393 files changed, 35750 insertions, 65150 deletions

diff --git a/.gitmodules b/.gitmodules
index f9047a059..6c30dad66 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "libempathy-gtk/egg-list-box"]
-	path = libempathy-gtk/egg-list-box
-	url = git://git.gnome.org/egg-list-box
+[submodule "telepathy-account-widgets"]
+	path = telepathy-account-widgets
+	url = git://git.gnome.org/telepathy-account-widgets.git
diff --git a/GOSSIP-RELICENSING.txt b/GOSSIP-RELICENSING.txt
index 9b8db1abb..53880604d 100644
--- a/GOSSIP-RELICENSING.txt
+++ b/GOSSIP-RELICENSING.txt
@@ -1,3 +1,5 @@
+== Relicensing for Telepathy logger ==
+
 From sjoerd.simons@collabora.co.uk Tue Jun 15 16:28:08 2010
 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender:
  sjoerd) with ESMTPSA id 0BEF66002FD
@@ -409,3 +411,3379 @@ Content-Transfer-Encoding: 8bit
 
 OK!
 
+
+== Telepathy account widgets relicensing (Gossip contributors) ==
+
+Message-ID: <1368796612.5620.19.camel@carbonara>
+Subject: Relicensing some code from Gossip to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Martyn Russell <martyn@lanedo.com>, Richard Hult
+ <richard@tinybird.com>, Mikael Hallendal <micke@tinybird.com>
+Date: Fri, 17 May 2013 14:16:52 +0100
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi,
+
+I'm currently working on integrating IM account creation with
+gnome-online-accounts. This would allow a Gnome user to create all types
+of accounts directly in the “System Settings�.
+To do so, I need to move to a separate module all the account widget
+code that is currently in Empathy, plus some other utility functions.
+The problem is that gnome-online-accounts is under LGPL, while the
+Empathy code that comes from Gossip is under GPL.
+
+Would it be possible for you (both personally and for Imendio AB) to
+agree to relicense this code to LGPL version 2.1 or later?
+
+Considering that this is the second time we ask your permission to
+relicense code coming from Gossip, I was wondering if you would agree to
+give us permission to relicense your code (to LGPL v2.1+) in case it
+will be needed again for similar projects in the future.
+
+Thanks!
+
+-- 
+Marco Barisione
+
+X-Greylist: delayed 427 seconds by postgrey-1.32 at bhuna; Fri, 17 May 2013
+ 15:05:02 BST
+Received: from lanedo.com (lanedo.com [85.214.136.179]) (using TLSv1 with
+ cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by
+ bhuna.collabora.co.uk (Postfix) with ESMTPS id 828D4170864F for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 15:05:02 +0100 (BST)
+Received: from [192.168.1.77]
+ (host86-131-206-214.range86-131.btcentralplus.com [86.131.206.214])
+ (Authenticated sender: martyn) by lanedo.com (Postfix) with ESMTPSA id
+ 81DC27F40AD; Fri, 17 May 2013 15:57:54 +0200 (CEST)
+Message-ID: <51963761.3030407@lanedo.com>
+Date: Fri, 17 May 2013 14:57:53 +0100
+From: Martyn Russell <martyn@lanedo.com>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510
+ Thunderbird/17.0.6
+MIME-Version: 1.0
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+CC: Richard Hult <richard@tinybird.com>,  Mikael Hallendal
+ <micke@tinybird.com>
+Subject: Re: Relicensing some code from Gossip to LGPL
+References: <1368796612.5620.19.camel@carbonara>
+In-Reply-To: <1368796612.5620.19.camel@carbonara>
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 8bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 15:23:07 2013
+X-DSPAM-Confidence: 0.5891
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51963d4b19129775617922
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On 17/05/13 14:16, Marco Barisione wrote:
+> Hi,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move to a separate module all the account widget
+> code that is currently in Empathy, plus some other utility functions.
+> The problem is that gnome-online-accounts is under LGPL, while the
+> Empathy code that comes from Gossip is under GPL.
+>
+> Would it be possible for you (both personally and for Imendio AB) to
+> agree to relicense this code to LGPL version 2.1 or later?
+>
+> Considering that this is the second time we ask your permission to
+> relicense code coming from Gossip, I was wondering if you would agree to
+> give us permission to relicense your code (to LGPL v2.1+) in case it
+> will be needed again for similar projects in the future.
+
+Hello Macro, which code exactly are we talking about out of interest?
+
+-- 
+Regards,
+Martyn
+
+Founder and CEO of Lanedo GmbH.
+
+Message-ID: <1368804002.5620.42.camel@carbonara>
+Subject: Re: Relicensing some code from Gossip to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Martyn Russell <martyn@lanedo.com>
+Cc: Richard Hult <richard@tinybird.com>, Mikael Hallendal
+ <micke@tinybird.com>
+Date: Fri, 17 May 2013 16:20:02 +0100
+In-Reply-To: <51963761.3030407@lanedo.com>
+References: <1368796612.5620.19.camel@carbonara>
+         <51963761.3030407@lanedo.com>
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On Fri, 2013-05-17 at 14:57 +0100, Martyn Russell wrote:
+> Hello Macro, which code exactly are we talking about out of interest?
+
+It's difficult to pinpoint exactly what can be considered code coming
+from Gossip and what not as most code was heavily changed.
+I actually found it interesting how some functions was basically
+completely rewritten and now uses a different library (GtkBuilder
+instead of glade) but you can still see how they look similar to some
+Gossip code written 10 years ago! (It's almost Gossip's 10th birthday as
+the first commit was on the 19th May 2003.)
+
+Anyway, this is the code we need that was written for Gossip under GPL:
+      * UI code for configuring accounts (coming from
+        gossip-account-widget-jabber.[ch]).
+      * Some utility functions related to GtkBuilder (they were
+        originally for Glade). See gossip-glade.[ch].
+      * Some utility code to get the toplevel GtkWindow of a widget (see
+        gossip-account-widget-jabber.c and gossip-presence-chooser.c)
+      * A utility function to present a window, see
+        gossip_window_present() in gossip-ui-utils.c.
+
+-- 
+Marco Barisione
+
+Received: from lanedo.com (lanedo.com [85.214.136.179]) (using TLSv1 with
+ cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by
+ bhuna.collabora.co.uk (Postfix) with ESMTPS id DBC9916986FA for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 18:00:58 +0100 (BST)
+Received: from [192.168.1.77]
+ (host86-131-206-214.range86-131.btcentralplus.com [86.131.206.214])
+ (Authenticated sender: martyn) by lanedo.com (Postfix) with ESMTPSA id
+ 80C287F40A5; Fri, 17 May 2013 19:00:57 +0200 (CEST)
+Message-ID: <51966248.5020308@lanedo.com>
+Date: Fri, 17 May 2013 18:00:56 +0100
+From: Martyn Russell <martyn@lanedo.com>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510
+ Thunderbird/17.0.6
+MIME-Version: 1.0
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+CC: Richard Hult <richard@tinybird.com>,  Mikael Hallendal
+ <micke@tinybird.com>
+Subject: Re: Relicensing some code from Gossip to LGPL
+References: <1368796612.5620.19.camel@carbonara>
+          <51963761.3030407@lanedo.com> <1368804002.5620.42.camel@carbonara>
+In-Reply-To: <1368804002.5620.42.camel@carbonara>
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 7bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 18:01:01 2013
+X-DSPAM-Confidence: 0.9916
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196624c19123502411123
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On 17/05/13 16:20, Marco Barisione wrote:
+> On Fri, 2013-05-17 at 14:57 +0100, Martyn Russell wrote:
+>> Hello Macro, which code exactly are we talking about out of interest?
+>
+> It's difficult to pinpoint exactly what can be considered code coming
+> from Gossip and what not as most code was heavily changed.
+> I actually found it interesting how some functions was basically
+> completely rewritten and now uses a different library (GtkBuilder
+> instead of glade) but you can still see how they look similar to some
+> Gossip code written 10 years ago! (It's almost Gossip's 10th birthday as
+> the first commit was on the 19th May 2003.)
+>
+> Anyway, this is the code we need that was written for Gossip under GPL:
+>        * UI code for configuring accounts (coming from
+>          gossip-account-widget-jabber.[ch]).
+>        * Some utility functions related to GtkBuilder (they were
+>          originally for Glade). See gossip-glade.[ch].
+>        * Some utility code to get the toplevel GtkWindow of a widget (see
+>          gossip-account-widget-jabber.c and gossip-presence-chooser.c)
+>        * A utility function to present a window, see
+>          gossip_window_present() in gossip-ui-utils.c.
+
+Fine by me, was just interested :)
+
+Please go ahead.
+
+-- 
+Regards,
+Martyn
+
+Founder and CEO of Lanedo GmbH.
+
+Received: from mail-la0-f45.google.com (mail-la0-f45.google.com
+ [209.85.215.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 872DB1A8806E for <marco.barisione@collabora.co.uk>; Thu, 30 May
+ 2013 16:32:08 +0100 (BST)
+Received: by mail-la0-f45.google.com with SMTP id fr10so396796lab.4 for
+ <marco.barisione@collabora.co.uk>; Thu, 30 May 2013 08:32:07 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=google.com; s=20120113;
+ h=content-type:mime-version:subject:from:in-reply-to:date:cc
+ :content-transfer-encoding:message-id:references:to:x-mailer
+ :x-gm-message-state; bh=em3Xu/rdTkZodWe51PjShChayLOTdb68zV4rd6LL7g4=;
+ b=La4J6KZ/HixmKuI5gj1QqsVpSFy6o/c/kSO2wU6BUAX9El3V12zYyMj1wLEAmAw4Bf
+ DFz0+MX+uaJjF7Kb9NdIlGDUNLT/NLCzjwDwa4wMIeSVj03OLdXhj9O5xKRTr6DAGN6J
+ fUmUVNt14zmFCG+/YxcaaThd+QDkUQ5KXQPuwCKsqiS277LszpdK0mvz67SBr6Kv9Oid
+ 1NQWMApL/Fu39RIkyBPhol9hNtWmtPRU4SrtI8AuQCTCTo5cWeuGTAo3tHCeXnOz4Oht
+ sfqeQlwkZu1Cfw56KF33Lo2shJwR8Aon7yQAx3cC15VglrgH+84j8Bk03tR/tWrwPRXi U/oQ==
+X-Received: by 10.152.22.199 with SMTP id g7mr3105740laf.20.1369927927723;
+ Thu, 30 May 2013 08:32:07 -0700 (PDT)
+Received: from [192.168.50.11] (c80-216-147-62.bredband.comhem.se.
+ [80.216.147.62]) by mx.google.com with ESMTPSA id
+ f8sm17212966lbr.10.2013.05.30.08.32.04 for <multiple recipients>
+ (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 30 May 2013
+ 08:32:06 -0700 (PDT)
+Content-Type: text/plain; charset=us-ascii
+Mime-Version: 1.0 (Mac OS X Mail 6.3 \(1503\))
+Subject: Re: Relicensing some code from Gossip to LGPL
+From: Richard Hult <richard@tinybird.com>
+In-Reply-To: <1368804002.5620.42.camel@carbonara>
+Date: Thu, 30 May 2013 17:32:03 +0200
+Cc: Martyn Russell <martyn@lanedo.com>
+Content-Transfer-Encoding: quoted-printable
+Message-Id: <48F9E57D-673D-4BB6-BCB1-AA80C80B672E@tinybird.com>
+References: <1368796612.5620.19.camel@carbonara>
+         <51963761.3030407@lanedo.com> <1368804002.5620.42.camel@carbonara>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+X-Mailer: Apple Mail (2.1503)
+X-Gm-Message-State:
+ ALoCoQmf77Ca0NSy0HMMkExOPJLIE97QTjzE8LPDz6Z999SvJDGstgQWuhv8Gikd2hq9Ydj9G3PA
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Thu May 30 16:37:13 2013
+X-DSPAM-Confidence: 0.9915
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51a7722919121527013877
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi,
+
+We (me and Micke, including Imendio / Tinybird) are fine with =
+relicensing all our contributions in Gossip to LGPL v2.1+.
+
+It's good to see that ancient thing come to use :)
+
+Cheers,
+Richard
+
+17 maj 2013 kl. 17:20 skrev Marco Barisione =
+<marco.barisione@collabora.co.uk>:
+
+> On Fri, 2013-05-17 at 14:57 +0100, Martyn Russell wrote:
+>> Hello Macro, which code exactly are we talking about out of interest?
+>=20
+> It's difficult to pinpoint exactly what can be considered code coming
+> from Gossip and what not as most code was heavily changed.
+> I actually found it interesting how some functions was basically
+> completely rewritten and now uses a different library (GtkBuilder
+> instead of glade) but you can still see how they look similar to some
+> Gossip code written 10 years ago! (It's almost Gossip's 10th birthday =
+as
+> the first commit was on the 19th May 2003.)
+>=20
+> Anyway, this is the code we need that was written for Gossip under =
+GPL:
+>      * UI code for configuring accounts (coming from
+>        gossip-account-widget-jabber.[ch]).
+>      * Some utility functions related to GtkBuilder (they were
+>        originally for Glade). See gossip-glade.[ch].
+>      * Some utility code to get the toplevel GtkWindow of a widget =
+(see
+>        gossip-account-widget-jabber.c and gossip-presence-chooser.c)
+>      * A utility function to present a window, see
+>        gossip_window_present() in gossip-ui-utils.c.
+>=20
+> --=20
+> Marco Barisione
+>=20
+>=20
+
+--=20
+http://tinybird.com/ ~ Tinybird Interactive - Inspiring Software
+
+== Telepathy account widgets relicensing (Collabora contributors) ==
+
+Message-ID: <1368795514.5620.8.camel@carbonara>
+Subject: Relicensing some Empathy code from GPL to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Jonny Lamb <jonnylamb@gnome.org>, Marco Barisione
+ <marco@barisione.org>, Felix Kaser <f.kaser@gmx.net>, Cosimo Cecchi
+ <cosimoc@gnome.org>, Travis Reitter <treitter@gmail.com>,  Xavier Claessens
+ <xclaesse@gmail.com>, Danielle Madeley <danielle@madeley.id.au>
+Date: Fri, 17 May 2013 13:58:34 +0100
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi all,
+
+I'm currently working on integrating IM account creation with
+gnome-online-accounts. This would allow a Gnome user to create all types
+of accounts directly in the “System Settings�.
+To do so, I need to move all the account creation code to a separate git
+submodule that can be used by gnome-online-accounts.
+The problem is that gnome-online-account is under LGPL, while Empathy
+contains some files under GPL and some files under LGPL.
+
+I'm writing you because you contributed to some Empathy files under GPL
+that we would like to use in gnome-online-accounts. These contributions
+were done using your personal email addresses, so I'm not sure whether
+you wrote the code in your free time or for Collabora.
+In case some of the code was written outside work, would you agree to
+relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Thanks!
+
+-- 
+Marco Barisione
+
+X-Greylist: delayed 416 seconds by postgrey-1.32 at bhuna; Fri, 17 May 2013
+ 14:30:36 BST
+Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
+ [66.111.4.26]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 5F2FA1708625 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:30:36 +0100 (BST)
+Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42])
+ by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id B03CC20A06; Fri, 17
+ May 2013 09:23:37 -0400 (EDT)
+Received: from frontend2.nyi.mail.srv.osa ([10.202.2.161]) by
+ compute2.internal (MEProxy); Fri, 17 May 2013 09:23:37 -0400
+DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com;
+ h=message-id:subject:from:to:date
+ :in-reply-to:references:content-type:mime-version
+ :content-transfer-encoding; s=smtpout; bh=ao/XTCWVPrRO0biL9ndAnB w+QVk=;
+ b=H7DVExc4VMFzFtjndObVmJBjaHFaTJ1is040b9gk5UXA8xk40swh2B
+ b7Wqvmmis/uD4G+bkOwAys5fQyzLaAEJeOBK4GFgXKrhWrx7+BslocHL47lXdHLe
+ R1gYDTA2XHAR3eINRqyl46wGcpRbT+dYhyyo69U1CsjR1AUCkGOGE=
+X-Sasl-enc: YaQs8RVRW4bZ4vRd7mOOG8Y768a4nwKSKJng7BgS5qdD 1368797017
+Received: from [10.69.106.15] (unknown [93.45.233.185]) by
+ mail.messagingengine.com (Postfix) with ESMTPA id 11FC120008D for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 09:23:36 -0400 (EDT)
+Message-ID: <1368797015.19887.48.camel@reger>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Jonny Lamb <jonnylamb@jonnylamb.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Date: Fri, 17 May 2013 15:23:35 +0200
+In-Reply-To: <1368795514.5620.8.camel@carbonara>
+References: <1368795514.5620.8.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.0-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:34:23 2013
+X-DSPAM-Confidence: 0.5660
+X-DSPAM-Probability: 0.0354
+X-DSPAM-Signature: 12,519631df19121547611730
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Il giorno ven, 17/05/2013 alle 13.58 +0100, Marco Barisione ha scritto:
+> In case some of the code was written outside work, would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Yes.
+
+-- 
+Jonny Lamb
+
+X-Greylist: delayed 400 seconds by postgrey-1.32 at bhuna; Fri, 17 May 2013
+ 14:37:27 BST
+Received: from dwicky1.webinabox.net.au (dwicky1-3.webinabox.net.au
+ [110.173.224.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256
+ bits)) (No client certificate requested) by bhuna.collabora.co.uk (Postfix)
+ with ESMTPS id 87461170860A for <marco.barisione@collabora.co.uk>; Fri, 17
+ May 2013 14:37:27 +0100 (BST)
+Received: (qmail 27127 invoked by uid 89); 17 May 2013 13:30:42 -0000
+Received: by simscan 1.1.0 ppid: 27119, pid: 27122, t: 0.4232s scanners:
+ attach: 1.1.0 clamav: 0.88/m:35/d:1235 spam: 3.2.4
+X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on
+ dwicky1.webinabox.net.au
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED,HTML_MESSAGE
+ autolearn=failed version=3.2.4
+Received: from unknown (HELO mail-qc0-f180.google.com)
+ (danielle@madeley.id.au@209.85.216.180) by dwicky1.webinabox.net.au with
+ ESMTPA; 17 May 2013 13:30:42 -0000
+Received: by mail-qc0-f180.google.com with SMTP id a10so1664685qcx.39 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:30:39 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=google.com; s=20120113;
+ h=mime-version:x-received:in-reply-to:references:date:message-id
+ :subject:from:to:content-type;
+ bh=wYGY0zxDLIoZIN+pv6p78/LjECx1nPfqDufvDG8nVZ4=;
+ b=aLqZXAesRaCr8GuIypucFTsT/VcHfKgeUcY4hgiPsJZkAeB8vP/0BTKR0jmCivGGKH
+ w2axkj3lxAybck2oqj3ViTV73HuL6CJvtGqAFijmSxnyz1bkrPyCJd1L+9xi5F136mCv
+ BWElJG1gobWRyTQaeL0UVUo4tkSobBxNzMrDSmEIWQHWresZBFOpt0GpW34vmTo24qxe
+ EoAYXhnKLrpe0gk48Oa6R81Rmnz0qJ1es3uDiVof4mvuH0wKxrgWKKog2VFaLNlajlS4
+ eb+90OJzfJPoOqLZbt/7MAWI3zG4mj4SvHvRBFURcjB7ZcK5Ru3n8KwbPH56v1GTo6q0 N+pQ==
+MIME-Version: 1.0
+X-Received: by 10.224.192.6 with SMTP id do6mr37195109qab.82.1368797439221;
+ Fri, 17 May 2013 06:30:39 -0700 (PDT)
+Received: by 10.49.117.195 with HTTP; Fri, 17 May 2013 06:30:39 -0700 (PDT)
+In-Reply-To: <1368795514.5620.8.camel@carbonara>
+References: <1368795514.5620.8.camel@carbonara>
+Date: Fri, 17 May 2013 23:30:39 +1000
+Message-ID: <CAKyTCxaNxZBoz99DFcSMkJpq+JJTXuXx5HrUdej6Q4Coi+tXyw@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Danielle Madeley <danielle@madeley.id.au>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Content-Type: multipart/alternative; boundary=20cf300fb1cb2267ec04dce9fdc8
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:40:06 2013
+X-DSPAM-Confidence: 0.5883
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196333619122110957504
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--20cf300fb1cb2267ec04dce9fdc8
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Relicence away!
+
+On Friday, 17 May 2013, Marco Barisione wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-account is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. These contributions
+> were done using your personal email addresses, so I'm not sure whether
+> you wrote the code in your free time or for Collabora.
+> In case some of the code was written outside work, would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thanks!
+>
+> --
+> Marco Barisione
+>
+>
+
+--20cf300fb1cb2267ec04dce9fdc8
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Relicence away!<span></span><br><br>On Friday, 17 May 2013, Marco Barisione=
+  wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;bo=
+rder-left:1px #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-account is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. These contributions<br>
+were done using your personal email addresses, so I&#39;m not sure whether<=
+br>
+you wrote the code in your free time or for Collabora.<br>
+In case some of the code was written outside work, would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thanks!<br>
+<br>
+--<br>
+Marco Barisione<br>
+<br>
+</blockquote>
+
+--20cf300fb1cb2267ec04dce9fdc8--
+
+Received: from mail-ea0-f176.google.com (mail-ea0-f176.google.com
+ [209.85.215.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 186B11708614 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:48:20 +0100 (BST)
+Received: by mail-ea0-f176.google.com with SMTP id k11so2440251eaj.35 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:48:19 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=x-received:sender:message-id:subject:from:to:date:in-reply-to
+ :references:content-type:x-mailer:mime-version :content-transfer-encoding;
+ bh=ETuqIl7IDAWDEheKJ8nP+MeyQy1GN957saQXDCX81nE=;
+ b=hNdg84v8OuZqXILYOdfUalurTdkfz5eP9pfgO1T2zstl1tg+qu8BO6jLjHPmNN2Lek
+ hirUvvCpOb4wfurTvSG+CMEB2CjU/NRNCg6BVkQTe2YJNwQEDslV79oRma4gpj5CBatd
+ jqJHgz2E8tUMIu+HpZRjZ3NK0ZL9AYodaMnx1jepKuiwKee/UMUKSLG6BYs2IGLkBH0j
+ IL2NUVPLQzybm9DmYQ+xPyyx2asjRbYkPCgYrBw+y2sRgBOMgetHTq7tD2PplGAUMc1x
+ /srnWD9pxbu4oYkm+rDbgp53BDq8oWMTjx9uz2bhRlc1ZV3cw25SmrONfD6RHPpEROCN VbtQ==
+X-Received: by 10.15.35.71 with SMTP id f47mr91722892eev.15.1368798499636;
+ Fri, 17 May 2013 06:48:19 -0700 (PDT)
+Received: from [172.22.64.131] (pakora.collabora.co.uk. [93.93.133.71]) by
+ mx.google.com with ESMTPSA id i2sm18882677eeg.2.2013.05.17.06.48.18 for
+ <marco.barisione@collabora.co.uk> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA
+ bits=128/128); Fri, 17 May 2013 06:48:18 -0700 (PDT)
+Sender: Marco Barisione <barisione@gmail.com>
+Message-ID: <1368798497.5620.25.camel@carbonara>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Marco Barisione <marco@barisione.org>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Date: Fri, 17 May 2013 14:48:17 +0100
+In-Reply-To: <1368795514.5620.8.camel@carbonara>
+References: <1368795514.5620.8.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:51:19 2013
+X-DSPAM-Confidence: 0.9906
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,519635d719122019096701
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On Fri, 2013-05-17 at 13:58 +0100, Marco Barisione wrote:
+> In case some of the code was written outside work, would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Hi Marco,
+I'm fine with relicensing.
+
+-- 
+Marco
+
+Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com
+ [74.125.82.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
+ certificate requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id
+ 99A0D16986F8 for <marco.barisione@collabora.co.uk>; Fri, 17 May 2013
+ 16:10:09 +0100 (BST)
+Received: by mail-wg0-f44.google.com with SMTP id a12so1330250wgh.11 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 08:10:09 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=x-received:message-id:subject:from:to:cc:date:in-reply-to
+ :references:content-type:x-mailer:mime-version :content-transfer-encoding;
+ bh=b5rNuRG3vw5UbY/OnAj27wQAWhIx4lXLWkTUJXigGE8=;
+ b=tnYxJmDLfBBoT95ZDw7DCNH0SOXNq9U/lm2iZY2K29bXcd/GjmT5w8XTnsKZQYJaEf
+ xy3ULPyBqPvYWNaKBtd8mubwpk7+K9RNPfBMK/K5TfzSGwso1SuI+ug4ml8yEXme1W47
+ ZlbLweT9BWD9ydMRgRnElEmLYD6/zmQul62AF7OzEVRetFL+c47RR5zfB+2VvjFLFg/9
+ 77OLEx3eR8SWvs9vHFvYwdIQSU+r+9E+rBrH5tsCUnKNzPOKTxS49+f6HCQUnc+mQJR5
+ JeurFsnUiVcNfZ8kgsVaXexisnqmz7itWmUTXA8HmPS8D5tsh+zuizMKlImgN+XhhHfv +Sww==
+X-Received: by 10.181.13.112 with SMTP id
+ ex16mr16564844wid.28.1368803409040; Fri, 17 May 2013 08:10:09 -0700 (PDT)
+Received: from [192.168.1.173] (cable-212.76.254.67.coditel.net.
+ [212.76.254.67]) by mx.google.com with ESMTPSA id
+ fz8sm10089134wib.2.2013.05.17.08.10.07 for <multiple recipients>
+ (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 May 2013
+ 08:10:08 -0700 (PDT)
+Message-ID: <1368803406.23948.3.camel@X230>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Xavier Claessens <xclaesse@gmail.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Jonny Lamb <jonnylamb@gnome.org>, Marco Barisione
+ <marco@barisione.org>, Felix Kaser <f.kaser@gmx.net>, Cosimo Cecchi
+ <cosimoc@gnome.org>, Travis Reitter <treitter@gmail.com>,  Danielle Madeley
+ <danielle@madeley.id.au>
+Date: Fri, 17 May 2013 17:10:06 +0200
+In-Reply-To: <1368795514.5620.8.camel@carbonara>
+References: <1368795514.5620.8.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.1-0ubuntu1~raring1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-DSPAM-Result: Whitelisted
+X-DSPAM-Processed: Fri May 17 16:10:11 2013
+X-DSPAM-Confidence: 0.9909
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196485319129696466813
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hello,
+
+No problem for me.
+
+Regards,
+Xavier Claessens.
+
+Le vendredi 17 mai 2013 à 13:58 +0100, Marco Barisione a écrit :
+> Hi all,
+> 
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-account is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+> 
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. These contributions
+> were done using your personal email addresses, so I'm not sure whether
+> you wrote the code in your free time or for Collabora.
+> In case some of the code was written outside work, would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+> 
+> Thanks!
+> 
+
+Received: from mail-ob0-f179.google.com (mail-ob0-f179.google.com
+ [209.85.214.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 77A80170861A for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 16:40:39 +0100 (BST)
+Received: by mail-ob0-f179.google.com with SMTP id wd20so3165117obb.38 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 08:40:38 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=mime-version:x-received:sender:in-reply-to:references:date
+ :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
+ bh=W6gVWpVQ2I9yhPP1qYWmUghyxB65GEyrHMaIkls7wNI=;
+ b=q8iyIbLI3hxmJyryDq84NztO6mlwib2yuqPBDK0XmWX0/NuhxuMI4pyOfvp1lduoCE
+ rT+jPqjGTn0NtCylAi2CwahReI7maL8frHk7bz7HXLPr2AcjPhbhfdl3moOyL1FvW92Q
+ B4Qi2cnfa3YuJiL8DxqWvnn7nFHNotsxgK1z3Q1w1PcN4tvCNjWSSK2s45xR4ZxMRpZ8
+ s/HJqC3jceQ2mpcKH9RGi4v9Spk5PsofO6xEjgVbgfXC/u6n1pMzi1QeP6PrUeXyJGM/
+ EMSGxNNfslgOXiPIE2VNu5Bp+dk0BZ4tVqBhEQkfbFL/KUDr1SUFFDRZrQoMJZ1feFkd 3UeQ==
+MIME-Version: 1.0
+X-Received: by 10.60.62.237 with SMTP id b13mr3640322oes.40.1368805238259;
+ Fri, 17 May 2013 08:40:38 -0700 (PDT)
+Sender: cosimo.cecchi@gmail.com
+Received: by 10.60.45.143 with HTTP; Fri, 17 May 2013 08:40:38 -0700 (PDT)
+In-Reply-To: <1368803406.23948.3.camel@X230>
+References: <1368795514.5620.8.camel@carbonara>
+         <1368803406.23948.3.camel@X230>
+Date: Fri, 17 May 2013 08:40:38 -0700
+X-Google-Sender-Auth: BOIuBp3MZ95dGx_Q9NUtAzDmb0Y
+Message-ID: <CAKbt28b2P5mad_c4ydTs2NQrGKRETBg4+ey-PqhOCPvkEeHuKw@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Cosimo Cecchi <cosimoc@gnome.org>
+To: Xavier Claessens <xclaesse@gmail.com>
+Cc: Marco Barisione <marco.barisione@collabora.co.uk>, Jonny Lamb
+ <jonnylamb@gnome.org>,  Marco Barisione <marco@barisione.org>, Felix Kaser
+ <f.kaser@gmx.net>,  Travis Reitter <treitter@gmail.com>, Danielle Madeley
+ <danielle@madeley.id.au>
+Content-Type: multipart/alternative; boundary=001a11c21b76fe443c04dcebcddf
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 16:41:15 2013
+X-DSPAM-Confidence: 0.9915
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51964f9a19128002011127
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--001a11c21b76fe443c04dcebcddf
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Hey Marco,
+
+Sure, no problem.
+
+Cosimo
+
+
+On Fri, May 17, 2013 at 8:10 AM, Xavier Claessens <xclaesse@gmail.com>wrote=
+:
+
+> Hello,
+>
+> No problem for me.
+>
+> Regards,
+> Xavier Claessens.
+>
+> Le vendredi 17 mai 2013 =E0 13:58 +0100, Marco Barisione a =E9crit :
+> > Hi all,
+> >
+> > I'm currently working on integrating IM account creation with
+> > gnome-online-accounts. This would allow a Gnome user to create all type=
+s
+> > of accounts directly in the =93System Settings=94.
+> > To do so, I need to move all the account creation code to a separate gi=
+t
+> > submodule that can be used by gnome-online-accounts.
+> > The problem is that gnome-online-account is under LGPL, while Empathy
+> > contains some files under GPL and some files under LGPL.
+> >
+> > I'm writing you because you contributed to some Empathy files under GPL
+> > that we would like to use in gnome-online-accounts. These contributions
+> > were done using your personal email addresses, so I'm not sure whether
+> > you wrote the code in your free time or for Collabora.
+> > In case some of the code was written outside work, would you agree to
+> > relicense your code from GPL to LGPL (version 2.1 or later)?
+> >
+> > Thanks!
+> >
+>
+>
+>
+
+--001a11c21b76fe443c04dcebcddf
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Hey Marco,<div><br></div><div style>Sure, no problem.</div=
+><div style><br></div><div style>Cosimo</div></div><div class=3D"gmail_extr=
+a"><br><br><div class=3D"gmail_quote">On Fri, May 17, 2013 at 8:10 AM, Xavi=
+er Claessens <span dir=3D"ltr">&lt;<a href=3D"mailto:xclaesse@gmail.com" ta=
+rget=3D"_blank">xclaesse@gmail.com</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hello,<br>
+<br>
+No problem for me.<br>
+<br>
+Regards,<br>
+Xavier Claessens.<br>
+<br>
+Le vendredi 17 mai 2013 =E0 13:58 +0100, Marco Barisione a =E9crit :<br>
+<div class=3D"HOEnZb"><div class=3D"h5">&gt; Hi all,<br>
+&gt;<br>
+&gt; I&#39;m currently working on integrating IM account creation with<br>
+&gt; gnome-online-accounts. This would allow a Gnome user to create all typ=
+es<br>
+&gt; of accounts directly in the =93System Settings=94.<br>
+&gt; To do so, I need to move all the account creation code to a separate g=
+it<br>
+&gt; submodule that can be used by gnome-online-accounts.<br>
+&gt; The problem is that gnome-online-account is under LGPL, while Empathy<=
+br>
+&gt; contains some files under GPL and some files under LGPL.<br>
+&gt;<br>
+&gt; I&#39;m writing you because you contributed to some Empathy files unde=
+r GPL<br>
+&gt; that we would like to use in gnome-online-accounts. These contribution=
+s<br>
+&gt; were done using your personal email addresses, so I&#39;m not sure whe=
+ther<br>
+&gt; you wrote the code in your free time or for Collabora.<br>
+&gt; In case some of the code was written outside work, would you agree to<=
+br>
+&gt; relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+&gt;<br>
+&gt; Thanks!<br>
+&gt;<br>
+<br>
+<br>
+</div></div></blockquote></div><br></div>
+
+--001a11c21b76fe443c04dcebcddf--
+
+X-Greylist: delayed 457 seconds by postgrey-1.32 at bhuna; Fri, 17 May 2013
+ 20:09:56 BST
+Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by
+ bhuna.collabora.co.uk (Postfix) with ESMTP id 22C7B16986BE for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 20:09:56 +0100 (BST)
+Received: from mailout-de.gmx.net ([10.1.76.12]) by mrigmx.server.lan
+ (mrigmx002) with ESMTP (Nemesis) id 0MB0os-1Ul4os0ZEq-00A1wY for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 20:57:18 +0200
+Received: (qmail invoked by alias); 17 May 2013 18:57:17 -0000
+Received: from mail-ee0-f49.google.com (EHLO mail-ee0-f49.google.com)
+ [74.125.83.49] by mail.gmx.net (mp012) with SMTP; 17 May 2013 20:57:17 +0200
+X-Authenticated: #24284661
+X-Provags-ID: V01U2FsdGVkX193WC12kHh3qD6oo4BlVAUMeh6TLiexwcKQKX4fCG
+ eL5Rbw1X85d5rv
+Received: by mail-ee0-f49.google.com with SMTP id d17so2709611eek.36 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 11:57:17 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=google.com; s=20120113;
+ h=mime-version:x-received:in-reply-to:references:date:message-id
+ :subject:from:to:cc:content-type;
+ bh=Q6nI2bLTruB/xc0iwoRE7vmJLnH/v40b9NLCjA7aO38=;
+ b=A8C89zmct65+q133icJvENQ4qVEnHyaH9hs4ggzSyCLontorisJgbraRc3xS4pcKSP
+ +rRHbkDeBVF86WMVTckfv4EhYOeSPcI6THtgAZReoQvfajfotMYVuKZrz5ZqUdfCfGFO
+ 5CDZY0l/y4hsNvMxwj2O7lesJcZV3n6jO44P+gdg0VCNgHceL5ZjQYrGD75vowDtlhY1
+ WRmOt8GgruVbD7gNBZsOE6+Sizm1k4f81I2nysWUSTwNA+TX34wjWxItEzVY0CEf4vDL
+ n0TDvirpbBuBcAsjhQzq66l8Rm8P3OdBzX32Wd4aC1raBeUZ7Gl5wPRbM4+681vDRl1m /Z4w==
+MIME-Version: 1.0
+X-Received: by 10.14.178.129 with SMTP id f1mr95588974eem.10.1368817037194;
+ Fri, 17 May 2013 11:57:17 -0700 (PDT)
+Received: by 10.223.1.19 with HTTP; Fri, 17 May 2013 11:57:17 -0700 (PDT)
+In-Reply-To: <CAKbt28b2P5mad_c4ydTs2NQrGKRETBg4+ey-PqhOCPvkEeHuKw@mail.gmail.com>
+References: <1368795514.5620.8.camel@carbonara>
+         <1368803406.23948.3.camel@X230>
+         <CAKbt28b2P5mad_c4ydTs2NQrGKRETBg4+ey-PqhOCPvkEeHuKw@mail.gmail.com>
+Date: Fri, 17 May 2013 20:57:17 +0200
+Message-ID: <CA+57usN9xF9qxaoUHVf=2N29Gt=E4qu-=J_AHonmVK934aVFqQ@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Felix Kaser <f.kaser@gmx.net>
+To: Cosimo Cecchi <cosimoc@gnome.org>
+Cc: Xavier Claessens <xclaesse@gmail.com>, Marco Barisione
+ <marco.barisione@collabora.co.uk>,  Jonny Lamb <jonnylamb@gnome.org>, Marco
+ Barisione <marco@barisione.org>,  Travis Reitter <treitter@gmail.com>,
+ Danielle Madeley <danielle@madeley.id.au>
+Content-Type: multipart/alternative; boundary=047d7b603d8843ffaf04dcee8dbe
+X-Y-GMX-Trusted: 0
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 20:09:58 2013
+X-DSPAM-Confidence: 0.6164
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196808619121890219965
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--047d7b603d8843ffaf04dcee8dbe
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Hi Marco,
+
+as we already discussed: No problem on my side either.
+
+cheers
+felix
+
+
+On Fri, May 17, 2013 at 5:40 PM, Cosimo Cecchi <cosimoc@gnome.org> wrote:
+
+> Hey Marco,
+>
+> Sure, no problem.
+>
+> Cosimo
+>
+>
+> On Fri, May 17, 2013 at 8:10 AM, Xavier Claessens <xclaesse@gmail.com>wro=
+te:
+>
+>> Hello,
+>>
+>> No problem for me.
+>>
+>> Regards,
+>> Xavier Claessens.
+>>
+>> Le vendredi 17 mai 2013 =E0 13:58 +0100, Marco Barisione a =E9crit :
+>> > Hi all,
+>> >
+>> > I'm currently working on integrating IM account creation with
+>> > gnome-online-accounts. This would allow a Gnome user to create all typ=
+es
+>> > of accounts directly in the =93System Settings=94.
+>> > To do so, I need to move all the account creation code to a separate g=
+it
+>> > submodule that can be used by gnome-online-accounts.
+>> > The problem is that gnome-online-account is under LGPL, while Empathy
+>> > contains some files under GPL and some files under LGPL.
+>> >
+>> > I'm writing you because you contributed to some Empathy files under GP=
+L
+>> > that we would like to use in gnome-online-accounts. These contribution=
+s
+>> > were done using your personal email addresses, so I'm not sure whether
+>> > you wrote the code in your free time or for Collabora.
+>> > In case some of the code was written outside work, would you agree to
+>> > relicense your code from GPL to LGPL (version 2.1 or later)?
+>> >
+>> > Thanks!
+>> >
+>>
+>>
+>>
+>
+
+--047d7b603d8843ffaf04dcee8dbe
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Hi Marco,<div><br></div><div>as we already discussed: No p=
+roblem on my side either.</div><div><br></div><div>cheers</div><div>felix</=
+div></div><div class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On =
+Fri, May 17, 2013 at 5:40 PM, Cosimo Cecchi <span dir=3D"ltr">&lt;<a href=
+=3D"mailto:cosimoc@gnome.org" target=3D"_blank">cosimoc@gnome.org</a>&gt;</=
+span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex"><div dir=3D"ltr">Hey Marco,<div><br></div><d=
+iv>Sure, no problem.</div><span class=3D"HOEnZb"><font color=3D"#888888"><d=
+iv><br>
+</div><div>Cosimo</div></font></span></div><div class=3D"HOEnZb"><div class=
+=3D"h5"><div class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Fr=
+i, May 17, 2013 at 8:10 AM, Xavier Claessens <span dir=3D"ltr">&lt;<a href=
+=3D"mailto:xclaesse@gmail.com" target=3D"_blank">xclaesse@gmail.com</a>&gt;=
+</span> wrote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hello,<br>
+<br>
+No problem for me.<br>
+<br>
+Regards,<br>
+Xavier Claessens.<br>
+<br>
+Le vendredi 17 mai 2013 =E0 13:58 +0100, Marco Barisione a =E9crit :<br>
+<div><div>&gt; Hi all,<br>
+&gt;<br>
+&gt; I&#39;m currently working on integrating IM account creation with<br>
+&gt; gnome-online-accounts. This would allow a Gnome user to create all typ=
+es<br>
+&gt; of accounts directly in the =93System Settings=94.<br>
+&gt; To do so, I need to move all the account creation code to a separate g=
+it<br>
+&gt; submodule that can be used by gnome-online-accounts.<br>
+&gt; The problem is that gnome-online-account is under LGPL, while Empathy<=
+br>
+&gt; contains some files under GPL and some files under LGPL.<br>
+&gt;<br>
+&gt; I&#39;m writing you because you contributed to some Empathy files unde=
+r GPL<br>
+&gt; that we would like to use in gnome-online-accounts. These contribution=
+s<br>
+&gt; were done using your personal email addresses, so I&#39;m not sure whe=
+ther<br>
+&gt; you wrote the code in your free time or for Collabora.<br>
+&gt; In case some of the code was written outside work, would you agree to<=
+br>
+&gt; relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+&gt;<br>
+&gt; Thanks!<br>
+&gt;<br>
+<br>
+<br>
+</div></div></blockquote></div><br></div>
+</div></div></blockquote></div><br></div>
+
+--047d7b603d8843ffaf04dcee8dbe--
+
+Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com
+ [209.85.212.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 45D60170861C for <marco.barisione@collabora.co.uk>; Sat, 18 May
+ 2013 00:21:00 +0100 (BST)
+Received: by mail-vb0-f49.google.com with SMTP id q12so2664559vbe.8 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 16:20:59 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:x-received:in-reply-to:references:date:message-id
+ :subject:from:to:cc:content-type;
+ bh=ZPABAGr6X8lwyNqNMCNFEHueMbJys8AAbEjUMRfAtgU=;
+ b=jgD1uU4/qInDb/h9gbKmBGMPR3hSrN1qRXtwm++i8W6aJaCqlc8TMu2IY4DzF05AwV
+ L37kjbcHau3CaR/Y8q8geCSMPWvTVBxO0sBNF2XB+5X9TpDZxUwTsR1Z+49mjHGrY4yU
+ ud3LvnE0e5dWRaxnZiN0IC64yYYNRTOywOwEDXfwa2hs1X72EAU7uy/6iMcRpYElAx2u
+ kcH/ijLml0eoBa1O7tyfnoRXJzZZm479XVU4XpxTZ2EhfGsJwH2JFm5kF62mAgKcNjJT
+ AsKn9UznGkwOntIBHoKkpqOSXAcNZYHIzZz1fd6EDTKd84ERkLeXCvY6hRgFK6jv7lDN 7qXg==
+MIME-Version: 1.0
+X-Received: by 10.58.210.162 with SMTP id
+ mv2mr31045906vec.11.1368832859034; Fri, 17 May 2013 16:20:59 -0700 (PDT)
+Received: by 10.52.32.10 with HTTP; Fri, 17 May 2013 16:20:58 -0700 (PDT)
+In-Reply-To: <1368795514.5620.8.camel@carbonara>
+References: <1368795514.5620.8.camel@carbonara>
+Date: Fri, 17 May 2013 16:20:58 -0700
+Message-ID: <CALtP05tb+xOArR_22s11_yp28q-8C8SnFEto+VxLWBMe7seGCg@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: "treitter@gmail.com" <treitter@gmail.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Jonny Lamb <jonnylamb@gnome.org>, Marco Barisione
+ <marco@barisione.org>,  Felix Kaser <f.kaser@gmx.net>, Cosimo Cecchi
+ <cosimoc@gnome.org>,  Xavier Claessens <xclaesse@gmail.com>, Danielle
+ Madeley <danielle@madeley.id.au>
+Content-Type: multipart/alternative; boundary=047d7bdc075451dd6104dcf23c27
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Sat May 18 00:22:20 2013
+X-DSPAM-Confidence: 0.9915
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196bbac19122138115084
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--047d7bdc075451dd6104dcf23c27
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Sounds good to me.
+
+Thanks,
+-Travis
+
+
+On Fri, May 17, 2013 at 5:58 AM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =93System Settings=94.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-account is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. These contributions
+> were done using your personal email addresses, so I'm not sure whether
+> you wrote the code in your free time or for Collabora.
+> In case some of the code was written outside work, would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thanks!
+>
+> --
+> Marco Barisione
+>
+>
+
+--047d7bdc075451dd6104dcf23c27
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Sounds good to me.<div><br></div><div style>Thanks,</div><=
+div style>-Travis</div></div><div class=3D"gmail_extra"><br><br><div class=
+=3D"gmail_quote">On Fri, May 17, 2013 at 5:58 AM, Marco Barisione <span dir=
+=3D"ltr">&lt;<a href=3D"mailto:marco.barisione@collabora.co.uk" target=3D"_=
+blank">marco.barisione@collabora.co.uk</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =93System Settings=94.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-account is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. These contributions<br>
+were done using your personal email addresses, so I&#39;m not sure whether<=
+br>
+you wrote the code in your free time or for Collabora.<br>
+In case some of the code was written outside work, would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thanks!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br></div>
+
+--047d7bdc075451dd6104dcf23c27--
+
+== Telepathy account widgets relicensing (other contributors) ==
+
+Message-ID: <1368795784.5620.13.camel@carbonara>
+Subject: Relicensing some Empathy code from GPL to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Chandni Verma <chandniverma2112@gmail.com>, Cyril Roelandt
+ <tipecaml@gmail.com>, Dimitris Zenios <dimitris.zenios@gmail.com>, Jonathan
+ Tellier <jonathan.tellier@gmail.com>, Marc Plano-Lesay
+ <marc.planolesay@gmail.com>, Vitaly Minko <vitaly.minko@gmail.com>,
+ Frederic Peters <fpeters@0d.be>, Andreas Henriksson <andreas@fatal.se>,
+ Vincent Untz <vuntz@gnome.org>, Baptiste Mille-Mathias
+ <baptistem@gnome.org>, Susana Pereira <susana.pereira@gmail.com>, Steve
+ =?ISO-8859-1?Q?Fr=E9cinaux?= <code@istique.net>
+Date: Fri, 17 May 2013 14:03:04 +0100
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi all,
+
+I'm currently working on integrating IM account creation with
+gnome-online-accounts. This would allow a Gnome user to create all types
+of accounts directly in the “System Settings�.
+To do so, I need to move all the account creation code to a separate git
+submodule that can be used by gnome-online-accounts.
+The problem is that gnome-online-accounts is under LGPL, while Empathy
+contains some files under GPL and some files under LGPL.
+
+I'm writing you because you contributed to some Empathy files under GPL
+that we would like to use in gnome-online-accounts. Would you agree to
+relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Thank you!
+
+-- 
+Marco Barisione
+
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com
+ [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 694871708620 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:14:55 +0100 (BST)
+Received: by mail-wi0-f169.google.com with SMTP id hn14so746100wib.2 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:14:55 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=x-received:date:from:to:subject:message-id:in-reply-to:references
+ :x-mailer:mime-version:content-type:content-transfer-encoding;
+ bh=aRWDQsUSxsYHiA/1BATsoHCmBILdZFqKrF4PPeZ8jCo=;
+ b=wqVv32+z/uDjohO2fo8vt9R4qUnaqepDH+0xKtnjHzDzuzCMwZs/YPHSHphLCp1jnv
+ LWhAxvPcdxKHJMmUWXECgWCE6IeSx6i/j8TPqMZaYbn+YZ77HY0kaJKMr2VM1hBmWiCg
+ o6nMtSpPBPTRAI7wajvTEPoF2T2zXv+Iliaj4zYtG66kjfLHgb42FSmd64IZJoB/2EBb
+ Ex5szRaRqHDCF2kt3G9AJFKFeSmGp5b0pIJXhvH6JVEXcD0XEVAM2vZX79wILGHVoKzr
+ oncTZ6cpoYFnqIO5UikSRW5V0TZbV2q7NMXU0s5x+W2bEYTvwQ15D56CWbwC4g8n184y Nupg==
+X-Received: by 10.194.175.1 with SMTP id bw1mr414615wjc.31.1368796493073;
+ Fri, 17 May 2013 06:14:53 -0700 (PDT)
+Received: from x200.localdomain (radico-m14-2.Obninsk.ru. [195.112.105.39])
+ by mx.google.com with ESMTPSA id ff10sm9470539wib.10.2013.05.17.06.14.52
+ for <marco.barisione@collabora.co.uk> (version=SSLv3 cipher=RC4-SHA
+ bits=128/128); Fri, 17 May 2013 06:14:52 -0700 (PDT)
+Date: Fri, 17 May 2013 17:13:40 +0400
+From: Vitaly Minko <vitaly.minko@gmail.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+Message-ID: <20130517171340.2714095d@x200.localdomain>
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+References: <1368795784.5620.13.camel@carbonara>
+X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.16; x86_64-pc-linux-gnu)
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:21:44 2013
+X-DSPAM-Confidence: 0.9913
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51962ee819121758791674
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi Marco,
+
+I do agree to relicense my code to LGPL.
+
+Best regards,
+Vitaly
+
+
+On Fri, 17 May 2013 14:03:04 +0100
+Marco Barisione <marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>=20
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all
+> types of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the account creation code to a separate
+> git submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>=20
+> I'm writing you because you contributed to some Empathy files under
+> GPL that we would like to use in gnome-online-accounts. Would you
+> agree to relicense your code from GPL to LGPL (version 2.1 or later)?
+>=20
+> Thank you!
+>=20
+
+Received: from mail-oa0-f46.google.com (mail-oa0-f46.google.com
+ [209.85.219.46]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id C7B78170862E for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:18:16 +0100 (BST)
+Received: by mail-oa0-f46.google.com with SMTP id h2so5150652oag.33 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:18:15 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=x-received:mime-version:in-reply-to:references:from:date:message-id
+ :subject:to:content-type; bh=+G9jOHmG03PHqloQKMa65D5+FolmUzR6f9fM96FMbTg=;
+ b=Hanj+NlQoRX1md1Q6lkZfFsaCmIFZxGqZcRBn0HIajFZFv3Fq4vyG1rOWzFeqKRt6A
+ 68B3HbnR5y+Ele5yAN9nsMNfmRhYSE2kscuz/0aRCnRLZJr4s/Kg4l2pEyQPaVuyqJfS
+ nI/ZUJx9wgyBaQbSDT9OJl2m+P0xZQD/u07rgcAm9wjSt8p5pM8fLBWStMXypeI53kaq
+ c5FkP2yrSfZn6JTKqEas85eMvb8HOB4pD1vk59tbIEUH+QAuUdJAODw6sD4LHnHgEZB9
+ xj7orSX1I9+e84/sey3quvRwz9Zr3pWaAk6LH432AJSAYC2juYM777D9Aj6TyQHEyYl7 SFsA==
+X-Received: by 10.182.56.169 with SMTP id b9mr19255226obq.42.1368796695273;
+ Fri, 17 May 2013 06:18:15 -0700 (PDT)
+MIME-Version: 1.0
+Received: by 10.76.143.233 with HTTP; Fri, 17 May 2013 06:17:35 -0700 (PDT)
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+References: <1368795784.5620.13.camel@carbonara>
+From: Dimitris Zenios <dimitris.zenios@gmail.com>
+Date: Fri, 17 May 2013 16:17:35 +0300
+Message-ID: <CAGSzHa3yyLtxUay-1YLHkLrcX+g6ZSV2tAP4L2rQr3iDJLyG+A@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Content-Type: multipart/alternative; boundary=001a11c2ce16caaade04dce9d060
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:28:05 2013
+X-DSPAM-Confidence: 0.9913
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196306519121737816876
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--001a11c2ce16caaade04dce9d060
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Sure
+
+
+On Fri, May 17, 2013 at 4:03 PM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =93System Settings=94.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+--001a11c2ce16caaade04dce9d060
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Sure</div><div class=3D"gmail_extra"><br><br><div class=3D=
+"gmail_quote">On Fri, May 17, 2013 at 4:03 PM, Marco Barisione <span dir=3D=
+"ltr">&lt;<a href=3D"mailto:marco.barisione@collabora.co.uk" target=3D"_bla=
+nk">marco.barisione@collabora.co.uk</a>&gt;</span> wrote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =93System Settings=94.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br></div>
+
+--001a11c2ce16caaade04dce9d060--
+
+X-Greylist: delayed 2095 seconds by postgrey-1.32 at bhuna; Fri, 17 May
+ 2013 15:00:18 BST
+Received: from leucas.entrouvert.org (leucas.entrouvert.org
+ [176.31.123.109]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 8FBBE170863B for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 15:00:18 +0100 (BST)
+Received: from 213.219.168.49.adsl.dyn.edpnet.net ([213.219.168.49]
+ helo=nezt) by leucas.entrouvert.org with esmtpsa
+ (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from
+ <fpeters@0d.be>) id 1UdKew-00038N-Ld for marco.barisione@collabora.co.uk;
+ Fri, 17 May 2013 15:25:23 +0200
+Received: from fred by nezt with local (Exim 4.80) (envelope-from
+ <fpeters@0d.be>) id 1UdKeq-0001oE-Ot for marco.barisione@collabora.co.uk;
+ Fri, 17 May 2013 15:25:16 +0200
+Date: Fri, 17 May 2013 15:25:16 +0200
+From: Frederic Peters <fpeters@0d.be>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Message-ID: <20130517132516.GB6894@0d.be>
+References: <1368795784.5620.13.camel@carbonara>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+X-Operating-System: Debian GNU/Linux (jessie/sid with kernel Linux
+ 3.2.0-4-amd64)
+User-Agent: Mutt/1.5.21 (2010-09-15)
+X-SA-Exim-Connect-IP: 213.219.168.49
+X-SA-Exim-Mail-From: fpeters@0d.be
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
+ leucas.entrouvert.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.2 required=5.0 tests=ALL_TRUSTED,BAYES_00,
+ TVD_RCVD_IP autolearn=ham version=3.3.1
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+X-SA-Exim-Version: 4.2.1 (built Mon, 22 Mar 2010 06:26:47 +0000)
+X-SA-Exim-Scanned: Yes (on leucas.entrouvert.org)
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 15:13:38 2013
+X-DSPAM-Confidence: 0.5891
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51963b1219125565015966
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Marco Barisione wrote:
+
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+> 
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+I'm fine with my code at the moment in Empathy being relicensed to
+LGPL (2.1 or later).
+
+
+        Fred
+
+X-Greylist: delayed 521 seconds by postgrey-1.32 at bhuna; Fri, 17 May 2013
+ 14:39:08 BST
+Received: from ada.istique.net (istique.net [78.47.68.43]) by
+ bhuna.collabora.co.uk (Postfix) with ESMTP id D55BF170861B for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 14:39:08 +0100 (BST)
+Received: from [172.30.201.23] (unknown [91.183.36.185]) (using TLSv1 with
+ cipher AES256-SHA (256/256 bits)) (No client certificate requested)
+ (Authenticated sender: sf) by ada.istique.net (Postfix) with ESMTPSA id
+ 49330C8382 for <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 15:30:27
+ +0200 (CEST)
+Message-ID: <519630F2.1000806@istique.net>
+Date: Fri, 17 May 2013 15:30:26 +0200
+From: =?UTF-8?B?U3RldmUgRnLDqWNpbmF1eA==?= <code@istique.net>
+User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:17.0) Gecko/20130413
+ Icedove/17.0.5
+MIME-Version: 1.0
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+References: <1368795784.5620.13.camel@carbonara>
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 8bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:41:14 2013
+X-DSPAM-Confidence: 0.5887
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5196337a19122033117475
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hello,
+
+I have no objection with that, my contribution was rather trivial anyway...
+
+Regards,
+Steve
+
+On 05/17/2013 03:03 PM, Marco Barisione wrote:
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+
+Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by
+ bhuna.collabora.co.uk (Postfix) with ESMTP id C730C170861F for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 14:14:53 +0100 (BST)
+Received: from fennas.vuntz.net (unknown [88.185.152.219]) by
+ smtp3-g21.free.fr (Postfix) with ESMTP id A70B7A62F3 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 15:14:45 +0200 (CEST)
+Received: by fennas.vuntz.net (Postfix, from userid 1000) id 4EEAD158D5C;
+ Fri, 17 May 2013 15:14:44 +0200 (CEST)
+Date: Fri, 17 May 2013 15:14:44 +0200
+From: Vincent Untz <vuntz@gnome.org>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+Message-ID: <20130517131444.GU2971@vuntz.net>
+References: <1368795784.5620.13.camel@carbonara>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+User-Agent: Mutt/1.5.20 (2009-06-14)
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:20:46 2013
+X-DSPAM-Confidence: 0.9904
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51962eae19127181415510
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Le vendredi 17 mai 2013, à 14:03 +0100, Marco Barisione a écrit :
+> Hi all,
+> 
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+> 
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Do you have the details of my code contributions? I might have to ask
+SUSE if that was done for work.
+
+But otherwise, sure, no problem.
+
+Vincent
+
+-- 
+Les gens heureux ne sont pas pressés.
+
+Message-ID: <1368798281.5620.22.camel@carbonara>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Vincent Untz <vuntz@gnome.org>
+Date: Fri, 17 May 2013 14:44:41 +0100
+In-Reply-To: <20130517131444.GU2971@vuntz.net>
+References: <1368795784.5620.13.camel@carbonara>
+         <20130517131444.GU2971@vuntz.net>
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.6.3-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On Fri, 2013-05-17 at 15:14 +0200, Vincent Untz wrote:
+> Do you have the details of my code contributions? I might have to ask
+> SUSE if that was done for work.
+
+It's just the patch for this bug:
+https://bugzilla.gnome.org/show_bug.cgi?id=522862
+
+-- 
+Marco Barisione
+
+Received: from smtp3-g21.free.fr (smtp3-g21.free.fr [212.27.42.3]) by
+ bhuna.collabora.co.uk (Postfix) with ESMTP id 875D91708614 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 15:10:37 +0100 (BST)
+Received: from fennas.vuntz.net (unknown [88.185.152.219]) by
+ smtp3-g21.free.fr (Postfix) with ESMTP id 71815A62AD for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 16:10:33 +0200 (CEST)
+Received: by fennas.vuntz.net (Postfix, from userid 1000) id 08488158D5C;
+ Fri, 17 May 2013 16:10:32 +0200 (CEST)
+Date: Fri, 17 May 2013 16:10:32 +0200
+From: Vincent Untz <vuntz@gnome.org>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+Message-ID: <20130517141031.GW2971@vuntz.net>
+References: <1368795784.5620.13.camel@carbonara>
+         <20130517131444.GU2971@vuntz.net> <1368798281.5620.22.camel@carbonara>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso-8859-1
+Content-Disposition: inline
+Content-Transfer-Encoding: 8bit
+In-Reply-To: <1368798281.5620.22.camel@carbonara>
+User-Agent: Mutt/1.5.20 (2009-06-14)
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 15:29:44 2013
+X-DSPAM-Confidence: 0.9917
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51963ed819125606879423
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Le vendredi 17 mai 2013, 14:44 +0100, Marco Barisione a crit :
+> On Fri, 2013-05-17 at 15:14 +0200, Vincent Untz wrote:
+> > Do you have the details of my code contributions? I might have to ask
+> > SUSE if that was done for work.
+> 
+> It's just the patch for this bug:
+> https://bugzilla.gnome.org/show_bug.cgi?id=522862
+
+That's trivial code, and it was written during the night, so yeah, no
+need to annoy SUSE for that. Go ahead!
+
+Vicnent
+
+-- 
+Les gens heureux ne sont pas presss.
+
+X-Greylist: delayed 1542 seconds by postgrey-1.32 at bhuna; Fri, 17 May
+ 2013 18:47:18 BST
+Received: from smtprelay-b21.telenor.se (smtprelay-b21.telenor.se
+ [195.54.99.212]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
+ (No client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id C9B1316986FD for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 18:47:18 +0100 (BST)
+Received: from ipb2.telenor.se (ipb2.telenor.se [195.54.127.165]) by
+ smtprelay-b21.telenor.se (Postfix) with ESMTP id 55E7714DAC for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 19:21:34 +0200 (CEST)
+X-SENDER-IP: [85.225.139.89]
+X-LISTENER: [smtp.bredband.net]
+X-IronPort-Anti-Spam-Filtered: true
+X-IronPort-Anti-Spam-Result:
+ AuhgACtmllFV4YtZPGdsb2JhbABagwiDa4Q6uVUEfhcDAQEBATg1gh8BAQUjMzMLGAkMBw4CAg8FGQwDBxoKiBmrR5F1jgSBLoI3MmEDlzcBlFE6
+X-IronPort-AV: E=Sophos;i="4.87,694,1363129200"; 
+ d="asc'?scan'208";a="550322390"
+Received: from c-598be155.447-1-64736c11.cust.bredbandsbolaget.se (HELO
+ amd64.fatal.se) ([85.225.139.89]) by ipb2.telenor.se with ESMTP; 17 May
+ 2013 19:21:34 +0200
+Received: from gem by amd64.fatal.se with local (Exim 4.80) (envelope-from
+ <gem@amd64.fatal.se>) id 1UdOJm-0007Kf-R5 for
+ marco.barisione@collabora.co.uk; Fri, 17 May 2013 19:19:46 +0200
+Date: Fri, 17 May 2013 19:19:46 +0200
+From: Andreas Henriksson <andreas@fatal.se>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+Message-ID: <20130517171946.GA28153@amd64.fatal.se>
+References: <1368795784.5620.13.camel@carbonara>
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="x+6KMIRAuhnl3hBn"
+Content-Disposition: inline
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+User-Agent: Mutt/1.5.21 (2010-09-15)
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 18:48:16 2013
+X-DSPAM-Confidence: 0.6152
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51966d6019124891196261
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--x+6KMIRAuhnl3hBn
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+Hello Marco!
+
+I'm not aware of having contributed anything significantly, so
+please treat anything associated with my name as something that
+I'm not going to claim any copyright on.
+
+You're free to relicense it however you wish and even consider
+it non-copyrightable or any copyright transfered to you or other
+project leaders.
+
+
+On Fri, May 17, 2013 at 02:03:04PM +0100, Marco Barisione wrote:
+> Hi all,
+>=20
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>=20
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>=20
+> Thank you!
+>=20
+> --=20
+> Marco Barisione
+>=20
+
+--=20
+Andreas Henriksson
+
+--x+6KMIRAuhnl3hBn
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: Digital signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEARECAAYFAlGWZrIACgkQcgQ2cL3l8e6IhQCeJ9v0KwG/SDiVPo5u05esf97N
+rMIAoNzXzjx5FWdbyBMHyDJK6H9kjfeH
+=4qwN
+-----END PGP SIGNATURE-----
+
+--x+6KMIRAuhnl3hBn--
+
+Received: from mail-oa0-f51.google.com (mail-oa0-f51.google.com
+ [209.85.219.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id CC8641708623 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:31:10 +0100 (BST)
+Received: by mail-oa0-f51.google.com with SMTP id f4so5140833oah.38 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:31:09 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=x-received:mime-version:in-reply-to:references:from:date:message-id
+ :subject:to:cc:content-type;
+ bh=KKQ7aqzBDUHN8P0GuI3/OlxaMIKdsj0zEnMJQYIePds=;
+ b=vxUw8zZG8TuyxI8LVV9aBtbNfCjJYPM3mH8fH5LX1Cu54+Doh/LMiLpovPRNN5VugI
+ 5UCfjOMGxAIs9elOvkpu7s2rQkgfE34KxHcpb67dqm0iZjiY9+IleNZ3hGoX1QzhO4su
+ RQ2942CTg0g8O+0oL8Z7wGQjN40a9R3WxzYH7bHpwzUVnCSRY2qZSd9GZ+uGYRu7Nj1V
+ IBuDHAuaCQhK3gr7so3kjg2iTppsfZMsobBKTjIKd2P5q1Zp5tjPVQkzL8Cm/Xj9pe4y
+ N2OK5U24ztzjWXFmCY0JKrK2lLTW5mPy6rU1dE+Dzy7s15jCd0HK/ah2x5X4A0jWAMjz zYvQ==
+X-Received: by 10.60.56.234 with SMTP id d10mr148020oeq.29.1368797469651;
+ Fri, 17 May 2013 06:31:09 -0700 (PDT)
+MIME-Version: 1.0
+Received: by 10.182.164.72 with HTTP; Fri, 17 May 2013 06:30:49 -0700 (PDT)
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+References: <1368795784.5620.13.camel@carbonara>
+From: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>
+Date: Fri, 17 May 2013 15:30:49 +0200
+Message-ID: <CAJ4DpxZjh75DrLi-=LvUb3Md8dAD4hmFV=v9-6Q5RDJatsXbrA@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Chandni Verma <chandniverma2112@gmail.com>, Cyril Roelandt
+ <tipecaml@gmail.com>,  Dimitris Zenios <dimitris.zenios@gmail.com>,
+ Jonathan Tellier <jonathan.tellier@gmail.com>,  Marc Plano-Lesay
+ <marc.planolesay@gmail.com>, Vitaly Minko <vitaly.minko@gmail.com>, 
+ Frederic Peters <fpeters@0d.be>, Andreas Henriksson <andreas@fatal.se>,
+ Vincent Untz <vuntz@gnome.org>,  Baptiste Mille-Mathias
+ <baptistem@gnome.org>, Susana Pereira <susana.pereira@gmail.com>, 
+ =?UTF-8?Q?Steve_Fr=C3=A9cinaux?= <code@istique.net>
+Content-Type: multipart/alternative; boundary=089e0153863cf2baf004dce9fe18
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 14:34:36 2013
+X-DSPAM-Confidence: 0.9913
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,519631ec19121166520974
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--089e0153863cf2baf004dce9fe18
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Hi Marco,
+
+whatever I wrote you can re-licence my code.
+
+Regards
+
+
+On Fri, May 17, 2013 at 3:03 PM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+
+--=20
+Baptiste Mille-Mathias
+Les gens heureux ne sont pas press=C3=A9s
+[w] http://damnpeople.fr
+
+--089e0153863cf2baf004dce9fe18
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div><div>Hi Marco,<br><br></div>whatever I wrote you can =
+re-licence my code.<br><br></div>Regards<br></div><div class=3D"gmail_extra=
+"><br><br><div class=3D"gmail_quote">On Fri, May 17, 2013 at 3:03 PM, Marco=
+ Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco.barisione@collabor=
+a.co.uk" target=3D"_blank">marco.barisione@collabora.co.uk</a>&gt;</span> w=
+rote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br><br clear=3D"all"><br>-- <br>Baptiste =
+Mille-Mathias<br>Les gens heureux ne sont pas press=C3=A9s<br>[w] <a href=
+=3D"http://damnpeople.fr" target=3D"_blank">http://damnpeople.fr</a>
+</div>
+
+--089e0153863cf2baf004dce9fe18--
+
+Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com
+ [209.85.212.176]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id A4AB81708639 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 14:59:48 +0100 (BST)
+Received: by mail-wi0-f176.google.com with SMTP id hr14so485432wib.9 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 06:59:47 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=x-received:content-type:mime-version:content-transfer-encoding
+ :x-mailer:message-id:date:subject:from:in-reply-to:references:to:cc;
+ bh=8FzL3su1ZIjRxmDpp6gzKS47sMFXSHQsaBuVlQ8XLZU=;
+ b=U5BViHNCnfnNz3i+N2p8L2z0u1n3DuOHdxFJV3oZE3In6rOi0vUt/rhIpsqfbzrQ7q
+ B2F7wC7ERRWEezVpIp3tkkL2O+a2eiGWTmBtCLi6p1lnu9rDHS2/Paazzyj6cxsb32UC
+ oBVcFo0lnq7YFvo9rtQIhdp/zPdC/r62iWZVAb8vyyYDqCTtuauLEavHN/TDXHcVXPU8
+ zzXjG6AcOE2E7aJbxooBuNafDc19s4KHBM3Veuv49sVgr8bSvfygXOACi/jDXKtaKfOo
+ +kSA6SYiUg0lVNg3bi60Ubc2GQXN1d52Mx9RbYsKH7HUFuQZ3K9wuhmCc4Xpseg5WGPN ll+Q==
+X-Received: by 10.180.109.84 with SMTP id
+ hq20mr34435419wib.11.1368799187758; Fri, 17 May 2013 06:59:47 -0700 (PDT)
+Received: from [127.0.0.1] ([90.84.144.31]) by mx.google.com with ESMTPSA
+ id ge7sm9716160wib.6.2013.05.17.06.59.44 for <multiple recipients>
+ (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 May 2013
+ 06:59:46 -0700 (PDT)
+Content-Type: text/html; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+X-Mailer: BlackBerry Email (10.1.0.1720)
+Message-ID: <20130517135944.4722816.5389.44@gmail.com>
+Date: Fri, 17 May 2013 15:59:44 +0200
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Marc Plano-Lesay <marc.planolesay@gmail.com>
+In-Reply-To:  <CAJ4DpxZjh75DrLi-=LvUb3Md8dAD4hmFV=v9-6Q5RDJatsXbrA@mail.gmail.com>
+References: <1368795784.5620.13.camel@carbonara>
+         <CAJ4DpxZjh75DrLi-=LvUb3Md8dAD4hmFV=v9-6Q5RDJatsXbrA@mail.gmail.com>
+To: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>, Marco
+ Barisione <marco.barisione@collabora.co.uk>
+Cc: Chandni Verma <chandniverma2112@gmail.com>, Cyril Roelandt
+ <tipecaml@gmail.com>, Dimitris Zenios <dimitris.zenios@gmail.com>, Jonathan
+ Tellier <jonathan.tellier@gmail.com>, Vitaly Minko
+ <vitaly.minko@gmail.com>, Frederic Peters <fpeters@0d.be>, Andreas
+ Henriksson <andreas@fatal.se>, Vincent Untz <vuntz@gnome.org>, Baptiste
+ Mille-Mathias <baptistem@gnome.org>, Susana Pereira
+ <susana.pereira@gmail.com>, =?utf-8?q?Steve_Fr=C3=A9cinaux?=
+ <code@istique.net>
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 15:13:31 2013
+X-DSPAM-Confidence: 0.9907
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51963b0b19121947941476
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+<html><head></head><body data-blackberry-caret-color=3D"#00a8df" style=3D"b=
+ackground-color: rgb(255, 255, 255); line-height: initial;"><div id=3D"BB10=
+_response_div" style=3D"width: 100%; font-size: initial; font-family: Calib=
+ri, 'Slate Pro', sans-serif; text-align: initial; background-color: rgb(255=
+, 255, 255);"><font color=3D"#262626">Hi,</font></div><div style=3D"width: =
+100%; font-size: initial; font-family: Calibri, 'Slate Pro', sans-serif; te=
+xt-align: initial; background-color: rgb(255, 255, 255);"><font color=3D"#2=
+62626">There's no problem for me.</font></div><div style=3D"width: 100%; fo=
+nt-size: initial; font-family: Calibri, 'Slate Pro', sans-serif; text-align=
+: initial; background-color: rgb(255, 255, 255);"><font color=3D"#262626"><=
+br></font></div><div style=3D"width: 100%; font-size: initial; font-family:=
+ Calibri, 'Slate Pro', sans-serif; text-align: initial; background-color: r=
+gb(255, 255, 255);"><font color=3D"#262626">Regards,</font></div><div style=
+=3D"width: 100%; font-size: initial; font-family: Calibri, 'Slate Pro', san=
+s-serif; text-align: initial; background-color: rgb(255, 255, 255);"><font =
+color=3D"#262626">Marc Plano-Lesay</font></div>                            =
+                                                                           =
+                              <div id=3D"_signaturePlaceholder" style=3D"fo=
+nt-size: initial; font-family: Calibri, 'Slate Pro', sans-serif; color: rgb=
+(31, 73, 125); text-align: initial; background-color: rgb(255, 255, 255);">=
+</div>                                                                     =
+                                                                           =
+                                        <table width=3D"100%" style=3D"back=
+ground-color:white;border-spacing:0px;"> <tbody><tr><td id=3D"_persistentHe=
+aderContainer" colspan=3D"2" style=3D"font-size: initial; text-align: initi=
+al; background-color: rgb(255, 255, 255);">                                =
+              <div id=3D"_persistentHeader" style=3D"border-style: solid no=
+ne none; border-top-color: rgb(181, 196, 223); border-top-width: 1pt; paddi=
+ng: 3pt 0in 0in; font-family: Tahoma, 'BB Alpha Sans', 'Slate Pro'; font-si=
+ze: 10pt;">  <div><b>De: </b>Baptiste Mille-Mathias</div><div><b>Envoy=C3=
+=A9: </b>vendredi 17 mai 2013 15:31</div><div><b>=C3=80: </b>Marco Barision=
+e</div><div><b>Cc: </b>Chandni Verma; Cyril Roelandt; Dimitris Zenios; Jona=
+than Tellier; Marc Plano-Lesay; Vitaly Minko; Frederic Peters; Andreas Henr=
+iksson; Vincent Untz; Baptiste Mille-Mathias; Susana Pereira; Steve Fr=C3=
+=A9cinaux</div><div><b>Objet: </b>Re: Relicensing some Empathy code from GP=
+L to LGPL</div></div></td></tr></tbody></table><div id=3D"_persistentHeader=
+End" style=3D"border-style: solid none none; border-top-color: rgb(186, 188=
+, 209); border-top-width: 1pt; font-size: initial; text-align: initial; bac=
+kground-color: rgb(255, 255, 255);"></div><br><div id=3D"_originalContent" =
+style=3D""><div dir=3D"ltr"><div><div>Hi Marco,<br><br></div>whatever I wro=
+te you can re-licence my code.<br><br></div>Regards<br></div><div class=3D"=
+gmail_extra"><br><br><div class=3D"gmail_quote">On Fri, May 17, 2013 at 3:0=
+3 PM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco.barisio=
+ne@collabora.co.uk" target=3D"_blank">marco.barisione@collabora.co.uk</a>&g=
+t;</span> wrote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I'm currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br>
+of accounts directly in the =E2=80=9CSystem Settings=E2=80=9D.<br>
+To do so, I need to move all the account creation code to a separate git<br>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I'm writing you because you contributed to some Empathy files under GPL<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br><br clear=3D"all"><br>-- <br>Baptiste =
+Mille-Mathias<br>Les gens heureux ne sont pas press=C3=A9s<br>[w] <a href=
+=3D"http://damnpeople.fr" target=3D"_blank">http://damnpeople.fr</a>
+</div>
+<br><!--end of _originalContent --></div></body></html>
+
+Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com
+ [209.85.220.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id C1B431708652 for <marco.barisione@collabora.co.uk>; Fri, 17 May
+ 2013 15:05:31 +0100 (BST)
+Received: by mail-pa0-f53.google.com with SMTP id kq12so3566860pab.26 for
+ <marco.barisione@collabora.co.uk>; Fri, 17 May 2013 07:05:30 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:x-received:in-reply-to:references:date:message-id
+ :subject:from:to:cc:content-type;
+ bh=K+JhZV+B/IdtWlTZmgfYGHM20j19noSm3jciITxdFms=;
+ b=gpcpJpyxzMT3Aq8b9kLEqtRG549wq4cUFmieJ3tU3DyLkiXP8ZjXG2iGdicKvQPHRS
+ OQQv2ja6reR2RCXcpPK8O0fRYVZLsweZ5pJyx2NUtvc5UdV5U7/DVcyXHyzdybx/H2dA
+ LeM+Yk9Eg3hxLFhHFmTipS3sriHuAN3f8MDxG7iUonr0pdSGUM7OVazK19uVbU4kvXpn
+ PWUaz8iihoJWIG65Ewz6Cth6a+8L5h72XusJI01obqwUPccnNrEMb5F1xlocu1YukWqF
+ Udq9VGj4JJJ1JsZ31WuVmAuv+GPZM/ipaOyvscCHx0+SiV2hoej7ertwslQDybl8DCef Fbyw==
+MIME-Version: 1.0
+X-Received: by 10.66.19.234 with SMTP id
+ i10mr49262400pae.152.1368799530319; Fri, 17 May 2013 07:05:30 -0700 (PDT)
+Received: by 10.70.16.67 with HTTP; Fri, 17 May 2013 07:05:30 -0700 (PDT)
+In-Reply-To: <20130517135944.4722816.5389.44@gmail.com>
+References: <1368795784.5620.13.camel@carbonara>
+         <CAJ4DpxZjh75DrLi-=LvUb3Md8dAD4hmFV=v9-6Q5RDJatsXbrA@mail.gmail.com>
+         <20130517135944.4722816.5389.44@gmail.com>
+Date: Fri, 17 May 2013 10:05:30 -0400
+Message-ID: <CAFUYb-tVWjcUOcwZ0HwHA1mDY6sNZnYGuDc=fpGOSVearEDAbg@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Jonathan Tellier <jonathan.tellier@gmail.com>
+To: Marc Plano-Lesay <marc.planolesay@gmail.com>
+Cc: Baptiste Mille-Mathias <baptiste.millemathias@gmail.com>,  Marco
+ Barisione <marco.barisione@collabora.co.uk>,  Chandni Verma
+ <chandniverma2112@gmail.com>, Cyril Roelandt <tipecaml@gmail.com>, 
+ Dimitris Zenios <dimitris.zenios@gmail.com>, Vitaly Minko
+ <vitaly.minko@gmail.com>,  Frederic Peters <fpeters@0d.be>, Andreas
+ Henriksson <andreas@fatal.se>, Vincent Untz <vuntz@gnome.org>,  Baptiste
+ Mille-Mathias <baptistem@gnome.org>, Susana Pereira
+ <susana.pereira@gmail.com>,  =?ISO-8859-1?Q?Steve_Fr=E9cinaux?=
+ <code@istique.net>
+Content-Type: multipart/alternative; boundary=bcaec520f501c6096204dcea79e1
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 17 15:23:15 2013
+X-DSPAM-Confidence: 0.9923
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51963d5219127642219882
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--bcaec520f501c6096204dcea79e1
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Hi,
+That's fine with me.
+
+Regards,
+Jonathan
+
+
+On Fri, May 17, 2013 at 9:59 AM, Marc Plano-Lesay <marc.planolesay@gmail.co=
+m
+> wrote:
+
+> Hi,
+> There's no problem for me.
+>
+> Regards,
+> Marc Plano-Lesay
+>   *De: *Baptiste Mille-Mathias
+> *Envoy=E9: *vendredi 17 mai 2013 15:31
+> *=C0: *Marco Barisione
+> *Cc: *Chandni Verma; Cyril Roelandt; Dimitris Zenios; Jonathan Tellier;
+> Marc Plano-Lesay; Vitaly Minko; Frederic Peters; Andreas Henriksson;
+> Vincent Untz; Baptiste Mille-Mathias; Susana Pereira; Steve Fr=E9cinaux
+> *Objet: *Re: Relicensing some Empathy code from GPL to LGPL
+>
+> Hi Marco,
+>
+> whatever I wrote you can re-licence my code.
+>
+> Regards
+>
+>
+> On Fri, May 17, 2013 at 3:03 PM, Marco Barisione <
+> marco.barisione@collabora.co.uk> wrote:
+>
+>> Hi all,
+>>
+>> I'm currently working on integrating IM account creation with
+>> gnome-online-accounts. This would allow a Gnome user to create all types
+>> of accounts directly in the =93System Settings=94.
+>> To do so, I need to move all the account creation code to a separate git
+>> submodule that can be used by gnome-online-accounts.
+>> The problem is that gnome-online-accounts is under LGPL, while Empathy
+>> contains some files under GPL and some files under LGPL.
+>>
+>> I'm writing you because you contributed to some Empathy files under GPL
+>> that we would like to use in gnome-online-accounts. Would you agree to
+>> relicense your code from GPL to LGPL (version 2.1 or later)?
+>>
+>> Thank you!
+>>
+>> --
+>> Marco Barisione
+>>
+>>
+>
+>
+> --
+> Baptiste Mille-Mathias
+> Les gens heureux ne sont pas press=E9s
+> [w] http://damnpeople.fr
+>
+>
+
+--bcaec520f501c6096204dcea79e1
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div><div><div>Hi,<br></div>That&#39;s fine with me.<br><b=
+r></div>Regards,<br></div>Jonathan<br></div><div class=3D"gmail_extra"><br>=
+<br><div class=3D"gmail_quote">On Fri, May 17, 2013 at 9:59 AM, Marc Plano-=
+Lesay <span dir=3D"ltr">&lt;<a href=3D"mailto:marc.planolesay@gmail.com" ta=
+rget=3D"_blank">marc.planolesay@gmail.com</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex"><div style=3D"line-height:initial"><div styl=
+e=3D"text-align:initial;font-size:initial;width:100%;font-family:Calibri,&#=
+39;Slate Pro&#39;,sans-serif">
+<font color=3D"#262626">Hi,</font></div><div style=3D"text-align:initial;fo=
+nt-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39;,sans-ser=
+if"><font color=3D"#262626">There&#39;s no problem for me.</font></div><div=
+ style=3D"text-align:initial;font-size:initial;width:100%;font-family:Calib=
+ri,&#39;Slate Pro&#39;,sans-serif">
+<font color=3D"#262626"><br></font></div><div style=3D"text-align:initial;f=
+ont-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39;,sans-se=
+rif"><font color=3D"#262626">Regards,</font></div><div style=3D"text-align:=
+initial;font-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39=
+;,sans-serif">
+<font color=3D"#262626">Marc Plano-Lesay</font></div>                      =
+                                                                           =
+                                    <div style=3D"text-align:initial;color:=
+rgb(31,73,125);font-size:initial;font-family:Calibri,&#39;Slate Pro&#39;,sa=
+ns-serif">
+</div>                                                                     =
+                                                                           =
+                                        <table style=3D"border-spacing:0px"=
+ width=3D"100%">
+ <tbody><tr><td colspan=3D"2" style=3D"text-align:initial;font-size:initial=
+">                                              <div style=3D"border-style:=
+solid none none;border-top-color:rgb(181,196,223);border-top-width:1pt;padd=
+ing:3pt 0in 0in;font-family:Tahoma,&#39;BB Alpha Sans&#39;,&#39;Slate Pro&#=
+39;;font-size:10pt">
+  <div><b>De: </b>Baptiste Mille-Mathias</div><div><b>Envoy=E9: </b>vendred=
+i 17 mai 2013 15:31</div><div><b>=C0: </b>Marco Barisione</div><div><b>Cc: =
+</b>Chandni Verma; Cyril Roelandt; Dimitris Zenios; Jonathan Tellier; Marc =
+Plano-Lesay; Vitaly Minko; Frederic Peters; Andreas Henriksson; Vincent Unt=
+z; Baptiste Mille-Mathias; Susana Pereira; Steve Fr=E9cinaux</div>
+<div><b>Objet: </b>Re: Relicensing some Empathy code from GPL to LGPL</div>=
+</div></td></tr></tbody></table><div><div class=3D"h5"><div style=3D"border=
+-top-color:rgb(186,188,209);text-align:initial;font-size:initial;border-sty=
+le:solid none none;border-top-width:1pt">
+</div><br><div><div dir=3D"ltr"><div><div>Hi Marco,<br><br></div>whatever I=
+ wrote you can re-licence my code.<br><br></div>Regards<br></div><div class=
+=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Fri, May 17, 2013 at=
+ 3:03 PM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco.bar=
+isione@collabora.co.uk" target=3D"_blank">marco.barisione@collabora.co.uk</=
+a>&gt;</span> wrote:<br>
+
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =93System Settings=94.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br><br clear=3D"all"><br>-- <br>Baptiste =
+Mille-Mathias<br>Les gens heureux ne sont pas press=E9s<br>[w] <a href=3D"h=
+ttp://damnpeople.fr" target=3D"_blank">http://damnpeople.fr</a>
+</div>
+<br></div></div></div></div>
+</blockquote></div><br></div>
+
+--bcaec520f501c6096204dcea79e1--
+
+Received: from mail-we0-f170.google.com (mail-we0-f170.google.com
+ [74.125.82.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 3F66516985EF for <marco.barisione@collabora.co.uk>; Sat, 18 May
+ 2013 09:48:13 +0100 (BST)
+Received: by mail-we0-f170.google.com with SMTP id u54so4253689wes.1 for
+ <marco.barisione@collabora.co.uk>; Sat, 18 May 2013 01:48:12 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:in-reply-to:references:date:message-id:subject:from:to
+ :cc:content-type; bh=6BwKYeFFjzca0GcyPQVAgH+l5ASHw+LRNKCf7C9qjRA=;
+ b=ZLfpwnbfGwmWTCSgIvxpLKwwjoBXhM2HtxJQt5zurpgK6ewAXr5UUasgZGlMnMOrf/
+ pt/d1nJjjWnMKenbI+52NRIxHb80qSLe5bEdkrHXwISDLRQPq8sbUaocQhNHx4MthEAw
+ GV2dp7ZKfeLPNlPRnK6fWufc1qLMAtQzi8oLo5gUnWA8vhejHOF242KLhfeGnjUmnT58
+ DJEY8F/laGLNIab1odQ9usADvNKnftzwRNiwZG3k2roLxU1iHYyTbpSgkCOLnyME6EN9
+ hY/TqpksVjlzYv5grbb/X2kzi+h7hDPF6LkWJzWJ1ZckvGH4fsyuOgT/10rtznWfzjph hlLw==
+MIME-Version: 1.0
+X-Received: by 10.180.9.238 with SMTP id d14mr1357980wib.18.1368866892811;
+ Sat, 18 May 2013 01:48:12 -0700 (PDT)
+Received: by 10.227.192.72 with HTTP; Sat, 18 May 2013 01:48:12 -0700 (PDT)
+In-Reply-To: <CAFUYb-tVWjcUOcwZ0HwHA1mDY6sNZnYGuDc=fpGOSVearEDAbg@mail.gmail.com>
+References: <1368795784.5620.13.camel@carbonara>
+         <CAJ4DpxZjh75DrLi-=LvUb3Md8dAD4hmFV=v9-6Q5RDJatsXbrA@mail.gmail.com>
+         <20130517135944.4722816.5389.44@gmail.com>
+         <CAFUYb-tVWjcUOcwZ0HwHA1mDY6sNZnYGuDc=fpGOSVearEDAbg@mail.gmail.com>
+Date: Sat, 18 May 2013 14:18:12 +0530
+Message-ID: <CADttZZrH0nhL0=gcgM7N-z43ntnbd+f4RqrSQp7s+GXuHkvnvw@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Chandni Verma <chandniverma2112@gmail.com>
+To: Jonathan Tellier <jonathan.tellier@gmail.com>
+Cc: Marc Plano-Lesay <marc.planolesay@gmail.com>,  Baptiste Mille-Mathias
+ <baptiste.millemathias@gmail.com>,  Marco Barisione
+ <marco.barisione@collabora.co.uk>, Cyril Roelandt <tipecaml@gmail.com>, 
+ Dimitris Zenios <dimitris.zenios@gmail.com>, Vitaly Minko
+ <vitaly.minko@gmail.com>,  Frederic Peters <fpeters@0d.be>, Andreas
+ Henriksson <andreas@fatal.se>, Vincent Untz <vuntz@gnome.org>,  Baptiste
+ Mille-Mathias <baptistem@gnome.org>, Susana Pereira
+ <susana.pereira@gmail.com>,  =?ISO-8859-1?Q?Steve_Fr=E9cinaux?=
+ <code@istique.net>
+Content-Type: multipart/alternative; boundary=001a11c2b15ee413ce04dcfa280a
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Sat May 18 09:48:16 2013
+X-DSPAM-Confidence: 0.9928
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,5197405019121329410518
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--001a11c2b15ee413ce04dcfa280a
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Yes, feel free to re-licence my code to LGPL
+
+
+On 17 May 2013 19:35, Jonathan Tellier <jonathan.tellier@gmail.com> wrote:
+
+> Hi,
+> That's fine with me.
+>
+> Regards,
+> Jonathan
+>
+>
+> On Fri, May 17, 2013 at 9:59 AM, Marc Plano-Lesay <
+> marc.planolesay@gmail.com> wrote:
+>
+>> Hi,
+>> There's no problem for me.
+>>
+>> Regards,
+>> Marc Plano-Lesay
+>>    *De: *Baptiste Mille-Mathias
+>> *Envoy=E9: *vendredi 17 mai 2013 15:31
+>> *=C0: *Marco Barisione
+>> *Cc: *Chandni Verma; Cyril Roelandt; Dimitris Zenios; Jonathan Tellier;
+>> Marc Plano-Lesay; Vitaly Minko; Frederic Peters; Andreas Henriksson;
+>> Vincent Untz; Baptiste Mille-Mathias; Susana Pereira; Steve Fr=E9cinaux
+>> *Objet: *Re: Relicensing some Empathy code from GPL to LGPL
+>>
+>> Hi Marco,
+>>
+>> whatever I wrote you can re-licence my code.
+>>
+>> Regards
+>>
+>>
+>> On Fri, May 17, 2013 at 3:03 PM, Marco Barisione <
+>> marco.barisione@collabora.co.uk> wrote:
+>>
+>>> Hi all,
+>>>
+>>> I'm currently working on integrating IM account creation with
+>>> gnome-online-accounts. This would allow a Gnome user to create all type=
+s
+>>> of accounts directly in the =93System Settings=94.
+>>> To do so, I need to move all the account creation code to a separate gi=
+t
+>>> submodule that can be used by gnome-online-accounts.
+>>> The problem is that gnome-online-accounts is under LGPL, while Empathy
+>>> contains some files under GPL and some files under LGPL.
+>>>
+>>> I'm writing you because you contributed to some Empathy files under GPL
+>>> that we would like to use in gnome-online-accounts. Would you agree to
+>>> relicense your code from GPL to LGPL (version 2.1 or later)?
+>>>
+>>> Thank you!
+>>>
+>>> --
+>>> Marco Barisione
+>>>
+>>>
+>>
+>>
+>> --
+>> Baptiste Mille-Mathias
+>> Les gens heureux ne sont pas press=E9s
+>> [w] http://damnpeople.fr
+>>
+>>
+>
+
+
+--=20
+Chandni
+
+--001a11c2b15ee413ce04dcfa280a
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Yes, feel free to re-licence my code to LGPL<br></div><div=
+ class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On 17 May 2013 19=
+:35, Jonathan Tellier <span dir=3D"ltr">&lt;<a href=3D"mailto:jonathan.tell=
+ier@gmail.com" target=3D"_blank">jonathan.tellier@gmail.com</a>&gt;</span> =
+wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex"><div dir=3D"ltr"><div><div><div>Hi,<br></div=
+>That&#39;s fine with me.<br><br></div>Regards,<br></div>Jonathan<br></div>=
+<div class=3D"HOEnZb">
+<div class=3D"h5"><div class=3D"gmail_extra"><br><br><div class=3D"gmail_qu=
+ote">On Fri, May 17, 2013 at 9:59 AM, Marc Plano-Lesay <span dir=3D"ltr">&l=
+t;<a href=3D"mailto:marc.planolesay@gmail.com" target=3D"_blank">marc.plano=
+lesay@gmail.com</a>&gt;</span> wrote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex"><div style=3D"line-height:initial"><div styl=
+e=3D"text-align:initial;font-size:initial;width:100%;font-family:Calibri,&#=
+39;Slate Pro&#39;,sans-serif">
+
+<font color=3D"#262626">Hi,</font></div><div style=3D"text-align:initial;fo=
+nt-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39;,sans-ser=
+if"><font color=3D"#262626">There&#39;s no problem for me.</font></div><div=
+ style=3D"text-align:initial;font-size:initial;width:100%;font-family:Calib=
+ri,&#39;Slate Pro&#39;,sans-serif">
+
+<font color=3D"#262626"><br></font></div><div style=3D"text-align:initial;f=
+ont-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39;,sans-se=
+rif"><font color=3D"#262626">Regards,</font></div><div style=3D"text-align:=
+initial;font-size:initial;width:100%;font-family:Calibri,&#39;Slate Pro&#39=
+;,sans-serif">
+
+<font color=3D"#262626">Marc Plano-Lesay</font></div>                      =
+                                                                           =
+                                    <div style=3D"text-align:initial;color:=
+rgb(31,73,125);font-size:initial;font-family:Calibri,&#39;Slate Pro&#39;,sa=
+ns-serif">
+
+</div>                                                                     =
+                                                                           =
+                                        <table style=3D"border-spacing:0px"=
+ width=3D"100%">
+
+ <tbody><tr><td colspan=3D"2" style=3D"text-align:initial;font-size:initial=
+">                                              <div style=3D"border-style:=
+solid none none;border-top-color:rgb(181,196,223);border-top-width:1pt;padd=
+ing:3pt 0in 0in;font-family:Tahoma,&#39;BB Alpha Sans&#39;,&#39;Slate Pro&#=
+39;;font-size:10pt">
+
+  <div><b>De: </b>Baptiste Mille-Mathias</div><div><b>Envoy=E9: </b>vendred=
+i 17 mai 2013 15:31</div><div><b>=C0: </b>Marco Barisione</div><div><b>Cc: =
+</b>Chandni Verma; Cyril Roelandt; Dimitris Zenios; Jonathan Tellier; Marc =
+Plano-Lesay; Vitaly Minko; Frederic Peters; Andreas Henriksson; Vincent Unt=
+z; Baptiste Mille-Mathias; Susana Pereira; Steve Fr=E9cinaux</div>
+
+<div><b>Objet: </b>Re: Relicensing some Empathy code from GPL to LGPL</div>=
+</div></td></tr></tbody></table><div><div><div style=3D"border-top-color:rg=
+b(186,188,209);text-align:initial;font-size:initial;border-style:solid none=
+ none;border-top-width:1pt">
+
+</div><br><div><div dir=3D"ltr"><div><div>Hi Marco,<br><br></div>whatever I=
+ wrote you can re-licence my code.<br><br></div>Regards<br></div><div class=
+=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Fri, May 17, 2013 at=
+ 3:03 PM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco.bar=
+isione@collabora.co.uk" target=3D"_blank">marco.barisione@collabora.co.uk</=
+a>&gt;</span> wrote:<br>
+
+
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =93System Settings=94.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br><br clear=3D"all"><br>-- <br>Baptiste =
+Mille-Mathias<br>Les gens heureux ne sont pas press=E9s<br>[w] <a href=3D"h=
+ttp://damnpeople.fr" target=3D"_blank">http://damnpeople.fr</a>
+</div>
+<br></div></div></div></div>
+</blockquote></div><br></div>
+</div></div></blockquote></div><br><br clear=3D"all"><br>-- <br>Chandni
+</div>
+
+--001a11c2b15ee413ce04dcfa280a--
+
+Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com
+ [209.85.217.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 820591698704 for <marco.barisione@collabora.co.uk>; Mon, 20 May
+ 2013 14:47:01 +0100 (BST)
+Received: by mail-lb0-f172.google.com with SMTP id p10so1735952lbi.3 for
+ <marco.barisione@collabora.co.uk>; Mon, 20 May 2013 06:47:00 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:x-received:in-reply-to:references:date:message-id
+ :subject:from:to:cc:content-type;
+ bh=7vS2FVrTMxkQf+kfdiwSW3mutwSFmKvx96nohUKRPcc=;
+ b=VqvdJCd7cPfUIkgrYkXk9JNUKnRt70aqctsnBzLVjvgnNkfC0WQxvcFo8nLl8aLUxr
+ 3eA73jj4Mt/Qod88TDx0y4sMeQqWMcuV3+gt/4oookidzlwtN2SoZ+CE1nHpfPEaGkUM
+ SRfxKZ2keLhRCsekviBbKXjpl/fpRqV7SyXa359yoHsTERoX5VhNCNIme/SSmWbtMgbX
+ CHmniO4AllFScg+UaK5NT7XyqRTI1YxbQRQXF5NNcAuC0UcVbsc+3UQPWsirSxxHm/4v
+ NlbeyBzKvFinwJWHMb7hpc5HxPfrXKdK3OYrIAj/CUVtYE+VLGFZLTFcZnX1qa9zShl0 f+eQ==
+MIME-Version: 1.0
+X-Received: by 10.112.198.199 with SMTP id
+ je7mr9979095lbc.110.1369057620637; Mon, 20 May 2013 06:47:00 -0700 (PDT)
+Received: by 10.152.120.5 with HTTP; Mon, 20 May 2013 06:47:00 -0700 (PDT)
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+References: <1368795784.5620.13.camel@carbonara>
+Date: Mon, 20 May 2013 14:47:00 +0100
+Message-ID: <CAB0BngJwSj8FLfDWUC4X9xQ_ap2mFqm6ZF7uoY1em+KLNanSVA@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Susana Pereira <susana.pereira@gmail.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Chandni Verma <chandniverma2112@gmail.com>, Cyril Roelandt
+ <tipecaml@gmail.com>,  Dimitris Zenios <dimitris.zenios@gmail.com>,
+ Jonathan Tellier <jonathan.tellier@gmail.com>,  Marc Plano-Lesay
+ <marc.planolesay@gmail.com>, Vitaly Minko <vitaly.minko@gmail.com>, 
+ Frederic Peters <fpeters@0d.be>, Andreas Henriksson <andreas@fatal.se>,
+ Vincent Untz <vuntz@gnome.org>,  Baptiste Mille-Mathias
+ <baptistem@gnome.org>, =?ISO-8859-1?Q?Steve_Fr=E9cinaux?= <code@istique.net>
+Content-Type: multipart/alternative; boundary=001a11c2ae1827bd6104dd269181
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Mon May 20 14:47:31 2013
+X-DSPAM-Confidence: 0.9913
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,519a297319121258751312
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--001a11c2ae1827bd6104dd269181
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Hi Marco,
+
+Fine with me.
+
+Best regards,
+
+Susana Pereira
+
+
+On Fri, May 17, 2013 at 2:03 PM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the =93System Settings=94.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+--001a11c2ae1827bd6104dd269181
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div><div>Hi Marco,<br><br></div>Fine with me.<br><br></di=
+v><div>Best regards,<br></div><div><br></div>Susana Pereira<br></div><div c=
+lass=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Fri, May 17, 201=
+3 at 2:03 PM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco=
+.barisione@collabora.co.uk" target=3D"_blank">marco.barisione@collabora.co.=
+uk</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in the =93System Settings=94.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br></div>
+
+--001a11c2ae1827bd6104dd269181--
+
+Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com
+ [74.125.82.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
+ certificate requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id
+ 543AB1708659 for <marco.barisione@collabora.co.uk>; Fri, 31 May 2013
+ 22:56:38 +0100 (BST)
+Received: by mail-wg0-f44.google.com with SMTP id a12so1619225wgh.23 for
+ <marco.barisione@collabora.co.uk>; Fri, 31 May 2013 14:56:38 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=message-id:date:from:user-agent:mime-version:to:subject:references
+ :in-reply-to:content-type:content-transfer-encoding;
+ bh=iAhoGkmGfG7oxpluc6aq1/6VeTwG4dQEfY727VwXdjE=;
+ b=cDUK8eSDG6N2/B0XRx2EU/vQvs+z6n1nFEdxlB8BmOLiaizFeObYbA2tTZiLhUi+rv
+ JJA2Tf3vPjYeTuic3D4kJwBAK+ni5eW/xJbmBP1IG1qJ2NPEM/iMcjzuV15WdWTdlx+M
+ w9VY1GlINix3Hprmwt1FSBBcyeuIguXZrm8+dY38kJCAq0FiuwrGEE4SDEy4BHOA+hHq
+ 7KjBZ+CNYMHMqL7DAosyy7y+fmkMjkKafx0j1iCGuSvCmhAUDBcyk2vJ9uil1BHqqpDY
+ 2SKvqlNGukutkpk12OsIbULUkESG+wyAAxU2fsLVP0PTTZiGX175wgLwnBT9zJFYerQw btxg==
+X-Received: by 10.180.149.171 with SMTP id
+ ub11mr4970991wib.40.1370037398098; Fri, 31 May 2013 14:56:38 -0700 (PDT)
+Received: from [192.168.0.10] (tal33-3-82-233-82-24.fbx.proxad.net.
+ [82.233.82.24]) by mx.google.com with ESMTPSA id
+ fx7sm6653903wic.11.2013.05.31.14.56.35 for
+ <marco.barisione@collabora.co.uk> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA
+ bits=128/128); Fri, 31 May 2013 14:56:36 -0700 (PDT)
+Message-ID: <51A91888.8070702@gmail.com>
+Date: Fri, 31 May 2013 23:39:20 +0200
+From: Cyril Roelandt <tipecaml@gmail.com>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130116
+ Icedove/10.0.12
+MIME-Version: 1.0
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+References: <1368795784.5620.13.camel@carbonara>
+In-Reply-To: <1368795784.5620.13.camel@carbonara>
+Content-Type: text/plain; charset=UTF-8; format=flowed
+Content-Transfer-Encoding: 8bit
+X-DSPAM-Result: Innocent
+X-DSPAM-Processed: Fri May 31 22:56:39 2013
+X-DSPAM-Confidence: 0.9909
+X-DSPAM-Probability: 0.0000
+X-DSPAM-Signature: 12,51a91c9719121486025439
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On 05/17/2013 03:03 PM, Marco Barisione wrote:
+> Hi all,
+>
+
+Hello,
+
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in the “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+
+No problem. Sorry for the late answer.
+
+Cyril Roelandt.
+
+Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender:
+ bari) with ESMTPSA id 6AE1A16A8317
+Message-ID: <1375190367.24158.22.camel@carbonara>
+Subject: Relicensing some Empathy code from GPL to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Lars-Peter Clausen <lars@metafoo.de>, Milo Casagrande
+ <milo@ubuntu.com>, Philip Withnall <philip@tecnocode.co.uk>, Raluca Elena
+ Podiuc <ralucaelena1985@gmail.com>
+Date: Tue, 30 Jul 2013 14:19:27 +0100
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.2-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi all,
+
+I'm currently working on integrating IM account creation with
+gnome-online-accounts. This would allow a Gnome user to create all types
+of accounts directly in “System Settings�.
+To do so, I need to move all the account creation code to a separate git
+submodule that can be used by gnome-online-accounts.
+The problem is that gnome-online-accounts is under LGPL, while Empathy
+contains some files under GPL and some files under LGPL.
+
+I'm writing you because you contributed to some Empathy files under GPL
+that we would like to use in gnome-online-accounts. Would you agree to
+relicense your code from GPL to LGPL (version 2.1 or later)?
+
+Thank you!
+
+-- 
+Marco Barisione
+
+Received: from fox.clues.ltd.uk (fox.clues.ltd.uk [217.151.102.250]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id DD85416A8319
+ for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 15:55:21 +0100 (BST)
+Received: from smtp-out-242.synserver.de ([212.40.185.242]) by
+ fox.clues.ltd.uk with esmtp (Exim 4.72) (envelope-from <lars@metafoo.de>)
+ id 1V4BKV-00022U-0M for marco.barisione@collabora.co.uk; Tue, 30 Jul 2013
+ 15:55:21 +0100
+Received: (qmail 26250 invoked by uid 0); 30 Jul 2013 13:23:53 -0000
+X-SynServer-TrustedSrc: 1
+X-SynServer-AuthUser: lars@metafoo.de
+X-SynServer-PPID: 26062
+Received: from p4fe61db0.dip0.t-ipconnect.de (HELO ?192.168.0.176?)
+ [79.230.29.176] by 217.119.54.81 with AES256-SHA encrypted SMTP; 30 Jul
+ 2013 13:23:53 -0000
+Message-ID: <51F7BEA5.6000703@metafoo.de>
+Date: Tue, 30 Jul 2013 15:24:53 +0200
+From: Lars-Peter Clausen <lars@metafoo.de>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130704
+ Icedove/17.0.7
+MIME-Version: 1.0
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+CC: Milo Casagrande <milo@ubuntu.com>,  Philip Withnall
+ <philip@tecnocode.co.uk>, Raluca Elena Podiuc <ralucaelena1985@gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+References: <1375190367.24158.22.camel@carbonara>
+In-Reply-To: <1375190367.24158.22.camel@carbonara>
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On 07/30/2013 03:19 PM, Marco Barisione wrote:
+> Hi all,
+> 
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in “System Settings�.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+
+dejavu? Pretty sure I got a similar mail already a few years ago.
+
+> 
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+I agree.
+
+- Lars
+
+Received: from fox.clues.ltd.uk (fox.clues.ltd.uk [217.151.102.250]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id D17FB16A8319
+ for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 15:14:54 +0100 (BST)
+Received: from mail-wi0-x22c.google.com ([2a00:1450:400c:c05::22c]) by
+ fox.clues.ltd.uk with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.72)
+ (envelope-from <milo.casagrande@gmail.com>) id 1V4AhQ-0006ZY-21 for
+ marco.barisione@collabora.co.uk; Tue, 30 Jul 2013 15:14:54 +0100
+Received: by mail-wi0-f172.google.com with SMTP id hj13so2182400wib.5 for
+ <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 07:14:51 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=mime-version:sender:in-reply-to:references:from:date
+ :x-google-sender-auth:message-id:subject:to:cc:content-type;
+ bh=CCPDSdcbySwnUDjkMoluka8I04l9G3NnpUqqbuGANjY=;
+ b=dv2Si3AwG9Pccor/vD3kenqlwdI/FTHUiRml04Ie/UM3tu0ypEQL/V21I/5Ivgm4lg
+ 1pWqFeHtGeG9Y+sJwoxghpsOruta2UIlSQcFX/uIvuArLZ2EhVns0Z11ipo+TyWmLIu5
+ xqUPFgyXkHQM4ZKY+BKKNcYlGnT0NYCSI5Inv0evnXTOICfy36r0QpxDBhFAznl8vaFa
+ PHC69qWv5AOSNCcg/hhzxbpHrwH34NFcC7MWUesuk/LrFUnvLAnlNFHIOJyFEjgW3edL
+ bqUN8ZCC8EcHcMiADVTfyjoD7KnEh5Oin044KsfVo4AbBf5aN0yS3Z+XhXVsz83VwHY1 hGLQ==
+X-Received: by 10.194.219.198 with SMTP id
+ pq6mr46879282wjc.58.1375193691430; Tue, 30 Jul 2013 07:14:51 -0700 (PDT)
+MIME-Version: 1.0
+Sender: milo.casagrande@gmail.com
+Received: by 10.216.217.9 with HTTP; Tue, 30 Jul 2013 07:14:31 -0700 (PDT)
+In-Reply-To: <1375190367.24158.22.camel@carbonara>
+References: <1375190367.24158.22.camel@carbonara>
+From: Milo Casagrande <milo@ubuntu.com>
+Date: Tue, 30 Jul 2013 16:14:31 +0200
+X-Google-Sender-Auth: rz2266Lwvp6tfsGeaGMFWpTSWQg
+Message-ID: <CAN8MeYeTncjAQ2EbMGtVvMxzPT9JfYHe6ndOQj=U2ot_=31=jQ@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Lars-Peter Clausen <lars@metafoo.de>, Philip Withnall
+ <philip@tecnocode.co.uk>,  Raluca Elena Podiuc <ralucaelena1985@gmail.com>
+Content-Type: text/plain; charset=UTF-8
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hello Marco, all,
+
+On Tue, Jul 30, 2013 at 3:19 PM, Marco Barisione
+<marco.barisione@collabora.co.uk> wrote:
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+I completely agree.
+Ciao!
+
+-- 
+Milo Casagrande <milo@ubuntu.com>
+
+Received: from node0007.antibodymx.net (node0007.antibodymx.net
+ [89.238.145.165]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id A3C4716A8319 for <marco.barisione@collabora.co.uk>; Tue, 30 Jul
+ 2013 15:45:26 +0100 (BST)
+Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]) by
+ node0007.antibodymx.net with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim
+ 4.72) (envelope-from <philip.withnall@gmail.com>) id 1V4BAy-00066m-PM for
+ marco.barisione@collabora.co.uk; Tue, 30 Jul 2013 15:45:26 +0100
+Received: by mail-we0-f181.google.com with SMTP id p58so5270625wes.12 for
+ <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 07:45:24 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=sender:message-id:subject:from:reply-to:to:cc:date:in-reply-to
+ :references:content-type:x-mailer:mime-version :content-transfer-encoding;
+ bh=sWeCUAJcxKO0FZtuU0N5atLphcfAE64aly1Ay74u6jA=;
+ b=tKJuLCzo6MHkLH29lX9Lk3DQ/wqu4VXTc0dX3H+iD1Xz/g0r2iIeL4vrYXK81kyPVQ
+ egV/rDDQ5guwoKpR/xPwYmtpzgN5dS6h7IPJUGq3QxTWRxrE2P/c3NbxW7hBJgP9oXuk
+ nHIfd2Dtqo8NBSxvBnpJwCIqqVjWsGzudTl8hyGZsREgi9T47GnAyVmUsYpwTKxK6kzh
+ WNCstBQOrHGBfVVuukpuDffJZ++/EU20HyNRMgih0BUj1X1kmVcCrGFlN5ZJX1lZWZPd
+ Rxx/gEclKjKPPSUoN1pGLTK4IUXIbCXIlqNRXmuAUpHMJHIj+2sGOg81n0ehzTTjXmYV oLPw==
+X-Received: by 10.194.108.73 with SMTP id
+ hi9mr35353864wjb.85.1375194080611; Tue, 30 Jul 2013 07:21:20 -0700 (PDT)
+Received: from [10.200.137.177] (nat-pool-brq-u.redhat.com.
+ [209.132.186.35]) by mx.google.com with ESMTPSA id
+ o10sm28852906wiz.5.2013.07.30.07.21.18 for <multiple recipients>
+ (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 30 Jul 2013 07:21:19
+ -0700 (PDT)
+Sender: Philip Withnall <philip.withnall@gmail.com>
+Message-ID: <51f7cbdf.6a56b40a.4cb0.ffffb79b@mx.google.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+From: Philip Withnall <philip@tecnocode.co.uk>
+Reply-To: philip@tecnocode.co.uk
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Lars-Peter Clausen <lars@metafoo.de>, Milo Casagrande
+ <milo@ubuntu.com>, Raluca Elena Podiuc <ralucaelena1985@gmail.com>
+Date: Tue, 30 Jul 2013 16:21:17 +0200
+In-Reply-To: <1375190367.24158.22.camel@carbonara>
+References: <1375190367.24158.22.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.4 (3.8.4-1.fc19)
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On Tue, 2013-07-30 at 14:19 +0100, Marco Barisione wrote:
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+
+I agree!
+
+Philip
+
+Received: from node0008.antibodymx.net (node0008.antibodymx.net
+ [89.238.145.166]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 447FE17086F5 for <marco.barisione@collabora.co.uk>; Mon, 19 Aug
+ 2013 15:59:50 +0100 (BST)
+Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]) by
+ node0008.antibodymx.net with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim
+ 4.72) (envelope-from <ralucaelena1985@gmail.com>) id 1VBQvs-00067l-AO for
+ marco.barisione@collabora.co.uk; Mon, 19 Aug 2013 15:59:50 +0100
+Received: by mail-pa0-f45.google.com with SMTP id bg4so4677268pad.4 for
+ <marco.barisione@collabora.co.uk>; Mon, 19 Aug 2013 07:59:46 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:in-reply-to:references:from:date:message-id:subject:to
+ :cc:content-type; bh=RXd6D9OD0zKAq8jE8AOPRvPJFki5B9YbzqFMAk4orRw=;
+ b=Jb2QosLgLyVAtr7UVfMm/Fn9L9S21NwS5Q2E/UoE3CdOKLSt/dgUim8/I2FVIZ6onZ
+ 7vZIauvtnCQC2f5jwFbMdRk7XoGHUgOyBVuxONdMPia288jGcLI4xyKed9NonHv7jsd6
+ 0VMzaZl3WCJ271JRxpq5ItltKOY28tF0W2XBL7CLgXaJC+Dec7F9pz8mOz3Ya7BPsHIq
+ TENVVveYKgrwgf41NN5q96NFnf8K19ROvTynDJoFC5tVE0AW80RpsWNPykLJg1KydVGi
+ kLRen9/6CsFHxjOoZzS+F40ZH4AIjO68IiKlCoiq1entPgVfTuol6hjSMD062iVByX1h 06/Q==
+X-Received: by 10.66.25.133 with SMTP id c5mr13636565pag.4.1376924385957;
+ Mon, 19 Aug 2013 07:59:45 -0700 (PDT)
+MIME-Version: 1.0
+Received: by 10.70.12.2 with HTTP; Mon, 19 Aug 2013 07:59:25 -0700 (PDT)
+In-Reply-To: <1375190367.24158.22.camel@carbonara>
+References: <1375190367.24158.22.camel@carbonara>
+From: Raluca-Elena Podiuc <ralucaelena1985@gmail.com>
+Date: Mon, 19 Aug 2013 17:59:25 +0300
+Message-ID: <CAFRSiR47+wGzARJHLLkf98+1ZDEJ_gHts1AsC8gCcO+U+Kny6g@mail.gmail.com>
+Subject: Re: Relicensing some Empathy code from GPL to LGPL
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Lars-Peter Clausen <lars@metafoo.de>, Milo Casagrande
+ <milo@ubuntu.com>,  Philip Withnall <philip@tecnocode.co.uk>
+Content-Type: multipart/alternative; boundary=bcaec52bed09e85bba04e44e309f
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--bcaec52bed09e85bba04e44e309f
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Yeap,
+Totally OK by me!
+
+
+On Tue, Jul 30, 2013 at 4:19 PM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the account creation code to a separate git
+> submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to some Empathy files under GPL
+> that we would like to use in gnome-online-accounts. Would you agree to
+> relicense your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+
+--=20
+Raluca-Elena
+
+--bcaec52bed09e85bba04e44e309f
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Yeap,=C2=A0<div>Totally OK by me!</div></div><div class=3D=
+"gmail_extra"><br><br><div class=3D"gmail_quote">On Tue, Jul 30, 2013 at 4:=
+19 PM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailto:marco.barisi=
+one@collabora.co.uk" target=3D"_blank">marco.barisione@collabora.co.uk</a>&=
+gt;</span> wrote:<br>
+
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.<br>
+To do so, I need to move all the account creation code to a separate git<br=
+>
+submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to some Empathy files under GPL=
+<br>
+that we would like to use in gnome-online-accounts. Would you agree to<br>
+relicense your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br><br clear=3D"all"><div><br></div>-- <b=
+r>Raluca-Elena
+</div>
+
+--bcaec52bed09e85bba04e44e309f--
+
+== Telepathy account widgets relicensing (Cheese contributors) ==
+
+Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender:
+ bari) with ESMTPSA id 8C8C01A88055
+Message-ID: <1375107920.24158.18.camel@carbonara>
+Subject: Relicensing some Cheese code to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Bastien Nocera <hadess@hadess.net>, "Daniel G. Siegel"
+ <dgsiegel@gnome.org>,  Filippo Argiolas <filippo.argiolas@gmail.com>, Jaap
+ Haitsma <jaap@haitsma.org>, Ryan Zeigler <zeiglerr@gmail.com>
+Date: Mon, 29 Jul 2013 15:25:20 +0100
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.2-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 8bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Hi all,
+
+I'm currently working on integrating IM account creation with
+gnome-online-accounts. This would allow a Gnome user to create all types
+of accounts directly in “System Settings�.
+To do so, I need to move all the Empathy account creation code to a
+separate git submodule that can be used by gnome-online-accounts.
+The problem is that gnome-online-accounts is under LGPL, while Empathy
+contains some files under GPL and some files under LGPL.
+
+I'm writing you because you contributed to
+cheese-camera-device-monitor.c and that file was later copied into
+Empathy (it's used to set your avatar). Would you agree to relicense
+your code from GPL to LGPL (version 2.1 or later)?
+
+Thank you!
+
+-- 
+Marco Barisione
+
+Received: from backus.clues.ltd.uk (backus.clues.ltd.uk [85.158.43.50])
+ (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id BFDAD16985AB
+ for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 08:20:38 +0100 (BST)
+Received: from slow1-d.mail.gandi.net ([217.70.178.86]) by
+ backus.clues.ltd.uk with esmtp (Exim 4.72) (envelope-from
+ <hadess@hadess.net>) id 1V44EV-00088M-3C for
+ marco.barisione@collabora.co.uk; Tue, 30 Jul 2013 08:20:38 +0100
+Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net
+ [217.70.183.196]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id
+ 3878247A8B1 for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013
+ 09:09:51 +0200 (CEST)
+Received: from mfilter16-d.gandi.net (mfilter16-d.gandi.net
+ [217.70.178.144]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id
+ EFB11172055; Tue, 30 Jul 2013 09:09:10 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at mfilter16-d.gandi.net
+Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by
+ mfilter16-d.gandi.net (mfilter16-d.gandi.net [10.0.15.180]) (amavisd-new,
+ port 10024) with ESMTP id EtS44xL8IlyD; Tue, 30 Jul 2013 09:09:08 +0200
+ (CEST)
+X-Originating-IP: 217.69.97.51
+Received: from [10.153.0.35] (gtsr.mendelu.cz [217.69.97.51])
+ (Authenticated sender: hadess@hadess.net) by relay4-d.mail.gandi.net
+ (Postfix) with ESMTPSA id 789DB17207C; Tue, 30 Jul 2013 09:09:04 +0200
+ (CEST)
+Message-ID: <1375168140.4538.1.camel@sirocco.hadess.net>
+Subject: Re: Relicensing some Cheese code to LGPL
+From: Bastien Nocera <hadess@hadess.net>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: "Daniel G. Siegel" <dgsiegel@gnome.org>, Filippo Argiolas
+ <filippo.argiolas@gmail.com>, Jaap Haitsma <jaap@haitsma.org>, Ryan Zeigler
+ <zeiglerr@gmail.com>, Debarshi Ray <rishi.is@lostca.se>
+Date: Tue, 30 Jul 2013 09:09:00 +0200
+In-Reply-To: <1375107920.24158.18.camel@carbonara>
+References: <1375107920.24158.18.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) 
+Mime-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Em Mon, 2013-07-29 =C3=A0s 15:25 +0100, Marco Barisione escreveu:
+> Hi all,
+>=20
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all type=
+s
+> of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the Empathy account creation code to a
+> separate git submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>=20
+> I'm writing you because you contributed to
+> cheese-camera-device-monitor.c and that file was later copied into
+> Empathy (it's used to set your avatar). Would you agree to relicense
+> your code from GPL to LGPL (version 2.1 or later)?
+
+Why are you moving this code to gnome-online-accounts instead of
+gnome-control-center? Code that pokes that webcams has absolutely
+nothing to do in gnome-online-accounts, and I hope Rishi tells you so as
+well.
+
+Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender:
+ bari) with ESMTPSA id E10C4169875A
+Message-ID: <1375169183.24158.20.camel@carbonara>
+Subject: Re: Relicensing some Cheese code to LGPL
+From: Marco Barisione <marco.barisione@collabora.co.uk>
+To: Bastien Nocera <hadess@hadess.net>
+Cc: "Daniel G. Siegel" <dgsiegel@gnome.org>, Filippo Argiolas
+ <filippo.argiolas@gmail.com>, Jaap Haitsma <jaap@haitsma.org>, Ryan Zeigler
+ <zeiglerr@gmail.com>, Debarshi Ray <rishi.is@lostca.se>
+Date: Tue, 30 Jul 2013 08:26:23 +0100
+In-Reply-To: <1375168140.4538.1.camel@sirocco.hadess.net>
+References: <1375107920.24158.18.camel@carbonara>
+         <1375168140.4538.1.camel@sirocco.hadess.net>
+Organization: Collabora Ltd.
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.2-1 
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+On Tue, 2013-07-30 at 09:09 +0200, Bastien Nocera wrote:
+> Why are you moving this code to gnome-online-accounts instead of
+> gnome-control-center? Code that pokes that webcams has absolutely
+> nothing to do in gnome-online-accounts, and I hope Rishi tells you so as
+> well.
+
+Because the UIs for the different GOA providers are in libgoabackend,
+not in g-c-c. Settings your own avatar is part of the configuration of
+IM accounts.
+
+-- 
+Marco Barisione
+
+Received: from rose.clues.ltd.uk (rose.clues.ltd.uk [93.190.169.34]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id 76A5E169875A
+ for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013 09:55:19 +0100 (BST)
+Received: from slow1-d.mail.gandi.net ([217.70.178.86]) by
+ rose.clues.ltd.uk with esmtp (Exim 4.72) (envelope-from
+ <hadess@hadess.net>) id 1V45i3-0005Df-Vy for
+ marco.barisione@collabora.co.uk; Tue, 30 Jul 2013 09:55:19 +0100
+Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net
+ [217.70.183.196]) by slow1-d.mail.gandi.net (Postfix) with ESMTP id
+ 9CE8D47A25A for <marco.barisione@collabora.co.uk>; Tue, 30 Jul 2013
+ 10:54:13 +0200 (CEST)
+Received: from mfilter10-d.gandi.net (mfilter10-d.gandi.net
+ [217.70.178.139]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id
+ 4E7A61720BF; Tue, 30 Jul 2013 10:53:33 +0200 (CEST)
+X-Virus-Scanned: Debian amavisd-new at mfilter10-d.gandi.net
+Received: from relay4-d.mail.gandi.net ([217.70.183.196]) by
+ mfilter10-d.gandi.net (mfilter10-d.gandi.net [10.0.15.180]) (amavisd-new,
+ port 10024) with ESMTP id W5ugtmTdrBTO; Tue, 30 Jul 2013 10:53:31 +0200
+ (CEST)
+X-Originating-IP: 209.132.186.34
+Received: from [10.34.129.183] (nat-pool-brq-t.redhat.com [209.132.186.34])
+ (Authenticated sender: hadess@hadess.net) by relay4-d.mail.gandi.net
+ (Postfix) with ESMTPSA id 71D30172091; Tue, 30 Jul 2013 10:53:29 +0200
+ (CEST)
+Message-ID: <1375174407.4538.3.camel@sirocco.hadess.net>
+Subject: Re: Relicensing some Cheese code to LGPL
+From: Bastien Nocera <hadess@hadess.net>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: "Daniel G. Siegel" <dgsiegel@gnome.org>, Filippo Argiolas
+ <filippo.argiolas@gmail.com>, Jaap Haitsma <jaap@haitsma.org>, Ryan Zeigler
+ <zeiglerr@gmail.com>, Debarshi Ray <rishi.is@lostca.se>
+Date: Tue, 30 Jul 2013 10:53:27 +0200
+In-Reply-To: <1375169183.24158.20.camel@carbonara>
+References: <1375107920.24158.18.camel@carbonara>
+         <1375168140.4538.1.camel@sirocco.hadess.net>
+         <1375169183.24158.20.camel@carbonara>
+Content-Type: text/plain; charset="UTF-8"
+X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) 
+Mime-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+Em Tue, 2013-07-30 =C3=A0s 08:26 +0100, Marco Barisione escreveu:
+> On Tue, 2013-07-30 at 09:09 +0200, Bastien Nocera wrote:
+> > Why are you moving this code to gnome-online-accounts instead of
+> > gnome-control-center? Code that pokes that webcams has absolutely
+> > nothing to do in gnome-online-accounts, and I hope Rishi tells you so=
+ as
+> > well.
+>=20
+> Because the UIs for the different GOA providers are in libgoabackend,
+> not in g-c-c. Settings your own avatar is part of the configuration of
+> IM accounts.
+
+As mentioned on IRC, that code should be in shared library, so that we
+don't end up with 2 copies of that code in gnome-control-center (once
+directly in the User Accounts panel, once through GOA).
+
+Fine to relicense that code though.
+
+Received: from fox.clues.ltd.uk (fox.clues.ltd.uk [217.151.102.250]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id C76491A88055
+ for <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 16:10:11 +0100 (BST)
+Received: from mail-ve0-x232.google.com ([2607:f8b0:400c:c01::232]) by
+ fox.clues.ltd.uk with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.72)
+ (envelope-from <jaap.haitsma@gmail.com>) id 1V3p5J-0007fi-4z for
+ marco.barisione@collabora.co.uk; Mon, 29 Jul 2013 16:10:11 +0100
+Received: by mail-ve0-f178.google.com with SMTP id ox1so2350935veb.37 for
+ <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 08:10:03 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=mime-version:sender:in-reply-to:references:date
+ :x-google-sender-auth:message-id:subject:from:to:cc:content-type;
+ bh=VGg6jZy2QwKKfLp0CVJJkQBHhH77MOrUOlNiDCQmYbg=;
+ b=VY+LQ9DSwWOtG8MGUXVfTTeoxNE6f6cuNw6+67YdAhvAiVt4LnWV3PHrpd6qP9+ipn
+ wkNLRaeOw+7VqsA960CiUguOFrllah1r50AVGQsTsB28/6gyuz5b++qiqxjKxFHxWho0
+ jcMNOUSQWQKeKbgd2TDDUh1ed49aETJxYVywPVhzt7kiR67AncSkiGX351rE9dTiIBh2
+ kDqU+Sob3A6R8ijrxO0XCFrE+q2szd/FkPHgTvC6EoFKPbqVXSuDjF79wVknD6iT0bg3
+ F9+FPyYBnauEkW64pPuU7vLpJYeAOLgIZjJa1wKrx3NzD4rG2RlWu/BUSDX0trAXgKWw l0IQ==
+MIME-Version: 1.0
+X-Received: by 10.52.191.72 with SMTP id
+ gw8mr21680661vdc.114.1375110603368; Mon, 29 Jul 2013 08:10:03 -0700 (PDT)
+Sender: jaap.haitsma@gmail.com
+Received: by 10.58.100.241 with HTTP; Mon, 29 Jul 2013 08:10:03 -0700 (PDT)
+In-Reply-To: <1375107920.24158.18.camel@carbonara>
+References: <1375107920.24158.18.camel@carbonara>
+Date: Mon, 29 Jul 2013 11:10:03 -0400
+X-Google-Sender-Auth: -Wk8Ks06V_K0Mzu29VLMB5CXass
+Message-ID: <CAGt47YwDsmu4vvr7Gv_aoXLR5q6Sxvbn4Bj_P21TLCdXzHuoDA@mail.gmail.com>
+Subject: Re: Relicensing some Cheese code to LGPL
+From: "Jaap A. Haitsma" <jaap@haitsma.org>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: Bastien Nocera <hadess@hadess.net>, "Daniel G. Siegel"
+ <dgsiegel@gnome.org>,  Filippo Argiolas <filippo.argiolas@gmail.com>, Ryan
+ Zeigler <zeiglerr@gmail.com>
+Content-Type: multipart/alternative; boundary=047d7b5d61620a73aa04e2a7e326
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--047d7b5d61620a73aa04e2a7e326
+Content-Type: text/plain; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+Sure no problem for me
+
+Jaap
+
+
+On Mon, Jul 29, 2013 at 10:25 AM, Marco Barisione <
+marco.barisione@collabora.co.uk> wrote:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in =93System Settings=94.
+> To do so, I need to move all the Empathy account creation code to a
+> separate git submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to
+> cheese-camera-device-monitor.c and that file was later copied into
+> Empathy (it's used to set your avatar). Would you agree to relicense
+> your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+--047d7b5d61620a73aa04e2a7e326
+Content-Type: text/html; charset=windows-1252
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Sure no problem for me<div><br></div><div>Jaap</div></div>=
+<div class=3D"gmail_extra"><br><br><div class=3D"gmail_quote">On Mon, Jul 2=
+9, 2013 at 10:25 AM, Marco Barisione <span dir=3D"ltr">&lt;<a href=3D"mailt=
+o:marco.barisione@collabora.co.uk" target=3D"_blank">marco.barisione@collab=
+ora.co.uk</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex">Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in =93System Settings=94.<br>
+To do so, I need to move all the Empathy account creation code to a<br>
+separate git submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to<br>
+cheese-camera-device-monitor.c and that file was later copied into<br>
+Empathy (it&#39;s used to set your avatar). Would you agree to relicense<br=
+>
+your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<span class=3D"HOEnZb"><font color=3D"#888888"><br>
+--<br>
+Marco Barisione<br>
+<br>
+</font></span></blockquote></div><br></div>
+
+--047d7b5d61620a73aa04e2a7e326--
+
+Received: from fox.clues.ltd.uk (fox.clues.ltd.uk [217.151.102.250]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id 9E4D91A88055
+ for <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 16:31:43 +0100 (BST)
+Received: from nopln.org ([212.103.74.197]) by fox.clues.ltd.uk with esmtps
+ (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from
+ <dgsiegel@gnome.org>) id 1V3pQC-0001Ls-3R for
+ marco.barisione@collabora.co.uk; Mon, 29 Jul 2013 16:31:42 +0100
+Received: from [10.204.33.93] (tmo-100-97.customers.d1-online.com
+ [80.187.100.97]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No
+ client certificate requested) by nopln.org ("nopln.org mail server") with
+ ESMTPSA id D1DD93FDB0; Mon, 29 Jul 2013 17:24:12 +0200 (CEST)
+User-Agent: K-9 Mail for Android
+In-Reply-To: <1375107920.24158.18.camel@carbonara>
+References: <1375107920.24158.18.camel@carbonara>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Subject: Re: Relicensing some Cheese code to LGPL
+From: "daniel g. siegel" <dgsiegel@gnome.org>
+Date: Mon, 29 Jul 2013 17:24:00 +0200
+To: Marco Barisione <marco.barisione@collabora.co.uk>,Bastien Nocera
+ <hadess@hadess.net>,Filippo Argiolas <filippo.argiolas@gmail.com>,Jaap
+ Haitsma <jaap@haitsma.org>,Ryan Zeigler <zeiglerr@gmail.com>
+Message-ID: <def23d24-276e-4f37-b298-f0801aa9b411@email.android.com>
+Content-Transfer-Encoding: quoted-printable
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+sure, go ahead!
+
+daniel
+
+Marco Barisione <marco.barisione@collabora.co.uk> wrote:
+>Hi all,
+>
+>I'm currently working on integrating IM account creation with
+>gnome-online-accounts. This would allow a Gnome user to create all
+>types
+>of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.
+>To do so, I need to move all the Empathy account creation code to a
+>separate git submodule that can be used by gnome-online-accounts.
+>The problem is that gnome-online-accounts is under LGPL, while Empathy
+>contains some files under GPL and some files under LGPL.
+>
+>I'm writing you because you contributed to
+>cheese-camera-device-monitor.c and that file was later copied into
+>Empathy (it's used to set your avatar). Would you agree to relicense
+>your code from GPL to LGPL (version 2.1 or later)?
+>
+>Thank you!
+
+
+--=20
+this mail was sent using 100% recycled electrons
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+daniel g. siegel <dgsiegel@gnome.org>
+http://www.dgsiegel.net
+gnupg key id: 0xDB8E409F
+encrypted email preferred
+
+Received: from fox.clues.ltd.uk (fox.clues.ltd.uk [217.151.102.250]) (using
+ TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate
+ requested) by bhuna.collabora.co.uk (Postfix) with ESMTPS id 20ECC1A88055
+ for <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 17:58:04 +0100 (BST)
+Received: from mail-wg0-x22e.google.com ([2a00:1450:400c:c00::22e]) by
+ fox.clues.ltd.uk with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.72)
+ (envelope-from <filippo.argiolas@gmail.com>) id 1V3qll-0000eE-7j for
+ marco.barisione@collabora.co.uk; Mon, 29 Jul 2013 17:58:03 +0100
+Received: by mail-wg0-f46.google.com with SMTP id k13so5095262wgh.25 for
+ <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 09:58:00 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113;
+ h=mime-version:in-reply-to:references:date:message-id:subject:from:to
+ :cc:content-type; bh=t4nNyM8xFWXWFuFGcZFVTLS3z2Im9yEkY7SozkMa+Cg=;
+ b=0z8Yu6MGmCJyN2xAqb5zzJu9zzf74UcjnUNfUJmHtuDAxHcF9KwiNwxHHzsHNYc5ZP
+ +C8/rpxTEd9uIcnYrHo80cawP6zvchuuvqy40IpDA04koSfebBaDG/PFNVvjozUrB8IT
+ r/qCvol/HF/9Dz+OwUfleEljYoEE+ympwelmDEloMvrsfb8ERL3VgpFDZjEQaVlcTMkV
+ QWBQjubRiAdDCyLy13n2tU8zL9RKiGRpz5VwHKwDkW3w3UXoqqYm514qRq4ZQEOpCGCM
+ 35yBARUsU64sWL8cMzuxr/KIgVrzVm3lvk5nQ25aJLUqGZCOkv88EO7OK6+/0pdaJkR1 kOiQ==
+MIME-Version: 1.0
+X-Received: by 10.194.108.73 with SMTP id
+ hi9mr32623129wjb.85.1375115711876; Mon, 29 Jul 2013 09:35:11 -0700 (PDT)
+Received: by 10.216.139.202 with HTTP; Mon, 29 Jul 2013 09:35:11 -0700 (PDT)
+Received: by 10.216.139.202 with HTTP; Mon, 29 Jul 2013 09:35:11 -0700 (PDT)
+In-Reply-To: <1375107920.24158.18.camel@carbonara>
+References: <1375107920.24158.18.camel@carbonara>
+Date: Mon, 29 Jul 2013 18:35:11 +0200
+Message-ID: <CAOdrLGJN+fs3D19vCOzCnnNn=9aVoJBGYLt2Z0VyZawtHx5iCQ@mail.gmail.com>
+Subject: Re: Relicensing some Cheese code to LGPL
+From: Filippo Argiolas <filippo.argiolas@gmail.com>
+To: Marco Barisione <marco.barisione@collabora.co.uk>
+Cc: "daniel g. siegel" <dgsiegel@gnome.org>, Ryan Zeigler
+ <zeiglerr@gmail.com>,  Jaap Haitsma <jaap@haitsma.org>, Bastien Nocera <hadess@hadess.net>
+Content-Type: multipart/alternative; boundary=047d7bf10b2888145004e2a913c4
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--047d7bf10b2888145004e2a913c4
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Sure, ok for me!
+
+Filippo
+ Il giorno 29/lug/2013 16:25, "Marco Barisione" <
+marco.barisione@collabora.co.uk> ha scritto:
+
+> Hi all,
+>
+> I'm currently working on integrating IM account creation with
+> gnome-online-accounts. This would allow a Gnome user to create all types
+> of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.
+> To do so, I need to move all the Empathy account creation code to a
+> separate git submodule that can be used by gnome-online-accounts.
+> The problem is that gnome-online-accounts is under LGPL, while Empathy
+> contains some files under GPL and some files under LGPL.
+>
+> I'm writing you because you contributed to
+> cheese-camera-device-monitor.c and that file was later copied into
+> Empathy (it's used to set your avatar). Would you agree to relicense
+> your code from GPL to LGPL (version 2.1 or later)?
+>
+> Thank you!
+>
+> --
+> Marco Barisione
+>
+>
+
+--047d7bf10b2888145004e2a913c4
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<p dir=3D"ltr">Sure, ok for me! </p>
+<p dir=3D"ltr">Filippo<br>
+</p>
+<div class=3D"gmail_quote">Il giorno 29/lug/2013 16:25, &quot;Marco Barisio=
+ne&quot; &lt;<a href=3D"mailto:marco.barisione@collabora.co.uk">marco.baris=
+ione@collabora.co.uk</a>&gt; ha scritto:<br type=3D"attribution"><blockquot=
+e class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc sol=
+id;padding-left:1ex">
+Hi all,<br>
+<br>
+I&#39;m currently working on integrating IM account creation with<br>
+gnome-online-accounts. This would allow a Gnome user to create all types<br=
+>
+of accounts directly in =E2=80=9CSystem Settings=E2=80=9D.<br>
+To do so, I need to move all the Empathy account creation code to a<br>
+separate git submodule that can be used by gnome-online-accounts.<br>
+The problem is that gnome-online-accounts is under LGPL, while Empathy<br>
+contains some files under GPL and some files under LGPL.<br>
+<br>
+I&#39;m writing you because you contributed to<br>
+cheese-camera-device-monitor.c and that file was later copied into<br>
+Empathy (it&#39;s used to set your avatar). Would you agree to relicense<br=
+>
+your code from GPL to LGPL (version 2.1 or later)?<br>
+<br>
+Thank you!<br>
+<br>
+--<br>
+Marco Barisione<br>
+<br>
+</blockquote></div>
+
+--047d7bf10b2888145004e2a913c4--
+
+Received: from node0007.antibodymx.net (node0007.antibodymx.net
+ [89.238.145.165]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No
+ client certificate requested) by bhuna.collabora.co.uk (Postfix) with
+ ESMTPS id 77C211E8800A for <marco.barisione@collabora.co.uk>; Tue, 30 Jul
+ 2013 02:26:41 +0100 (BST)
+Received: from mail-ob0-x232.google.com ([2607:f8b0:4003:c01::232]) by
+ node0007.antibodymx.net with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim
+ 4.72) (envelope-from <zeiglerr@gmail.com>) id 1V3yhz-0007sk-Am for
+ marco.barisione@collabora.co.uk; Tue, 30 Jul 2013 02:26:41 +0100
+Received: by mail-ob0-f178.google.com with SMTP id ef5so3016902obb.23 for
+ <marco.barisione@collabora.co.uk>; Mon, 29 Jul 2013 18:26:37 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com;
+ s=20120113; h=message-id:mime-version:from:to:cc:subject:importance:date
+ :in-reply-to:references:content-type;
+ bh=8KrOJseHd9d/k2RiFIDeaLrm1751q5HidfWtfaQwtog=;
+ b=JrnawAEQx2qAN02UXIHlWyD9iyGNV/Iu6uG8ntzECX8A4OqD7EWdlL5a/F6SO6MhWn
+ qSPdTN5FZpCPtRwVuGRnUC/uQeXKeLkZEZNOPTAR3l1JAzHYIUCtoWfcDZo7tQiH1MRr
+ IMhlYejwW/cBJAdht2cIeLZxTHum2u+mB9XMCVfArGQvJgf9Zb8ibzGlUUbWe0G9W85H
+ Nlnor6/MJC75RmkHmtvPfRooQRWa+0PgXVmV4e2RYb7fIrt3quRjezQS4nr1p760fRAs
+ AD6o0j2Um7erUV56N+vAZGI6/NAYNKTXTI3Rd09fiec4EOzFOUiM9CWaPf6ShbdPqEkK G6Ew==
+X-Received: by 10.60.43.73 with SMTP id u9mr7489521oel.105.1375145767165;
+ Mon, 29 Jul 2013 17:56:07 -0700 (PDT)
+Received: from RyansVizio (cpe-24-27-120-87.tx.res.rr.com. [24.27.120.87])
+ by mx.google.com with ESMTPSA id fh1sm371068oeb.7.2013.07.29.17.56.05 for
+ <multiple recipients> (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 29
+ Jul 2013 17:56:05 -0700 (PDT)
+Message-ID: <51f70f25.a1653c0a.2e60.1076@mx.google.com>
+MIME-Version: 1.0
+From: <zeiglerr@gmail.com>
+To: =?utf-8?Q?Marco_Barisione?= <marco.barisione@collabora.co.uk>, 
+ =?utf-8?Q?Filippo_Argiolas?= <filippo.argiolas@gmail.com>
+CC: =?utf-8?Q?daniel_g._siegel?= <dgsiegel@gnome.org>, 
+ =?utf-8?Q?Jaap_Haitsma?= <jaap@haitsma.org>,  =?utf-8?Q?Bastien_Nocera?=
+ <hadess@hadess.net>
+Subject: =?utf-8?Q?Re:_Relicensing_some_Cheese_code_to_LGPL?=
+Importance: Normal
+Date: Tue, 30 Jul 2013 00:55:51 +0000
+In-Reply-To: <CAOdrLGJN+fs3D19vCOzCnnNn=9aVoJBGYLt2Z0VyZawtHx5iCQ@mail.gmail.com>
+References: <1375107920.24158.18.camel@carbonara>
+        ,<CAOdrLGJN+fs3D19vCOzCnnNn=9aVoJBGYLt2Z0VyZawtHx5iCQ@mail.gmail.com>
+Content-Type: multipart/alternative; boundary="_2E96FD07-E857-4598-B474-6713566EDF0B_"
+X-Evolution-Source: 1205242379.4854.0@cordof
+
+
+--_2E96FD07-E857-4598-B474-6713566EDF0B_
+Content-Transfer-Encoding: base64
+Content-Type: text/plain; charset="utf-8"
+
+R28gYWhlYWQuDQoNClJlZ2FyZHMsDQoNClJ5YW4gWmVpZ2xlcg0KDQoNCg0KRnJvbTogRmlsaXBw
+byBBcmdpb2xhcw0KU2VudDog4oCOTW9uZGF54oCOLCDigI5KdWx54oCOIOKAjjI54oCOLCDigI4y
+MDEzIOKAjjEx4oCOOuKAjjM14oCOIOKAjkFNDQpUbzogTWFyY28gQmFyaXNpb25lDQpDYzogZGFu
+aWVsIGcuIHNpZWdlbDsgUnlhbiBaZWlnbGVyOyBKYWFwIEhhaXRzbWE7IEJhc3RpZW4gTm9jZXJh
+DQoNCg0KU3VyZSwgb2sgZm9yIG1lISANCg0KRmlsaXBwbw0KDQoNCklsIGdpb3JubyAyOS9sdWcv
+MjAxMyAxNjoyNSwgIk1hcmNvIEJhcmlzaW9uZSIgPG1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEu
+Y28udWs+IGhhIHNjcml0dG86DQoNCkhpIGFsbCwNCg0KSSdtIGN1cnJlbnRseSB3b3JraW5nIG9u
+IGludGVncmF0aW5nIElNIGFjY291bnQgY3JlYXRpb24gd2l0aA0KZ25vbWUtb25saW5lLWFjY291
+bnRzLiBUaGlzIHdvdWxkIGFsbG93IGEgR25vbWUgdXNlciB0byBjcmVhdGUgYWxsIHR5cGVzDQpv
+ZiBhY2NvdW50cyBkaXJlY3RseSBpbiDigJxTeXN0ZW0gU2V0dGluZ3PigJ0uDQpUbyBkbyBzbywg
+SSBuZWVkIHRvIG1vdmUgYWxsIHRoZSBFbXBhdGh5IGFjY291bnQgY3JlYXRpb24gY29kZSB0byBh
+DQpzZXBhcmF0ZSBnaXQgc3VibW9kdWxlIHRoYXQgY2FuIGJlIHVzZWQgYnkgZ25vbWUtb25saW5l
+LWFjY291bnRzLg0KVGhlIHByb2JsZW0gaXMgdGhhdCBnbm9tZS1vbmxpbmUtYWNjb3VudHMgaXMg
+dW5kZXIgTEdQTCwgd2hpbGUgRW1wYXRoeQ0KY29udGFpbnMgc29tZSBmaWxlcyB1bmRlciBHUEwg
+YW5kIHNvbWUgZmlsZXMgdW5kZXIgTEdQTC4NCg0KSSdtIHdyaXRpbmcgeW91IGJlY2F1c2UgeW91
+IGNvbnRyaWJ1dGVkIHRvDQpjaGVlc2UtY2FtZXJhLWRldmljZS1tb25pdG9yLmMgYW5kIHRoYXQg
+ZmlsZSB3YXMgbGF0ZXIgY29waWVkIGludG8NCkVtcGF0aHkgKGl0J3MgdXNlZCB0byBzZXQgeW91
+ciBhdmF0YXIpLiBXb3VsZCB5b3UgYWdyZWUgdG8gcmVsaWNlbnNlDQp5b3VyIGNvZGUgZnJvbSBH
+UEwgdG8gTEdQTCAodmVyc2lvbiAyLjEgb3IgbGF0ZXIpPw0KDQpUaGFuayB5b3UhDQoNCi0tDQpN
+YXJjbyBCYXJpc2lvbmU=
+
+--_2E96FD07-E857-4598-B474-6713566EDF0B_
+Content-Transfer-Encoding: base64
+Content-Type: text/html; charset="utf-8"
+
+PGh0bWw+PGhlYWQ+PHN0eWxlIGRhdGEtZXh0ZXJuYWxzdHlsZT0idHJ1ZSI+PCEtLQpwLk1zb0xp
+c3RQYXJhZ3JhcGgsIGxpLk1zb0xpc3RQYXJhZ3JhcGgsIGRpdi5Nc29MaXN0UGFyYWdyYXBoIHsK
+bWFyZ2luLXRvcDowaW47Cm1hcmdpbi1yaWdodDowaW47Cm1hcmdpbi1ib3R0b206MGluOwptYXJn
+aW4tbGVmdDouNWluOwptYXJnaW4tYm90dG9tOi4wMDAxcHQ7Cn0KCnAuTXNvTGlzdFBhcmFncmFw
+aEN4U3BGaXJzdCwgbGkuTXNvTGlzdFBhcmFncmFwaEN4U3BGaXJzdCwgZGl2Lk1zb0xpc3RQYXJh
+Z3JhcGhDeFNwRmlyc3QsIHAuTXNvTGlzdFBhcmFncmFwaEN4U3BNaWRkbGUsIGxpLk1zb0xpc3RQ
+YXJhZ3JhcGhDeFNwTWlkZGxlLCBkaXYuTXNvTGlzdFBhcmFncmFwaEN4U3BNaWRkbGUsIHAuTXNv
+TGlzdFBhcmFncmFwaEN4U3BMYXN0LCBsaS5Nc29MaXN0UGFyYWdyYXBoQ3hTcExhc3QsIGRpdi5N
+c29MaXN0UGFyYWdyYXBoQ3hTcExhc3QgewptYXJnaW4tdG9wOjBpbjsKbWFyZ2luLXJpZ2h0OjBp
+bjsKbWFyZ2luLWJvdHRvbTowaW47Cm1hcmdpbi1sZWZ0Oi41aW47Cm1hcmdpbi1ib3R0b206LjAw
+MDFwdDsKbGluZS1oZWlnaHQ6MTE1JTsKfQotLT48L3N0eWxlPjwvaGVhZD48Ym9keT48ZGl2IGRh
+dGEtZXh0ZXJuYWxzdHlsZT0iZmFsc2UiIGRpcj0ibHRyIiBzdHlsZT0iZm9udC1mYW1pbHk6Q2Fs
+aWJyaSwnU2Vnb2UgVUknLE1laXJ5bywnTWljcm9zb2Z0IFlhSGVpIFVJJywnTWljcm9zb2Z0IEpo
+ZW5nSGVpIFVJJywnTWFsZ3VuIEdvdGhpYycsJ0tobWVyIFVJJywnTmlybWFsYSBVSScsVHVuZ2Es
+J0xhbyBVSScsRWJyaW1hLHNhbnMtc2VyaWY7Zm9udC1zaXplOjEycHQ7Ij48ZGl2PkdvIGFoZWFk
+LjwvZGl2PjxkaXY+UmVnYXJkcyw8L2Rpdj48ZGl2PlJ5YW4gWmVpZ2xlcjwvZGl2PjxkaXYgZGF0
+YS1zaWduYXR1cmVibG9jaz0idHJ1ZSI+Jm5ic3A7PC9kaXY+PGRpdiBzdHlsZT0icGFkZGluZy10
+b3A6IDVweDsgYm9yZGVyLXRvcC1jb2xvcjogcmdiKDIyOSwgMjI5LCAyMjkpOyBib3JkZXItdG9w
+LXdpZHRoOiAxcHg7IGJvcmRlci10b3Atc3R5bGU6IHNvbGlkOyI+PGRpdj48Zm9udCBmYWNlPSJD
+YWxpYnJpLCAnU2Vnb2UgVUknLCBNZWlyeW8sICdNaWNyb3NvZnQgWWFIZWkgVUknLCAnTWljcm9z
+b2Z0IEpoZW5nSGVpIFVJJywgJ01hbGd1biBHb3RoaWMnLCAnS2htZXIgVUknLCAnTmlybWFsYSBV
+SScsIFR1bmdhLCAnTGFvIFVJJywgRWJyaW1hLCBzYW5zLXNlcmlmIiBzdHlsZT0nbGluZS1oZWln
+aHQ6IDE1cHQ7IGxldHRlci1zcGFjaW5nOiAwLjAyZW07IGZvbnQtZmFtaWx5OiBDYWxpYnJpLCAi
+U2Vnb2UgVUkiLCBNZWlyeW8sICJNaWNyb3NvZnQgWWFIZWkgVUkiLCAiTWljcm9zb2Z0IEpoZW5n
+SGVpIFVJIiwgIk1hbGd1biBHb3RoaWMiLCAiS2htZXIgVUkiLCAiTmlybWFsYSBVSSIsIFR1bmdh
+LCAiTGFvIFVJIiwgRWJyaW1hLCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDExcHQ7Jz48Yj5Gcm9t
+OjwvYj4mbmJzcDtGaWxpcHBvIEFyZ2lvbGFzPGJyPjxiPlNlbnQ6PC9iPiZuYnNwO+KAjk1vbmRh
+eeKAjiwg4oCOSnVseeKAjiDigI4yOeKAjiwg4oCOMjAxMyDigI4xMeKAjjrigI4zNeKAjiDigI5B
+TTxicj48Yj5Ubzo8L2I+Jm5ic3A7TWFyY28gQmFyaXNpb25lPGJyPjxiPkNjOjwvYj4mbmJzcDtk
+YW5pZWwgZy4gc2llZ2VsOyBSeWFuIFplaWdsZXI7IEphYXAgSGFpdHNtYTsgQmFzdGllbiBOb2Nl
+cmE8L2ZvbnQ+PC9kaXY+PC9kaXY+PGRpdj4mbmJzcDs8L2Rpdj48cCBkaXI9Imx0ciI+U3VyZSwg
+b2sgZm9yIG1lISA8L3A+CjxwIGRpcj0ibHRyIj5GaWxpcHBvPGJyPgo8L3A+CjxkaXYgY2xhc3M9
+ImdtYWlsX3F1b3RlIj5JbCBnaW9ybm8gMjkvbHVnLzIwMTMgMTY6MjUsICJNYXJjbyBCYXJpc2lv
+bmUiICZsdDs8YSB0aXRsZT0ibWFpbHRvOm1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWsi
+IGhyZWY9Im1haWx0bzptYXJjby5iYXJpc2lvbmVAY29sbGFib3JhLmNvLnVrIiB0YXJnZXQ9Il9w
+YXJlbnQiPm1hcmNvLmJhcmlzaW9uZUBjb2xsYWJvcmEuY28udWs8L2E+Jmd0OyBoYSBzY3JpdHRv
+Ojxicj48YmxvY2txdW90ZSBjbGFzcz0iZ21haWxfcXVvdGUiIHN0eWxlPSJtYXJnaW46IDBweCAw
+cHggMHB4IDAuOGV4OyBwYWRkaW5nLWxlZnQ6IDFleDsgYm9yZGVyLWxlZnQtY29sb3I6IHJnYigy
+MDQsIDIwNCwgMjA0KTsgYm9yZGVyLWxlZnQtd2lkdGg6IDFweDsgYm9yZGVyLWxlZnQtc3R5bGU6
+IHNvbGlkOyI+CkhpIGFsbCw8YnI+Cjxicj4KSSdtIGN1cnJlbnRseSB3b3JraW5nIG9uIGludGVn
+cmF0aW5nIElNIGFjY291bnQgY3JlYXRpb24gd2l0aDxicj4KZ25vbWUtb25saW5lLWFjY291bnRz
+LiBUaGlzIHdvdWxkIGFsbG93IGEgR25vbWUgdXNlciB0byBjcmVhdGUgYWxsIHR5cGVzPGJyPgpv
+ZiBhY2NvdW50cyBkaXJlY3RseSBpbiDigJxTeXN0ZW0gU2V0dGluZ3PigJ0uPGJyPgpUbyBkbyBz
+bywgSSBuZWVkIHRvIG1vdmUgYWxsIHRoZSBFbXBhdGh5IGFjY291bnQgY3JlYXRpb24gY29kZSB0
+byBhPGJyPgpzZXBhcmF0ZSBnaXQgc3VibW9kdWxlIHRoYXQgY2FuIGJlIHVzZWQgYnkgZ25vbWUt
+b25saW5lLWFjY291bnRzLjxicj4KVGhlIHByb2JsZW0gaXMgdGhhdCBnbm9tZS1vbmxpbmUtYWNj
+b3VudHMgaXMgdW5kZXIgTEdQTCwgd2hpbGUgRW1wYXRoeTxicj4KY29udGFpbnMgc29tZSBmaWxl
+cyB1bmRlciBHUEwgYW5kIHNvbWUgZmlsZXMgdW5kZXIgTEdQTC48YnI+Cjxicj4KSSdtIHdyaXRp
+bmcgeW91IGJlY2F1c2UgeW91IGNvbnRyaWJ1dGVkIHRvPGJyPgpjaGVlc2UtY2FtZXJhLWRldmlj
+ZS1tb25pdG9yLmMgYW5kIHRoYXQgZmlsZSB3YXMgbGF0ZXIgY29waWVkIGludG88YnI+CkVtcGF0
+aHkgKGl0J3MgdXNlZCB0byBzZXQgeW91ciBhdmF0YXIpLiBXb3VsZCB5b3UgYWdyZWUgdG8gcmVs
+aWNlbnNlPGJyPgp5b3VyIGNvZGUgZnJvbSBHUEwgdG8gTEdQTCAodmVyc2lvbiAyLjEgb3IgbGF0
+ZXIpPzxicj4KPGJyPgpUaGFuayB5b3UhPGJyPgo8YnI+Ci0tPGJyPgpNYXJjbyBCYXJpc2lvbmU8
+YnI+Cjxicj4KPC9ibG9ja3F1b3RlPjwvZGl2Pgo8L2Rpdj48L2JvZHk+PC9odG1sPg==
+
+--_2E96FD07-E857-4598-B474-6713566EDF0B_--
diff --git a/Makefile.am b/Makefile.am
index dc120d5fb..28e6374d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
+MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
 NST_SUBDIRS = nautilus-sendto-plugin
 GOA_SUBDIRS = goa-mc-plugin
 UOA_SUBDIRS = ubuntu-online-accounts
diff --git a/NEWS b/NEWS
index 582a5d04d..b8429d5e3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,30 +1,144 @@
-NEW in 3.8.4 (09/09/2013)
-============
+NEW in 3.9.91 (03/09/2013)
+=============
+
+Dependencies:
+ • GLib ≥ 2.37.6
+ • Geoclue-2.0 (optional)
 
-This stable release fixes a bunch of bugs including various crashes.
-Upgrading is highly recommended.
+Bugs fixed:
+ - Fixed #643183, Stop live search when an action is started (Chandni Verma)
+ - Fixed #701392, Empathy does not honor disabled "Automatically connect on startup"
+ - Fixed #706627, Port to Geoclue2 (Guillaume Desmottes)
+ - Fixed #706829, build fails due to outdated egg-list-box submodule (Guillaume Desmottes)
+ - Fixed #706830, build fails due to misnamed macro (Seán de Búrca)
+ - Fixed #707104, Interface should consistently use typographical ellipsis (Seán de Búrca)
+ - Fixed #707208, menu does not appear translated (Marco Barisione)
+ - Fixed #707265, Stop using GtkHBox (Guillaume Desmottes)
+ - Fixed #707291, Warning when opening preferences dialog (Guillaume Desmottes)
+ - Fixed #707338, UOA: Fix build failure (Tim Lunn)
+ - Fixed #706801, tp-aw ships files in a path that cannot be configured (Marco Barisione)
+ - Fixed #706881, Avatar file chooser unusable if avatar chooser button is in a modal dialog
 
+Translations:
+ - Updated es Translation (Daniel Mustieles)
+ - Updated ga Translation (Seán de Búrca)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated it Translation (Milo Casagrande)
+ - Updated lt Translation (Aurimas ÄŒernius)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pl Translation (Piotr DrÄ…g)
+ - Updated pt_BR Translation (Rafael Ferreira, Enrico Nicoletto)
+ - Updated sk Translation (Pavol Kla�anský)
+ - Updated sl Translation (Matej Urban�i�)
+
+Documentation translations:
+ - Updated fr Documentation translation (Alexandre Franke)
+
+NEW in 3.9.90 (20/08/2013)
+=============
 Bugs fixed:
- - Fixed #696328, empathy-debugger crashed with SIGSEGV (Guillaume Desmottes)
- - Fixed #692105, empathy-3.6.2-1.fc18: items_delete_cb: Process /usr/bin/empathy-accounts was killed by signal 11 (Emilio Pozuelo Monfort)
+ - Fixed #585440, deleting a contact in multiple groups (Chandni Verma)
+ - Fixed #643755, Create Join Chat and Leave chat menu items for the conversation menu in MUCs (Chandni Verma)
+ - Fixed #698530, adding contact to group does not cause them to leave Ungrouped until Empathy restart (Chandni Verma)
+ - Fixed #701649, empathy will give user information after the account was deleted (Travis Reitter)
+ - Fixed #703487, Show typing icon against composing members of a MUC (Chandni Verma)
+ - Fixed #704452, No sound played when salut contact gets online (Xavier Claessens)
+ - Fixed #704454, No sound played when account goes online (Xavier Claessens)
  - Fixed #704469, Crash when deleting a non-chat GOA account (Marco Barisione)
+ - Fixed #705618, Outgoing VoIP windows aren't always front end (Guillaume Desmottes)
+ - Fixed #705668, Some labels does not update correctly when changing account's identifier (Xavier Claessens)
+ - Fixed #706020, Finish geocode-glib 0.99.1 porting (Andreas Henriksson)
+ - Fixed #706125, password prompt dialog has no title (Emilio Pozuelo Monfort)
+ - Fixed #699492, Move the account widget code to a git submodule (Emanuele Aina)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated de Translation (Christian Kirbach)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated hu Translation (Gabor Kelemen)
+ - Updated it Translation (Milo Casagrande)
+ - Updated lt Translation (Aurimas ÄŒernius)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated pt_BR Translation (Rafael Ferreira)
+ - Updated sk Translation (Pavol Kla�anský)
+ - Updated sl Translation (Matej Urban�i�)
+ - Updated zh_CN Translation (Wylmer Wang)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach)
+
+NEW in 3.9.4 (09/07/2013)
+============
+Bugs fixed:
  - Fixed #702095, System crash when typing a long string in empathy (Xavier Claessens)
- - Fixed #691085, Backslash escapes applied in the chat log (Ryan Lortie)
- - Fixed #701914, Return value of tp_debug_client_get_messages_finish() is leaked (Guillaume Desmottes)
+ - Fixed #703453, correctly sort contacts and groups (Frédéric Péters)
+ - Fixed #703775, ContactSearch is not clear when it is no supported (Xavier Claessens)
+
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated gl Translation (Fran Diéguez)
+ - Updated it Translation (Milo Casagrande)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sk Translation (Pavol Kla�anský)
+
+Documentation translations:
+ - Updated es Documentation translation (Daniel Mustieles)
+
+NEW in 3.9.3 (17/06/2013)
+============
+Bugs fixed:
+ - Fixed #680778, Stop using empathy-accounts
  - Fixed #698742, Crash when joining an IRC channel (Xavier Claessens)
+ - Fixed #701281, empathy-sanity-checker: Include empathy-keyring.h when HAVE_UOA is defined. (Iain Lane)
+ - Fixed #701891, New account dialog title is incorrect (Sindhu S)
+ - Fixed #701914, Return value of tp_debug_client_get_messages_finish() is leaked (Guillaume Desmottes)
+
+Translations:
+ - Updated gl Translation (Fran Diéguez)
 
-NEW in 3.8.3 (24/05/2013)
+NEW in 3.9.2 (29/05/2013)
 ============
 Bugs fixed:
  - Fixed #692746, history uses wrong encoding to show utf8 logs (Guillaume Desmottes)
  - Fixed #696151, empathy crashed with SIGSEGV in listing_failed_cb() (Guillaume Desmottes)
+ - Fixed #699333, online-accounts-preferences crashes when accounts need access granted (Xavier Claessens)
+ - Fixed #700084, new *.page added not recognized by git due to commit eb8eb761 (Sindhu S)
 
-NEW in 3.8.2 (20/05/2013)
+Translations:
+ - Updated cs Translation (Marek Černocký)
+ - Updated es Translation (Daniel Mustieles)
+ - Updated he Translation (Yaron Shahrabani)
+ - Updated nb Translation (Kjartan Maraas)
+ - Updated sk Translation (Pavol Kla�anský)
+ - Updated sl Translation (Matej Urban�i�)
+
+Documentation translations:
+ - Updated ca Documentation translation (Gil Forcada, Manel Vidal)
+ - Updated es Documentation translation (Daniel Mustieles)
+
+NEW in 3.9.1 (03/05/2013)
 ============
 Bugs fixed:
+ - Fixed #692160, Updated Icon Names (B.Prathibha)
  - Fixed #697214, call-window: Remember that the audio output has been added (Olivier Crête)
+ - Fixed #697302, Spelling mistake: "You need to setup an account..." (SandipTiwari)
  - Fixed #699017, libempathy: Fix build by adding missing math.h header (Stef Walter)
- - Fixed #699333, online-accounts-preferences crashes when accounts need access granted
+ - Fixed #673775, The icon for audio call in the help is wrong. (Ekaterina Gerasimova)
+ - Fixed #677549, "Link Contacts" user documentation is wrong (Shobha Tyagi)
+
+Translations:
+ - Updated crh Translation (ReÅŸat SABIQ)
+ - Updated it Translation (Milo Casagrande)
+
+Documentation translations:
+ - Updated de Documentation translation (Christian Kirbach)
+ - Updated el Documentation translation (Dimitris Spingos)
+ - Updated es Documentation translation (Daniel Mustieles)
+ - Updated zh_CN Documentation translation (Wylmer Wang)
 
 NEW in 3.8.1 (15/04/2013)
 ============
diff --git a/autogen.sh b/autogen.sh
index b585c552f..ef19a9fb1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,15 +19,15 @@ which gnome-autogen.sh || {
 }
 
 # Fetch submodules if needed
-if test ! -f libempathy-gtk/egg-list-box/COPYING;
+if test ! -f telepathy-account-widgets/COPYING;
 then
   echo "+ Setting up submodules"
   git submodule init
 fi
 git submodule update
 
-cd libempathy-gtk/egg-list-box
+cd telepathy-account-widgets
 sh autogen.sh --no-configure
-cd ../..
+cd ..
 
 USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index eae41a114..7f7df8fb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [8])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_minor_version], [9])
+m4_define([empathy_micro_version], [91])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -37,13 +37,13 @@ AC_COPYRIGHT([
 FOLKS_REQUIRED=0.9.0
 GNUTLS_REQUIRED=2.8.5
 
-GLIB_REQUIRED=2.33.3
+GLIB_REQUIRED=2.37.6
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_34, [Prevent post 2.34 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_38, [Prevent post 2.38 APIs])
 
-GTK_REQUIRED=3.5.1
-AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
-AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
+GTK_REQUIRED=3.9.4
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [Ignore post 3.8 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_10, [Prevent post 3.10 APIs])
 
 CLUTTER_REQUIRED=1.10.0
 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
@@ -69,7 +69,7 @@ GOA_REQUIRED=3.5.1
 
 # Optional deps
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.12
+GEOCLUE_REQUIRED=1.99.3
 GEOCODE_GLIB_REQUIRED=0.99.1
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
@@ -87,15 +87,25 @@ MC_PLUGINS_REQUIRED=5.13.1
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
-# egg-list-box
+# tp-account-widgets
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
+ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/empathy"
+ac_configure_args="$ac_configure_args --with-gettext-package=empathy-tpaw"
+ifelse(empathy_released, 1, [],
+    [
+        ac_configure_args="$ac_configure_args --enable-unreleased-checks"
+    ])
+AX_CONFIG_DIR([telepathy-account-widgets])
 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"libempathy-gtk/egg-list-box
-PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
+PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
+
+EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widgets`
+AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
+   [Name of provider for accounts imported from libaccounts])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -274,10 +284,6 @@ fi
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
-AC_DEFINE(EMPATHY_UOA_PROVIDER,
-    "im.telepathy.Account.Storage.UOA",
-   [Name of provider for accounts imported from libaccounts])
-
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -410,11 +416,18 @@ AC_ARG_ENABLE(location,
 if test "x$enable_location" != "xno"; then
    PKG_CHECK_MODULES(GEOCLUE,
    [
-      geoclue >= $GEOCLUE_REQUIRED
+      geoclue-2.0 >= $GEOCLUE_REQUIRED
    ], have_geoclue="yes", have_geoclue="no")
 
    if test "x$have_geoclue" = "xyes"; then
-      AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
+      GEOCLUE_XML_FILE=`pkg-config --variable=dbus_interface geoclue-2.0`
+      if test "x$GEOCLUE_XML_FILE" = "x"; then
+        echo "Can't find dbus_interface variable in geoclue-2.0.pc"
+        have_geoclue="no"
+      else
+        AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue-2])
+        AC_SUBST(GEOCLUE_XML_FILE)
+      fi
    fi
 else
    have_geoclue="no"
@@ -441,7 +454,7 @@ AC_ARG_ENABLE(geocode,
 if test "x$enable_geocode" != "xno"; then
    PKG_CHECK_MODULES(GEOCODE,
    [
-      geocode-glib >= $GEOCODE_GLIB_REQUIRED
+      geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED
    ], have_geocode="yes", have_geocode="no")
 
    if test "x$have_geocode" = "xyes"; then
diff --git a/data/Makefile.am b/data/Makefile.am
index e6627ae15..a7bada5bf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -60,7 +60,11 @@ css_DATA = \
 	empathy.css \
 	$(NULL)
 
+appdatadir = $(datadir)/appdata
+appdata_files = empathy.appdata.xml
+
 EXTRA_DIST = 				\
+	$(appdata_files) \
 	$(convert_DATA)			\
 	$(desktop_in_files)		\
 	$(desktop_DATA)			\
diff --git a/data/empathy.appdata.xml b/data/empathy.appdata.xml
new file mode 100644
index 000000000..52b18ece5
--- /dev/null
+++ b/data/empathy.appdata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+  <id type="desktop">empathy.desktop</id>
+  <licence>CC0</licence>
+  <description>
+    <p>
+      Empathy is the official instant messaging application of the GNOME desktop environment.  Empathy can connect to AIM, MSN, Jabber (including Facebook and Google Talk), IRC, and many other messaging networks. You can chat with text, make audio and video calls, or even transfer files, depending on what your contact’s chat application allows.
+    </p>
+    <p>
+      Empathy provides integrated messaging for the GNOME desktop, so you’ll never miss a message.  You can respond to your contacts without even having to open Empathy!
+    </p>
+  </description>
+  <url type="homepage">https://wiki.gnome.org/Empathy</url>
+  <screenshots>
+    <screenshot type="default">https://wiki.gnome.org/Empathy?action=AttachFile&amp;do=get&amp;target=empathy.png</screenshot>
+  </screenshots>
+  <updatecontact>telepathy@lists.freedesktop.org</updatecontact>
+</application>
diff --git a/data/empathy.convert b/data/empathy.convert
index eabc9e488..e1e2ac299 100644
--- a/data/empathy.convert
+++ b/data/empathy.convert
@@ -54,8 +54,5 @@ close-main-window = /apps/empathy/hints/close_main_window
   
 [org.gnome.Empathy.location]
 publish = /apps/empathy/location/publish
-resource-network = /apps/empathy/location/resource_network
-resource-cell = /apps/empathy/location/resource_cell
-resource-gps = /apps/empathy/location/resource_gps
 reduce-accuracy = /apps/empathy/location/reduce_accuracy
 
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index c5dea6f7e..2e9b9fc91 100644
--- a/data/empathy.desktop.in.in
+++ b/data/empathy.desktop.in.in
@@ -7,7 +7,7 @@ _Comment=Chat on Google Talk, Facebook, MSN and many other chat services
 _Keywords=chat;talk;im;message;irc;voip;gtalk;facebook;jabber;
 Exec=empathy
 Icon=empathy
-StartupNotify=false
+StartupNotify=true
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Network;InstantMessaging;
diff --git a/data/org.gnome.Empathy.gschema.xml b/data/org.gnome.Empathy.gschema.xml
index 9267cf848..f695431af 100644
--- a/data/org.gnome.Empathy.gschema.xml
+++ b/data/org.gnome.Empathy.gschema.xml
@@ -256,21 +256,6 @@ present them to the user immediately.</description>
       <summary>Empathy can publish the user's location</summary>
       <description>Whether Empathy can publish the user's location to their contacts.</description>
     </key>
-    <key name="resource-network" type="b">
-      <default>true</default>
-      <summary>Empathy can use the network to guess the location</summary>
-      <description>Whether Empathy can use the network to guess the location.</description>
-    </key>
-    <key name="resource-cell" type="b">
-      <default>true</default>
-      <summary>Empathy can use the cellular network to guess the location</summary>
-      <description>Whether Empathy can use the cellular network to guess the location.</description>
-    </key>
-    <key name="resource-gps" type="b">
-      <default>false</default>
-      <summary>Empathy can use the GPS to guess the location</summary>
-      <description>Whether Empathy can use the GPS to guess the location.</description>
-    </key>
     <key name="reduce-accuracy" type="b">
       <default>true</default>
       <summary>Empathy should reduce the location's accuracy</summary>
diff --git a/empathy.doap b/empathy.doap
index 2be67a535..413b87845 100644
--- a/empathy.doap
+++ b/empathy.doap
@@ -4,7 +4,7 @@
          xmlns:foaf="http://xmlns.com/foaf/0.1/"
          xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
-  <name xml:lang="en">Empathy IM Client</name>
+  <name xml:lang="en">empathy</name>
   <shortdesc xml:lang="en">Send and receive messages</shortdesc>
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 
diff --git a/extensions/extensions.h b/extensions/extensions.h
index 2dbd79cc6..c1c421643 100644
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -1,7 +1,6 @@
 #ifndef __EMP_EXTENSIONS_H__
 #define __EMP_EXTENSIONS_H__
 
-#include <glib-object.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"
diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 5072b1618..74949852d 100644
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -24,14 +24,11 @@
  */
 
 #include "config.h"
-
-#include <telepathy-glib/telepathy-glib.h>
+#include "mcp-account-manager-goa.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
 
-#include "mcp-account-manager-goa.h"
-
 #define DEBUG g_debug
 #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
 #define DECLARE_GASYNC_CALLBACK(name) \
diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 406530560..d4e8ae297 100644
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -23,7 +23,7 @@
  *    Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#include <mission-control-plugins/mission-control-plugins.h>
+#include "config.h"
 
 #include "mcp-account-manager-goa.h"
 
diff --git a/help/.gitignore b/help/.gitignore
index 90a9e908f..89cbe39ab 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -3,3 +3,4 @@
 */*.stamp
 */*.page
 */*.xml
+!/C
diff --git a/help/C/account-irc.page b/help/C/account-irc.page
index 213247c8d..4b4b92776 100644
--- a/help/C/account-irc.page
+++ b/help/C/account-irc.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       xmlns:e="http://projectmallard.org/experimental/"
       type="topic" style="screen"
       id="account-irc">
@@ -14,7 +15,7 @@
     <revision pkgversion="2.30" version="0.2" date="2010-04-19" status="review"/>
     <credit type="author">
       <name>Shaun McCance</name>
-      <email>shaunm@gnome.org</email>
+      <email its:translate="no">shaunm@gnome.org</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -103,13 +104,16 @@ telepathy-idle note
     <list>
       <item><p>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>.</p></item>
+      height="16" its:translate="no"><span
+      its:translate="yes">Add</span></media>.</p></item>
       <item><p>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>.</p></item>
+      height="16" its:translate="no"><span
+      its:translate="yes">Edit</span></media>.</p></item>
       <item><p>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>.</p></item>
+      width="16" height="16" its:translate="no"><span
+      its:translate="yes">Remove</span></media>.</p></item>
     </list>
 
     <p>When adding or modifying a network, you can enter the following
diff --git a/help/C/accounts-window.page b/help/C/accounts-window.page
index 8e25b80a2..c8839babf 100644
--- a/help/C/accounts-window.page
+++ b/help/C/accounts-window.page
@@ -5,7 +5,6 @@
 
   <info>
     <link type="topic" xref="add-account"/>
-    <link type="topic" xref="create-account"/>
     <link type="topic" xref="disable-account"/>
     <link type="topic" xref="remove-account"/>
     <desc>Add, modify, and delete accounts.</desc>
diff --git a/help/C/add-account.page b/help/C/add-account.page
index b727eddfa..cdeb4b8d9 100644
--- a/help/C/add-account.page
+++ b/help/C/add-account.page
@@ -1,6 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
-      type="topic" style="task"
+      type="guide" style="task"
       id="add-account">
 
   <info>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
index 0bf6a0b54..3426cd6fc 100644
--- a/help/C/add-contact.page
+++ b/help/C/add-contact.page
@@ -5,7 +5,7 @@
 
   <info>
     <link type="guide" xref="index#contacts"/>
-    <link type="seealso" xref="offline-contacts"/>
+    <link type="seealso" xref="hide-contacts"/>
     <desc>Add someone to the contact list.</desc>
     <revision pkgversion="2.28" version="0.1" date="2009-06-15" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review">
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
index 024b46377..4d9707f38 100644
--- a/help/C/audio-call.page
+++ b/help/C/audio-call.page
@@ -1,5 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="task"
       id="audio-call">
 
@@ -15,10 +16,17 @@
     </revision>
     <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
     <revision pkgversion="2.32" version="0.4" date="2010-09-09" status="review"/>   
+    <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/>
+
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
+    </credit>
+    <credit type="author">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756@gmail.com</email>
     </credit>
+
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
@@ -26,27 +34,27 @@
 
   <title>Start an audio conversation</title>
 
-  <p>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.</p>
+  <p>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.</p>
+
   <steps>
     <item>
       <p>
-        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>.
+        Right-click on the contact that you want to call and select
+        <gui style="menuitem">Audio Call</gui>.
       </p>
     </item>
     <item>
       <p>
         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.</p>
+        see the total conversation time at the bottom of the window.
+      </p>
     </item>
     <item>
       <p>
-        To end the conversation, click on <gui style="button">Hang up</gui>.
+        To end the conversation, click the <gui style="button">hand up</gui>
+        button.
       </p>
     </item>
   </steps>
diff --git a/help/C/create-account.page b/help/C/create-account.page
index e87e117e1..3535a37b1 100644
--- a/help/C/create-account.page
+++ b/help/C/create-account.page
@@ -1,152 +1,145 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       xmlns:e="http://projectmallard.org/experimental/"
       type="topic" style="task"
       id="create-account">
 
   <info>
-    <link type="guide" xref="index#accounts"/>
-    <link type="seealso" xref="add-account"/>
-    <desc>Register for an account with one of the supported messaging services.</desc>
+    <link type="guide" xref="add-account"/>
     <revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
     <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review">
-      <!--
-      <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
-      -->
+    <!--
+    <e:review by="shaunm@gnome.org" date="2009-09-02" status="done"/>
+    -->
     </revision>
     <revision pkgversion="2.30" version="0.3" date="2010-04-19" status="review"/>
     <revision pkgversion="2.30" version="0.4" date="2010-10-01" status="review"/>
+    <revision pkgversion="3.10" date="2013-06-23" status="review"/>
+
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
+    </credit>
+    <credit type="editor">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756@gmail.com</email>
     </credit>
+
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
-<!--
-    <copyright>
-      <year>2009</year>
-      <name>GNOME Documentation Project</name>
-    </copyright>
-    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
--->
+
+    <desc>Create an account for one of the supported messaging services.</desc>
+
   </info>
 
-  <title>Register for a new account</title>
+  <title>Register a new account</title>
+
+  <p>Most account types require you to create an account with a service
+  provider before you can use that account with instant messaging applications.
+  You can use <app>Empathy</app> to register for a new account with some
+  account providers using the same steps as you would to
+  <link xref="add-account">add an account</link>.</p>
+
+  <p>Once you create a new account, your account provider should give you a
+  login or a username and a password, as well as any additional information you
+  need to connect using <app>Empathy</app>.</p>
 
-  <p>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>.</p>
+  <section id="irc">
+    <title>IRC</title>
+
+    <p>IRC networks require that you specify a nick (nickname) when you connect
+    to the server. Some IRC networks use a service, such as NickServ, to allow
+    users to <link xref="irc-nick-password">protect their nick</link>. If you
+    did not register your nick or are unable to do so and another user is using
+    it, then you will need to choose a different one.</p>
+
+    <p>Some IRC servers are password protected. You will need to know the
+    password to connect to these servers. Generally, these are private IRC
+    networks.</p>
+
+    <note>
+      <p>Many GNOME projects use <code>irc.gnome.org</code> for project-related
+      discussion.</p>
+    </note>
+  </section>
 
-  <p>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>.</p>
-  
   <section id="facebook">
     <title>Facebook</title>
-    <p>
-      Facebook is one of the most-used social networks.  It allows users to
-      create their own profile and to communicate with their friends. 
-    </p>
-    <p>
-      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>.
-    </p>
+
+    <p>Facebook is one of the more popular social networks. It allows users to
+    create their own profile and to communicate with their friends.</p>
+
+    <p>To use Facebook to communicate with your friends, you will need to
+    create a new account from the website:
+    <link href="https://www.facebook.com">www.facebook.com</link>.</p>
   </section>
 
   <section id="jabber">
     <title>Jabber</title>
 
-    <p>Jabber is an open instant messaging system.  Like email, Jabber allows
+    <p>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.</p>
 
-    <p>You will need to create a new account with a Jabber provider.  There are
+    <p>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>.</p>
+    <link href="http://register.jabber.org/">jabber.org</link>.</p>
 
     <note>
-      <p>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.</p>
+      <p>If you use Gmail or Google+ Hangouts, you already have a Jabber
+      account. Use your Gmail address and password in <app>Empathy</app> to
+      connect.</p>
     </note>
   </section>
 
   <section id="salut">
     <title>People Nearby</title>
 
-    <p>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.</p>
+    <p>This service works whenever you are connected to a local network, such
+    as a wireless hotspot, you do not need to create an account with service
+    providor, just set up your account through <app>Empathy</app>. It
+    automatically finds all other users on the network who are also using this
+    service.</p>
 
-    <p>For more information, see <link xref="salut-protocol" />.</p>
+    <p>For more information, see the <link xref="salut-protocol">salut
+    protocol</link>.</p>
   </section>
 
   <section id ="sip-services">
     <title>SIP</title>
 
     <p>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,
+    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.</p>
 
-    <note style="warning">
-      <p>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>.</p>
-    </note>
-
     <p>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.</p>
-  </section>
-
-  <section id="irc">
-    <title>IRC</title>
-
-    <p>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.</p>
-
-    <p>Some IRC networks use a service called NickServ to allow users to protect
-    their nicknames.  See <link xref="irc-nick-password"/> for more information.</p>
-
-    <p>Some IRC servers are password protected.  You will need to know the password
-    to connect to these servers.  Generally, these are private IRC networks.</p>
+    Generally, you will need to subscribe to a paid service for this
+    feature.</p>
   </section>
 
   <section id="proprietary-services">
     <title>Proprietary Services</title>
 
     <p>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.
+    developed by different companies or organizations. <app>Empathy</app>
+    allows you to connect to an existing account for some of these 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.</p>
+    visit the website for the service.</p>
 
     <list>
       <item>
-        <p>
-          <link href="http://dashboard.aim.com/aim">AIM</link>
-        </p>
+        <p><link href="http://dashboard.aim.com/aim">AIM</link></p>
       </item>
       <item>
-        <p>
-          <link href="https://www.icq.com/register/">ICQ</link>
-        </p>
+        <p><link href="https://www.icq.com/register/">ICQ</link></p>
       </item>
       <item>
-        <p>
-          <link href="https://accountservices.passport.net">MSN</link>
-        </p>
+        <p><link href="https://accountservices.passport.net">MSN</link></p>
       </item>
       <item>
-        <p>
-          <link href="https://login.yahoo.com/config/login">Yahoo!</link>
-        </p>
+        <p><link href="https://login.yahoo.com/config/login">Yahoo!</link></p>
       </item>
     </list>
   </section>
diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
deleted file mode 100644
index f45d15d56..000000000
--- a/help/C/figures/audio-input-microphone.png
+++ /dev/null
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
deleted file mode 100644
index e5406c5b9..000000000
--- a/help/C/figures/camera-web.png
+++ /dev/null
diff --git a/help/C/index.page b/help/C/index.page
index 5b700188d..778115e51 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,11 +1,10 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="index">
 
   <info>
-    <title type="link">Empathy Internet Messenger</title>
-    <title type="text">Empathy Internet Messenger</title>
     <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/>
     <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
     <revision pkgversion="2.28" version="0.2" date="2009-09-05" status="review">
@@ -15,20 +14,26 @@
     </revision>
     <revision pkgversion="2.30" version="0.3" date="2010-02-03" status="review"/>
     <revision pkgversion="2.32" version="0.4" date="2010-09-11" status="review"/>
+    <revision pkgversion="3.10" date="2013-06-23" status="review"/>
+
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
+
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>    
+
+    <desc>Empathy is the instant messenging application for GNOME. It supports text, voice and video chat over many protocols.</desc> 
+
+    <title type="link">Empathy</title>
+    <title type="text">Empathy</title>
   </info>
 
   <title>
-    <media type="image" mime="image/png" src="figures/empathy-logo.png">
-      Empathy Internet Messenger logo
-    </media>
-    Empathy Internet Messenger
+    <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no" />
+    Empathy
   </title>
 
   <section id="accounts" style="2column">
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 06184ac66..6a23cd142 100644
--- a/help/C/link-contacts.page
+++ b/help/C/link-contacts.page
@@ -15,6 +15,10 @@
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
+    <credit type="editor">
+      <name>Shobha Tyagi</name>
+      <email>tyagishobha@gmail.com</email>
+    </credit>
     <license>
       <p>
         Creative Commons Share Alike 3.0
@@ -22,18 +26,18 @@
     </license>
   </info>
 
-  <title>Combine and separate contacts</title>
+  <title>Link and unlink contacts</title>
   <p>
-    If one, or more, of your contacts has multiple accounts with different
-    messaging services, you can combine these contacts into a single one.
+    If one or more of your contacts has multiple accounts with different
+    messaging services, you can combine these accounts into a single contact.
   </p>
   <p>
     The resulting contact is called a <em>meta-contact</em>: a contact composed
     from different single contacts.
   </p>
   <p>
-    If you have a Jane Smith contact that is using three different messaging
-    services like:
+    Suppose you have a contact called Jane Smith who is using three different
+    messaging services like:
   </p>
   <list>
     <item>
@@ -55,52 +59,71 @@
   <p>
     You can combine these contacts into a single Jane Smith one.
   </p>
-  
   <section id="linking">
-    <title>Combining contacts</title>
+  <title>Link contacts</title>
+  <p>
+    The way you can link your contacts is as follows:
+  </p>
     <steps>
       <item>
         <p>
-          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>.
+          Press the tick button to select entries you want to link. This will enable
+          <em>selection mode</em> and you can see a checkbox for each entry.
         </p>
       </item>
       <item>
         <p>
-          From the left pane in the <gui>Link Contacts</gui> window,
-          select the contacts you want to combine.
+	  Tick the checkboxes that correspond to the <app>Contacts</app> entries which
+	  belong to the same contact.
         </p>
       </item>
       <item>
         <p>
-          Click <gui style="button">Link</gui>.
+          Press <gui style="button">Link</gui>.
         </p>
       </item>
     </steps>
-    <note>
-      <p>
-        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.
-      </p>
-    </note>
+    <p>
+      Repeat steps 3 and 4 in order to link other contacts.
+    </p>
   </section>
   
-  <section id="unlinkg">
-    <title>Separating contacts</title>
+  <section id="unlinking">
+  <title>Unlink contacts</title>
+  <p>
+    To unlink a linked contact:
+  </p>
     <steps>
       <item>
         <p>
-          From the <gui>Contact List</gui>, right-click the contact
-          to separate, and select <gui style="menuitem">Link Contacts...</gui>.
+          Select the contact from your list.
+        </p>
+      </item>
+      <item>
+        <p>
+          Press <gui style="button">Edit</gui> in the top-right corner of <app>Contacts</app>.
+	</p>
+      </item>
+      <item>
+	<p>
+	  Press <gui style="button">Linked Contacts</gui>.
+        </p>
+      </item>
+      <item>
+	<p>
+	  Press <gui style="button">Remove</gui> to unlink an entry from the linked contact.
         </p>
       </item>
       <item>
         <p>
-          Click <gui style="button">Unlink</gui>.
+          Press <gui style="button">Close</gui> if you do not want to unlink any more contacts.
         </p>
       </item>
+      <item>
+        <p>
+	  Finally, press <gui style="button">Done</gui> to finish editing.
+	</p>
+      </item>
     </steps>
   </section>
 </page>
diff --git a/help/C/overview.page b/help/C/overview.page
index daa67b844..2ce72a9d0 100644
--- a/help/C/overview.page
+++ b/help/C/overview.page
@@ -1,4 +1,5 @@
-<page  xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic"
       id="overview">
 
@@ -10,11 +11,11 @@
     </desc>
     <credit type="author">
       <name>Aruna S</name>
-      <email>aruna.evam@gmail.com</email>
+      <email its:translate="no">aruna.evam@gmail.com</email>
     </credit>
     <credit type="editor">
       <name>Ekaterina Gerasimova</name>
-      <email>kittykat3756@gmail.com</email>
+      <email its:translate="no">kittykat3756@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -34,9 +35,9 @@
 
   <table frame="all" shade="cols">
      <tr>
-       <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
-       <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
-       <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150"></media></p></td>
+       <td><p><media type="image" src="figures/video_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
+       <td><p><media type="image" src="figures/conf_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
+       <td><p><media type="image" src="figures/croom_overview.png" mime="image/png" style="right" width="150" height="150" its:translate="no" /></p></td>
      </tr>
      <tr>
        <td><p>Video Conference</p></td>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
index 38ca57c43..0ce4a506a 100644
--- a/help/C/prob-conn-auth.page
+++ b/help/C/prob-conn-auth.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="prob-conn-auth">
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic"
+      id="prob-conn-auth">
 
   <info>
     <link type="guide" xref="prob-conn"/>
@@ -15,11 +16,11 @@
     <revision pkgversion="2.30" version="0.4" date="2010-02-16" status="review"/>
     <credit type="author">
       <name>Phil Bull</name>
-      <email>philbull@gmail.com</email>
+      <email its:translate="no">philbull@gmail.com</email>
     </credit>
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -54,10 +55,8 @@
       </p>
     </item>
     <item>
-      <p>
-       Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> 
-        icon in the error message.
-      </p>
+      <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media> 
+      icon in the error message.</p>
     </item>
     <item>
       <p>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 00407a665..f3bdefd35 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="prob-conn-name">
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic"
+      id="prob-conn-name">
 
   <info>
     <link type="guide" xref="prob-conn"/>
@@ -16,7 +17,7 @@
     <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -40,10 +41,8 @@
 
   <steps>
     <item>
-      <p>
-        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
-        icon in the error message.
-      </p>
+      <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+      icon in the error message.</p>
     </item>
     <item>
       <list>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index 91d482222..146c0eb7d 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="prob-conn-neterror">
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic"
+      id="prob-conn-neterror">
 
   <info>
     <link type="guide" xref="prob-conn"/>
@@ -13,11 +14,11 @@
     <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Phil Bull</name>
-      <email>philbull@gmail.com</email>
+      <email its:translate="no">philbull@gmail.com</email>
     </credit>
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -55,10 +56,8 @@
       </p>
     </item>
     <item>
-      <p>
-        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
-        icon in the error message.
-      </p>
+      <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+      icon in the error message.</p>
     </item>
     <item>
       <p>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
index be63f994d..1212fdb7c 100644
--- a/help/C/status-icons.page
+++ b/help/C/status-icons.page
@@ -1,4 +1,5 @@
 <page xmlns="http://projectmallard.org/1.0/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       xmlns:e="http://projectmallard.org/experimental/"
       type="topic" style="concept"
       id="status-icons">
@@ -14,11 +15,11 @@
     </revision>
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
     <credit type="author">
       <name>Shaun McCance</name>
-      <email>shaunm@gnome.org</email>
+      <email its:translate="no">shaunm@gnome.org</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -36,13 +37,13 @@
 
   <terms>
     <item>
-      <title><media type="image" mime="image/png" src="figures/available.png">Available icon</media>
+      <title><media type="image" mime="image/png" src="figures/available.png" its:translate="no"><span its:translate="yes">Available icon</span></media>
       <gui>Available</gui></title>
       <p>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.</p>
     </item>
     <item>
-      <title><media type="image" mime="image/png" src="figures/busy.png">Busy icon</media>
+      <title><media type="image" mime="image/png" src="figures/busy.png" its:translate="no"><span its:translate="yes">Busy icon</span></media>
       <gui>Busy</gui></title>
       <p>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
@@ -50,7 +51,7 @@
       bubbles and sounds when you are busy.  You can set a custom message for this status.</p>
     </item>
     <item>
-      <title><media type="image" mime="image/png" src="figures/away.png">Away icon</media>
+      <title><media type="image" mime="image/png" src="figures/away.png" its:translate="no"><span its:translate="yes">Away icon</span></media>
       <gui>Away</gui></title>
       <p>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
@@ -59,14 +60,14 @@
       away.  You can set a custom message for this status.</p>
     </item>
     <item>
-      <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media>
+      <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media>
       <gui>Invisible</gui></title>
       <p>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.</p>
     </item>
     <item>
-      <title><media type="image" mime="image/png" src="figures/offline.png">Offline icon</media>
+      <title><media type="image" mime="image/png" src="figures/offline.png" its:translate="no"><span its:translate="yes">Offline icon</span></media>
       <gui>Offline</gui></title>
       <p>Setting your status to <em>Offline</em> disconnects you from all of
       your accounts.</p>
diff --git a/help/C/video-call.page b/help/C/video-call.page
index bbd4c6812..0cdd63c1a 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -1,5 +1,6 @@
 <page xmlns="http://projectmallard.org/1.0/"
       xmlns:e="http://projectmallard.org/experimental/"
+      xmlns:its="http://www.w3.org/2005/11/its"
       type="topic" style="task"
       id="video-call">
 
@@ -18,10 +19,17 @@
     </revision>
     <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
     <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
+    <revision pkgversion="3.8" version="0.4" date="2013-04-15" status="review"/>
+
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
+    </credit>
+    <credit type="author">
+      <name>Ekaterina Gerasimova</name>
+      <email its:translate="no">kittykat3756@gmail.com</email>
     </credit>
+
     <license>
       <p>Creative Commons Share Alike 3.0</p>
     </license>
@@ -35,28 +43,24 @@
 
   <steps>
     <item>
-      <p>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>.
-      </p>
+      <p>Right-click on the contact that you want to call and select
+      <gui style="menuitem">Video Call</gui>.</p>
     </item>
     <item>
       <p>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.</p>
+      see the total conversation time at the bottom of the window.</p>
     </item>
     <item>
-      <p>
-        To end the conversation, click on <gui style="button">Hang up</gui>.
-      </p>
+      <p>To end the conversation, click on the <gui style="button">hang
+      up</gui> button.</p>
     </item>
   </steps>
+
   <note style="tip">
-    <p>
-      To turn a video conversation into an audio conversation, choose
-      <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.
-    </p>
+    <p>To turn a video conversation into an audio conversation, choose
+    <guiseq><gui style="menu">Video</gui><gui style="menuitem">Video Off</gui></guiseq>.</p>
   </note>
+
   <section id="video-meta-contact">
     <title>Start a video conversation with a meta-contact</title>
     <steps>
diff --git a/help/Makefile.am b/help/Makefile.am
index 60b9facab..6253e2a0b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -2,11 +2,9 @@
 
 HELP_ID = empathy
 HELP_MEDIA = \
-	figures/audio-input-microphone.png \
 	figures/available.png \
 	figures/away.png \
 	figures/busy.png \
-	figures/camera-web.png \
 	figures/empathy-main-window.png \
 	figures/empathy-logo.png \
 	figures/gtk-add.png \
diff --git a/help/ca/ca.po b/help/ca/ca.po
index 3193c282a..d1fdd8f16 100644
--- a/help/ca/ca.po
+++ b/help/ca/ca.po
@@ -2,1837 +2,1735 @@
 # Copyright © 2009 Free Software Foundation, Inc.
 # Joan Duran <jodufi@gmail.com>, 2008, 2009.
 # Carles Ferrando Garcia <carles.ferrando@gmail.com>, 2010.
+# Manel Vidal <verduler@gmail.com>, 2013.
+# Gil Forcada <gilforcada@guifi.net>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: emphaty\n"
-"POT-Creation-Date: 2011-04-01 02:16+0000\n"
-"PO-Revision-Date: 2010-05-28 22:37+0200\n"
-"Last-Translator: Carles Ferrando Garcia <carles.ferrando@gmail.com>\n"
+"POT-Creation-Date: 2013-05-07 13:30+0000\n"
+"PO-Revision-Date: 2013-05-08 23:43+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"Language: ca\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: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 ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+"Joan Duran <jodufi@gmail.com>, 2008, 2009\n"
+"Carles Ferrando <carles.ferrando@gmail.com>, 2010\n"
+"Gil Forcada <gilforcada@guifi.net>, 2011\n"
+"Manel Vidal <verduler@gmail.com>, 2013"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "Inicieu una conversa de vídeo amb un dels contactes."
+#: C/index.page:8(info/title)
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Missatgeria d'Internet Empathy"
+
+#: C/index.page:9(info/title)
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Missatgeria d'Internet Empathy"
 
-#: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:13(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: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: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:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(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:25(credit/name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:14(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: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: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:17(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: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: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:24(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:31(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:28(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:23(license/p) C/overview.page:20(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:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Reconeixement-Compartir Igual 3.0"
 
-#: C/video-call.page:28(title)
-msgid "Start a video conversation"
-msgstr "Inicieu una conversa de vídeo"
-
-#: C/video-call.page:30(p)
-#, fuzzy
-#| msgid ""
-#| "If you have a webcam, you can call your contacts and have an 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 ""
-"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 ""
-"Si teniu una càmera web, podeu trucar els contactes i tindre una "
-"vídeo conferencia amb ells. Aquesta característica sols funciona amb certs "
-"tipus de comptes, i requereix que l'altra persona tingui una aplicació que "
-"suporti vídeo trucades."
-
-#: C/video-call.page:37(p)
-#, fuzzy
-#| 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>. Alternatively, right click the contact and "
-#| "choose <gui style=\"menuitem\">Video Call</gui>."
-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 ""
-"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la "
-"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
-"\">vídeo trucada</media> a la vora del nom del contacte que vols trucar i "
-"escull <gui style=\"menuitem\">Vídeo trucada</gui>. També podeu fer clic al "
-"botó dret sobre el contacte i escull <gui style=\"menuitem\">Vídeo trucada</"
-"gui>."
-
-#: 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 ""
-"S'obrirà una finestra nova. Quan s'estableixi la connexió veureu que a la "
-"part inferior de la finestra posa <gui>Connectat</gui> juntament amb la durada "
-"de la conversa."
-
-#: 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 ""
-"Per acabar la conversa feu clic a <gui style=\"button\">Penja</gui>."
-
-#: 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 ""
-"Per canviar d'una conversa de vídeo a una conversa d'àudio, escolliu "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Apaga el vídeo</"
-"gui></guiseq>."
+#: C/index.page:30(media/span)
+msgid "Empathy Internet Messenger logo"
+msgstr "Logotip del programa de missatgeria d'Internet Empathy"
 
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "Inicia una conversa de vídeo amb un metacontacte"
+#: C/index.page:28(page/title)
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "<_:media-1/> Missatgeria d'Internet Empathy"
 
-#: 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 ""
-"Des de la finestra <gui>Llista de contactes</gui>, feu clic amb el botó "
-"secundari al metacontacte."
-
-#: 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 ""
-"Seleccioneu el contacte amb el que voleu realitzar la conversa i des del menú "
-"seleccioneu <gui style=\"menuitem\">Trucada de vídeo</gui>."
+#: C/index.page:36(section/title)
+msgid "Account Management"
+msgstr "Gestió de comptes"
 
-#: C/video-call.page:75(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 ""
+#: C/index.page:40(section/title)
+msgid "Contact Management"
+msgstr "Gestió de contactes"
 
-#. 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=1952a8952efbe87e84b21e09e0587e71"
+#: C/index.page:44(section/title)
+msgid "Text Conversations"
+msgstr "Converses de text"
 
-#. 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=6cab57171fb6d732a85ace48f11cf207"
+#: C/index.page:48(section/title)
+msgid "Audio and Video Conversations"
+msgstr "Converses de veu i de vídeo"
 
-#. 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=9a93ccca527af39cbe11db5c9d915ca0"
+#: C/index.page:52(section/title)
+msgid "Advanced Actions"
+msgstr "Opcions avançades"
 
-#. 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=565ba82fbedd22e4eb5b810750199527"
+#: C/index.page:56(section/title) C/irc-manage.page:64(section/title)
+msgid "Common Problems"
+msgstr "Problemes comuns"
 
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "Explicació dels diversos estats i icones d'estat."
+#. 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 "Informació addicional per connectar-se a xarxes d'IRC."
 
-#: 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/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "Icones i tipus d'estats"
-
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "Icona de disponibilitat"
-
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "Disponible"
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "Dades del compte d'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 ""
-"Utilitzeu l'estat <em>Disponible</em> quan esteu a l'ordinador i esteu "
-"disponibles per xatejar. Podeu configurar un missatge personalitzat per "
-"aquest estat."
+"Els comptes d'IRC requereixen una informació diferent que els altres tipus "
+"de comptes. Per crear un compte d'IRC heu d'especificar com a mínim una "
+"xarxa d'IRC i un sobrenom. Aquesta pàgina descriu la informació que podeu "
+"proporcionar pel compte d'IRC."
 
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "Icona d'ocupat"
+#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"Heu de tenir instal·lat el paquet <sys>telepathy-idle</sys> per utilitzar "
+"l'IRC amb l'<app>Empathy</app>."
 
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "Ocupat"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr "<gui>Xarxa</gui>"
 
-#: C/status-icons.page:47(p)
+#: C/account-irc.page:46(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."
+"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 ""
-"Utilitzeu l'estat <em>Ocupat</em> per mostrar als contactes que no voleu "
-"xatejar ara. Encara podran xatejar si volen, per exemple si tenen alguna cosa "
-"urgent a comentar-vos. Per defecte, l'<app>Empathy</app> no utilitzarà "
-"finestres emergents ni sons quan esteu ocupats. Podeu configurar un missatge "
-"personalitzat per aquest estat."
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "Icona d'absent"
+"L'IRC és un sistema obert que permet que puguin haver-hi tantes xarxes d'IRC "
+"com es vulgui. Cada xarxa és diferent de les altres i té els seus propis "
+"usuaris i sales de xat. L'<app>Empathy</app> us mostra les xarxes més "
+"populars a la llista desplegable <gui>Xarxa</gui>. Podeu afegir més xarxes "
+"si voleu. Vegeu <link xref=\"#networks\"/> més avall."
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "Absent"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr "<gui>Sobrenom</gui>"
 
-#: C/status-icons.page:55(p)
+#: C/account-irc.page:54(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."
+"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 ""
-"Utilitzeu l'estat <em>Absent</em> quan sou lluny de l'ordinador. "
-"L'<app>Empathy</app> us posa automàticament l'estat «Absent» si esteu un temps "
-"sense utilitzar l'ordinador o si s'activa l'estalvi de pantalla. Per defecte, "
-"l'<app>Empathy</app> no utilitzarà finestres emergents ni sons quan esteu "
-"absents. Podeu configurar un missatge personalitzat per aquest estat."
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "Icona de desconnectat"
+"El vostre sobrenom és el nom únic que us identifica a la xarxa d'IRC. Només "
+"una persona pot utilitzar un sobrenom específic a cada xarxa. Si rebeu un "
+"error que diu <link xref=\"prob-conn-name\" role=\"error-msg\"/> haureu de "
+"canviar el sobrenom."
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "Invisible"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr "<gui>Contrasenya</gui>"
 
-#: C/status-icons.page:64(p)
+#: C/account-irc.page:61(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."
+"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 ""
-"Quan poseu l'estat com a <em>Invisible</em>, apareixereu com a desconnectat "
-"per als contactes. Encara estareu connectat als comptes i podreu "
-"veure l'estat dels contactes i xatejar-hi."
+"Per connectar-se a alguns servidors, en especial els de les xarxes privades, "
+"us farà falta una contrasenya. Si esteu autoritzat a utilitzar la xarxa, els "
+"seus administradors us en proporcionaran la contrasenya."
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "Desconnectat"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "Contrasenyes de NickServ"
 
-#: C/status-icons.page:71(p)
+#: C/account-irc.page:66(note/p)
 msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
+"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 ""
-"Si establiu l'estat com a <em>Desconnectat</em> us desconnectarà de tots "
-"els contactes."
-
-#: C/share-desktop.page:7(desc)
-msgid "Share the desktop with your contacts."
-msgstr "Compartiu l'escriptori amb els contactes."
+"En algunes xarxes es poden registrar els sobrenoms amb un servei conegut com "
+"a NickServ. L'<app>Empathy</app> encara no permet utilitzar sobrenoms amb "
+"contrasenyes. En algunes xarxes, entre elles la popular xarxa freenode, els "
+"servidors de contrasenyes es reenvien automàticament al NickServ, de manera "
+"que podeu establir aquest camp per identificar-vos amb el NickServ. Vegeu "
+"<link xref=\"irc-nick-password\"/> per més informació."
 
-#: C/share-desktop.page:28(title)
-msgid "Share your desktop"
-msgstr "Compartiu l'escriptori"
+#: C/account-irc.page:76(item/title)
+msgid "<gui>Real name</gui>"
+msgstr "<gui>Nom real</gui>"
 
-#: C/share-desktop.page:30(p)
+#: C/account-irc.page:77(item/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."
+"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 ""
-"Podeu compartir l'escriptori amb algun contacte o que algun contacte us "
-"comparteixi el seu escriptori. Podeu utilitzar-ho per mostrar l'escriptori "
-"als contactes, per demanar-los ajuda o ajudar-los a resoldre un problema."
+"Podeu proporcionar el vostre nom real conjuntament amb el sobrenom. Els "
+"altres usuaris el podran veure quan vegin la vostra informació."
+
+#: C/account-irc.page:81(item/title)
+msgid "<gui>Quit message</gui>"
+msgstr "<gui>Missatge de desconnexió</gui>"
 
-#: C/share-desktop.page:38(p)
+#: C/account-irc.page:82(item/p)
 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."
+"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 ""
-"Per tal d'habilitar la compartició d'escriptori o utilitzar de forma remota "
-"l'escriptori d'un contacte, us cal tenir una aplicació de visualització "
-"d'escriptoris remots instal·lat al sistema."
+"Quan sortiu, s'enviarà un missatge a totes les sales de xat que estigueu i "
+"tots els usuaris amb els que tingueu xats privats. Utilitzeu aquest camp per "
+"proporcionar un missatge de sortida personalitzat."
 
-#: C/share-desktop.page:46(p) 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 ""
-"Des de la finestra <gui>Llista de contactes</gui> executeu una de les "
-"següents accions:"
+#: C/account-irc.page:94(info/title)
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "Xarxes d'IRC"
 
-#: C/share-desktop.page:51(p)
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Xarxes"
+
+#: C/account-irc.page:99(section/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>."
+"<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 ""
-"Seleccioneu el contacte amb el que voleu compartir l'escriptori i escolliu "
-"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Comparteix el meu "
-"escriptori</gui></guiseq>."
+"L'<app>Empathy</app> inclou una llista de les xarxes d'IRC més populars. Si "
+"voleu una altra xarxa, podeu afegir-la a la llista. També podeu modificar "
+"xarxes existents i esborrar-ne de la llista."
 
-#: C/share-desktop.page:57(p)
+#: C/account-irc.page:104(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 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 ""
-"Feu clic amb el botó secundari sobre el contacte amb el qual voleu compartir "
-"l'escriptori i seleccioneu <gui>Comparteix el meu escriptori</gui>."
+"Feu clic a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png"
+"\" width=\"16\" height=\"16\">Afegeix</media> per afegir una xarxa a la "
+"llista."
 
-#: C/share-desktop.page:65(p)
+#: C/account-irc.page:107(item/p)
 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."
+"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 ""
-"S'enviarà una sol·licitud al contacte amb el qual voleu compartir "
-"l'escriptori. Si l'accepta s'iniciarà l'aplicació de visualització "
-"d'escriptoris remots per permetre-us desconnectar l'usuari que controla "
-"el vostre escriptori."
+"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">Edita</"
+"media> per modificar una xarxa de la llista."
 
-#: C/share-desktop.page:70(p)
+#: C/account-irc.page:110(item/p)
 msgid ""
-"For more information about how to use the remote desktop viewer application, "
-"refer to its help."
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
 msgstr ""
-"Per més informació sobre com utilitzar l'aplicació de visualització "
-"d'escriptoris remots mireu la seva ajuda."
+"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" mime="
+"\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height="
+"\"16\">Suprimeix</media> per suprimir una xarxa de la llista."
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:115(section/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"When adding or modifying a network, you can enter the following information:"
 msgstr ""
-"Quan compartiu l'escriptori amb algú altre, podeu notar un alentiment del "
-"sistema i una disminució de la velocitat d'Internet."
+"Quan afegiu o modifiqueu una xarxa podeu introduir la informació següent:"
 
-#: C/share-desktop.page:83(p)
+#: C/account-irc.page:121(item/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."
+"This is the name of the network as you want it to appear in the list of "
+"networks."
 msgstr ""
-"Potser no tots els contactes podran utilitzar aquesta funció. Cal que tinguin "
-"com a mínim la versió 2.28 de l'<app>Empathy</app> i una aplicació "
-"de visualització d'escriptoris remots instal·lada al sistema."
-
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "Afegiu, editeu o suprimiu missatges personals dels vostres estats."
-
-#: 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"
+"Aquest és el nom de la xarxa que voleu que aparegui a la llista de xarxes."
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "Establiu un missatge personalitzat"
+#: C/account-irc.page:125(item/title)
+msgid "<gui>Charset</gui>"
+msgstr "<gui>Joc de caràcters</gui>"
 
-#: C/set-custom-status.page:36(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
 msgstr ""
-"A vegades voleu deixar un missatge personalitzat pel vostre estat, per exemple "
-"per fer saber als contactes que no estareu disponible durant una estona."
+"Això especifica la codificació de caràcters que s'utilitza en aquesta xarxa. "
+"Una codificació de caràcters és un format específic per enregistrar "
+"caràcters internament a l'ordinador. Hi ha moltes codificacions de caràcters "
+"i heu d'utilitzar la mateixa que els altres usuaris per veure els missatges "
+"de forma correcta."
 
-#: 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 ""
-"Podeu deixar un missatge personalitzat per a cada estat disponible."
+"Per defecte l'<app>Empathy</app> utilitza l'UTF-8 , una codificació de "
+"caràcters moderna que pot gestionar text escrit en la immensa majoria de les "
+"llengües del món. Una altra codificació de caràcters per l'anglès i algunes "
+"llengües occidentals és l'ISO-8859-1."
 
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Servidors</gui>"
+
+#: 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 ""
-"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista "
-"desplegable de la part superior."
+"Una xarxa d'IRC pot tenir molts servidors als que us podeu connectar. Quan "
+"esteu connectat a un servidor d'una xarxa en particular, us podeu comunicar "
+"amb tots els usuaris de tots els servidors d'aquella xarxa. Podeu afegir o "
+"suprimir servidors per a aquesta xarxa utilitzant els botons <gui>Afegeix</"
+"gui> i <gui>Suprimeix</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 ""
-"Seleccioneu l'estat al que voleu afegir-li el missatge personalitzat. Heu de "
-"seleccionar el que està identificat amb l'etiqueta <gui>Missatge personalitzat</"
-"gui>."
+"Quan seleccioneu un servidor feu clic al camp de <gui>Servidor</gui> o "
+"<gui>Port</gui> per editar-lo. També ho podeu fer amb les tecles de "
+"navegació de cap a la dreta i de cap a l'esquerra per donar el focus al camp "
+"i si feu clic a la barra espaiadora editareu el camp."
 
-#: 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 ""
-"Introduïu el missatge personalitzat a la caixa de text de dalt de la finestra "
-"i premeu <key>Retorn</key> per establir el missatge."
+"Seleccioneu la casella de selecció de la columna <gui>SSL</gui> per xifrar "
+"totes les comunicacions amb el servidor. Adoneu-vos que això no impedirà que "
+"altres usuaris de la xarxa puguin veure el que escriviu en un xat públic."
+
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Opcions avançades per als comptes de Jabber i de Google Talk."
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Dades dels comptes de 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 ""
-"Si voleu establir el missatge personalitzat com a preferit, per poder-lo "
-"utilitzar en un altre moment, feu clic a l'estrela petita a la dreta de la "
-"caixa de text on heu escrit el missatge personalitzat."
+"Per connectar-se a la majoria de comptes de Jabber només fa falta el nom "
+"d'usuari i la contrasenya. Tot i així, per alguns comptes o tipus de xarxes "
+"haureu d'introduir informació addicional al secció <gui>Avançada</gui>. "
+"Normalment, no us farà falta utilitzar les opcions avançades. Vegeu <link "
+"xref=\"add-account\"/> per les instruccions generals de com afegir comptes."
 
-#: 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 ""
-"So no el deseu com a preferit quan torneu a iniciar l'<app>Empathy</app> no "
-"estarà disponible com a missatge personalitzat. Només es desarà per la sessió "
-"actual."
+"Com que el Google Talk també és un tipus de compte de Jabber, les "
+"instruccions següents també serveixen."
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Editeu , suprimiu i afegiu un missatge personalitzat"
+#: C/account-jabber.page:45(item/title)
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Es requereix encriptació (TLS/SSL)</gui>"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "Seleccioneu <gui>Edita el missatge personalitzat</gui>."
+#: C/account-jabber.page:46(item/title)
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "<gui>Ignora els errors del certificat SSL</gui>"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "Per editar un missatge personalitzat:"
-
-#: 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 ""
-"Des de la caixa <guilabel>Paràmetres desats</guilabel>, seleccioneu el "
-"missatge d'estat que voleu editar i feu-hi doble clic."
-
-#: 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 ""
-"Teclegeu el missatge personalitzat nou i premeu <key>Retorn</key> per "
-"modificar-lo."
-
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "Per suprimir un missatge personalitzat:"
+"Sempre que sigui possible, es xifren les comunicacions entre l'<app>Empathy</"
+"app> i el servidor de Jabber. Si no és possible, s'envien els missatges "
+"sense xifrar. Seleccioneu <gui>Es requereix encriptació</gui> per impedir "
+"que l'<app>Empathy</app> es comuniqui amb el servidor de Jabber si no es pot "
+"establir una comunicació xifrada."
 
-#: 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 ""
-"Des de la caixa <guilabel>Paràmetres desats</guilabel>, seleccioneu el "
-"missatge d'estat que voleu suprimir."
+"Alguns servidors de Jabber xifren les dades amb certificats no vàlids o "
+"d'autoritats no reconegudes. Si confieu en el servidor al que us connecteu, "
+"podeu seleccionar <gui>Ignora els errors del certificat SSL</gui> per "
+"permetre la comunicació xifrada amb certificats no vàlids."
 
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "Feu clic al botó <gui>Suprimeix</gui>."
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Recurs</gui>"
 
-#: C/set-custom-status.page:131(p)
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioritat</gui>"
+
+#: 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 ""
-"Per afegir un missatge personalitzat nou des de la secció <gui>Afegeix un "
-"paràmetre nou</gui>:"
+"Si teniu més d'una aplicació (en ordinadors diferents) connectats al mateix "
+"temps al mateix compte, podeu configurar un recurs per identificar de forma "
+"inequívoca cadascun d'ells. Per defecte l'<app>Empathy</app> utilitzarà "
+"<input>Telepathy</input> com a recurs."
 
-#: 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 ""
-"Feu clic a la llista desplegable per seleccionar l'estat al que voleu "
-"afegir-hi el missatge personalitzat."
+"Podeu establir la prioritat per especificar quina aplicació rebrà els "
+"missatges entrants dels contactes. Els missatges nous s'enviaran a "
+"l'aplicació que tingui la màxima prioritat."
 
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "Feu clic a la caixa de text i escriu el missatge personalitzat nou."
+#: C/account-jabber.page:70(item/title)
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Sobreescriu els paràmetres del servidor</gui>"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#: 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 ""
-"Feu clic a <gui>Afegeix</gui> per afegir el missatge nou als per defecte."
+"L'<app>Empathy</app> utilitza els paràmetres per defecte, basant-se en el "
+"nom d'usuari, per connectar-se al servidor de Jabber. Per alguns servidors "
+"de Jabber us caldrà introduir els paràmetres del servidor manualment. "
+"Aquests paràmetres els hauria de proporcionar el proveïdor de Jabber."
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "Feu clic a <gui>Tanca</gui> quan hàgiu acabat."
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Afegiu, modifiqueu i suprimiu comptes."
 
-#: C/set-custom-status.page:163(p)
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Finestra dels comptes"
+
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"Quan editeu o afegiu un missatge personalitzat nou, no s'establirà com "
-"el missatge actual. L'haureu de seleccionar a la finestra <gui>Llista de "
-"contactes</gui>."
+"La finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir "
+"comptes."
 
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Envieu un missatge a un dels contactes."
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Dades dels comptes"
 
-#: 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/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 ""
+"Per a majoria de tipus de comptes només us caldrà entrar el nom d'usuari i "
+"la contrasenya. Tanmateix alguns comptes o tipus de comptes requereixen "
+"informació addicional."
 
-#: 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:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Afegiu un compte nou a l'<app>Empathy</app>."
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Envieu una missatge a algú"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Afegiu un compte nou"
 
-#: C/send-message.page:36(p)
-#, fuzzy
-#| msgid ""
-#| "Double click the name of the contact that you want to have a conversation "
-#| "with."
+#: 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 ""
-"Feu doble clic sobre el nom del contacte amb el qual voleu tindre la "
-"conversació."
+"Podeu afegir comptes de missatgeria instantània per a qualsevol servei "
+"habilitat per comunicar-vos amb el contactes a través de l'<app>Empathy</"
+"app>. Per a alguns proveïdors de comptes aquests passos us permeten "
+"registrar-hi un compte nou. Vegeu <link xref=\"create-account\"/> per a més "
+"informació."
 
-#: 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 ""
-"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 ""
-"S'obrirà una finestra nova. Teclegeu el missatge a la caixa a la part "
-"inferior de la finestra i premeu <key>Retorn</key> per enviar-lo."
+"Des de la finestra <gui>Llista de contactes</gui> seleccioneu "
+"<guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> o premeu la tecla "
+"<key>F4</key>."
 
-#: C/send-message.page:50(title)
-#, fuzzy
-#| msgid "Send a message to someone"
-msgid "Send a message to a meta-contact"
-msgstr "Com enviar una missatge a algú"
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Feu clic a <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 ""
-"Seleccioneu el contacte amb el que voleu conversar i des del menú seleccioneu "
-"<gui style=\"menuitem\">Xat</gui>."
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "Envieu un fitxer des del vostre ordinador a un dels contactes."
+"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de "
+"compte que vulgueu afegir."
 
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "Envia fitxers"
+#: 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 ""
+"Si no teniu un compte registrat, seleccioneu <gui>Crea un compte nou al "
+"servidor</gui>. Aquesta característica no està disponible per tots els tipus "
+"de comptes i pot no funcionar amb alguns proveïdors. Vegeu <link xref="
+"\"create-account\"/> per a més informació."
 
-#: 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 ""
-"Feu clic amb el botó secundari al contacte que li voleu enviar el fitxer i "
-"seleccioneu <gui>Envia un fitxer</gui>."
+"Introduïu la informació requerida. Per la majoria de comptes només us caldrà "
+"un nom d'usuari i una contrasenya. En alguns comptes cal més informació. "
+"Vegeu <link xref=\"accounts-window#details\"/> per a més informació."
 
-#: C/send-file.page:50(p)
+#: C/add-account.page:74(item/p) C/import-account.page:61(item/p)
+#: C/irc-nick-password.page:63(item/p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "Feu clic a <gui style=\"button\">Aplica</gui>."
+
+#: C/add-account.page:81(note/p)
 msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"Feu clic al contacte que li voleu enviar un fitxer i seleccioneu"
-"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Envia un fitxer</gui></guiseq>."
+"Per canviar el nom que identifica el compte a la finestra <gui>Comptes</"
+"gui>, seleccioneu el compte des de la llista de l'esquerra i feu clic sobre "
+"el nom o premeu la barra espaiadora. Editeu el nom del compte i feu clic a "
+"<key>Retorn</key> quan hageu acabat."
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "Seleccioneu el fitxer a enviar i feu clic a <gui>Envia</gui>."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Afegiu algú a la llista de contactes."
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "Apareixerà la finestra <gui>Transferències de fitxers</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)
-msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Afegiu algú a la llista de contactes"
+
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
 msgstr ""
-"Espereu que el contacte accepti la transferència del fitxer o feu clic a "
-"<gui>Atura</gui> per aturar la transferència."
+"Seleccioneu <guiseq><gui>Xat</gui><gui>Afegeix contacte</gui></guiseq>."
 
-#: C/send-file.page:72(p)
+#: C/add-contact.page:40(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"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 ""
-"Una vegada s'hagi acabat la transferència podeu tancar la finestra "
-"<gui>Transferències de fitxers</gui>."
+"Des de la llista desplegable del <gui>Compte</gui>, seleccioneu el compte "
+"que voleu utilitzar per connectar-vos amb el contacte. Haurà d'utilitzar el "
+"mateix servei que el compte que seleccioneu."
 
-#: C/send-file.page:80(p)
+#: C/add-contact.page:45(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>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"Si teniu llistades múltiples transferències acabades a la finestra, feu clic "
-"a <gui>Neteja</gui> per buidar la llista. Només s'esborraran de la "
-"llista, no s'esborraran els fitxers de l'ordinador."
+"Al camp <gui>Identificador</gui> introduïu l'identificador d'entrada del "
+"contacte, el seu nom d'usuari, el nom de pantalla o qualsevol identificador "
+"apropiat per al tipus de servei."
 
-#: C/send-file.page:87(p)
+#: C/add-contact.page:49(item/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>."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 msgstr ""
-"Només podeu enviar fitxers amb els serveis següents: <em>Jabber</em>, "
-"<em>Google Talk</em> i <em>Gent propera</em>."
+"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que "
+"aparegui a la llista de contactes."
+
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Feu clic a <gui>Afegeix</gui> per afegir el contacte a la llista de "
+"contactes."
 
-#: 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 ""
-"Per enviar un fitxer a algú us cal estar connectat a Internet o a una "
-"xarxa d'àrea local."
+"Per afegir una persona nova a la llista de contactes heu d'estar connectat a "
+"Internet i al compte."
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Explicació sobre la funció de «Gent propera»."
+#: C/audio-call.page:10(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Truqueu els contactes per Internet."
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Què és la «Gent propera»?"
+#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name)
+#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr ""
+#: C/audio-call.page:35(page/title)
+msgid "Start an audio conversation"
+msgstr "Inicieu una conversa de veu"
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-call.page:37(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 servei de «Gent propera» és un servei de comunicació descentralitzat: no us "
-"cal estar connectat ni autenticar-vos amb un servidor central per utilitzar-lo."
+"Podeu trucar als contactes i mantenir-hi converses de veu. Aquesta "
+"característica només funciona amb alguns tipus de comptes i requereix que "
+"l'altra persona també tingui una aplicació que permeti realitzar trucades de "
+"veu."
 
-#: C/salut-protocol.page:45(p)
+#: C/audio-call.page:43(item/p)
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una "
-"xarxa local i no cal una connexió a Internet activa."
+"Amb el botó secundari feu clic al contacte amb el qual voleu conversar i "
+"escolliu <gui style=\"menuitem\">Trucada de veu</gui>."
 
-#: C/salut-protocol.page:49(p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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 the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"La gent que utilitza aquest servei dins de la xarxa local apareixeran "
-"automàticament i es podran enviar missatges i fitxers igual com en els altres "
-"serveis."
+"S'obrirà una finestra nova. Quan s'estableixi la connexió veureu que a la "
+"part inferior de la finestra es mostrarà la durada de la conversa."
 
-#: C/salut-protocol.page:54(p)
+#: C/audio-call.page:55(item/p)
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei."
+"Per acabar la conversa feu clic al botó <gui style=\"button\">Penja</gui>."
 
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "Suprimeix un compte completament de l'<app>Empathy</app>."
+#: C/audio-call.page:63(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 ""
+"Per convertir una conversa de veu en una conversa de vídeo, escolliu "
+"<guiseq><gui style=\"menu\">Vídeo</gui> <gui style=\"menuitem\">Activa el "
+"vídeo</gui></guiseq>."
 
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "Com suprimir un compte"
+#: C/audio-call.page:71(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Inicieu una conversa de veu amb un metacontacte"
 
-#: C/remove-account.page:35(p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(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 ""
-"Podeu suprimir un compte completament de l'<app>Empathy</app> si no voleu "
-"utilitzar-lo més. Si voleu utilitzar el compte un altre cop amb l'<app>Empathy"
-"</app> en un futur haureu de tornar a crear el compte amb totes les seves dades."
+"Des de la finestra <gui>Llista de contactes</gui>, feu clic amb el botó "
+"secundari al metacontacte."
 
-#: 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-call.page:79(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 ""
-"Des de la finestra <gui>Llista de contactes</gui> seleccioneu "
-"<guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> o premeu <key>F4</key>."
+"Seleccioneu el contacte amb el que voleu mantenir la conversa i des del menú "
+"seleccioneu <gui style=\"menuitem\">Trucada de veu</gui>."
 
-#: C/remove-account.page:46(p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 ""
-"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part "
-"esquerra de la finestra."
+"Per reconèixer si un contacte és un <em>metacontacte</em> situeu el ratolí a "
+"sobre d'un contacte de la finestra <gui>Llista de contactes</gui> i "
+"mantingueu-lo a sobre durant un segon: apareixerà un petit missatge emergent "
+"que mostrarà el nombre de contactes que formen el metacontacte."
 
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Feu clic al botó <gui style=\"button\">Suprimeix</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/audio-video.page:58(media)
+msgctxt "_"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+
+#. 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:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr "external ref='figures/camera-web.png' md5='__failed__'"
 
-#: C/remove-account.page:53(p)
+#: C/audio-video.page:8(info/desc)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"Information on when it is possible to have an audio or video conversation."
 msgstr ""
-"Es mostrarà un diàleg sol·licitant la confirmació. Feu clic al botó "
-"<gui>Suprimeix</gui> per a suprimir el compte permanentment."
+"Informació sobre quan és possible realitzar una conversa de veu o de vídeo."
 
-#: C/remove-account.page:59(p)
-msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
-msgstr ""
-"Fins i tot després de la supressió d'un compte l'<app>Empathy</app> no esborrarà "
-"l'historial de converses del compte."
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Àudio i vídeo"
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#: 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 ""
-"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de missatgeria "
-"instantània."
+"Només podeu realitzar converses de veu i de vídeo amb els contactes que "
+"utilitzin una aplicació que permeti aquestes característiques. Si les "
+"aplicacions dels contactes permeten realitzar converses de veu o de vídeo, "
+"veureu les icones següents al costat del seu nom a la llista de contactes:"
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problemes connectant a un servei de missatgeria instantània"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Icona"
 
-#. 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:48(td/p)
+msgid "Description"
+msgstr "Descripció"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: C/audio-video.page:57(td/p)
 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 ""
-"Apareix un missatge d'error a la finestra principal que diu «<gui>Error de "
-"xarxa</gui>»."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icona per a una conversa de veu </media>"
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error�"
-msgstr "Veig un missatge que diu «Error de xarxa»"
-
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "El contacte pot realitzar converses de veu."
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/audio-video.page:69(td/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."
+"<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\"> "
+"Icona per a una conversa de vídeo </media>"
+
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "El contacte pot realitzar converses de vídeo."
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
 msgstr ""
-"Aquest tipus d'errada succeeix quan l'<app>Empathy</app> no pot comunicar-se "
-"amb el servei de missatgeria instantània per alguna raó."
+"Per realitzar una conversa de veu heu de tenir una targeta de so reconeguda "
+"pel sistema operatiu i un micròfon que funcioni."
 
-#: C/prob-conn-neterror.page:45(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 ""
-"També es pot produir quan intenteu utilitzar un compte d'IRC sense configurar "
-"el sobrenom."
+"Per realitzar una conversa de vídeo heu de tenir una càmera web reconeguda "
+"pel sistema operatiu i un micròfon que funcioni."
 
-#: 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 "Assegureu-vos que esteu connectats a Internet o a una xarxa d'àrea local."
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Tipus de comptes permesos"
 
-#: 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: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 ""
-"Feu clic a la icona <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
-"edit.png\">Edita</media> del missatge d'error."
+"Només podeu realitzar converses de veu i de vídeo en comptes d'alguns "
+"proveïdors de serveis. La taula següent mostra si els tipus de compte "
+"permeten converses de veu i de vídeo."
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(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 ""
-"Comproveu a la secció <gui>Avançat</gui> que les dades siguin les correctes. "
-"Hauríeu de poder trobar aquestes dades al lloc web del servei de "
-"missatgeria."
+"Els tipus de comptes es proporcionen els connectors. El sistema pot no "
+"disposar de tots el tipus llistats aquí, o pot disposar de tipus de comptes "
+"que no estiguin llistats. Versions més noves dels connectors poden fer "
+"possible les converses de veu i de vídeo en tipus de comptes que estan "
+"classificats com que no ho permeten."
 
-#: 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 ""
-"Desactiveu <gui>Activat</gui> i torneu-lo a activar de nou per comprovar si "
-"es reconnecta el servei."
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "Servei"
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "Accés a través de servidor intermediari"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "Àudio"
 
-#: C/prob-conn-neterror.page:91(p)
-msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
-"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un "
-"servidor intermediari."
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "Vídeo"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "«Nom utilitzat»"
+#: 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 ""
-"Apareix un missatge a la finestra principal que diu «<gui>Nom utilitzat</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:32(title)
-msgid "I get a message that says “Name in use�"
-msgstr "Teniu un missatge que diu «Nom utilitzat»"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Xat de Facebook"
 
-#: 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 ""
-"Aquests tipus d'errades apareixen quan intenteu connectar-vos a comptes "
-"d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella xarxa."
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "Al quadre de text <gui>Sobrenom</gui> introduïu el sobrenom nou."
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: 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 ""
-"Si heu registrat el sobrenom a la xarxa on sou ara, poseu la contrasenya per "
-"aquest sobrenom. Vegeu <link xref=\"irc-nick-password\"/> per més informació."
+#: 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-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 ""
-"Desseleccioneu la casella de selecció <gui>Habilitat</gui> al costat del nom "
-"del compte i llavors seleccioneu-lo de nou per intentar reconnectar-vos al "
-"servei."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-auth.page:8(desc)
-msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
-msgstr ""
-"Apareix un missatge d'error a la finestra principal que diu «<gui>Errada en "
-"l'autenticació</gui>»."
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "Teniu un missatge que diu «Errada en l'autenticació»."
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: 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 ""
-"Aquest tipus d'errors apareix quan el servei de missatgeria instantània no "
-"permet la connexió perquè no reconeix el vostre nom d'usuari o contrasenya "
-"per alguna raó."
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: 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 ""
-"Comproveu que heu registrat un compte amb el servei amb el qual intenteu "
-"connectar-vos. Si no teniu un compte, molts serveis no us permetran "
-"connectar-vos."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: 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 ""
-"Escriviu el nom d'usuari i la contrasenya de nou per estar segurs que són "
-"correctes."
+#: 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 ""
-"El compte del servei de missatgeria instantània que voleu utilitzar no està "
-"habilitat a la llista de comptes."
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "El meu compte està habilitat"
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Gent propera"
 
-#: 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 ""
-"Si el compte de missatgeria instantània que voleu utilitzar no està "
-"habilitat a la llista inferior quan intenteu iniciar una conversa o unir-vos "
-"a una sala, els detalls del vostre compte poden no ser correctes."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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 ""
-"Escolliu <guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> i seleccioneu "
-"el compte que no està funcionant."
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: 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 ""
-"Comproveu que la caixa de selecció <gui style=\"checkbox\">Habilitat</gui> "
-"està seleccionada. Si no ho està, seleccioneu-la per activar el compte."
+#: 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 "Navegueu o cerqueu per les converses anteriors."
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "Visualitzeu les converses anteriors"
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: 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."
-msgstr ""
-"El ressaltat de text no funciona del tot bé: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. Si hi ha un ressaltat actuant, "
-"independentment de la selecció (com el groc o semblant) , podeu utilitzar el "
-"terme «ressalta». D'altra forma us caldrà utilitzar el terme «selecciona». "
-"Llegiu el informe d'error."
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "Canvieu l'estat per avisar la disponibilitat als contactes."
 
-#: C/prev-conv.page:46(p)
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Canvi de l'estat"
+
+#: 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 ""
-"L'<app>Empathy</app> desa automàticament totes les converses que manteniu "
-"amb els contactes. Podeu cercar <link xref=\"#search\">per les "
-"converses anteriors</link> o <link xref=\"#browse\">navegar per les "
-"converses anteriors</link> per contacte i data."
+"Podeu canviar l'estat per indicar la disponibilitat als contactes. "
+"L'<app>Empathy</app> us permet seleccionar-ne un d'una llista d'estats per "
+"defecte."
 
-#: 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 ""
-"No us cal estar connectat a Internet per visualitzar i cercar a les "
-"converses anteriors."
+"Feu clic a la llista desplegable a la part de dalt de la finestra "
+"<gui>Llista de contactes</gui>."
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "Cerqueu a les converses anteriors"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Seleccioneu un estat de la llista."
 
-#: C/prev-conv.page:63(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 ""
-"Podeu utilitzar cerca de texts complets dins les converses anteriors."
+"Vegeu <link xref=\"status-icons\"/> per veure la llista d'estats possibles i "
+"què signifiquen. També podeu <link xref=\"set-custom-status\">afegir "
+"missatges d'estat personalitzats</link> per proporcionar informació sobre la "
+"disponibilitat als contactes."
 
-#: 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 ""
-"Des de la finestra <gui>Llista de contactes</gui> escolliu "
-"<guiseq><gui>Visualitza</gui><gui>Converses anteriors</gui></guiseq>. "
-"O premeu <key>F3</key>."
+"Si no utilitzeu l'ordinador durant una estona o s'activa l'estalvi de "
+"pantalla, l'estat es posarà a absent."
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Cerca</gui>."
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "Registreu un compte amb un dels serveis de missatgeria habilitats."
 
-#: 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 ""
-"Al camp <gui>Per</gui> escriviu el text que voleu cercar. Feu clic a "
-"<gui>Cerca</gui> o premeu la tecla <key>Retorn</key>."
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Registreu un compte nou"
 
-#: 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 ""
-"Qualsevol conversa que compleixi els criteris de cerca serà mostrada a la "
-"llista a sota del camp de cerca. Per defecte, les converses estan ordenades "
-"per data."
+"La majoria de comptes requereixen que creeu un compte amb un proveïdor abans "
+"de connectar-vos amb aplicacions de missatgeria com l'<app>Empathy</app>. "
+"Amb alguns proveïdors de comptes, podeu utilitzar l'<app>Empathy</app> per "
+"registrar el compte nou, utilitzant el mateixos passos que si <link xref="
+"\"add-account\">afegiu un compte</link>."
 
-#: 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 ""
-"Feu clic sobre una conversa per veure-la. L'<app>Empathy</app> seleccionarà el "
-"text de la conversa que compleixi els criteris de cerca."
+"Aquesta pàgina proporciona informació sobre la creació de comptes nous de "
+"tipologia variada. El vostre proveïdor de comptes hauria de donar-vos un nom "
+"d'usuari i una contrasenya, així com qualsevol informació addicional que us "
+"pugui fer falta per connectar-vos amb l'<app>Empathy</app>."
 
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "Navegueu per les converses anteriors"
+#: 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 ""
-"Podeu navegar, per data, per les converses anteriors amb els contactes i "
-"pels xats a les sales."
+"Facebook és una de les xarxes socials més utilitzades. Permet als usuaris "
+"crear el seu propi perfil i comunicar-se amb els seus amics."
 
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Converses</gui>."
-
-#: 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 ""
-"Seleccioneu un compte de la llista desplegable de dalt a l'esquerre. Es mostrarà "
-"a sota la llista de contactes i les sales de xat per aquest compte."
+"Per utilitzar Facebook per comunicar-vos amb els vostres amics, us cal crear "
+"un compte nou al lloc web: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 
-#: 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 ""
-"Seleccioneu un contacte o una sala de xat per veure'n les converses anteriors. "
-"Per defecte es mostrarà la conversa més recent."
+"Jabber és un sistema obert de missatgeria instantània. Semblant al correu "
+"electrònic, Jabber us permet escollir el vostre proveïdor de comptes i "
+"comunicar-vos amb altres usuaris de Jabber, sense que importi el seu "
+"proveïdor de comptes."
 
-#: 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 ""
-"Podeu navegar per les converses per data. Els dies en els quals heu "
-"mantingut converses amb el contacte es mostraran amb negreta. Feu clic "
-"a una data per seleccionar-la. Feu clic a les fletxes al costat del mes i de "
-"l'any per navegar entre dates."
+"Haureu de crear un compte nou amb algun proveïdor de comptes Jabber. Hi ha "
+"molt proveïdors gratuïts, un dels més populars és <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 ""
-"Podeu cercar text a la conversa mostrada escrivint al camp de cerca a la "
-"part superior. Es ressaltarà el text que coincideixi."
+"Si sou usuaris del Google Mail o del Google Talk, ja teniu un compte de "
+"Jabber. El Google Talk és un servei de Jabber. Només us cal utilitzar "
+"l'adreça i la contrasenya de Google Mail per connectar-vos a l'<app>Empathy</"
+"app>."
 
-#: 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."
-msgstr ""
-"Podeu veure fàcilment les converses anteriors amb algun dels contactes a la "
-"finestra <gui>Llista de contactes</gui>. Feu clic sobre el contacte i "
-"escolliu <gui>Visualitza les converses anteriors</gui>. S'obrirà la finestra "
-"<gui>Converses anteriors</gui> amb el contacte ja seleccionat."
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
+"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 ""
+"No us cal crear cap compte a cap proveïdor de serveis per utilitzar aquesta "
+"característica. Aquest servei funciona sempre que estigueu connectats a una "
+"xarxa d'àrea local, com un punt d'accés Wi-Fi. Us mostra tots els usuaris "
+"que fan servir aquest mateix servei de forma automàtica."
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr ""
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "Vegeu <link xref=\"salut-protocol\"/> per a més informació."
 
-#: 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 ""
+"El SIP és un sistema obert que permet realitzar converses de veu i de vídeo "
+"per Internet. Heu de crear un compte amb un proveïdor de SIP. Podeu "
+"comunicar-vos amb qualsevol usuari de SIP sense que importi el proveïdor SIP "
+"que estiguin utilitzant."
 
-#: 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 ""
+"Per motius tècnics, el servei lliure <link href=\"https://www.ekiga.net/"
+"index.php?page=register\">Ekiga.net</link> no funciona amb l'<app>Empathy</"
+"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 ""
+"Alguns proveïdors de SIP us permeten fer trucades a telèfons fixes i mòbils "
+"des de l'ordinador. Normalment us cal una subscripció a un servei de "
+"pagament per poder-ho realitzar."
 
-#: 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."
+#: 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 ""
+"No us cal registrar un compte per utilitzar l'IRC. Encara que especifiqueu "
+"un sobrenom quan afegiu el compte d'IRC a l'<app>Empathy</app>, aquest "
+"sobrenom només s'utilitza cada vegada que us connecteu. Si un altre usuari "
+"està utilitzant aquest sobrenom, us caldrà canviar el sobrenom."
 
-#: C/link-contacts.page:60(title)
-#, fuzzy
-#| msgid "Modifying a Contact"
-msgid "Combining contacts"
-msgstr "Com modificar un contacte"
-
-#: 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 ""
+"Algunes xarxes d'IRC utilitzen un servei anomenat NickServ per permetre als "
+"usuaris protegir el seu sobrenom. Vegeu <link xref=\"irc-nick-password\"/> "
+"per a més informació."
 
-#: C/link-contacts.page:70(p)
-#, fuzzy
-#| msgid ""
-#| "From the <gui>Saved Presets</gui> box, select the status message you want "
-#| "to remove."
+#: 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 ""
-"Des de la caixa<guilabel>Paràmetres desats</guilabel>, seleccioneu l'estat "
-"del missatge que voleu suprimir."
+"Alguns servidors d'IRC estan protegits amb contrasenya. Haureu de saber la "
+"contrasenya per connectar-vos-hi. Generalment són xarxes d'IRC privades."
 
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Feu clic a <gui style=\"button\">Enllaça</gui>."
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Serveis propietaris"
 
-#: 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 ""
+"Hi ha molts serveis de missatgeria instantània propietaris desenvolupats per "
+"diverses organitzacions o empreses. L'<app>Empathy</app> us permet connectar-"
+"vos a comptes existent de molts serveis populars. Per crear-vos-hi un compte "
+"nou haureu de visitar el lloc web i acceptar la llicència d'ús."
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "Separació de contactes"
+#: 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 ""
+#: 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 "Feu clic a <gui style=\"button\">Desenllaça</gui>."
+#: 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 "Informació legal."
+#: 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 "Llicència"
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr ""
+"Impedeix que l'<app>Empathy</app> es connecti de forma automàtica a un "
+"compte."
 
-#: C/license.page:12(p)
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Inhabiliteu un compte"
+
+#: 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 ""
-"Aquest treball es distribueix sota la llicència Creative Commons "
-"Reconeixement-Compartir igual 3.0 llicència no adaptada."
+"Podeu inhabilitar un compte per evitar que l'<app>Empathy</app> es connecti "
+"sense esborrar completament el compte. Podeu desactivar i reactivar el "
+"compte si només voleu connectar-vos al compte esporàdicament, però encara "
+"voleu utilitzar l'<app>Empathy</app> per altres comptes."
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "Sou lliure de:"
+#: 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 ""
+"Seleccioneu el compte que voleu inhabilitar del llistat de comptes al quadre "
+"de l'esquerra de la finestra."
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "Compartir"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "A la part dreta de la finestra, inhabiliteu-lo."
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Copiar, distribuir i transmetre el treball."
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "Per tornar a activar el compte, habiliteu-lo."
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "Fer-ne obres derivades"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Com configurar, entrar i gestionar sales preferides."
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Adaptar el treball."
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Sales preferides"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "sota les següents condicions:"
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Establiu un sala com a preferida"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Reconeixement"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Com entrar en una sala."
 
-#: 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 ""
-"Cal que reconegueu el treball de la forma especificada per l'autor o el "
-"llicenciatari (però no de forma que suggereixi que us dóna suport personal o "
-"de l'ús del treball)."
-
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Compartir igual"
+"Per saber-ne més de com entrar en una sala d'IRC vegeu <link xref=\"irc-join-"
+"room\"/>."
 
-#: 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 ""
-"Si altereu, transformeu, o construïu a partir d'aquest treball heu de "
-"distribuir el treball resultant sota la mateixa llicència o una de compatible."
+"Per saber-ne més de com iniciar o unir-se a una conversa de grup vegeu <link "
+"xref=\"group-conversations\"/>."
 
-#: 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 ""
-"Per veure el text de la llicència completa vegeu el <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">Lloc web de Creative Commons "
-"</link>, o llegiu la pàgina <link href=\"http://creativecommons.org/licenses/"
-"by-sa/3.0/\">Commons Deed</link>."
+"A la finestra de conversa escolliu <guiseq><gui>Conversa</gui><gui>Sala de "
+"xat preferida</gui></guiseq>."
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "Inicieu un conversa amb un contacte de l'IRC."
-
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Xatejeu amb algú a l'IRC"
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Com entrar a sales preferides"
 
-#: 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:"
+#: 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 ""
-"Podeu mantenir converses privades amb altres usuaris de l'IRC fora de la sala "
-"pública de l'IRC. Per iniciar una conversa amb un altre usuari de l'IRC:"
+"Des de la finestra <gui>Llista de contactes</gui> executeu una de les "
+"següents accions:"
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Premeu <key>F5</key>."
+
+#: 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 ""
-"Feu doble clic sobre el nom de l'usuari amb el qual voleu xatejar a la "
-"llista de contactes de la sala de xat de l'IRC. També podeu fer clic amb el botó "
-"secundari sobre l'usuari i escolliu <gui>Xat</gui>."
+"Escolliu <guiseq><gui>Sala</gui><gui>Uneix-te als preferits</gui></guiseq>, "
+"per entrar a totes les sales preferides."
 
-#: 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 ""
-"La llista de contactes de la sala de l'IRC no és la mateixa que la llista de "
-"contactes de l'<app>Empathy</app>. Aquesta conté la llista d'usuaris de la "
-"sala de l'IRC a la qual us heu unit. Cada sala tindrà un llista de contactes "
-"diferent."
+"Escolliu <gui>Sala</gui> i seleccioneu la sala preferida a la qual voleu "
+"entrar."
 
-#: 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>."
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
 msgstr ""
-"La llista de contactes de la sala de l'IRC normalment està a la part dreta de "
-"la finestra de la sala de l'IRC. Si no la veieu, escolliu "
-"<guiseq><gui>Conversa</gui><gui>Mostra la llista de contacte</gui></guiseq>."
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "L'<app>Empathy</app> encara no permet l'enviament de fitxers utilitzant l'IRC."
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "Enviament de fitxer a través de l'IRC."
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "Encara no és possible enviar fitxers a través de l'IRC."
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "Protegiu el vostre sobrenom per impedir que altres usuaris de l'IRC l'usin."
+"Per entrar a una sala preferida us cal estar connectat a Internet i a un "
+"compte."
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "Utilitzeu un sobrenom amb contrasenya a l'IRC"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Com gestionar les sales preferides"
 
-#: 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 ""
-"En algunes xarxes d'IRC podeu registrar el vostre sobrenom amb un servei anomenat "
-"NickServ. Si envieu uns missatges especials a NickServ podreu establir la "
-"contrasenya i identificar-vos. Algunes sales d'IRC no permeten entrar si el "
-"sobrenom no està registrat."
+"A la finestra <gui>Llista de contactes</gui>, escolliu <guiseq><gui>Sala</"
+"gui><gui>Gestiona les preferides</gui></guiseq>."
 
-#: C/irc-nick-password.page:40(p)
-#, fuzzy
-#| 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: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 ""
-"L'<app>Empathy</app> no suporta el registre de sobrenoms. Algunes xarxes d'IRC, "
-"tanmateix, us enviaran de forma automàtica una <em>contrasenya de servidor</"
-"em> al NickServ. En aquestes xarxes, podeu utilitzar la contrasenya d'IRC a "
-"l'<app>Empathy</app> per identificar-vos amb NickServ. La popular xarxa "
-"FreeNode és coneguda per aquesta característica."
+"A la llista desplegable <gui>Compte</gui>, seleccioneu el compte del que "
+"vulgueu gestionar les sales preferides."
 
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "Per establir una contrasenya de servidor d'IRC:"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "Seleccioneu <gui>Totes</gui> per veure totes les sales preferides."
 
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "Seleccioneu el compte d'IRC al quadre de l'esquerra del diàleg."
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Seleccioneu la sala preferida que voleu gestionar:"
 
-#: C/irc-nick-password.page:57(p)
+#: C/favorite-rooms.page:121(item/p)
 msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
-"Al camp <gui>Contrasenya</gui> escriviu la contrasenya que heu utilitzat per "
-"registrar el sobrenom."
-
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "Feu clic a <gui style=\"button\">Aplica</gui>."
+"Seleccioneu la caixa de verificació <gui>Connecta automàticament</gui> per "
+"entrar de forma automàtica a la sala quan us connecteu amb el compte."
 
-#: 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>."
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
 msgstr ""
-"Aquestes instruccions sols us permeten utilitzar un sobrenom protegit per contrasenya "
-"en certes xarxes d'IRC. L'<app>Empathy</app> encara no permet registrar un "
-"sobrenom de l'IRC o canviar-ne la contrasenya."
+"Feu clic a <gui>Suprimeix</gui> per esborrar la sala de la llista de "
+"preferides."
 
-#: C/irc-manage.page:9(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "Com utilitzar IRC amb l'<app>Empathy</app>."
-
-#: C/irc-manage.page:34(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
-
-#: C/irc-manage.page:37(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 ""
-"Heu de tenir instal·lat el paquet <sys>telepathy-idle</sys> per utilitzar "
-"l'IRC amb l'<app>Empathy</app>."
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "Quan acabeu feu clic a <gui>Tanca</gui>."
 
-#: C/irc-manage.page:43(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Sales de xat de l'IRC i converses"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "Com utilitzar i entendre la geolocalització a l'<app>Empathy</app>."
 
-#: C/irc-manage.page:45(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Sales de xat i converses"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Posició geogràfica"
 
-#: C/irc-manage.page:50(title)
-msgid "Common IRC Problems"
-msgstr "Problemes d'IRC comuns"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Geolocalització"
 
-#: C/irc-manage.page:52(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problemes comuns"
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Arreglar problemes comuns"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Uniu-vos a un canal d'IRC."
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "L'<app>Empathy</app> no publicarà la meva posició geogràfica."
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "Uniu-vos a la sala de xat de l'IRC"
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Posició geogràfica no publicada"
 
-#: 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 ""
-"Podeu unir-vos a sales de xat de l'IRC (també conegudes com canals de l'IRC) a "
-"qualsevol xarxa d'IRC a la qual estigueu connectat. Per connectar-vos a una "
-"xarxa d'IRC, vegeu <link xref=\"add-account\"/> i <link xref=\"account-irc\"/"
-">."
+"Si els contactes no poden veure la vostra localització, l'<app>Empathy</app> "
+"no podrà descobrir amb un bon marge de precisió la vostra posició geogràfica."
 
-#: 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 la finestra <gui>Llista de contactes</gui> escolliu <guiseq><gui>Sala</"
-"gui><gui>Entra</gui></guiseq>."
+"En aquest cas, no es publicarà la vostra posició, però podreu veure la "
+"localització dels contactes."
 
-#: 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 ""
-"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que "
-"correspon a la xarxa que voleu utilitzar."
+"Si voleu fer pública la posició geogràfica, podeu utilitzar un dispositiu "
+"extern com un GPS."
 
-#: 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 ""
-"Al quadre de text <gui>Sala</gui> introduïu el nom del canal on voleu "
-"entrar. Els noms dels canals IRC comencen amb el caràcter coixinet (<sys>#</"
-"sys>)."
+"Per publicar la posició geogràfica, el servidor de Jabber ha d'implementar "
+"el Protocol personal d'esdeveniments (PEP). Hi ha una llista actualitzada de "
+"<link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html"
+"\">servidors que implementen el PEP</link> en línia. El Google Talk encara "
+"no l'implementa."
 
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "Feu clic a <gui>Entra</gui> per entrar a la sala."
-
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
-"Per entrar en més d'una sala, haureu de repetir els passos de sobre per cada "
-"sala."
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Quina informació s'envia i a qui."
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "Entreu la contrasenya per les sales de xat de l'IRC."
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Privacitat de la geolocalització"
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "Entreu en una sala de xat d'IRC protegida."
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "Quina informació s'envia"
 
-#: 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:"
+"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 ""
-"En algunes xarxes d'IRC les sales privades poden estar protegides per "
-"contrasenya, si la sabeu seguiu els següents passos per unir-vos-hi:"
-
-#: 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\">Entra a la sala</link> com sempre."
+"Les dades que es poden enviar són: el país, la regió, la població, l'àrea, "
+"el carrer, l'edifici, la planta, la porta, el codi postal, la longitud, la "
+"latitud, l'alçada, la velocitat i la orientació."
 
-#: C/irc-join-pwd.page:38(p)
-#, fuzzy
+#: 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 ""
-"L'Empathy us demanarà una contrasenya. Introduïu la contrasenya per la sala "
-"de xat de l'IRC i feu clic a <gui style=\"button\">Uneix-m'hi</gui>."
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "Ordres de l'IRC interpretades per l'Empathy."
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "Ordres de l'IRC"
+"L'exactitud i la quantitat d'informació sobre la posició geogràfica estan "
+"basades en el programari o en la infraestructura utilitzada per descobrir la "
+"posició."
 
-#: 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 ""
-"Per veure la llista d'ordres interpretades per l'IRC escriviu, en una sala "
-"de xat, <input>/help</input> i premeu <key>Retorn</key>."
+"Cada tipus de xarxa pot tenir uns paràmetres d'exactitud diferents i poden "
+"enviar informació diferent. L'ús de dispositius externs com un GPS o un "
+"telèfon mòbil incrementarà l'exactitud de la informació enviada."
 
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "Totes les ordres disponibles tenen una petita descripció del seu ús."
-
-#. 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"
+"Quan s'habilita el mode de privacitat, la màxima precisió que s'enviarà serà "
+"la ciutat, encara que feu servir un dispositiu extern."
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "Introducció al client de missatgeria instantània <app>Empathy</app>."
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "Qui pot veure la informació enviada"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "Introducció"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "Només els contactes poden veure la vostra posició geogràfica."
 
-#: C/introduction.page:23(p)
-#, fuzzy
-#| msgid ""
-#| "<app>Empathy</app> is an instant messaging application for the GNOME "
-#| "Desktop. It supports text messaging, voice &amp; video call, file "
-#| "transfers and all the most used messaging systems such as MSN and Google "
-#| "Talk."
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Què és el mode de privacitat"
+
+#: 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 ""
-"L'<app>Empathy</app> és una aplicació de missatgeria instantània per a "
-"l'escriptori GNOME. Permet utilitzar la missatgeria de text, trucades de veu "
-"i vídeo, la transmissió de fitxers i tots els sistemes de missatgeria més "
-"utilitzats com l'MSN i el Google Talk."
+"El mode de privacitat, habilitat per defecte, és un mode que redueix la "
+"precisió de la posició geogràfica que s'envia als contactes."
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Descripció de la privacitat"
 
-#: 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 ""
-"L'<app>Empathy</app> inclou característiques que us ajuden a col·laborar "
-"mentre treballeu i que us permeten de forma fàcil estar al dia amb els "
-"amics."
+"Descripció de varis paràmetres de geolocalització en l'<app>Empathy</app>."
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "La geolocalització no s'activa per defecte."
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "El mode de privacitat s'activa per defecte."
+
+#: 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 ""
-"Amb l'<app>Empathy</app> podeu agrupar totes les converses en una única "
-"finestra, tenir una finestra per a cada tipus de conversa, fer cerques de "
-"forma fàcil a les converses anteriors i compartir el vostre escriptori en tan "
-"sols dos clics."
+"El mode de privacitat preval inclús quan esteu utilitzant dispositius "
+"externs amb més precisió."
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "Finestra de la <gui>Llista de contactes</gui>"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "Només els contactes poden veure la vostra posició."
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "Finestra principal de l'<app>Empathy</app>"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "Serveis que utilitzen la geolocalització i la compatibilitat."
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "Finestra principal de l'<app>Empathy</app>."
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "Serveis que l'utilitzen"
 
-#. 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 "Missatgeria d'Internet Empathy"
+"La característica de la geolocalització, de moment, només és compatible amb "
+"el servei de Jabber. Per utilitzar-la fa falta que tant vós com els "
+"contactes tinguin un compte 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\"> "
-"Logotip de la missatgeria d'Internet Empathy</media> Missatgeria d'Internet "
-"Empathy"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "Gestió de comptes"
-
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "Gestió de contactes"
-
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "Converses de text"
+"És necessari que el servidor que esteu utilitzant també habiliti la "
+"característica de la geolocalització. Molt servidors de Jabber ja ho tenen "
+"habilitat. Per saber-ne més mireu la documentació del servei web."
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Converses d'àudio i vídeo"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Compatibilitat"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Opcions avançades"
+#: 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 geolocalització de l'<app>Empathy</app> no és "
+"compatible amb altres serveis de posicionament geogràfic com el <em>Google "
+"Latitude</em>, el <em>Yahoo Fire Eagle</em> o el <em>Brightkite</em>."
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "Importeu un compte d'una altra aplicació de missatgeria instantània."
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "Com activar i desactivar la geolocalització a l'<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 "Activeu/Desactiveu la geolocalització"
 
-#: 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 "Seleccioneu <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>."
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "Com importar un compte existent"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "Seleccioneu la pestanya <gui>Localització</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 vegada que executeu l'<app>Empathy</app> us oferirà la importació "
-"dels comptes d'una altra aplicació de missatgeria instantània. "
-"Ara mateix l'única aplicació des de la que es poden importar comptes és el "
-"<app>Pidgin</app>."
+"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per "
+"activar-la."
 
-#: C/import-account.page:50(p)
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Per desactivar la geolocalització, desseleccioneu-ho."
+
+#: 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 ""
-"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes "
-"quantes opcions per crear comptes nous."
+"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix "
+"la precisió de la localització</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 ""
-"Seleccioneu <gui>Sí, importa les dades dels comptes de</gui> i feu clic a "
-"<gui>Endavant</gui>."
+"Si teniu un dispositiu extern com un GPS o voleu enviar una posició més "
+"exacta, seleccioneu l'opció apropiada a la secció <gui>Fonts d'ubicació</"
+"gui>."
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "Seleccioneu la caixa de selecció de cada compte que vulgueu importar."
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Comprenent la geolocalització."
 
-#: C/import-account.page:66(p)
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Què és la geolocalització?"
+
+#: 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 ""
-"No és possible importar comptes nous després d'haver completat l'auxiliar "
-"de la primera execució."
+"La geolocalització us permet identificar la localització geogràfica real "
+"d'un ordinador o un dispositiu connectat a Internet."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr ""
-"Oculta el contactes fora de línia de la <gui>Llista de contactes</gui>."
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "Gràcies a la geolocalització a l'<app>Empathy</app> podeu:"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Com amagar els contactes fora de línia"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "Fer pública la localització geogràfica als contactes."
 
-#: 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 ""
-"Normalment, l'<app>Empathy</app> mostra tots els contactes: aquells "
-"que són en línia, amb els quals teniu una conversa i els que són "
-"fora de línia."
-
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "Per amagar els contactes que són fora de línia:"
+"Veure la localització geogràfica del contactes i contactar fàcilment amb "
+"ells."
 
-#: 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 ""
-"Des de la finestra <gui>Llista de contactes</gui> escolliu "
-"<guiseq><gui>Visualitza</gui><gui>Contactes fora de línia</gui></guiseq>, o "
-"premeu <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+"Fixar l'exactitud de la vostra localització i el dispositiu utilitzat per "
+"descobrir la localització."
 
-#: 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 ""
-"Per tornar a mostrar els contactes fora de línia, repetiu els mateixos passos "
-"descrits aquí sobre."
+"Per veure les localitzacions geogràfiques dels contactes els caldrà un "
+"servei i una aplicació que faci ús de la geolocalització."
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "Inicieu o uniu-vos a una conversa de grup amb els contactes."
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "Converses de grup"
 
-#: 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."
@@ -1840,7 +1738,7 @@ msgstr ""
 "Les converses de grup us permeten mantenir converses de text amb més d'un "
 "contacte al mateix temps."
 
-#: 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."
@@ -1848,7 +1746,7 @@ msgstr ""
 "Per mantenir una conversa de grup us cal tindre un compte registrat a "
 "Jabber, a Google Talk o a Gent propera."
 
-#: 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."
@@ -1856,39 +1754,48 @@ msgstr ""
 "Sols podeu mantenir converses de grup amb els contactes que estan utilitzant "
 "el mateix servei que vós."
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "Com iniciar un conversa de grup"
 
-#: 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 la finestra <gui>Llista de contactes</gui> escolliu <guiseq><gui>Sala</"
+"gui><gui>Entra</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 ""
-"Des de la llista desplegable <guilabel>Compte</guilabel> trieu el compte "
-"que vulgueu utilitzar per la conversa de grup."
+"Des de la llista desplegable <gui>Compte</gui> trieu el compte que vulgueu "
+"utilitzar per la conversa de grup."
 
-#: 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 ""
-"Al quadre de text <guilabel>Servidor</guilabel> introduïu el nom del "
-"servidor en qual s'hostatjarà la conversa."
+"Al quadre de text <gui>Servidor</gui> introduïu el nom del servidor en el "
+"qual s'hostatjarà la 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 "Deixeu el camp buit 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."
 msgstr ""
-"Al quadre de text <guilabel>Sala</guilabel> introduïu el nom que vulgueu "
-"donar a la conversa."
+"Al quadre de text <gui>Sala</gui> introduïu el nom que vulgueu donar a la "
+"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 "
@@ -1897,23 +1804,23 @@ msgstr ""
 "Aquest serà el nom de la sala on mantindreu la conversa. El nom serà públic "
 "i altra gent podrà unir-s'hi. No es poden crear sales privades."
 
-#: 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 ""
 "Per convidar altres contactes a unir-se a la conversa de grup, seleccioneu "
-"el contacte que voleu convidar des de la finestra <gui>Llista de contactes"
-"</gui> i feu el següent:"
+"el contacte que voleu convidar des de la finestra <gui>Llista de contactes</"
+"gui> i feu el següent:"
 
-#: 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 ""
 "Feu clic amb el botó secundari sobre el contacte i escolliu <gui>Convida a "
 "la sala de xat</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>."
@@ -1921,7 +1828,7 @@ msgstr ""
 "Escolliu <guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Convida a la sala "
 "de xat</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."
@@ -1929,21 +1836,21 @@ msgstr ""
 "Si teniu més d'una conversa de grup oberta, seleccioneu la que vulgueu per "
 "convidar els contactes."
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "Uniu-vos a una conversa de grup"
 
-#: 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 ""
 "Expandiu la secció <gui>Llista de sales</gui> per veure totes les sales "
 "existents."
 
-#: 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 "Feu doble clic sobre el nom de la sala a la qual voleu unir-vos."
 
-#: 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 "
@@ -1953,1526 +1860,1674 @@ msgstr ""
 "requerir una contrasenya o una invitació per entrar-hi. L'<app>Empathy</app> "
 "encara no permet utilitzar aquest tipus de sales."
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "Comprenent la geolocalització."
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr ""
+"Oculta el contactes fora de línia de la <gui>Llista de contactes</gui>."
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "Què és la geolocalització?"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "Amagueu els contactes fora de línia"
 
-#: 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 geolocalització us permet identificar la localització geogràfica real "
-"d'un ordinador o un dispositiu connectat a Internet."
+"Normalment, l'<app>Empathy</app> mostra tots els contactes: aquells que són "
+"en línia, amb els quals teniu una conversa i els que són fora de línia."
 
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "Gràcies a la geolocalització a l'<app>Empathy</app> podeu:"
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "Per amagar els contactes que són fora de línia:"
 
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "Fer pública la localització geogràfica als contactes."
+#: 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 ""
+"Des de la finestra <gui>Llista de contactes</gui> escolliu "
+"<guiseq><gui>Visualitza</gui><gui>Contactes fora de línia</gui></guiseq> o "
+"premeu <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."
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
 msgstr ""
-"Veure la localització geogràfica del contactes i contactar fàcilment amb "
-"ells."
+"Per tornar a mostrar els contactes fora de línia, repetiu els mateixos "
+"passos descrits aquí sobre."
+
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "Importeu un compte d'una altra aplicació de missatgeria instantània."
 
-#: C/geolocation-what-is.page:52(p)
+#: 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 "Importeu un compte existent"
+
+#: C/import-account.page:44(page/p)
 msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
+"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 ""
-"Fixar l'exactitud de la vostra localització i el dispositiu utilitzat per "
-"descobrir la localització."
+"La primera vegada que executeu l'<app>Empathy</app> us oferirà la importació "
+"dels comptes d'una altra aplicació de missatgeria instantània. Ara mateix "
+"l'única aplicació des de la que es poden importar comptes és el <app>Pidgin</"
+"app>."
 
-#: C/geolocation-what-is.page:60(p)
+#: C/import-account.page:50(item/p)
 msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
 msgstr ""
-"Per veure les localitzacions geogràfiques dels contactes els caldrà "
-"un servei i una aplicació que faci ús de la geolocalització."
-
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "Com activar i desactivar la geolocalització a l'<app>Empathy</app>."
+"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes "
+"quantes opcions per crear comptes nous."
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activeu/Desactiveu la geolocalització"
+#: C/import-account.page:54(item/p)
+msgid ""
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr ""
+"Seleccioneu <gui>Sí, importa les dades dels comptes de</gui> i feu clic a "
+"<gui>Endavant</gui>."
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "Seleccioneu <guiseq><gui>Edita</gui><gui>Preferències</gui></guiseq>."
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "Seleccioneu la caixa de selecció de cada compte que vulgueu importar."
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Localització</gui>."
+#: 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 ""
+"No és possible importar comptes nous després d'haver completat l'auxiliar de "
+"la primera execució."
 
-#: C/geolocation-turn.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.
+#: C/introduction.page:41(media)
+msgctxt "_"
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 msgstr ""
-"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per "
-"activar-la."
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Per desactivar la geolocalització, desseleccioneu-ho."
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "Introducció al client de missatgeria instantània <app>Empathy</app>."
 
-#: C/geolocation-turn.page:55(p)
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Introducció"
+
+#: C/introduction.page:23(page/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
+"<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 ""
-"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix "
-"la precisió de la localització</gui>."
+"L'<app>Empathy</app> és una aplicació de missatgeria instantània per a "
+"l'escriptori GNOME. Permet utilitzar la missatgeria de text, trucades de veu "
+"i de vídeo, la transmissió de fitxers i tots els sistemes de missatgeria més "
+"utilitzats com el MSN i el Google Talk."
 
-#: C/geolocation-turn.page:61(p)
+#: C/introduction.page:28(page/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."
+"<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 ""
-"Si teniu un dispositiu extern com un GPS o voleu enviar una posició més "
-"exacta, seleccioneu l'opció apropiada a la secció <gui>Fonts d'ubicació</gui>."
+"L'<app>Empathy</app> inclou característiques que us ajuden a col·laborar "
+"mentre treballeu i que us permeten de forma fàcil estar al dia amb els amics."
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Serveis que utilitzen la geolocalització i la compatibilitat."
+#: 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 ""
+"Amb l'<app>Empathy</app> podeu agrupar totes les converses en una única "
+"finestra, tenir una finestra per a cada tipus de conversa, fer cerques de "
+"forma fàcil a les converses anteriors i compartir el vostre escriptori en "
+"tan sols dos clics."
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Serveis que l'utilitzen"
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Finestra de la <gui>Llista de contactes</gui>"
 
-#: C/geolocation-supported.page:33(p)
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "Finestra principal de l'<app>Empathy</app>"
+
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "Finestra principal de l'<app>Empathy</app>."
+
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "Ordres de l'IRC interpretades per l'Empathy."
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Ordres de l'IRC"
+
+#: C/irc-commands.page:19(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."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
-"La característica de la geolocalització, de moment, només és compatible amb "
-"el servei de Jabber. Per utilitzar-la fa falta que tant vós com els contactes "
-"tinguin un compte de Jabber."
+"Per veure la llista d'ordres interpretades per l'IRC escriviu, en una sala "
+"de xat, <input>/help</input> i premeu <key>Retorn</key>."
 
-#: C/geolocation-supported.page:39(p)
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "Totes les ordres disponibles tenen una petita descripció del seu ús."
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "Entreu la contrasenya per les sales de xat de l'IRC."
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "Entreu en una sala de xat d'IRC protegida."
+
+#: C/irc-join-pwd.page:27(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."
+"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 ""
-"És necessari que el servidor que esteu utilitzant també habiliti la "
-"característica de la geolocalització. Molt servidors de Jabber ja ho tenen "
-"habilitat. Per saber-ne més mireu la documentació del servei web."
+"En algunes xarxes d'IRC les sales privades poden estar protegides per "
+"contrasenya, si la sabeu seguiu els següents passos per unir-vos-hi:"
 
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilitat"
+#: 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\">Entra a la sala</link> com sempre."
 
-#: C/geolocation-supported.page:49(p)
+#: C/irc-join-pwd.page:38(item/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>."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"La característica de geolocalització de l'<app>Empathy</app> no és compatible amb "
-"altres serveis de posicionament geogràfic com el <em>Google Latitude</em>, "
-"el <em>Yahoo Fire Eagle</em> o el <em>Brightkite</em>."
-
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Quina informació s'envia i a qui."
+"L'Empathy us demanarà una contrasenya. Introduïu la contrasenya de la sala "
+"de xat de l'IRC i feu clic a <gui style=\"button\">Uneix-m'hi</gui>."
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Privacitat de la geolocalització"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Uniu-vos a un canal d'IRC."
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Quina informació s'envia"
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "Uniu-vos a la sala de xat de l'IRC"
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-join-room.page:33(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."
+"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 ""
-"Les dades que es poden enviar són: el país, la regió, la població, l'àrea, "
-"el carrer, l'edifici, la planta, la porta, el codi postal, la longitud, la "
-"latitud, l'alçada, la velocitat i la orientació."
+"Podeu unir-vos a sales de xat de l'IRC (també conegudes com canals de l'IRC) "
+"a qualsevol xarxa d'IRC a la qual estigueu connectat. Per connectar-vos a "
+"una xarxa d'IRC, vegeu <link xref=\"add-account\"/> i <link xref=\"account-"
+"irc\"/>."
 
-#: C/geolocation-privacy.page:40(p)
+#: C/irc-join-room.page:45(item/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."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
 msgstr ""
-"L'exactitud i la quantitat d'informació sobre la posició geogràfica estan "
-"basades en el programari o en la infraestructura utilitzada per descobrir la "
-"posició."
+"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que "
+"correspon a la xarxa que voleu utilitzar."
 
-#: C/geolocation-privacy.page:44(p)
+#: C/irc-join-room.page:51(item/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."
+"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 ""
-"Cada tipus de xarxa pot tenir uns paràmetres d'exactitud diferents i "
-"poden enviar informació diferent. L'ús de dispositius externs com un GPS o "
-"un telèfon mòbil incrementarà l'exactitud de la informació enviada."
+"Al quadre de text <gui>Sala</gui> introduïu el nom del canal on voleu "
+"entrar. Els noms dels canals IRC comencen amb el caràcter coixinet (<sys>#</"
+"sys>)."
+
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "Feu clic a <gui>Entra</gui> per entrar a la sala."
 
-#: C/geolocation-privacy.page:49(p)
+#: C/irc-join-room.page:64(note/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."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
-"Quan s'habilita el mode de privacitat, la màxima precisió que s'enviarà serà la "
-"ciutat, encara que feu servir un dispositiu extern."
+"Per entrar en més d'una sala, haureu de repetir els passos de sobre per cada "
+"sala."
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "Qui pot veure la informació enviada"
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "Com utilitzar IRC amb l'<app>Empathy</app>."
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "Només els contactes poden veure la vostra posició geogràfica."
+#: C/irc-manage.page:23(credit/name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "Què és el mode de privacitat"
+#: C/irc-manage.page:39(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
 
-#: C/geolocation-privacy.page:64(p)
+#: C/irc-manage.page:47(when/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."
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
+"idle</link>"
 msgstr ""
-"El mode de privacitat, habilitat per defecte, és un mode que redueix la "
-"precisió de la posició geogràfica que s'envia als contactes."
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Instal·la el paquet "
+"telepathy-idle</link>"
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Descripció de la privacitat"
+#: C/irc-manage.page:55(info/title)
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "Sales de xat de l'IRC i converses"
+
+#: C/irc-manage.page:57(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Sales de xat i converses"
+
+#: C/irc-manage.page:62(info/title)
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Problemes de l'IRC més habituals"
+
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr ""
+"Protegiu el vostre sobrenom per impedir que altres usuaris de l'IRC l'usin."
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "Utilitzeu un sobrenom amb contrasenya a l'IRC"
 
-#: C/geolocation-privacy.page:72(p)
+#: C/irc-nick-password.page:35(page/p)
 msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+"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 ""
-"Descripció de varis paràmetres de geolocalització en l'<app>Empathy</app>."
+"En algunes xarxes d'IRC podeu registrar el vostre sobrenom amb un servei "
+"anomenat NickServ. Si envieu uns missatges especials a NickServ podreu "
+"establir la contrasenya i identificar-vos. Algunes sales d'IRC no permeten "
+"entrar si el sobrenom no està registrat."
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "La geolocalització no s'activa per defecte."
+#: 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 ""
+"L'<app>Empathy</app> no suporta el registre de sobrenoms. Algunes xarxes "
+"d'IRC, tanmateix, us enviaran de forma automàtica una <em>contrasenya de "
+"servidor</em> al NickServ. En aquestes xarxes, podeu utilitzar la "
+"contrasenya d'IRC a l'<app>Empathy</app> per identificar-vos amb NickServ. "
+"La popular xarxa freenode és coneguda per aquesta característica."
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "El mode de privacitat s'activa per defecte."
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "Per establir una contrasenya de servidor d'IRC:"
 
-#: C/geolocation-privacy.page:87(p)
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "Seleccioneu el compte d'IRC al quadre de l'esquerra del diàleg."
+
+#: C/irc-nick-password.page:57(item/p)
 msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 msgstr ""
-"El mode de privacitat preval inclús quan esteu utilitzant dispositius "
-"externs amb més precisió."
+"Al camp <gui>Contrasenya</gui> escriviu la contrasenya que heu utilitzat per "
+"registrar el sobrenom."
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "Només els contactes poden veure la vostra posició."
+#: 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 ""
+"Aquestes instruccions sols us permeten utilitzar un sobrenom protegit per "
+"contrasenya en certes xarxes d'IRC. L'<app>Empathy</app> encara no permet "
+"registrar un sobrenom de l'IRC o canviar-ne la contrasenya."
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "L'<app>Empathy</app> no publicarà la meva posició geogràfica."
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr ""
+"L'<app>Empathy</app> encara no permet l'enviament de fitxers utilitzant "
+"l'IRC."
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Posició geogràfica no publicada"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Enviament de fitxer a través de l'IRC."
+
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "Encara no és possible enviar fitxers a través de l'IRC."
+
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "Inicieu un conversa amb un contacte de l'IRC."
+
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "Xategeu amb algú a l'IRC"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/irc-start-conversation.page:32(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."
+"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 ""
-"Si els contactes no poden veure la vostra localització, "
-"l'<app>Empathy</app> no podrà descobrir amb un bon marge de precisió la "
-"vostra posició geogràfica."
+"Podeu mantenir converses privades amb altres usuaris de l'IRC fora de la "
+"sala pública de l'IRC. Per iniciar una conversa amb un altre usuari de l'IRC:"
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/irc-start-conversation.page:37(item/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"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 aquest cas, no es publicarà la vostra posició, però podreu veure la "
-"localització dels contactes."
+"Feu doble clic sobre el nom de l'usuari amb el qual voleu xatejar a la "
+"llista de contactes de la sala de xat de l'IRC. També podeu fer clic amb el "
+"botó secundari sobre l'usuari i escolliu <gui>Xat</gui>."
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-start-conversation.page:45(item/p)
 msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
+"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 ""
-"Si voleu fer pública la posició geogràfica, podeu utilitzar un "
-"dispositiu extern com un GPS."
+"La llista de contactes de la sala de l'IRC no és la mateixa que la llista de "
+"contactes de l'<app>Empathy</app>. Aquesta conté la llista d'usuaris de la "
+"sala de l'IRC a la qual us heu unit. Cada sala tindrà un llista de contactes "
+"diferent."
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/irc-start-conversation.page:52(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."
+"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 ""
-"Per publicar la posició geogràfica, el servidor de Jabber "
-"ha d'implementar el Protocol personal d'esdeveniments (PEP). Hi ha una llista "
-"actualitzada de <link href=\"http://coccinella.im/servers/servers_by_pubsub_pep.html\">"
-"servidors que implementen el PEP</link> en línia. El Google Talk encara no l'implementa."
+"La llista de contactes de la sala de l'IRC normalment està a la part dreta "
+"de la finestra de la sala de l'IRC. Si no la veieu, escolliu "
+"<guiseq><gui>Conversa</gui><gui>Mostra la llista de contacte</gui></guiseq>."
 
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "Com utilitzar i entendre la geolocalització a l'<app>Empathy</app>."
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "Informació legal."
 
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "Posició geogràfica"
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "Llicència"
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "Geolocalització"
+#: C/license.page:12(page/p)
+msgid ""
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
+msgstr ""
+"Aquest treball es distribueix sota la llicència Creative Commons "
+"Reconeixement-Compartir igual 3.0 llicència no adaptada."
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "Arreglar problemes comuns"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "Sou lliure de:"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "Com configurar, entrar i gestionar sales preferides."
+#: C/license.page:25(item/title)
+msgid "<em>To share</em>"
+msgstr "<em>Compartir</em>"
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "Sales preferides"
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "Copiar, distribuir i transmetre el treball."
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "Establiu un sala com a preferida"
+#: C/license.page:29(item/title)
+msgid "<em>To remix</em>"
+msgstr "<em>Fer-ne obres derivades</em>"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "Com entrar en una sala."
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "Adaptar el treball."
+
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "Sota les següents condicions:"
 
-#: C/favorite-rooms.page:40(p)
+#: C/license.page:38(item/title)
+msgid "<em>Attribution</em>"
+msgstr "<em>Reconeixement</em>"
+
+#: C/license.page:39(item/p)
 msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
+"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 ""
-"Per saber-ne més de com entrar en una sala d'IRC vegeu "
-"<link xref=\"irc-join-room\"/>."
+"Cal que reconegueu el treball de la forma especificada per l'autor o el "
+"llicenciatari (però no de forma que suggereixi que us dóna suport personal o "
+"de l'ús del treball)."
 
+#: C/license.page:46(item/title)
+msgid "<em>Share Alike</em>"
+msgstr "<em>Compartir igual</em>"
 
-#: C/favorite-rooms.page:46(p)
+#: C/license.page:47(item/p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"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 ""
-"Per saber-ne més de com iniciar o unir-se a una conversa de grup vegeu "
-"<link xref=\"group-conversations\"/>."
+"Si altereu, transformeu, o construïu a partir d'aquest treball heu de "
+"distribuir el treball resultant sota la mateixa llicència o una de "
+"compatible."
 
-#: C/favorite-rooms.page:54(p)
+#: C/license.page:53(page/p)
 msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"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 la finestra de conversa escolliu <guiseq><gui>Conversa</"
-"gui><gui>Sala de xat preferida</gui></guiseq>."
+"Per veure el text de la llicència completa vegeu el <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">Lloc web de Creative "
+"Commons </link>, o llegiu la pàgina <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/\">Commons Deed</link>."
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "Com entrar a sales preferides"
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "Fusiona i separa diferents contactes en un de sol."
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "Premeu <key>F5</key>."
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
+
+#: C/link-contacts.page:29(page/title)
+msgid "Link and unlink contacts"
+msgstr "Enllaceu i desenllaceu contactes"
 
-#: C/favorite-rooms.page:76(p)
+#: C/link-contacts.page:30(page/p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 msgstr ""
-"Escolliu <guiseq><gui>Sala</gui><gui>Uneix-te als preferits</gui></guiseq>, per "
-"entrar a totes les sales preferides."
+"Si algun contacte vostre té més d'un compte a diferents serveis de "
+"missatgeria, podeu combinar aquests comptes en un sol contacte."
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+#: C/link-contacts.page:34(page/p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
 msgstr ""
-"Escolliu <gui>Sala</gui> i seleccioneu la sala preferida a la qual voleu "
-"entrar."
+"El contacte resultant s'anomena <em>metacontacte</em>: un contacte composat "
+"de diferents contactes individuals."
 
-#: C/favorite-rooms.page:90(p)
+#: C/link-contacts.page:38(page/p)
 msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
-"Per entrar a una sala preferida us cal estar connectat a Internet i a un "
-"compte."
+"Si teniu un contacte, en Marc Garcia, que té tres serveis de missatgeria "
+"diferents, com per exemple:"
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "Com gestionar les sales preferides"
+#: C/link-contacts.page:44(item/p)
+msgid "janes@facebook"
+msgstr "marc@facebook"
 
-#: 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 ""
-"A la finestra <gui>Llista de contactes</gui>, escolliu "
-"<guiseq><gui>Sala</gui><gui>Gestiona les preferides</gui></guiseq>."
+#: C/link-contacts.page:49(item/p)
+msgid "jane.smith@gmail"
+msgstr "marc.garcia@gmail"
 
-#: 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."
+#: C/link-contacts.page:54(item/p)
+msgid "jane_smith@hotmail"
+msgstr "marc_garcia@hotmail"
+
+#: C/link-contacts.page:59(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
 msgstr ""
-"A la llista desplegable <guilabel>Compte</guilabel>, seleccioneu el compte "
-"del que vulgueu gestionar-ne les preferides."
+"Podeu combinar aquests contactes en un de sol amb el nom de Marc Garcia."
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "Seleccioneu <gui>Totes</gui> per veure totes les sales preferides."
+#: C/link-contacts.page:63(section/title)
+msgid "Link contacts"
+msgstr "Enllaceu contactes"
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "Seleccioneu la sala preferida que voleu gestionar:"
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "Podeu enllaçar els vostres contactes de la manera següent:"
 
-#: C/favorite-rooms.page:121(p)
+#: C/link-contacts.page:69(item/p)
 msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 msgstr ""
-"Seleccioneu la caixa de verificació <gui>Connecta automàticament</gui> per "
-"entrar de forma automàtica a la sala quan us connecteu amb el compte."
+"Feu clic al botó de «vist» per seleccionar les entrades que voleu enllaçar. "
+"Haureu habilitat el <em>mode de selecció</em>, veureu que cada element té "
+"una casella de selecció."
 
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+#: C/link-contacts.page:75(item/p)
+msgid ""
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"Feu clic a <gui>Suprimeix</gui> per esborrar la sala de la llista de preferides."
+"Marqueu les caselles de selecció que corresponguin a les entrades de "
+"<app>contactes</app> que pertanyen al mateix contacte."
 
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "Quan acabeu feu clic a <gui>Tanca</gui>."
+#: C/link-contacts.page:81(item/p)
+msgid "Press <gui style=\"button\">Link</gui>."
+msgstr "Feu clic a <gui style=\"button\">Enllaça</gui>."
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr ""
-"Impedeix que l'<app>Empathy</app> es connecti de forma automàtica a un compte."
+#: C/link-contacts.page:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr "Repetiu els passos 3 i 4 per enllaçar altres comptes."
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "Com inhabilitar un compte"
+#: C/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Desenllaceu contactes"
 
-#: C/disable-account.page:41(p)
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Per desenllaçar un contacte enllaçat:"
+
+#: C/link-contacts.page:98(item/p)
+msgid "Select the contact from your list."
+msgstr "Seleccioneu el contacte de la vostra llista."
+
+#: C/link-contacts.page:103(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."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 msgstr ""
-"Podeu inhabilitar un compte per evitar que l'<app>Empathy</app> es connecti "
-"sense esborrar completament el compte. Podeu desactivar i reactivar el "
-"compte si només voleu connectar-vos al compte esporàdicament, però encara "
-"voleu utilitzar l'<app>Empathy</app> per altres comptes."
+"Premeu <gui style=\"button\">Edita</gui> a la cantonada de dalt a la dreta "
+"del <app>Contactes</app>."
+
+#: C/link-contacts.page:108(item/p)
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr "Feu clic a <gui style=\"button\">Metacontactes</gui>."
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:113(item/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 msgstr ""
-"Seleccioneu el compte que voleu desactivar del llistat de comptes al quadre "
-"de l'esquerra de la finestra."
+"Feu clic a <gui style=\"button\">Suprimeix</gui> per desenllaçar una entrada "
+"del metacontacte."
 
-#: C/disable-account.page:56(p)
+#: C/link-contacts.page:118(item/p)
 msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
 msgstr ""
-"Desseleccioneu <gui style=\"checkbox\">Activat</gui> a la part dreta de la "
-"finestra."
+"Feu clic a <gui style=\"button\">Tanca</gui> si no voleu desenllaçar més "
+"contactes."
 
-#: C/disable-account.page:62(p)
-msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
+#: C/link-contacts.page:123(item/p)
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
 msgstr ""
-"Per tornar a activar el compte, només us cal seleccionar <gui style=\"checkbox"
-"\">Activat</gui>."
+"Per acabar, feu clic a <gui style=\"button\">Fet</gui> per acabar l'edició."
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "Registreu un compte amb un dels serveis de missatgeria habilitats."
+#. 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/overview.page:37(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
+msgstr ""
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Registre d'un compte nou"
+#. 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/overview.page:38(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
+msgstr ""
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 
-#: C/create-account.page:36(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/overview.page:39(media)
+msgctxt "_"
 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>."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr ""
-"La majoria de comptes requereixen que creeu un compte amb un proveïdor "
-"abans de connectar-vos amb aplicacions de missatgeria com "
-"l'<app>Empathy</app>. Amb alguns proveïdors de comptes, podeu utilitzar "
-"l'<app>Empathy</app> per registrar el compte nou, utilitzant el mateixos "
-"passos que si <link xref=\"add-account\">afegiu un compte</link>."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 
-#: C/create-account.page:42(p)
-#, fuzzy
-#| 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 with "
-#| "<app>Empathy</app>."
+#: C/overview.page:8(info/desc)
+msgid "What instant messaging is and how you can use it."
+msgstr "Què és la missatgeria instantània i com la podeu utilitzar?"
+
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
+msgstr "Aruna S"
+
+#: C/overview.page:24(page/title)
+msgid "Overview of instant messaging"
+msgstr "Visió general de la missatgeria instantània"
+
+#: C/overview.page:26(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>."
+"Instant messaging, sometimes abbreviated to IM, is a text-based means to "
+"communicate instantly over the internet and the local network. While some IM "
+"applications work with only one type of account, others, including <link "
+"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link "
+"xref=\"add-account\">accounts</link> from different service providers. Some "
+"of these even support audio and video calling."
 msgstr ""
-"Aquesta pàgina proporciona informació sobre la creació de comptes nous de "
-"tipologia variada. El vostre proveïdor de comptes hauria de donar-vos un "
-"nom d'usuari ID i una contrasenya, així com qualsevol informació addicional "
-"que us pugui fer falta per connectar-vos amb l'<app>Empathy</app>."
+"La missatgeria instantània, que de vegades s'abreuja com «IM», és un mitjà "
+"de comunicació instantani en format text i que funciona a través d'Internet "
+"i de les xarxes locals. Tot i que algunes aplicacions d'IM funcionen només "
+"amb un tipus de compte, d'altres com l'<link xref=\"introduction\">Empathy</"
+"link> permeten l'ús de <link xref=\"add-account\">comptes</link> de "
+"diferents proveïdors, fent més còmode l'ús de la missatgeria instantània. "
+"Alguns d'aquests proveïdors fins i tot permeten fer trucades de veu i de "
+"vídeo."
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: C/overview.page:42(td/p)
+msgid "Video Conference"
+msgstr "Conferència de vídeo"
+
+#: C/overview.page:43(td/p)
+msgid "Group chats"
+msgstr "Xats de grup"
+
+#: C/overview.page:44(td/p)
+msgid "Chat rooms"
+msgstr "Sales de xats"
+
+#: C/overview.page:48(page/p)
+msgid ""
+"Some instant messaging applications can be used to connect to chat rooms, "
+"online places where like-minded people meet to talk. One popular means to "
+"connect to several chat rooms is the Internet Relay Chat, also known as "
+"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room"
+"\">public</link> chat rooms, which are open to anyone who creates an account "
+"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-"
+"pwd\">password protected</link> and open only to a select few."
+msgstr ""
+"Algunes aplicacions de missatgeria instantània es poden utilitzar per "
+"connectar-se a sales de xat, llocs en línia on persones amb les mateixes "
+"inquietuds es troben per parlar. Una de les vies més populars per connectar-"
+"se a moltes sales de xat es l'Internet Relay Chat, també conegut com <link "
+"xref=\"irc-manage\">IRC</link>. L'IRC proporciona sales <link xref=\"irc-"
+"join-room\">públiques</link> de xat, obertes a tothom que tingui un compte "
+"al servidor de l'IRC i sales privades de xat protegides amb <link xref=\"irc-"
+"join-pwd\">contrasenya</link> i obertes només a un cert grup de persones."
+
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "Navegueu o cerqueu per les converses anteriors."
+
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "Visualització de les converses anteriors"
 
-#: C/create-account.page:48(p)
-#, fuzzy
-#| msgid ""
-#| "Facebook is one of the most used social network. It provides users with "
-#| "the opportunity to create their own profile, and to communicate with "
-#| "their friends."
+#: C/prev-conv.page:38(page/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."
+"<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 ""
-"Facebook és una de les xarxes socials més utilitzades. Proporciona als "
-"usuaris la oportunitat de crear-se el seu propi perfil, i de comunicar-se "
-"amb els seus amics."
+"L'<app>Empathy</app> desa automàticament totes les converses que manteniu "
+"amb els contactes. Podeu cercar <link xref=\"#search\">per les converses "
+"anteriors</link> o <link xref=\"#browse\">navegar per les converses "
+"anteriors</link> per contacte i data."
 
-#: C/create-account.page:52(p)
-#, fuzzy
-#| msgid ""
-#| "In order 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>."
+#: C/prev-conv.page:46(note/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>."
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
 msgstr ""
-"Per utilitzar Facebook per comunicar-vos amb els vostres amics, us cal crear "
-"un compte nou al lloc web: <link href=\"http://www.facebook.com\">www."
-"facebook.com</link>."
+"No us cal estar connectat a Internet per visualitzar i cercar a les "
+"converses anteriors."
 
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "Cerqueu a les converses anteriors"
 
-#: C/create-account.page:62(p)
+#: C/prev-conv.page:55(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 és un sistema obert de missatgeria instantània. Semblant al correu "
-"electrònic, Jabber us permet escollir el vostre proveïdor de comptes i "
-"comunicar-vos amb altres usuaris de Jabber, sense que importi el seu "
-"proveïdor de comptes."
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "Podeu utilitzar cerca de texts complets dins les converses anteriors."
 
-#: C/create-account.page:66(p)
+#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(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>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
 msgstr ""
-"Haureu de crear un compte nou amb algun proveïdor de comptes Jabber. Hi ha "
-"molt proveïdors gratuïts, un dels més populars és <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
+"Des de la finestra <gui>Llista de contactes</gui> escolliu "
+"<guiseq><gui>Visualitza</gui><gui>Converses anteriors</gui></guiseq> o "
+"premeu <key>F3</key>."
 
-#: C/create-account.page:71(p)
+#: C/prev-conv.page:63(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."
+"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 ""
-"Si sou usuaris del Google Mail o del Google Talk, ja teniu un compte de Jabber. "
-"El Google Talk és un servei de Jabber. Només us cal utilitzar l'adreça i la "
-"contrasenya de Google Mail per connectar-vos a l'<app>Empathy</app>."
+"Seleccioneu un compte de la llista desplegable situada a la part superior. "
+"Es mostrarà a sota la llista de contactes i les sales de xat per aquest "
+"compte."
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "Gent propera"
+#: C/prev-conv.page:67(item/p)
+msgid ""
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "Escriviu el text que voleu cercar al camp de text <gui>Cerca</gui>."
 
-#: C/create-account.page:80(p)
+#: C/prev-conv.page:71(item/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."
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
 msgstr ""
-"No us cal crear cap compte a cap proveïdor de serveis per utilitzar "
-"aquesta característica. Aquest servei funciona sempre que estigueu connectats a "
-"una xarxa d'àrea local, com un punt d'accés Wi-Fi. Us mostra tots els usuaris "
-"que fan servir aquest mateix servei de forma automàtica."
+"Es mostrarà totes les converses que compleixin els criteris de cerca. Per "
+"defecte, les converses estan ordenades per data."
 
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "Vegeu <link xref=\"salut-protocol\"/> per a més informació."
-
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "Navegueu per les converses anteriors"
 
-#: C/create-account.page:91(p)
+#: C/prev-conv.page:82(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."
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
 msgstr ""
-"El SIP és un sistema obert que permet realitzar converses d'àudio i de vídeo "
-"per Internet. Heu de crear un compte amb un proveïdor de SIP. Podeu "
-"comunicar-vos amb qualsevol usuari de SIP sense que importi el proveïdor "
-"SIP que estiguin utilitzant."
+"Podeu navegar, per data, per les converses anteriors amb els contactes i "
+"pels xats a les sales."
 
-#: C/create-account.page:97(p)
+#: C/prev-conv.page:91(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 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 ""
-"Per motius tècnics, el servei lliure <link href=\"https://www.ekiga."
-"net/index.php?page=register\">Ekiga.net</link> no funciona amb l'<app>Empathy</"
-"app>."
+"Seleccioneu un compte de la llista desplegable de dalt a l'esquerre. Es "
+"mostrarà a sota la llista de contactes i les sales de xat per aquest compte."
 
-#: C/create-account.page:102(p)
+#: C/prev-conv.page:95(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."
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
 msgstr ""
-"Alguns proveïdors de SIP us permeten fer trucades a telèfons fixes i mòbils "
-"des de l'ordinador. Normalment us cal una subscripció a un servei de pagament "
-"per poder-ho realitzar."
-
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+"Seleccioneu un contacte o una sala de xat per veure'n les converses "
+"anteriors. Per defecte es mostrarà la conversa més recent."
 
-#: C/create-account.page:109(p)
+#: C/prev-conv.page:99(item/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 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 ""
-"No us cal registrar un compte per utilitzar l'IRC. Encara que especifiqueu "
-"un sobrenom quan afegiu el compte d'IRC a l'<app>Empathy</app>, aquest "
-"sobrenom només s'utilitza cada vegada que us connecteu. Si un altre usuari està "
-"utilitzant aquest sobrenom, us caldrà canviar el sobrenom."
+"Podeu navegar per les converses per data. Els dies en els quals heu "
+"mantingut converses amb el contacte es mostraran amb negreta. Feu clic a una "
+"data per seleccionar-la. Feu clic a les fletxes al costat del mes i de l'any "
+"per navegar entre dates."
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:105(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."
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
 msgstr ""
-"Algunes xarxes d'IRC utilitzen un servei anomenat NickServ per permetre als "
-"usuaris protegir el seu sobrenom. Vegeu <link xref=\"irc-nick-password\"/> "
-"per a més informació."
+"Podeu cercar alguna paraula o frase de les converses escrivint al camp de "
+"cerca situat a la part superior. Es mostraran les converses que coincideixin "
+"amb la paraula o la frase cercada."
 
-#: C/create-account.page:117(p)
+#: C/prev-conv.page:111(note/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."
+"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 ""
-"Alguns servidors d'IRC estan protegits amb contrasenya. Haureu de saber la "
-"contrasenya per connectar-vos-hi. Generalment són xarxes d'IRC privades."
-
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "Serveis propietaris"
+"Podeu veure fàcilment les converses anteriors amb algun dels contactes a la "
+"finestra <gui>Llista de contactes</gui>. Feu clic sobre el contacte i "
+"escolliu <gui>Converses anteriors</gui>. S'obrirà la finestra <gui>Converses "
+"anteriors</gui> amb el contacte ja seleccionat."
 
-#: C/create-account.page:124(p)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 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."
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
 msgstr ""
-"Hi ha molts serveis de missatgeria instantània propietaris desenvolupats "
-"per diverses organitzacions o empreses. L'<app>Empathy</app> "
-"us permet connectar-vos a comptes existent de molts serveis populars. Per "
-"crear-vos-hi un compte nou haureu de visitar el lloc web i acceptar la "
-"llicència d'ús."
-
-#: 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"
+"El compte del servei de missatgeria instantània que voleu utilitzar no està "
+"habilitat a la llista de comptes."
 
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "El meu compte està habilitat"
 
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
+#: 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 ""
+"Si el compte de missatgeria instantània que voleu utilitzar no està "
+"habilitat a la llista inferior quan intenteu iniciar una conversa o unir-vos "
+"a una sala, els detalls del vostre compte poden no ser correctes."
 
-#: 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 ""
-"Canvieu l'estat per avisar la disponibilitat als contactes."
+"Assegureu-vos que esteu connectats a Internet o a una xarxa d'àrea local."
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "Canvieu l'estat"
+#: 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 ""
+"Escolliu <guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> i seleccioneu "
+"el compte que no està funcionant."
 
-#: 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 ""
-"Podeu canviar l'estat per indicar la disponibilitat als contactes. "
-"L'<app>Empathy</app> us permet seleccionar-ne un d'una llista d'estats "
-"per defecte."
+"Escriviu el nom d'usuari i la contrasenya de nou per estar segurs que són "
+"correctes."
 
-#: 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 ""
-"Feu clic a la llista desplegable a la part de dalt de la finestra <gui>Llista "
-"de contactes</gui>."
+"Comproveu a la secció <gui>Avançat</gui> que les dades siguin les correctes. "
+"Hauríeu de poder trobar aquestes dades al lloc web del servei de missatgeria."
 
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "Seleccioneu un estat de la llista."
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "Comproveu que el compte està habilitat."
 
-#: 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 ""
-"Vegeu <link xref=\"status-icons\"/> per veure la llista d'estats possibles i "
-"què signifiquen. També podeu <link xref=\"set-custom-message\">"
-"afegir missatges d'estat personalitzats</link> per proporcionar informació "
-"sobre la disponibilitat als contactes."
+"Apareix un missatge d'error a la finestra principal que diu «<gui>Errada en "
+"l'autenticació</gui>»."
+
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "Teniu un missatge que diu «Errada en l'autenticació»."
 
-#: 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 ""
-"Si no utilitzeu l'ordinador durant una estona o s'activa l'estalvi de pantalla, "
-"l'estat es posarà a absent."
+"Aquest tipus d'errors apareix quan el servei de missatgeria instantània no "
+"permet la connexió perquè no reconeix el vostre nom d'usuari o contrasenya "
+"per alguna raó."
 
-#. 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"
+"Comproveu que heu registrat un compte amb el servei amb el qual intenteu "
+"connectar-vos. Si no teniu un compte, molts serveis no us permetran "
+"connectar-vos."
 
-#: 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 "Informació sobre quan és possible realitzar una conversa d'àudio o de vídeo."
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "Àudio i vídeo"
+"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
+"\">edit</media> icon in the error message."
+msgstr ""
+"Feu clic a la icona <media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">Edita</media> del missatge d'error."
 
-#: 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 ""
-"Només podeu realitzar converses d'àudio i de vídeo amb els contactes que utilitzin "
-"una aplicació que permeti aquestes característiques. Si les aplicacions dels "
-"contactes permeten realitzar converses d'àudio o de vídeo, veureu les icones "
-"següents al costat del seu nom a la llista de contactes:"
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "Icona"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "Descripció"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "Icona per converses d'àudio"
-
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "El contacte pot realitzar converses d'àudio."
-
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "Icona per converses de vídeo"
+"Desactiveu <gui>Activat</gui> i torneu-lo a activar de nou per comprovar si "
+"es reconnecta el servei."
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "El contacte pot realitzar converses de vídeo."
+#: C/prob-conn-name.page:9(info/title)
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "«Nom ja utilitzat»"
 
-#: 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 ""
-"Per realitzar una conversa d'àudio heu de tenir una targeta de so reconeguda "
-"pel sistema operatiu i un micròfon que funcioni."
+"Apareix un missatge a la finestra principal que diu «<gui>Nom utilitzat</"
+"gui>»."
+
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "Teniu un missatge que diu «Nom utilitzat»"
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-name.page:35(page/p)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
 msgstr ""
-"Per realitzar una conversa de vídeo heu de tenir una càmera web reconeguda pel "
-"sistema operatiu i un micròfon que funcioni."
+"Aquests tipus d'errades apareixen quan intenteu connectar-vos a comptes "
+"d'IRC i utilitzeu un sobrenom que ja l'utilitza algú altre en aquella xarxa."
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "Tipus de comptes permesos"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "Al quadre de text <gui>Sobrenom</gui> introduïu el sobrenom nou."
 
-#: 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 ""
-"Només podeu realitzar converses d'àudio i de vídeo en comptes d'alguns "
-"proveïdors de serveis. La taula següent mostra si els tipus de "
-"compte permeten converses d'àudio i de vídeo."
+"Si heu registrat el sobrenom a la xarxa on sou ara, poseu la contrasenya per "
+"aquest sobrenom. Vegeu <link xref=\"irc-nick-password\"/> per més informació."
 
-#: 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 ""
-"Els tipus de comptes es proporcionen els connectors. El sistema pot no disposar "
-"de tots el tipus llistats aquí, o pot disposar de tipus de comptes que no "
-"estiguin llistats. Versions més noves dels connectors poden fer possible les "
-"converses d'àudio i de vídeo en tipus de comptes que estan classificats com "
-"que no ho permeten."
+"Desactiveu el compte i torneu-lo a activar de nou per intentar que es "
+"connecti de nou al servei."
 
-#: 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 ""
+"Apareix un missatge d'error a la finestra principal que diu «<gui>Error de "
+"xarxa</gui>»."
+
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "Veig un missatge que diu «Error de xarxa»"
 
-#: C/audio-video.page:118(p)
+#: C/prob-conn-neterror.page:42(page/p)
 msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
+"This kind of error happens when <app>Empathy</app> cannot communicate with "
+"the instant messaging service for some reason."
 msgstr ""
+"Aquest tipus d'errada succeeix quan l'<app>Empathy</app> no pot comunicar-se "
+"amb el servei de missatgeria instantània per alguna raó."
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "Servei"
-
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "Àudio"
-
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "Vídeo"
+#: 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 ""
+"També es pot produir quan intenteu utilitzar un compte d'IRC sense "
+"configurar el sobrenom."
 
-#: 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:87(section/title)
+msgid "Proxy support"
+msgstr "Accés a través de servidor intermediari"
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Xat de Facebook"
+#: 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 ""
+"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un "
+"servidor intermediari."
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de "
+"missatgeria instantània."
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemes connectant a un servei de missatgeria instantània"
 
-#: 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:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Suprimeix un compte completament de l'<app>Empathy</app>."
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Suprimiu un compte"
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: 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 ""
+"Podeu suprimir un compte completament de l'<app>Empathy</app> si no voleu "
+"utilitzar-lo més. Si voleu utilitzar el compte un altre cop amb "
+"l'<app>Empathy</app> en un futur haureu de tornar a crear el compte amb "
+"totes les seves dades."
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: 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 ""
+"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part "
+"esquerra de la finestra."
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Feu clic a <gui style=\"button\">-</gui>."
 
-#: 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 ""
+"Es mostrarà un diàleg sol·licitant la confirmació. Feu clic al botó "
+"<gui>Suprimeix</gui> per a suprimir el compte permanentment."
 
-#: 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 ""
+"Fins i tot després de la supressió d'un compte l'<app>Empathy</app> no "
+"esborrarà l'historial de converses del compte."
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Truqueu els contactes per Internet."
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Explicació sobre la funció de «Gent propera»."
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Inicieu una conversa d'àudio"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Què és la «Gent propera»?"
 
-#: 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."
-msgstr ""
-"Podeu trucar els contactes i realitzar-hi converses d'àudio. Aquesta "
-"característica només funciona amb alguns tipus de comptes i requereix que l'altra "
-"persona també tingui una aplicació que permeti realitzar trucades d'àudio."
-
-#: C/audio-call.page:34(p)
-#, fuzzy
-#| 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>. Alternatively, right click the contact and "
-#| "choose <gui style=\"menuitem\">Video Call</gui>."
-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 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 ""
-"Des de la finestra de la <gui>Llista de contactes</gui> , feu clic a la "
-"icona<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png"
-"\">vídeo trucada</media> a la vora del nom del contacte que vols trucar i "
-"escull <gui style=\"menuitem\">Vídeo trucada</gui>. També podeu prémer el "
-"botó dret sobre el contacte i seleccionar <gui style=\"menuitem\">Vídeo trucada</"
-"gui>."
+"El servei de «Gent propera» és un servei de comunicació descentralitzat: no "
+"us cal estar connectat ni autenticar-vos amb un servidor central per "
+"utilitzar-lo."
 
-#: C/audio-call.page:55(p)
-#, fuzzy
-#| msgid ""
-#| "To turn an audio conversation into a video conversation, choose "
-#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
-#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
-#| "\"figures/camera-web.png\">video call</media> toolbar button to select it."
+#: C/salut-protocol.page:45(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>."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"Per convertir una àudio conversa en una vídeo conversa, escolliu "
-"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Engega vídeo</"
-"gui></guiseq>, o premeu el botó de la barra per seleccionar <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">vídeo trucada</"
-"media>."
-
-#: C/audio-call.page:63(title)
-#, fuzzy
-#| msgid "Start a conversation witn an IRC contact."
-msgid "Start an audio conversation with a meta-contact"
-msgstr "Inicieu un conversa amb un contacte IRC"
+"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una "
+"xarxa local i no cal una connexió a Internet activa."
 
-#: C/audio-call.page:71(p)
-#, fuzzy
-#| msgid ""
-#| "Right-click on the name of the contact you want to have a conversation "
-#| "with, and choose <gui>Chat</gui>."
+#: C/salut-protocol.page:49(page/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <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 ""
-"Premeu el botó dret sobre el nom del contacte amb el qual voleu conversar, i "
-"escolliu <gui>Xat</gui>."
+"La gent que utilitza aquest servei dins de la xarxa local apareixeran "
+"automàticament i es podran enviar missatges i fitxers igual com en els "
+"altres serveis."
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Afegiu algú a la llista de contactes."
+#: C/salut-protocol.page:54(page/p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr ""
+"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei."
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Afegiu algú a la llista de contactes"
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Envieu un fitxer des del vostre ordinador a un dels contactes."
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr "Seleccioneu <guiseq><gui>Xat</gui><gui>Afegeix contacte</gui></guiseq>."
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Envieu fitxers"
 
-#: C/add-contact.page:40(p)
+#: C/send-file.page:45(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."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Des de la llista desplegable del <gui>Compte</gui>, seleccioneu el compte "
-"que voleu utilitzar per connectar-vos amb el contacte. Haurà d'utilitzar el "
-"mateix servei que el compte que seleccioneu."
+"Feu clic amb el botó secundari al contacte que li voleu enviar el fitxer i "
+"seleccioneu <gui>Envia un fitxer</gui>."
 
-#: C/add-contact.page:45(p)
+#: C/send-file.page:50(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."
+"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 ""
-"Al camp <gui>Identificador</gui> introduïu l'identificador d'entrada del contacte, "
-"el seu nom d'usuari, el nom de pantalla o qualsevol identificador apropiat per "
-"al tipus de servei."
+"Feu clic al contacte a qui voleu enviar un fitxer i seleccioneu "
+"<guiseq><gui>Edita</gui><gui>Contacte</gui> <gui>Envia un fitxer</gui></"
+"guiseq>."
+
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccioneu el fitxer a enviar i feu clic a <gui>Envia</gui>."
 
-#: C/add-contact.page:49(p)
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "Apareixerà la finestra <gui>Transferències de fitxers</gui>."
+
+#: 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 ""
-"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que "
-"aparegui a la llista de contactes."
+"Espereu que el contacte accepti la transferència del fitxer o feu clic a "
+"<gui>Atura</gui> per aturar la transferència."
 
-#: 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 ""
-"Feu clic a <gui>Afegeix</gui> per afegir el contacte a la llista de contactes."
+"Una vegada s'hagi acabat la transferència podeu tancar la finestra "
+"<gui>Transferències de fitxers</gui>."
 
-#: 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 ""
-"Per afegir una persona nova a la llista de contactes heu d'estar "
-"connectat a Internet i al compte."
-
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "Afegiu un compte nou a l'<app>Empathy</app>."
-
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "Com afegir un compte nou"
+"Si teniu llistades múltiples transferències acabades a la finestra, feu clic "
+"a <gui>Neteja</gui> per buidar la llista. Només s'esborraran de la llista, "
+"no s'esborraran els fitxers de l'ordinador."
 
-#: 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 ""
-"Podeu afegir comptes de missatgeria instantània per a qualsevol servei "
-"habilitat per comunicar-vos amb el contactes a través de l'<app>Empathy</app>. "
-"Per a alguns proveïdors de comptes aquests passos us permeten registrar-hi un "
-"compte nou. Vegeu <link xref=\"create-account\"/> per a més informació."
-
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Feu clic a <gui style=\"button\">Afegeix</gui>."
+"Només podeu enviar fitxers amb els serveis següents: <em>Jabber</em>, "
+"<em>Google Talk</em> i <em>Gent propera</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 ""
-"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de "
-"compte que vulgueu afegir."
+"Per enviar un fitxer a algú us cal estar connectat a Internet o a una xarxa "
+"d'àrea local."
 
-#: C/add-account.page:61(p)
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "Envieu un missatge a un dels contactes."
+
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "Enviament de missatges"
+
+#: 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 ""
-"Si no teniu un compte registrat, seleccioneu <gui>Crea un compte nou al "
-"servidor</gui>. Aquesta característica no està disponible per tots els tipus "
-"de comptes i pot no funcionar amb alguns proveïdors. Vegeu <link xref="
-"\"create-account\"/> per a més informació."
+"Des de la finestra <gui>Llista de contactes</gui> feu doble clic al nom del "
+"contacte amb el que voleu parlar."
 
-#: 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 ""
-"Introduïu la informació requerida. Per la majoria de comptes només us caldrà "
-"un nom d'usuari i una contrasenya. En alguns comptes cal més informació. Vegeu "
-"<link xref=\"accounts-window#details\"/> per a més informació."
+"S'obrirà una finestra nova. Teclegeu el missatge a la caixa a la part "
+"inferior de la finestra i premeu <key>Retorn</key> per enviar-lo."
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "Feu clic a <gui style=\"button\">Entra</gui>."
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Com enviar un missatge a un metacontacte"
 
-#: 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 ""
-"Per canviar el nom que identifica el compte a la finestra <gui>Comptes</"
-"gui>, seleccioneu el compte des de la llista de l'esquerra i feu clic sobre el "
-"nom o premeu la barra espaiadora. Editeu el nom del compte i feu clic a "
-"<key>Retorn</key> quan hageu acabat."
+"Seleccioneu el contacte amb el que voleu conversar i des del menú "
+"seleccioneu <gui style=\"menuitem\">Xat</gui>."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Afegiu, modifiqueu i suprimiu comptes."
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "Afegiu, editeu o suprimiu missatges personals dels vostres estats."
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Finestra dels comptes"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/accounts-window.page:35(p)
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "Establiu un missatge personalitzat"
+
+#: 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 finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir "
-"comptes."
+"A vegades voleu deixar un missatge personalitzat pel vostre estat, per "
+"exemple per fer saber als contactes que no estareu disponible durant una "
+"estona."
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Dades dels comptes"
+#: C/set-custom-status.page:40(page/p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr "Podeu deixar un missatge personalitzat per a cada estat disponible."
 
-#: C/accounts-window.page:44(p)
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(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>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"Per a majoria de tipus de comptes només us caldrà entrar el nom d'usuari "
-"i la contrasenya. Tanmateix alguns comptes o tipus de comptes requereixen "
-"informació addicional."
-
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Opcions avançades per als comptes de Jabber i de Google Talk."
-
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Dades dels comptes de Jabber"
+"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista "
+"desplegable de la part superior."
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:52(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\"/>."
+"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 ""
-"Per connectar-se a la majoria de comptes de Jabber només fa falta el nom "
-"d'usuari i la contrasenya. Tot i així, per alguns comptes o tipus de xarxes haureu "
-"d'introduir informació addicional al secció <gui>Avançada</gui>. Normalment, no "
-"us farà falta utilitzar les opcions avançades. Vegeu <link xref=\"add-account\"/> "
-"per les instruccions generals de com afegir comptes."
+"Seleccioneu l'estat al que voleu afegir-li el missatge personalitzat. Heu de "
+"seleccionar el que està identificat amb l'etiqueta <gui>Missatge "
+"personalitzat</gui>."
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:58(item/p)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"Com que el Google Talk també és un tipus de compte de Jabber, les instruccions "
-"següents també serveixen."
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Es requereix encriptació (TLS/SSL)"
-
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignora els errors del certificat SSL"
+"Introduïu el missatge personalitzat a la caixa de text de dalt de la "
+"finestra i premeu <key>Retorn</key> per establir el missatge."
 
-#: 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 ""
-"Sempre que sigui possible, es xifren les comunicacions entre l'<app>Empathy"
-"</app> i el servidor de Jabber. Si no és possible, s'envien els missatges "
-"sense xifrar. Seleccioneu <gui>Es requereix encriptació</gui> per impedir que "
-"l'<app>Empathy</app> es comuniqui amb el servidor de Jabber si no es pot "
-"establir una comunicació xifrada."
+"Si voleu establir el missatge personalitzat com a preferit, per poder-lo "
+"utilitzar en un altre moment, feu clic al cor petit a la dreta de la caixa "
+"de text on heu escrit el missatge personalitzat."
 
-#: 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 ""
-"Alguns servidors de Jabber xifren les dades amb certificats no vàlids o "
-"d'autoritats no reconegudes. Si confieu en el servidor al que us connecteu, "
-"podeu seleccionar <gui>Ignora els errors del certificat SSL</gui> per permetre "
-"la comunicació xifrada amb certificats no vàlids."
+"So no el deseu com a preferit quan torneu a iniciar l'<app>Empathy</app> no "
+"estarà disponible com a missatge personalitzat. Només es desarà per la "
+"sessió actual."
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "Recurs"
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "Edició i supressió dels missatges personalitzats"
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "Prioritat"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Seleccioneu <gui>Edita el missatge personalitzat</gui>."
 
-#: C/account-jabber.page:61(p)
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Per editar un missatge personalitzat:"
+
+#: 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 teniu més d'una aplicació (en ordinadors diferents) connectats al mateix "
-"temps al mateix compte, podeu configurar un recurs per identificar de "
-"forma inequívoca cadascun d'ells. Per defecte l'<app>Empathy</app> utilitzarà "
-"<input>Telepathy</input> com a recurs."
+"Des de la caixa <gui>Preestablerts desats</gui>, seleccioneu el missatge "
+"d'estat que voleu editar i feu-hi doble clic."
 
-#: 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 ""
-"Podeu establir la prioritat per especificar quina aplicació rebrà els missatges "
-"entrants dels contactes. Els missatges nous s'enviaran a l'aplicació que tingui "
-"la màxima prioritat."
+"Teclegeu el missatge personalitzat nou i premeu <key>Retorn</key> per "
+"modificar-lo."
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "Sobreescriptura dels paràmetres del servidor"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "Per suprimir un missatge personalitzat:"
 
-#: 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 ""
-"L'<app>Empathy</app> utilitza els paràmetres per defecte, basant-se en el nom "
-"d'usuari, per connectar-se al servidor de Jabber. Per alguns servidors de "
-"Jabber us caldrà introduir els paràmetres del servidor manualment. Aquests "
-"paràmetres els hauria de proporcionar el proveïdor de Jabber."
+"Des de la caixa <gui>Preestablerts desats</gui>, seleccioneu el missatge "
+"d'estat que voleu suprimir."
+
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Feu clic al botó <gui>Suprimeix</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:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Feu clic a <gui>Tanca</gui> quan hàgiu acabat."
 
-#. 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 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"
+"Quan editeu un missatge personalitzat, aquest no s'establirà com el missatge "
+"actual. L'haureu de seleccionar a la finestra <gui>Llista de contactes</gui>."
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "Informació addicional per connectar-se a xarxes d'IRC."
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "Mostreu l'escriptori als contactes."
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "Dades del compte d'IRC"
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "Compartició de l'escriptori"
 
-#: 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 ""
-"Els comptes d'IRC requereixen una informació diferent que els altres tipus de "
-"comptes. Per crear un compte d'IRC heu d'especificar com a mínim una xarxa "
-"d'IRC i un sobrenom. Aquesta pàgina descriu la informació que podeu "
-"proporcionar pel compte d'IRC."
+"Podeu compartir l'escriptori amb algun contacte. Podeu utilitzar-ho per "
+"mostrar l'escriptori als contactes, per exemple per demanar-los ajuda o "
+"ajudar-los a resoldre un problema."
 
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "Xarxa"
-
-#: 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 ""
-"L'IRC és un sistema obert que permet que puguin haver-hi tantes xarxes d'IRC "
-"com es vulgui. Cada xarxa és diferent de les altres i té els seus propis "
-"usuaris i sales de xat. L'<app>Empathy</app> us mostra les xarxes més populars "
-"a la llista desplegable <gui>Xarxa</gui>. Podeu afegir més xarxes si voleu. "
-"Vegeu <link xref=\"#networks\"/> més avall."
+"Per poder compartir l'escriptori, cal que tingueu instal·lat al sistema un "
+"servidor de VNC que permeti aquesta funció. El <app>Vino</app>, el servidor "
+"de VNC del GNOME, ja ho permet."
 
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "Sobrenom"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr ""
+"Des de la finestra <gui>Llista de contactes</gui> executeu una de les "
+"accions següents:"
 
-#: C/account-irc.page:54(p)
+#: C/share-desktop.page:56(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."
+"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 ""
-"El vostre sobrenom és el nom únic que us identifica a la xarxa d'IRC. Només "
-"una persona pot utilitzar un sobrenom específic a cada xarxa. Si rebeu un "
-"error que diu <link xref=\"prob-conn-name\" role=\"error-msg\"/> haureu de "
-"canviar el sobrenom."
+"Seleccioneu el contacte amb el que voleu compartir l'escriptori i escolliu "
+"<guiseq><gui>Edita</gui><gui>Contacte</gui><gui>Comparteix el meu "
+"escriptori</gui></guiseq>."
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "Contrasenya"
+#: 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 ""
+"Feu clic amb el botó secundari sobre el contacte amb el qual voleu compartir "
+"l'escriptori i seleccioneu <gui>Comparteix el meu escriptori</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 ""
-"Per connectar-se a alguns servidors, en especial els de les xarxes privades, "
-"us farà falta una contrasenya. Si esteu autoritzat a utilitzar la xarxa, "
-"els seus administradors us en proporcionaran la contrasenya."
+"Perquè pugui veure el vostre escriptori, al contacte que hageu seleccionat "
+"se li enviarà una invitació que haurà d'acceptar."
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "Contrasenyes de NickServ"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr ""
+"Podeu desconnectar el contacte del vostre ordinador mitjançat l'aplicació de "
+"compartició d'escriptoris."
 
-#: C/account-irc.page:66(p)
-#, fuzzy
-#| 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."
+#: 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 algunes xarxes es poden registrar els sobrenoms amb un servei conegut com a "
-"NickServ. L'<app>Empathy</app> encara no permet utilitzar sobrenoms amb "
-"contrasenyes. Algunes xarxes, entre elles la popular xarxa FreeNode, els "
-"servidors de contrasenyes es reenvien automàticament al NickServ, de manera "
-"que podeu establir aquest camp per identificar-vos amb el NickServ. Vegeu "
-"<link xref=\"irc-nick-password\"/> per més informació."
+"Per més informació sobre com utilitzar l'aplicació de compartició "
+"d'escriptoris remots mireu la seva ajuda."
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "Nom 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 ""
+"Quan compartiu l'escriptori amb algú altre, podeu notar un alentiment del "
+"sistema i una disminució de la velocitat d'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 ""
-"Podeu proporcionar el vostre nom real conjuntament amb el sobrenom. Els altres "
-"usuaris el podran veure quan vegin la vostra informació."
+"Potser no tots els contactes podran utilitzar aquesta funció. Cal que "
+"tinguin la versió 2.28 o una més nova de l'<app>Empathy</app> i una "
+"aplicació de visualització d'escriptoris remots compatible instal·lada al "
+"sistema."
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "Missatge de sortida"
+#. 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'"
 
-#: 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)
+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 ""
-"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 ""
-"Quan sortiu, s'enviarà un missatge a totes les sales de xat que estigueu i "
-"tots els usuaris amb els que tingueu xats privats. Utilitzeu aquest camp per "
-"proporcionar un missatge de sortida personalitzat."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "Xarxes d'IRC"
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "Explicació dels diversos estats i icones d'estat."
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "Xarxes"
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "Icones i tipus d'estats"
 
-#: C/account-irc.page:99(p)
+#: C/status-icons.page:39(item/title)
 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 ""
-"L'<app>Empathy</app> inclou una llista de les xarxes d'IRC més populars. Si "
-"voleu una altra xarxa, podeu afegir-la a la llista. També podeu modificar "
-"xarxes existents i esborrar-ne de la llista."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png\">Icona "
+"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 ""
-"Feu clic a <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-add.png\" "
-"width=\"16\" height=\"16\">Afegeix</media> per afegir una xarxa a la llista."
+"Utilitzeu l'estat <em>Disponible</em> quan esteu a l'ordinador i esteu "
+"disponibles per xatejar. Podeu configurar un missatge personalitzat per "
+"aquest estat."
 
-#: C/account-irc.page:107(p)
+#: C/status-icons.page:45(item/title)
 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 ""
-"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">"
-"Edita</media> per modificar una xarxa de la llista."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Icona "
+"d'ocupat</media> <gui>Ocupat</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 ""
-"Seleccioneu una xarxa de la llista i feu clic a <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">"
-"Suprimeix</media> per suprimir una xarxa de la llista."
+"Utilitzeu l'estat <em>Ocupat</em> per mostrar als contactes que no voleu "
+"xatejar ara. Encara podran xatejar si volen, per exemple si tenen alguna "
+"cosa urgent a comentar-vos. Per defecte, l'<app>Empathy</app> no utilitzarà "
+"finestres emergents ni sons quan esteu ocupats. Podeu configurar un missatge "
+"personalitzat per aquest estat."
 
-#: C/account-irc.page:115(p)
+#: C/status-icons.page:53(item/title)
 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 ""
-"Quan afegiu o modifiqueu una xarxa podeu introduir la informació següent:"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Icona "
+"d'absent</media> <gui>Absent</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 ""
-"Aquest és el nom de la xarxa que voleu que aparegui a la llista de xarxes."
+"Utilitzeu l'estat <em>Absent</em> quan sou lluny de l'ordinador. "
+"L'<app>Empathy</app> us posa automàticament l'estat «Absent» si esteu un "
+"temps sense utilitzar l'ordinador o si s'activa l'estalvi de pantalla. Per "
+"defecte, l'<app>Empathy</app> no utilitzarà finestres emergents ni sons quan "
+"esteu absents. Podeu configurar un missatge personalitzat per aquest estat."
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "Joc de caràcters"
+#: 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\">Icona "
+"d'invisible</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 ""
-"Això especifica la codificació de caràcters que s'utilitza en aquesta xarxa. "
-"Una codificació de caràcters és un format específic per enregistrar caràcters "
-"internament a l'ordinador. Hi ha moltes codificacions de caràcters i heu "
-"d'utilitzar la mateixa que els altres usuaris per veure els missatges de "
-"forma correcta."
+"Quan poseu l'estat com a <em>Invisible</em>, apareixereu com a desconnectat "
+"per als contactes. Encara estareu connectat als comptes i podreu veure "
+"l'estat dels contactes i xatejar-hi."
 
-#. Translators: Recommend character encodings that are common
-#.            for your language.
-#: C/account-irc.page:135(p)
+#: C/status-icons.page:69(item/title)
 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 ""
-"Per defecte l'<app>Empathy</app> utilitza l'UTF-8 , una codificació de "
-"caràcters moderna que pot gestionar text escrit en la immensa majoria de les "
-"llengües del món. Una altra codificació de caràcters per l'anglès i algunes "
-"llengües occidentals és l'ISO-8859-1."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Icona "
+"de fora de línia</media> <gui>Fora de línia</gui>"
+
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr ""
+"Si establiu l'estat com a <em>Desconnectat</em> us desconnectarà de tots els "
+"contactes."
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidors"
+#: C/video-call.page:11(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Inicieu una conversa de vídeo amb un dels contactes."
+
+#: C/video-call.page:37(page/title)
+msgid "Start a video conversation"
+msgstr "Inicieu una conversa de vídeo"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:39(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 xarxa d'IRC pot tenir molts servidors als que us podeu connectar. Quan "
-"esteu connectat a un servidor d'una xarxa en particular, us podeu comunicar "
-"amb tots els usuaris de tots els servidors d'aquella xarxa. Podeu "
-"afegir o suprimir servidors per a aquesta xarxa utilitzant els botons "
-"<gui>Afegeix</gui> i <gui>Suprimeix</gui>."
+"Si teniu una càmera web, podeu trucar els contactes i tindre una vídeo "
+"conferencia amb ells. Aquesta característica sols funciona amb certs tipus "
+"de comptes, i requereix que l'altra persona tingui una aplicació que permeti "
+"fer vídeo trucades."
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:46(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."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"Quan seleccioneu un servidor feu clic al camp de <gui>Servidor</gui> o "
-"<gui>Port</gui> per editar-lo. També ho podeu fer amb les tecles de navegació "
-"de cap a la dreta i de cap a l'esquerra per donar el focus al camp i si feu "
-"clic a la barra espaiadora editareu el camp."
+"Feu clic amb el botó secundari al contacte que voleu trucar i des del menú "
+"seleccioneu <gui style=\"menuitem\">Trucada de vídeo</gui>."
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:54(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."
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr "Per acabar la conversa feu clic a <gui style=\"button\">Penja</gui>."
+
+#: C/video-call.page:60(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 ""
-"Seleccioneu la casella de selecció de la columna <gui>SSL</gui> per xifrar "
-"totes les comunicacions amb el servidor. Adoneu-vos que això no impedirà que "
-"altres usuaris de la xarxa puguin veure el que escriviu en un xat públic."
+"Per canviar d'una conversa de vídeo a una conversa de veu, escolliu "
+"<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Apaga el "
+"vídeo</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:65(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "Inicia una conversa de vídeo amb un metacontacte"
+
+#: C/video-call.page:73(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
-"Joan Duran <jodufi@gmail.com>, 2008, 2009\n"
-"Carles Ferrando <carles.ferrando@gmail.com>, 2010\n"
-"Gil Forcada <gilforcada@guifi.net>, 2011"
+"Seleccioneu el contacte amb el que voleu realitzar la conversa i des del "
+"menú seleccioneu <gui style=\"menuitem\">Trucada de vídeo</gui>."
diff --git a/help/de/de.po b/help/de/de.po
index f8574ee55..d5c2ffe19 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -11,18 +11,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy help master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 02:56+0000\n"
-"PO-Revision-Date: 2013-04-05 14:35+0200\n"
-"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
+"POT-Creation-Date: 2013-08-08 18:59+0000\n"
+"PO-Revision-Date: 2013-08-09 20:15+0100\n"
+"Last-Translator: Benjamin Steinwender <b@stbe.at>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
-"Language: \n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -41,26 +39,16 @@ msgstr ""
 #. 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)
+#: C/index.page:35(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/empathy-logo.png' "
 "md5='1afc419a644e90b16393807e35cb5cb2'"
 msgstr "original"
 
-#: 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/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/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:20(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)
@@ -77,20 +65,20 @@ msgstr "Empathy Internet-Nachrichtendienst"
 #: 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/prob-conn-auth.page:22(credit/name) C/prob-conn-name.page:19(credit/name)
+#: C/prob-conn-neterror.page:20(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)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:17(credit/name)
+#: C/video-call.page:25(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/index.page:25(license/p) C/account-irc.page:21(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:21(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/audio-call.page:31(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:29(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)
@@ -104,47 +92,61 @@ msgstr "Milo Casagrande"
 #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(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/overview.page:20(license/p)
+#: C/link-contacts.page:23(license/p) C/overview.page:21(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/prob-conn-auth.page:26(license/p) C/prob-conn-name.page:23(license/p)
+#: C/prob-conn-neterror.page:24(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)
+#: C/status-icons.page:25(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/index.page:27(page/title)
+#: C/index.page:28(info/desc)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Empathy is the instant messenging application for GNOME. It supports text, "
+"voice and video chat over many protocols."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Internet-Nachrichtendienst-Logo</media> Empathy Internet-"
-"Nachrichtendienst"
+"Empathy ist eine Sofortnachrichten-Anwendung für GNOME. Textnachrichten, "
+"Sprach- und Videoanrufe sowie alle gängigen Nachrichtensysteme werden "
+"unterstützt."
+
+#: C/index.page:30(info/title)
+msgctxt "link"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:31(info/title)
+msgctxt "text"
+msgid "Empathy"
+msgstr "Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:34(page/title)
+msgid "<_:media-1/> Empathy"
+msgstr "<_:media-1/> Empathy"
+
+#: C/index.page:40(section/title)
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: C/index.page:39(section/title)
+#: C/index.page:44(section/title)
 msgid "Contact Management"
 msgstr "Kontaktverwaltung"
 
-#: C/index.page:43(section/title)
+#: C/index.page:48(section/title)
 msgid "Text Conversations"
 msgstr "Text-Unterhaltungen"
 
-#: C/index.page:47(section/title)
+#: C/index.page:52(section/title)
 msgid "Audio and Video Conversations"
-msgstr "Audio- und Video-Unterhaltungen"
+msgstr "Sprach- und Video-Unterhaltungen"
 
-#: C/index.page:51(section/title)
+#: C/index.page:56(section/title)
 msgid "Advanced Actions"
 msgstr "Fortgeschrittene Aktionen"
 
-#: C/index.page:55(section/title) C/irc-manage.page:64(section/title)
+#: C/index.page:60(section/title) C/irc-manage.page:64(section/title)
 msgid "Common Problems"
 msgstr "Häufig auftretende Probleme"
 
@@ -152,7 +154,7 @@ msgstr "Häufig auftretende Probleme"
 #. 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)
+#: C/account-irc.page:107(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
@@ -177,7 +179,7 @@ msgstr "original"
 #. 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/account-irc.page:111(media) C/prob-conn-auth.page:58(media)
 #: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
 msgctxt "_"
 msgid ""
@@ -188,30 +190,30 @@ msgstr "original"
 #. 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)
+#: C/account-irc.page:115(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
 msgstr "original"
 
-#: C/account-irc.page:8(info/desc)
+#: C/account-irc.page:9(info/desc)
 msgid "Additional information necessary for connecting to IRC networks."
 msgstr ""
 "Zusätzlich erforderliche Informationen für Verbindungen zu IRC-Netzwerken."
 
-#: 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/account-irc.page:17(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:17(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)
+#: C/status-icons.page:21(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/account-irc.page:31(page/title)
+#: C/account-irc.page:32(page/title)
 msgid "IRC account details"
 msgstr "IRC-Kontendetails"
 
-#: C/account-irc.page:33(page/p)
+#: C/account-irc.page:34(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 "
@@ -223,7 +225,7 @@ msgstr ""
 "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:39(note/p) C/irc-manage.page:42(note/p)
+#: C/account-irc.page:40(note/p) C/irc-manage.page:42(note/p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -231,11 +233,11 @@ msgstr ""
 "Sie müssen das Paket <sys>telepathy-idle</sys> installiert haben, um das IRC "
 "in <app>Empathy</app> nutzen zu können."
 
-#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+#: C/account-irc.page:46(item/title) C/account-irc.page:124(item/title)
 msgid "<gui>Network</gui>"
 msgstr "<gui>Netzwerk</gui>"
 
-#: C/account-irc.page:46(item/p)
+#: C/account-irc.page:47(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> "
@@ -249,11 +251,11 @@ msgstr ""
 "zusätzliche Netzwerke hinzufügen. Siehe <link xref=\"#networks\"/> "
 "nachfolgend."
 
-#: C/account-irc.page:53(item/title)
+#: C/account-irc.page:54(item/title)
 msgid "<gui>Nickname</gui>"
 msgstr "<gui>Spitzname</gui>"
 
-#: C/account-irc.page:54(item/p)
+#: C/account-irc.page:55(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 "
@@ -265,11 +267,11 @@ msgstr ""
 "Sie die Fehlermeldung <link xref=\"prob-conn-name\" role=\"error-msg\"/> "
 "erhalten, müssen Sie Ihren Spitznamen ändern."
 
-#: C/account-irc.page:60(item/title)
+#: C/account-irc.page:61(item/title)
 msgid "<gui>Password</gui>"
 msgstr "<gui>Passwort</gui>"
 
-#: C/account-irc.page:61(item/p)
+#: C/account-irc.page:62(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 "
@@ -280,11 +282,11 @@ msgstr ""
 "benutzen, sollte Sie Ihnen dessen Verwalter ein Passwort zur Verfügung "
 "gestellt haben."
 
-#: C/account-irc.page:65(note/title)
+#: C/account-irc.page:66(note/title)
 msgid "NickServ Passwords"
 msgstr "NickServ-Passwörter"
 
-#: C/account-irc.page:66(note/p)
+#: C/account-irc.page:67(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. "
@@ -300,11 +302,11 @@ msgstr ""
 "ermöglicht, sich mit diesem Feld bei NickServ zu identifizieren. Weitere "
 "Details hierzu finden Sie in <link xref=\"irc-nick-password\"/>"
 
-#: C/account-irc.page:76(item/title)
+#: C/account-irc.page:77(item/title)
 msgid "<gui>Real name</gui>"
 msgstr "<gui>Realer Name</gui>"
 
-#: C/account-irc.page:77(item/p)
+#: C/account-irc.page:78(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."
@@ -313,11 +315,11 @@ msgstr ""
 "Dieser wird anderen Benutzern angezeigt, wenn diese Ihre persönlichen "
 "Informationen betrachten."
 
-#: C/account-irc.page:81(item/title)
+#: C/account-irc.page:82(item/title)
 msgid "<gui>Quit message</gui>"
 msgstr "<gui>Abmeldungsnachricht</gui>"
 
-#: C/account-irc.page:82(item/p)
+#: C/account-irc.page:83(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 "
@@ -328,16 +330,16 @@ msgstr ""
 "Benutzer, mit denen Sie eine private Unterhaltung führen. Verwenden Sie "
 "dieses Feld, um eine benutzerdefinierte Nachricht bereitzustellen."
 
-#: C/account-irc.page:94(info/title)
+#: C/account-irc.page:95(info/title)
 msgctxt "link"
 msgid "IRC Networks"
 msgstr "IRC-Netzwerke"
 
-#: C/account-irc.page:97(section/title)
+#: C/account-irc.page:98(section/title)
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: C/account-irc.page:99(section/p)
+#: C/account-irc.page:100(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 "
@@ -347,43 +349,44 @@ msgstr ""
 "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/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 ""
-"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/account-irc.page:108(media/span)
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: C/account-irc.page:105(item/p)
+msgid "To add a network to the list, click <_:media-1/>."
+msgstr "Klicken Sie auf <_:media-1/>, um ein Netzwerk zur Liste hinzuzufügen."
+
+#: C/account-irc.page:112(media/span)
+msgid "Edit"
+msgstr "Bearbeiten"
 
-#: C/account-irc.page:107(item/p)
+#: C/account-irc.page:109(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>."
+"To modify a network in the list, select the network and click <_:media-1/>."
 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>."
+"auf <_:media-1/>."
 
-#: C/account-irc.page:110(item/p)
+#: C/account-irc.page:116(media/span)
+msgid "Remove"
+msgstr "Entfernen"
+
+#: C/account-irc.page:113(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>."
+"To remove a network from the list, select the network and click <_:media-1/>."
 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>."
+"auf <_:media-1/>."
 
-#: C/account-irc.page:115(section/p)
+#: C/account-irc.page:119(section/p)
 msgid ""
 "When adding or modifying a network, you can enter the following information:"
 msgstr ""
 "Beim Hinzufügen oder Ändern eines Netzwerks können Sie die folgenden "
 "Informationen eingeben:"
 
-#: C/account-irc.page:121(item/p)
+#: C/account-irc.page:125(item/p)
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
@@ -391,11 +394,11 @@ msgstr ""
 "Dies ist der Name des Netzwerks, so wie der in der Liste der Netzwerke "
 "erscheinen soll."
 
-#: C/account-irc.page:125(item/title)
+#: C/account-irc.page:129(item/title)
 msgid "<gui>Charset</gui>"
 msgstr "<gui>Zeichensatz</gui>"
 
-#: C/account-irc.page:126(item/p)
+#: C/account-irc.page:130(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 "
@@ -409,7 +412,7 @@ msgstr ""
 "Zeichenkodierungen. Sie müssen die gleiche Kodierung wie die anderen "
 "Benutzer verwenden, damit deren Nachrichten korrekt angezeigt werden können."
 
-#: C/account-irc.page:135(item/p)
+#: C/account-irc.page:139(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 "
@@ -420,11 +423,11 @@ msgstr ""
 "kann. Eine weitere häufig benutzte Kodierung für Englisch und andere "
 "westliche Sprachen ist ISO-8859-1."
 
-#: C/account-irc.page:141(item/title)
+#: C/account-irc.page:145(item/title)
 msgid "<gui>Servers</gui>"
 msgstr "<gui>Server</gui>"
 
-#: C/account-irc.page:142(item/p)
+#: C/account-irc.page:146(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 "
@@ -438,7 +441,7 @@ msgstr ""
 "<gui>Hinzufügen</gui> und <gui>Entfernen</gui> Server dieses Netzwerks "
 "hinzufügen und entfernen."
 
-#: C/account-irc.page:147(item/p)
+#: C/account-irc.page:151(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 "
@@ -449,7 +452,7 @@ msgstr ""
 "verwenden Sie die linke und rechte Pfeiltaste, um das Feld zu fokussieren. "
 "Mit der Leertaste beginnen Sie mit der Bearbeitung."
 
-#: C/account-irc.page:151(item/p)
+#: C/account-irc.page:155(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 "
@@ -574,15 +577,15 @@ msgstr ""
 "müssen Sie benutzerdefinierte Einstellungen manuell eingeben. Diese "
 "Einstellungen sollte Ihnen Ihr Jabber-Dienstanbieter zur Verfügung stellen."
 
-#: C/accounts-window.page:11(info/desc)
+#: C/accounts-window.page:10(info/desc)
 msgid "Add, modify, and delete accounts."
 msgstr "Hinzufügen, Bearbeiten und Entfernen von Konten."
 
-#: C/accounts-window.page:33(page/title)
+#: C/accounts-window.page:32(page/title)
 msgid "Accounts Window"
 msgstr "Konten-Fenster"
 
-#: C/accounts-window.page:35(page/p)
+#: C/accounts-window.page:34(page/p)
 msgid ""
 "The <gui>Accounts</gui> window allows you to add, modify, and delete "
 "accounts."
@@ -590,11 +593,11 @@ msgstr ""
 "Das <gui>Konten</gui> ermöglicht Ihnen das Hinzufügen, Bearbeiten oder "
 "Entfernen von Kontakten."
 
-#: C/accounts-window.page:43(section/title)
+#: C/accounts-window.page:42(section/title)
 msgid "Account Details"
 msgstr "Kontendetails"
 
-#: C/accounts-window.page:44(section/p)
+#: C/accounts-window.page:43(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 "
@@ -694,8 +697,8 @@ msgstr "Jemanden zur Kontaktliste hinzufügen."
 
 #: 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/prob-conn-auth.page:18(credit/name)
+#: C/prob-conn-neterror.page:16(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"
@@ -751,103 +754,84 @@ msgstr ""
 "Um eine neue Person zu Ihrer Kontaktliste hinzuzufügen, müssen Sie mit dem "
 "Internet und mit Ihrem Konto verbunden sein."
 
-#. 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/audio-call.page:9(info/desc)
+#: C/audio-call.page:10(info/desc)
 msgid "Call your contacts over the Internet."
 msgstr "Ihre Kontakte über das Internet anrufen."
 
-#: C/audio-call.page:27(page/title)
+#: C/audio-call.page:26(credit/name) C/create-account.page:24(credit/name)
+#: C/overview.page:17(credit/name) C/share-desktop.page:18(credit/name)
+#: C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
 msgid "Start an audio conversation"
-msgstr "Eine Audio-Unterhaltung starten"
+msgstr "Eine Sprachunterhaltung starten"
 
-#: C/audio-call.page:29(page/p)
+#: C/audio-call.page:37(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."
+"features only works with certain types of accounts and it requires the other "
+"person to have an application that supports audio calls."
 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."
+"Sie können Ihre Kontakte für eine Sprachunterhaltung anrufen. Dieses "
+"Funktionsmerkmal steht nur für bestimmte Kontentypen zur Verfügung. Außerdem "
+"muss die andere Person mit einer Anwendung arbeiten, die Sprachanrufe "
+"unterstützt."
 
-#: C/audio-call.page:34(item/p)
+#: C/audio-call.page:43(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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio Call</gui>."
 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>."
+"Wählen Sie mit der rechten Maustaste den Kontakt aus, den Sie anrufen "
+"wollen, und wählen Sie <gui style=\"menuitem\">Sprachanruf</gui>."
 
-#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 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."
+"sehen Sie am unteren Rand des Fensters die Gesamtzeit der Unterhaltung."
 
-#: 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>."
+#: C/audio-call.page:55(item/p)
+msgid ""
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Um eine Unterhaltung zu beenden, klicken Sie auf <gui style=\"button"
-"\">Auflegen</gui>."
+"Um eine Unterhaltung zu beenden, klicken Sie auf den Knopf <gui style="
+"\"button\">Auflegen</gui>."
 
-#: C/audio-call.page:55(note/p)
+#: C/audio-call.page:63(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 ""
-"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>."
+"Um eine Sprachunterhaltung in eine Videounterhaltung umzuwandeln, wählen Sie "
+"<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video an</"
+"gui></guiseq>."
 
-#: C/audio-call.page:63(section/title)
+#: C/audio-call.page:71(section/title)
 msgid "Start an audio conversation with a meta-contact"
-msgstr "Eine Unterhaltung mit einem Meta-Kontakt starten"
+msgstr "Eine Sprachunterhaltung mit einem Meta-Kontakt starten"
 
-#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
-#: C/video-call.page:64(item/p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(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/audio-call.page:71(item/p)
+#: C/audio-call.page:79(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Audio 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\">Audioanruf</gui>."
+"und wählen Sie im Menü <gui style=\"menuitem\">Sprachanruf</gui>."
 
-#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
-#: C/video-call.page:76(note/p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 "
@@ -865,20 +849,29 @@ msgstr ""
 #. 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'"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
 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.
+#: C/audio-video.page:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr ""
+"external ref='figures/color-camera.png' "
+"md5='3c7319d2fde00e55eaca8f5318667a66'"
+
 #: C/audio-video.page:8(info/desc)
 msgid ""
 "Information on when it is possible to have an audio or video conversation."
 msgstr ""
-"Informationen über die Möglichkeiten für Audio- und Video-Unterhaltungen."
+"Informationen über die Möglichkeiten für Sprach- und Video-Unterhaltungen."
 
 #: C/audio-video.page:32(page/title)
 msgid "Audio and video support"
-msgstr "Audio- und Video-Unterstützung"
+msgstr "Sprach- und Video-Unterstützung"
 
 #: C/audio-video.page:34(page/p)
 msgid ""
@@ -887,9 +880,9 @@ msgid ""
 "audio or video conversations, you will see the following icons next to their "
 "names in the contact list:"
 msgstr ""
-"Sie können Audio- und Video-Unterhaltungen nur mit Kontakten führen, die "
+"Sie können Sprach- 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 "
+"Wenn Ihre Kontakte Sprach- oder Video-Unterhaltungen unterstützen, werden "
 "neben deren Namen in der Kontaktliste folgende Symbole angezeigt:"
 
 #: C/audio-video.page:43(td/p)
@@ -910,7 +903,7 @@ msgstr ""
 
 #: 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."
+msgstr "Der Kontakt kann eine Sprachunterhaltung führen."
 
 #: C/audio-video.page:69(td/p)
 msgid ""
@@ -929,7 +922,7 @@ 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 ""
-"Um eine Audio-Unterhaltung führen zu können, benötigen Sie eine von Ihrem "
+"Um eine Sprachunterhaltung führen zu können, benötigen Sie eine von Ihrem "
 "Betriebssystem unterstützte Soundkarte sowie ein funktionierendes Mikrofon."
 
 #: C/audio-video.page:87(note/p)
@@ -950,7 +943,7 @@ msgid ""
 "supported services. The following table lists whether audio and video is "
 "supported for each type of account."
 msgstr ""
-"Sie können nur mit denjenigen Konten Audio- oder Video-Unterhaltungen "
+"Sie können nur mit denjenigen Konten Sprach- 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."
@@ -966,7 +959,7 @@ msgstr ""
 "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."
+"Konten dennoch Sprach- und Video-Unterhaltungen ermöglichen."
 
 #: C/audio-video.page:128(td/p)
 msgid "Service"
@@ -1027,11 +1020,11 @@ msgstr "Groupwise"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+#: C/audio-video.page:165(td/p) C/create-account.page:49(section/title)
 msgid "IRC"
 msgstr "IRC"
 
-#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+#: C/audio-video.page:170(td/p) C/create-account.page:79(section/title)
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -1047,7 +1040,7 @@ msgstr "myspace"
 msgid "qq"
 msgstr "qq"
 
-#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+#: C/audio-video.page:190(td/p) C/create-account.page:97(section/title)
 msgid "People Nearby"
 msgstr "Personen in der Nähe"
 
@@ -1059,7 +1052,7 @@ msgstr "gleichzeitig"
 msgid "silc"
 msgstr "silc"
 
-#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+#: C/audio-video.page:205(td/p) C/create-account.page:110(section/title)
 msgid "SIP"
 msgstr "SIP"
 
@@ -1120,65 +1113,96 @@ msgstr ""
 "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/create-account.page:32(info/desc)
+msgid "Create an account for one of the supported messaging services."
+msgstr "Ein Konto bei einem der unterstützten Nachrichtendienste erstellen."
 
-#: C/create-account.page:34(page/title)
-msgid "Register for a new account"
+#: C/create-account.page:36(page/title)
+msgid "Register a new account"
 msgstr "Ein neues Konto registrieren"
 
-#: C/create-account.page:36(page/p)
+#: C/create-account.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>."
+"Most account types require you to create an account with a service provider "
+"before you can use that account with instant messaging applications. You can "
+"use <app>Empathy</app> to register for a new account with some account "
+"providers using the same steps as you would to <link xref=\"add-account"
+"\">add an account</link>."
 msgstr ""
 "Für die meisten Kontentypen ist es erforderlich, dass Sie ein Konto bei "
-"einem Dienstanbieter erstellen, bevor Sie sich über Sofortnachrichten-"
-"Anwendungen wie <app>Empathy</app> verbinden können. Für einige "
-"Kontenanbieter können Sie <app>Empathy</app> 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>."
+"einem Dienstanbieter erstellen, bevor Sie dieses Konto für Sofortnachrichten-"
+"Anwendungen verwenden können. Für einige Kontenanbieter können Sie "
+"<app>Empathy</app> verwenden, um ein neues Konto zu anzumelden, unter "
+"Anwendung der gleichen Schritte wie für das <link xref=\"add-account"
+"\">Hinzufügen eines Kontos</link>."
 
-#: C/create-account.page:42(page/p)
+#: C/create-account.page:44(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>."
+"Once you create a new account, your account provider should give you a login "
+"or a username and a password, as well as any additional information you need "
+"to connect using <app>Empathy</app>."
+msgstr ""
+"Sobald Sie ein neues Konto erstellt haben, sollten Sie von Ihrem "
+"Dienstanbieter eine Anmeldekennung und ein Passwort sowie eventuelle "
+"zusätzliche Informationen erhalten haben, die Sie zum Verbinden mit "
+"<app>Empathy</app> benötigen."
+
+#: C/create-account.page:51(section/p)
+msgid ""
+"IRC networks require that you specify a nick (nickname) when you connect to "
+"the server. Some IRC networks use a service, such as NickServ, to allow "
+"users to <link xref=\"irc-nick-password\">protect their nick</link>. If you "
+"did not register your nick or are unable to do so and another user is using "
+"it, then you will need to choose a different one."
 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 <app>Empathy</app> benötigen."
+"IRC-Netzwerke erfordern, dass Sie einen nick (Spitznamen) bei Verbindung mit "
+"dem Server angeben. Einige IRC-Netzwerke nutzen einen Dienst, wie z.B. "
+"NickServ, um Benutzern den <link xref=\"irc-nick-password\">Schutz Ihres "
+"Spitznamens</link> zu gewähren. Wenn Sie Ihren Spitznamen nicht anmelden "
+"oder dies nicht möglich ist und ein andere Benutzer ihn einsetzt, dann "
+"müssen Sie einen anderen wählen."
 
-#: C/create-account.page:47(section/title)
+#: C/create-account.page:57(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 ""
+"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/create-account.page:62(note/p)
+msgid ""
+"Many GNOME projects use <code>irc.gnome.org</code> for project-related "
+"discussion."
+msgstr ""
+"Viele GNOME-Projekte nutzen <code>irc.gnome.org</code> für Projekt-bezogene "
+"Diskussionen."
+
+#: C/create-account.page:68(section/title)
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C/create-account.page:48(section/p)
+#: C/create-account.page:70(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."
+"Facebook is one of the more popular social networks. It allows users to "
+"create their own profile and to communicate with their friends."
 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."
 
-#: C/create-account.page:52(section/p)
+#: C/create-account.page:73(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."
+"new account from the website: <link href=\"https://www.facebook.com\">www."
 "facebook.com</link>."
 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."
+"ein neues Konto auf folgender Webseite erstellen: <link href=\"https://www."
 "facebook.com\">www.facebook.com</link>."
 
-#: C/create-account.page:62(section/p)
+#: C/create-account.page:81(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, "
@@ -1188,67 +1212,60 @@ msgstr ""
 "die Wahl Ihres Konto-Dienstanbieters und die Kommunikation mit anderen "
 "Jabber-Benutzern, unabhängig von deren Konto-Dienstanbietern."
 
-#: C/create-account.page:66(section/p)
+#: C/create-account.page:85(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>."
+"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>."
+"anlegen. Es gibt zahlreiche freie Jabber-Dienstanbieter. Einer der "
+"populärsten ist <link href=\"http://register.jabber.org/\">jabber.org</link>."
 
-#: C/create-account.page:71(note/p)
+#: C/create-account.page:90(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."
+"If you use Gmail or Google+ Hangouts, you already have a Jabber account. Use "
+"your Gmail address and password in <app>Empathy</app> to connect."
 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."
+"Falls Sie Gmail oder Google+ Hangouts verwenden, so haben Sie bereits ein "
+"Jabber-Konto. Verwenden Sie einfach Ihre Google Mail-Adresse und Ihr "
+"Passwort in <app>Empathy</app> für die Verbindung."
 
-#: C/create-account.page:80(section/p)
+#: C/create-account.page:99(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."
+"This service works whenever you are connected to a local network, such as a "
+"wireless hotspot, you do not need to create an account with service "
+"providor, just set up your account through <app>Empathy</app>. It "
+"automatically finds all other users on the network who are also using this "
+"service."
 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."
+"Dieser Dienst ist immer dann verfügbar, wenn Sie mit einem lokalen Netzwerk "
+"verbunden sind, zum Beispiel einem drahtlosen Zugangspunkt (Hotspot). Sie "
+"müssen beim Dienstanbieter kein Konto einrichten. Erstellen Sie einfach ein "
+"Konto mit <app>Empathy</app>. Andere Benutzer, die diesen Dienst nutzen, "
+"werden im Netzwerk automatisch gefunden."
 
-#: 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/create-account.page:105(section/p)
+msgid ""
+"For more information, see the <link xref=\"salut-protocol\">salut protocol</"
+"link>."
+msgstr ""
+"Weitere Informationen finden Sie unter <link xref=\"salut-protocol\">Salut-"
+"Protokoll</link>."
 
-#: C/create-account.page:91(section/p)
+#: C/create-account.page:112(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 ist ein offenes System für Audio- und Video-Unterhaltungen übar das "
+"SIP ist ein offenes System für Sprach- und Video-Unterhaltungen über 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/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 ""
-"Wegen technischer Unterschiede funktioniert <link href=\"https://www.ekiga."
-"net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
-"<app>Empathy</app>."
-
-#: C/create-account.page:102(section/p)
+#: C/create-account.page:117(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."
@@ -1257,69 +1274,37 @@ msgstr ""
 "Telefone anzurufen. Im Allgemeinen werden Sie sich hierfür an einem zu "
 "bezahlenden Dienst registrieren müssen."
 
-#: 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 ""
-"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/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 ""
-"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/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 ""
-"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/create-account.page:122(section/title)
+#: C/create-account.page:123(section/title)
 msgid "Proprietary Services"
 msgstr "Proprietäre Dienste"
 
-#: C/create-account.page:124(section/p)
+#: C/create-account.page:125(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."
+"you to connect to an existing account for some of these services. To create "
+"a new account with one of these services, you will need to visit the website "
+"for the service."
 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."
+"<app>Empathy</app> ermöglicht Ihnen für zahlreiche Dienste die Verbindung zu "
+"einem vorhandenen Konto. Um ein neues Konto bei einem dieser Dienste "
+"anzulegen, besuchen Sie bitte die Webseite des jeweiligen Anbieters."
 
-#: C/create-account.page:132(item/p)
+#: C/create-account.page:133(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)
+#: C/create-account.page:136(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)
+#: C/create-account.page:139(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)
+#: C/create-account.page:142(item/p)
 msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
@@ -2426,20 +2411,24 @@ msgid "Merge and separate different contacts into a single one."
 msgstr ""
 "Verschiedene Kontakte in einen einzigen zusammenführen oder diese aufteilen."
 
-#: C/link-contacts.page:25(page/title)
-msgid "Combine and separate contacts"
-msgstr "Kontakte zusammenlegen und aufteilen"
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
+
+#: C/link-contacts.page:29(page/title)
+msgid "Link and unlink contacts"
+msgstr "Kontakte verknüpfen und trennen"
 
-#: C/link-contacts.page:26(page/p)
+#: C/link-contacts.page:30(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."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 msgstr ""
-"Wenn ein oder mehrere Kontakte verschiedene Konten bei unterschiedlichen "
+"Wenn ein oder mehrere Kontakte mehrere Konten bei unterschiedlichen "
 "Nachrichtendiensten haben, so können Sie diese Kontakte in einen einzigen "
 "zusammenlegen."
 
-#: C/link-contacts.page:30(page/p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
 "The resulting contact is called a <em>meta-contact</em>: a contact composed "
 "from different single contacts."
@@ -2447,87 +2436,115 @@ msgstr ""
 "Der entstehende Kontakt wird als <em>Meta-Kontakt</em> bezeichnet: Ein "
 "Kontakt, der aus unterschiedlichen einzelnen Kontakten gebildet wird."
 
-#: C/link-contacts.page:34(page/p)
+#: C/link-contacts.page:38(page/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
 "Wenn Sie einen Kontakt »Janina Schmitt« haben, der drei verschiedene "
 "Nachrichtendienste verwende, wie z.B.:"
 
-#: C/link-contacts.page:40(item/p)
+#: C/link-contacts.page:44(item/p)
 msgid "janes@facebook"
 msgstr "janinas@facebook"
 
-#: C/link-contacts.page:45(item/p)
+#: C/link-contacts.page:49(item/p)
 msgid "jane.smith@gmail"
 msgstr "Janina Schmitt@gmail"
 
-#: C/link-contacts.page:50(item/p)
+#: C/link-contacts.page:54(item/p)
 msgid "jane_smith@hotmail"
 msgstr "Janina_Schmitt@hotmail"
 
-#: C/link-contacts.page:55(page/p)
+#: C/link-contacts.page:59(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/link-contacts.page:60(section/title)
-msgid "Combining contacts"
+#: C/link-contacts.page:63(section/title)
+msgid "Link contacts"
 msgstr "Kontakte zusammenlegen"
 
-#: C/link-contacts.page:63(item/p)
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "So können Sie Ihre Kontakte zusammen legen:"
+
+#: C/link-contacts.page:69(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>."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 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>."
+"Klicken Sie auf den Auswahl-Knopf, um Einträge zum Verknüpfen zu wählen. "
+"Damit wird der <em>Auswahl-Modus</em> aktiviert und es erscheinen "
+"Ankreuzfelder für jeden Eintrag."
 
-#: C/link-contacts.page:70(item/p)
+#: C/link-contacts.page:75(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"Wählen Sie in der linken Seitenleiste im Fenster <gui>Kontakte verknüpfen</"
-"gui> die Kontakte aus, die Sie zusammenlegen wollen."
+"Wählen Sie die Ankreuzfelder aus, die zu den Einträgen des selben "
+"<app>Kontakts</app> gehören. "
 
-#: C/link-contacts.page:76(item/p)
-msgid "Click <gui style=\"button\">Link</gui>."
+#: C/link-contacts.page:81(item/p)
+msgid "Press <gui style=\"button\">Link</gui>."
 msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfen</gui>."
 
-#: C/link-contacts.page:82(note/p)
+#: C/link-contacts.page:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr ""
+"Wiederholen Sie die Schritte 3 und 4, um weitere Kontakte zusammen zu legen."
+
+#: C/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Kontaktverknüpfungen lösen"
+
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "So trennen Sie einen verknüpften Kontakt:"
+
+#: C/link-contacts.page:98(item/p)
+msgid "Select the contact from your list."
+msgstr "Wählen Sie den Kontakt aus Ihrer Liste aus."
+
+#: C/link-contacts.page:103(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."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 msgstr ""
-"Wenn ein Meta-Kontakt erstellt wurde wird derjenige Kontakt bei einer "
-"Unterhaltung verwendet, der die längste Zeit angemeldet ist."
+"Klicken Sie auf <gui style=\"button\">Bearbeiten</gui> in der oberen rechten "
+"Ecke von <app>Kontakte</app>."
 
-#: C/link-contacts.page:91(section/title)
-msgid "Separating contacts"
-msgstr "Kontakte aufteilen"
+#: C/link-contacts.page:108(item/p)
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfte Kontakte</gui>."
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:113(item/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 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>."
+"Klicken Sie auf <gui style=\"button\">Entfernen</gui>, um einen Eintrag vom "
+"verknüpften Kontakt zu lösen."
 
-#: 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/link-contacts.page:118(item/p)
+msgid ""
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
+msgstr ""
+"Klicken Sie auf <gui style=\"button\">Schließen</gui>, sobald Sie keine "
+"weiteren Kontaktverknüpfungen aufheben wollen."
+
+#: C/link-contacts.page:123(item/p)
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
+msgstr ""
+"Klicken Sie zum Schluss auf <gui style=\"button\">Fertig</gui>, um die "
+"Bearbeitung abzuschließen."
 
 #. 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/overview.page:37(media)
+#: C/overview.page:38(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/video_overview.png' "
@@ -2538,7 +2555,7 @@ msgstr "original"
 #. 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/overview.page:38(media)
+#: C/overview.page:39(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/conf_overview.png' "
@@ -2549,30 +2566,26 @@ msgstr "original"
 #. 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/overview.page:39(media)
+#: C/overview.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/croom_overview.png' "
 "md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr "original"
 
-#: C/overview.page:8(info/desc)
+#: C/overview.page:9(info/desc)
 msgid "What instant messaging is and how you can use it."
 msgstr "Was sind Sofortnachrichten und wie können Sie diese nutzen."
 
-#: C/overview.page:12(credit/name)
+#: C/overview.page:13(credit/name)
 msgid "Aruna S"
 msgstr "Aruna S"
 
-#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/overview.page:24(page/title)
+#: C/overview.page:25(page/title)
 msgid "Overview of instant messaging"
 msgstr "Überblick über Sofortnachrichten"
 
-#: C/overview.page:26(page/p)
+#: C/overview.page:27(page/p)
 msgid ""
 "Instant messaging, sometimes abbreviated to IM, is a text-based means to "
 "communicate instantly over the internet and the local network. While some IM "
@@ -2587,21 +2600,21 @@ msgstr ""
 "für Sofortnachrichten nur mit einer bestimmten Art von Konten funktionieren, "
 "können andere, wie <link xref=\"introduction\">Empathy</link>, auch <link "
 "xref=\"add-account\">Konten</link> von verschiedenen Anbietern nutzen. "
-"Einige unterstützen auch Audio- und Videoanrufe."
+"Einige unterstützen auch Sprach- und Videoanrufe."
 
-#: C/overview.page:42(td/p)
+#: C/overview.page:43(td/p)
 msgid "Video Conference"
 msgstr "Videokonferenz"
 
-#: C/overview.page:43(td/p)
+#: C/overview.page:44(td/p)
 msgid "Group chats"
 msgstr "Gruppenunterhaltungen"
 
-#: C/overview.page:44(td/p)
+#: C/overview.page:45(td/p)
 msgid "Chat rooms"
 msgstr "Unterhaltungsräume"
 
-#: C/overview.page:48(page/p)
+#: C/overview.page:49(page/p)
 msgid ""
 "Some instant messaging applications can be used to connect to chat rooms, "
 "online places where like-minded people meet to talk. One popular means to "
@@ -2778,8 +2791,8 @@ msgstr ""
 "aktiviert ist, wenn Sie eine neue Unterhaltung starten oder einen Raum "
 "betreten wollen, könnten Ihre Kontendetails eventuell nicht korrekt sein."
 
-#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
-#: C/prob-conn-neterror.page:53(item/p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:46(item/p)
+#: C/prob-conn-neterror.page:54(item/p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
@@ -2794,7 +2807,7 @@ msgstr ""
 "Wählen Sie <guiseq><gui>Bearbeiten</gui><gui>Konten</gui></guiseq> und "
 "wählen Sie den nicht funktionierenden Kontakt aus."
 
-#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:62(item/p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
 msgstr ""
@@ -2802,7 +2815,7 @@ msgstr ""
 "stellen, dass diese korrekt sind."
 
 #: C/prob-conn-acctdisabled.page:60(item/p)
-#: C/prob-conn-neterror.page:64(item/p)
+#: C/prob-conn-neterror.page:63(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 "
@@ -2816,7 +2829,7 @@ msgstr ""
 msgid "Check that the account is switched on."
 msgstr "Überprüfen Sie, ob das Konto eingeschaltet ist."
 
-#: C/prob-conn-auth.page:8(info/desc)
+#: C/prob-conn-auth.page:9(info/desc)
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>� appears in "
 "the main window."
@@ -2824,11 +2837,11 @@ msgstr ""
 "Eine Fehlermeldung »<gui>Legitimierung fehlgeschlagen</gui>« erscheint im "
 "Hauptfenster."
 
-#: C/prob-conn-auth.page:36(page/title)
+#: C/prob-conn-auth.page:37(page/title)
 msgid "I get a message that says “Authentication failed�"
 msgstr "Eine Meldung zeigt »Legitimierung fehlgeschlagen« an"
 
-#: C/prob-conn-auth.page:38(page/p)
+#: C/prob-conn-auth.page:39(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 "
@@ -2838,7 +2851,7 @@ msgstr ""
 "erlaubt, weil Benutzername oder Passwort aus verschiedenen Gründen nicht "
 "akzeptiert werden konnten."
 
-#: C/prob-conn-auth.page:50(item/p)
+#: C/prob-conn-auth.page:51(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 "
@@ -2848,16 +2861,17 @@ msgstr ""
 "dem Sie sich verbinden wollen. Falls Sie über kein Konto verfügen, "
 "verweigern die meisten Dienste die Verbindung."
 
-#: 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 ""
-"Klicken Sie auf das <media type=\"image\" mime=\"image/png\" src=\"figures/"
-"gtk-edit.png\">Bearbeiten</media>-Symbol in der Fehlermeldung."
+#: C/prob-conn-auth.page:58(media/span) C/prob-conn-name.page:44(media/span)
+#: C/prob-conn-neterror.page:59(media/span)
+msgid "edit"
+msgstr "Bearbeiten"
 
-#: C/prob-conn-auth.page:68(item/p)
+#: C/prob-conn-auth.page:58(item/p) C/prob-conn-name.page:44(item/p)
+#: C/prob-conn-neterror.page:59(item/p)
+msgid "Click the <_:media-1/> icon in the error message."
+msgstr "Klicken Sie auf das Symbol <_:media-1/> in der Fehlernachricht."
+
+#: C/prob-conn-auth.page:67(item/p)
 msgid ""
 "Deselect the <gui>Enabled</gui>, and then select it again to try to "
 "reconnect to the service."
@@ -2865,12 +2879,12 @@ msgstr ""
 "Deaktivieren Sie das Ankreuzfeld <gui>Aktiviert</gui> und aktivieren Sie es "
 "erneut, um einen neuen Verbindungsversuch zu starten."
 
-#: C/prob-conn-name.page:9(info/title)
+#: C/prob-conn-name.page:10(info/title)
 msgctxt "link:error-msg"
 msgid "“Name in use�"
 msgstr "»Name bereits in Verwendung«"
 
-#: C/prob-conn-name.page:10(info/desc)
+#: C/prob-conn-name.page:11(info/desc)
 msgid ""
 "An error message which says “<gui>Name in use</gui>� appears in the main "
 "window."
@@ -2878,11 +2892,11 @@ msgstr ""
 "Eine Fehlermeldung »<gui>Name bereits in Benutzung</gui>« erscheint im "
 "Hauptfenster."
 
-#: C/prob-conn-name.page:33(page/title)
+#: C/prob-conn-name.page:34(page/title)
 msgid "I get a message that says “Name in use�"
 msgstr "Eine Meldung zeigt »Name bereits in Benutzung« an"
 
-#: C/prob-conn-name.page:35(page/p)
+#: C/prob-conn-name.page:36(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 "
@@ -2892,12 +2906,12 @@ msgstr ""
 "und Sie einen Spitznamen verwenden wollen, den in diesem bestimmten Netzwerk "
 "bereits jemand anders gewählt hat."
 
-#: C/prob-conn-name.page:51(item/p)
+#: C/prob-conn-name.page:50(item/p)
 msgid "In the <gui>Nickname</gui> text box, type a new nickname."
 msgstr ""
 "Geben Sie in das <gui>Spitzname</gui>-Textfeld einen neuen Spitznamen ein."
 
-#: C/prob-conn-name.page:56(item/p)
+#: C/prob-conn-name.page:55(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-"
@@ -2908,7 +2922,7 @@ msgstr ""
 "Weitere Informationen hierzu finden Sie in <link xref=\"irc-nick-password\"/"
 ">."
 
-#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+#: C/prob-conn-name.page:64(item/p) C/prob-conn-neterror.page:78(item/p)
 msgid ""
 "Switch the account off, and then switch it on to try to reconnect to the "
 "service."
@@ -2916,7 +2930,7 @@ msgstr ""
 "Deaktivieren Sie das Konto und aktivieren Sie es erneut, um einen neuen "
 "Verbindungsversuch zu starten."
 
-#: C/prob-conn-neterror.page:7(info/desc)
+#: C/prob-conn-neterror.page:8(info/desc)
 msgid ""
 "An error message which says “<gui>Network error</gui>� appears in the main "
 "window."
@@ -2924,11 +2938,11 @@ msgstr ""
 "Eine Fehlermeldung mit dem Text »<gui>Netzwerkfehler</gui>« erscheint im "
 "Hauptfenster."
 
-#: C/prob-conn-neterror.page:34(page/title)
+#: C/prob-conn-neterror.page:35(page/title)
 msgid "I get a message that says “Network error�"
 msgstr "Eine Meldung zeigt einen »Netzwerkfehler« an"
 
-#: C/prob-conn-neterror.page:42(page/p)
+#: C/prob-conn-neterror.page:43(page/p)
 msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
@@ -2936,7 +2950,7 @@ msgstr ""
 "Dieser Fehler tritt auf, wenn <app>Empathy</app> aus irgendeinem Grund nicht "
 "in der Lage ist, mit dem Sofortnachrichtendienst zu kommunizieren."
 
-#: C/prob-conn-neterror.page:46(page/p)
+#: C/prob-conn-neterror.page:47(page/p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
@@ -2944,11 +2958,11 @@ msgstr ""
 "Dieser Fehler tritt auch auf, wenn Sie ein IRC-Konto verwenden wollen, ohne "
 "einen Spitznamen festzulegen."
 
-#: C/prob-conn-neterror.page:87(section/title)
+#: C/prob-conn-neterror.page:86(section/title)
 msgid "Proxy support"
 msgstr "Proxy-Unterstützung"
 
-#: C/prob-conn-neterror.page:88(section/p)
+#: C/prob-conn-neterror.page:87(section/p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
@@ -3405,7 +3419,7 @@ msgstr ""
 #. 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)
+#: C/status-icons.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
@@ -3415,7 +3429,7 @@ msgstr "original"
 #. 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)
+#: C/status-icons.page:46(media)
 msgctxt "_"
 msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
 msgstr "original"
@@ -3424,7 +3438,7 @@ msgstr "original"
 #. 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)
+#: C/status-icons.page:54(media)
 msgctxt "_"
 msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
 msgstr "original"
@@ -3438,29 +3452,29 @@ msgstr "original"
 #. 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)
+#: C/status-icons.page:63(media) C/status-icons.page:70(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgstr "original"
 
-#: C/status-icons.page:7(info/desc)
+#: C/status-icons.page:8(info/desc)
 msgid "Understanding the various statuses and status icons."
 msgstr "Erläuterung der verschiedenen Status und deren Symbole."
 
-#: C/status-icons.page:35(page/title)
+#: C/status-icons.page:36(page/title)
 msgid "Status Types and Icons"
 msgstr "Typen des Anwesenheitsstatus und Symbole"
 
-#: 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"
-"\">Verfügbar-Symbol</media> <gui>Verfügbar</gui>"
+#: C/status-icons.page:40(media/span)
+msgid "Available icon"
+msgstr "Symbol »Verfügbar«"
+
+#: C/status-icons.page:40(item/title)
+msgid "<_:media-1/> <gui>Available</gui>"
+msgstr "<_:media-1/> <gui>Verfügbar</gui>"
 
-#: C/status-icons.page:41(item/p)
+#: C/status-icons.page:42(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."
@@ -3469,15 +3483,15 @@ msgstr ""
 "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(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"
-"\">Beschäftigt-Symbol</media> <gui>Beschäftigt</gui>"
+#: C/status-icons.page:46(media/span)
+msgid "Busy icon"
+msgstr "Symbol »Beschäftigt«"
+
+#: C/status-icons.page:46(item/title)
+msgid "<_:media-1/> <gui>Busy</gui>"
+msgstr "<_:media-1/> <gui>Beschäftigt</gui>"
 
-#: C/status-icons.page:47(item/p)
+#: C/status-icons.page:48(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 "
@@ -3492,15 +3506,15 @@ msgstr ""
 "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(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\">Abwesend-"
-"Symbol</media> <gui>Abwesend</gui>"
+#: C/status-icons.page:54(media/span)
+msgid "Away icon"
+msgstr "Symbol »Abwesend«"
+
+#: C/status-icons.page:54(item/title)
+msgid "<_:media-1/> <gui>Away</gui>"
+msgstr "<_:media-1/> <gui>Abwesend</gui>"
 
-#: C/status-icons.page:55(item/p)
+#: C/status-icons.page:56(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 "
@@ -3516,16 +3530,15 @@ msgstr ""
 "abwesend sind. Sie können für diesen Status eine benutzerdefinierte "
 "Nachricht festlegen."
 
-# Passt do, Symbol wird doppelt verwendet
-#: 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"
-"\">Abgemeldet-Symbol</media> <gui>Unsichtbar</gui>"
+#: C/status-icons.page:63(media/span) C/status-icons.page:70(media/span)
+msgid "Offline icon"
+msgstr "Symbol »Abgemeldet«"
 
-#: C/status-icons.page:64(item/p)
+#: C/status-icons.page:63(item/title)
+msgid "<_:media-1/> <gui>Invisible</gui>"
+msgstr "<_:media-1/> <gui>Unsichtbar</gui>"
+
+#: C/status-icons.page:65(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 "
@@ -3536,15 +3549,11 @@ msgstr ""
 "verbunden. Sie sehen deren Status und können Unterhaltungen mit Ihnen "
 "beginnen."
 
-#: 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"
-"\">Abgemeldet-Symbol</media> <gui>Abgemeldet</gui>"
+#: C/status-icons.page:70(item/title)
+msgid "<_:media-1/> <gui>Offline</gui>"
+msgstr "<_:media-1/> <gui>Abgemeldet</gui>"
 
-#: C/status-icons.page:71(item/p)
+#: C/status-icons.page:72(item/p)
 msgid ""
 "Setting your status to <em>Offline</em> disconnects you from all of your "
 "accounts."
@@ -3552,15 +3561,15 @@ msgstr ""
 "Wenn Sie Ihren Status auf <em>Abgemeldet</em> setzen, werden alle "
 "Verbindungen zu Ihren Kontakten getrennt."
 
-#: C/video-call.page:10(info/desc)
+#: C/video-call.page:11(info/desc)
 msgid "Start a video conversation with one of your contacts."
 msgstr "Beginnen Sie eine Videounterhaltung mit einem Ihrer Kontakte."
 
-#: C/video-call.page:29(page/title)
+#: C/video-call.page:37(page/title)
 msgid "Start a video conversation"
 msgstr "Eine Video-Unterhaltung beginnen"
 
-#: C/video-call.page:31(page/p)
+#: C/video-call.page:39(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 "
@@ -3572,32 +3581,36 @@ msgstr ""
 "Kontentypen zur Verfügung. Außerdem muss die andere Person mit einer "
 "Anwendung arbeiten, die Videoanrufe unterstützt."
 
-#: C/video-call.page:38(item/p)
+#: C/video-call.page:46(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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Video Call</gui>."
 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>."
+"Wählen Sie mit der rechten Maustaste den Kontakt aus, den Sie eine anrufen "
+"wollen, und wählen Sie im Menü  <gui style=\"menuitem\">Videoanruf</gui>."
+
+#: C/video-call.page:54(item/p)
+msgid ""
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr ""
+"Um eine Unterhaltung zu beenden, klicken Sie auf <gui style=\"button"
+"\">Auflegen</gui>."
 
-#: C/video-call.page:55(note/p)
+#: C/video-call.page:60(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 ""
-"Um eine Video-Unterhaltung in eine Audio-Unterhaltung umzuwandeln, wählen "
+"Um eine Video-Unterhaltung in eine Sprachunterhaltung umzuwandeln, wählen "
 "Sie <guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video "
 "aus</gui></guiseq>."
 
-#: C/video-call.page:61(section/title)
+#: C/video-call.page:65(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)
+#: C/video-call.page:73(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Video Call</gui>."
@@ -3605,50 +3618,136 @@ 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>."
 
-#~ 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"
+#~ msgctxt "link"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Empathy Internet-Nachrichtendienst"
+
+#~ msgctxt "text"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Empathy Internet-Nachrichtendienst"
+
+#~ 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 Internet-Nachrichtendienst-Logo</media> Empathy Internet-"
+#~ "Nachrichtendienst"
+
+#~ 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 ""
+#~ "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>."
+
+#~ 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 ""
+#~ "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>."
+
+#~ 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 ""
+#~ "Wegen technischer Unterschiede funktioniert <link href=\"https://www."
+#~ "ekiga.net/index.php?page=register\">Ekiga.net</link> derzeit nicht mit "
+#~ "<app>Empathy</app>."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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\"/>."
+
+#~ msgid "Combine and separate contacts"
+#~ msgstr "Kontakte zusammenlegen und aufteilen"
+
+#~ 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 ""
+#~ "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>."
+
+#~ msgid ""
+#~ "From the left pane in the <gui>Link Contacts</gui> window, select the "
+#~ "contacts you want to combine."
+#~ msgstr ""
+#~ "Wählen Sie in der linken Seitenleiste im Fenster <gui>Kontakte "
+#~ "verknüpfen</gui> die Kontakte aus, die Sie zusammenlegen wollen."
+
+#~ 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 ""
+#~ "Wenn ein Meta-Kontakt erstellt wurde wird derjenige Kontakt bei einer "
+#~ "Unterhaltung verwendet, der die längste Zeit angemeldet ist."
+
+#~ msgid "Separating contacts"
+#~ msgstr "Kontakte aufteilen"
+
+#~ msgid ""
+#~ "From the <gui>Contact List</gui>, right-click the contact to separate, "
+#~ "and select <gui style=\"menuitem\">Link Contacts...</gui>."
+#~ 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>."
+
+#~ msgid "Click <gui style=\"button\">Unlink</gui>."
+#~ msgstr "Klicken Sie auf <gui style=\"button\">Verknüpfung aufheben</gui>."
+
+#~ 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."
+
+#~ 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"
+#~ "\">Verfügbar-Symbol</media> <gui>Verfügbar</gui>"
+
+#~ 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"
+#~ "\">Beschäftigt-Symbol</media> <gui>Beschäftigt</gui>"
+
+#~ 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"
+#~ "\">Abwesend-Symbol</media> <gui>Abwesend</gui>"
diff --git a/help/el/el.po b/help/el/el.po
index 82c4c3b4a..6e4d45ea0 100644
--- a/help/el/el.po
+++ b/help/el/el.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-help-el-4325__.merged\n"
-"POT-Creation-Date: 2013-02-03 12:24+0000\n"
-"PO-Revision-Date: 2013-03-10 06:15+0300\n"
+"POT-Creation-Date: 2013-04-15 22:03+0000\n"
+"PO-Revision-Date: 2013-04-26 00:03+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτ�ης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@gnome.gr\n"
 "Language: el\n"
@@ -29,36 +29,18 @@ msgstr ""
 "\n"
 "Για πε�ισσότε�ες πλη�οφο�ίες, επισκεφθείτε τη σελίδα http://www.gnome.gr/"
 
-#. 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)
+#: C/index.page:8(info/title)
 msgctxt "link"
 msgid "Empathy Internet Messenger"
 msgstr "Μην�ματα διαδικτ�ου Empathy"
 
-#: C/index.page:8(info/title)
+#: C/index.page:9(info/title)
 msgctxt "text"
 msgid "Empathy Internet Messenger"
 msgstr "Μην�ματα διαδικτ�ου 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/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(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)
@@ -81,14 +63,14 @@ msgstr "Μην�ματα διαδικτ�ου Empathy"
 #: 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)
+#: C/video-call.page:25(credit/name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/index.page:23(license/p) C/account-irc.page:20(license/p)
+#: C/index.page:24(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/audio-call.page:31(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)
@@ -110,40 +92,43 @@ msgstr "Milo Casagrande"
 #: 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)
+#: C/status-icons.page:24(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: 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</media> Αποστολέας άμεσων "
-"μηνυμάτων Empathy"
+#: C/index.page:30(media/span)
+#| msgctxt "link"
+#| msgid "Empathy Internet Messenger"
+msgid "Empathy Internet Messenger logo"
+msgstr "Λογότυπος αγγελιοφό�ου διαδικτ�ου Empathy"
+
+#: C/index.page:28(page/title)
+#| msgctxt "link"
+#| msgid "Empathy Internet Messenger"
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "<_:media-1/> Αγγελιοφό�ος διαδικτ�ου Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:36(section/title)
 msgid "Account Management"
 msgstr "Διαχεί�ιση λογα�ιασμών"
 
-#: C/index.page:39(section/title)
+#: C/index.page:40(section/title)
 msgid "Contact Management"
 msgstr "Διαχεί�ιση επαφών"
 
-#: C/index.page:43(section/title)
+#: C/index.page:44(section/title)
 msgid "Text Conversations"
 msgstr "Γ�απτές συζητήσεις"
 
-#: C/index.page:47(section/title)
+#: C/index.page:48(section/title)
 msgid "Audio and Video Conversations"
 msgstr "Φωνητικές κλήσεις και βιντεοκλήσεις"
 
-#: C/index.page:51(section/title)
+#: C/index.page:52(section/title)
 msgid "Advanced Actions"
 msgstr "Για π�οχω�ημένους"
 
-#: C/index.page:55(section/title) C/irc-manage.page:64(section/title)
+#: C/index.page:56(section/title) C/irc-manage.page:64(section/title)
 msgid "Common Problems"
 msgstr "Κοινά π�οβλήματα"
 
@@ -230,8 +215,8 @@ msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
 msgstr ""
-"Για να χ�ησιμοποιήσετε το IRC στο <app>Empathy</app>, θα π�έπει να έχετε "
-"εγκατεστημένο το πακέτο <sys>telepathy-idle</sys>."
+"Π�έπει να έχετε εγκατεστημένο το πακέτο <sys>telepathy-idle</sys> για να "
+"χ�ησιμοποιήσετε το IRC στο <app>Empathy</app>."
 
 #: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
 msgid "<gui>Network</gui>"
@@ -408,7 +393,7 @@ msgstr ""
 "Ο�ίζει την κωδικοποίηση χα�ακτή�ων που χ�ησιμοποιείται συνήθως στο δίκτυο "
 "αυτό. Η κωδικοποίηση χα�ακτή�ων είναι ένας συγκεκ�ιμένος τ�όπος με τον οποίο "
 "αποθηκε�ει χα�ακτή�ες ο υπολογιστής. Υπά�χουν πολλές διαθέσιμες "
-"κωδικοποιήσεις χα�ακτή�ων. Για να βλέπετε τα μην�ματα των άλλων χ�ηστών "
+"κωδικοποιήσεις χα�ακτή�ων και για να βλέπετε τα μην�ματα των άλλων χ�ηστών "
 "χω�ίς π�οβλήματα, θα π�έπει να χ�ησιμοποιείτε την ίδια κωδικοποίηση με "
 "αυτο�ς."
 
@@ -622,11 +607,11 @@ msgid ""
 "account providers, these steps will also allow you to register for a new "
 "account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
-"Μπο�είτε να π�οσθέτετε λογα�ιασμο�ς άμεσων μηνυμάτων για όλες τις "
-"υποστη�ιζόμενες υπη�εσίες. Έτσι, θα μπο�είτε να επικοινωνείτε με όλες τις "
-"επαφές σας μέσω του <app>Empathy</app>. Τα πα�ακάτω βήματα σας επιτ�έπουν να "
-"δημιου�γήσετε λογα�ιασμο�ς σε ο�ισμένους πα�όχους λογα�ιασμών. Για "
-"πε�ισσότε�ες λεπτομέ�ειες, δείτε την <link xref=\"create-account\"/>."
+"Μπο�είτε να π�οσθέτετε λογα�ιασμο�ς άμεσων μηνυμάτων από οποιαδήποτε "
+"υποστη�ιζόμενη υπη�εσία για επικοινωνία με όλες τις επαφές σας στο "
+"<app>Empathy</app>. Για με�ικο�ς πα�όχους λογα�ιασμών, αυτά τα βήματα θα σας "
+"επιτ�έψουν επίσης να καταχω�ίσετε έναν νέο λογα�ιασμό. Για πε�ισσότε�ες "
+"λεπτομέ�ειες, δείτε το <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)
@@ -687,7 +672,7 @@ msgid ""
 msgstr ""
 "Για να αλλάξετε το όνομα που χ�ησιμοποιείται για το λογα�ιασμό στο πα�άθυ�ο "
 "<gui>Λογα�ιασμοί</gui>, επιλέξτε το λογα�ιασμό από τη λίστα στα α�ιστε�ά, "
-"και μετά πατήστε το όνομα ή πιέστε το πλήκτ�ο «Διάστημα». Αλλάξτε το όνομα "
+"και μετά πατήστε το όνομα ή πιέστε το πλήκτ�ο διαστήματος. Αλλάξτε το όνομα "
 "του λογα�ιασμο� και πιέστε <key>Enter</key> όταν τελειώσετε."
 
 #: C/add-contact.page:9(info/desc)
@@ -752,95 +737,86 @@ msgstr ""
 "Για να π�οσθέσετε ένα νέο άτομο στη λίστα επαφών σας, θα π�έπει να έχετε "
 "συνδεθεί στο διαδίκτυο, καθώς και στο λογα�ιασμό σας."
 
-#. 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/audio-call.page:9(info/desc)
+#: C/audio-call.page:10(info/desc)
 msgid "Call your contacts over the Internet."
 msgstr "Κλήση των επαφών σας μέσω διαδικτ�ου."
 
-#: C/audio-call.page:27(page/title)
+#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name)
+#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
 msgid "Start an audio conversation"
 msgstr "Ένα�ξη φωνητικής κλήσης"
 
-#: C/audio-call.page:29(page/p)
+#: C/audio-call.page:37(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."
 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."
+"features only works with certain types of accounts and it requires the other "
+"person to have an application that supports audio calls."
 msgstr ""
-"Μπο�είτε να καλείτε τις επαφές σας και να μιλάτε μαζί τους. Αυτή η "
-"λειτου�γία διατίθεται μόνο για ο�ισμένους τ�πους λογα�ιασμών, και "
-"π�οϋποθέτει ότι η επαφή σας θα διαθέτει επίσης εφα�μογή με υποστή�ιξη για "
-"φωνητικές κλήσεις."
+"Μπο�είτε να καλείτε τις επαφές σας και να μιλάτε μαζί τους ηχητικά. Αυτή η "
+"λειτου�γία διατίθεται μόνο για ο�ισμένους τ�πους λογα�ιασμών και απαιτεί το "
+"άλλο άτομο να διαθέτει επίσης εφα�μογή που υποστη�ίζει φωνητικές κλήσεις."
 
-#: C/audio-call.page:34(item/p)
+#: C/audio-call.page:43(item/p)
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Audio Call</gui>."
 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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Από το πα�άθυ�ο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</"
-"media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και "
-"επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
+"Δεξιοπατήστε στην επαφή την οποία θέλετε να καλέσετε και επιλέξτε <gui "
+"style=\"menuitem\">Φωνητική κλήση</gui>."
 
-#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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."
 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."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"Θα ανοίξει ένα νέο πα�άθυ�ο. Όταν επιτευχθεί η σ�νδεση, θα δείτε το μήνυμα "
-"<gui>Σε σ�νδεση</gui> στο κάτω μέ�ος του πα�αθ��ου, μαζί με τη διά�κεια της "
-"συνομιλίας."
+"Θα ανοίξει ένα νέο πα�άθυ�ο. Όταν επιτευχθεί η σ�νδεση, θα δείτε τον "
+"συνολικό χ�όνο συζήτησης στο κάτω μέ�ος του πα�αθ��ου."
 
-#: 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>."
+#: C/audio-call.page:55(item/p)
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgid ""
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Για να τε�ματίσετε τη συνομιλία, επιλέξτε <gui style=\"button\">Κλείσιμο</"
-"gui>."
+"Για να τε�ματίσετε τη συνομιλία, πατήστε το κουμπί <gui "
+"style=\"button\">Κλείσιμο</gui>."
 
-#: C/audio-call.page:55(note/p)
+#: C/audio-call.page:63(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 ""
 "Για να μετατ�έψετε μια φωνητική κλήση σε βιντεοκλήση, επιλέξτε <guiseq><gui "
-"style=\"menu\">Βίντεο</gui> <gui style=\"menuitem\">Βίντεο ενε�γό</gui></"
-"guiseq>."
+"style=\"menu\">Βίντεο</gui> <gui style=\"menuitem\">Βίντεο "
+"ενε�γό</gui></guiseq>."
 
-#: C/audio-call.page:63(section/title)
+#: C/audio-call.page:71(section/title)
 msgid "Start an audio conversation with a meta-contact"
 msgstr "Ένα�ξη φωνητικής συζήτησης με μια μετα-επαφή"
 
-#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
-#: C/video-call.page:64(item/p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/p)
 msgid ""
 "From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr "Στο πα�άθυ�ο <gui>Λίστα επαφών</gui>, κάντε δεξί κλικ στη μετα-επαφή."
 
-#: C/audio-call.page:71(item/p)
+#: C/audio-call.page:79(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Audio Call</gui>."
@@ -848,8 +824,8 @@ msgstr ""
 "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το μενο� "
 "επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
 
-#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
-#: C/video-call.page:76(note/p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 "
@@ -867,13 +843,26 @@ msgstr ""
 #. 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'"
 msgctxt "_"
-msgid ""
-"external ref='figures/audio-input-microphone.png' "
-"md5='8d89026b66a263a3bc5b1f0665948567'"
-msgstr ""
-"external ref='figures/audio-input-microphone.png' "
-"md5='8d89026b66a263a3bc5b1f0665948567'"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+
+#. 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:70(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/camera-web.png' "
+#| "md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr "external ref='figures/camera-web.png' md5='__failed__'"
 
 #: C/audio-video.page:8(info/desc)
 msgid ""
@@ -1114,11 +1103,10 @@ msgid ""
 "status messages</link> to provide more information about your availability "
 "to your contacts."
 msgstr ""
-"Στην <link xref=\"status-icons\"/> υπά�χει μια λίστα με τις "
-"π�οεγκατεστημένες καταστάσεις και το τι σημαίνει η καθεμία. Επίσης, μπο�είτε "
-"να <link xref=\"set-custom-message\">π�οσθέτετε π�οσα�μοσμένα μην�ματα "
-"κατάστασης</link> που πα�έχουν πε�ισσότε�ες πλη�οφο�ίες για τη διαθεσιμότητά "
-"σας στις επαφές σας."
+"Στο <link xref=\"status-icons\"/> υπά�χει μια λίστα με τις ενσωματωμένες "
+"καταστάσεις και το τι σημαίνουν. Επίσης, μπο�είτε να <link xref=\"set-custom-"
+"status\">π�οσθέτετε π�οσα�μοσμένα μην�ματα κατάστασης</link> που πα�έχουν "
+"πε�ισσότε�ες πλη�οφο�ίες για τη διαθεσιμότητά σας στις επαφές σας."
 
 #: C/change-status.page:63(note/p)
 msgid ""
@@ -1194,10 +1182,10 @@ msgid ""
 "choose your account provider and communicate with all other Jabber users, "
 "regardless of their account provider."
 msgstr ""
-"Το Jabber είναι ένα ανοιχτό σ�στημα άμεσων μηνυμάτων. Όπως και το email, το "
-"Jabber σας επιτ�έπει να επιλέγετε όποιον πά�οχο θέλετε για το λογα�ιασμό "
-"σας. Από εκεί και πέ�α, μπο�είτε να επικοινωνείτε με όλους τους υπόλοιπους "
-"χ�ήστες του Jabber, ανεξά�τητα από τον πά�οχό τους."
+"Το Jabber είναι ένα ανοιχτό σ�στημα άμεσων μηνυμάτων. Όπως και η ηλεκτ�ονική "
+"αλληλογ�αφία, το Jabber σας επιτ�έπει να επιλέξετε τον πά�οχο του "
+"λογα�ιασμο� σας και να επικοινωνήσετε με όλους τους άλλους χ�ήστες, "
+"ανεξά�τητα από τον πά�οχο λογα�ιασμο� τους."
 
 #: C/create-account.page:66(section/p)
 msgid ""
@@ -1257,9 +1245,9 @@ msgid ""
 "index.php?page=register\">Ekiga.net</link> service does not currently work "
 "with <app>Empathy</app>."
 msgstr ""
-"Εξαιτίας ο�ισμένων τεχνικών διαφο�ών, π�ος το πα�όν η ελε�θε�η υπη�εσία  "
-"<link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</"
-"link> δεν υποστη�ίζεται από το <app>Empathy</app>."
+"Εξαιτίας ο�ισμένων τεχνικών διαφο�ών, π�ος το πα�όν η ελε�θε�η υπη�εσία "
+"<link href=\"https://www.ekiga.net/index.php?page=register\">Ekiga.net</link> "
+"δεν υποστη�ίζεται από το <app>Empathy</app>."
 
 #: C/create-account.page:102(section/p)
 msgid ""
@@ -1352,12 +1340,11 @@ msgid ""
 "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 ""
-"Μπο�είτε να απενε�γοποιήσετε ένα λογα�ιασμό, έτσι ώστε το <app>Empathy</app> "
-"να μη συνδέεται πλέον αυτόματα σε αυτόν. Έτσι, δε χ�ειάζεται να τον "
-"διαγ�άψετε, και μπο�είτε να τον ενε�γοποιείτε μόνο όποτε τον χ�ειάζεστε, "
-"απενε�γοποιώντας τον στη συνέχεια. Πα�άλληλα, θα συνεχίζετε να "
-"χ�ησιμοποιείτε κανονικά το <app>Empathy</app> για τους υπόλοιπους "
-"λογα�ιασμο�ς σας."
+"Μπο�είτε να απενε�γοποιήσετε ένα λογα�ιασμό για αποφυγή σ�νδεσης του "
+"<app>Empathy</app> χω�ίς πλή�η αφαί�εση του λογα�ιασμο�. Μπο�εί να θέλετε να "
+"απενε�γοποιήσετε και να επανε�γοποιήσετε έναν λογα�ιασμό αν θέλετε μόνο να "
+"συνδεθείτε στον λογα�ιασμό συγκεκ�ιμένες φο�ές, αλλά να θέλετε να "
+"χ�ησιμοποιήσετε ακόμα το <app>Empathy</app> για άλλους λογα�ιασμο�ς."
 
 #: C/disable-account.page:53(item/p)
 msgid ""
@@ -1542,7 +1529,7 @@ msgid ""
 "external device such as a GPS."
 msgstr ""
 "Αν θέλετε να δημοσιε�σετε τη γεωγ�αφική σας θέση, μπο�είτε να δοκιμάσετε με "
-"μια εξωτε�ική συσκευή, π.χ. GPS."
+"μια εξωτε�ική συσκευή όπως ένα GPS."
 
 #: C/geolocation-not-showing.page:48(note/p)
 msgid ""
@@ -1662,7 +1649,7 @@ msgstr "Μόνο οι επαφές σας βλέπουν την τοποθεσί
 
 #: C/geolocation-supported.page:7(info/desc)
 msgid "Services that supports geolocation and compatibility."
-msgstr "Υπη�εσίες που υποστη�ίζουν τον εντοπισμό τοποθεσίας. Συμβατότητα."
+msgstr "Υπη�εσίες που υποστη�ίζουν τον εντοπισμό τοποθεσίας και συμβατότητα."
 
 #: C/geolocation-supported.page:31(page/title)
 msgid "Supported services"
@@ -1748,7 +1735,7 @@ msgid ""
 "position, select the appropriate option in the <gui>Location sources</gui> "
 "section."
 msgstr ""
-"Αν διαθέτετε μια εξωτε�ική συσκευή (π.χ. GPS), ή αν θέλετε να στέλνετε πιο "
+"Αν διαθέτετε μια εξωτε�ική συσκευή όπως GPS, ή αν θέλετε να στέλνετε πιο "
 "ακ�ιβή στοιχεία για την τοποθεσία σας, σημειώστε την κατάλληλη επιλογή στην "
 "ενότητα <gui>Πηγές τοποθεσίας</gui>."
 
@@ -2077,11 +2064,11 @@ msgid ""
 "search through your previous conversations, and share your desktop in just "
 "two clicks."
 msgstr ""
-"Η χ�ήση του <app>Empathy</app>, σας επιτ�έπει να ομαδοποιείτε όλες τις "
-"συζητήσεις σας σε ένα πα�άθυ�ο, ή να χ�ησιμοποιείτε διαφο�ετικά πα�άθυ�α για "
-"κάθε συζήτηση. Σας δίνει τη δυνατότητα να κάνετε ε�κολα αναζητήσεις στις "
-"π�οηγο�μενες συζητήσεις σας και να μοι�άζεστε την επιφάνεια ε�γασίας σας με "
-"δ�ο μόνο κλικ."
+"Χ�ησιμοποιώντας το <app>Empathy</app>, μπο�είτε να ομαδοποιείτε όλες τις "
+"συζητήσεις σε ένα ενιαίο πα�άθυ�ο, ή να έχετε πολλαπλά πα�άθυ�α για "
+"διαφο�ετικά είδη συνομιλιών, να αναζητήσετε ε�κολα τις π�οηγο�μενες "
+"συζητήσεις σας και να μοι�άζεστε την επιφάνεια ε�γασίας σας με δ�ο μόνο "
+"πατήματα."
 
 #: C/introduction.page:39(figure/title)
 msgid "<gui>Contact List</gui> window"
@@ -2093,7 +2080,7 @@ msgstr "Βασικό πα�άθυ�ο του <app>Empathy</app>"
 
 #: C/introduction.page:42(media/p)
 msgid "<app>Empathy</app> main window."
-msgstr "Βασικό πα�άθυ�ο του <app>Empathy</app>"
+msgstr "Βασικό πα�άθυ�ο του <app>Empathy</app>."
 
 #: C/irc-commands.page:7(info/desc)
 msgid "The supported IRC commands."
@@ -2109,7 +2096,7 @@ msgid ""
 "help</input> and press <key>Enter</key>."
 msgstr ""
 "Για να δείτε τη λίστα των εντολών του IRC που υποστη�ίζονται, σε ένα δωμάτιο "
-"συζητήσεων πληκτ�ολογήστε <input>/help</input> και πιέστε το πλήκτ�ο  "
+"συζητήσεων πληκτ�ολογήστε <input>/help</input> και πιέστε το πλήκτ�ο "
 "<key>Enter</key>."
 
 #: C/irc-commands.page:24(note/p)
@@ -2205,9 +2192,6 @@ msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
 #: C/irc-manage.page:47(when/p)
-#| msgid ""
-#| "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
-#| "\">Install telepathy-idle</link>"
 msgid ""
 "<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
 "idle</link>"
@@ -2541,9 +2525,6 @@ msgstr "Πατήστε <gui style=\"button\">Διαχω�ισμός</gui>."
 #. 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/overview.page:37(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgctxt "_"
 msgid ""
 "external ref='figures/video_overview.png' "
@@ -2557,9 +2538,6 @@ msgstr ""
 #. 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/overview.page:38(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgctxt "_"
 msgid ""
 "external ref='figures/conf_overview.png' "
@@ -2573,10 +2551,6 @@ msgstr ""
 #. 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/overview.page:39(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/gtk-remove.png' "
-#| "md5='215e3a325a3dd619874e35c30a018bb6'"
 msgctxt "_"
 msgid ""
 "external ref='figures/croom_overview.png' "
@@ -2593,10 +2567,6 @@ msgstr "Τι άμεσο μήνυμα είναι και πώς μποÏ�είτε Î
 msgid "Aruna S"
 msgstr "Aruna S"
 
-#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
 #: C/overview.page:24(page/title)
 msgid "Overview of instant messaging"
 msgstr "Επισκόπηση άμεσων μηνυμάτων"
@@ -2614,21 +2584,19 @@ msgstr ""
 "κείμενο για στιγμιαία επικοινωνία μέσω διαδικτ�ου και του τοπικο� δικτ�ου. "
 "Ενώ με�ικές εφα�μογές IM δουλε�ουν με μόνο έναν τ�πο λογα�ιασμο�, άλλες, "
 "συμπε�ιλαμβάνουν το <link xref=\"introduction\">Empathy</link>, που πα�έχει "
-"διευκολ�νσεις IM χ�ησιμοποιώντας <link xref=\"add-"
-"account\">λογα�ιασμο�ς</link> από διαφο�ετικο�ς πα�όχους υπη�εσίας. Κάποιοι "
-"από αυτο�ς υποστη�ίζουν ακόμα κλήση ήχου και βίντεο."
+"διευκολ�νσεις IM χ�ησιμοποιώντας <link xref=\"add-account\">λογα�ιασμο�ς</"
+"link> από διαφο�ετικο�ς πα�όχους υπη�εσίας. Κάποιοι από αυτο�ς υποστη�ίζουν "
+"ακόμα κλήση ήχου και βίντεο."
 
 #: C/overview.page:42(td/p)
 msgid "Video Conference"
 msgstr "Βιντεοδιάσκεψη"
 
 #: C/overview.page:43(td/p)
-#| msgid "Group conversations"
 msgid "Group chats"
 msgstr "Ομαδικές συνομιλίες"
 
 #: C/overview.page:44(td/p)
-#| msgid "Favorite rooms"
 msgid "Chat rooms"
 msgstr "Δωμάτια συνομιλίας"
 
@@ -2646,8 +2614,8 @@ msgstr ""
 "δωμάτια συνομιλιών, με δικτυακές θέσεις όπου άτομα με τα ίδια ενδιαφέ�οντα "
 "συναντιο�νται για να συζητήσουν. Ένα δημοφιλές μέσο σ�νδεσης σε πολλά "
 "δωμάτια συνομιλιών είναι οι διαδικτυακές μεταγωγές, γνωστές επίσης ως <link "
-"xref=\"irc-manage\">IRC</link>. Το IRC πα�έχει <link xref=\"irc-join-"
-"room\">δημόσια</link> δωμάτια συνομιλίας, που είναι ανοικτά σε οποιονδήποτε "
+"xref=\"irc-manage\">IRC</link>. Το IRC πα�έχει <link xref=\"irc-join-room"
+"\">δημόσια</link> δωμάτια συνομιλίας, που είναι ανοικτά σε οποιονδήποτε "
 "δημιου�γήσει έναν λογα�ιασμό στον εξυπη�ετητή IRC και ιδιωτικά δωμάτια "
 "συνομιλίας, που <link xref=\"irc-join-pwd\">π�οστατε�ονται με κωδικό</link> "
 "και ανοίγουν μόνο σε λίγους επιλεγμένους."
@@ -2854,12 +2822,12 @@ msgid ""
 "An error message which says “<gui>Authentication failed</gui>� appears in "
 "the main window."
 msgstr ""
-"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους «<gui>Η πιστοποίηση απέτυχε</"
-"gui>»."
+"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους “<gui>Η πιστοποίηση "
+"απέτυχε</gui>�."
 
 #: C/prob-conn-auth.page:36(page/title)
 msgid "I get a message that says “Authentication failed�"
-msgstr "Λαμβάνω το μήνυμα «Η πιστοποίηση απέτυχε»"
+msgstr "Λαμβάνω το μήνυμα “Η πιστοποίηση απέτυχε�"
 
 #: C/prob-conn-auth.page:38(page/p)
 msgid ""
@@ -2901,19 +2869,19 @@ msgstr ""
 #: C/prob-conn-name.page:9(info/title)
 msgctxt "link:error-msg"
 msgid "“Name in use�"
-msgstr "“Όνομα σε χ�ήση\""
+msgstr "“Όνομα σε χ�ήση�"
 
 #: 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 ""
-"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους \"<gui>Το όνομα "
-"χ�ησιμοποιείται ήδη</gui>\"."
+"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους “<gui>Το όνομα "
+"χ�ησιμοποιείται ήδη</gui>�."
 
 #: C/prob-conn-name.page:33(page/title)
 msgid "I get a message that says “Name in use�"
-msgstr "Λαμβάνω το μήνυμα «Το όνομα χ�ησιμοποιείται ήδη»"
+msgstr "Λαμβάνω το μήνυμα “Το όνομα χ�ησιμοποιείται ήδη�"
 
 #: C/prob-conn-name.page:35(page/p)
 msgid ""
@@ -2952,11 +2920,11 @@ msgid ""
 "An error message which says “<gui>Network error</gui>� appears in the main "
 "window."
 msgstr ""
-"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους «<gui>Σφάλμα δικτ�ου</gui>»."
+"Στο κ��ιο πα�άθυ�ο εμφανίζεται το μήνυμα λάθους “<gui>Σφάλμα δικτ�ου</gui>�."
 
 #: C/prob-conn-neterror.page:34(page/title)
 msgid "I get a message that says “Network error�"
-msgstr "Λαμβάνω το μήνυμα «Σφάλμα δικτ�ου»"
+msgstr "Λαμβάνω το μήνυμα “Σφάλμα δικτ�ου�"
 
 #: C/prob-conn-neterror.page:42(page/p)
 msgid ""
@@ -3349,9 +3317,9 @@ msgid ""
 "support for the feature, installed on your system. <app>Vino</app>, the "
 "GNOME VNC server, has the required support."
 msgstr ""
-"Για να είστε σε θέση να μοι�άσετε την επιφάνεια ε�γασίας σας, χ�ειάζεστε ένα "
-"διακομιστή VNC εγκατεστημένο στο σ�στημα σας, για την υποστή�ιξη αυτής της "
-"λειτου�γίας.Το <app>Vino</app>, ο διακομιστής VNC του GNOME, έχει την "
+"Για να είστε σε θέση να μοι�άσετε την επιφάνεια ε�γασίας σας, χ�ειάζεστε να "
+"έχετε έναν διακομιστή VNC που υποστη�ίζει αυτό το γνώ�ισμα, εγκατεστημένο "
+"στο σ�στημά σας. Το <app>Vino</app>, ο διακομιστής VNC του GNOME, έχει την "
 "απαιτο�μενη υποστή�ιξη."
 
 #: C/share-desktop.page:51(item/p)
@@ -3572,15 +3540,15 @@ msgstr ""
 "Αν επιλέξετε την κατάσταση <em>Εκτός σ�νδεσης</em>, θα αποσυνδεθείτε από "
 "όλους τους λογα�ιασμο�ς σας."
 
-#: C/video-call.page:10(info/desc)
+#: C/video-call.page:11(info/desc)
 msgid "Start a video conversation with one of your contacts."
 msgstr "Ένα�ξη βιντεοσυζήτησης με τις επαφές σας."
 
-#: C/video-call.page:29(page/title)
+#: C/video-call.page:37(page/title)
 msgid "Start a video conversation"
 msgstr "Ένα�ξη βιντεοκλήσης"
 
-#: C/video-call.page:31(page/p)
+#: C/video-call.page:39(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 "
@@ -3592,35 +3560,41 @@ msgstr ""
 "ότι ο συνομιλητής σας διαθέτει και αυτός εφα�μογή που υποστη�ίζει "
 "βιντεοκλήσεις."
 
-#: C/video-call.page:38(item/p)
+#: C/video-call.page:46(item/p)
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Video Call</gui>."
 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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Video Call</gui>."
 msgstr ""
-"Από το πα�άθυ�ο <gui>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</"
-"media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και "
-"επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε δεξί "
-"κλικ στο όνομα της επαφής και επιλέξτε  <gui>Βιντεοκλήση</gui>."
+"Δεξιοπατήστε στην επαφή την οποία θέλετε να καλέσετε και επιλέξτε <gui "
+"style=\"menuitem\">Βιντεοκλήση</gui>."
 
-#: C/video-call.page:55(note/p)
+#: C/video-call.page:54(item/p)
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgid ""
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr ""
+"Για να τε�ματίσετε τη συνομιλία, πατήστε το κουμπί <gui "
+"style=\"button\">Κλείσιμο</gui>."
+
+#: C/video-call.page:60(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 ""
 "Για να μετατ�έψετε μια βιντεοκλήση σε φωνητική συνομιλία, επιλέξτε "
 "<guiseq><gui style=\"menu\">Βίντεο</gui><gui style=\"menuitem\">Βίντεο "
-"ανενε�γό</gui></guiseq>, ή πατήστε το κουμπί <media type=\"image\" mime="
-"\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</media> της "
-"ε�γαλειοθήκης για να το αποεπιλέξετε."
+"ανενε�γό</gui></guiseq>."
 
-#: C/video-call.page:61(section/title)
+#: C/video-call.page:65(section/title)
 msgid "Start a video conversation with a meta-contact"
 msgstr "Ένα�ξη βιντεοσυζήτησης με μια μετα-επαφή"
 
-#: C/video-call.page:69(item/p)
+#: C/video-call.page:73(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Video Call</gui>."
@@ -3628,6 +3602,45 @@ msgstr ""
 "Επιλέξτε την επαφή με την οποία θέλετε να συζητήσετε, και από το μενο� "
 "επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>."
 
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/empathy-logo.png' "
+#~ "md5='1afc419a644e90b16393807e35cb5cb2'"
+#~ msgstr ""
+#~ "external ref='figures/empathy-logo.png' "
+#~ "md5='1afc419a644e90b16393807e35cb5cb2'"
+
+#~ 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</media> Αποστολέας "
+#~ "άμεσων μηνυμάτων Empathy"
+
+#~ 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>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</"
+#~ "media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και "
+#~ "επιλέξτε <gui style=\"menuitem\">Φωνητική κλήση</gui>."
+
+#~ 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>Λίστα επαφών</gui>, πατήστε το εικονίδιο <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">βιντεοκλήση</"
+#~ "media> δίπλα από το όνομα της επαφής που επιθυμείτε να καλέσετε, και "
+#~ "επιλέξτε <gui style=\"menuitem\">Βιντεοκλήση</gui>. Εναλλακτικά, κάνετε "
+#~ "δεξί κλικ στο όνομα της επαφής και επιλέξτε  <gui>Βιντεοκλήση</gui>."
+
 #~ msgid "milo@ubuntu.com"
 #~ msgstr "milo@ubuntu.com"
 
diff --git a/help/es/es.po b/help/es/es.po
index c0c5072d2..96ef4884f 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: 2013-02-03 12:24+0000\n"
-"PO-Revision-Date: 2013-02-04 17:39+0100\n"
+"POT-Creation-Date: 2013-06-23 17:39+0000\n"
+"PO-Revision-Date: 2013-06-24 16:27+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -21,40 +21,12 @@ msgstr ""
 msgctxt "_"
 msgid "translator-credits"
 msgstr ""
-"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012\n"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2012, 2013\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)
-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 "Mensajería para Internet Empathy"
-
-#: C/index.page:8(info/title)
-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/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:20(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)
@@ -71,20 +43,20 @@ msgstr "Mensajeri�a para Internet Empathy"
 #: 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/prob-conn-auth.page:22(credit/name) C/prob-conn-name.page:19(credit/name)
+#: C/prob-conn-neterror.page:20(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)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:17(credit/name)
+#: C/video-call.page:25(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/index.page:25(license/p) C/account-irc.page:21(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:21(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/audio-call.page:31(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:29(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)
@@ -98,116 +70,86 @@ msgstr "Milo Casagrande"
 #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(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/overview.page:20(license/p)
+#: C/link-contacts.page:23(license/p) C/overview.page:21(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/prob-conn-auth.page:26(license/p) C/prob-conn-name.page:23(license/p)
+#: C/prob-conn-neterror.page:24(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)
+#: C/status-icons.page:25(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Compartir Igual 3.0"
 
-#: C/index.page:27(page/title)
+#: C/index.page:28(info/desc)
+#| 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."
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Empathy is the instant messenging application for GNOME. It supports text, "
+"voice and video chat over many protocols."
 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"
+"Empathy es la aplicación de mensajería instantánea para GNOME. Soporta "
+"mensajes de texto, llamadas de voz y de vídeo sobre varios protocolos."
+
+#: C/index.page:30(info/title)
+msgctxt "link"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:31(info/title)
+msgctxt "text"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:34(page/title)
+#| msgid "<_:media-1/> Empathy Internet Messenger"
+msgid "<_:media-1/> Empathy"
+msgstr "<_:media-1/> Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:40(section/title)
 msgid "Account Management"
 msgstr "Gestión de cuentas"
 
-#: C/index.page:39(section/title)
+#: C/index.page:44(section/title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/index.page:43(section/title)
+#: C/index.page:48(section/title)
 msgid "Text Conversations"
 msgstr "Conversaciones de texto"
 
-#: C/index.page:47(section/title)
+#: C/index.page:52(section/title)
 msgid "Audio and Video Conversations"
 msgstr "Conversaciones de sonido y vídeo"
 
-#: C/index.page:51(section/title)
+#: C/index.page:56(section/title)
 msgid "Advanced Actions"
 msgstr "Acciones avanzadas"
 
-#: C/index.page:55(section/title) C/irc-manage.page:64(section/title)
+#: C/index.page:60(section/title) C/irc-manage.page:64(section/title)
 msgid "Common Problems"
 msgstr "Problemas comunes"
 
-#. 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)
+#: C/account-irc.page:9(info/desc)
 msgid "Additional information necessary for connecting to IRC networks."
 msgstr "Información adicional necesaria para conectarse a redes IRC."
 
-#: 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/account-irc.page:17(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:17(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)
+#: C/status-icons.page:21(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/account-irc.page:31(page/title)
+#: C/account-irc.page:32(page/title)
 msgid "IRC account details"
 msgstr "Detalles de la cuenta IRC"
 
-#: C/account-irc.page:33(page/p)
+#: C/account-irc.page:34(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 "
@@ -219,7 +161,7 @@ msgstr ""
 "apodo. Esta página detalla la información que puede proporcionar para una "
 "cuenta de IRC."
 
-#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p)
+#: C/account-irc.page:40(note/p) C/irc-manage.page:42(note/p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -227,11 +169,11 @@ msgstr ""
 "Debe tener instalado el paquete <sys>telepathy-idle</sys> para poder usar el "
 "IRC en <app>Empathy</app>."
 
-#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+#: C/account-irc.page:46(item/title) C/account-irc.page:124(item/title)
 msgid "<gui>Network</gui>"
 msgstr "<gui>Red</gui>"
 
-#: C/account-irc.page:46(item/p)
+#: C/account-irc.page:47(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> "
@@ -244,11 +186,11 @@ msgstr ""
 "<gui>Red</gui>. Puede añadir redes adicionales. Consulte debajo la <link "
 "xref=\"#networks\"/>."
 
-#: C/account-irc.page:53(item/title)
+#: C/account-irc.page:54(item/title)
 msgid "<gui>Nickname</gui>"
 msgstr "<gui>Alias</gui>"
 
-#: C/account-irc.page:54(item/p)
+#: C/account-irc.page:55(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 "
@@ -259,11 +201,11 @@ msgstr ""
 "usar cierto apodo. Si obtiene un mensaje que dice <link xref=\"prob-conn-name"
 "\" role=\"error-msg\"/> deberá cambiar su apodo."
 
-#: C/account-irc.page:60(item/title)
+#: C/account-irc.page:61(item/title)
 msgid "<gui>Password</gui>"
 msgstr "<gui>Contraseña</gui>"
 
-#: C/account-irc.page:61(item/p)
+#: C/account-irc.page:62(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 "
@@ -273,11 +215,11 @@ msgstr ""
 "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/account-irc.page:65(note/title)
+#: C/account-irc.page:66(note/title)
 msgid "NickServ Passwords"
 msgstr "Contraseñas NickServ"
 
-#: C/account-irc.page:66(note/p)
+#: C/account-irc.page:67(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. "
@@ -293,11 +235,11 @@ msgstr ""
 "permitiéndole usar este campo para identificarse con NickServ. Para obtener "
 "más información consulte la <link xref=\"irc-nick-password\"/>."
 
-#: C/account-irc.page:76(item/title)
+#: C/account-irc.page:77(item/title)
 msgid "<gui>Real name</gui>"
 msgstr "<gui>Nombre real</gui>"
 
-#: C/account-irc.page:77(item/p)
+#: C/account-irc.page:78(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."
@@ -305,11 +247,11 @@ msgstr ""
 "Puede proporcionar su nombre real además de su apodo. Otros usuarios podrán "
 "verlo al ver su información."
 
-#: C/account-irc.page:81(item/title)
+#: C/account-irc.page:82(item/title)
 msgid "<gui>Quit message</gui>"
 msgstr "<gui>Mensaje de salida</gui>"
 
-#: C/account-irc.page:82(item/p)
+#: C/account-irc.page:83(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 "
@@ -319,16 +261,16 @@ msgstr ""
 "en las que está y a todos los usuarios con los que tiene una conversación "
 "privada. Use este campo para proporcionar un mensaje personalizado."
 
-#: C/account-irc.page:94(info/title)
+#: C/account-irc.page:95(info/title)
 msgctxt "link"
 msgid "IRC Networks"
 msgstr "Redes IRC"
 
-#: C/account-irc.page:97(section/title)
+#: C/account-irc.page:98(section/title)
 msgid "Networks"
 msgstr "Redes"
 
-#: C/account-irc.page:99(section/p)
+#: C/account-irc.page:100(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 "
@@ -338,52 +280,52 @@ msgstr ""
 "otra red IRC puede añadirla a la lista. También puede modificar y quitar "
 "redes de la lista."
 
-#: 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 ""
-"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/account-irc.page:108(media/span)
+msgid "Add"
+msgstr "Añadir"
 
-#: C/account-irc.page:107(item/p)
+#: C/account-irc.page:105(item/p)
+msgid "To add a network to the list, click <_:media-1/>."
+msgstr "Para añadir una red a la lista, pulse <_:media-1/>."
+
+#: C/account-irc.page:112(media/span)
+msgid "Edit"
+msgstr "Editar"
+
+#: C/account-irc.page:109(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>."
+"To modify a network in the list, select the network and click <_:media-1/>."
 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>."
+"Para modificar una red de la lista seleccione la red y pulse <_:media-1/>."
+
+#: C/account-irc.page:116(media/span)
+msgid "Remove"
+msgstr "Quitar"
 
-#: C/account-irc.page:110(item/p)
+#: C/account-irc.page:113(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>."
+"To remove a network from the list, select the network and click <_:media-1/>."
 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>."
+"Para quitar una red de la lista seleccione la red y pulse <_:media-1/>."
 
-#: C/account-irc.page:115(section/p)
+#: C/account-irc.page:119(section/p)
 msgid ""
 "When adding or modifying a network, you can enter the following information:"
 msgstr ""
 "Al añadir o modificar una red puede introducir la siguiente información:"
 
-#: C/account-irc.page:121(item/p)
+#: C/account-irc.page:125(item/p)
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
 msgstr ""
 "Este es el nombre de la red como quiere que aparezca en la lista de redes."
 
-#: C/account-irc.page:125(item/title)
+#: C/account-irc.page:129(item/title)
 msgid "<gui>Charset</gui>"
 msgstr "<gui>Conjunto de caracteres</gui>"
 
-#: C/account-irc.page:126(item/p)
+#: C/account-irc.page:130(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 "
@@ -397,7 +339,7 @@ msgstr ""
 "caracteres y debe usar la misma configuración de caracteres que el resto de "
 "usuarios para poder ver sus mensajes correctamente."
 
-#: C/account-irc.page:135(item/p)
+#: C/account-irc.page:139(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 "
@@ -408,11 +350,11 @@ msgstr ""
 "del mundo. Otra configuración de caracteres común para inglés y otros "
 "idiomas occidentales es ISO-8859-1."
 
-#: C/account-irc.page:141(item/title)
+#: C/account-irc.page:145(item/title)
 msgid "<gui>Servers</gui>"
 msgstr "<gui>Servidores</gui>"
 
-#: C/account-irc.page:142(item/p)
+#: C/account-irc.page:146(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 "
@@ -425,7 +367,7 @@ msgstr ""
 "añadir y quitar servidores para esa red usando los botones <gui>Añadir</gui> "
 "y <gui>Quitar</gui>."
 
-#: C/account-irc.page:147(item/p)
+#: C/account-irc.page:151(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 "
@@ -436,7 +378,7 @@ msgstr ""
 "izquierda y derecha para dar el foco al campo y pulse la barra espaciadora "
 "para comenzar a editarlo."
 
-#: C/account-irc.page:151(item/p)
+#: C/account-irc.page:155(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 "
@@ -558,15 +500,15 @@ msgstr ""
 "servidores Jabber necesitará introducir manualmente ajustes de servidor. Su "
 "proveedor Jabber deberá proporcionar esos ajustes."
 
-#: C/accounts-window.page:11(info/desc)
+#: C/accounts-window.page:10(info/desc)
 msgid "Add, modify, and delete accounts."
 msgstr "Añadir, modificar y eliminar cuentas."
 
-#: C/accounts-window.page:33(page/title)
+#: C/accounts-window.page:32(page/title)
 msgid "Accounts Window"
 msgstr "Ventana de cuentas"
 
-#: C/accounts-window.page:35(page/p)
+#: C/accounts-window.page:34(page/p)
 msgid ""
 "The <gui>Accounts</gui> window allows you to add, modify, and delete "
 "accounts."
@@ -574,11 +516,11 @@ msgstr ""
 "La ventana <gui>Cuentas</gui> le permite añadir, modificar y eliminar "
 "cuentas."
 
-#: C/accounts-window.page:43(section/title)
+#: C/accounts-window.page:42(section/title)
 msgid "Account Details"
 msgstr "Detalles de la cuenta"
 
-#: C/accounts-window.page:44(section/p)
+#: C/accounts-window.page:43(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 "
@@ -676,8 +618,8 @@ msgstr "Añadir alguien a la lista de contactos."
 
 #: 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/prob-conn-auth.page:18(credit/name)
+#: C/prob-conn-neterror.page:16(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"
@@ -730,74 +672,55 @@ msgstr ""
 "Para añadir una persona nueva a su lista de contactos necesita estar "
 "conectado a Internet y a su cuenta."
 
-#. 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/audio-call.page:9(info/desc)
+#: C/audio-call.page:10(info/desc)
 msgid "Call your contacts over the Internet."
 msgstr "Llamar a sus contactos a través de Internet."
 
-#: C/audio-call.page:27(page/title)
+#: C/audio-call.page:26(credit/name) C/create-account.page:24(credit/name)
+#: C/overview.page:17(credit/name) C/share-desktop.page:18(credit/name)
+#: C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
 msgid "Start an audio conversation"
 msgstr "Iniciar una conversación de sonido"
 
-#: C/audio-call.page:29(page/p)
+#: C/audio-call.page:37(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."
+"features only works with certain types of accounts and it requires the other "
+"person to have an application that supports audio calls."
 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."
+"Puede llamar a sus contactos y tener conversaciones de voz 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 voz."
 
-#: C/audio-call.page:34(item/p)
+#: C/audio-call.page:43(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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio 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\">videollamada</"
-"media> junto al nombre del contacto al que quiere llamar y seleccione <gui "
-"style=\"menuitem\">Llamada de voz</gui>."
+"Pulse con el botón derecho sobre el contacto al que quiere llamar y "
+"seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
 
-#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 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."
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá  el "
+"tiempo total de conversación en la parte inferior de la ventana."
 
-#: 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>."
+#: C/audio-call.page:55(item/p)
+msgid ""
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Para finalizar una conversación pulse <gui style=\"button\">Colgar</gui>."
+"Para finalizar una conversación pulse el botón <gui style=\"button\">Colgar</"
+"gui>."
 
-#: C/audio-call.page:55(note/p)
+#: C/audio-call.page:63(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>."
@@ -806,19 +729,19 @@ msgstr ""
 "<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
 "encendido</gui></guiseq>."
 
-#: C/audio-call.page:63(section/title)
+#: C/audio-call.page:71(section/title)
 msgid "Start an audio conversation with a meta-contact"
 msgstr "Iniciar una conversación con un metacontacto"
 
-#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
-#: C/video-call.page:64(item/p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/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/audio-call.page:71(item/p)
+#: C/audio-call.page:79(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Audio Call</gui>."
@@ -826,8 +749,8 @@ msgstr ""
 "Seleccione el contacto con el que quiere tener la conversación y, del menú, "
 "seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
 
-#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
-#: C/video-call.page:76(note/p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 "
@@ -845,12 +768,17 @@ msgstr ""
 #. 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'"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+
+#. 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:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr "external ref='figures/camera-web.png' md5='__failed__'"
 
 #: C/audio-video.page:8(info/desc)
 msgid ""
@@ -1009,11 +937,11 @@ msgstr "Groupwise"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+#: C/audio-video.page:165(td/p) C/create-account.page:49(section/title)
 msgid "IRC"
 msgstr "IRC"
 
-#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+#: C/audio-video.page:170(td/p) C/create-account.page:79(section/title)
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -1029,7 +957,7 @@ msgstr "myspace"
 msgid "qq"
 msgstr "qq"
 
-#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+#: C/audio-video.page:190(td/p) C/create-account.page:97(section/title)
 msgid "People Nearby"
 msgstr "Gente cerca"
 
@@ -1041,7 +969,7 @@ msgstr "sametime"
 msgid "silc"
 msgstr "silc"
 
-#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+#: C/audio-video.page:205(td/p) C/create-account.page:110(section/title)
 msgid "SIP"
 msgstr "SIP"
 
@@ -1100,64 +1028,114 @@ msgstr ""
 "Si no usa su equipo durante un rato, o si se activa el salvapantallas, el "
 "estado se cambiará automáticamente a Ausente."
 
-#: 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:32(info/desc)
+#| msgid ""
+#| "Register for an account with one of the supported messaging services."
+msgid "Create an account for one of the supported messaging services."
+msgstr "Cree una cuenta en uno de los servicios de mensajería soportados."
 
-#: C/create-account.page:34(page/title)
-msgid "Register for a new account"
+#: C/create-account.page:36(page/title)
+#| msgid "Register for a new account"
+msgid "Register a new account"
 msgstr "Registrar una cuenta nueva"
 
-#: 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>."
+#: C/create-account.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>."
+msgid ""
+"Most account types require you to create an account with a service provider "
+"before you can use that account with instant messaging applications. You can "
+"use <app>Empathy</app> to register for a new account with some account "
+"providers using the same steps as you would to <link xref=\"add-account"
+"\">add an account</link>."
 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>."
+"instantánea. Con algunos proveedores de cuentas puede usar <app>Empathy</"
+"app> para registrar una cuenta nueva, siguiendo los mismos pasos que "
+"seguiría para <link xref=\"add-account\">añadir una cuenta</link>."
 
-#: C/create-account.page:42(page/p)
+#: C/create-account.page:44(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>."
 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>."
+"Once you create a new account, your account provider should give you a login "
+"or a username and a password, as well as any additional information you need "
+"to connect using <app>Empathy</app>."
 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>."
+"Una vez que haya creado su nueva cuenta, su proveedor de cuentas debería "
+"proporcionarle un ID o un nombre de usuario de inicio de sesión y una "
+"contraseña, así como otra información adicional que puede necesitar para "
+"conectarse usando <app>Empathy</app>."
 
-#: C/create-account.page:47(section/title)
+#: C/create-account.page:51(section/p)
+msgid ""
+"IRC networks require that you specify a nick (nickname) when you connect to "
+"the server. Some IRC networks use a service, such as NickServ, to allow "
+"users to <link xref=\"irc-nick-password\">protect their nick</link>. If you "
+"did not register your nick or are unable to do so and another user is using "
+"it, then you will need to choose a different one."
+msgstr ""
+"Las redes IRC requieren que especifique un alias (nick) cuando se conecta al "
+"servidor. Algunas redes IRC usan un servicio, como NickServ, para permitir a "
+"los usuarios <link xref=\"irc-nick-password\">proteger su nick</link>. Si no "
+"registra su nick o no puede hacerlo y otra persona lo está usando, deberá "
+"elegir otro diferente."
+
+#: C/create-account.page:57(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 ""
+"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:62(note/p)
+msgid ""
+"Many GNOME projects use <code>irc.gnome.org</code> for project-related "
+"discussion."
+msgstr ""
+"Muchos proyectos de GNOME usan <code>irc.gnome.org</code> para discusiones "
+"relacionadas con el proyecto."
+
+#: C/create-account.page:68(section/title)
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C/create-account.page:48(section/p)
+#: C/create-account.page:70(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."
 msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
+"Facebook is one of the more popular social networks. It allows users to "
+"create their own profile and to communicate with their friends."
 msgstr ""
 "Facebook es una de las redes sociales más usadas. Permite a los usuarios "
 "crear su propio perfil y comunicarse con sus amigos."
 
-#: C/create-account.page:52(section/p)
+#: C/create-account.page:73(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>."
 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."
+"new account from the website: <link href=\"https://www.facebook.com\">www."
 "facebook.com</link>."
 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."
+"nueva desde el sitio web: <link href=\"https://www.facebook.com\">www."
 "facebook.com</link>."
 
-#: C/create-account.page:62(section/p)
+#: C/create-account.page:81(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, "
@@ -1167,44 +1145,62 @@ msgstr ""
 "Jabber le permite elegir su proveedor de la cuenta y comunicarse con otros "
 "usuarios de Jabber, independientemente del proveedor de la cuenta."
 
-#: C/create-account.page:66(section/p)
+#: C/create-account.page:85(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>."
 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>."
+"org/\">jabber.org</link>."
 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>."
+"jabber.org/\">jabber.org</link>."
 
-#: C/create-account.page:71(note/p)
+#: C/create-account.page:90(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."
 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."
+"If you use Gmail or Google+ Hangouts, you already have a Jabber account. Use "
+"your Gmail address and password in <app>Empathy</app> to connect."
 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."
+"Si usa Google Mail o Google+ Hangouts ya tiene una cuenta Jabber. "
+"Simplemente use su dirección de GMail y su contraseña en <app>Empathy</app> "
+"para conectarse."
 
-#: 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."
+#: C/create-account.page:99(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."
+msgid ""
+"This service works whenever you are connected to a local network, such as a "
+"wireless hotspot, you do not need to create an account with service "
+"providor, just set up your account through <app>Empathy</app>. It "
+"automatically finds all other users on the network who are also using this "
+"service."
 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."
+"Este servicio funciona siempre que esté conectado a una red local, tal como "
+"un punto inalámbrico; no es necesario crear una cuenta con un proveedor del "
+"servicio, simplemente configure su cuenta en <app>Empathy</app>. "
+"Automáticamente encuentra otros usuarios en la red que estén usando este "
+"servicio."
 
-#: C/create-account.page:85(section/p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
+#: C/create-account.page:105(section/p)
+#| msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgid ""
+"For more information, see the <link xref=\"salut-protocol\">salut protocol</"
+"link>."
 msgstr ""
-"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
+"Para obtener más información consulte el <link xref=\"salut-protocol"
+"\">protocolo salut</link>."
 
-#: C/create-account.page:91(section/p)
+#: C/create-account.page:112(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 "
@@ -1216,17 +1212,7 @@ msgstr ""
 "Puede comunicarse con todos los usuarios SIP, independientemente del "
 "proveedor SIP que usen."
 
-#: 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 ""
-"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/create-account.page:102(section/p)
+#: C/create-account.page:117(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."
@@ -1235,67 +1221,43 @@ msgstr ""
 "equipo. Generalmente deberá suscribirse a un servicio de pago para usar esta "
 "característica."
 
-#: 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 ""
-"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/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 ""
-"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/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 ""
-"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(section/title)
+#: C/create-account.page:123(section/title)
 msgid "Proprietary Services"
 msgstr "Servicios propietarios"
 
-#: C/create-account.page:124(section/p)
+#: C/create-account.page:125(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."
 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 to connect to an existing account for some of these services. To create "
+"a new account with one of these services, you will need to visit the website "
+"for the service."
 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. "
+"le permite conectarse a una cuenta existente de alguno de estos servicios. "
 "Para crear una cuenta nueva con uno de esos servicios deberá visitar el "
-"servicio web del sitio y aceptar los términos de uso."
+"sitio web del servicio."
 
-#: C/create-account.page:132(item/p)
+#: C/create-account.page:133(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)
+#: C/create-account.page:136(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)
+#: C/create-account.page:139(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)
+#: C/create-account.page:142(item/p)
 msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
@@ -2157,9 +2119,6 @@ msgid "Internet Relay Chat (IRC)"
 msgstr "Internet Relay Chat (IRC)"
 
 #: C/irc-manage.page:47(when/p)
-#| msgid ""
-#| "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
-#| "\">Install telepathy-idle</link>"
 msgid ""
 "<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
 "idle</link>"
@@ -2387,19 +2346,23 @@ msgstr ""
 msgid "Merge and separate different contacts into a single one."
 msgstr "Unir y separar diferentes contactos en uno solo."
 
-#: C/link-contacts.page:25(page/title)
-msgid "Combine and separate contacts"
-msgstr "Combinar y separar contactos"
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
+
+#: C/link-contacts.page:29(page/title)
+msgid "Link and unlink contacts"
+msgstr "Enlazar y desenlazar contactos"
 
-#: C/link-contacts.page:26(page/p)
+#: C/link-contacts.page:30(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."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 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."
+"Si uno o más de sus contactos tienen varias cuentas con diferentes servicios "
+"de mensajería, puede combinar esas cuentas en uno sola."
 
-#: C/link-contacts.page:30(page/p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
 "The resulting contact is called a <em>meta-contact</em>: a contact composed "
 "from different single contacts."
@@ -2407,139 +2370,120 @@ msgstr ""
 "Al contacto resultante se le llama <em>metacontacto</em>: un contacto "
 "compuesto de diferentes contactos simples."
 
-#: C/link-contacts.page:34(page/p)
+#: C/link-contacts.page:38(page/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
-"Si tiene un contacto Juan Pérez que usa tres servicios de mensajería de "
-"contactos como:"
+"Suponga que tiene un contacto llamado Juan Pérez que usa tres servicios de "
+"mensajería de contactos como:"
 
-#: C/link-contacts.page:40(item/p)
+#: C/link-contacts.page:44(item/p)
 msgid "janes@facebook"
 msgstr "juan@facebook"
 
-#: C/link-contacts.page:45(item/p)
+#: C/link-contacts.page:49(item/p)
 msgid "jane.smith@gmail"
 msgstr "juan.perez@gmail"
 
-#: C/link-contacts.page:50(item/p)
+#: C/link-contacts.page:54(item/p)
 msgid "jane_smith@hotmail"
 msgstr "juan_perez@hotmail"
 
-#: C/link-contacts.page:55(page/p)
+#: C/link-contacts.page:59(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/link-contacts.page:60(section/title)
-msgid "Combining contacts"
-msgstr "Combinar contactos"
+#: C/link-contacts.page:63(section/title)
+msgid "Link contacts"
+msgstr "Enlazar contactos"
 
-#: C/link-contacts.page:63(item/p)
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "Puede enlazar sus contactos de la siguiente manera:"
+
+#: C/link-contacts.page:69(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>."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 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>."
+"Pulse el botón para seleccionar las entradas que quiere enlazar. Esto "
+"activará el <em>modo de selección</em> y verá una casilla por cada entrada."
 
-#: C/link-contacts.page:70(item/p)
+#: C/link-contacts.page:75(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
-"seleccione los contactos que quiere combinar."
+"Marque las casillas que corresponden a las entradas de <app>Contactos</app> "
+"que pertenecen al mismo contacto."
 
-#: C/link-contacts.page:76(item/p)
-msgid "Click <gui style=\"button\">Link</gui>."
+#: C/link-contacts.page:81(item/p)
+msgid "Press <gui style=\"button\">Link</gui>."
 msgstr "Pulse <gui style=\"button\">Enlazar</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 ""
-"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:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr "Repita los pasos 3 y 4 para enlazar otros contactos."
+
+#: C/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Desenlazar contactos"
 
-#: C/link-contacts.page:91(section/title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Para desenlazar un contacto enlazado:"
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:98(item/p)
+msgid "Select the contact from your list."
+msgstr "Seleccione el contacto de su lista."
+
+#: C/link-contacts.page:103(item/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 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>."
+"Pulse <gui style=\"button\">Editar</gui> en la esquina superior derecha de "
+"<app>Contactos</app>."
 
-#: C/link-contacts.page:100(item/p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
+#: C/link-contacts.page:108(item/p)
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr "Pulse <gui style=\"button\">Contactos enlazados</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/overview.page:37(media)
-msgctxt "_"
+#: C/link-contacts.page:113(item/p)
 msgid ""
-"external ref='figures/video_overview.png' "
-"md5='6cfcfbd833bf2234537d402185c40596'"
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 msgstr ""
-"external ref='figures/video_overview.png' "
-"md5='6cfcfbd833bf2234537d402185c40596'"
+"Pulse <gui style=\"button\">Quitar</gui> para desenlazar una entrada de un "
+"contacto enlazado."
 
-#. 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/overview.page:38(media)
-msgctxt "_"
+#: C/link-contacts.page:118(item/p)
 msgid ""
-"external ref='figures/conf_overview.png' "
-"md5='74c58668fe89c84060f12f6b70a6b903'"
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
 msgstr ""
-"external ref='figures/conf_overview.png' "
-"md5='74c58668fe89c84060f12f6b70a6b903'"
+"Pulse <gui style=\"button\">Cerrar</gui> si no quiere desenlazar más "
+"contactos."
 
-#. 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/overview.page:39(media)
-msgctxt "_"
-msgid ""
-"external ref='figures/croom_overview.png' "
-"md5='e9619d2c8420bc48a880c03dbc1ae084'"
+#: C/link-contacts.page:123(item/p)
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
 msgstr ""
-"external ref='figures/croom_overview.png' "
-"md5='e9619d2c8420bc48a880c03dbc1ae084'"
+"Finalmente, pulse <gui style=\"button\">Hecho</gui> para terminar la edición."
 
-#: C/overview.page:8(info/desc)
+#: C/overview.page:9(info/desc)
 msgid "What instant messaging is and how you can use it."
 msgstr "Qué es la mensajería instantánea y cómo puede usarla."
 
-#: C/overview.page:12(credit/name)
+#: C/overview.page:13(credit/name)
 msgid "Aruna S"
 msgstr "Aruna S"
 
-#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/overview.page:24(page/title)
+#: C/overview.page:25(page/title)
 msgid "Overview of instant messaging"
 msgstr "Visión general de la mensajería instantánea"
 
-#: C/overview.page:26(page/p)
+#: C/overview.page:27(page/p)
 msgid ""
 "Instant messaging, sometimes abbreviated to IM, is a text-based means to "
 "communicate instantly over the internet and the local network. While some IM "
@@ -2556,19 +2500,19 @@ msgstr ""
 "link> de diferentes proveedores de servicios. Algunos de ellos soportan "
 "incluso llamadas con sonido y vídeo."
 
-#: C/overview.page:42(td/p)
+#: C/overview.page:43(td/p)
 msgid "Video Conference"
 msgstr "Videoconferencia"
 
-#: C/overview.page:43(td/p)
+#: C/overview.page:44(td/p)
 msgid "Group chats"
 msgstr "Conversaciones en grupo"
 
-#: C/overview.page:44(td/p)
+#: C/overview.page:45(td/p)
 msgid "Chat rooms"
 msgstr "Salas de chat"
 
-#: C/overview.page:48(page/p)
+#: C/overview.page:49(page/p)
 msgid ""
 "Some instant messaging applications can be used to connect to chat rooms, "
 "online places where like-minded people meet to talk. One popular means to "
@@ -2745,8 +2689,8 @@ msgstr ""
 "nueva o unirse a una charla, puede que los detalles de su cuenta no sean "
 "correctos."
 
-#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
-#: C/prob-conn-neterror.page:53(item/p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:46(item/p)
+#: C/prob-conn-neterror.page:54(item/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."
@@ -2759,7 +2703,7 @@ msgstr ""
 "Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y seleccione la "
 "cuenta que no está funcionando."
 
-#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:62(item/p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
 msgstr ""
@@ -2767,7 +2711,7 @@ msgstr ""
 "correctos."
 
 #: C/prob-conn-acctdisabled.page:60(item/p)
-#: C/prob-conn-neterror.page:64(item/p)
+#: C/prob-conn-neterror.page:63(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 "
@@ -2781,7 +2725,7 @@ msgstr ""
 msgid "Check that the account is switched on."
 msgstr "Compruebe que la cuenta está activada"
 
-#: C/prob-conn-auth.page:8(info/desc)
+#: C/prob-conn-auth.page:9(info/desc)
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>� appears in "
 "the main window."
@@ -2789,11 +2733,11 @@ msgstr ""
 "Aparece un mensaje de error en la ventana principal que muestra «<gui>Falló "
 "la autenticación</gui>»."
 
-#: C/prob-conn-auth.page:36(page/title)
+#: C/prob-conn-auth.page:37(page/title)
 msgid "I get a message that says “Authentication failed�"
 msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
 
-#: C/prob-conn-auth.page:38(page/p)
+#: C/prob-conn-auth.page:39(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 "
@@ -2803,7 +2747,7 @@ msgstr ""
 "está permitiendo conectar porque por alguna razón no reconoce su nombre de "
 "usuario o contraseña."
 
-#: C/prob-conn-auth.page:50(item/p)
+#: C/prob-conn-auth.page:51(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 "
@@ -2813,16 +2757,17 @@ msgstr ""
 "intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no "
 "le permitirán que se conecte."
 
-#: 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/prob-conn-auth.page:58(media/span) C/prob-conn-name.page:44(media/span)
+#: C/prob-conn-neterror.page:59(media/span)
+msgid "edit"
+msgstr "editar"
 
-#: C/prob-conn-auth.page:68(item/p)
+#: C/prob-conn-auth.page:58(item/p) C/prob-conn-name.page:44(item/p)
+#: C/prob-conn-neterror.page:59(item/p)
+msgid "Click the <_:media-1/> icon in the error message."
+msgstr "Pulse el icono <_:media-1/> en el mensaje de error."
+
+#: C/prob-conn-auth.page:67(item/p)
 msgid ""
 "Deselect the <gui>Enabled</gui>, and then select it again to try to "
 "reconnect to the service."
@@ -2830,12 +2775,12 @@ msgstr ""
 "Deseleccione la casilla de verificación <gui>Activada</gui> y después "
 "selecciónela de nuevo para intentar reconectar con el servicio."
 
-#: C/prob-conn-name.page:9(info/title)
+#: C/prob-conn-name.page:10(info/title)
 msgctxt "link:error-msg"
 msgid "“Name in use�"
 msgstr "«Nombre en uso»"
 
-#: C/prob-conn-name.page:10(info/desc)
+#: C/prob-conn-name.page:11(info/desc)
 msgid ""
 "An error message which says “<gui>Name in use</gui>� appears in the main "
 "window."
@@ -2843,11 +2788,11 @@ msgstr ""
 "Aparecen en la ventana principal un mensaje de error que dice «<gui>Nombre en "
 "uso</gui>»."
 
-#: C/prob-conn-name.page:33(page/title)
+#: C/prob-conn-name.page:34(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)
+#: C/prob-conn-name.page:36(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 "
@@ -2857,11 +2802,11 @@ msgstr ""
 "está usando un apodo que ya está usando otra persona en esa red en "
 "particular."
 
-#: C/prob-conn-name.page:51(item/p)
+#: C/prob-conn-name.page:50(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/prob-conn-name.page:56(item/p)
+#: C/prob-conn-name.page:55(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-"
@@ -2871,14 +2816,14 @@ msgstr ""
 "contraseña para ese apodo. Para obtener más información consulte la <link "
 "xref=\"irc-nick-password\"/>."
 
-#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+#: C/prob-conn-name.page:64(item/p) C/prob-conn-neterror.page:78(item/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/prob-conn-neterror.page:7(info/desc)
+#: C/prob-conn-neterror.page:8(info/desc)
 msgid ""
 "An error message which says “<gui>Network error</gui>� appears in the main "
 "window."
@@ -2886,11 +2831,11 @@ msgstr ""
 "Aparecerá el mensaje de error «<gui>Error de red</gui>» en la ventana "
 "principal."
 
-#: C/prob-conn-neterror.page:34(page/title)
+#: C/prob-conn-neterror.page:35(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)
+#: C/prob-conn-neterror.page:43(page/p)
 msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
@@ -2898,7 +2843,7 @@ 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."
 
-#: C/prob-conn-neterror.page:46(page/p)
+#: C/prob-conn-neterror.page:47(page/p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
@@ -2906,11 +2851,11 @@ msgstr ""
 "Este tipo de error también sucede cuando intenta usar una cuenta de IRC sin "
 "haber configurado el apodo."
 
-#: C/prob-conn-neterror.page:87(section/title)
+#: C/prob-conn-neterror.page:86(section/title)
 msgid "Proxy support"
 msgstr "Soporte de proxy"
 
-#: C/prob-conn-neterror.page:88(section/p)
+#: C/prob-conn-neterror.page:87(section/p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
@@ -3351,68 +3296,23 @@ msgstr ""
 "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."
 
-#. 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/status-icons.page:7(info/desc)
+#: C/status-icons.page:8(info/desc)
 msgid "Understanding the various statuses and status icons."
 msgstr "Entender los diversos estados e iconos de estado."
 
-#: C/status-icons.page:35(page/title)
+#: C/status-icons.page:36(page/title)
 msgid "Status Types and Icons"
 msgstr "Tipos de estados e iconos"
 
-#: 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\">Icono "
-"de «disponible»</media> <gui>Disponible</gui>"
+#: C/status-icons.page:40(media/span)
+msgid "Available icon"
+msgstr "Icono de disponible"
 
-#: C/status-icons.page:41(item/p)
+#: C/status-icons.page:40(item/title)
+msgid "<_:media-1/> <gui>Available</gui>"
+msgstr "<_:media-1/> <gui>Disponible</gui>"
+
+#: C/status-icons.page:42(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."
@@ -3421,15 +3321,15 @@ msgstr ""
 "charlar con sus contactos. Puede establecer un mensaje personalizado para "
 "este estado."
 
-#: 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\">Icono de "
-"«ocupado»</media> <gui>Ocupado</gui>"
+#: C/status-icons.page:46(media/span)
+msgid "Busy icon"
+msgstr "Icono de ocupado"
+
+#: C/status-icons.page:46(item/title)
+msgid "<_:media-1/> <gui>Busy</gui>"
+msgstr "<_:media-1/> <gui>Ocupado</gui>"
 
-#: C/status-icons.page:47(item/p)
+#: C/status-icons.page:48(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 "
@@ -3443,15 +3343,15 @@ msgstr ""
 "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(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\">Icono de "
-"«ausente»</media> <gui>Ausente</gui>"
+#: C/status-icons.page:54(media/span)
+msgid "Away icon"
+msgstr "Icono de ausente"
+
+#: C/status-icons.page:54(item/title)
+msgid "<_:media-1/> <gui>Away</gui>"
+msgstr "<_:media-1/> <gui>Ausente</gui>"
 
-#: C/status-icons.page:55(item/p)
+#: C/status-icons.page:56(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 "
@@ -3466,15 +3366,15 @@ msgstr ""
 "sonidos cuando esté ocupado. Puede establecer un mensaje personalizado para "
 "este estado."
 
-#: 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\">Icono "
-"de «desconectado»</media> <gui>Invisible</gui>"
+#: C/status-icons.page:63(media/span) C/status-icons.page:70(media/span)
+msgid "Offline icon"
+msgstr "Icono de desconectado"
+
+#: C/status-icons.page:63(item/title)
+msgid "<_:media-1/> <gui>Invisible</gui>"
+msgstr "<_:media-1/> <gui>Invisible</gui>"
 
-#: C/status-icons.page:64(item/p)
+#: C/status-icons.page:65(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 "
@@ -3484,15 +3384,11 @@ msgstr ""
 "contactos. Aún estará conectado a sus cuentas, verá los estados de sus "
 "contactos y podrá iniciar conversaciones con ellos."
 
-#: 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\">Icono "
-"de «desconectado»</media> <gui>Desconectado</gui>"
+#: C/status-icons.page:70(item/title)
+msgid "<_:media-1/> <gui>Offline</gui>"
+msgstr "<_:media-1/> <gui>Desconectado</gui>"
 
-#: C/status-icons.page:71(item/p)
+#: C/status-icons.page:72(item/p)
 msgid ""
 "Setting your status to <em>Offline</em> disconnects you from all of your "
 "accounts."
@@ -3500,15 +3396,15 @@ msgstr ""
 "Establecer su estado como <em>Desconectado</em> le desconecta de todas sus "
 "cuentas."
 
-#: C/video-call.page:10(info/desc)
+#: C/video-call.page:11(info/desc)
 msgid "Start a video conversation with one of your contacts."
 msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
 
-#: C/video-call.page:29(page/title)
+#: C/video-call.page:37(page/title)
 msgid "Start a video conversation"
 msgstr "Comenzar una conversación de vídeo"
 
-#: C/video-call.page:31(page/p)
+#: C/video-call.page:39(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 "
@@ -3520,19 +3416,23 @@ msgstr ""
 "cuentas y requiere que la otra persona tenga una aplicación que soporte "
 "llamadas de vídeo."
 
-#: C/video-call.page:38(item/p)
+#: C/video-call.page:46(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="
+"Right-click on the contact that you want to call and select <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 quiere llamar y seleccione <gui "
-"style=\"menuitem\">Llamada de vídeo</gui>."
+"Pulse con el botón derecho sobre el contacto al que quiere llamar y "
+"seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
+
+#: C/video-call.page:54(item/p)
+msgid ""
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr ""
+"Para finalizar una conversación pulse el botón <gui style=\"button\">Colgar</"
+"gui>."
 
-#: C/video-call.page:55(note/p)
+#: C/video-call.page:60(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>."
@@ -3541,11 +3441,11 @@ msgstr ""
 "<guiseq><gui style=\"menu\">Vídeo</gui><gui style=\"menuitem\">Vídeo "
 "apagado</gui></guiseq>."
 
-#: C/video-call.page:61(section/title)
+#: C/video-call.page:65(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)
+#: C/video-call.page:73(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Video Call</gui>."
@@ -3553,33 +3453,261 @@ msgstr ""
 "Seleccione el contacto con el que quiere tener la conversacio�n y, del menu�, "
 "seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
 
+#~ msgctxt "link"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Mensajería para Internet Empathy"
+
+#~ msgctxt "text"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Mensajeri�a para Internet Empathy"
+
+#~ msgid "Empathy Internet Messenger logo"
+#~ msgstr "Logo de mensajería para Internet Empathy"
+
+#~ 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 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>."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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\"/>."
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+#~ msgstr ""
+#~ "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+#~ msgstr ""
+#~ "external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/gtk-remove.png' "
+#~ "md5='215e3a325a3dd619874e35c30a018bb6'"
+#~ msgstr ""
+#~ "external ref='figures/gtk-remove.png' "
+#~ "md5='215e3a325a3dd619874e35c30a018bb6'"
+
+#~ 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 ""
+#~ "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>."
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/video_overview.png' "
+#~ "md5='6cfcfbd833bf2234537d402185c40596'"
+#~ msgstr ""
+#~ "external ref='figures/video_overview.png' "
+#~ "md5='6cfcfbd833bf2234537d402185c40596'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/conf_overview.png' "
+#~ "md5='74c58668fe89c84060f12f6b70a6b903'"
+#~ msgstr ""
+#~ "external ref='figures/conf_overview.png' "
+#~ "md5='74c58668fe89c84060f12f6b70a6b903'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/croom_overview.png' "
+#~ "md5='e9619d2c8420bc48a880c03dbc1ae084'"
+#~ msgstr ""
+#~ "external ref='figures/croom_overview.png' "
+#~ "md5='e9619d2c8420bc48a880c03dbc1ae084'"
+
+#~ 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."
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/available.png' "
+#~ "md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+#~ msgstr ""
+#~ "external ref='figures/available.png' "
+#~ "md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+#~ msgstr ""
+#~ "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+#~ msgstr ""
+#~ "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+#~ msgstr ""
+#~ "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+
+#~ 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"
+#~ "\">Icono de «disponible»</media> <gui>Disponible</gui>"
+
+#~ 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\">Icono "
+#~ "de «ocupado»</media> <gui>Ocupado</gui>"
+
+#~ 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\">Icono "
+#~ "de «ausente»</media> <gui>Ausente</gui>"
+
+#~ 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>"
+
+#~ 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"
+#~ "\">Icono de «desconectado»</media> <gui>Desconectado</gui>"
+
+#~ msgid "Combine and separate contacts"
+#~ msgstr "Combinar y separar contactos"
+
+#~ 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 ""
+#~ "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>."
+
+#~ msgid ""
+#~ "From the left pane in the <gui>Link Contacts</gui> window, select the "
+#~ "contacts you want to combine."
+#~ msgstr ""
+#~ "Desde el panel izquierdo, en la ventana <gui>Enlazar contatos</gui>, "
+#~ "seleccione los contactos que quiere combinar."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Separating contacts"
+#~ msgstr "Separar contactos"
+
+#~ msgid ""
+#~ "From the <gui>Contact List</gui>, right-click the contact to separate, "
+#~ "and select <gui style=\"menuitem\">Link Contacts...</gui>."
+#~ 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>."
+
+#~ msgid "Click <gui style=\"button\">Unlink</gui>."
+#~ msgstr "Pulse <gui style=\"button\">Desenlazar</gui>."
+
+#~ 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 ""
+#~ "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 quiere llamar "
+#~ "y seleccione <gui style=\"menuitem\">Llamada de voz</gui>."
+
+#~ 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 quiere llamar y "
+#~ "seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
+
+#~ msgctxt "_"
+#~ msgid ""
+#~ "external ref='figures/empathy-logo.png' "
+#~ "md5='1afc419a644e90b16393807e35cb5cb2'"
+#~ msgstr ""
+#~ "external ref='figures/empathy-logo.png' "
+#~ "md5='1afc419a644e90b16393807e35cb5cb2'"
+
+#~ 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"
+#~ "\">Logotipo de la mensajería para Internet Empathy</media> Mensajería "
+#~ "para Internet Empathy"
+
 #~ 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"
 
@@ -3828,9 +3956,6 @@ msgstr ""
 #~ msgid "Click <gui>Apply</gui>."
 #~ msgstr "Pulse el botón <gui>Aplicar</gui>."
 
-#~ msgid "Click on the <gui>Edit Account</gui> button in the error message."
-#~ msgstr "Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error."
-
 #~ msgid ""
 #~ "In the case of an IRC account, type your nickname in the <gui>Nickname</"
 #~ "gui> text box."
@@ -3854,10 +3979,6 @@ msgstr ""
 #~ msgid "Click the <gui style=\"button\">Add</gui> button."
 #~ msgstr "Pulse el botón <gui style=\"button\">Añadir</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."
-
 #~ msgid ""
 #~ "If you select another account without clicking <gui>Connect</gui>, any "
 #~ "information you have entered will be lost."
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 4b2718f1f..f4caf9f7c 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -18,9 +18,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.2.2\n"
-"POT-Creation-Date: 2013-03-23 17:33+0000\n"
-"PO-Revision-Date: 2013-03-24 07:57+0100\n"
-"Last-Translator: Mickael Albertus <mickael.albertus@gmail.com>\n"
+"POT-Creation-Date: 2013-07-18 13:54+0000\n"
+"PO-Revision-Date: 2013-08-21 21:21+0200\n"
+"Last-Translator: Alain Lojewski <allomervan@gmail.com>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -52,7 +52,7 @@ msgstr ""
 #. 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)
+#: C/index.page:35(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/empathy-logo.png' "
@@ -61,19 +61,9 @@ msgstr ""
 "external ref='figures/empathy-logo.png' "
 "md5='1afc419a644e90b16393807e35cb5cb2'"
 
-#: C/index.page:7(info/title)
-msgctxt "link"
-msgid "Empathy Internet Messenger"
-msgstr "Messagerie instantanée Empathy"
-
-#: C/index.page:8(info/title)
-msgctxt "text"
-msgid "Empathy Internet Messenger"
-msgstr "Messagerie instantanée 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/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:20(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)
@@ -90,20 +80,20 @@ msgstr "Messagerie instantanée Empathy"
 #: 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/prob-conn-auth.page:22(credit/name) C/prob-conn-name.page:19(credit/name)
+#: C/prob-conn-neterror.page:20(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)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:17(credit/name)
+#: C/video-call.page:25(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/index.page:25(license/p) C/account-irc.page:21(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:21(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/audio-call.page:31(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:29(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)
@@ -117,49 +107,62 @@ msgstr "Milo Casagrande"
 #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(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/overview.page:20(license/p)
+#: C/link-contacts.page:23(license/p) C/overview.page:21(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/prob-conn-auth.page:26(license/p) C/prob-conn-name.page:23(license/p)
+#: C/prob-conn-neterror.page:24(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)
+#: C/status-icons.page:25(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr ""
 "Creative Commons Paternité - Partage des Conditions Initiales à l'Identique "
 "3.0"
 
-#: C/index.page:27(page/title)
+#: C/index.page:28(info/desc)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Empathy is the instant messenging application for GNOME. It supports text, "
+"voice and video chat over many protocols."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Logo de la messagerie instantanée Empathy </media> Messagerie instantanée "
-"Empathy"
+"Empathy est le client de messagerie instantanée de GNOME. Il prend en charge "
+"les discussions textuelles, vocales et vidéo sous de nombreux protocoles."
+
+#: C/index.page:30(info/title)
+msgctxt "link"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:31(info/title)
+msgctxt "text"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:34(page/title)
+msgid "<_:media-1/> Empathy"
+msgstr "<_:media-1/> Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:40(section/title)
 msgid "Account Management"
 msgstr "Gestion du compte"
 
-#: C/index.page:39(section/title)
+#: C/index.page:44(section/title)
 msgid "Contact Management"
 msgstr "Gestion des contacts"
 
-#: C/index.page:43(section/title)
+#: C/index.page:48(section/title)
 msgid "Text Conversations"
 msgstr "Conversations en mode texte"
 
-#: C/index.page:47(section/title)
+#: C/index.page:52(section/title)
 msgid "Audio and Video Conversations"
 msgstr "Conversations audio et vidéo"
 
-#: C/index.page:51(section/title)
+#: C/index.page:56(section/title)
 msgid "Advanced Actions"
 msgstr "Actions avancées"
 
-#: C/index.page:55(section/title) C/irc-manage.page:64(section/title)
+#: C/index.page:60(section/title) C/irc-manage.page:64(section/title)
 msgid "Common Problems"
 msgstr "Problèmes courants"
 
@@ -167,7 +170,7 @@ msgstr "Problèmes courants"
 #. 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)
+#: C/account-irc.page:107(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
@@ -193,7 +196,7 @@ msgstr ""
 #. 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/account-irc.page:111(media) C/prob-conn-auth.page:58(media)
 #: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
 msgctxt "_"
 msgid ""
@@ -205,32 +208,32 @@ msgstr ""
 #. 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)
+#: C/account-irc.page:115(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)
+#: C/account-irc.page:9(info/desc)
 msgid "Additional information necessary for connecting to IRC networks."
 msgstr ""
 "Informations supplémentaires nécessaires pour se connecter aux réseaux IRC."
 
-#: 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/account-irc.page:17(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:17(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)
+#: C/status-icons.page:21(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/account-irc.page:31(page/title)
+#: C/account-irc.page:32(page/title)
 msgid "IRC account details"
 msgstr "Détails du compte IRC"
 
 # Alias = Nickname ? NON c'est différent (Bruno)
-#: C/account-irc.page:33(page/p)
+#: C/account-irc.page:34(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 "
@@ -242,7 +245,7 @@ msgstr ""
 "nom de réseau IRC et un pseudonyme. Cette page énumère les informations que "
 "vous pouvez fournir pour un compte IRC."
 
-#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p)
+#: C/account-irc.page:40(note/p) C/irc-manage.page:42(note/p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -250,11 +253,11 @@ msgstr ""
 "Vous devez avoir installé le paquet <sys>telepathy-idle</sys> pour pouvoir "
 "utiliser IRC avec <app>Empathy</app>."
 
-#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+#: C/account-irc.page:46(item/title) C/account-irc.page:124(item/title)
 msgid "<gui>Network</gui>"
 msgstr "<gui>Réseau</gui>"
 
-#: C/account-irc.page:46(item/p)
+#: C/account-irc.page:47(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> "
@@ -265,14 +268,14 @@ msgstr ""
 "des réseaux IRC séparés. Chaque réseau est distinct et possède ses propres "
 "utilisateurs et salons de discussions. <app>Empathy</app> dresse une liste "
 "des réseaux les plus populaires dans la liste déroulante <gui>Réseaux</gui>. "
-"Vous pouvez ajouter des réseaux supplémentaires. Consultez <link xref="
+"Vous pouvez y ajouter des réseaux supplémentaires. Consultez <link xref="
 "\"#networks\"/> ci-dessous."
 
-#: C/account-irc.page:53(item/title)
+#: C/account-irc.page:54(item/title)
 msgid "<gui>Nickname</gui>"
 msgstr "<gui>Pseudonyme</gui>"
 
-#: C/account-irc.page:54(item/p)
+#: C/account-irc.page:55(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 "
@@ -284,11 +287,11 @@ msgstr ""
 "voyez apparaître ce message d'erreur <link xref=\"prob-conn-name\" role="
 "\"error-msg\"/>, c'est que vous devez changer de pseudonyme."
 
-#: C/account-irc.page:60(item/title)
+#: C/account-irc.page:61(item/title)
 msgid "<gui>Password</gui>"
 msgstr "<gui>Mot de passe</gui>"
 
-#: C/account-irc.page:61(item/p)
+#: C/account-irc.page:62(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 "
@@ -298,11 +301,11 @@ msgstr ""
 "de passe pour vous y connecter. Si vous êtes autorisé à utiliser le réseau, "
 "son administrateur doit vous fournir un mot de passe."
 
-#: C/account-irc.page:65(note/title)
+#: C/account-irc.page:66(note/title)
 msgid "NickServ Passwords"
 msgstr "Mots de passe NickServ"
 
-#: C/account-irc.page:66(note/p)
+#: C/account-irc.page:67(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. "
@@ -313,95 +316,96 @@ msgid ""
 msgstr ""
 "Sur certains réseaux, les pseudonymes peuvent être enregistrés en utilisant "
 "un service nommé NickServ. <app>Empathy</app> ne prend pas directement en "
-"charge les mots de passe de pseudonyme. Sur certains réseaux, incluant le "
+"charge les mots de passe des pseudonymes. Sur certains réseaux, incluant le "
 "populaire Freenode, les mots de passe du serveur sont automatiquement "
 "transférés vers NickServ, vous permettant ainsi de vous authentifier. "
 "Consultez <link xref=\"irc-nick-password\"/> pour plus de détails."
 
-#: C/account-irc.page:76(item/title)
+#: C/account-irc.page:77(item/title)
 msgid "<gui>Real name</gui>"
 msgstr "<gui>Nom réel</gui>"
 
-#: C/account-irc.page:77(item/p)
+#: C/account-irc.page:78(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 ""
-"Vous pouvez fournir votre vrai nom en plus de votre pseudonyme. Les autres "
+"Vous pouvez donner votre vrai nom en plus de votre pseudonyme. Les autres "
 "utilisateurs peuvent ainsi le voir lorsqu'ils affichent vos informations."
 
-#: C/account-irc.page:81(item/title)
+#: C/account-irc.page:82(item/title)
 msgid "<gui>Quit message</gui>"
-msgstr "<gui>Message de départ</gui>"
+msgstr "<gui>Message de déconnexion</gui>"
 
-#: C/account-irc.page:82(item/p)
+#: C/account-irc.page:83(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 ""
-"Lorsque vous vous déconnectez, un message de départ est envoyé dans tous les "
-"salons de discussion où vous êtes présent et à tous les utilisateurs avec "
-"qui vous êtes en conversation. Renseignez ce champ pour personnaliser votre "
-"message de déconnexion."
+"Lorsque vous vous déconnectez, un message est envoyé dans tous les salons de "
+"discussion où vous êtes présent et à tous les utilisateurs avec qui vous "
+"êtes en conversation. Renseignez ce champ pour personnaliser votre message "
+"de déconnexion."
 
-#: C/account-irc.page:94(info/title)
+#: C/account-irc.page:95(info/title)
 msgctxt "link"
 msgid "IRC Networks"
 msgstr "Réseaux IRC"
 
-#: C/account-irc.page:97(section/title)
+#: C/account-irc.page:98(section/title)
 msgid "Networks"
 msgstr "Réseaux"
 
-#: C/account-irc.page:99(section/p)
+#: C/account-irc.page:100(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> comprend une liste des réseaux IRC les plus populaires. "
+"<app>Empathy</app> contient une liste des réseaux IRC les plus populaires. "
 "Si vous souhaitez vous connecter à un autre réseau IRC, vous pouvez "
 "l'ajouter à la liste. Vous pouvez aussi modifier les réseaux existants et "
 "les supprimer de la liste."
 
-#: 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 ""
-"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/account-irc.page:108(media/span)
+msgid "Add"
+msgstr "Ajouter"
+
+#: C/account-irc.page:105(item/p)
+msgid "To add a network to the list, click <_:media-1/>."
+msgstr "Pour ajouter un réseau à la liste, cliquez sur <_:media-1/>."
 
-#: C/account-irc.page:107(item/p)
+#: C/account-irc.page:112(media/span)
+msgid "Edit"
+msgstr "Modifier"
+
+#: C/account-irc.page:109(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>."
+"To modify a network in the list, select the network and click <_:media-1/>."
 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>."
+"<_:media-1/>."
+
+#: C/account-irc.page:116(media/span)
+msgid "Remove"
+msgstr "Supprimer"
 
-#: C/account-irc.page:110(item/p)
+#: C/account-irc.page:113(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>."
+"To remove a network from the list, select the network and click <_:media-1/>."
 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>."
+"<_:media-1/>."
 
-#: C/account-irc.page:115(section/p)
+#: C/account-irc.page:119(section/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 saisir les "
 "informations suivantes :"
 
-#: C/account-irc.page:121(item/p)
+#: C/account-irc.page:125(item/p)
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
@@ -409,11 +413,11 @@ msgstr ""
 "C'est le nom du réseau tel que vous voulez qu'il apparaisse dans la liste "
 "des réseaux."
 
-#: C/account-irc.page:125(item/title)
+#: C/account-irc.page:129(item/title)
 msgid "<gui>Charset</gui>"
 msgstr "<gui>Codage de caractères</gui>"
 
-#: C/account-irc.page:126(item/p)
+#: C/account-irc.page:130(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 "
@@ -427,7 +431,7 @@ msgstr ""
 "et vous devez utiliser le même que ceux des autres utilisateurs pour pouvoir "
 "afficher leurs messages correctement."
 
-#: C/account-irc.page:135(item/p)
+#: C/account-irc.page:139(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 "
@@ -438,11 +442,11 @@ msgstr ""
 "autre codage commun pour l'anglais et quelques autres langues occidentales "
 "est le codage ISO-8859-1."
 
-#: C/account-irc.page:141(item/title)
+#: C/account-irc.page:145(item/title)
 msgid "<gui>Servers</gui>"
 msgstr "<gui>Serveurs</gui>"
 
-#: C/account-irc.page:142(item/p)
+#: C/account-irc.page:146(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 "
@@ -455,7 +459,7 @@ msgstr ""
 "autres serveurs sur ce réseau. Vous pouvez ajouter et enlever des serveurs "
 "de ce réseau avec les boutons <gui>Ajouter</gui> et <gui>Enlever</gui>."
 
-#: C/account-irc.page:147(item/p)
+#: C/account-irc.page:151(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 "
@@ -464,9 +468,9 @@ msgstr ""
 "Lorsqu'un serveur est sélectionné, cliquez sur le champ au-dessous de "
 "<gui>Serveur</gui> ou <gui>Port</gui> pour le modifier. Vous pouvez aussi "
 "utiliser les flèches droite et gauche pour sélectionner le champ et ensuite "
-"appuyer sur la barre d'espace pour commencer l'édition."
+"appuyer sur la barre d'espace pour commencer la modification."
 
-#: C/account-irc.page:151(item/p)
+#: C/account-irc.page:155(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 "
@@ -506,7 +510,7 @@ msgid ""
 "Google Talk is a type of Jabber account. These instructions hold for Google "
 "Talk accounts as well."
 msgstr ""
-"Google Talk est un type de compte Jabber. Ces instructions sont donc aussi "
+"Google Talk est un compte de type Jabber. Ces instructions sont donc aussi "
 "valables pour les comptes Google Talk."
 
 #: C/account-jabber.page:45(item/title)
@@ -586,19 +590,19 @@ msgid ""
 "by your Jabber provider."
 msgstr ""
 "<app>Empathy</app> utilise les paramètres par défaut pour se connecter au "
-"serveur Jabber selon vos informations de connexions. Pour certains serveurs "
+"serveur Jabber avec vos informations de connexion. Pour certains serveurs "
 "Jabber, vous devez saisir manuellement des paramètres personnalisés. Ces "
 "paramètres doivent vous être remis par votre fournisseur Jabber."
 
-#: C/accounts-window.page:11(info/desc)
+#: C/accounts-window.page:10(info/desc)
 msgid "Add, modify, and delete accounts."
 msgstr "Ajouter, modifier et supprimer des comptes."
 
-#: C/accounts-window.page:33(page/title)
+#: C/accounts-window.page:32(page/title)
 msgid "Accounts Window"
 msgstr "Fenêtre des comptes"
 
-#: C/accounts-window.page:35(page/p)
+#: C/accounts-window.page:34(page/p)
 msgid ""
 "The <gui>Accounts</gui> window allows you to add, modify, and delete "
 "accounts."
@@ -606,11 +610,11 @@ msgstr ""
 "La fenêtre des <gui>Comptes</gui> vous permet d'ajouter, de modifier et de "
 "supprimer des comptes."
 
-#: C/accounts-window.page:43(section/title)
+#: C/accounts-window.page:42(section/title)
 msgid "Account Details"
 msgstr "Détails du compte"
 
-#: C/accounts-window.page:44(section/p)
+#: C/accounts-window.page:43(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 "
@@ -710,8 +714,8 @@ msgstr "Ajouter une personne à la liste des contacts."
 
 #: 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/prob-conn-auth.page:18(credit/name)
+#: C/prob-conn-neterror.page:16(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"
@@ -767,76 +771,56 @@ msgstr ""
 "Pour ajouter une nouvelle personne à votre liste de contacts, vous devez "
 "être connecté à Internet et à votre compte."
 
-#. 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/audio-call.page:9(info/desc)
+#: C/audio-call.page:10(info/desc)
 msgid "Call your contacts over the Internet."
 msgstr "Appeler vos contacts sur Internet."
 
-#: C/audio-call.page:27(page/title)
+#: C/audio-call.page:26(credit/name) C/create-account.page:24(credit/name)
+#: C/overview.page:17(credit/name) C/share-desktop.page:18(credit/name)
+#: C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
 msgid "Start an audio conversation"
 msgstr "Démarrage d'une conversation audio"
 
-#: C/audio-call.page:29(page/p)
+#: C/audio-call.page:37(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."
+"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 une conversation audio avec eux. "
-"Cette option n'est disponible qu'avec certains types de comptes et il faut "
-"que l'autre personne possède une application compatible avec les appels "
-"audio."
+"Cette option ne peut fonctionner qu'avec certains types de comptes et il "
+"requiert que l'autre personne possède une application compatible avec les "
+"appels audio."
 
-#: C/audio-call.page:34(item/p)
+#: C/audio-call.page:43(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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, cliquez sur <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">appel vidéo</"
-"media> à côté du nom de la personne que vous souhaitez contacter et "
-"sélectionnez <gui style=\"menuitem\">Appel audio</gui>."
+"Faites un clic droit sur le contact que vous voulez appeler et sélectionnez "
+"<gui style=\"menuitem\">Appel audio</gui>."
 
-#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"Une nouvelle fenêtre s'ouvre. Lorsque la connexion est établie, vous voyez "
-"s'afficher <gui>Connecté</gui> au bas de la fenêtre, à côté du temps de "
-"conversation total."
+"Une nouvelle fenêtre s'ouvre. Lorsque la connexion est établie, le temps "
+"total de conversation s'affiche en bas de la fenêtre."
 
-#: 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>."
+#: C/audio-call.page:55(item/p)
+msgid ""
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Pour mettre fin à la conversation, cliquez sur <gui style=\"button"
-"\">Raccrocher</gui>."
+"Pour terminer la conversation, cliquez sur <gui style=\"button\">Raccrocher</"
+"gui>."
 
-#: C/audio-call.page:55(note/p)
+#: C/audio-call.page:63(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>."
@@ -845,29 +829,29 @@ msgstr ""
 "<guiseq><gui style=\"menu\">Vidéo</gui> <gui style=\"menuitem\">Vidéo "
 "activée</gui></guiseq>."
 
-#: C/audio-call.page:63(section/title)
+#: C/audio-call.page:71(section/title)
 msgid "Start an audio conversation with a meta-contact"
 msgstr "Démarrage d'une conversation audio avec un méta-contact"
 
 # meta-contact
-#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
-#: C/video-call.page:64(item/p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/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/audio-call.page:71(item/p)
+#: C/audio-call.page:79(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 avoir une conversation et "
-"sélectionnez <gui style=\"menuitem\">Appel audio</gui> à partir du menu."
+"choisissez <gui style=\"menuitem\">Appel audio</gui> dans le menu."
 
-#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
-#: C/video-call.page:76(note/p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 "
@@ -885,12 +869,17 @@ msgstr ""
 #. 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'"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+
+#. 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:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr "external ref='figures/camera-web.png' md5='__failed__'"
 
 #: C/audio-video.page:8(info/desc)
 msgid ""
@@ -1052,11 +1041,11 @@ msgstr "Groupwise"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+#: C/audio-video.page:165(td/p) C/create-account.page:49(section/title)
 msgid "IRC"
 msgstr "IRC"
 
-#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+#: C/audio-video.page:170(td/p) C/create-account.page:79(section/title)
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -1072,7 +1061,7 @@ msgstr "myspace"
 msgid "qq"
 msgstr "qq"
 
-#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+#: C/audio-video.page:190(td/p) C/create-account.page:97(section/title)
 msgid "People Nearby"
 msgstr "Personnes à proximité"
 
@@ -1085,7 +1074,7 @@ msgstr "sametime"
 msgid "silc"
 msgstr "silc"
 
-#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+#: C/audio-video.page:205(td/p) C/create-account.page:110(section/title)
 msgid "SIP"
 msgstr "SIP"
 
@@ -1144,71 +1133,100 @@ msgid ""
 "the status will be automatically set to Away."
 msgstr ""
 "Si vous n'utilisez pas votre ordinateur pendant un certain laps de temps, ou "
-"si l'économiseur d'écran est actif, votre état est automatiquement défini à "
-"Absent."
+"si l'économiseur d'écran est actif, votre état est automatiquement mis sur "
+"« Absent »."
 
-#: C/create-account.page:9(info/desc)
-msgid "Register for an account with one of the supported messaging services."
+#: C/create-account.page:32(info/desc)
+msgid "Create an account for one of the supported messaging services."
 msgstr ""
-"Enregistrer un compte avec un des services de messagerie instantanée pris en "
+"Créer un compte pour un des services de messagerie instantanée pris en "
 "charge."
 
-#: C/create-account.page:34(page/title)
-msgid "Register for a new account"
+#: C/create-account.page:36(page/title)
+msgid "Register a new account"
 msgstr "Enregistrement d'un nouveau compte"
 
 # types de compte(S) ??
-#: C/create-account.page:36(page/p)
+#: C/create-account.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>."
+"Most account types require you to create an account with a service provider "
+"before you can use that account with instant messaging applications. You can "
+"use <app>Empathy</app> to register for a new account with some account "
+"providers using the same steps as you would to <link xref=\"add-account"
+"\">add an account</link>."
 msgstr ""
 "Dans la plupart des cas, un compte doit être créé chez un fournisseur de "
-"compte avant de pouvoir vous connecter sur une application de messagerie "
-"instantanée comme <app>Empathy</app>. Avec certains fournisseurs de comptes, "
-"vous pouvez utiliser <app>Empathy</app> pour enregistrer un nouveau compte "
-"en suivant les mêmes étapes qu'en passant par <link xref=\"add-account"
-"\">Ajouter un compte</link>."
+"service avant de pouvoir l'utiliser avec une application de messagerie "
+"instantanée. Vous pouvez utiliser <app>Empathy</app> pour enregistrer un "
+"nouveau compte chez quelques fournisseurs en suivant les mêmes étapes qu'en "
+"passant par <link xref=\"add-account\">Ajouter un compte</link>."
 
-#: C/create-account.page:42(page/p)
+#: C/create-account.page:44(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>."
+"Once you create a new account, your account provider should give you a login "
+"or a username and a password, as well as any additional information you need "
+"to connect using <app>Empathy</app>."
 msgstr ""
-"Cette page vous informe sur la création d'un nouveau compte pour divers "
-"types de comptes. Votre fournisseur de compte doit vous fournir un "
-"identifiant de connexion et un mot de passe, ainsi que toutes les "
-"informations supplémentaires nécessaires pour vous connecter en utilisant "
+"Après avoir créé un nouveau compte, votre fournisseur doit vous fournir un "
+"identifiant de connexion ou un nom d'utilisateur et un mot de passe, ainsi "
+"que toutes informations supplémentaires requises pour vous connecter avec "
 "<app>Empathy</app>."
 
-#: C/create-account.page:47(section/title)
+#: C/create-account.page:51(section/p)
+msgid ""
+"IRC networks require that you specify a nick (nickname) when you connect to "
+"the server. Some IRC networks use a service, such as NickServ, to allow "
+"users to <link xref=\"irc-nick-password\">protect their nick</link>. If you "
+"did not register your nick or are unable to do so and another user is using "
+"it, then you will need to choose a different one."
+msgstr ""
+"Pour vous connecter à un serveur de réseaux IRC, vous devez renseigner un "
+"pseudonyme. Certains réseaux IRC utilisent un service extérieur tel que "
+"NickServ pour permettre aux utilisateurs de <link xref=\"irc-nick-password"
+"\">protéger leur pseudo</link>. Si vous n'enregistrez pas votre pseudo, ou "
+"ne pouvez le faire parce qu'un autre l'utilise déjà, alors vous devez en "
+"changer."
+
+#: C/create-account.page:57(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 ""
+"Certains serveurs IRC sont protégés par mot de passe. Vous devez connaître "
+"ce mot de passe pour vous y connecter. En général, ce sont des réseaux IRC "
+"privés."
+
+#: C/create-account.page:62(note/p)
+msgid ""
+"Many GNOME projects use <code>irc.gnome.org</code> for project-related "
+"discussion."
+msgstr ""
+"Beaucoup de projets GNOME sont débattus sur <code>irc.gnome.org</"
+"code>."
+
+#: C/create-account.page:68(section/title)
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C/create-account.page:48(section/p)
+#: C/create-account.page:70(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."
+"Facebook is one of the more popular 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 les plus utilisés. Il permet aux "
+"Facebook est l'un des réseaux sociaux les plus populaires. Il permet aux "
 "utilisateurs de créer leur propre profil et de communiquer avec leurs amis."
 
-#: C/create-account.page:52(section/p)
+#: C/create-account.page:73(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."
+"new account from the website: <link href=\"https://www.facebook.com\">www."
 "facebook.com</link>."
 msgstr ""
 "Pour communiquer avec vos amis en utilisant Facebook, vous devrez créer un "
-"nouveau compte sur leur site Web : <link href=\"http://www.facebook.com"
+"nouveau compte sur leur site Web : <link href=\"https://www.facebook.com"
 "\">www.facebook.com</link>."
 
-#: C/create-account.page:62(section/p)
+#: C/create-account.page:81(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, "
@@ -1219,45 +1237,48 @@ msgstr ""
 "communiquer avec tous les autres utilisateurs de Jabber, indépendamment de "
 "leur fournisseur de compte."
 
-#: C/create-account.page:66(section/p)
+#: C/create-account.page:85(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>."
+"org/\">jabber.org</link>."
 msgstr ""
 "Vous devez créer un nouveau compte avec un fournisseur Jabber. Il y a "
 "plusieurs fournisseurs gratuits ; un des plus populaires est <link href="
-"\"http://register.jabber.org/\">Jabber.org</link>."
+"\"http://register.jabber.org/\">jabber.org</link>."
 
-#: C/create-account.page:71(note/p)
+#: C/create-account.page:90(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."
+"If you use Gmail or Google+ Hangouts, you already have a Jabber account. Use "
+"your Gmail 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 simplement votre adresse "
-"Google Mail et son mot de passe associé dans <app>Empathy</app> pour vous y "
-"connecter."
+"Si vous utilisez les Hangouts de Gmail ou Google+, vous avez déjà un compte "
+"Jabber. Utilisez votre adresse Gmail et son mot de passe associé dans "
+"<app>Empathy</app> pour vous y connecter."
 
-#: C/create-account.page:80(section/p)
+#: C/create-account.page:99(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 ""
-"Vous n'avez pas besoin de créer un compte avec un fournisseur de service "
-"pour utiliser cette fonctionnalité. Ce service fonctionne dès que vous êtes "
-"connecté à un réseau local, comme un réseau sans fil. Il trouve "
-"automatiquement les autres utilisateurs sur le réseau qui utilisent déjà ce "
+"This service works whenever you are connected to a local network, such as a "
+"wireless hotspot, you do not need to create an account with service "
+"providor, just set up your account through <app>Empathy</app>. It "
+"automatically finds all other users on the network who are also using this "
 "service."
+msgstr ""
+"Ce service fonctionne dès que vous êtes connecté à un réseau local, comme à "
+"un réseau sans fil. Vous n'avez pas besoin de créer un autre compte avec un "
+"fournisseur de services, paramétrez-le tout simplement dans <app>Empathy</"
+"app> et il trouvera automatiquement tous les autres utilisateurs du réseau "
+"utilisant ce même service."
 
-#: C/create-account.page:85(section/p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "Pour plus d'informations, consultez <link xref=\"salut-protocol\"/>."
+#: C/create-account.page:105(section/p)
+msgid ""
+"For more information, see the <link xref=\"salut-protocol\">salut protocol</"
+"link>."
+msgstr ""
+"Pour plus d'informations, consultez le <link xref=\"salut-protocol\">protocole salut"
+"</link>."
 
-#: C/create-account.page:91(section/p)
+#: C/create-account.page:112(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 "
@@ -1269,17 +1290,7 @@ msgstr ""
 "un fournisseur SIP. Vous pouvez communiquer avec tous les autres "
 "utilisateurs SIP, indépendamment du fournisseur SIP qu'ils utilisent."
 
-#: 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 ""
-"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(section/p)
+#: C/create-account.page:117(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."
@@ -1288,67 +1299,37 @@ msgstr ""
 "téléphones fixes à partir de votre ordinateur. Généralement, vous devez "
 "souscrire à un service payant pour utiliser cette fonction."
 
-#: 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 ""
-"Vous n'avez pas besoin d'enregistrer un compte pour utiliser IRC. Même si "
-"vous devez spécifier un pseudonyme lorsque vous ajoutez un compte IRC sur "
-"<app>Empathy</app>, celui-ci n'est valide que pour la durée de la connexion. "
-"Si le même pseudonyme est déjà utilisé, vous devez en choisir un autre."
-
-#: 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 ""
-"Certains réseaux IRC utilisent un service appelé NickServ qui permet aux "
-"utilisateurs de protéger leurs pseudonymes. Consultez <link xref=\"irc-nick-"
-"password\"/> pour plus d'information."
-
-#: 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 ""
-"Certains serveurs IRC sont protégés par mot de passe. Vous devez connaître "
-"ce mot de passe pour vous y connecter. En général, ce sont des réseaux IRC "
-"privés."
-
-#: C/create-account.page:122(section/title)
+#: C/create-account.page:123(section/title)
 msgid "Proprietary Services"
 msgstr "Services propriétaires"
 
-#: C/create-account.page:124(section/p)
+#: C/create-account.page:125(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."
+"you to connect to an existing account for some of these services. To create "
+"a new account with one of these services, you will need to visit the website "
+"for the service."
 msgstr ""
 "Il existe plusieurs services de messagerie instantanée propriétaires qui ont "
 "été développés par différentes sociétés ou organisations. <app>Empathy</app> "
 "vous permet de vous connecter à un compte existant pour la plupart des "
 "services. Pour créer un nouveau compte avec un de ces services, vous devez "
-"visiter le site Web du service et accepter ses conditions d'utilisation."
+"visiter le site Web du service."
 
-#: C/create-account.page:132(item/p)
+#: C/create-account.page:133(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)
+#: C/create-account.page:136(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)
+#: C/create-account.page:139(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)
+#: C/create-account.page:142(item/p)
 msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
@@ -2163,7 +2144,7 @@ msgstr ""
 
 #: C/irc-join-room.page:8(info/desc)
 msgid "Join an IRC channel."
-msgstr "Rejoindre un canal IRC."
+msgstr "Rejoindre un salon IRC."
 
 #: C/irc-join-room.page:31(page/title)
 msgid "Join an IRC chat room"
@@ -2193,8 +2174,8 @@ 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 d'un canal IRC commencent par un caractère dièse "
+"Dans la zone de texte <gui>Salon</gui>, saisissez le nom du salon que vous "
+"voulez rejoindre. Les noms d'un salon IRC commencent par un caractère dièse "
 "(<sys>#</sys>)."
 
 #: C/irc-join-room.page:57(item/p)
@@ -2455,21 +2436,25 @@ msgstr ""
 
 #: C/link-contacts.page:11(info/desc)
 msgid "Merge and separate different contacts into a single one."
-msgstr "Lier et séparer des contacts différents en un seul."
+msgstr "Lier et séparer différents contacts en un seul."
+
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
 
-#: C/link-contacts.page:25(page/title)
-msgid "Combine and separate contacts"
-msgstr "Union et séparation de contacts"
+#: C/link-contacts.page:29(page/title)
+msgid "Link and unlink contacts"
+msgstr "Association, séparation de contacts"
 
-#: C/link-contacts.page:26(page/p)
+#: C/link-contacts.page:30(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."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 msgstr ""
-"Si un ou plusieurs de vos contacts possèdent plusieurs comptes sur des "
-"services de messagerie différents, vous pouvez lier ces contacts en un seul."
+"Si un ou plusieurs de vos contacts ont plusieurs comptes de différents "
+"services de messagerie, vous pouvez lier ces contacts en un seul."
 
-#: C/link-contacts.page:30(page/p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
 "The resulting contact is called a <em>meta-contact</em>: a contact composed "
 "from different single contacts."
@@ -2477,88 +2462,114 @@ msgstr ""
 "La liaison crée un contact appelé <em>méta-contact</em> : un contact composé "
 "de plusieurs contacts distincts."
 
-#: C/link-contacts.page:34(page/p)
+#: C/link-contacts.page:38(page/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
-"Si vous avez un contact Jean Bonneau qui utilise trois services de "
-"messagerie différents comme :"
+"Supposons que vous ayez un contact Jean Bonneau qui utilise trois services "
+"de messagerie différents comme :"
 
-#: C/link-contacts.page:40(item/p)
+#: C/link-contacts.page:44(item/p)
 msgid "janes@facebook"
 msgstr "jean@facebook"
 
-#: C/link-contacts.page:45(item/p)
+#: C/link-contacts.page:49(item/p)
 msgid "jane.smith@gmail"
 msgstr "jean.bonneau@gmail"
 
-#: C/link-contacts.page:50(item/p)
+#: C/link-contacts.page:54(item/p)
 msgid "jane_smith@hotmail"
 msgstr "jean_bonneau@hotmail"
 
-#: C/link-contacts.page:55(page/p)
+#: C/link-contacts.page:59(page/p)
 msgid "You can combine these contacts into a single Jane Smith one."
 msgstr "vous pouvez lier ces contacts en un seul Jean Bonneau."
 
-#: C/link-contacts.page:60(section/title)
-msgid "Combining contacts"
-msgstr "Lien entre contacts"
+#: C/link-contacts.page:63(section/title)
+msgid "Link contacts"
+msgstr "Association de contacts"
 
-#: C/link-contacts.page:63(item/p)
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "Pour associer vos contacts :"
+
+#: C/link-contacts.page:69(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>."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 msgstr ""
-"Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur l'un "
-"des contacts qui possède différents comptes et sélectionnez <gui style="
-"\"menuitem\">Lier les contacts</gui>."
+"appuyez sur le bouton à cocher pour sélectionner les entrées que vous voulez "
+"associer. Ceci active le <em>mode sélection</em> et ajoute une case à cocher "
+"à chaque entrée,"
 
-#: C/link-contacts.page:70(item/p)
+#: C/link-contacts.page:75(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"Dans le panneau de gauche de la fenêtre <gui>Lier des contacts</gui>, "
-"sélectionnez les contacts que vous voulez lier."
+"cochez les cases correspondant aux entrées <app>Contacts</app> qui "
+"appartiennent au même contact,"
 
-#: C/link-contacts.page:76(item/p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "Cliquez sur <gui style=\"button\">Lier</gui>."
+#: C/link-contacts.page:81(item/p)
+msgid "Press <gui style=\"button\">Link</gui>."
+msgstr "appuyez sur <gui style=\"button\">Lier</gui>."
 
-#: C/link-contacts.page:82(note/p)
+#: C/link-contacts.page:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr "Répéter les étapes 3 et 4 dans l'ordre pour lier d'autres contacts."
+
+#: C/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Dissocier des contacts"
+
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Pour dissocier un contact lié :"
+
+#: C/link-contacts.page:98(item/p)
+msgid "Select the contact from your list."
+msgstr "sélectionnez le contact dans votre liste,"
+
+#: C/link-contacts.page:103(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."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 msgstr ""
-"Par défaut, quand un méta contact a été créé et que vous faites un double "
-"clic dessus, vous êtes mis en ligne avec le contact qui a la plus forte "
-"présence sur le réseau."
+"appuyez sur <gui style=\"button\">Édition</gui> dans le coin en haut à "
+"droite de <app>Contacts</app>,"
 
-#: C/link-contacts.page:91(section/title)
-msgid "Separating contacts"
-msgstr "Séparation de contacts"
+#: C/link-contacts.page:108(item/p)
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr "cliquez sur <gui style=\"button\">Contacts liés</gui>,"
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:113(item/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 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>."
+"appuyez sur <gui style=\"button\">Supprimer</gui> pour dissocier une entrée "
+"du contact lié,"
 
-#: C/link-contacts.page:100(item/p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Cliquez sur <gui style=\"button\">Séparer</gui>."
+#: C/link-contacts.page:118(item/p)
+msgid ""
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
+msgstr ""
+"appuyez sur <gui style=\"button\">Fermer</gui> si vous ne voulez pas "
+"dissocier d'autres contacts,"
+
+#: C/link-contacts.page:123(item/p)
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
+msgstr ""
+"enfin, appuyez sur <gui style=\"button\">Fait</gui> pour finir la "
+"modification."
 
 #. 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/overview.page:37(media)
+#: C/overview.page:38(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/video_overview.png' "
@@ -2571,7 +2582,7 @@ msgstr ""
 #. 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/overview.page:38(media)
+#: C/overview.page:39(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/conf_overview.png' "
@@ -2584,7 +2595,7 @@ msgstr ""
 #. 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/overview.page:39(media)
+#: C/overview.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/croom_overview.png' "
@@ -2593,23 +2604,19 @@ msgstr ""
 "external ref='figures/croom_overview.png' "
 "md5='e9619d2c8420bc48a880c03dbc1ae084'"
 
-#: C/overview.page:8(info/desc)
+#: C/overview.page:9(info/desc)
 msgid "What instant messaging is and how you can use it."
 msgstr "Qu'est-ce qu'une messagerie instantanée et comment l'utiliser ?"
 
-#: C/overview.page:12(credit/name)
+#: C/overview.page:13(credit/name)
 msgid "Aruna S"
 msgstr "Aruna S"
 
-#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/overview.page:24(page/title)
+#: C/overview.page:25(page/title)
 msgid "Overview of instant messaging"
 msgstr "Présentation de la messagerie instantanée"
 
-#: C/overview.page:26(page/p)
+#: C/overview.page:27(page/p)
 msgid ""
 "Instant messaging, sometimes abbreviated to IM, is a text-based means to "
 "communicate instantly over the internet and the local network. While some IM "
@@ -2626,19 +2633,19 @@ msgstr ""
 "account\">comptes</link> de différents fournisseurs de services. Certains "
 "d'entre eux prennent même en charge les appels audio et vidéo."
 
-#: C/overview.page:42(td/p)
+#: C/overview.page:43(td/p)
 msgid "Video Conference"
 msgstr "Visioconférence"
 
-#: C/overview.page:43(td/p)
+#: C/overview.page:44(td/p)
 msgid "Group chats"
 msgstr "Groupes de discussion"
 
-#: C/overview.page:44(td/p)
+#: C/overview.page:45(td/p)
 msgid "Chat rooms"
 msgstr "Salons de discussion"
 
-#: C/overview.page:48(page/p)
+#: C/overview.page:49(page/p)
 msgid ""
 "Some instant messaging applications can be used to connect to chat rooms, "
 "online places where like-minded people meet to talk. One popular means to "
@@ -2819,11 +2826,11 @@ msgstr ""
 "démarrer une nouvelle conversation ou de rejoindre un salon, il se peut que "
 "les détails de votre compte soient incorrects."
 
-#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
-#: C/prob-conn-neterror.page:53(item/p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:46(item/p)
+#: C/prob-conn-neterror.page:54(item/p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
-msgstr "Assurez-vous que vous êtes connecté à Internet ou à un réseau local."
+msgstr "Assurez-vous d'être connecté à Internet ou à un réseau local."
 
 #: C/prob-conn-acctdisabled.page:49(item/p)
 msgid ""
@@ -2833,7 +2840,7 @@ msgstr ""
 "Choisissez <guiseq><gui>Édition</gui><gui>Comptes</gui></guiseq> et "
 "sélectionnez le compte qui ne fonctionne pas."
 
-#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:62(item/p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
 msgstr ""
@@ -2841,7 +2848,7 @@ msgstr ""
 "pour vous assurer qu'ils sont corrects."
 
 #: C/prob-conn-acctdisabled.page:60(item/p)
-#: C/prob-conn-neterror.page:64(item/p)
+#: C/prob-conn-neterror.page:63(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 "
@@ -2855,7 +2862,7 @@ msgstr ""
 msgid "Check that the account is switched on."
 msgstr "Vérifiez que le compte est activé."
 
-#: C/prob-conn-auth.page:8(info/desc)
+#: C/prob-conn-auth.page:9(info/desc)
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>� appears in "
 "the main window."
@@ -2863,11 +2870,11 @@ msgstr ""
 "Le message d'erreur <gui>L'authentification a échoué</gui> apparaît dans la "
 "fenêtre principale."
 
-#: C/prob-conn-auth.page:36(page/title)
+#: C/prob-conn-auth.page:37(page/title)
 msgid "I get a message that says “Authentication failed�"
 msgstr "Affichage du message « L'authentification a échoué »"
 
-#: C/prob-conn-auth.page:38(page/p)
+#: C/prob-conn-auth.page:39(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 "
@@ -2877,26 +2884,27 @@ msgstr ""
 "ne vous autorise pas à vous connecter parce qu'il ne reconnaît pas votre "
 "identifiant de connexion ou votre mot de passe pour une certaine raison."
 
-#: C/prob-conn-auth.page:50(item/p)
+#: C/prob-conn-auth.page:51(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 ""
-"Assurez-vous que vous avez enregistré un compte pour le service auquel vous "
+"Assurez-vous d'avoir enregistré un compte pour le service auquel vous "
 "essayez de vous connecter. Si vous n'avez pas de compte, la plupart des "
 "services ne vous permettent pas de vous connecter."
 
-#: 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 ""
-"Cliquez sur <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
-"png\">éditer</media> dans le message d'erreur."
+#: C/prob-conn-auth.page:58(media/span) C/prob-conn-name.page:44(media/span)
+#: C/prob-conn-neterror.page:59(media/span)
+msgid "edit"
+msgstr "edit"
+
+#: C/prob-conn-auth.page:58(item/p) C/prob-conn-name.page:44(item/p)
+#: C/prob-conn-neterror.page:59(item/p)
+msgid "Click the <_:media-1/> icon in the error message."
+msgstr "Cliquer sur l' <_:media-1/> icône dans le message d'erreur."
 
-#: C/prob-conn-auth.page:68(item/p)
+#: C/prob-conn-auth.page:67(item/p)
 msgid ""
 "Deselect the <gui>Enabled</gui>, and then select it again to try to "
 "reconnect to the service."
@@ -2904,12 +2912,12 @@ msgstr ""
 "Déconnectez puis reconnectez-vous pour essayer de vous reconnecter au "
 "service."
 
-#: C/prob-conn-name.page:9(info/title)
+#: C/prob-conn-name.page:10(info/title)
 msgctxt "link:error-msg"
 msgid "“Name in use�"
 msgstr "« Nom déjà utilisé »"
 
-#: C/prob-conn-name.page:10(info/desc)
+#: C/prob-conn-name.page:11(info/desc)
 msgid ""
 "An error message which says “<gui>Name in use</gui>� appears in the main "
 "window."
@@ -2917,11 +2925,11 @@ msgstr ""
 "Le message d'erreur <gui>Nom déjà utilisé</gui> s'affiche dans la fenêtre "
 "principale."
 
-#: C/prob-conn-name.page:33(page/title)
+#: C/prob-conn-name.page:34(page/title)
 msgid "I get a message that says “Name in use�"
 msgstr "Affichage du message « Nom utilisé »"
 
-#: C/prob-conn-name.page:35(page/p)
+#: C/prob-conn-name.page:36(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 "
@@ -2931,11 +2939,11 @@ msgstr ""
 "compte IRC avec un pseudonyme déjà utilisé par quelqu'un d'autre sur ce "
 "réseau."
 
-#: C/prob-conn-name.page:51(item/p)
+#: C/prob-conn-name.page:50(item/p)
 msgid "In the <gui>Nickname</gui> text box, type a new nickname."
 msgstr "Saisissez un nouveau <gui>Pseudonyme</gui> dans le champ texte."
 
-#: C/prob-conn-name.page:56(item/p)
+#: C/prob-conn-name.page:55(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-"
@@ -2945,7 +2953,7 @@ msgstr ""
 "passe adéquat. Consultez <link xref=\"irc-nick-password\"/> pour plus "
 "d'informations."
 
-#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+#: C/prob-conn-name.page:64(item/p) C/prob-conn-neterror.page:78(item/p)
 msgid ""
 "Switch the account off, and then switch it on to try to reconnect to the "
 "service."
@@ -2953,7 +2961,7 @@ msgstr ""
 "Déconnectez puis reconnectez-vous pour essayer de vous reconnecter au "
 "service."
 
-#: C/prob-conn-neterror.page:7(info/desc)
+#: C/prob-conn-neterror.page:8(info/desc)
 msgid ""
 "An error message which says “<gui>Network error</gui>� appears in the main "
 "window."
@@ -2961,11 +2969,11 @@ msgstr ""
 "Le message d'erreur <gui>Erreur réseau</gui> s'affiche dans la fenêtre "
 "principale."
 
-#: C/prob-conn-neterror.page:34(page/title)
+#: C/prob-conn-neterror.page:35(page/title)
 msgid "I get a message that says “Network error�"
 msgstr "Affichage du message « Erreur réseau »"
 
-#: C/prob-conn-neterror.page:42(page/p)
+#: C/prob-conn-neterror.page:43(page/p)
 msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
@@ -2974,7 +2982,7 @@ msgstr ""
 "communiquer avec le service de messagerie instantanée pour une quelconque "
 "raison."
 
-#: C/prob-conn-neterror.page:46(page/p)
+#: C/prob-conn-neterror.page:47(page/p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
@@ -2982,11 +2990,11 @@ msgstr ""
 "Ce type d'erreur se produit également lorsque vous essayez d'utiliser un "
 "compte IRC sans définir un pseudonyme."
 
-#: C/prob-conn-neterror.page:87(section/title)
+#: C/prob-conn-neterror.page:86(section/title)
 msgid "Proxy support"
 msgstr "Prise en charge d'un serveur mandataire"
 
-#: C/prob-conn-neterror.page:88(section/p)
+#: C/prob-conn-neterror.page:87(section/p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
@@ -3020,7 +3028,7 @@ msgid ""
 msgstr ""
 "Vous pouvez supprimer complètement un compte d'<app>Empathy</app> si vous ne "
 "souhaitez plus l'utiliser. Si vous souhaitez l'utiliser de nouveau sur "
-"<app>Empathy</app> à l'avenir, vous devrez ajouter votre compte à nouveau."
+"<app>Empathy</app> à l'avenir, vous devrez l'ajouter à nouveau."
 
 #: C/remove-account.page:47(item/p)
 msgid ""
@@ -3433,7 +3441,7 @@ msgstr ""
 #. 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)
+#: C/status-icons.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
@@ -3444,7 +3452,7 @@ msgstr ""
 #. 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)
+#: C/status-icons.page:46(media)
 msgctxt "_"
 msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
 msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
@@ -3453,7 +3461,7 @@ msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
 #. 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)
+#: C/status-icons.page:54(media)
 msgctxt "_"
 msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
 msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
@@ -3467,30 +3475,30 @@ msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
 #. 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)
+#: C/status-icons.page:63(media) C/status-icons.page:70(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgstr ""
 "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: C/status-icons.page:7(info/desc)
+#: C/status-icons.page:8(info/desc)
 msgid "Understanding the various statuses and status icons."
 msgstr "Comprendre les différents états et leurs icônes respectives."
 
-#: C/status-icons.page:35(page/title)
+#: C/status-icons.page:36(page/title)
 msgid "Status Types and Icons"
 msgstr "Types d'états et icônes"
 
-#: 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\">Icône "
-"Disponible</media> <gui>Disponible</gui>"
+#: C/status-icons.page:40(media/span)
+msgid "Available icon"
+msgstr "icône disponible"
 
-#: C/status-icons.page:41(item/p)
+#: C/status-icons.page:40(item/title)
+msgid "<_:media-1/> <gui>Available</gui>"
+msgstr "<_:media-1/> <gui>Disponible</gui>"
+
+#: C/status-icons.page:42(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."
@@ -3499,15 +3507,15 @@ msgstr ""
 "enclin à discuter avec vos contacts. Vous pouvez définir un message "
 "personnalisé pour cet état."
 
-#: 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\">icône "
-"Occupé</media> <gui>Occupé</gui>"
+#: C/status-icons.page:46(media/span)
+msgid "Busy icon"
+msgstr "icône occupé"
 
-#: C/status-icons.page:47(item/p)
+#: C/status-icons.page:46(item/title)
+msgid "<_:media-1/> <gui>Busy</gui>"
+msgstr "<_:media-1/> <gui>Occupé</gui>"
+
+#: C/status-icons.page:48(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 "
@@ -3522,15 +3530,15 @@ msgstr ""
 "notification et de sons lorsque vous êtes occupé. Vous pouvez définir un "
 "message personnalisé pour cet état."
 
-#: 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\">icône "
-"Absent</media> <gui>Absent</gui>"
+#: C/status-icons.page:54(media/span)
+msgid "Away icon"
+msgstr "icône absent"
+
+#: C/status-icons.page:54(item/title)
+msgid "<_:media-1/> <gui>Away</gui>"
+msgstr "<_:media-1/> <gui>Absent</gui>"
 
-#: C/status-icons.page:55(item/p)
+#: C/status-icons.page:56(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 "
@@ -3545,15 +3553,15 @@ msgstr ""
 "de bulles de notification et de sons lorsque vous êtes absent. Vous pouvez "
 "définir un message personnalisé pour cet état."
 
-#: 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\">icône "
-"Hors-ligne</media> <gui>Invisible</gui>"
+#: C/status-icons.page:63(media/span) C/status-icons.page:70(media/span)
+msgid "Offline icon"
+msgstr "icône hors-ligne"
 
-#: C/status-icons.page:64(item/p)
+#: C/status-icons.page:63(item/title)
+msgid "<_:media-1/> <gui>Invisible</gui>"
+msgstr "<_:media-1/> <gui>Invisible</gui>"
+
+#: C/status-icons.page:65(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 "
@@ -3564,15 +3572,11 @@ msgstr ""
 "vous pouvez encore voir les états de vos contacts et engager des "
 "conversations avec eux."
 
-#: 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\">Hors-"
-"ligne icon</media> <gui>Déconnecté</gui>"
+#: C/status-icons.page:70(item/title)
+msgid "<_:media-1/> <gui>Offline</gui>"
+msgstr "<_:media-1/> <gui>Hors-ligne</gui>"
 
-#: C/status-icons.page:71(item/p)
+#: C/status-icons.page:72(item/p)
 msgid ""
 "Setting your status to <em>Offline</em> disconnects you from all of your "
 "accounts."
@@ -3580,15 +3584,15 @@ msgstr ""
 "Définissez votre état à <em>Déconnecté</em> pour vous déconnecter de tous "
 "vos comptes."
 
-#: C/video-call.page:10(info/desc)
+#: C/video-call.page:11(info/desc)
 msgid "Start a video conversation with one of your contacts."
 msgstr "Démarrer une conversation vidéo avec l'un de ses contacts."
 
-#: C/video-call.page:29(page/title)
+#: C/video-call.page:37(page/title)
 msgid "Start a video conversation"
 msgstr "Démarrage d'une conversation vidéo"
 
-#: C/video-call.page:31(page/p)
+#: C/video-call.page:39(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 "
@@ -3600,19 +3604,23 @@ msgstr ""
 "certains types de compte et il est nécessaire que l'autre personne possède "
 "également une application qui prenne en charge les appels vidéo."
 
-#: C/video-call.page:38(item/p)
+#: C/video-call.page:46(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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Video Call</gui>."
 msgstr ""
-"Dans 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 nom du contact que vous voulez appeler et choisissez "
+"Clique-droit sur le contact que vous voulez appeler, et sélectionnez "
 "<gui style=\"menuitem\">Appel vidéo</gui>."
 
-#: C/video-call.page:55(note/p)
+#: C/video-call.page:54(item/p)
+msgid ""
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr ""
+"Pour terminer la conversation, cliquez sur <gui style=\"button\">Raccrocher</"
+"gui>."
+
+#: C/video-call.page:60(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>."
@@ -3621,14 +3629,179 @@ msgstr ""
 "<guiseq><gui style=\"menu\">Vidéo</gui><gui style=\"menuitem\">Vidéo "
 "désactivée</gui></guiseq>."
 
-#: C/video-call.page:61(section/title)
+#: C/video-call.page:65(section/title)
 msgid "Start a video conversation with a meta-contact"
 msgstr "Démarrage d'une conversation vidéo avec un méta-contact"
 
-#: C/video-call.page:69(item/p)
+#: C/video-call.page:73(item/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 qui vous voulez avoir la conversation, et "
 "sélectionnez <gui style=\"menuitem\">Appel vidéo</gui> dans le menu."
+
+#~ msgctxt "link"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Messagerie instantanée Empathy"
+
+#~ msgctxt "text"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Messagerie instantanée Empathy"
+
+#~| msgctxt "link"
+#~| msgid "Empathy Internet Messenger"
+#~ msgid "Empathy Internet Messenger logo"
+#~ msgstr "Logo Messagerie instantanée Empathy"
+
+#~ 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>."
+
+#~ 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 ""
+#~ "Vous n'avez pas besoin d'enregistrer un compte pour utiliser IRC. Même si "
+#~ "vous devez spécifier un pseudonyme lorsque vous ajoutez un compte IRC sur "
+#~ "<app>Empathy</app>, celui-ci n'est valide que pour la durée de la "
+#~ "connexion. Si le même pseudonyme est déjà utilisé, vous devez en choisir "
+#~ "un autre."
+
+#~ 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 ""
+#~ "Certains réseaux IRC utilisent un service appelé NickServ qui permet aux "
+#~ "utilisateurs de protéger leurs pseudonymes. Consultez <link xref=\"irc-"
+#~ "nick-password\"/> pour plus d'information."
+
+#~ 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"
+#~ "\"> Logo de la messagerie instantanée Empathy </media> Messagerie "
+#~ "instantanée Empathy"
+
+#~ 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>."
+
+#~ 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 ""
+#~ "Dans la fenêtre <gui>Liste des contacts</gui>, cliquez sur <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">appel vidéo</"
+#~ "media> à côté du nom de la personne que vous souhaitez contacter et "
+#~ "sélectionnez <gui style=\"menuitem\">Appel audio</gui>."
+
+#~ msgid "Combine and separate contacts"
+#~ msgstr "Union et séparation de contacts"
+
+#~ 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 ""
+#~ "Dans la fenêtre <gui>Liste des contacts</gui>, faites un clic droit sur "
+#~ "l'un des contacts qui possède différents comptes et sélectionnez <gui "
+#~ "style=\"menuitem\">Lier les contacts</gui>."
+
+#~ 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 lier."
+
+#~ 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 ""
+#~ "Par défaut, quand un méta contact a été créé et que vous faites un double "
+#~ "clic dessus, vous êtes mis en ligne avec le contact qui a la plus forte "
+#~ "présence sur le réseau."
+
+#~ msgid "Separating contacts"
+#~ msgstr "Séparation de contacts"
+
+#~ 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>."
+
+#~ msgid "Click <gui style=\"button\">Unlink</gui>."
+#~ msgstr "Cliquez sur <gui style=\"button\">Séparer</gui>."
+
+#~ msgid ""
+#~ "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#~ "png\">edit</media> icon in the error message."
+#~ msgstr ""
+#~ "Cliquez sur <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+#~ "edit.png\">éditer</media> dans le message d'erreur."
+
+#~ 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"
+#~ "\">Icône Disponible</media> <gui>Disponible</gui>"
+
+#~ 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\">icône "
+#~ "Occupé</media> <gui>Occupé</gui>"
+
+#~ 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\">icône "
+#~ "Absent</media> <gui>Absent</gui>"
+
+#~ 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"
+#~ "\">icône Hors-ligne</media> <gui>Invisible</gui>"
+
+#~ 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\">Hors-"
+#~ "ligne icon</media> <gui>Déconnecté</gui>"
+
+#~ 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 ""
+#~ "Dans 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 nom du contact que vous voulez appeler et "
+#~ "choisissez <gui style=\"menuitem\">Appel vidéo</gui>."
diff --git a/help/hu/hu.po b/help/hu/hu.po
index de4f79788..97f3cc45e 100644
--- a/help/hu/hu.po
+++ b/help/hu/hu.po
@@ -1,20 +1,20 @@
 # Hungarian translation of empathy-docs
 # Copyright (C) 2010, 2011. Free Software Foundation, Inc.
-# This file is distributed under the same license as the empathy package.
+# This file is distributed under the same license as the empathy help.
 #
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2010, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-docs master\n"
-"POT-Creation-Date: 2013-02-03 12:24+0000\n"
-"PO-Revision-Date: 2013-03-21 09:41+0100\n"
+"POT-Creation-Date: 2013-08-14 10:38+0000\n"
+"PO-Revision-Date: 2013-09-09 00:28+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
@@ -31,7 +31,7 @@ msgstr "Kelemen Gábor <kelemeng at gnome dot hu>, 2010, 2011, 2012, 2013"
 #. 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)
+#: C/index.page:35(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/empathy-logo.png' "
@@ -40,19 +40,9 @@ msgstr ""
 "external ref='figures/empathy-logo.png' "
 "md5='1afc419a644e90b16393807e35cb5cb2'"
 
-#: C/index.page:7(info/title)
-msgctxt "link"
-msgid "Empathy Internet Messenger"
-msgstr "Empathy üzenetküldő"
-
-#: C/index.page:8(info/title)
-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/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:20(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)
@@ -69,20 +59,20 @@ msgstr "Empathy üzenetküldő"
 #: 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/prob-conn-auth.page:22(credit/name) C/prob-conn-name.page:19(credit/name)
+#: C/prob-conn-neterror.page:20(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)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:17(credit/name)
+#: C/video-call.page:25(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/index.page:25(license/p) C/account-irc.page:21(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:21(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/audio-call.page:31(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:29(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)
@@ -96,46 +86,65 @@ msgstr "Milo Casagrande"
 #: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(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/overview.page:20(license/p)
+#: C/link-contacts.page:23(license/p) C/overview.page:21(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/prob-conn-auth.page:26(license/p) C/prob-conn-name.page:23(license/p)
+#: C/prob-conn-neterror.page:24(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)
+#: C/status-icons.page:25(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "Creative Commons Share Alike 3.0"
 
-#: C/index.page:27(page/title)
+#: C/index.page:28(info/desc)
+#| 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."
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"Empathy is the instant messenging application for GNOME. It supports text, "
+"voice and video chat over many protocols."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy üzenetküldő logója </media> Empathy üzenetküldő"
+"Az Empathy egy azonnaliüzenő alkalmazás a GNOME-hoz. Támogatja a szöveges "
+"üzenetküldést, valamint a hang- és videohívásokat számos protokollon."
+
+#: C/index.page:30(info/title)
+msgctxt "link"
+msgid "Empathy"
+msgstr "Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:31(info/title)
+msgctxt "text"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: C/index.page:34(page/title)
+msgid "<_:media-1/> Empathy"
+msgstr "<_:media-1/> Empathy"
+
+#: C/index.page:40(section/title)
 msgid "Account Management"
 msgstr "Fiókkezelés"
 
-#: C/index.page:39(section/title)
+#: C/index.page:44(section/title)
 msgid "Contact Management"
 msgstr "Partnerkezelés"
 
-#: C/index.page:43(section/title)
+#: C/index.page:48(section/title)
 msgid "Text Conversations"
 msgstr "Szöveges csevegések"
 
-#: C/index.page:47(section/title)
+#: C/index.page:52(section/title)
 msgid "Audio and Video Conversations"
 msgstr "Hang- és videocsevegések"
 
-#: C/index.page:51(section/title)
+#: C/index.page:56(section/title)
 msgid "Advanced Actions"
 msgstr "Speciális műveletek"
 
-#: C/index.page:55(section/title) C/irc-manage.page:64(section/title)
+#: C/index.page:60(section/title) C/irc-manage.page:64(section/title)
 msgid "Common Problems"
 msgstr "Gyakori problémák"
 
@@ -143,7 +152,7 @@ msgstr "Gyakori problémák"
 #. 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)
+#: C/account-irc.page:107(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
@@ -169,7 +178,7 @@ msgstr ""
 #. 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/account-irc.page:111(media) C/prob-conn-auth.page:58(media)
 #: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
 msgctxt "_"
 msgid ""
@@ -181,30 +190,30 @@ msgstr ""
 #. 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)
+#: C/account-irc.page:115(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)
+#: C/account-irc.page:9(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/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/account-irc.page:17(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:17(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)
+#: C/status-icons.page:21(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/account-irc.page:31(page/title)
+#: C/account-irc.page:32(page/title)
 msgid "IRC account details"
 msgstr "IRC-fiók részletei"
 
-#: C/account-irc.page:33(page/p)
+#: C/account-irc.page:34(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 "
@@ -215,7 +224,7 @@ msgstr ""
 "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:39(note/p) C/irc-manage.page:42(note/p)
+#: C/account-irc.page:40(note/p) C/irc-manage.page:42(note/p)
 msgid ""
 "You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
 "<app>Empathy</app>."
@@ -223,11 +232,11 @@ msgstr ""
 "Az IRC protokoll <app>Empathyban</app> való használatához telepíteni kell a "
 "<sys>telepathy-idle</sys> csomagot."
 
-#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+#: C/account-irc.page:46(item/title) C/account-irc.page:124(item/title)
 msgid "<gui>Network</gui>"
 msgstr "<gui>Hálózat</gui>"
 
-#: C/account-irc.page:46(item/p)
+#: C/account-irc.page:47(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> "
@@ -241,11 +250,11 @@ msgstr ""
 "továbbiakat is felvehet. Részletekért lásd a <link xref=\"#networks\"/> "
 "részt lentebb."
 
-#: C/account-irc.page:53(item/title)
+#: C/account-irc.page:54(item/title)
 msgid "<gui>Nickname</gui>"
 msgstr "<gui>Becenév</gui>"
 
-#: C/account-irc.page:54(item/p)
+#: C/account-irc.page:55(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 "
@@ -256,11 +265,11 @@ msgstr ""
 "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/account-irc.page:60(item/title)
+#: C/account-irc.page:61(item/title)
 msgid "<gui>Password</gui>"
 msgstr "<gui>Jelszó</gui>"
 
-#: C/account-irc.page:61(item/p)
+#: C/account-irc.page:62(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 "
@@ -270,11 +279,11 @@ msgstr ""
 "csatlakozáshoz. Ha jogosult a hálózat használatára, akkor a hálózat "
 "rendszergazdái megadják a jelszót."
 
-#: C/account-irc.page:65(note/title)
+#: C/account-irc.page:66(note/title)
 msgid "NickServ Passwords"
 msgstr "NickServ jelszavak"
 
-#: C/account-irc.page:66(note/p)
+#: C/account-irc.page:67(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. "
@@ -290,11 +299,11 @@ msgstr ""
 "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/account-irc.page:76(item/title)
+#: C/account-irc.page:77(item/title)
 msgid "<gui>Real name</gui>"
 msgstr "<gui>Valódi név</gui>"
 
-#: C/account-irc.page:77(item/p)
+#: C/account-irc.page:78(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."
@@ -302,11 +311,11 @@ 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."
 
-#: C/account-irc.page:81(item/title)
+#: C/account-irc.page:82(item/title)
 msgid "<gui>Quit message</gui>"
 msgstr "<gui>Kilépési üzenet</gui>"
 
-#: C/account-irc.page:82(item/p)
+#: C/account-irc.page:83(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 "
@@ -316,16 +325,16 @@ msgstr ""
 "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/account-irc.page:94(info/title)
+#: C/account-irc.page:95(info/title)
 msgctxt "link"
 msgid "IRC Networks"
 msgstr "IRC-hálózatok"
 
-#: C/account-irc.page:97(section/title)
+#: C/account-irc.page:98(section/title)
 msgid "Networks"
 msgstr "Hálózatok"
 
-#: C/account-irc.page:99(section/p)
+#: C/account-irc.page:100(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 "
@@ -336,54 +345,62 @@ msgstr ""
 "listához. A hálózatokat módosíthatja is, és a listából is eltávolíthatja "
 "azokat."
 
-#: 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 ""
-"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/account-irc.page:108(media/span)
+msgid "Add"
+msgstr "Hozzáadás"
+
+#: C/account-irc.page:105(item/p)
+msgid "To add a network to the list, click <_:media-1/>."
+msgstr "Hálózat listához adásához nyomja meg a <_:media-1/> gombot."
+
+#: C/account-irc.page:112(media/span)
+msgid "Edit"
+msgstr "Szerkesztés"
 
-#: C/account-irc.page:107(item/p)
+#: C/account-irc.page:109(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>."
 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>."
+"To modify a network in the list, select the network and click <_:media-1/>."
 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."
+"A módosításhoz válassza ki a hálózatot, és nyomja meg a <_:media-1/> gombot."
+
+#: C/account-irc.page:116(media/span)
+msgid "Remove"
+msgstr "Eltávolítás"
 
-#: C/account-irc.page:110(item/p)
+#: C/account-irc.page:113(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>."
 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>."
+"To remove a network from the list, select the network and click <_:media-1/>."
 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 eltávolításhoz válassza ki a hálózatot, és nyomja meg az <_:media-1/> "
+"gombot."
 
-#: C/account-irc.page:115(section/p)
+#: C/account-irc.page:119(section/p)
 msgid ""
 "When adding or modifying a network, you can enter the following information:"
 msgstr ""
 "Hálózat hozzáadásakor vagy módosításakor a következő információkat adhatja "
 "meg:"
 
-#: C/account-irc.page:121(item/p)
+#: C/account-irc.page:125(item/p)
 msgid ""
 "This is the name of the network as you want it to appear in the list of "
 "networks."
 msgstr ""
 "Ez a hálózat neve, ahogyan a hálózatok listájában meg szeretné jeleníteni."
 
-#: C/account-irc.page:125(item/title)
+#: C/account-irc.page:129(item/title)
 msgid "<gui>Charset</gui>"
 msgstr "<gui>Karakterkészlet</gui>"
 
-#: C/account-irc.page:126(item/p)
+#: C/account-irc.page:130(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 "
@@ -396,7 +413,7 @@ msgstr ""
 "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/account-irc.page:135(item/p)
+#: C/account-irc.page:139(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 "
@@ -406,11 +423,11 @@ msgstr ""
 "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/account-irc.page:141(item/title)
+#: C/account-irc.page:145(item/title)
 msgid "<gui>Servers</gui>"
 msgstr "<gui>Kiszolgálók</gui>"
 
-#: C/account-irc.page:142(item/p)
+#: C/account-irc.page:146(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 "
@@ -423,7 +440,7 @@ msgstr ""
 "gui> gombbal vehet fel kiszolgálókat, és az <gui>Eltávolítás</gui> gombbal "
 "törölheti azokat."
 
-#: C/account-irc.page:147(item/p)
+#: C/account-irc.page:151(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 "
@@ -434,7 +451,7 @@ msgstr ""
 "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/account-irc.page:151(item/p)
+#: C/account-irc.page:155(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 "
@@ -558,15 +575,15 @@ msgstr ""
 "kiszolgálóbeállításokat megadnia. Ezeket a beállításokat a Jabber "
 "szolgáltatója biztosítja."
 
-#: C/accounts-window.page:11(info/desc)
+#: C/accounts-window.page:10(info/desc)
 msgid "Add, modify, and delete accounts."
 msgstr "Fiókok hozzáadása, módosítása és törlése."
 
-#: C/accounts-window.page:33(page/title)
+#: C/accounts-window.page:32(page/title)
 msgid "Accounts Window"
 msgstr "Fiókok ablak"
 
-#: C/accounts-window.page:35(page/p)
+#: C/accounts-window.page:34(page/p)
 msgid ""
 "The <gui>Accounts</gui> window allows you to add, modify, and delete "
 "accounts."
@@ -574,11 +591,11 @@ 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(section/title)
+#: C/accounts-window.page:42(section/title)
 msgid "Account Details"
 msgstr "Fiók részletei"
 
-#: C/accounts-window.page:44(section/p)
+#: C/accounts-window.page:43(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 "
@@ -675,8 +692,8 @@ msgstr "A partnerlista bővíté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/prob-conn-auth.page:18(credit/name)
+#: C/prob-conn-neterror.page:16(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"
@@ -732,75 +749,68 @@ msgstr ""
 "Új személy partnerlistára való felvételéhez csatlakoznia kell az internethez "
 "és fiókjához."
 
-#. 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/audio-call.page:9(info/desc)
+#: C/audio-call.page:10(info/desc)
 msgid "Call your contacts over the Internet."
 msgstr "Hívja fel partnereit az interneten."
 
-#: C/audio-call.page:27(page/title)
+#: C/audio-call.page:26(credit/name) C/create-account.page:24(credit/name)
+#: C/overview.page:17(credit/name) C/share-desktop.page:18(credit/name)
+#: C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
 msgid "Start an audio conversation"
 msgstr "Hanghívás kezdeményezése"
 
-#: C/audio-call.page:29(page/p)
+#: C/audio-call.page:37(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."
 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."
+"features only works with certain types of accounts and it requires the other "
+"person to have an application that supports audio calls."
 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."
 
-#: C/audio-call.page:34(item/p)
+#: C/audio-call.page:43(item/p)
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Audio Call</gui>."
 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="
+"Right-click on the contact that you want to call and select <gui style="
 "\"menuitem\">Audio 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"
-"\">Hanghívás</gui> lehetőséget."
+"Kattintson a jobb egérgombbal a felhívni kívánt partnerre, majd válassza a "
+"menüből a <gui style=\"menuitem\">Hanghívás</gui> menüpontot."
 
-#: C/audio-call.page:42(item/p) C/video-call.page:44(item/p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(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."
 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."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 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."
+"beszélgetés teljes ideje jelenik meg."
 
-#: 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>."
+#: C/audio-call.page:55(item/p)
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgid ""
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">Befejezés</"
-"gui> gombra."
+"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">feltartott "
+"kéz</gui> gombra."
 
-#: C/audio-call.page:55(note/p)
+#: C/audio-call.page:63(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>."
@@ -808,19 +818,19 @@ 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(section/title)
+#: C/audio-call.page:71(section/title)
 msgid "Start an audio conversation with a meta-contact"
 msgstr "Hanghívás indítása metapartnerrel"
 
-#: C/audio-call.page:66(item/p) C/send-message.page:53(item/p)
-#: C/video-call.page:64(item/p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/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/audio-call.page:71(item/p)
+#: C/audio-call.page:79(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Audio Call</gui>."
@@ -828,8 +838,8 @@ 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."
 
-#: C/audio-call.page:78(note/p) C/send-message.page:65(note/p)
-#: C/video-call.page:76(note/p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(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 "
@@ -845,13 +855,26 @@ msgstr ""
 #. 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'"
 msgctxt "_"
-msgid ""
-"external ref='figures/audio-input-microphone.png' "
-"md5='8d89026b66a263a3bc5b1f0665948567'"
-msgstr ""
-"external ref='figures/audio-input-microphone.png' "
-"md5='8d89026b66a263a3bc5b1f0665948567'"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+
+#. 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:70(media)
+#| msgctxt "_"
+#| msgid ""
+#| "external ref='figures/camera-web.png' "
+#| "md5='8166b4372f25b78cbf5a64fe2eac2ce5'"
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
+msgstr "external ref='figures/camera-web.png' md5='__failed__'"
 
 #: C/audio-video.page:8(info/desc)
 msgid ""
@@ -1007,11 +1030,11 @@ msgstr "Groupwise"
 msgid "ICQ"
 msgstr "ICQ"
 
-#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+#: C/audio-video.page:165(td/p) C/create-account.page:49(section/title)
 msgid "IRC"
 msgstr "IRC"
 
-#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+#: C/audio-video.page:170(td/p) C/create-account.page:79(section/title)
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -1027,7 +1050,7 @@ msgstr "MySpace"
 msgid "qq"
 msgstr "QQ"
 
-#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+#: C/audio-video.page:190(td/p) C/create-account.page:97(section/title)
 msgid "People Nearby"
 msgstr "Közeli emberek"
 
@@ -1039,7 +1062,7 @@ msgstr "Sametime"
 msgid "silc"
 msgstr "Silc"
 
-#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+#: C/audio-video.page:205(td/p) C/create-account.page:110(section/title)
 msgid "SIP"
 msgstr "SIP"
 
@@ -1099,62 +1122,112 @@ 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."
 
-#: 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/create-account.page:32(info/desc)
+#| msgid ""
+#| "Register for an account with one of the supported messaging services."
+msgid "Create an account for one of the supported messaging services."
+msgstr "Fiók létrehozása valamelyik támogatott üzenetküldő szolgáltatáshoz."
 
-#: C/create-account.page:34(page/title)
-msgid "Register for a new account"
+#: C/create-account.page:36(page/title)
+#| msgid "Register for a new account"
+msgid "Register a new account"
 msgstr "Új fiók regisztrálása"
 
-#: 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>."
+#: C/create-account.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>."
+msgid ""
+"Most account types require you to create an account with a service provider "
+"before you can use that account with instant messaging applications. You can "
+"use <app>Empathy</app> to register for a new account with some account "
+"providers using the same steps as you would to <link xref=\"add-account"
+"\">add an account</link>."
 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</"
+"azt a fiókot használhassa. 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/create-account.page:42(page/p)
+#: C/create-account.page:44(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>."
 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>."
+"Once you create a new account, your account provider should give you a login "
+"or a username and a password, as well as any additional information you need "
+"to connect using <app>Empathy</app>."
 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 "
+"Az új fiók létrehozása után 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/create-account.page:47(section/title)
+#: C/create-account.page:51(section/p)
+msgid ""
+"IRC networks require that you specify a nick (nickname) when you connect to "
+"the server. Some IRC networks use a service, such as NickServ, to allow "
+"users to <link xref=\"irc-nick-password\">protect their nick</link>. If you "
+"did not register your nick or are unable to do so and another user is using "
+"it, then you will need to choose a different one."
+msgstr ""
+"Az IRC hálózatok megkövetelik egy becenév megadását a kiszolgálóhoz való "
+"csatlakozáskor. Egyes IRC hálózatok rendelkeznek NickServ szolgáltatással, "
+"amely lehetővé teszi a <link xref=\"irc-nick-password\">becenevek védelmét<"
+"/link>. Ha nem regisztrálja becenevét, vagy nincs erre lehetősége és közben "
+"másik felhasználó vette használatba, akkor másikat kell választania."
+
+#: C/create-account.page:57(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 ""
+"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/create-account.page:62(note/p)
+msgid ""
+"Many GNOME projects use <code>irc.gnome.org</code> for project-related "
+"discussion."
+msgstr ""
+"Számos GNOME projekt az <code>irc.gnome.org</code> hálózatot használja a "
+"projekttel kapcsolatos beszélgetéshez."
+
+#: C/create-account.page:68(section/title)
 msgid "Facebook"
 msgstr "Facebook"
 
-#: C/create-account.page:48(section/p)
+#: C/create-account.page:70(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."
 msgid ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
+"Facebook is one of the more popular 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 "
+"A Facebook az egyik legnépszerűbb 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/create-account.page:52(section/p)
+#: C/create-account.page:73(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>."
 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."
+"new account from the website: <link href=\"https://www.facebook.com\">www."
 "facebook.com</link>."
 msgstr ""
-"A Facebook használatához a <link href=\"http://www.facebook.com\">www."
+"A Facebook használatához a <link href=\"https://www.facebook.com\">www."
 "facebook.com</link> weboldalon kell létrehoznia egy új fiókot."
 
-#: C/create-account.page:62(section/p)
+#: C/create-account.page:81(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, "
@@ -1164,43 +1237,62 @@ msgstr ""
 "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/create-account.page:66(section/p)
+#: C/create-account.page:85(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>."
 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>."
+"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>."
+"\">jabber.org</link>."
 
-#: C/create-account.page:71(note/p)
+#: C/create-account.page:90(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."
 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."
+"If you use Gmail or Google+ Hangouts, you already have a Jabber account. Use "
+"your Gmail address and password in <app>Empathy</app> to connect."
 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."
+"Ha a GMail vagy a Google+ Hangout szolgáltatást használja, akkor már van "
+"Jabber fiókja. Használja GMail címét és jelszavát az <app>Empathyban</app> a "
+"kapcsolódáshoz."
 
-#: 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."
+#: C/create-account.page:99(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."
+msgid ""
+"This service works whenever you are connected to a local network, such as a "
+"wireless hotspot, you do not need to create an account with service "
+"providor, just set up your account through <app>Empathy</app>. It "
+"automatically finds all other users on the network who are also using this "
+"service."
 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."
+"Ez a szolgáltatás mindig működik, amikor helyi hálózathoz, "
+"például vezeték nélküli hotspothoz kapcsolódik. Használatához nem kell fiókot "
+"regisztrálni egy szolgáltatónál, csak egy fiókot kell beállítani az <app>"
+"Empathyban</app>. Ezután automatikusan megtalálja a szolgáltatás többi "
+"felhasználóját az adott hálózaton."
 
-#: 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/create-account.page:105(section/p)
+#| msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgid ""
+"For more information, see the <link xref=\"salut-protocol\">salut protocol</"
+"link>."
+msgstr ""
+"További információkért lásd a <link xref=\"salut-protocol\">salut protokoll<"
+"/link> oldalt."
 
-#: C/create-account.page:91(section/p)
+#: C/create-account.page:112(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 "
@@ -1212,17 +1304,7 @@ msgstr ""
 "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/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 ""
-"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/create-account.page:102(section/p)
+#: C/create-account.page:117(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."
@@ -1230,66 +1312,42 @@ 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: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 ""
-"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/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 ""
-"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/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 ""
-"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/create-account.page:122(section/title)
+#: C/create-account.page:123(section/title)
 msgid "Proprietary Services"
 msgstr "Zárt szolgáltatások"
 
-#: C/create-account.page:124(section/p)
+#: C/create-account.page:125(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."
 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 to connect to an existing account for some of these services. To create "
+"a new account with one of these services, you will need to visit the website "
+"for the service."
 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."
+"fiókjával néhány ilyen szolgáltatáshoz. Új fiók létrehozásához fel kell "
+"keresnie a szolgáltató weboldalát."
 
-#: C/create-account.page:132(item/p)
+#: C/create-account.page:133(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)
+#: C/create-account.page:136(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)
+#: C/create-account.page:139(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)
+#: C/create-account.page:142(item/p)
 msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
@@ -2146,9 +2204,6 @@ msgid "Internet Relay Chat (IRC)"
 msgstr "Interneten továbbított csevegés (IRC)"
 
 #: C/irc-manage.page:47(when/p)
-#| msgid ""
-#| "<link action=\"install:telepathy-idle\" xref=\"index\" style=\"button"
-#| "\">Install telepathy-idle</link>"
 msgid ""
 "<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
 "idle</link>"
@@ -2371,19 +2426,27 @@ msgstr ""
 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/link-contacts.page:25(page/title)
-msgid "Combine and separate contacts"
-msgstr "Partnerek egyesítése és szétválasztása"
+#: C/link-contacts.page:19(credit/name)
+msgid "Shobha Tyagi"
+msgstr "Shobha Tyagi"
+
+#: C/link-contacts.page:29(page/title)
+#| msgid "Hide offline contacts"
+msgid "Link and unlink contacts"
+msgstr "Névjegyek összekapcsolása/szétválasztása"
 
-#: C/link-contacts.page:26(page/p)
+#: C/link-contacts.page:30(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."
 msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
+"If one or more of your contacts has multiple accounts with different "
+"messaging services, you can combine these accounts into a single contact."
 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."
+"ezeket egyesítheti egyetlen partnerbejegyzéssé."
 
-#: C/link-contacts.page:30(page/p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
 "The resulting contact is called a <em>meta-contact</em>: a contact composed "
 "from different single contacts."
@@ -2391,93 +2454,127 @@ msgstr ""
 "Az eredményül kapott partnert <em>metapartnernek</em> hívjuk: ez egy több "
 "önálló partnerbejegyzésből álló partner."
 
-#: C/link-contacts.page:34(page/p)
+#: C/link-contacts.page:38(page/p)
+#| msgid ""
+#| "If you have a Jane Smith contact that is using three different messaging "
+#| "services like:"
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"Suppose you have a contact called Jane Smith who is using three different "
+"messaging services like:"
 msgstr ""
-"Ha rendelkezik egy Kovács Erzsébet nevű partnerrel, aki három különböző "
+"Ha például 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(item/p)
+#: C/link-contacts.page:44(item/p)
 msgid "janes@facebook"
 msgstr "ekovacs@facebook"
 
-#: C/link-contacts.page:45(item/p)
+#: C/link-contacts.page:49(item/p)
 msgid "jane.smith@gmail"
 msgstr "erzsebet.kovacs@gmail"
 
-#: C/link-contacts.page:50(item/p)
+#: C/link-contacts.page:54(item/p)
 msgid "jane_smith@hotmail"
 msgstr "erzsebet_kovacs@hotmail"
 
-#: C/link-contacts.page:55(page/p)
+#: C/link-contacts.page:59(page/p)
 msgid "You can combine these contacts into a single Jane Smith one."
 msgstr ""
 "Ezeket a partnerbejegyzéseket egyetlen Kovács Erzsébet bejegyzéssé "
 "egyesítheti."
 
-#: C/link-contacts.page:60(section/title)
-msgid "Combining contacts"
-msgstr "Partnerek egyesítése"
+#: C/link-contacts.page:63(section/title)
+#| msgid "Combining contacts"
+msgid "Link contacts"
+msgstr "Partnerek összekapcsolása"
+
+#: C/link-contacts.page:64(section/p)
+msgid "The way you can link your contacts is as follows:"
+msgstr "Partnerek összekapcsolásához:"
 
-#: C/link-contacts.page:63(item/p)
+#: C/link-contacts.page:69(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>."
+"Press the tick button to select entries you want to link. This will enable "
+"<em>selection mode</em> and you can see a checkbox for each entry."
 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."
+"Nyomja meg a pipa gombot az összekapcsolni kívánt bejegyzések kijelöléséhez. "
+"Ez bekapcsolja a <em>kijelölési módot</em>, és minden bejegyzés mellett "
+"megjelenik egy jelölőnégyzet."
 
-#: C/link-contacts.page:70(item/p)
+#: C/link-contacts.page:75(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"Tick the checkboxes that correspond to the <app>Contacts</app> entries which "
+"belong to the same contact."
 msgstr ""
-"A <gui>Partnerek összekapcsolása</gui> ablak bal oldalán válassza ki az "
-"egyesíteni kívánt partnereket."
+"Jelölje be az azonos partnerhez tartozó <app>Névjegyek</app> alkalmazásbeli "
+"bejegyzéseket."
 
-#: C/link-contacts.page:76(item/p)
-msgid "Click <gui style=\"button\">Link</gui>."
+#: C/link-contacts.page:81(item/p)
+#| msgid "Click <gui style=\"button\">Link</gui>."
+msgid "Press <gui style=\"button\">Link</gui>."
 msgstr "Nyomja meg az <gui style=\"button\">Összekapcsolás</gui> gombot."
 
-#: C/link-contacts.page:82(note/p)
+#: C/link-contacts.page:86(section/p)
+msgid "Repeat steps 3 and 4 in order to link other contacts."
+msgstr "Ismételje a 3. és 4. lépéseket a további partnerek összekapcsolásához."
+
+#: C/link-contacts.page:92(section/title)
+#| msgid "Combining contacts"
+msgid "Unlink contacts"
+msgstr "Partnerek szétválasztása"
+
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Az összekapcsolt partnerek szétválasztása:"
+
+#: C/link-contacts.page:98(item/p)
+#| msgid "Select a status from the list."
+msgid "Select the contact from your list."
+msgstr "Válassza ki a partnert a partnerlistából."
+
+#: C/link-contacts.page:103(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."
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 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."
+"Kattintson a <gui style=\"button\">Szerkesztés</gui> gombra a "
+"<app>Névjegyek</app> jobb felső sarkában."
 
-#: C/link-contacts.page:91(section/title)
-msgid "Separating contacts"
-msgstr "Metapartnerek szétválasztása"
+#: C/link-contacts.page:108(item/p)
+#| msgid "Click <gui style=\"button\">Link</gui>."
+msgid "Press <gui style=\"button\">Linked Contacts</gui>."
+msgstr ""
+"Nyomja meg az <gui style=\"button\">Összekapcsolt névjegyek</gui> gombot."
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:113(item/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"Press <gui style=\"button\">Remove</gui> to unlink an entry from the linked "
+"contact."
 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."
+"Nyomja meg az <gui style=\"button\">Eltávolítás</gui> gombot a bejegyzés "
+"leválasztásához a névjegyről."
 
-#: 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/link-contacts.page:118(item/p)
+msgid ""
+"Press <gui style=\"button\">Close</gui> if you do not want to unlink any "
+"more contacts."
+msgstr ""
+"Nyomja meg a <gui style=\"button\">Bezárás</gui> gombot, amikor befejezte a "
+"partnerek szétválasztását."
+
+#: C/link-contacts.page:123(item/p)
+#| msgid "Click on <gui style=\"button\">Remove</gui>."
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
+msgstr ""
+"Végül nyomja meg a <gui style=\"button\">Kész</gui> gombot a szerkesztés "
+"befejezéséhez."
 
 #. 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/overview.page:37(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+#: C/overview.page:38(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/video_overview.png' "
@@ -2490,10 +2587,7 @@ msgstr ""
 #. 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/overview.page:38(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+#: C/overview.page:39(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/conf_overview.png' "
@@ -2506,11 +2600,7 @@ msgstr ""
 #. 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/overview.page:39(media)
-#| msgctxt "_"
-#| msgid ""
-#| "external ref='figures/gtk-remove.png' "
-#| "md5='215e3a325a3dd619874e35c30a018bb6'"
+#: C/overview.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/croom_overview.png' "
@@ -2519,23 +2609,19 @@ msgstr ""
 "external ref='figures/croom_overview.png' "
 "md5='e9619d2c8420bc48a880c03dbc1ae084'"
 
-#: C/overview.page:8(info/desc)
+#: C/overview.page:9(info/desc)
 msgid "What instant messaging is and how you can use it."
 msgstr "Mi az azonnali üzenetküldés, és hogyan használhatja."
 
-#: C/overview.page:12(credit/name)
+#: C/overview.page:13(credit/name)
 msgid "Aruna S"
 msgstr "Aruna S"
 
-#: C/overview.page:16(credit/name) C/share-desktop.page:18(credit/name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
-
-#: C/overview.page:24(page/title)
+#: C/overview.page:25(page/title)
 msgid "Overview of instant messaging"
 msgstr "Azonnali üzenetküldés áttekintése"
 
-#: C/overview.page:26(page/p)
+#: C/overview.page:27(page/p)
 msgid ""
 "Instant messaging, sometimes abbreviated to IM, is a text-based means to "
 "communicate instantly over the internet and the local network. While some IM "
@@ -2546,26 +2632,24 @@ msgid ""
 msgstr ""
 "Az azonnali üzenetküldés egy szövegalapú helyi hálózati és internetes "
 "kommunikációs módszer. Míg sok azonnali üzenő alkalmazás csak egy "
-"fióktípussal működik, addig mások, beleértve az <link xref=\"introduction\">"
-"Empathyt</link>, számos különböző szolgáltató <link xref=\"add-account\">"
-"fiókjainak</link> használatával biztosítanak azonnali üzenetküldést. Ezek "
+"fióktípussal működik, addig mások, beleértve az <link xref=\"introduction"
+"\">Empathyt</link>, számos különböző szolgáltató <link xref=\"add-account"
+"\">fiókjainak</link> használatával biztosítanak azonnali üzenetküldést. Ezek "
 "közül néhány hang- és videohívást is támogat."
 
-#: C/overview.page:42(td/p)
+#: C/overview.page:43(td/p)
 msgid "Video Conference"
 msgstr "Videokonferencia"
 
-#: C/overview.page:43(td/p)
-#| msgid "Group conversations"
+#: C/overview.page:44(td/p)
 msgid "Group chats"
 msgstr "Csoportos társalgások"
 
-#: C/overview.page:44(td/p)
-#| msgid "Favorite rooms"
+#: C/overview.page:45(td/p)
 msgid "Chat rooms"
 msgstr "Csevegőszobák"
 
-#: C/overview.page:48(page/p)
+#: C/overview.page:49(page/p)
 msgid ""
 "Some instant messaging applications can be used to connect to chat rooms, "
 "online places where like-minded people meet to talk. One popular means to "
@@ -2577,12 +2661,12 @@ msgid ""
 msgstr ""
 "Egyes azonnali üzenő alkalmazásokkal csevegőszobákhoz is lehet csatlakozni, "
 "amelyeket a hasonló gondolkodású emberek használnak beszélgetésre. Az egyik "
-"népszerű eszköz számos csevegőszobához csatlakozásra az <link "
-"xref=\"irc-manage\">IRC</link>. Az IRC <link xref=\"irc-join-room\">"
-"nyilvános</link> csevegőszobákat biztosít, amelyek bárki számára nyitottak, "
-"aki létrehoz egy fiókot az IRC kiszolgálón, valamint privát csevegőszobákat, "
-"amelyek <link xref=\"irc-join-pwd\">jelszóval védettek</link>, és csak a "
-"készítőjük által kiválasztott kevesek léphetnek be."
+"népszerű eszköz számos csevegőszobához csatlakozásra az <link xref=\"irc-"
+"manage\">IRC</link>. Az IRC <link xref=\"irc-join-room\">nyilvános</link> "
+"csevegőszobákat biztosít, amelyek bárki számára nyitottak, aki létrehoz egy "
+"fiókot az IRC kiszolgálón, valamint privát csevegőszobákat, amelyek <link "
+"xref=\"irc-join-pwd\">jelszóval védettek</link>, és csak a készítőjük által "
+"kiválasztott kevesek léphetnek be."
 
 #: C/prev-conv.page:8(info/desc)
 msgid "Browse or search your previous conversations."
@@ -2735,8 +2819,8 @@ msgstr ""
 "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/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
-#: C/prob-conn-neterror.page:53(item/p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:46(item/p)
+#: C/prob-conn-neterror.page:54(item/p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
 msgstr ""
@@ -2750,7 +2834,7 @@ 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/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:62(item/p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
 msgstr ""
@@ -2758,7 +2842,7 @@ msgstr ""
 "el azokat."
 
 #: C/prob-conn-acctdisabled.page:60(item/p)
-#: C/prob-conn-neterror.page:64(item/p)
+#: C/prob-conn-neterror.page:63(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 "
@@ -2771,18 +2855,18 @@ msgstr ""
 msgid "Check that the account is switched on."
 msgstr "Ellenőrizze, hogy a fiók be van-e kapcsolva."
 
-#: C/prob-conn-auth.page:8(info/desc)
+#: C/prob-conn-auth.page:9(info/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/prob-conn-auth.page:36(page/title)
+#: C/prob-conn-auth.page:37(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)
+#: C/prob-conn-auth.page:39(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 "
@@ -2792,7 +2876,7 @@ msgstr ""
 "engedélyezi a csatlakozást, mert valamiért nem ismeri fel az Ön "
 "felhasználónevét vagy jelszavát."
 
-#: C/prob-conn-auth.page:50(item/p)
+#: C/prob-conn-auth.page:51(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 "
@@ -2802,16 +2886,17 @@ msgstr ""
 "amelyhez csatlakozni próbál. Ha nincs fiókja, a legtöbb szolgáltatás nem "
 "engedélyezi a csatlakozást."
 
-#: 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 ""
-"Kattintson a hibaüzenetben a <media type=\"image\" mime=\"image/png\" src="
-"\"figures/gtk-edit.png\">Szerkesztés</media> ikonra."
+#: C/prob-conn-auth.page:58(media/span) C/prob-conn-name.page:44(media/span)
+#: C/prob-conn-neterror.page:59(media/span)
+msgid "edit"
+msgstr "szerkesztés"
+
+#: C/prob-conn-auth.page:58(item/p) C/prob-conn-name.page:44(item/p)
+#: C/prob-conn-neterror.page:59(item/p)
+msgid "Click the <_:media-1/> icon in the error message."
+msgstr "Kattintson a hibaüzenetben a <_:media-1/> ikonra."
 
-#: C/prob-conn-auth.page:68(item/p)
+#: C/prob-conn-auth.page:67(item/p)
 msgid ""
 "Deselect the <gui>Enabled</gui>, and then select it again to try to "
 "reconnect to the service."
@@ -2819,22 +2904,22 @@ 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."
 
-#: C/prob-conn-name.page:9(info/title)
+#: C/prob-conn-name.page:10(info/title)
 msgctxt "link:error-msg"
 msgid "“Name in use�"
 msgstr "„A név használatban�"
 
-#: C/prob-conn-name.page:10(info/desc)
+#: C/prob-conn-name.page:11(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/prob-conn-name.page:33(page/title)
+#: C/prob-conn-name.page:34(page/title)
 msgid "I get a message that says “Name in use�"
 msgstr "Az „A név használatban� üzenetet kapom"
 
-#: C/prob-conn-name.page:35(page/p)
+#: C/prob-conn-name.page:36(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 "
@@ -2843,11 +2928,11 @@ 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/prob-conn-name.page:51(item/p)
+#: C/prob-conn-name.page:50(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/prob-conn-name.page:56(item/p)
+#: C/prob-conn-name.page:55(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-"
@@ -2857,7 +2942,7 @@ msgstr ""
 "jelszót az adott becenévhez. További információkért lásd a <link xref=\"irc-"
 "nick-password\"/> részt."
 
-#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+#: C/prob-conn-name.page:64(item/p) C/prob-conn-neterror.page:78(item/p)
 msgid ""
 "Switch the account off, and then switch it on to try to reconnect to the "
 "service."
@@ -2865,17 +2950,17 @@ msgstr ""
 "Kapcsolja ki, majd újra be a fiókot a szolgáltatáshoz való ismételt "
 "csatlakozás megpróbálásához."
 
-#: C/prob-conn-neterror.page:7(info/desc)
+#: C/prob-conn-neterror.page:8(info/desc)
 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."
 
-#: C/prob-conn-neterror.page:34(page/title)
+#: C/prob-conn-neterror.page:35(page/title)
 msgid "I get a message that says “Network error�"
 msgstr "A „Hálózati hiba� üzenetet kapom"
 
-#: C/prob-conn-neterror.page:42(page/p)
+#: C/prob-conn-neterror.page:43(page/p)
 msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
@@ -2883,7 +2968,7 @@ 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/prob-conn-neterror.page:46(page/p)
+#: C/prob-conn-neterror.page:47(page/p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
@@ -2891,11 +2976,11 @@ 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."
 
-#: C/prob-conn-neterror.page:87(section/title)
+#: C/prob-conn-neterror.page:86(section/title)
 msgid "Proxy support"
 msgstr "Proxytámogatás"
 
-#: C/prob-conn-neterror.page:88(section/p)
+#: C/prob-conn-neterror.page:87(section/p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
 msgstr ""
@@ -3333,7 +3418,7 @@ msgstr ""
 #. 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)
+#: C/status-icons.page:40(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
@@ -3344,7 +3429,7 @@ msgstr ""
 #. 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)
+#: C/status-icons.page:46(media)
 msgctxt "_"
 msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
 msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
@@ -3353,7 +3438,7 @@ msgstr "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
 #. 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)
+#: C/status-icons.page:54(media)
 msgctxt "_"
 msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
 msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
@@ -3367,30 +3452,30 @@ msgstr "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
 #. 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)
+#: C/status-icons.page:63(media) C/status-icons.page:70(media)
 msgctxt "_"
 msgid ""
 "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 msgstr ""
 "external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
 
-#: C/status-icons.page:7(info/desc)
+#: C/status-icons.page:8(info/desc)
 msgid "Understanding the various statuses and status icons."
 msgstr "A különböző állapotok és állapotikonok ismertetése."
 
-#: C/status-icons.page:35(page/title)
+#: C/status-icons.page:36(page/title)
 msgid "Status Types and Icons"
 msgstr "�llapottípusok és ikonok"
 
-#: 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"
-"\">Elérhető ikon</media> <gui>Elérhető</gui>"
+#: C/status-icons.page:40(media/span)
+msgid "Available icon"
+msgstr "Elérhető ikon"
 
-#: C/status-icons.page:41(item/p)
+#: C/status-icons.page:40(item/title)
+msgid "<_:media-1/> <gui>Available</gui>"
+msgstr "<_:media-1/> <gui>Elérhető</gui>"
+
+#: C/status-icons.page:42(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."
@@ -3398,15 +3483,15 @@ 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(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\">Elfoglalt "
-"ikon</media> <gui>Elfoglalt</gui>"
+#: C/status-icons.page:46(media/span)
+msgid "Busy icon"
+msgstr "Elfoglalt ikon"
+
+#: C/status-icons.page:46(item/title)
+msgid "<_:media-1/> <gui>Busy</gui>"
+msgstr "<_:media-1/> <gui>Elfoglalt</gui>"
 
-#: C/status-icons.page:47(item/p)
+#: C/status-icons.page:48(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 "
@@ -3420,15 +3505,15 @@ msgstr ""
 "<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(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\">Távol "
-"ikon</media> <gui>Távol</gui>"
+#: C/status-icons.page:54(media/span)
+msgid "Away icon"
+msgstr "Távol ikon"
 
-#: C/status-icons.page:55(item/p)
+#: C/status-icons.page:54(item/title)
+msgid "<_:media-1/> <gui>Away</gui>"
+msgstr "<_:media-1/> <gui>Távol</gui>"
+
+#: C/status-icons.page:56(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 "
@@ -3442,15 +3527,15 @@ msgstr ""
 "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(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"
-"\">Láthatatlan ikon</media> <gui>Láthatatlan</gui>"
+#: C/status-icons.page:63(media/span) C/status-icons.page:70(media/span)
+msgid "Offline icon"
+msgstr "Kilépett ikon"
 
-#: C/status-icons.page:64(item/p)
+#: C/status-icons.page:63(item/title)
+msgid "<_:media-1/> <gui>Invisible</gui>"
+msgstr "<_:media-1/> <gui>Láthatatlan</gui>"
+
+#: C/status-icons.page:65(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 "
@@ -3460,30 +3545,26 @@ msgstr ""
 "kilépettként jelenik meg. Fiókjaihoz ekkor is csatlakozni fog, láthatja "
 "partnerei állapotát, és társalgásokat indíthat velük."
 
-#: 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"
-"\">Kilépett ikon</media> <gui>Kilépett</gui>"
+#: C/status-icons.page:70(item/title)
+msgid "<_:media-1/> <gui>Offline</gui>"
+msgstr "<_:media-1/> <gui>Kilépett</gui>"
 
-#: C/status-icons.page:71(item/p)
+#: C/status-icons.page:72(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/video-call.page:10(info/desc)
+#: C/video-call.page:11(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)
+#: C/video-call.page:37(page/title)
 msgid "Start a video conversation"
 msgstr "Videobeszélgetés kezdése"
 
-#: C/video-call.page:31(page/p)
+#: C/video-call.page:39(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 "
@@ -3495,19 +3576,29 @@ msgstr ""
 "fióktípusokkal működik, és a másik félnek is rendelkeznie kell a videohívást "
 "támogató alkalmazással."
 
-#: C/video-call.page:38(item/p)
+#: C/video-call.page:46(item/p)
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Video Call</gui>."
 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="
+"Right-click on the contact that you want to call and select <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."
+"Kattintson a jobb egérgombbal arra a partnerre, akit fel szeretne hívni, és "
+"válassza a "
+"<gui style=\"menuitem\">Videohívás</gui> lehetőséget."
+
+#: C/video-call.page:54(item/p)
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
+msgid ""
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr ""
+"A beszélgetés befejezéséhez kattintson a <gui style=\"button\">lerakás</"
+"gui> gombra."
 
-#: C/video-call.page:55(note/p)
+#: C/video-call.page:60(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>."
@@ -3516,11 +3607,11 @@ msgstr ""
 "style=\"menu\">Videó</gui><gui style=\"menuitem\">Videó ki</gui></guiseq> "
 "menüpontot."
 
-#: C/video-call.page:61(section/title)
+#: C/video-call.page:65(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)
+#: C/video-call.page:73(item/p)
 msgid ""
 "Select the contact you want to have the conversation, and from the menu "
 "select <gui style=\"menuitem\">Video Call</gui>."
@@ -3528,33 +3619,179 @@ 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."
 
+#~ msgctxt "link"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Empathy üzenetküldő"
+
+#~ msgctxt "text"
+#~ msgid "Empathy Internet Messenger"
+#~ msgstr "Empathy üzenetküldő"
+
+#~ 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 üzenetküldő logója </media> Empathy üzenetküldő"
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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>."
+
+#~ 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 ""
+#~ "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."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Combine and separate contacts"
+#~ msgstr "Partnerek egyesítése és szétválasztása"
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid ""
+#~ "From the left pane in the <gui>Link Contacts</gui> window, select the "
+#~ "contacts you want to combine."
+#~ msgstr ""
+#~ "A <gui>Partnerek összekapcsolása</gui> ablak bal oldalán válassza ki az "
+#~ "egyesíteni kívánt partnereket."
+
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Separating contacts"
+#~ msgstr "Metapartnerek szétválasztása"
+
+#~ 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."
+
+#~ msgid "Click <gui style=\"button\">Unlink</gui>."
+#~ msgstr "Nyomja meg a <gui style=\"button\">Szétválasztás</gui> gombot."
+
+#~ msgid ""
+#~ "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."
+
+#~ 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"
+#~ "\">Elérhető ikon</media> <gui>Elérhető</gui>"
+
+#~ 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"
+#~ "\">Elfoglalt ikon</media> <gui>Elfoglalt</gui>"
+
+#~ 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\">Távol "
+#~ "ikon</media> <gui>Távol</gui>"
+
+#~ 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>"
+
+#~ 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"
+#~ "\">Kilépett ikon</media> <gui>Kilépett</gui>"
+
+#~ 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."
+
 #~ 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"
 
@@ -3596,9 +3833,6 @@ msgstr ""
 #~ 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"
 
diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index c70bd5cd2..de41b6a30 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -5,1716 +5,1714 @@
 # Tao Wang <dancefire@gmail.com>, 2010
 # lainme <lainme993@gmail.com>, 2011
 # Guanhao Yin <yinguanhao@gmail.com>, 2011
+# tuhaihe <wangdianjin@linuxdeepin.com>, 2012
+# Wylmer Wang <wantinghard@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"POT-Creation-Date: 2011-12-11 14:58+0000\n"
-"PO-Revision-Date: 2011-12-09 21:36+0800\n"
-"Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
+"POT-Creation-Date: 2013-04-15 22:03+0000\n"
+"PO-Revision-Date: 2012-02-14 13:34+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh-CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\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
+#, fuzzy
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
 msgstr ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+"Lavande  <lavande@thislove.cz.cc>, 2010\n"
+"Tao Wang <dancefire@gmail.com>, 2010\n"
+"lainme <lainme993@gmail.com>, 2011\n"
+"Guanhao Yin <yinguanhao@gmail.com>, 2011\n"
+"tuhaihe <wangdianjin@linuxdeepin.com>, 2012"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "�您的�系人进行视频�天。"
+#: C/index.page:8(info/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络�天工具"
+
+#: C/index.page:9(info/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络�天工具"
 
-#: 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:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(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:25(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:24(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:31(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:28(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/overview.page:20(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:34(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 "开始视频�天"
+#: C/index.page:30(media/span)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgid "Empathy Internet Messenger logo"
+msgstr "Empathy 网络�天工具"
 
-#: 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 ""
-"如果您有网络摄�头，您�以呼�您的�系人并和他们进行视频�天。此功能仅特定类"
-"型的账户�用，并需�对方使用的程�支�视频呼�。"
+#: C/index.page:28(page/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "Empathy 网络�天工具"
 
-#: 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 ""
-"在<gui>�系人列表</gui>窗�，点击您想呼�的�系人的�字�的<media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼�</media>"
-"图标并选择<gui style=\"menuitem\">视频呼�</gui>。"
+#: C/index.page:36(section/title)
+msgid "Account Management"
+msgstr "��管�"
 
-#: 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 ""
-"一个新窗�会被打开。连接建立�，您将在窗�底部看到<gui>已连接</gui>，以�总会"
-"�时间。"
+#: C/index.page:40(section/title)
+msgid "Contact Management"
+msgstr "�系人管�"
 
-#: 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 "点击<gui style=\"button\">挂断</gui>以结�会�。"
+#: C/index.page:44(section/title)
+msgid "Text Conversations"
+msgstr "文字�天"
 
-#: 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 ""
-"�将视频会�转为语音会�，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
-"style=\"menuitem\">视频关闭</gui></guiseq>。"
+#: C/index.page:48(section/title)
+msgid "Audio and Video Conversations"
+msgstr "语音和视频�天"
 
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "和一�元�系人进行视频�天。"
+#: C/index.page:52(section/title)
+msgid "Advanced Actions"
+msgstr "高级�作"
 
-#: 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 "在<gui>�系人列表</gui>窗�，�键点击该元�系人。"
+#: C/index.page:56(section/title) C/irc-manage.page:64(section/title)
+msgid "Common Problems"
+msgstr "常�问题"
 
-#: 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)
+#, fuzzy
+#| msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgctxt "_"
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
-msgstr ""
-"选择��天的�系人，然�在��中选择<gui style=\"menuitem\">视频呼�</gui>"
+"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 
-#: 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.
+#.
+#. 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)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgctxt "_"
+msgid ""
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+msgstr "@@image: '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)
+#, fuzzy
+#| 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 ""
-"�识别一个�系人是�是<em>元�系人</em>，将您的鼠标移动到<gui>�系人列表</"
-"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/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"
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "�解��状�和状�图标。"
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "连接 IRC 网络需�的�外信�。"
 
-#: 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 ��详情"
 
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "状�的类别�其图标"
+#: 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 ��需�与其他类型的����的信�。�创建 IRC ��，您至少需�指定一个 "
+"IRC 网络和一个昵称。本页详细介�了您�以为一个 IRC ���供的信�。"
 
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "在线图标"
+#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"�在 <app>Empathy</app> 中使用 IRC，您必须安装 <sys>telepathy-idle</sys> 包。"
 
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "在线"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr ""
 
-#: 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 ""
-"当您在电脑�并且有空和您的�系人�天时，使用<em>在线</em>状�。您�以为此状�"
-"自定一�消�。"
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "忙碌图标"
+"IRC 是一�开放的系统，它�许人们�行�自的 IRC 网络。�个网络是独立的，有特有"
+"的用户和�天室。<app>Empathy</app> 在 <gui>网络</gui> 下拉列表中列出了一些最"
+"�行的网络。您�以添加其他的网络。�看下�的<link xref=\"#networks\"/>。"
 
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "忙碌"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr ""
 
-#: 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 ""
-"使用<em>忙碌</em>以让您的�系人知�您当��想�天。他们�然�以�系您，比如他"
-"们�能有急事需�讨论。默认地，当您忙碌时，<app>Empathy</app> �会使用气泡�示"
-"和声音�示。您�以为此状�自定一�消�。"
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "离开图标"
+"您的昵称是您在 IRC 网络上的唯一性的�字。�有一个人�以使用�个特定的昵称。如"
+"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信�，您需�改"
+"�您的昵称。"
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "离开"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr ""
 
-#: 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 ""
-"当您�在电脑�时，使用<em>离开</em>状�。如果您一段时间内�使用电脑，或者�幕"
-"�护打开了，<app>Empathy</app> 将自动设置您的状�为离开。默认地，当您离开时，"
-"<app>Empathy</app> �会使用气泡�示和声音�示。您�以为此状�自定一�消�。"
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "离线图标"
+"一些�务器，尤其是那些�有网络，需�密��能连接。如果您被授�使用，网络的管"
+"�员应当为您�供了密�。"
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "�身"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "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 ""
-"当您将状�设置为<em>�身</em>时，您的�系人会看到您已离线。但您�然连接�您的"
-"账户，并且�以看到您的�系人的状�，或者和他们�天。"
+"在�些网络上，昵称�以通过一��� NickServ 的�务被注册。<app>Empathy</app> "
+"并�直接支�昵称密�。在�些网络上，包括�行的 freenode 网络，�务器密�会被"
+"自动转�给 NickServ，从而�许您设置此项� NickServ �明您自己。更多信���"
+"<link xref=\"irc-nick-password\"/>。"
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "离线"
+#: C/account-irc.page:76(item/title)
+#, fuzzy
+#| msgid "Real name"
+msgid "<gui>Real name</gui>"
+msgstr "真实姓�"
 
-#: 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."
-msgstr "将状�设置为<em>离线</em>将会断开您所有账户的连接。"
+"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 ""
+"除了昵称，您还�以�供您的真实姓�。其他用户查看您的信�时�以看到您的真实姓"
+"�。"
 
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "�您的�系人展示您的桌�。"
+#: C/account-irc.page:81(item/title)
+#, fuzzy
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "选择<gui>编辑自定义消�</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 ""
+"当您离线时，一个退出消�会被��给所有您加入的�天室和正在与您进行�人�天的"
+"用户。设置此项以�供自定义的退出消�。"
 
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+#: C/account-irc.page:94(info/title)
+#, fuzzy
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "IRC 网络"
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "共享您的桌�"
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "网络"
 
-#: 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 ""
-"您�以和�系人共享桌�。使用这个功能，您�以��系人展示您的桌�，�寻求帮助"
-"或帮助�系人解决问题。"
+"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网"
+"络，您�以将其添加到这个列表中。您也�以修改网络或从列表中删除网络。"
 
-#: 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 ""
-"�共享您的桌�，您的系统中必须安装支�此功能的 VNC �务器。<app>Vino</app>，"
-"GNOME 的 VNC �务器，就有这项功能。"
-
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr "在<gui>�系人列表</gui>窗�，执行下列�作之一："
+"�想列表中添加网络，点击<media type=\"image\" mime=\"image/png\" src="
+"\"figures/gtk-add.png\" width=\"16\" height=\"16\">添加</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 ""
-"选择您想�共享您的桌�的�系人，并选择 <guiseq><gui>编辑</gui><gui>�系人</"
-"gui><gui>共享我的桌�</gui></guiseq>。"
+"�修改列表中的网络，选择那个网络并点击<media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</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 ""
-"�键点击您想�共享您桌�的�系人的�字，然�选择<gui>共享我的桌�</gui>。"
+"�从列表中删除网络，选择�删除的网络并点击<media type=\"image\" mime=\"image/"
+"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">删除</"
+"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."
-msgstr ""
-"您选择的�系人会收到一个查看您桌�的邀请。�查看您的桌�，他们需�接�邀请。"
+"When adding or modifying a network, you can enter the following information:"
+msgstr "在添加或修改一个网络时，您�以输入下列信�："
 
-#: 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."
-msgstr "在您的桌�共享程�中，您�以断开您的�系人到您的计算机的连接。"
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "这是您希望网络显示在网络列表中的�字。"
 
-#: C/share-desktop.page:82(p)
+#: C/account-irc.page:125(item/title)
+#, fuzzy
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>�系人列表</gui>窗�"
+
+#: C/account-irc.page:126(item/p)
 msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr "如果需�更多关于如何使用远程桌�查共享程�的信�，请�看其帮助。"
+"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 ""
+"这指明了网络上常用的字符编�。字符编�是计算机内部记录字符的一�特定方�。有"
+"许多��的字符编�，您需�与其他用户使用�样的字符编��能正确地看到他们的信"
+"�。"
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:135(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"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 ""
-"当您与其他人共享您的桌�的时候，�能会出现系统性能�低和网络速度下�的现象。"
+"默认地，<app>Empathy</app> 使用 UTF-8，一�能够处�世界上大多数语言的现代化的"
+"字符编�。简体中文常用的编�还有 GB18030，GBK 和 GB2312。"
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr ""
+
+#: C/account-irc.page:142(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."
+"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 ""
-"并�您的所有�系人都�以使用这个功能。他们必须使用 2.28 或更新版本的 "
-"<app>Empathy</app> 并且在安装了兼容的远程桌�查看器程�。"
+"一个 IRC 网络�能有许多�务器供您连接。当您连接到一个特定网络的�务器�，您�"
+"以和�一网络中所有�务器的用户交�。您�以为一个网络添加或删除�务器，使用"
+"<gui>添加</gui>或<gui>删除</gui>按钮。"
 
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "为您的状�添加�编辑或删除个人消�。"
+#: 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 ""
+"当一个�务器被选择�，点击<gui>�务器</gui>或<gui>端�</gui>下方的字段�编辑"
+"它。或者，使用左�方�键��焦�个字段，并按空格键开始编辑。"
 
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+#: 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 ""
+"选择 <gui>SSL</gui> 列中的�选框以加密与�务器间的所有通讯。注�这并�能�味"
+"�其他用户�能看到您在公共�天室中的�言。"
 
-#: 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 "Jabber 和 Google Talk ��的高级选项。"
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "设置一个自定义消�"
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Jabber ��详情"
 
-#: 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 ""
-"有时您也许想�为您的状�设置一个自定义消�，例如，让别人知�您�能在一段时间"
-"内�在。"
+"大多 Jabber ���需�登录 ID 和密�就�以连接。但对于�些��或�些网络，您"
+"�能需�在<gui>高级</gui>选项�中输入一些�外的信�。通常，您�需�使用下�的"
+"这些高级选项。添加��的一般指导��<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."
-msgstr "�以根���的状��设置自定义消�。"
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr "Google Talk 是一� Jabber ��。这些指�对 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 "在<gui>�系人列表</gui>窗�，点击顶部的下拉列表。"
+#: C/account-jabber.page:45(item/title)
+#, fuzzy
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "需�加密(TLS/SSL)"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-jabber.page:46(item/title)
+#, fuzzy
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "忽略 SSL �书错误"
+
+#: 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 ""
-"选择您希望添加自定义消�的状�。您必须选择有<gui>自定义消�</gui>标签标记的状"
-"�。"
+"��有�能，<app>Empathy</app> 与 Jabber �务器之间的通讯就会被加密。如果��"
+"能加密，消�就�能被明文��。选择<gui>需�加密</gui>以阻止�能加密时 "
+"<app>Empathy</app> 与 Jabber �务器进行明文通讯。"
 
-#: 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 ""
-"在窗�顶部的文本框中输入您的自定义消�，然�按<key>Enter</key>�设定这个消"
-"�。"
+"有些 Jabber �务器�能使用��法的�书加密数�，或者使用�自未知的�书认�机"
+"构的�书。如果您信任您的�务器，您�以选择<gui>忽略 SSL �书错误</gui>以�许"
+"使用��法的�书进行加密通讯。"
 
-#: 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:59(item/title)
+msgid "<gui>Resource</gui>"
 msgstr ""
-"如果您希望收�一个自定义消�，�将它�存下�方便日�使用，请点击您撰写自定义"
-"消�的文本框�侧的�星星。"
 
-#: 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."
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
 msgstr ""
-"如果您�这么�，那么下次您使用 <app>Empathy</app> 的时候，这个自定义消�就�"
-"会�出现。它�在 <app>Empathy</app> 本次�行期间被�留。"
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "编辑�删除和添加自定义消�"
+#: 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 ""
+"如果您有多个应用程�(比如，在�一�计算机上)�时连接了您的��，您�以设置“资"
+"��以唯一地标识�一个连接的程�。默认地，<app>Empathy</app> 会使用 "
+"<input>Telepathy</input> 作为“资��。"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "选择<gui>编辑自定义消�</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 ""
+"您�以设置优先级以指定哪一个程�优先收到您的�系人���的消�。新的消�会被"
+"��给优先级最高的程�。"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "�编辑自定义消�："
+#: C/account-jabber.page:70(item/title)
+#, fuzzy
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "覆盖�务器设置"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
-msgstr "在<gui>已�存的自定义状�</gui>中，选择您想�编辑的状�消�并�击它。"
+"<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> 会根�您的登录 ID 以默认的设置连接 Jabber �务器。对�些 "
+"Jabber �务器，您需�人工输入一些�务器设置。这些设置应该由您的 Jabber �务�"
+"供商�供。"
 
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr "输入新的自定义消�并且按<key>Enter</key>�修改它。"
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "添加�修改和删除��。"
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "�删除自定义消�："
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "��窗�"
 
-#: C/set-custom-status.page:118(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
-msgstr "在<gui>已�存的自定义状�</gui>中，选择�删除的状�消�。"
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "点击<gui>删除</gui>按钮。"
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr "<gui>��</gui>窗��许您添加�修改和删除��。"
 
-#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr "�添加一�新的自定义消�，在<gui>添加新自定义状�</gui>选项�："
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "��详细信�"
 
-#: C/set-custom-status.page:136(p)
+#: C/accounts-window.page:44(section/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
-msgstr "点击下拉列表选择您想�设定自定义消�的状�。"
-
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "点击文本框，输入新的自定义消�。"
+"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 ""
+"对于大多数的��，您�需�输入登录 ID 和密�。但有些��或有些类型的���能"
+"需��外的信�。"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "点击<gui>添加</gui>将新消�添加到已�存的的自定义消�列表中。"
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "� <app>Empathy</app> 添加新��。"
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "完��，点击<gui>关闭</gui>。"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "添加一个新��"
 
-#: C/set-custom-status.page:163(p)
+#: 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 ""
-"当你编辑或添加新自定义消�的时候，它�会被设为当�状�消�。您需�在<gui>�系"
-"人列表</gui>窗�中选中它。"
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "��消�给一个您的�系人。"
-
-#: 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"
+"您�以添加任何支�的�务的�时消���，以在 <app>Empathy</app> 中与您的�系"
+"人交�。对于�些���供商，这些步骤也�许您注册新��。更多细节��<link "
+"xref=\"create-account\"/>。"
 
-#: 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: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)
+#, fuzzy
+#| 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>�系人列表</gui>窗�中，选择<guiseq><gui>编辑</gui><gui>��</gui></"
+"guiseq>，或按<key>F4</key>。"
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "��人��消�"
+# 这个在显示时，也是一个“+“，建议�留
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "点击<gui style=\"button\">+</gui>。"
 
-#: C/send-message.page:36(p)
+#: C/add-account.page:58(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 "在<gui>�系人列表</gui>窗�中，�击�与之�天的�系人的�字。"
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr "在<gui>�议</gui>下拉列表，选择您�创建的��类型。"
 
-#: C/send-message.page:42(p)
+#: C/add-account.page:62(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."
+"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 ""
-"一个新窗�会被打开。在窗�底部的文本框中输入一�消�，然�按<key>Enter</key>"
-"��。"
-
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "�一�元�系人��消�"
+"如果您还没有注册��，选择<gui>在�务器上创建新的��</gui>。这个功能并�是对"
+"于�一���都�用，也�能对于�些���供商��用。更多信���<link xref="
+"\"create-account\"/>。"
 
-#: C/send-message.page:58(p)
+#: C/add-account.page:69(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</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 ""
-"选择您想�与之�天的�系人，并在��中选择 <gui style=\"menuitem\">�天</"
-"gui>。"
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "从您的计算机��文件给您的�系人。"
-
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "��文件"
-
-#: 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 "在<gui>�系人列表</gui>窗�，执行下列�作之一："
+"输入必�的信�。对于大多数��，您�需�输入登录 ID 和密�。有些���能需�"
+"更多信�。��<link xref=\"accounts-window#details\"/>获�更多信�。"
 
-#: 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 "�键点击��其��文件的�系人，然�选择<gui>��文件</gui>。"
+#: 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 "点击<gui style=\"button\">应用</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 ""
-"点击��其��文件的�系人，然�选择<guiseq><gui>编辑</gui><gui>�系人</"
-"gui><gui>��文件</gui></guiseq>。"
+"�改���在<gui>��</gui>窗�中的作为标识的�字，在左侧的列表中选择��，然"
+"�点击�字或者按空格键。编辑��的�字，完��按<key>Enter</key>。"
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "选择���的文件，并点击<gui>��</gui>。"
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "添加�人到�系人列表。"
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "<gui>文件传输</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)
-msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
-msgstr "请等待您的�系人接�文件传输，或点击<gui>�止</gui>�终止传输。"
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "添加�人到您的�系人列表"
 
-#: C/send-file.page:72(p)
-msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
-msgstr "传输结�之�，就�以关闭<gui>文件传输</gui>窗�了。"
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "选择<guiseq><gui>�天</gui><gui>添加�系人</gui></guiseq>。"
 
-#: C/send-file.page:80(p)
+#: C/add-contact.page:40(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."
+"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>清除</gui>�以清空列表。这�会将"
-"列表清空，而�会从您的计算机上删除这些文件。"
+"在 <gui>��</gui> 下拉列表中，选择您用�与您的�系人�系的��。您的�系人需"
+"�使用与您选择的��相�的�务。"
 
-#: C/send-file.page:87(p)
+#: C/add-contact.page:45(item/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>."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"�有使用下列�务�能��文件：<em>Jabber</em>�<em>Google Talk</em>和<em>附近"
-"的人</em>。"
+"在 <gui>标识符</gui> 一�中，输入这��务中您的�系人的登录 ID，用户�，显示"
+"�或其他�适的标识符。"
 
-#: C/send-file.page:93(p)
+#: C/add-contact.page:49(item/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 "��别人��文件，您需�连接到互�网，或本地局域网。"
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr "在 <gui>别�</gui> 中，输入您希望这个�系人显示在�系人列表中的�字。"
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "�解附近的人(People Nearby)功能"
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr "点击<gui>添加</gui>将此人添加到您的�系人列表。"
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "什么是“附近的人�？"
+#: 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 "�添加�系人到您的�系人列表，您需�连接因特网和您的��。"
+
+#: C/audio-call.page:10(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "通过互�网呼�您的�系人。"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "我希望看到更多的人�用这个。"
+#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name)
+#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
+msgid "Start an audio conversation"
+msgstr "开始语音�天"
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-call.page:37(page/p)
+#, fuzzy
+#| 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."
 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 ""
-"附近的人(People Nearby)�务是一个无�务器的通讯�务：您�需�连接并认�到一个"
-"中央�务器�使用这个功能。"
+"您�以呼�您的�系人，与他们进行语音�天。这个功能仅对于一些特定类型的���"
+"用，并且需��一个人使用的应用程�也支�语音呼�。"
 
-#: C/salut-protocol.page:45(p)
+#: C/audio-call.page:43(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Audio Call</gui>."
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
-msgstr "这类无�务器的通讯系统�局�于本地局域网，并且�需�互�网链接。"
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Audio Call</gui>."
+msgstr ""
+"选择您想�交谈的�系人，然�在��中选择<gui style=\"menuitem\">语音呼�</"
+"gui>。"
 
-#: C/salut-protocol.page:49(p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p)
+#, fuzzy
+#| 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."
 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 the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"会自动的�现在�一个局域网中使用这个�务的人，并且�以给他们��消�甚至文"
-"件，想其它�务一样。"
+"一个新窗�会被打开。连接建立�，您将在窗�底部看到<gui>已连接</gui>，以�总会"
+"�时间。"
 
-#: C/salut-protocol.page:54(p)
+#: C/audio-call.page:55(item/p)
+#, fuzzy
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
-msgstr "所有现代的本地局域网都应该�以支�这类�务。"
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
+msgstr "点击<gui style=\"button\">挂断</gui>以结�会�。"
 
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "从 <app>Empathy</app> 中完全地删除一个账户。"
+#: C/audio-call.page:63(note/p)
+#, fuzzy
+#| 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 ""
+"�将语音会�转为视频会�，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">视频开�</gui></guiseq>。"
 
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "删除账户"
+#: C/audio-call.page:71(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "�一�元�系人�起语音会�"
 
-#: C/remove-account.page:35(p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(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."
-msgstr ""
-"如果你�想�使用�个账户，您�以从 <app>Empathy</app> 中完全地删除这个账户。"
-"如果您将��希望在 <app>Empathy</app> 中使用这个账户了，您�以�添加这个账"
-"户。"
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "在<gui>�系人列表</gui>窗�，�键点击该元�系人。"
 
-#: 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-call.page:79(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 ""
-"在<gui>�系人列表</gui>窗�中，选择<guiseq><gui>编辑</gui><gui>账户</gui></"
-"guiseq>，或按<key>F4</key>。"
+"选择您想�交谈的�系人，然�在��中选择<gui style=\"menuitem\">语音呼�</"
+"gui>。"
 
-#: C/remove-account.page:46(p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(note/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
-msgstr "在窗�左侧的账户列表中选择您想�删除的账户。"
+"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 ""
+"�识别一个�系人是�是<em>元�系人</em>，将您的鼠标移动到<gui>�系人列表</"
+"gui>窗�中的一个�系人上，并�留几秒钟：一个�弹出消�会显示这个元�系人是由"
+"几个�系人组�的。"
 
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "点击<gui style=\"button\">删除</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/audio-video.page:58(media)
+msgctxt "_"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr ""
 
-#: C/remove-account.page:53(p)
-msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+#. 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:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
 msgstr ""
-"一个弹出对�框会�求您确认删除。点击<gui>删除</gui>按钮�永久的删除这个账户。"
 
-#: C/remove-account.page:59(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."
-msgstr "�使删除了账户，<app>Empathy</app> 也�会删除这个账户的�天记录。"
-
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
-msgstr "诊断连接到一个�时消��务的常�问题。"
-
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "连接到�时消��务时的问题"
+"Information on when it is possible to have an audio or video conversation."
+msgstr "语音或视频会�的�件。"
 
-#. 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 "语音和视频支�"
 
-#: 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 "主窗�中显示了一个错误�示信�，“<gui>网络错误</gui>�。"
+"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 ""
+"您的�系人也在使用支�语音和视频会�的程�时，您��以和他们进行语音�视频会"
+"�。如果您的�系人�以进行语音或视频会�，您将在�系人列表中他们的姓��看到"
+"下列图标："
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error�"
-msgstr "我收到“网络错误�的错误�示信�"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "图标"
 
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "�述"
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/audio-video.page:57(td/p)
+#, fuzzy
+#| 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 ""
+"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "�系人�以进行语音�天。"
+
+#: C/audio-video.page:69(td/p)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"这�错误在 <app>Empathy</app> 由于��原因而无法和�时通讯�务器连上时出现。"
+"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/prob-conn-neterror.page:45(p)
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "�系人�以进行视频�天。"
+
+#: C/audio-video.page:83(note/p)
 msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
-msgstr "此外，这�错误也在您试图�设置昵称而使用 IRC 账户时出现。"
+"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 ""
+"�进行语音�天，您需�有一�声�，且您的�作系统必需支�它，还需�一个能正常"
+"工作的麦克风。"
 
-#: 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:87(note/p)
 msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
-msgstr "确�您已�连接到互�网，或者一个本地网络。"
+"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 "�进行视频�天，您需��作系统支�的摄�头，��以正常工作的麦克风。"
 
-#: 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:95(section/title)
+msgid "Supported Account Types"
+msgstr "支�的��类型"
+
+#: 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 ""
-"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
-"gtk-edit.png\">编辑</media>图标。"
+"�有一些特定类型的��支�语音或视频�天。下表列出了��类型的��的语音�视"
+"频支�情况。"
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(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 ""
-"检查<gui>高级</gui>选项�中的所有细节是�正确。您应当�以从�时通讯�务商的网"
-"站上找到这些信�。"
+"��类型是由�件�供的。您的系统上�一定有以下列出的全部类型，也�能有一些类"
+"型没有在下�列出。�件的�级�能使下表中�支�语音或视频的��类型获得支�。"
 
-#: 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 "�消选择<gui>已�用</gui>，然��次选中以�新连接到�务器。"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "�务"
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "代�支�"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+msgstr "语音"
 
-#: C/prob-conn-neterror.page:91(p)
-msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr "目� <app>Empathy</app> 无法在代�下工作。"
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "视频"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use�"
-msgstr "“用户�已�被�用�"
+#: 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 "主窗�中显示了一个错误�示信�，“<gui>用户�已被�用</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 "�"
 
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use�"
-msgstr "我收到“用户�已�被�用�的错误�示信�"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook �天"
 
-#: 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 ""
-"这�错误出现在您�试连接到 IRC 账户，然而您使用的昵称正在被该网络上其他人使用"
-"的情况下。"
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: 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 ""
-"如果您在所用的网路中注册了这个昵称，请为该昵称设置密�。更多信���<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 "是"
 
-#: 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 ""
-"�消选择账户�边的<gui>已�用</gui>�选框，然��次选中以�新连接到�务器。"
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-auth.page:8(desc)
-msgid ""
-"An error message which says “<gui>Authentication failed</gui>� appears in "
-"the main window."
-msgstr "主窗�中显示了一个错误�示信�，“<gui>验�失败</gui>�。"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed�"
-msgstr "我收到“验�失败�的错误�示信�"
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: 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 ""
-"这�错误�生在您的�时通信�务器无法确认您的身份，��许您连接时。比如，因为"
-"��原因，它无法识别您的用户�或者密�。"
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: 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 ""
-"确�您已�在�连接的�务上注册了账户。如果没有账户，多数�务都�会�许您连"
-"接。"
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: 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 "�次输入您的用户�和密�，以确�它们是正确的。"
+#: 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 "您�连接的�时通信账户没有在账户列表中�用。"
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "我的账户没有�用"
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "附近的人"
 
-#: 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 ""
-"如果当您�试开始一个新会�或者加入房间时，�使用的�时�天账户没有在下拉的账"
-"户列表中�用，您的账户信��能�正确。"
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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 ""
-"选择<guiseq><gui>编辑</gui><gui>账户</gui></guiseq>，�选择�工作的账户。"
+#: C/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: 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 ""
-"检查<gui style=\"checkbox\">已�用</gui>选框是�勾选。没有的勾选它已�用账"
-"户。"
+#: 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 "�览或�索您之�的会�。"
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "查看之�的会�"
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: 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."
-msgstr ""
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "改�您的状�以�您的�系人表明您是�闲暇。"
 
-#: C/prev-conv.page:46(p)
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "改�您的状�"
+
+#: 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> 自动�存您和�系人的所有文字会�。您�以<link xref="
-"\"#search\">�索之�全部的会�</link>或者根��系人和日期<link xref=\"#browse"
-"\">�览之�的会�</link>。"
+"您�以改�您的状�，从而��系人表明您现在是�闲暇。<app>Empathy</app> �许您"
+"从一些定义好的状�中选择一个。"
 
-#: 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."
-msgstr "您�需�连接到网络�查看和�索您之�的会�。"
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "点击 <gui>�系人列表</gui> 窗�顶部的下拉列表。"
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "�索之�的会�"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "从列表中选择一个状�。"
 
-#: C/prev-conv.page:63(p)
+#: C/change-status.page:57(page/p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr "您�以在之�的所有会�中进行全文�索。"
+"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 ""
+"内置状��其�义��<link xref=\"status-icons\"/>。您也�以<link xref=\"set-"
+"custom-message\">添加自定义消�</link>��您的�系人�供更多有关您当�状�的"
+"信�。"
 
-#: 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 ""
-"从<gui>�系人列表</gui>窗�，选择<guiseq><gui>查看</gui><gui>以�的会�</"
-"gui></guiseq>。或者�以按<key>F3</key>键。"
+"如果您一段时间�使用计算机，或�幕�护开始�行，您的状�会自动�为“离开�。"
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "选择<gui>�索</gui>标签。"
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "为��支�的�务注册��。"
 
-#: 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 ""
-"在<gui>关键�</gui>中，输入您想��索的文字。点击<gui>查找</gui>或按"
-"<key>Enter</key>。"
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "注册一个新��"
 
-#: 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."
-msgstr "符��索�件的会�会显示在下�的列表中。会�默认按日期排�。"
+"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 ""
+"大多��类型需�您在使用 <app>Empathy</app> 这样的�时通讯软件连接之�先建立"
+"��。但对于�些���供商，您�以使用 <app>Empathy</app> �注册新��，使用"
+"与 <link xref=\"add-account\">添加��</link> 相�的步骤。"
 
-#: 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 ""
-"点击一个会�以查看。<app>Empathy</app> 会选择这个会�中符�您�索�件的文字。"
+"这一页是关于建立��类型的��的。您应当已�从您的���供商那里得到了登录 "
+"ID 和密�，以�其他使用 <app>Empathy</app> 连接这个��需�的信�。"
 
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "�览之�的会�"
+#: 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."
-msgstr "您�以按时间顺��览之�和�系人或在�天室中的会�。"
-
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "选择<gui>会�</gui>标签。"
+"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 是最常用的社交网络之一。它�许用户对自己进行个性化的�述并与朋�们交"
+"�。"
 
-#: 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 ""
-"在左上的下拉列表中选择一个账户。下方会显示这个账户的�系人和�天室列表。"
+"�使用 Facebook 与您的朋�们交�，您需�在其网站上建立一个新��：<link href="
+"\"http://www.facebook.com\">www.facebook.com</link>。"
 
-#: 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."
-msgstr "选择一个�系人或�天室以查看之�的会�。默认显示的是最近的会�。"
+"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 是一�开放的�时通讯系统。� email 一样，Jabber �许您选择���供商，"
+"并与其他 Jabber 用户交�，无论他们使用哪里���供商。"
 
-#: 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 ""
-"您�以按日期�览您的会�。如果在�日您所选择的账户有过会�，该日会以粗体显"
-"示。点击一个日期以选择它。点击月和年�的箭头以�览更早的日期。"
+"您需�在�个 Jabber �务�供商那里建立��。有许多 Jabber �务�供商，<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 ""
-"您�以在上方的�索�中输入文字，以在显示的会�中�索文字。匹�的文字会被高亮"
-"显示。"
+"如果您使用 Google Mail 或者 Google Talk，那么您已�拥有 Jabber ��了。"
+"Google Talk 就是一个 Jabber �务。您�需�使用您的 Google Mail 地�和密�在 "
+"<app>Empathy</app> 中连接。"
 
-#: 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 ""
-"在 <gui>�系人列表</gui> 窗�中，您�以快速的查看与�个�系人之�进行过的会"
-"�。�键点击该�系人并选择 <gui>查看以�的对�</gui>。<gui>最近会�</gui>窗�"
-"会打开，且该�系人会被选中。"
-
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr "将��的�系人�并分割为一个�系人。"
+"�使用这个�务，您并�需�在�个�务�供商那里创建��，�需�连接到一个本地"
+"网络，比如一个无线热点。它会自动�现网络中使用这个�务的其他用户。"
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "�并和分割�系人"
+#: C/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "更多信���<link xref=\"salut-protocol\"/>。"
 
-#: 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."
-msgstr "如果您的�系人有多个�天�务的多个账户，您�以将他们�并�一个�系人。"
+"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 是一��许用户通过互�网进行语音和视频会�的开放系统。您需�在�个 SIP �"
+"务�供商处创建��。您�以和其他的 SIP 用户交�，无论他们的 SIP �务�供商与"
+"您是�相�。"
 
-#: 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."
-msgstr "产生的�系人称为一个<em>元�系人</em>：由多个���系人组�的�系人。"
+"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 ""
+"由于技术上的差别，�费的 <link href=\"https://www.ekiga.net/index.php?"
+"page=register\">Ekiga.net</link> �务目�在 <app>Empathy</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:"
-msgstr "如果您有一个�� Jane Smith 的�系人，她使用三���的�天�务："
-
-#: 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 "您�以将这些�系人�并�一个 Jane Smith."
+"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 ""
+"有些 SIP �务�供商�许用您的计算机呼�一般的电�。通常，您需�订阅��付费�"
+"务�能使用这个功能。"
 
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "�并�系人"
+#: 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 ""
+"您�需�注册��就�以使用 IRC。尽管您在 <app>Empathy</app> 中添加 IRC ��时"
+"指定了一个昵称，这个昵称�是您�次连接时�建立。如果有其他用户在使用这个昵"
+"称，您需�选择一个其他昵称。"
 
-#: 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 ""
-"在 <gui>�系人列表</gui> 窗�，�键点击有��账户的�系人，并选择 <gui style="
-"\"menuitem\">绑定�系人…</gui>"
+"有些 IRC 网络上有一��� NickServ 的�务，�许用户�护他们的昵称。更多信��"
+"�<link xref=\"irc-nick-password\"/>。"
 
-#: 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."
-msgstr "在 <gui>绑定�系人</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 ""
+"有些 IRC �务器是被密��护的。您需�知�密��能连接到这些�务器。通常，这样"
+"的�务器是�有的。"
 
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "点击 <gui style=\"button\">绑定</gui>."
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "专有的�务"
 
-#: 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 ""
-"当一个元�系人被创建�，您�击该�系人时默认使用的�系人是有最高的在线状�的"
-"�系人。"
+"许多��的公�或组织开�了一些专�的�时消��务。<app>Empathy</app> �许您连"
+"接大多常��务的既存��。�为这样的�务创建��，您需�访问其网站并��其使"
+"用�款。"
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "分割�系人"
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
+msgstr ""
 
-#: 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/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 msgstr ""
-"在 <gui>�系人列表</gui> 窗�中，�键点击�分割的�系人，并选择 <gui style="
-"\"menuitem\">绑定�系人…</gui>"
 
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "点击 <gui style=\"button\">解除绑定</gui>。"
+#: C/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr ""
 
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "法律信�。"
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr ""
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "许�"
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "使 <app>Empathy</app> ��自动登录一个��。"
+
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "�用一个��"
 
-#: 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 ""
-"本作�在 CreativeCommons Attribution-Share Alike 3.0 Unported license下�布。"
+"您�以�用一个��以阻止 <app>Empathy</app> 自动登录这个��而�必将其彻底删"
+"除。您�能想��用��用�个��如果您�想�尔登录这个��，但�想使用 "
+"<app>Empathy</app> 中的其他��。"
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "您�以自由："
+#: 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 "在窗�左侧的��列表中，选择您想��用的��。"
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "分享"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "在窗�的�侧关闭它。"
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "�制�分�或者传播作�。"
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "��新�用这个��，则开�它。"
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "�创作"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "设立，加入或管��天室收�。"
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "修改作�。"
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "�天室收�"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "需�守一下�件："
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "收�一个�天室"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "署�"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "加入一个�天室。"
 
-#: 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)."
-msgstr ""
-"您必须按照作者或许�人指定的方�对作�署�(但�能以任何方�暗示他们认�您或者"
-"您对作�的使用)。"
-
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "相�方�共享"
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
+msgstr "关于如何加入 IRC �天室，�� <link xref=\"irc-join-room\"/>。"
 
-#: 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 ""
-"如果您改��转�本作�或者以本作�为基础进行�创作，您应以相��相似或者兼容"
-"的�议�布修改�的作�。"
+"关于如何�起或加入群组�天，�� <link xref=\"group-conversations\"/>。"
 
-#: 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 ""
-"许�的全文�� <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
-"legalcode\">CreativeCommons 网站</link>，或者阅读完整的<link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/\">通俗�议</link>。"
+"在会�窗�，选择 <guiseq><gui>会�</gui><gui>收��天室</gui></guiseq>。"
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "�一� IRC �系人�起会�。"
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "加入收�的�天室"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "与 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 "在<gui>�系人列表</gui>窗�，执行下列�作之一："
 
-#: 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 ""
-"您�以在公共的 IRC �天室之外与其他的 IRC 用户进行�人�天。�与�一� IRC 用"
-"户进行会�："
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "按 <key>F5</key> 键。"
 
-#: 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 ""
-"在一个 IRC �天室的�系人列表中，�击您想��天的用户。或者，�键点击用户的姓"
-"�并选择 <gui>�天</gui>"
+"选择 <guiseq><gui>�天室</gui><gui>加入已收�的�天室</gui></guiseq>，以加入"
+"您之�收�的�天室。"
 
-#: 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 ""
-"IRC �天室的�系人列表与 <app>Empathy</app> 的�系人列表��。它包�了您加入"
-"的这个 IRC �天室中的用户列表。��的�天室�能有��的�系人列表。"
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "选择 <gui>�天室</gui>，并选择您�加入的已收�的�天室。"
 
-#: 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 ""
-"IRC �天室的�系人列表通常�于窗��侧。如果您没有看到它，选择 <guiseq><gui>"
-"对�</gui><gui>显示�系人列表</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> 目��支� IRC 传文件。"
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "通过 IRC 传�文件"
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "目�无法用 IRC 传�文件。"
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "�护您的昵称，以防其他 IRC 用户使用。"
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr "�加入一个已收�的�天室，您必须连接互�网和您的��。"
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "在 IRC 中使用昵称和密�"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "管��天室收�"
 
-#: 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 ""
-"在�些 IRC 网络上，您�以通过 NickServ �务注册您的昵称。通过� NickServ ��"
-"特殊的消�，您�以设置密��认�您自己。一些 IRC �天室�能��许您加入，除�"
-"您有注册过的昵称。"
+"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>�天室</gui><gui>管�收�夹"
+"</gui></guiseq>。"
 
-#: 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."
-msgstr ""
-"<app>Empathy</app> 目�还�支�昵称注册。但一些 IRC 网络会自动� NickServ �"
-"�一个 <em>�务器密�</em>。在这样的网络上，您�以在 <app>Empathy</app> 中使"
-"用这样的密�� NickServ 认�您自己。�行的 freenode 网络就有这个功能。"
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "设置一个 IRC 密�："
-
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "在左侧的对�框中选择一个 IRC 账户"
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr "在 <gui>��</gui> 下拉列表中，选择您�管��天室收�的��。"
 
-#: C/irc-nick-password.page:57(p)
-msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
-msgstr "在 <gui>密�</gui> 一�中，输入您注册您的昵称时使用的密�。"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "选择 <gui>全部</gui> 以看到�有您收�的�天室。"
 
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "点击<gui style=\"button\">应用</gui>。"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "选择您�管�的收�："
 
-#: 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>."
-msgstr ""
-"这些说明�是�许您在特定的 IRC 网络上使用密��护的昵称。目�在 "
-"<app>Empathy</app> 中还�能注册 IRC 昵称或修改密�。"
-
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
-
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "互�网中继�天(IRC)"
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
+msgstr "选择 <gui>自动连接</gui>，则您连接到您的���，会自动加入这个�天室。"
 
-#: 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 ""
-"�在 <app>Empathy</app> 中使用 IRC，您必须安装 <sys>telepathy-idle</sys> 包。"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "点击 <gui>删除</gui> 以从收�夹中删除这个�天室。"
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "安装 telepathy-idle"
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "完��，点击 <gui>关闭</gui>。"
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "IRC �天室和会�"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "使用和了解 <app>Empathy</app> 中的地��置。"
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "�天室和会�"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "地��置"
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "常� IRC 问题"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "地��置"
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "常�问题"
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "修�常�问题"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "加入一个 IRC 频�。"
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> 没有�布我的地��置。"
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "加入一个 IRC �天室"
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "地��置没有被公布。"
 
-#: 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 ""
-"您�以加入您已�连接的所有 IRC 网络上的 IRC �天室(也称为 IRC 频�)。�连接一"
-"个 IRC 网络，�� <link xref=\"add-account\"/> and <link xref=\"account-irc"
-"\"/>。"
+"如果您的�系人�能看到您的�置，�能是因为 <app>Empathy</app> 无法�现有一定"
+"精度的您的地��置信�。"
 
-#: 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 ""
-"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>�天室</gui><gui>加入</"
-"gui></guiseq>。"
+"在这�情况下，您的�置信��会被公布，但您��以看到您的�系人的�置信�。"
 
-#: 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."
-msgstr "在 <gui>账户</gui> 下拉列表中，选择与您想�使用的网络对应的 IRC 账户。"
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr "如果您想�公布您的地��置，您�以试一试使用 GPS 等外部设备。"
 
-#: 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 ""
-"在 <gui>�天室</gui> 文本框中，输入您想�加入的频�的�称。IRC 频��称以井�"
-"(<sys>#</sys>)开头。"
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "点击<gui>加入</gui>�进入房间。"
+"��布您的地��置，您的 Jabber �务器必须支� Personal Eventing Protocal "
+"(PEP)。互�网上有人维护�一份<link href=\"http://coccinella.im/servers/"
+"servers_by_pubsub_pep.html\">支� PEP 的�务器列表</link>。Google Talk 目��"
+"支� PEP。"
 
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr "�加入多个房间，您需�对�个房间��上�的步骤。"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "��了什么信�，��给�了？"
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "进入有密��护的 IRC �天室。"
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "地��置��"
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "加入一个��护的 IRC �天室"
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "什么信�被��了"
 
-#: 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:"
+"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 ""
-"在�些 IRC 网络上，�人的 IRC 房间�以被密��护。如果您知�这密�，按照下�"
-"的步骤加入："
-
-#: 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\">加入房间</link>。"
+"有�能被��的信�：您所在的国家，地区，地方，区域，街�，建筑，楼层，房间，"
+"邮政编���纬度，您的速度和方�。"
 
-#: 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>."
-msgstr ""
-"Empathy 会�示您输入密�。输入这个 IRC �天室的密�并点击 <gui style=\"button"
-"\">加入</gui>。"
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "支�的 IRC 命令。"
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "支�的 IRC 命令"
+"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 "您的地��置信�的精度和质��决于软件或者用于�现您的�置的设施。"
 
-#: 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 ""
-"�查看支�的 IRC 命令的列表，在一个�天室中输入<input>/help</input>并按"
-"<key>Enter</key>。"
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "所有�用命令都有一个简�的用法�述。"
+"��的网络�能有��的精度设置，�能����的信�。使用外部设备，如 GPS 或手"
+"机，�以增加��的信�的精度。"
 
-#. 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"
+"当��模�被�用�，�有您所在的城市信�会被��，�使您正在使用外部设备。"
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "介� <app>Empathy</app> �时�天工具。"
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "�会看到这些��出去的信�"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "介�"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "�有您的�系人�以看到您的地��置。"
+
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "什么是��模�"
 
-#: 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> 是 GNOME 桌�的�时通讯程�。它支�文字消�，语音和视频呼"
-"�，文件传输，支�最常用的�时通讯系统，包括 MSN 和 Google Talk."
+"��模�是精度�低模�，它会�低��给您的�系人的地��置信�的精度。��模"
+"�默认开�。"
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "��概述"
 
-#: 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."
-msgstr ""
-"<app>Empathy</app> �以帮助您在工作中更好的�作，也�以帮助您与您的朋�们��"
-"�系。"
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr "<app>Empathy</app> 中一些关于地��置��的选项的概况。"
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "地��置默认�开�。"
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "��模�默认被激活"
+
+#: 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."
-msgstr ""
-"使用 <app>Empathy</app>，您�以将所有的会�组织在�一个窗�中，或者为��类型"
-"的会�使用��的窗�，还�以很容易地�索之�的会�，或者共享您的桌�，�需�"
-"两次点击。"
+"Privacy mode prevails even when using external and more precise devices."
+msgstr "�使在使用精度更高的外部设备，��模�也会�挥作用。"
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "<gui>�系人列表</gui>窗�"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "�有您的�系人�以看到您的�置。"
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "<app>Empathy</app> 主窗�"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "支�地��置的�务和�其兼容性。"
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "<app>Empathy</app> 主窗�。"
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+msgstr "支�的设备"
 
-#. 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 网络�天工具"
+"目�，�有 Jabber �务与地��置功能兼容。�使用地��置，您和您的�系人必须"
+"有 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\"> "
-"Empathy 网络�天工具标识</media> Empathy 网络�天工具"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "账户管�"
+"而且，您使用的�务器也需�支�地��置功能。大多 Jabber �务器都支�。�了解"
+"更多，请�看您的�务�供者的网站文档。"
 
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "�系人管�"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "兼容性"
 
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "文字�天"
+#: 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> 的地��置功能与其他一些地��置信��务并�兼容，如 "
+"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> 和 <em>Brightkite</em>。"
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "语音和视频�天"
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "在 <app>Empathy</app> 中如何激活和�用地��置。"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "高级�作"
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "激活/�用地��置"
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "从其他�时�天程�中导入账户。"
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
 
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "选择<gui>�置</gui>标签。"
 
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+#: C/geolocation-turn.page:47(item/p)
+msgid ""
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr "选择 <gui>�我的�系人公布�置信�</gui> 以激活地��置。"
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "导入已存在的账户"
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "��用地��置，请�消选择。"
 
-#: 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>."
-msgstr ""
-"<app>Empathy</app> 第一次�行时，会�示您�以从其他�时通讯程�中导入账户。目"
-"�，支�的程��有 <app>Pidgin</app>。"
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
+msgstr "��高您的�置的精度，请�消选择 <gui>�低�置信�精度</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 ""
-"第一次�行 <app>Empathy</app>，一个助�程�会�供若干选项以创建新账户。"
+"如果您有 GPS 这样的外部设备，或者想���更加精确的�置信�，在<gui>�置��"
+"</gui>选项�中选择适当的选项。"
 
-#: C/import-account.page:54(p)
-msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
-msgstr "选择 <gui>有，请导入我的账户信�</gui> 并点击 <gui>�进</gui>。"
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "了解地��置。"
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "选择�个您想�导入的账户�的�选框。"
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "什么是地��置"
 
-#: 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."
-msgstr "目�，您�能在第一次�行时的助�程�中导入账户。"
-
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr "在 <gui>�系人列表</gui> 中��离线�系人。"
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
+msgstr "地��置�许您确定连接到网络的一�电脑或设备在地�上的真实�置。"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "��离线的�系人"
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "通过 <app>Empathy</app> 中的地��置，您�以："
 
-#: 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 ""
-"一般情况下，<app>Empathy</app> 会显示您所有的�系人：您�以与之进行会�的在线"
-"的�系人，和那些离线的�系人。"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "公布您的地��置给�系人。"
 
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "���离线的�系人："
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "查看�系人的地��置并快速�系他们。"
 
-#: 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>."
-msgstr ""
-"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>查看</gui><gui>离线�系人</"
-"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。"
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr "设置您的地��置的精度��以用��现您的地��置的设备。"
 
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
-msgstr "��次显示离线的�系人，��上�的步骤。"
+#: 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 "您的�系人必须使用支�地��置的程�，您�能看到他们的地��置。"
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "开始和您的�系人进行群组�天，或加入群组�天。"
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "群组�天"
 
-#: 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 "在群组�天中，您�以和�止一��系人�时进行文字交谈。"
 
-#: 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 ""
-"�进行群组�天您需�注册有 Jabber 账户或者 Google Talk 账户，或者“附近的人�账"
+"�进行群组�天您需�注册有 Jabber ��或者 Google Talk ��，或者“附近的人�账"
 "户。"
 
-#: 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 "您�能和那些与您使用�样的�务的�系人进行群组�天。"
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "开始群组�天"
 
-#: 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 ""
+"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>�天室</gui><gui>加入</"
+"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 "在 <gui>账户</gui> 下拉列表中，选择一个账户用�进行群组�天。"
+msgstr "在 <gui>��</gui> 下拉列表中，选择一个��用�进行群组�天。"
 
-#: 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 "在 <gui>�务器</gui> 文本框中，输入将会承载这次�天的�务器�称。"
 
-#: 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 "如果�使用当��务器，请将其留空。"
 
-#: 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 "在 <gui>�天室</gui> 文本框中，输入您为这次群组�天起的�字。"
 
-#: 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 "
@@ -1723,7 +1721,7 @@ msgstr ""
 "这将是您进行群组�天的�天室的�字。这个�字会被大家看到以使大家�以加入。您"
 "�能建立一个�人的�天室。"
 
-#: 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 "
@@ -1732,11 +1730,11 @@ msgstr ""
 "�邀请其他�系人加入这次群组�天，在 <gui>�系人列表</gui> 窗�，选择您想�邀"
 "请的�系人，并进行下列�作中的�一项："
 
-#: 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 "�键点击�系人，并选择 <gui>邀请到�天室</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>."
@@ -1744,25 +1742,25 @@ msgstr ""
 "选择 <guiseq><gui>编辑</gui><gui>�系人</gui><gui>邀请到�天室</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 "如果您打开了�止一个群组�天，选择您想�邀请�系人加入的那个。"
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "加入群组�天。"
 
-#: 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 "展开<gui>�天室列表</gui>选项��查看所有存在的房间。"
 
-#: 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 "�击房间的�称加入。"
 
-#: 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 "
@@ -1771,1347 +1769,1760 @@ msgstr ""
 "并�所有的�天室都�以加入。有些�天室�能需�密�，有些�有收到邀请�能加"
 "入。<app>Empathy</app> �支�这些房间。"
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "了解地��置。"
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "在 <gui>�系人列表</gui> 中��离线�系人。"
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "什么是地��置"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "��离线的�系人"
 
-#: 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."
-msgstr "地��置�许您确定连接到网络的一�电脑或设备在地�上的真实�置。"
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "通过 <app>Empathy</app> 中的地��置，您�以："
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "公布您的地��置给�系人。"
-
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr "查看�系人的地��置并快速�系他们。"
+"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 ""
+"一般情况下，<app>Empathy</app> 会显示您所有的�系人：您�以与之进行会�的在线"
+"的�系人，和那些离线的�系人。"
 
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
-msgstr "设置您的地��置的精度��以用��现您的地��置的设备。"
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "���离线的�系人："
 
-#: C/geolocation-what-is.page:60(p)
+#: C/hide-contacts.page:31(item/p)
+#, fuzzy
+#| 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 ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
-msgstr "您的�系人必须使用支�地��置的程�，您�能看到他们的地��置。"
+"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 ""
+"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>查看</gui><gui>离线�系人</"
+"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。"
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "在 <app>Empathy</app> 中如何激活和�用地��置。"
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "��次显示离线的�系人，��上�的步骤。"
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "激活/�用地��置"
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "从其他�时�天程�中导入��。"
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "选择<gui>�置</gui>标签。"
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "导入已存在的��"
 
-#: C/geolocation-turn.page:47(p)
+#: C/import-account.page:44(page/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
-msgstr "选择 <gui>�我的�系人公布�置信�</gui> 以激活地��置。"
+"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 ""
+"<app>Empathy</app> 第一次�行时，会�示您�以从其他�时通讯程�中导入��。目"
+"�，支�的程��有 <app>Pidgin</app>。"
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "��用地��置，请�消选择。"
+#: 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 ""
+"第一次�行 <app>Empathy</app>，一个助�程�会�供若干选项以创建新��。"
 
-#: C/geolocation-turn.page:55(p)
+#: C/import-account.page:54(item/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
-msgstr "��高您的�置的精度，请�消选择 <gui>�低�置信�精度</gui>。"
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr "选择 <gui>有，请导入我的��信�</gui> 并点击 <gui>�进</gui>。"
+
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "选择�个您想�导入的���的�选框。"
 
-#: C/geolocation-turn.page:61(p)
+#: C/import-account.page:66(note/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."
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
+msgstr "目�，您�能在第一次�行时的助�程�中导入��。"
+
+#. 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)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/empathy-main-window.png'; "
+#| "md5=54908dcb2588beddb15ef0968d2c2582"
+msgctxt "_"
+msgid ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 msgstr ""
-"如果您有 GPS 这样的外部设备，或者想���更加精确的�置信�，在<gui>�置��"
-"</gui>选项�中选择适当的选项。"
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "支�地��置的�务和�其兼容性。"
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "介� <app>Empathy</app> �时�天工具。"
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "支�的设备"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "介�"
 
-#: 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 ""
-"目�，�有 Jabber �务与地��置功能兼容。�使用地��置，您和您的�系人必须"
-"有 Jabber 账户。"
+"<app>Empathy</app> 是 GNOME 桌�的�时通讯程�。它支�文字消�，语音和视频呼"
+"�，文件传输，支�最常用的�时通讯系统，包括 MSN 和 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 ""
-"而且，您使用的�务器也需�支�地��置功能。大多 Jabber �务器都支�。�了解"
-"更多，请�看您的�务�供者的网站文档。"
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "兼容性"
+"<app>Empathy</app> �以帮助您在工作中更好的�作，也�以帮助您与您的朋�们��"
+"�系。"
 
-#: 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 ""
-"<app>Empathy</app> 的地��置功能与其他一些地��置信��务并�兼容，如 "
-"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> 和 <em>Brightkite</em>。"
+"使用 <app>Empathy</app>，您�以将所有的会�组织在�一个窗�中，或者为��类型"
+"的会�使用��的窗�，还�以很容易地�索之�的会�，或者共享您的桌�，�需�"
+"两次点击。"
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "��了什么信�，��给�了？"
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>�系人列表</gui>窗�"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "地��置��"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app> 主窗�"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "什么信�被��了"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app> 主窗�。"
+
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "支�的 IRC 命令。"
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "支�的 IRC 命令"
 
-#: C/geolocation-privacy.page:36(p)
+#: 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 ""
-"有�能被��的信�：您所在的国家，地区，地方，区域，街�，建筑，楼层，房间，"
-"邮政编���纬度，您的速度和方�。"
+"�查看支�的 IRC 命令的列表，在一个�天室中输入<input>/help</input>并按"
+"<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 "您的地��置信�的精度和质��决于软件或者用于�现您的�置的设施。"
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "所有�用命令都有一个简�的用法�述。"
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "进入有密��护的 IRC �天室。"
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "加入一个��护的 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 ""
-"��的网络�能有��的精度设置，�能����的信�。使用外部设备，如 GPS 或手"
-"机，�以增加��的信�的精度。"
+"在�些 IRC 网络上，�人的 IRC 房间�以被密��护。如果您知�这密�，按照下�"
+"的步骤加入："
 
-#: 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\">加入房间</link>。"
+
+#: 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 ""
-"当��模�被�用�，�有您所在的城市信�会被��，�使您正在使用外部设备。"
+"Empathy 会�示您输入密�。输入这个 IRC �天室的密�并点击 <gui style=\"button"
+"\">加入</gui>。"
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "�会看到这些��出去的信�"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "加入一个 IRC 频�。"
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "�有您的�系人�以看到您的地��置。"
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "加入一个 IRC �天室"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "什么是��模�"
+#: 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 ""
+"您�以加入您已�连接的所有 IRC 网络上的 IRC �天室(也称为 IRC 频�)。�连接一"
+"个 IRC 网络，�� <link xref=\"add-account\"/> and <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 "在 <gui>��</gui> 下拉列表中，选择与您想�使用的网络对应的 IRC ��。"
+
+#: 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>�天室</gui> 文本框中，输入您想�加入的频�的�称。IRC 频��称以井�"
+"(<sys>#</sys>)开头。"
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "��概述"
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "点击<gui>加入</gui>�进入房间。"
 
-#: 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>."
-msgstr "<app>Empathy</app> 中一些关于地��置��的选项的概况。"
+"To join multiple rooms, you need to repeat the steps above for each room."
+msgstr "�加入多个房间，您需�对�个房间��上�的步骤。"
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "地��置默认�开�。"
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "��模�默认被激活"
+#: C/irc-manage.page:23(credit/name)
+msgid "Sindhu S"
+msgstr ""
 
-#: C/geolocation-privacy.page:87(p)
+#: C/irc-manage.page:39(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "互�网中继�天(IRC)"
+
+#: C/irc-manage.page:47(when/p)
 msgid ""
-"Privacy mode prevails even when using external and more precise devices."
-msgstr "�使在使用精度更高的外部设备，��模�也会�挥作用。"
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
+"idle</link>"
+msgstr ""
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "�有您的�系人�以看到您的�置。"
+#: C/irc-manage.page:55(info/title)
+#, fuzzy
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC �天室和会�"
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> 没有�布我的地��置。"
+#: C/irc-manage.page:57(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "�天室和会�"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "地��置没有被公布。"
+#: C/irc-manage.page:62(info/title)
+#, fuzzy
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "常� IRC 问题"
 
-#: 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 "�护您的昵称，以防其他 IRC 用户使用。"
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "在 IRC 中使用昵称和密�"
+
+#: 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 ""
-"如果您的�系人�能看到您的�置，�能是因为 <app>Empathy</app> 无法�现有一定"
-"精度的您的地��置信�。"
+"在�些 IRC 网络上，您�以通过 NickServ �务注册您的昵称。通过� NickServ ��"
+"特殊的消�，您�以设置密��认�您自己。一些 IRC �天室�能��许您加入，除�"
+"您有注册过的昵称。"
 
-#: 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 ""
-"在这�情况下，您的�置信��会被公布，但您��以看到您的�系人的�置信�。"
+"<app>Empathy</app> 目�还�支�昵称注册。但一些 IRC 网络会自动� NickServ �"
+"�一个 <em>�务器密�</em>。在这样的网络上，您�以在 <app>Empathy</app> 中使"
+"用这样的密�� NickServ 认�您自己。�行的 freenode 网络就有这个功能。"
+
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "设置一个 IRC 密�："
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "在左侧的对�框中选择一个 IRC ��"
+
+#: 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."
-msgstr "如果您想�公布您的地��置，您�以试一试使用 GPS 等外部设备。"
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr "在 <gui>密�</gui> 一�中，输入您注册您的昵称时使用的密�。"
 
-#: 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 ""
-"��布您的地��置，您的 Jabber �务器必须支� Personal Eventing Protocal "
-"(PEP)。互�网上有人维护�一份<link href=\"http://coccinella.im/servers/"
-"servers_by_pubsub_pep.html\">支� PEP 的�务器列表</link>。Google Talk 目��"
-"支� PEP。"
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "使用和了解 <app>Empathy</app> 中的地��置。"
-
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "地��置"
+"这些说明�是�许您在特定的 IRC 网络上使用密��护的昵称。目�在 "
+"<app>Empathy</app> 中还�能注册 IRC 昵称或修改密�。"
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "地��置"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> 目��支� IRC 传文件。"
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "修�常�问题"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "通过 IRC 传�文件"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "设立，加入或管��天室收�。"
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "目�无法用 IRC 传�文件。"
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "�天室收�"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "�一� IRC �系人�起会�。"
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "收�一个�天室"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "与 IRC 中�人�天"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "加入一个�天室。"
+#: 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 ""
+"您�以在公共的 IRC �天室之外与其他的 IRC 用户进行�人�天。�与�一� 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."
-msgstr "关于如何加入 IRC �天室，�� <link xref=\"irc-join-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 �天室的�系人列表中，�击您想��天的用户。或者，�键点击用户的姓"
+"�并选择 <gui>�天</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 ""
-"关于如何�起或加入群组�天，�� <link xref=\"group-conversations\"/>。"
+"IRC �天室的�系人列表与 <app>Empathy</app> 的�系人列表��。它包�了您加入"
+"的这个 IRC �天室中的用户列表。��的�天室�能有��的�系人列表。"
 
-#: 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 ""
-"在会�窗�，选择 <guiseq><gui>会�</gui><gui>收��天室</gui></guiseq>。"
+"IRC �天室的�系人列表通常�于窗��侧。如果您没有看到它，选择 <guiseq><gui>"
+"对�</gui><gui>显示�系人列表</gui></guiseq>。"
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "加入收�的�天室"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "法律信�。"
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "按 <key>F5</key> 键。"
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "许�"
 
-#: 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 ""
-"选择 <guiseq><gui>�天室</gui><gui>加入已收�的�天室</gui></guiseq>，以加入"
-"您之�收�的�天室。"
+"本作�在 CreativeCommons Attribution-Share Alike 3.0 Unported license下�布。"
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "选择 <gui>�天室</gui>，并选择您�加入的已收�的�天室。"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "您�以自由："
 
-#: 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 "�加入一个已收�的�天室，您必须连接互�网和您的账户。"
+#: C/license.page:25(item/title)
+#, fuzzy
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "分享"
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "管��天室收�"
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "�制�分�或者传播作�。"
 
-#: 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 ""
-"在 <gui>�系人列表</gui> 窗�，选择 <guiseq><gui>�天室</gui><gui>管�收�夹"
-"</gui></guiseq>。"
+#: C/license.page:29(item/title)
+#, fuzzy
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "�创作"
 
-#: 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 "在 <gui>账户</gui> 下拉列表中，选择您�管��天室收�的账户。"
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "修改作�。"
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "选择 <gui>全部</gui> 以看到�有您收�的�天室。"
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "需�守一下�件："
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "选择您�管�的收�："
+#: C/license.page:38(item/title)
+#, fuzzy
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "署�"
 
-#: C/favorite-rooms.page:121(p)
+#: C/license.page:39(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 "选择 <gui>自动连接</gui>，则您连接到您的账户�，会自动加入这个�天室。"
-
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "点击 <gui>删除</gui> 以从收�夹中删除这个�天室。"
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "完��，点击 <gui>关闭</gui>。"
+"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 ""
+"您必须按照作者或许�人指定的方�对作�署�(但�能以任何方�暗示他们认�您或者"
+"您对作�的使用)。"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "使 <app>Empathy</app> ��自动登录一个账户。"
+#: C/license.page:46(item/title)
+#, fuzzy
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "相�方�共享"
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "�用一个账户"
+#: 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 ""
+"如果您改��转�本作�或者以本作�为基础进行�创作，您应以相��相似或者兼容"
+"的�议�布修改�的作�。"
 
-#: C/disable-account.page:41(p)
+#: C/license.page:53(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."
+"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 ""
-"您�以�用一个账户以阻止 <app>Empathy</app> 自动登录这个账户而�必将其彻底删"
-"除。您�能想��用��用�个账户如果您�想�尔登录这个账户，但�想使用 "
-"<app>Empathy</app> 中的其他账户。"
+"许�的全文�� <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"legalcode\">CreativeCommons 网站</link>，或者阅读完整的<link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/\">通俗�议</link>。"
+
+#: C/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "将��的�系人�并分割为一个�系人。"
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "�并和分割�系人"
+
+#: C/link-contacts.page:26(page/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
-msgstr "在窗�左侧的账户列表中，选择您想��用的账户。"
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr "如果您的�系人有多个�天�务的多个��，您�以将他们�并�一个�系人。"
 
-#: C/disable-account.page:56(p)
+#: C/link-contacts.page:30(page/p)
 msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
-msgstr "在窗��侧，�消选择 <gui style=\"checkbox\">�用</gui>。"
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr "产生的�系人称为一个<em>元�系人</em>：由多个���系人组�的�系人。"
 
-#: C/disable-account.page:62(p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
-msgstr "��新�用这个账户，�需选择 <gui style=\"checkbox\">�用</gui>。"
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr "如果您有一个�� Jane Smith 的�系人，她使用三���的�天�务："
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "为��支�的�务注册账户。"
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "注册一个新账户"
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "您�以将这些�系人�并�一个 Jane Smith."
 
-#: C/create-account.page:36(p)
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "�并�系人"
+
+#: 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 ""
-"大多账户类型需�您在使用 <app>Empathy</app> 这样的�时通讯软件连接之�先建立"
-"账户。但对于�些账户�供商，您�以使用 <app>Empathy</app> �注册新账户，使用"
-"与 <link xref=\"add-account\">添加账户</link> 相�的步骤。"
+"在 <gui>�系人列表</gui> 窗�，�键点击有����的�系人，并选择 <gui style="
+"\"menuitem\">绑定�系人…</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>."
-msgstr ""
-"这一页是关于建立��类型的账户的。您应当已�从您的账户�供商那里得到了登录 "
-"ID 和密�，以�其他使用 <app>Empathy</app> 连接这个账户需�的信�。"
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr "在 <gui>绑定�系人</gui> 窗�的左窗格，选择您想�关�起�的�系人。"
 
-#: 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 "点击 <gui style=\"button\">绑定</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 是最常用的社交网络之一。它�许用户对自己进行个性化的�述并与朋�们交"
-"�。"
+"当一个元�系人被创建�，您�击该�系人时默认使用的�系人是有最高的在线状�的"
+"�系人。"
 
-#: C/create-account.page:52(p)
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "分割�系人"
+
+#: 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 ""
-"�使用 Facebook 与您的朋�们交�，您需�在其网站上建立一个新账户：<link href="
-"\"http://www.facebook.com\">www.facebook.com</link>。"
+"在 <gui>�系人列表</gui> 窗�中，�键点击�分割的�系人，并选择 <gui style="
+"\"menuitem\">绑定�系人…</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 "点击 <gui style=\"button\">解除绑定</gui>。"
 
-#: C/create-account.page:62(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/overview.page:37(media)
+msgctxt "_"
 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."
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
 msgstr ""
-"Jabber 是一�开放的�时通讯系统。� email 一样，Jabber �许您选择账户�供商，"
-"并与其他 Jabber 用户交�，无论他们使用哪里账户�供商。"
 
-#: C/create-account.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/overview.page:38(media)
+msgctxt "_"
 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>."
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 msgstr ""
-"您需�在�个 Jabber �务�供商那里建立账户。有许多 Jabber �务�供商，<link "
-"href=\"http://register.jabber.org/\">Jabber.org</link> 是很�行的一个。"
 
-#: C/create-account.page:71(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/overview.page:39(media)
+msgctxt "_"
 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."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr ""
-"如果您使用 Google Mail 或者 Google Talk，那么您已�拥有 Jabber 账户了。"
-"Google Talk 就是一个 Jabber �务。您�需�使用您的 Google Mail 地�和密�在 "
-"<app>Empathy</app> 中连接。"
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "附近的人"
-
-#: 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."
+#: C/overview.page:8(info/desc)
+msgid "What instant messaging is and how you can use it."
 msgstr ""
-"�使用这个�务，您并�需�在�个�务�供商那里创建账户，�需�连接到一个本地"
-"网络，比如一个无线热点。它会自动�现网络中使用这个�务的其他用户。"
-
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "更多信���<link xref=\"salut-protocol\"/>。"
 
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
+msgstr ""
 
-#: 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."
+#: C/overview.page:24(page/title)
+msgid "Overview of instant messaging"
 msgstr ""
-"SIP 是一��许用户通过互�网进行语音和视频会�的开放系统。您需�在�个 SIP �"
-"务�供商处创建账户。您�以和其他的 SIP 用户交�，无论他们的 SIP �务�供商与"
-"您是�相�。"
 
-#: C/create-account.page:97(p)
+#: C/overview.page:26(page/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>."
+"Instant messaging, sometimes abbreviated to IM, is a text-based means to "
+"communicate instantly over the internet and the local network. While some IM "
+"applications work with only one type of account, others, including <link "
+"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link "
+"xref=\"add-account\">accounts</link> from different service providers. Some "
+"of these even support audio and video calling."
 msgstr ""
-"由于技术上的差别，�费的 <link href=\"https://www.ekiga.net/index.php?"
-"page=register\">Ekiga.net</link> �务目�在 <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."
+#: C/overview.page:42(td/p)
+msgid "Video Conference"
 msgstr ""
-"有些 SIP �务�供商�许用您的计算机呼�一般的电�。通常，您需�订阅��付费�"
-"务�能使用这个功能。"
 
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+#: C/overview.page:43(td/p)
+#, fuzzy
+#| msgid "Group conversations"
+msgid "Group chats"
+msgstr "群组�天"
 
-#: C/create-account.page:109(p)
+#: C/overview.page:44(td/p)
+#, fuzzy
+#| msgid "Favorite rooms"
+msgid "Chat rooms"
+msgstr "�天室收�"
+
+#: C/overview.page:48(page/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."
+"Some instant messaging applications can be used to connect to chat rooms, "
+"online places where like-minded people meet to talk. One popular means to "
+"connect to several chat rooms is the Internet Relay Chat, also known as "
+"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room"
+"\">public</link> chat rooms, which are open to anyone who creates an account "
+"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-"
+"pwd\">password protected</link> and open only to a select few."
 msgstr ""
-"您�需�注册账户就�以使用 IRC。尽管您在 <app>Empathy</app> 中添加 IRC 账户时"
-"指定了一个昵称，这个昵称�是您�次连接时�建立。如果有其他用户在使用这个昵"
-"称，您需�选择一个其他昵称。"
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "�览或�索您之�的会�。"
+
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "查看之�的会�"
+
+#: C/prev-conv.page:38(page/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."
+"<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 ""
-"有些 IRC 网络上有一��� NickServ 的�务，�许用户�护他们的昵称。更多信��"
-"�<link xref=\"irc-nick-password\"/>。"
+"<app>Empathy</app> 自动�存您和�系人的所有文字会�。您�以<link xref="
+"\"#search\">�索之�全部的会�</link>或者根��系人和日期<link xref=\"#browse"
+"\">�览之�的会�</link>。"
 
-#: C/create-account.page:117(p)
+#: C/prev-conv.page:46(note/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 ""
-"有些 IRC �务器是被密��护的。您需�知�密��能连接到这些�务器。通常，这样"
-"的�务器是�有的。"
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr "您�需�连接到网络�查看和�索您之�的会�。"
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "专有的�务"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "�索之�的会�"
 
-#: C/create-account.page:124(p)
+#: C/prev-conv.page:55(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 ""
-"许多��的公�或组织开�了一些专�的�时消��务。<app>Empathy</app> �许您连"
-"接大多常��务的既存账户。�为这样的�务创建账户，您需�访问其网站并��其使"
-"用�款。"
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "您�以在之�的所有会�中进行全文�索。"
 
-#: 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)
+#, fuzzy
+#| 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 ""
+"从<gui>�系人列表</gui>窗�，选择<guiseq><gui>查看</gui><gui>最近会�</gui></"
+"guiseq>。或者�以按<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 "在顶部的下拉列表中选择一个��。下方显示该��的�系人列表和�天室。"
 
-#: 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 "在<gui>�索</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 "符��索�件的会�会显示在下�的列表中。会�默认按日期排�。"
 
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "改�您的状�以�您的�系人表明您是�闲暇。"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "�览之�的会�"
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "改�您的状�"
+#: C/prev-conv.page:82(section/p)
+msgid ""
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr "您�以按时间顺��览之�和�系人或在�天室中的会�。"
 
-#: C/change-status.page:36(p)
+#: C/prev-conv.page:91(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."
+"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 ""
-"您�以改�您的状�，从而��系人表明您现在是�闲暇。<app>Empathy</app> �许您"
-"从一些定义好的状�中选择一个。"
+"在左上的下拉列表中选择一个��。下方会显示这个��的�系人和�天室列表。"
 
-#: C/change-status.page:41(p)
+#: C/prev-conv.page:95(item/p)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr "点击 <gui>�系人列表</gui> 窗�顶部的下拉列表。"
-
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "从列表中选择一个状�。"
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr "选择一个�系人或�天室以查看之�的会�。默认显示的是最近的会�。"
 
-#: C/change-status.page:52(p)
+#: C/prev-conv.page:99(item/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."
+"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 ""
-"内置的状�和它们的�义��<link xref=\"status-icons\"/>。您也�以<link xref="
-"\"set-custom-message\">添加自定义的状�信�</link>��您的�系人�供更多有关"
-"您当�状�的信�。"
+"您�以按日期�览您的会�。如果在�日您所选择的��有过会�，该日会以粗体显"
+"示。点击一个日期以选择它。点击月和年�的箭头以�览更早的日期。"
 
-#: C/change-status.page:58(p)
+#: C/prev-conv.page:105(section/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."
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
 msgstr ""
-"如果您一段时间�使用计算机，或�幕�护开始�行，您的状�会自动�为“离开�。"
+"您�以在顶部的�索�中输入文字，以在会�中�索文字。匹�的会�会显示出�。"
 
-#. 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/prev-conv.page:111(note/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"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 ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"在 <gui>�系人列表</gui> 窗�中，您�以快速查看与�个�系人之�进行过的会�。"
+"�键点击该�系人，选择 <gui>最近回�</gui>。与该�系人的<gui>最近会�</gui>窗"
+"�将会打开，并且选中该�系人。"
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
-msgstr "语音或视频会�的�件。"
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr "您�连接的�时通信��没有在��列表中�用。"
 
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "语音和视频支�"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "我的��没有�用"
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-acctdisabled.page:36(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 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 ""
-"您的�系人也在使用支�语音和视频会�的程�时，您��以和他们进行语音�视频会"
-"�。如果您的�系人�以进行语音或视频会�，您将在�系人列表中他们的姓��看到"
-"下列图标："
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "图标"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "�述"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "语音�天的图标"
+"如果当您�试开始一个新会�或者加入房间时，�使用的�时�天��没有在下拉的账"
+"户列表中�用，您的��信��能�正确。"
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "�系人�以进行语音�天。"
+#: 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 "确�您已�连接到互�网，或者一个本地网络。"
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "视频�天的图标"
+#: 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 ""
+"选择<guiseq><gui>编辑</gui><gui>��</gui></guiseq>，�选择�工作的��。"
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "�系人�以进行视频�天。"
+#: 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 "�次输入您的用户�和密�，以确�它们是正确的。"
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(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."
+"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 ""
-"�进行语音�天，您需�有一�声�，且您的�作系统必需支�它，还需�一个能正常"
-"工作的麦克风。"
+"检查<gui>高级</gui>选项�中的所有细节是�正确。您应当�以从�时通讯�务商的网"
+"站上找到这些信�。"
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "检查��是�开�。"
+
+#: C/prob-conn-auth.page:8(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."
-msgstr "�进行视频�天，您需��作系统支�的摄�头，��以正常工作的麦克风。"
+"An error message which says “<gui>Authentication failed</gui>� appears in "
+"the main window."
+msgstr "主窗�中显示了一个错误�示信�，“<gui>验�失败</gui>�。"
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "支�的账户类型"
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed�"
+msgstr "我收到“验�失败�的错误�示信�"
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-auth.page:38(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 your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
 msgstr ""
-"�有一些特定类型的账户支�语音或视频�天。下表列出了��类型的账户的语音�视"
-"频支�情况。"
+"这�错误�生在您的�时通信�务器无法确认您的身份，��许您连接时。比如，因为"
+"��原因，它无法识别您的用户�或者密�。"
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-auth.page:50(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."
+"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 ""
-"账户类型是由�件�供的。您的系统上�一定有以下列出的全部类型，也�能有一些类"
-"型没有在下�列出。�件的�级�能使下表中�支�语音或视频的账户类型获得支�。"
+"确�您已�在�连接的�务上注册了��。如果没有��，多数�务都�会�许您连"
+"接。"
 
-#: C/audio-video.page:110(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 ""
-"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 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/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/audio-video.page:118(p)
+#: C/prob-conn-auth.page:68(item/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 ""
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
+msgstr "�消选择<gui>已�用</gui>，然��次选中以�新连接到�务器。"
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "�务"
+#: C/prob-conn-name.page:9(info/title)
+#, fuzzy
+#| msgid "“Name in use�"
+msgctxt "link:error-msg"
+msgid "“Name in use�"
+msgstr "“用户�已�被�用�"
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "语音"
+#: 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 "主窗�中显示了一个错误�示信�，“<gui>用户�已被�用</gui>�。"
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "视频"
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use�"
+msgstr "我收到“用户�已�被�用�的错误�示信�"
 
-#: 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 "�"
+#: 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 ""
+"这�错误出现在您�试连接到 IRC ��，然而您使用的昵称正在被该网络上其他人使用"
+"的情况下。"
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook �天"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: 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 ""
+"如果您在所用的网路中注册了这个昵称，请为该昵称设置密�。更多信���<link "
+"xref=\"irc-nick-password\"/>。"
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: 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 "关闭��，然�开�该��并�试�新连接到�务。"
 
-#: 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 "是"
+#: C/prob-conn-neterror.page:7(info/desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>� appears in the main "
+"window."
+msgstr "主窗�中显示了一个错误�示信�，“<gui>网络错误</gui>�。"
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error�"
+msgstr "我收到“网络错误�的错误�示信�"
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: 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 ""
+"这�错误在 <app>Empathy</app> 由于��原因而无法和�时通讯�务器连上时出现。"
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: 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 "此外，这�错误也在您试图�设置昵称而使用 IRC ��时出现。"
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "代�支�"
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: 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 "目� <app>Empathy</app> 无法在代�下工作。"
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr "诊断连接到一个�时消��务的常�问题。"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "通过互�网呼�您的�系人。"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "连接到�时消��务时的问题"
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "开始语音�天"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "从 <app>Empathy</app> 中完全地删除一个��。"
 
-#: 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 ""
-"您�以呼�您的�系人，与他们进行语音�天。这个功能仅对于一些特定类型的账户�"
-"用，并且需��一个人使用的应用程�也支�语音呼�。"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "删除��"
 
-#: C/audio-call.page:34(p)
+#: C/remove-account.page:36(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>."
+"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 ""
-"在 <gui>�系人列表</gui> 窗�，点击您想呼�的�系人的�字�的 <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼�</media> "
-"图标并选择 <gui style=\"menuitem\">语音呼�</gui>。"
+"如果你�想�使用�个��，您�以从 <app>Empathy</app> 中完全地删除这个��。"
+"如果您将��希望在 <app>Empathy</app> 中使用这个��了，您�以�添加这个账"
+"户。"
 
-#: C/audio-call.page:55(p)
+#: C/remove-account.page:47(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>."
-msgstr ""
-"�将语音会�转为视频会�，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
-"style=\"menuitem\">视频开�</gui></guiseq>。"
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr "在窗�左侧的��列表中选择您想�删除的��。"
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "�一�元�系人�起语音会�"
+# 有个"-"的按钮图标，�以�� - ��。
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "点击<gui style=\"button\">-</gui>。"
 
-#: C/audio-call.page:71(p)
+#: C/remove-account.page:54(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
 msgstr ""
-"选择您想�交谈的�系人，然�在��中选择<gui style=\"menuitem\">语音呼�</"
-"gui>。"
+"一个弹出对�框会�求您确认删除。点击<gui>删除</gui>按钮�永久的删除这个��。"
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "添加�人到�系人列表。"
+#: 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 "�使删除了��，<app>Empathy</app> 也�会删除这个��的�天记录。"
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "添加�人到您的�系人列表"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "�解附近的人(People Nearby)功能"
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr "选择<guiseq><gui>�天</gui><gui>添加�系人</gui></guiseq>。"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "什么是“附近的人�？"
 
-#: C/add-contact.page:40(p)
+#: C/salut-protocol.page:40(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."
+"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 ""
-"在 <gui>账户</gui> 下拉列表中，选择您用�与您的�系人�系的账户。您的�系人需"
-"�使用与您选择的账户相�的�务。"
+"附近的人(People Nearby)�务是一个无�务器的通讯�务：您�需�连接并认�到一个"
+"中央�务器�使用这个功能。"
 
-#: C/add-contact.page:45(p)
+#: C/salut-protocol.page:45(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."
-msgstr ""
-"在 <gui>标识符</gui> 一�中，输入这��务中您的�系人的登录 ID，用户�，显示"
-"�或其他�适的标识符。"
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr "这类无�务器的通讯系统�局�于本地局域网，并且�需�互�网链接。"
 
-#: C/add-contact.page:49(p)
+#: C/salut-protocol.page:49(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."
-msgstr "在 <gui>别�</gui> 中，输入您希望这个�系人显示在�系人列表中的�字。"
-
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr "点击<gui>添加</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 ""
+"会自动的�现在�一个局域网中使用这个�务的人，并且�以给他们��消�甚至文"
+"件，想其它�务一样。"
 
-#: C/add-contact.page:61(p)
+#: C/salut-protocol.page:54(page/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 "�添加�系人到您的�系人列表，您需�连接因特网和您的账户。"
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr "所有现代的本地局域网都应该�以支�这类�务。"
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "� <app>Empathy</app> 添加新账户。"
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "从您的计算机��文件给您的�系人。"
 
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "添加一个新账户"
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "��文件"
 
-#: C/add-account.page:41(p)
+#: C/send-file.page:45(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\"/>."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr "�键点击��其��文件的�系人，然�选择<gui>��文件</gui>。"
+
+#: C/send-file.page:50(item/p)
+#, fuzzy
+#| 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 ""
-"您�以添加任何支�的�务的�时消�账户，以在 <app>Empathy</app> 中与您的�系"
-"人交�。对于�些账户�供商，这些步骤也�许您注册新账户。更多细节��<link "
-"xref=\"create-account\"/>。"
+"点击��其��文件的�系人，然�选择<guiseq><gui>编辑</gui><gui>�系人</"
+"gui><gui>��文件</gui></guiseq>。"
+
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "选择���的文件，并点击<gui>��</gui>。"
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "点击<gui style=\"button\">添加</gui>。"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "<gui>文件传输</gui>窗�会被显示。"
 
-#: C/add-account.page:57(p)
+#: C/send-file.page:66(item/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
-msgstr "在<gui>�议</gui>下拉列表，选择您�创建的账户类型。"
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr "请等待您的�系人接�文件传输，或点击<gui>�止</gui>�终止传输。"
 
-#: C/add-account.page:61(p)
+#: C/send-file.page:72(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 ""
-"如果您还没有注册账户，选择<gui>在�务器上创建新的账户</gui>。这个功能并�是对"
-"于�一�账户都�用，也�能对于�些账户�供商��用。更多信���<link xref="
-"\"create-account\"/>。"
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr "传输结�之�，就�以关闭<gui>文件传输</gui>窗�了。"
 
-#: C/add-account.page:66(p)
+#: C/send-file.page:80(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."
+"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 ""
-"输入必�的信�。对于大多数账户，您�需�输入登录 ID 和密�。有些账户�能需�"
-"更多信�。��<link xref=\"accounts-window#details\"/>。"
-
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "点击<gui style=\"button\">登入</gui>。"
+"如果窗�中列出了很多已�完�的传输，点击<gui>清除</gui>�以清空列表。这�会将"
+"列表清空，而�会从您的计算机上删除这些文件。"
 
-#: C/add-account.page:78(p)
+#: C/send-file.page:87(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."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"�改�账户在<gui>账户</gui>窗�中的作为标识的�字，在左侧的列表中选择账户，然"
-"�点击�字或者按空格键。编辑账户的�字，完��按<key>Enter</key>。"
+"�有使用下列�务�能��文件：<em>Jabber</em>�<em>Google Talk</em>和<em>附近"
+"的人</em>。"
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "添加�修改和删除账户。"
+#: 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 "��别人��文件，您需�连接到互�网，或本地局域网。"
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "账户窗�"
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "��消�给一个您的�系人。"
 
-#: C/accounts-window.page:35(p)
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "��人��消�"
+
+#: C/send-message.page:36(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
-msgstr "<gui>账户</gui>窗��许您添加�修改和删除账户。"
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
+msgstr "在<gui>�系人列表</gui>窗�中，�击�与之�天的�系人的�字。"
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "账户详细信�"
+#: 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 ""
+"一个新窗�会被打开。在窗�底部的文本框中输入一�消�，然�按<key>Enter</key>"
+"��。"
 
-#: C/accounts-window.page:44(p)
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "�一�元�系人��消�"
+
+#: 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 ""
-"对于大多数的账户，您�需�输入登录 ID 和密�。但有些账户或有些类型的账户�能"
-"需��外的信�。"
+"选择您想�与之�天的�系人，并在��中选择 <gui style=\"menuitem\">�天</"
+"gui>。"
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Jabber 和 Google Talk 账户的高级选项。"
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "为您的状�添加�编辑或删除个人消�。"
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Jabber 账户详情"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "设置一个自定义消�"
+
+#: 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 ""
-"大多 Jabber 账户�需�登录 ID 和密�就�以连接。但对于�些账户或�些网络，您"
-"�能需�在<gui>高级</gui>选项�中输入一些�外的信�。通常，您�需�使用下�的"
-"这些高级选项。添加账户的一般指导��<link xref=\"add-account\"/>。"
+"有时您也许想�为您的状�设置一个自定义消�，例如，让别人知�您�能在一段时间"
+"内�在。"
 
-#: 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."
-msgstr "Google Talk 是一� Jabber 账户。这些指�对 Google Talk 账户�样适用。"
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "需�加密(TLS/SSL)"
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr "�以根���的状��设置自定义消�。"
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "忽略 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 "在<gui>�系人列表</gui>窗�，点击顶部的下拉列表。"
 
-#: C/account-jabber.page:47(p)
+#: C/set-custom-status.page:52(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."
+"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 ""
-"��有�能，<app>Empathy</app> 与 Jabber �务器之间的通讯就会被加密。如果��"
-"能加密，消�就�能被明文��。选择<gui>需�加密</gui>以阻止�能加密时 "
-"<app>Empathy</app> 与 Jabber �务器进行明文通讯。"
+"选择您希望添加自定义消�的状�。您必须选择有<gui>自定义消�</gui>标签标记的状"
+"�。"
 
-#: C/account-jabber.page:52(p)
+#: C/set-custom-status.page:58(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."
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"有些 Jabber �务器�能使用��法的�书加密数�，或者使用�自未知的�书认�机"
-"构的�书。如果您信任您的�务器，您�以选择<gui>忽略 SSL �书错误</gui>以�许"
-"使用��法的�书进行加密通讯。"
-
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "资�"
-
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "优先级"
+"在窗�顶部的文本框中输入您的自定义消�，然�按<key>Enter</key>�设定这个消"
+"�。"
 
-#: C/account-jabber.page:61(p)
+#: C/set-custom-status.page:64(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."
+"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 ""
-"如果您有多个应用程�(比如，在�一�计算机上)�时连接了您的账户，您�以设置“资"
-"��以唯一地标识�一个连接的程�。默认地，<app>Empathy</app> 会使用 "
-"<input>Telepathy</input> 作为“资��。"
+"如果您希望收�一个自定义消�，�将它�存下�方便日�使用，请点击您撰写自定义"
+"消�的文本框�侧的心形符�。"
 
-#: C/account-jabber.page:65(p)
+#: C/set-custom-status.page:69(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."
+"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 ""
-"您�以设置优先级以指定哪一个程�优先收到您的�系人���的消�。新的消�会被"
-"��给优先级最高的程�。"
+"如果您�这么�，那么下次您使用 <app>Empathy</app> 的时候，这个自定义消�就�"
+"会�出现。它�在 <app>Empathy</app> 本次�行期间被�留。"
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "覆盖�务器设置"
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "编辑和删除自定义消�"
+
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "选择<gui>编辑自定义消�</gui>。"
 
-#: C/account-jabber.page:71(p)
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "�编辑自定义消�："
+
+#: C/set-custom-status.page:100(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> 会根�您的登录 ID 以默认的设置连接 Jabber �务器。对�些 "
-"Jabber �务器，您需�人工输入一些�务器设置。这些设置应该由您的 Jabber �务�"
-"供商�供。"
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr "在<gui>已�存的自定义状�</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: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 "输入新的自定义消�并且按<key>Enter</key>�修改它。"
 
-#. 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 "�删除自定义消�："
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "连接 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 "在<gui>已�存的自定义状�</gui>中，选择�删除的状�消�。"
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "IRC 账户详情"
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "点击<gui>删除</gui>按钮。"
+
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "完��，点击<gui>关闭</gui>。"
 
-#: C/account-irc.page:33(p)
+#: C/set-custom-status.page:140(note/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."
+"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 ""
-"IRC 账户需�与其他类型的账户��的信�。�创建 IRC 账户，您至少需�指定一个 "
-"IRC 网络和一个昵称。本页详细介�了您�以为一个 IRC 账户�供的信�。"
+"当您编辑自定义消�时，它�会被设为当�状�消�。您需�在<gui>�系人列表</gui>"
+"窗�中选中它。"
 
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "网络"
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "�您的�系人展示您的桌�。"
+
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "共享您的桌�"
 
-#: C/account-irc.page:46(p)
+#: C/share-desktop.page:35(page/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."
+"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 ""
-"IRC 是一�开放的系统，它�许人们�行�自的 IRC 网络。�个网络是独立的，有特有"
-"的用户和�天室。<app>Empathy</app> 在 <gui>网络</gui> 下拉列表中列出了一些最"
-"�行的网络。您�以添加其他的网络。�看下�的<link xref=\"#networks\"/>。"
-
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "昵称"
+"您�以和�系人共享桌�。使用这个功能，您�以��系人展示您的桌�，�寻求帮助"
+"或帮助�系人解决问题。"
 
-#: C/account-irc.page:54(p)
+#: C/share-desktop.page:42(note/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."
+"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 网络上的唯一性的�字。�有一个人�以使用�个特定的昵称。如"
-"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信�，您需�改�"
-"您的昵称。"
+"�共享您的桌�，您的系统中必须安装支�此功能的 VNC �务器。<app>Vino</app>，"
+"GNOME 的 VNC �务器，就有这项功能。"
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "密�"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "在<gui>�系人列表</gui>窗�，执行下列�作之一："
 
-#: C/account-irc.page:61(p)
+#: C/share-desktop.page:56(item/p)
+#, fuzzy
+#| 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 ""
-"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."
+"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 ""
-"一些�务器，尤其是那些�有网络，需�密��能连接。如果您被授�使用，网络的管"
-"�员应当为您�供了密�。"
+"选择您想�共享您的桌�的�系人，并选择 <guiseq><gui>编辑</gui><gui>�系人</"
+"gui><gui>共享我的桌�</gui></guiseq>。"
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "NickServ 密�"
+#: 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 ""
+"�键点击您想�共享您桌�的�系人的�字，然�选择<gui>共享我的桌�</gui>。"
 
-#: C/account-irc.page:66(p)
+#: C/share-desktop.page:71(item/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."
+"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 ""
-"在�些网络上，昵称�以通过一��� NickServ 的�务被注册。<app>Empathy</app> "
-"并�直接支�昵称密�。在�些网络上，包括�行的 freenode 网络，�务器密�会被"
-"自动转�给 NickServ，从而�许您设置此项� NickServ �明您自己。更多信���"
-"<link xref=\"irc-nick-password\"/>。"
+"您选择的�系人会收到一个查看您桌�的邀请。�查看您的桌�，他们需�接�邀请。"
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "真实姓�"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr "在您的桌�共享程�中，您�以断开您的�系人到您的计算机的连接。"
 
-#: C/account-irc.page:77(p)
+#: C/share-desktop.page:82(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."
-msgstr ""
-"除了昵称，您还�以�供您的真实姓�。其他用户查看您的信�时�以看到您的真实姓"
-"�。"
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
+msgstr "如果需�更多关于如何使用远程桌�查共享程�的信�，请�看其帮助。"
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "退出消�"
+#: 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 ""
+"当您与其他人共享您的桌�的时候，�能会出现系统性能�低和网络速度下�的现象。"
 
-#: C/account-irc.page:82(p)
+#: C/share-desktop.page:96(note/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."
+"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 ""
-"当您离线时，一个退出消�会被��给所有您加入的�天室和正在与您进行�人�天的"
-"用户。设置此项以�供自定义的退出消�。"
+"并�您的所有�系人都�以使用这个功能。他们必须使用 2.28 或更新版本的 "
+"<app>Empathy</app> 并且在安装了兼容的远程桌�查看器程�。"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "IRC 网络"
+#. 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)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgctxt "_"
+msgid ""
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "网络"
+#. 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)
+#, fuzzy
+#| msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgctxt "_"
+msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+msgstr "@@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.
+#: C/status-icons.page:53(media)
+#, fuzzy
+#| msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgctxt "_"
+msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 
-#: C/account-irc.page:99(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.
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+#, fuzzy
+#| msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgctxt "_"
 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."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "�解��状�和状�图标。"
+
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "状�的类别�其图标"
+
+#: C/status-icons.page:39(item/title)
+#, fuzzy
+#| 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 ""
-"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网"
-"络，您�以将其添加到这个列表中。您也�以修改网络或从列表中删除网络。"
+"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: 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 ""
-"�想列表中添加网络，点击<media type=\"image\" mime=\"image/png\" src="
-"\"figures/gtk-add.png\" width=\"16\" height=\"16\">添加</media>。"
+"当您在电脑�并且有空和您的�系人�天时，使用<em>在线</em>状�。您�以为此状�"
+"自定一�消�。"
 
-#: C/account-irc.page:107(p)
+#: C/status-icons.page:45(item/title)
+#, fuzzy
+#| 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 ""
-"�修改列表中的网络，选择那个网络并点击<media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</media>。"
+"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: 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 ""
-"�从列表中删除网络，选择�删除的网络并点击<media type=\"image\" mime=\"image/"
-"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">删除</"
-"media>。"
+"使用<em>忙碌</em>以让您的�系人知�您当��想�天。他们�然�以�系您，比如他"
+"们�能有急事需�讨论。默认地，当您忙碌时，<app>Empathy</app> �会使用气泡�示"
+"和声音�示。您�以为此状�自定一�消�。"
 
-#: C/account-irc.page:115(p)
+#: C/status-icons.page:53(item/title)
+#, fuzzy
+#| 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:"
-msgstr "在添加或修改一个网络时，您�以输入下列信�："
+"<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/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: 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."
-msgstr "这是您希望网络显示在网络列表中的�字。"
+"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 ""
+"当您�在电脑�时，使用<em>离开</em>状�。如果您一段时间内�使用电脑，或者�幕"
+"�护打开了，<app>Empathy</app> 将自动设置您的状�为离开。默认地，当您离开时，"
+"<app>Empathy</app> �会使用气泡�示和声音�示。您�以为此状�自定一�消�。"
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "字符集"
+#: C/status-icons.page:62(item/title)
+#, fuzzy
+#| 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/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: 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 ""
-"这指明了网络上常用的字符编�。字符编�是计算机内部记录字符的一�特定方�。有"
-"许多��的字符编�，您需�与其他用户使用�样的字符编��能正确地看到他们的信"
-"�。"
+"当您将状�设置为<em>�身</em>时，您的�系人会看到您已离线。但您�然连接�您的"
+"��，并且�以看到您的�系人的状�，或者和他们�天。"
 
-#. Translators: Recommend character encodings that are common
-#.             for your language.
-#: C/account-irc.page:135(p)
+#: C/status-icons.page:69(item/title)
+#, fuzzy
+#| 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 ""
-"默认地，<app>Empathy</app> 使用 UTF-8，一�能够处�世界上大多数语言的现代化的"
-"字符编�。简体中文常用的编�还有 GB18030，GBK 和 GB2312。"
+"点击错误�示信�上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "�务器"
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr "将状�设置为<em>离线</em>将会断开您所有��的连接。"
+
+#: C/video-call.page:11(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "�您的�系人进行视频�天。"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:37(page/title)
+msgid "Start a video conversation"
+msgstr "开始视频�天"
+
+#: C/video-call.page:39(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 ""
-"一个 IRC 网络�能有许多�务器供您连接。当您连接到一个特定网络的�务器�，您�"
-"以和�一网络中所有�务器的用户交�。您�以为一个网络添加或删除�务器，使用"
-"<gui>添加</gui>或<gui>删除</gui>按钮。"
+"如果您有网络摄�头，您�以呼�您的�系人并和他们进行视频�天。此功能仅特定类"
+"型的���用，并需�对方使用的程�支�视频呼�。"
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:46(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Video Call</gui>."
 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."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"当一个�务器被选择�，点击<gui>�务器</gui>或<gui>端�</gui>下方的字段�编辑"
-"它。或者，使用左�方�键��焦�个字段，并按空格键开始编辑。"
+"选择��天的�系人，然�在��中选择<gui style=\"menuitem\">视频呼�</gui>"
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:54(item/p)
+#, fuzzy
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 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 end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr "点击<gui style=\"button\">挂断</gui>以结�会�。"
+
+#: C/video-call.page:60(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 ""
-"选择 <gui>SSL</gui> 列中的�选框以加密与�务器间的所有通讯。注�这并�能�味"
-"�其他用户�能看到您在公共�天室中的�言。"
+"�将视频会�转为语音会�，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">视频关闭</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:65(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "和一�元�系人进行视频�天。"
+
+#: C/video-call.page:73(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
-"Lavande  <lavande@thislove.cz.cc>, 2010\n"
-"Tao Wang <dancefire@gmail.com>, 2010\n"
-"lainme <lainme993@gmail.com>, 2011\n"
-"Guanhao Yin <yinguanhao@gmail.com>, 2011"
+"选择��天的�系人，然�在��中选择<gui style=\"menuitem\">视频呼�</gui>"
+
+#~ msgid ""
+#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+#~ msgstr ""
+#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ 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>�系人列表</gui>窗�，点击您想呼�的�系人的�字�的<media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼�</"
+#~ "media>图标并选择<gui style=\"menuitem\">视频呼�</gui>。"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "在线图标"
+
+#~ msgid "Available"
+#~ msgstr "在线"
+
+#~ msgid "Busy icon"
+#~ msgstr "忙碌图标"
+
+#~ msgid "Busy"
+#~ msgstr "忙碌"
+
+#~ msgid "Away icon"
+#~ msgstr "离开图标"
+
+#~ msgid "Away"
+#~ msgstr "离开"
+
+#~ msgid "Offline icon"
+#~ msgstr "离线图标"
+
+#~ msgid "Invisible"
+#~ msgstr "�身"
+
+#~ msgid "Offline"
+#~ msgstr "离线"
+
+#~ 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 "我希望看到更多的人�用这个。"
+
+#~ 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 ��许您创建 IRC ��。软件已�移除指�链接。请移除"
+#~ "文本。"
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "安装 telepathy-idle"
+
+#~ msgid ""
+#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+#~ msgstr ""
+#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+
+#~ 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 网络�天工具标识</media> Empathy 网络�天工具"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid ""
+#~ "@@image: 'figures/audio-input-microphone.png'; "
+#~ "md5=8d89026b66a263a3bc5b1f0665948567"
+#~ msgstr ""
+#~ "@@image: 'figures/audio-input-microphone.png'; "
+#~ "md5=8d89026b66a263a3bc5b1f0665948567"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "语音�天的图标"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "视频�天的图标"
+
+#~ 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 ""
+#~ "我喜欢�表格时，用空白代替 No，✔ 代表 Yes，但还是�看通用性如何。我已�"
+#~ "<link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/"
+#~ "msg00006.html\">咨询通用性团队</link>�出请求。"
+
+#, 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 ""
+#~ "最近 telepathy-butterfly 和 papyon 已�支� MSN 音频呼�和视频呼�。有�能"
+#~ "它们在2月28日��时�布，但该时间没有�循 Gnome �布计划，因此我�太确定。"
+#~ "如果八�能�载的�，就标为 Yes。"
+
+#~ 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>�系人列表</gui> 窗�，点击您想呼�的�系人的�字�的 <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼�</"
+#~ "media> 图标并选择 <gui style=\"menuitem\">语音呼�</gui>。"
+
+#~ msgid "Resource"
+#~ msgstr "资�"
+
+#~ msgid "Priority"
+#~ msgstr "优先级"
+
+#~ msgid "Network"
+#~ msgstr "网络"
+
+#~ msgid "Nickname"
+#~ msgstr "昵称"
+
+#~ msgid "Password"
+#~ msgstr "密�"
+
+#~ msgid "Quit message"
+#~ msgstr "退出消�"
+
+#~ msgid "Charset"
+#~ msgstr "字符集"
+
+#~ msgid "Servers"
+#~ msgstr "�务器"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "编辑�删除和添加自定义消�"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr "�添加一�新的自定义消�，在<gui>添加新自定义状�</gui>选项�："
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr "点击下拉列表选择您想�设定自定义消�的状�。"
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr "点击文本框，输入新的自定义消�。"
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr "点击<gui>添加</gui>将新消�添加到已�存的的自定义消�列表中。"
+
+#~ msgid "Click on <gui style=\"button\">Remove</gui>."
+#~ msgstr "点击<gui style=\"button\">删除</gui>。"
+
+#~ 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 ""
+#~ "�消选择���边的<gui>已�用</gui>�选框，然��次选中以�新连接到�务"
+#~ "器。"
+
+#~ 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 ""
+#~ "检查<gui style=\"checkbox\">已�用</gui>选框是�勾选。没有的勾选它已�用账"
+#~ "户。"
+
+#~ msgid "Select the <gui>Search</gui> tab."
+#~ msgstr "选择<gui>�索</gui>标签。"
+
+#~ 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 ""
+#~ "在<gui>关键�</gui>中，输入您想��索的文字。点击<gui>查找</gui>或按"
+#~ "<key>Enter</key>。"
+
+#~ msgid ""
+#~ "Click on a conversation to view it. <app>Empathy</app> will select the "
+#~ "text in the conversation that matched your search terms."
+#~ msgstr ""
+#~ "点击一个会�以查看。<app>Empathy</app> 会选择这个会�中符�您�索�件的文"
+#~ "字。"
+
+#~ msgid "Select the <gui>Conversations</gui> tab."
+#~ msgstr "选择<gui>会�</gui>标签。"
+
+#~ msgid ""
+#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+#~ "window."
+#~ msgstr "在窗��侧，�消选择 <gui style=\"checkbox\">�用</gui>。"
+
+#~ msgid "Click <gui style=\"button\">Log in</gui>."
+#~ msgstr "点击<gui style=\"button\">登入</gui>。"
diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore
index 3e3f6f051..b31c6282f 100644
--- a/libempathy-gtk/.gitignore
+++ b/libempathy-gtk/.gitignore
@@ -1,2 +1,4 @@
 empathy-gtk-marshal.*
 *.gladep
+geoclue-interface.c
+geoclue-interface.h
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 902a5e57f..44789fdea 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -1,15 +1,14 @@
-SUBDIRS = egg-list-box
-
 include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
 	$(ERROR_CFLAGS)					\
-	-I.                                             \
-	-I$(top_srcdir)                                 \
+	-I$(top_srcdir)/libempathy			\
+	-I$(top_srcdir)/extensions			\
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(YELL_CFLAGS)					\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
@@ -28,15 +27,9 @@ BUILT_SOURCES = 					\
 libempathy_gtk_handwritten_source =            	\
 	empathy-account-chooser.c		\
 	empathy-account-selector-dialog.c		\
-	empathy-account-widget-irc.c		\
-	empathy-account-widget-private.h	\
-	empathy-account-widget-sip.c		\
-	empathy-account-widget.c		\
-	empathy-avatar-chooser.c		\
 	empathy-avatar-image.c			\
 	empathy-bad-password-dialog.c 		\
 	empathy-base-password-dialog.c 		\
-	empathy-calendar-button.c \
 	empathy-call-utils.c			\
 	empathy-cell-renderer-activatable.c	\
 	empathy-cell-renderer-expander.c	\
@@ -44,8 +37,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-chat.c				\
 	empathy-contact-blocking-dialog.c	\
 	empathy-contact-chooser.c		\
-	empathy-contactinfo-utils.c		\
-	empathy-live-search.c			\
 	empathy-contact-search-dialog.c		\
 	empathy-contact-widget.c		\
 	empathy-dialpad-widget.c		\
@@ -62,9 +53,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-individual-view.c		\
 	empathy-individual-widget.c		\
 	empathy-input-text-view.c		\
-	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		\
@@ -91,7 +79,6 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-theme-manager.c			\
 	empathy-tls-dialog.c			\
 	empathy-ui-utils.c			\
-	empathy-user-info.c			\
 	empathy-plist.c				\
 	empathy-theme-adium.c			\
 	empathy-webkit-utils.c			\
@@ -100,14 +87,9 @@ libempathy_gtk_handwritten_source =            	\
 libempathy_gtk_headers =			\
 	empathy-account-chooser.h		\
 	empathy-account-selector-dialog.h		\
-	empathy-account-widget-irc.h		\
-	empathy-account-widget-sip.h		\
-	empathy-account-widget.h		\
-	empathy-avatar-chooser.h		\
 	empathy-avatar-image.h			\
 	empathy-bad-password-dialog.h 		\
 	empathy-base-password-dialog.h 		\
-	empathy-calendar-button.h \
 	empathy-call-utils.h			\
 	empathy-cell-renderer-activatable.h	\
 	empathy-cell-renderer-expander.h	\
@@ -115,10 +97,8 @@ libempathy_gtk_headers =			\
 	empathy-chat.h				\
 	empathy-contact-blocking-dialog.h	\
 	empathy-contact-chooser.h		\
-	empathy-live-search.h			\
 	empathy-contact-search-dialog.h		\
 	empathy-contact-widget.h		\
-	empathy-contactinfo-utils.h		\
 	empathy-dialpad-widget.h		\
 	empathy-dialpad-button.h		\
 	empathy-geometry.h			\
@@ -134,9 +114,6 @@ libempathy_gtk_headers =			\
 	empathy-individual-view.h		\
 	empathy-individual-widget.h		\
 	empathy-input-text-view.h		\
-	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		\
@@ -163,7 +140,6 @@ libempathy_gtk_headers =			\
 	empathy-theme-manager.h			\
 	empathy-tls-dialog.h			\
 	empathy-ui-utils.h			\
-	empathy-user-info.h			\
 	empathy-plist.h				\
 	empathy-theme-adium.h			\
 	empathy-webkit-utils.h			\
@@ -181,7 +157,7 @@ libempathy_gtk_la_LDFLAGS = \
 libempathy_gtk_la_SOURCES =			\
 	$(libempathy_gtk_handwritten_source)	\
 	$(libempathy_gtk_headers)		\
-	totem-subtitle-encoding.c totem-subtitle-encoding.h
+	$(NULL)
 
 # do not distribute generated files
 nodist_libempathy_gtk_la_SOURCES =\
@@ -190,6 +166,7 @@ nodist_libempathy_gtk_la_SOURCES =\
 libempathy_gtk_la_LIBADD =			\
 	$(EMPATHY_LIBS)			\
 	$(EMPATHY_LIBS)			\
+	$(TPAW_LIBS)			\
 	$(GTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
 	$(CANBERRA_LIBS) \
@@ -200,7 +177,6 @@ libempathy_gtk_la_LIBADD =			\
 	$(GCR_LIBS)				\
 	$(MEEGO_LIBS)				\
 	$(CHEESE_LIBS)				\
-	$(top_builddir)/libempathy-gtk/egg-list-box/libegglistbox.la \
 	$(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
@@ -209,10 +185,7 @@ check_c_sources = \
 include $(top_srcdir)/tools/check-coding-style.mk
 check-local: check-coding-style
 
-uidir = $(datadir)/empathy
-ui_DATA = 					\
-	empathy-contact-widget.ui		\
-	empathy-contact-blocking-dialog.ui	\
+account_widgets_ui_files =			\
 	empathy-account-widget-generic.ui	\
 	empathy-account-widget-jabber.ui	\
 	empathy-account-widget-msn.ui		\
@@ -223,6 +196,12 @@ ui_DATA = 					\
 	empathy-account-widget-yahoo.ui		\
 	empathy-account-widget-groupwise.ui	\
 	empathy-account-widget-aim.ui		\
+	$(NULL)
+
+uidir = $(datadir)/empathy
+ui_DATA = 					\
+	empathy-contact-widget.ui		\
+	empathy-contact-blocking-dialog.ui	\
 	empathy-status-preset-dialog.ui		\
 	empathy-log-window.ui			\
 	empathy-chat.ui				\
@@ -240,7 +219,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
 			--ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \
-			--fprod "#include <libempathy-gtk/@filename@>\n" \
+			--fprod '#include "@filename@"\n' \
 			--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
 			--eprod "GType @enum_name@_get_type (void);\n" \
 		$(libempathy_gtk_headers) ) > xgen-gth \
@@ -267,15 +246,30 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers)
 	&& cp xgen-gtc $(@F) \
 	&& rm -f xgen-gtc
 
-EXTRA_DIST =			\
+EXTRA_DIST =					\
 	$(ui_DATA)
 
 if HAVE_GEOCLUE
+geoclue-interface.c: geoclue-interface.h
+geoclue-interface.h: Makefile.am
+	gdbus-codegen						\
+		--interface-prefix org.freedesktop.GeoClue2.	\
+		--c-namespace GClue				\
+		--generate-c-code geoclue-interface		\
+		$(GEOCLUE_XML_FILE)
+
+BUILT_SOURCES += \
+	geoclue-interface.h \
+	geoclue-interface.c
+
 libempathy_gtk_handwritten_source +=		\
-	empathy-location-manager.c
+	empathy-location-manager.c \
+	empathy-geoclue-helper.c
 
 libempathy_gtk_headers +=			\
-	empathy-location-manager.h
+	empathy-location-manager.h \
+	empathy-geoclue-helper.h
+
 else
 EXTRA_DIST +=					\
 	empathy-location-manager.c		\
diff --git a/libempathy-gtk/egg-list-box b/libempathy-gtk/egg-list-box
deleted file mode 160000
-Subproject ce28bb7b142c3adfe007672300769daae1f9253
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 03aeacf71..69fc54fe2 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -22,14 +22,13 @@
  */
 
 #include "config.h"
+#include "empathy-account-chooser.h"
 
 #include <glib/gi18n-lib.h>
-
-#include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-account-chooser
@@ -840,7 +839,7 @@ account_chooser_filter_ready_cb (gboolean is_enabled,
   store = GTK_LIST_STORE (gtk_combo_box_get_model (combobox));
 
   icon_name = tp_account_get_icon_name (account);
-  pixbuf = empathy_pixbuf_from_icon_name (icon_name,
+  pixbuf = tpaw_pixbuf_from_icon_name (icon_name,
     GTK_ICON_SIZE_BUTTON);
 
   gtk_list_store_set (store, iter,
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index d58fcf12f..5302ad702 100644
--- a/libempathy-gtk/empathy-account-chooser.h
+++ b/libempathy-gtk/empathy-account-chooser.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNT_CHOOSER_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-selector-dialog.c b/libempathy-gtk/empathy-account-selector-dialog.c
index 72a7b2ffd..0dd67ea7c 100644
--- a/libempathy-gtk/empathy-account-selector-dialog.c
+++ b/libempathy-gtk/empathy-account-selector-dialog.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-account-selector-dialog.h"
 
 enum
diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/libempathy-gtk/empathy-account-widget-aim.ui
deleted file mode 100644
index 8ceacbf47..000000000
--- a/libempathy-gtk/empathy-account-widget-aim.ui
+++ /dev/null
@@ -1,299 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5222</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_aim_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_screenname">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Screen _Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_screenname</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_screenname">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; MyScreenName</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</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">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_aim_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_screenname_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your AIM screen name?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_screenname_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; MyScreenName</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your AIM password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-generic.ui b/libempathy-gtk/empathy-account-widget-generic.ui
deleted file mode 100644
index c37da5e01..000000000
--- a/libempathy-gtk/empathy-account-widget-generic.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkVBox" id="vbox_generic_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander_advanced_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">150</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">6</property>
-                <property name="resize_mode">queue</property>
-                <child>
-                  <object class="GtkGrid" id="grid_advanced_settings">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui b/libempathy-gtk/empathy-account-widget-groupwise.ui
deleted file mode 100644
index cfca2e345..000000000
--- a/libempathy-gtk/empathy-account-widget-groupwise.ui
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_groupwise_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_groupwise_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_groupwise_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</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">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_groupwise_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your GroupWise User ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your GroupWise password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui
deleted file mode 100644
index 865a33c08..000000000
--- a/libempathy-gtk/empathy-account-widget-icq.ui
+++ /dev/null
@@ -1,320 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5222</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_icq_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_uin">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">ICQ _UIN</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_uin</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_uin">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; 123456789</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_charset">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Ch_aracter set</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_charset</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_charset">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</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">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_icq_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_uin_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your ICQ UIN?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_uin_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; 123456789</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your ICQ password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
deleted file mode 100644
index c027fb250..000000000
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-irc.h"
-#include "empathy-ui-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
-
-typedef struct {
-  EmpathyAccountWidget *self;
-
-  GtkWidget *vbox_settings;
-
-  GtkWidget *network_chooser;
-} EmpathyAccountWidgetIrc;
-
-static void
-account_widget_irc_destroy_cb (GtkWidget *widget,
-                               EmpathyAccountWidgetIrc *settings)
-{
-  g_slice_free (EmpathyAccountWidgetIrc, settings);
-}
-
-static void
-account_widget_irc_setup (EmpathyAccountWidgetIrc *settings)
-{
-  gchar *nick = NULL;
-  gchar *fullname = NULL;
-  EmpathyAccountSettings *ac_settings;
-
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  nick = empathy_account_settings_dup_string (ac_settings, "account");
-  fullname = empathy_account_settings_dup_string (ac_settings,
-      "fullname");
-
-  if (nick == NULL)
-    {
-      nick = g_strdup (g_get_user_name ());
-
-      empathy_account_settings_set (ac_settings,
-        "account", g_variant_new_string (nick));
-    }
-
-  if (fullname == NULL)
-    {
-      fullname = g_strdup (g_get_real_name ());
-
-      if (fullname == NULL)
-          fullname = g_strdup (nick);
-
-      empathy_account_settings_set (ac_settings,
-          "fullname", g_variant_new_string (fullname));
-    }
-
-  g_free (nick);
-  g_free (fullname);
-}
-
-static void
-network_changed_cb (EmpathyIrcNetworkChooser *chooser,
-    EmpathyAccountWidgetIrc *settings)
-{
-  empathy_account_widget_changed (settings->self);
-}
-
-/**
- * set_password_prompt_if_needed:
- *
- * If @password is not empty, this function sets the 'password-prompt' param
- * on @ac_settings. This will ensure that Idle actually asks for the password
- * when connecting.
- *
- * Return: %TRUE if the password-prompt param has been changed
- */
-static gboolean
-set_password_prompt_if_needed (EmpathyAccountSettings *ac_settings,
-    const gchar *password)
-{
-  gboolean prompt;
-
-  prompt = !tp_str_empty (password);
-
-  if (prompt == empathy_account_settings_get_boolean (ac_settings,
-        "password-prompt"))
-    return FALSE;
-
-  empathy_account_settings_set (ac_settings, "password-prompt",
-      g_variant_new_boolean (prompt));
-
-  return TRUE;
-}
-
-static void
-entry_password_changed_cb (GtkEntry *entry,
-    EmpathyAccountWidgetIrc *settings)
-{
-  const gchar *password;
-  EmpathyAccountSettings *ac_settings;
-
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  password = gtk_entry_get_text (entry);
-
-  set_password_prompt_if_needed (ac_settings, password);
-
-  g_object_unref (ac_settings);
-}
-
-EmpathyIrcNetworkChooser *
-empathy_account_widget_irc_build (EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **table_common_settings,
-    GtkWidget **box)
-{
-  EmpathyAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
-  GtkWidget *entry_password;
-  gchar *password;
-
-  settings = g_slice_new0 (EmpathyAccountWidgetIrc);
-  settings->self = self;
-
-  self->ui_details->gui = empathy_builder_get_file (filename,
-      "table_irc_settings", table_common_settings,
-      "vbox_irc", box,
-      "table_irc_settings", &settings->vbox_settings,
-      "entry_password", &entry_password,
-      NULL);
-
-  /* Add network chooser button */
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  settings->network_chooser = empathy_irc_network_chooser_new (ac_settings);
-
-  g_signal_connect (settings->network_chooser, "changed",
-      G_CALLBACK (network_changed_cb), settings);
-
-  gtk_grid_attach (GTK_GRID (*table_common_settings),
-      settings->network_chooser, 1, 0, 1, 1);
-
-  gtk_widget_show (settings->network_chooser);
-
-  account_widget_irc_setup (settings);
-
-  empathy_account_widget_handle_params (self,
-      "entry_nick", "account",
-      "entry_fullname", "fullname",
-      "entry_password", "password",
-      "entry_quit_message", "quit-message",
-      "entry_username", "username",
-      NULL);
-
-  empathy_builder_connect (self->ui_details->gui, settings,
-      "table_irc_settings", "destroy", account_widget_irc_destroy_cb,
-      NULL);
-
-  self->ui_details->default_focus = g_strdup ("entry_nick");
-
-  g_object_unref (ac_settings);
-
-  /* Automatically set password-prompt when needed */
-  password = empathy_account_settings_dup_string (ac_settings, "password");
-
-  if (set_password_prompt_if_needed (ac_settings, password))
-    {
-      /* Apply right now to save password-prompt */
-      empathy_account_settings_apply_async (ac_settings, NULL, NULL);
-    }
-
-  g_free (password);
-
-  g_signal_connect (entry_password, "changed",
-      G_CALLBACK (entry_password_changed_cb), settings);
-
-  return EMPATHY_IRC_NETWORK_CHOOSER (settings->network_chooser);
-}
-
-EmpathyIrcNetworkChooser *
-empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **box)
-{
-  EmpathyAccountWidgetIrc *settings;
-  EmpathyAccountSettings *ac_settings;
-  GtkAlignment *alignment;
-
-  settings = g_slice_new0 (EmpathyAccountWidgetIrc);
-  settings->self = self;
-
-  self->ui_details->gui = empathy_builder_get_file (filename,
-      "vbox_irc_simple", box,
-      "alignment_network_simple", &alignment,
-      NULL);
-
-  /* Add network chooser button */
-  g_object_get (settings->self, "settings", &ac_settings, NULL);
-
-  settings->network_chooser = empathy_irc_network_chooser_new (ac_settings);
-
-  g_signal_connect (settings->network_chooser, "changed",
-      G_CALLBACK (network_changed_cb), settings);
-
-  gtk_container_add (GTK_CONTAINER (alignment), settings->network_chooser);
-
-  gtk_widget_show (settings->network_chooser);
-
-  empathy_account_widget_handle_params (self,
-      "entry_nick_simple", "account",
-      NULL);
-
-  empathy_builder_connect (self->ui_details->gui, settings,
-      "vbox_irc_simple", "destroy", account_widget_irc_destroy_cb,
-      NULL);
-
-  self->ui_details->default_focus = g_strdup ("entry_nick_simple");
-
-  g_object_unref (ac_settings);
-
-  return EMPATHY_IRC_NETWORK_CHOOSER (settings->network_chooser);
-}
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
deleted file mode 100644
index bcd45b76a..000000000
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
-#define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
-
-#include <gtk/gtk.h>
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-irc-network-chooser.h>
-
-G_BEGIN_DECLS
-
-EmpathyIrcNetworkChooser * empathy_account_widget_irc_build (
-    EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **table_common_settings,
-    GtkWidget **box);
-
-EmpathyIrcNetworkChooser * empathy_account_widget_irc_build_simple (
-    EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **box);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNT_WIDGET_IRC_H__ */
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
deleted file mode 100644
index fc72974b3..000000000
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ /dev/null
@@ -1,603 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkDialog" id="irc_network_dialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Network</property>
-    <property name="window_position">center-on-parent</property>
-    <property name="icon_name">gtk-edit</property>
-    <property name="type_hint">dialog</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="skip_pager_hint">True</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox10">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area10">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame14">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment28">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkGrid" id="greid14">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkLabel" id="label_network">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Network</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_charset">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Character set</property>
-                        <style>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry_network">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="combobox_charset">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_network1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Network</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment29">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkGrid" id="grid15">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                        <object class="GtkVBox" id="vbox1">
-                        <property name="visible">True</property>
-	                <property name="spacing">0</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow_network_server">
-                        <property name="height_request">120</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="shadow_type">in</property>
-                        <property name="expand">True</property>
-                        <child>
-                          <object class="GtkTreeView" id="treeview_servers">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="enable_search">False</property>
-                            <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="treeview-selection1"/>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToolbar" id="toolbar_network_server">
-                        <property name="visible">True</property>
-                        <property name="icon_size">1</property>
-                        <style>
-                          <class name="inline-toolbar"/>
-                        </style>
-                        <child>
-                          <object class="GtkToolButton" id="button_add">
-                            <property name="tooltip-text" translatable="yes">Add…</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">list-add-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_remove">
-                            <property name="tooltip-text" translatable="yes">Remove</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">list-remove-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_up">
-                            <property name="tooltip-text" translatable="yes" comments="Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority">Up</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">go-up-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkToolButton" id="button_down">
-                            <property name="tooltip-text" translatable="yes" comments="Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority">Down</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="icon_name">go-down-symbolic</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-               </object>
-              </child>
-             </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_servers">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Servers</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="-7">button_close</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkVBox" id="vbox_irc">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkGrid" id="table_irc_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_nick">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password_note">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="xalign">0</property>
-            <property name="yalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">Most IRC servers don't need a password, so if you're not sure, don't enter a password.</property>
-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_network2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Network</property>
-            <property name="use_underline">True</property>A
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_nick">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Nickname</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_nick</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_irc_settings1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">12</property>
-            <child>
-              <object class="GtkEntry" id="entry_quit_message">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_quit_message">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Quit message</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_fullname">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_fullname">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Real name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_nick</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">Username</property>
-                <property name="use_underline">True</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_username">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label_advanced">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_irc_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_network_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">Which IRC network?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_network_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_nick_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your IRC nickname?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment_nick_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="top_padding">6</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_nick_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sg_field_labels">
-    <widgets>
-      <widget name="label_network2"/>
-      <widget name="label_nick"/>
-      <widget name="label_password"/>
-      <widget name="label_username"/>
-      <widget name="label_fullname"/>
-      <widget name="label_quit_message"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui
deleted file mode 100644
index 8422daa0c..000000000
--- a/libempathy-gtk/empathy-account-widget-jabber.ui
+++ /dev/null
@@ -1,792 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">127</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">65555</property>
-    <property name="value">5222</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_fb_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Facebook username?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox2">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_fb_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_fb_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">4</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">This is your username, not your normal Facebook login.
-If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Facebook password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_fb_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_fb_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <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="xalign">0</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_gtalk_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Google ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox1b">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="spacing">4</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_g_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</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="label_g_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Google password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_g_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_g_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <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="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_jabber_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="valign">start</property>
-            <property name="hexpand">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="vbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="valign">start</property>
-            <child>
-              <object class="GtkLabel" id="label_username_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username_g_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@gmail.com</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_username_f_example">
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="xpad">3</property>
-                <property name="label" translatable="yes" comments="This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.">This is your username, not your normal Facebook login.
-If you are facebook.com/&lt;b&gt;badger&lt;/b&gt;, enter &lt;b&gt;badger&lt;/b&gt;.
-Use &lt;a href="http://www.facebook.com/username/"&gt;this page&lt;/a&gt; to choose a Facebook username if you don't have one.</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">2</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="hexpand">True</property>
-            <property name="use_action_appearance">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="justify">right</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">200</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkGrid" id="grid_advanced_settings">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="border_width">6</property>
-                    <property name="row_spacing">6</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkEntry" id="entry_resource">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spinbutton_priority">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="adjustment">adjustment1</property>
-                        <property name="climb_rate">1</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_ignore_ssl_errors">
-                        <property name="label" translatable="yes">I_gnore SSL certificate errors</property>
-                        <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="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_priority">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Priori_ty</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">spinbutton_priority</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_resource">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">Reso_urce</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">entry_resource</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_encryption">
-                        <property name="label" translatable="yes">Encr_yption required (TLS/SSL)</property>
-                        <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="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Override server settings</property>
-                        <attributes>
-                          <attribute name="weight" value="bold"/>
-                        </attributes>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">4</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_server">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Server</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">entry_server</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_port">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">1</property>
-                        <property name="label" translatable="yes">_Port</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">spinbutton_port</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_ssl">
-                        <property name="label" translatable="yes">Use old SS_L</property>
-                        <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="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">7</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="entry_server">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">â—�</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">5</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkSpinButton" id="spinbutton_port">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">â—�</property>
-                        <property name="adjustment">adjustment2</property>
-                        <property name="climb_rate">1</property>
-                        <property name="numeric">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">6</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_jabber_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Jabber ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_id_create">
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your desired Jabber ID?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="vbox1a">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="margin_left">12</property>
-        <property name="spacing">4</property>
-        <child>
-          <object class="GtkEntry" id="entry_id_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</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="label_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0.10000000149011612</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@jabber.org</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your Jabber password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_create">
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="ypad">6</property>
-        <property name="label" translatable="yes">What is your desired Jabber password?</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkEntry" id="entry_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="margin_left">12</property>
-        <property name="visibility">False</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">5</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <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="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">6</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-local-xmpp.ui b/libempathy-gtk/empathy-account-widget-local-xmpp.ui
deleted file mode 100644
index 460c41cbf..000000000
--- a/libempathy-gtk/empathy-account-widget-local-xmpp.ui
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkVBox" id="vbox_salut_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <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>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <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>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <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>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_nickname">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Nic_kname</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_nickname</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_last_name">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Last Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_last_name</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">1</property>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_first_name">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_First Name</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_first_name</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander_advanced_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">12</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <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>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_published">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Published Name</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_published</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <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>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <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>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_jid">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Jabber ID</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_jid</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_email">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">E-_mail address</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_email</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</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">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkSizeGroup" id="sg_field_labels">
-    <widgets>
-      <widget name="label_nickname"/>
-      <widget name="label_last_name"/>
-      <widget name="label_first_name"/>
-      <widget name="label_published"/>
-      <widget name="label_jid"/>
-      <widget name="label_email"/>
-    </widgets>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui
deleted file mode 100644
index 4b0614f33..000000000
--- a/libempathy-gtk/empathy-account-widget-msn.ui
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_msn_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_msn_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Login I_D</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@hotmail.com</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkGrid" id="grid_advanced_msn_settings">
-            <property name="visible">True</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="label_port">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Port</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton_port</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_server">
-                <property name="visible">True</property>
-                <property name="xalign">1</property>
-                <property name="label" translatable="yes">_Server</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">entry_server</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_server">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton_port">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="adjustment">adjustment1</property>
-                <property name="climb_rate">1</property>
-                <property name="numeric">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_msn_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@hotmail.com</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Windows Live password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
deleted file mode 100644
index 988b09883..000000000
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2009 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: Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
-#define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
-
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-struct _EmpathyAccountWidgetUIDetails {
-  GtkBuilder *gui;
-
-  char *default_focus;
-};
-
-
-void empathy_account_widget_handle_params (EmpathyAccountWidget *self,
-    const gchar *first_widget,
-    ...);
-
-void empathy_account_widget_setup_widget (EmpathyAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *param_name);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ */
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
deleted file mode 100644
index 4568cf175..000000000
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- *          Frederic Peters <fpeters@0d.be>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
-#include "empathy-ui-utils.h"
-
-typedef struct {
-  EmpathyAccountWidget *self;
-  GtkWidget *vbox_settings;
-
-  GtkWidget *label_stun_server;
-  GtkWidget *entry_stun_server;
-  GtkWidget *label_stun_port;
-  GtkWidget *spinbutton_stun_port;
-  GtkWidget *checkbutton_discover_stun;
-  GtkWidget *combobox_transport;
-  GtkWidget *combobox_keep_alive_mechanism;
-  GtkWidget *spinbutton_keepalive_interval;
-} EmpathyAccountWidgetSip;
-
-static void
-account_widget_sip_destroy_cb (GtkWidget *widget,
-                               EmpathyAccountWidgetSip *settings)
-{
-  g_slice_free (EmpathyAccountWidgetSip, settings);
-}
-
-static void
-account_widget_sip_discover_stun_toggled_cb (
-    GtkWidget *checkbox,
-    EmpathyAccountWidgetSip *settings)
-{
-  gboolean active;
-
-  active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
-  gtk_widget_set_sensitive (settings->label_stun_server, !active);
-  gtk_widget_set_sensitive (settings->entry_stun_server, !active);
-  gtk_widget_set_sensitive (settings->label_stun_port, !active);
-  gtk_widget_set_sensitive (settings->spinbutton_stun_port, !active);
-}
-
-static void
-keep_alive_mechanism_combobox_change_cb (GtkWidget *widget,
-    EmpathyAccountWidgetSip *self)
-{
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  gchar *mechanism;
-  gboolean enabled;
-
-  /* Unsensitive the keep-alive spin button if keep-alive is disabled */
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
-    return;
-
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-  gtk_tree_model_get (model, &iter, 0, &mechanism, -1);
-
-  enabled = tp_strdiff (mechanism, "none");
-
-  gtk_widget_set_sensitive (self->spinbutton_keepalive_interval, enabled);
-  g_free (mechanism);
-}
-
-static void
-checkbutton_tel_toggled (
-    GtkWidget *checkbox,
-    EmpathyAccountWidgetSip *sip_settings)
-{
-  EmpathyAccountSettings *settings;
-
-  settings = empathy_account_widget_get_settings (sip_settings->self);
-
-  empathy_account_settings_set_uri_scheme_tel (settings,
-      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)));
-
-  empathy_account_widget_changed (sip_settings->self);
-}
-
-GtkWidget *
-empathy_account_widget_sip_build (EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **grid_common_settings)
-{
-  EmpathyAccountWidgetSip *settings;
-  GtkWidget *vbox_settings;
-  gboolean is_simple;
-  GtkWidget *grid_advanced;
-
-  g_object_get (self, "simple", &is_simple, NULL);
-
-  if (is_simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_sip_simple", &vbox_settings,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_userid_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_userid_simple");
-    }
-  else
-    {
-      GtkListStore *store;
-      GtkCellRenderer *renderer;
-      GtkToggleButton *checkbutton_tel;
-
-      settings = g_slice_new0 (EmpathyAccountWidgetSip);
-      settings->self = self;
-
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_settings", grid_common_settings,
-          "grid_advanced_sip_settings", &grid_advanced,
-          "vbox_sip_settings", &vbox_settings,
-          "label_stun-server", &settings->label_stun_server,
-          "entry_stun-server", &settings->entry_stun_server,
-          "label_stun-port", &settings->label_stun_port,
-          "spinbutton_stun-port", &settings->spinbutton_stun_port,
-          "checkbutton_discover-stun", &settings->checkbutton_discover_stun,
-          "spinbutton_keepalive-interval",
-            &settings->spinbutton_keepalive_interval,
-          "checkbutton_tel", &checkbutton_tel,
-          NULL);
-      settings->vbox_settings = vbox_settings;
-
-      gtk_toggle_button_set_active (checkbutton_tel,
-          empathy_account_settings_has_uri_scheme_tel (
-            empathy_account_widget_get_settings (self)));
-
-      empathy_account_widget_handle_params (self,
-          "entry_userid", "account",
-          "entry_password", "password",
-          "checkbutton_discover-stun", "discover-stun",
-          "entry_stun-server", "stun-server",
-          "spinbutton_stun-port", "stun-port",
-          "entry_auth-user", "auth-user",
-          "entry_proxy-host", "proxy-host",
-          "spinbutton_port", "port",
-          "checkbutton_loose-routing", "loose-routing",
-          "checkbutton_discover-binding", "discover-binding",
-          "spinbutton_keepalive-interval", "keepalive-interval",
-          "checkbutton_ignore-tls-errors", "ignore-tls-errors",
-          "entry_local-ip-address", "local-ip-address",
-          "spinbutton_local-port", "local-port",
-          NULL);
-
-      account_widget_sip_discover_stun_toggled_cb (
-          settings->checkbutton_discover_stun,
-          settings);
-
-      empathy_builder_connect (self->ui_details->gui, settings,
-          "vbox_sip_settings", "destroy", account_widget_sip_destroy_cb,
-          "checkbutton_discover-stun", "toggled",
-          account_widget_sip_discover_stun_toggled_cb,
-          "checkbutton_tel", "toggled", checkbutton_tel_toggled,
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_userid");
-
-      /* Create the 'transport' combo box. The first column has to contain the
-       * value of the param. */
-      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-      settings->combobox_transport = gtk_combo_box_new_with_model (
-          GTK_TREE_MODEL (store));
-
-      renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (
-          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, TRUE);
-      gtk_cell_layout_add_attribute (
-          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, "text", 1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "auto", 1, _("Auto"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "udp", 1, _("UDP"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "tcp", 1, _("TCP"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "tls", 1, _("TLS"), -1);
-
-      empathy_account_widget_setup_widget (self, settings->combobox_transport,
-          "transport");
-
-      gtk_grid_attach (GTK_GRID (grid_advanced), settings->combobox_transport,
-          1, 11, 3, 1);
-
-      gtk_widget_show (settings->combobox_transport);
-
-      /* Create the 'keep-alive mechanism' combo box */
-      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-      settings->combobox_keep_alive_mechanism = gtk_combo_box_new_with_model (
-          GTK_TREE_MODEL (store));
-
-      renderer = gtk_cell_renderer_text_new ();
-      gtk_cell_layout_pack_start (
-          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
-          TRUE);
-      gtk_cell_layout_add_attribute (
-          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
-          "text", 1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "auto", 1, _("Auto"), -1);
-
-      /* translators: this string is very specific to SIP's internal; maybe
-       * best to keep the English version. */
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "register", 1, _("Register"), -1);
-
-      /* translators: this string is very specific to SIP's internal; maybe
-       * best to keep the English version. */
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "options", 1, _("Options"), -1);
-
-      gtk_list_store_insert_with_values (store, NULL, -1,
-          0, "none", 1, _("None"), -1);
-
-      g_signal_connect (settings->combobox_keep_alive_mechanism, "changed",
-          G_CALLBACK (keep_alive_mechanism_combobox_change_cb), settings);
-
-      empathy_account_widget_setup_widget (self,
-          settings->combobox_keep_alive_mechanism, "keepalive-mechanism");
-
-      gtk_grid_attach (GTK_GRID (grid_advanced),
-          settings->combobox_keep_alive_mechanism,
-          1, 7, 3, 1);
-
-      gtk_widget_show (settings->combobox_keep_alive_mechanism);
-    }
-
-  return vbox_settings;
-}
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
deleted file mode 100644
index 84e96e7b6..000000000
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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: Frederic Peters <fpeters@0d.be>
- */
-
-#ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
-#define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
-
-#include <gtk/gtk.h>
-#include <libempathy-gtk/empathy-account-widget.h>
-
-G_BEGIN_DECLS
-
-GtkWidget * empathy_account_widget_sip_build (EmpathyAccountWidget *self,
-    const char *filename,
-    GtkWidget **grid_common_settings);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNT_WIDGET_SIP_H__ */
diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui
deleted file mode 100644
index 7caa7cad6..000000000
--- a/libempathy-gtk/empathy-account-widget-sip.ui
+++ /dev/null
@@ -1,731 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment3">
-    <property name="upper">10000</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkAdjustment" id="adjustment4">
-    <property name="upper">65535</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_sip_settings">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">Pass_word</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_userid">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_userid">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">1</property>
-            <property name="label" translatable="yes">_Username</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_userid</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@my.sip.server</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.80000000000000004"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <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="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="checkbutton_tel">
-            <property name="label" translatable="yes">Use this account to call _landlines and mobile phones</property>
-            <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="xalign">0</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="top_attach">4</property>
-            <property name="left_attach">0</property>
-            <property name="width">4</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander_advanced">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
-            <property name="height_request">200</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="shadow_type">in</property>
-            <child>
-              <object class="GtkViewport" id="viewport1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="resize_mode">queue</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="xalign">0</property>
-                    <property name="border_width">6</property>
-                    <child>
-                      <object class="GtkGrid" id="grid_advanced_sip_settings">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="entry_stun-server">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_auth-user">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">10</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="entry_proxy-host">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_keepalive-interval">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment3</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">8</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                         <object class="GtkEntry" id="entry_local-ip-address">
-                           <property name="visible">True</property>
-                           <property name="can_focus">True</property>
-                         </object>
-                         <packing>
-                           <property name="left_attach">1</property>
-                           <property name="top_attach">14</property>
-                         </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_nat_traversal">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">NAT Traversal Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_proxy">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Proxy Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">4</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_misc">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Miscellaneous Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">9</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment7">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">24</property>
-                            <child>
-                              <object class="GtkLabel" id="label_stun-server">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">STUN Server</property>
-                                <property name="mnemonic_widget">entry_stun-server</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_discover-stun">
-                                <property name="label" translatable="yes">Discover the STUN server automatically</property>
-                                <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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_discover-binding">
-                                <property name="label" translatable="yes">Discover Binding</property>
-                                <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="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">3</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment8">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_proxy-host">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Server</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">5</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_keep_alive">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Keep-Alive Options</property>
-                            <attributes>
-                              <attribute name="weight" value="bold"/>
-                            </attributes>
-                          </object>
-                          <packing>
-                            <property name="top_attach">6</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_keepalive-mechanism">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Mechanism</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">7</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment11">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_keepalive-interval">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Interval (seconds)</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">8</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment12">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_auth-user">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Authentication username</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">10</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_transport">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Transport</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">11</property>
-                            <property name="left_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_loose-routing">
-                                <property name="label" translatable="yes">Loose Routing</property>
-                                <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="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">12</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment15">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkCheckButton" id="checkbutton_ignore-tls-errors">
-                                <property name="label" translatable="yes">Ignore TLS Errors</property>
-                                <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="draw_indicator">True</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="top_attach">13</property>
-                            <property name="left_attach">0</property>
-                            <property name="width">4</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_stun-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                            <property name="mnemonic_widget">spinbutton_stun-port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_stun-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment1</property>
-                            <property name="climb_rate">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment2</property>
-                            <property name="climb_rate">1</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkAlignment" id="alignment16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="left_padding">12</property>
-                            <child>
-                              <object class="GtkLabel" id="label_local-ip-address">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Local IP Address</property>
-                                <property name="mnemonic_widget">entry_local-ip-address</property>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label_local-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Port</property>
-                            <property name="mnemonic_widget">spinbutton_local-port</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkSpinButton" id="spinbutton_local-port">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment4</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">3</property>
-                            <property name="top_attach">14</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label_expander">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_sip_simple">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_userid_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your SIP login ID?</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_userid_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</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="label_example">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; user@my.sip.server</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.80000000000000004"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your SIP account password?</property>
-      </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="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember Password</property>
-        <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="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget-yahoo.ui b/libempathy-gtk/empathy-account-widget-yahoo.ui
deleted file mode 100644
index 9d002538c..000000000
--- a/libempathy-gtk/empathy-account-widget-yahoo.ui
+++ /dev/null
@@ -1,330 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy toplevel-contextual -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">5050</property>
-    <property name="lower">1</property>
-    <property name="upper">65555</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkVBox" id="vbox_yahoo_settings">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkGrid" id="grid_common_settings">
-        <property name="visible">True</property>
-        <property name="column_spacing">12</property>
-        <property name="row_spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label_password">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Pass_word:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_password</property>
-          </object>
-          <packing>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_id">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Yahoo! I_D:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_id</property>
-          </object>
-          <packing>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_id">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="entry_password">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label_username_example">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="xpad">3</property>
-            <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-            <property name="use_markup">True</property>
-            <attributes>
-              <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkCheckButton" id="remember_password">
-            <property name="label" translatable="yes">Remember password</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="active">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">3</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </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="GtkExpander" id="expander1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <child>
-          <object class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <child>
-              <object class="GtkGrid" id="grid_advanced_settings">
-                <property name="visible">True</property>
-                <property name="column_spacing">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_ignore_invites">
-                    <property name="label" translatable="yes">I_gnore conference and chat room invitations</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="width">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_locale">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Room List locale:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_locale</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">1</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_charset">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Ch_aracter set:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">entry_charset</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">2</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_locale">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="entry_charset">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label_port">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">_Port:</property>
-                    <property name="use_underline">True</property>
-                    <property name="mnemonic_widget">spinbutton_port</property>
-                  </object>
-                  <packing>
-                    <property name="top_attach">3</property>
-                    <property name="left_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinbutton_port">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="adjustment">adjustment1</property>
-                    <property name="climb_rate">1</property>
-                    <property name="numeric">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Advanced</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">True</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-  <object class="GtkVBox" id="vbox_yahoo_simple">
-    <property name="visible">True</property>
-    <property name="orientation">vertical</property>
-    <property name="spacing">6</property>
-    <child>
-      <object class="GtkLabel" id="label_id_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Yahoo! ID?</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment1">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="bottom_padding">3</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkVBox" id="vbox2">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">4</property>
-            <child>
-              <object class="GtkEntry" id="entry_id_simple">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label_example">
-                <property name="visible">True</property>
-                <property name="xalign">0.10000000149011612</property>
-                <property name="label" translatable="yes">&lt;b&gt;Example:&lt;/b&gt; username</property>
-                <property name="use_markup">True</property>
-                <attributes>
-                  <attribute name="scale" value="0.8"/><!-- PANGO_SCALE_SMALL -->
-                </attributes>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label_password_simple">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="label" translatable="yes">What is your Yahoo! password?</property>
-      </object>
-      <packing>
-        <property name="position">2</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkAlignment" id="alignment2">
-        <property name="visible">True</property>
-        <property name="xalign">0</property>
-        <property name="yalign">0</property>
-        <property name="xscale">0.34999999403953552</property>
-        <property name="yscale">0.34999999403953552</property>
-        <property name="left_padding">12</property>
-        <child>
-          <object class="GtkEntry" id="entry_password_simple">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="visibility">False</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="position">3</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkCheckButton" id="remember_password_simple">
-        <property name="label" translatable="yes">Remember password</property>
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="receives_default">False</property>
-        <property name="active">True</property>
-        <property name="draw_indicator">True</property>
-      </object>
-      <packing>
-        <property name="position">4</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
deleted file mode 100644
index 794e7d524..000000000
--- a/libempathy-gtk/empathy-account-widget.c
+++ /dev/null
@@ -1,2339 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007-2009 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: Xavier Claessens <xclaesse@gmail.com>
- *          Martyn Russell <martyn@imendio.com>
- *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
- *          Jonathan Tellier <jonathan.tellier@gmail.com>
- *          Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include <dbus/dbus-protocol.h>
-
-#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.h"
-#include "empathy-ui-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
-
-typedef enum
-{
-  NO_SERVICE = 0,
-  GTALK_SERVICE,
-  FACEBOOK_SERVICE,
-  N_SERVICES
-} Service;
-
-typedef struct
-{
-  const gchar *label_username_example;
-  gboolean show_advanced;
-} ServiceInfo;
-
-static ServiceInfo services_infos[N_SERVICES] = {
-    { "label_username_example", TRUE },
-    { "label_username_g_example", FALSE },
-    { "label_username_f_example", FALSE },
-};
-
-struct _EmpathyAccountWidgetPriv {
-  EmpathyAccountSettings *settings;
-
-  GtkWidget *grid_common_settings;
-  GtkWidget *apply_button;
-  GtkWidget *cancel_button;
-  GtkWidget *entry_password;
-  GtkWidget *spinbutton_port;
-  GtkWidget *radiobutton_reuse;
-  GtkWidget *hbox_buttons;
-
-  gboolean simple;
-
-  gboolean contains_pending_changes;
-
-  /* An EmpathyAccountWidget can be used to either create an account or
-   * modify it. When we are creating an account, this member is set to TRUE */
-  gboolean creating_account;
-
-  /* whether there are any other real accounts. Necessary so we know whether
-   * it's safe to dismiss this widget in some cases (eg, whether the Cancel
-   * button should be sensitive) */
-  gboolean other_accounts_exist;
-
-  /* if TRUE, the GTK+ destroy signal has been fired and so the widgets
-   * embedded in this account widget can't be used any more
-   * workaround because some async callbacks can be called after the
-   * widget has been destroyed */
-  gboolean destroyed;
-
-  TpAccountManager *account_manager;
-
-  GtkWidget *param_account_widget;
-  GtkWidget *param_password_widget;
-
-  gboolean automatic_change;
-  GtkWidget *remember_password_widget;
-
-  /* Used only for IRC accounts */
-  EmpathyIrcNetworkChooser *irc_network_chooser;
-
-  /* Used for 'special' XMPP account having a service associated ensuring that
-   * JIDs have a specific suffix; such as Facebook for example */
-  gchar *jid_suffix;
-};
-
-enum {
-  PROP_PROTOCOL = 1,
-  PROP_SETTINGS,
-  PROP_SIMPLE,
-  PROP_CREATING_ACCOUNT,
-  PROP_OTHER_ACCOUNTS_EXIST,
-};
-
-enum {
-  HANDLE_APPLY,
-  ACCOUNT_CREATED,
-  CANCELLED,
-  CLOSE,
-  LAST_SIGNAL
-};
-
-enum {
-  RESPONSE_LAUNCH
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-#define CHANGED_TIMEOUT 300
-
-#define DIGIT             "0-9"
-#define DIGITS            "(["DIGIT"]+)"
-#define ALPHA             "a-zA-Z"
-#define ALPHAS            "(["ALPHA"]+)"
-#define ALPHADIGIT        ALPHA DIGIT
-#define ALPHADIGITS       "(["ALPHADIGIT"]+)"
-#define ALPHADIGITDASH    ALPHA DIGIT "-"
-#define ALPHADIGITDASHS   "(["ALPHADIGITDASH"]*)"
-
-#define HOSTNUMBER        "("DIGITS"\\."DIGITS"\\."DIGITS"\\."DIGITS")"
-#define TOPLABEL          "("ALPHAS \
-                            "| (["ALPHA"]"ALPHADIGITDASHS "["ALPHADIGIT"]))"
-#define DOMAINLABEL       "("ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
-                                       "["ALPHADIGIT"]))"
-#define HOSTNAME          "((" DOMAINLABEL "\\.)+" TOPLABEL ")"
-/* Based on http://www.ietf.org/rfc/rfc1738.txt (section 5) */
-#define HOST              "("HOSTNAME "|" HOSTNUMBER")"
-/* Based on http://www.ietf.org/rfc/rfc0822.txt (appendix D) */
-#define EMAIL_LOCALPART   "([^\\(\\)<>@,;:\\\\\"\\[\\]\\s]+)"
-
-/* UIN is digital according to the unofficial specification:
- * http://iserverd.khstu.ru/docum_ext/icqv5.html#CTS
- * 5 digits minimum according to http://en.wikipedia.org/wiki/ICQ#UIN
- * According to an user, we can also provide an email address instead of the
- * ICQ UIN. */
-#define ICQ_USER_NAME     "((["DIGIT"]{5,})|"EMAIL_LOCALPART"@"HOST")"
-
-/* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */
-#define IRC_SPECIAL       "_\\[\\]{}\\\\|`^"
-#define IRC_NICK_NAME     "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
-
-/* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2)
- * We just exclude invalid characters to avoid ucschars and other redundant
- * complexity */
-#define JABBER_USER_NAME  "([^@:'\"<>&\\s]+)"
-/* ID is an email according to the unofficial specification:
- * http://www.hypothetic.org/docs/msn/general/names.php */
-#define MSN_USER_NAME     EMAIL_LOCALPART
-/* Based on the official help:
- * http://help.yahoo.com/l/us/yahoo/edit/registration/edit-01.html
- * Looks like an email address can be used as well (bgo #655959)
- * */
-#define YAHOO_USER_NAME   "(["ALPHA"]["ALPHADIGIT"_\\.]{3,31})|("EMAIL_LOCALPART"@"HOST")"
-
-#define ACCOUNT_REGEX_ICQ      "^"ICQ_USER_NAME"$"
-#define ACCOUNT_REGEX_IRC      "^"IRC_NICK_NAME"$"
-#define ACCOUNT_REGEX_JABBER   "^"JABBER_USER_NAME"@[^@/]+"
-#define ACCOUNT_REGEX_MSN      "^"MSN_USER_NAME"@"HOST"$"
-#define ACCOUNT_REGEX_YAHOO    "^"YAHOO_USER_NAME"$"
-
-static void
-account_widget_set_control_buttons_sensitivity (EmpathyAccountWidget *self,
-    gboolean sensitive)
-{
-  /* we hit this case because of the 'other-accounts-exist' property handler
-   * being called during init (before constructed()) */
-  if (self->priv->apply_button == NULL || self->priv->cancel_button == NULL)
-    return;
-
-  gtk_widget_set_sensitive (self->priv->apply_button, sensitive);
-
-  if (sensitive)
-    {
-      /* We can't grab default if the widget hasn't be packed in a
-       * window */
-      GtkWidget *window;
-
-      window = gtk_widget_get_toplevel (self->priv->apply_button);
-      if (window != NULL &&
-          gtk_widget_is_toplevel (window))
-        {
-          gtk_widget_set_can_default (self->priv->apply_button, TRUE);
-          gtk_widget_grab_default (self->priv->apply_button);
-        }
-    }
-}
-
-static void
-account_widget_set_entry_highlighting (GtkEntry *entry,
-    gboolean highlight)
-{
-  g_return_if_fail (GTK_IS_ENTRY (entry));
-
-  if (highlight)
-    {
-      GtkStyleContext *style;
-      GdkRGBA color;
-
-      style = gtk_widget_get_style_context (GTK_WIDGET (entry));
-      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);
-
-      gtk_widget_override_background_color (GTK_WIDGET (entry), 0, &color);
-    }
-  else
-    {
-      gtk_widget_override_background_color (GTK_WIDGET (entry), 0, NULL);
-    }
-}
-
-static void
-account_widget_handle_control_buttons_sensitivity (EmpathyAccountWidget *self)
-{
-  gboolean is_valid;
-
-  is_valid = empathy_account_settings_is_valid (self->priv->settings);
-
-  account_widget_set_control_buttons_sensitivity (self, is_valid);
-
-  g_signal_emit (self, signals[HANDLE_APPLY], 0, is_valid);
-}
-
-static void
-account_widget_entry_changed_common (EmpathyAccountWidget *self,
-    GtkEntry *entry, gboolean focus)
-{
-  const gchar *str;
-  const gchar *param_name;
-  gboolean prev_status;
-  gboolean curr_status;
-
-  str = gtk_entry_get_text (entry);
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  prev_status = empathy_account_settings_parameter_is_valid (
-      self->priv->settings, param_name);
-
-  if (EMP_STR_EMPTY (str))
-    {
-      empathy_account_settings_unset (self->priv->settings, param_name);
-
-      if (focus)
-        {
-          gchar *value;
-
-          value = empathy_account_settings_dup_string (self->priv->settings,
-              param_name);
-
-          DEBUG ("Unset %s and restore to %s", param_name, value);
-          gtk_entry_set_text (entry, value ? value : "");
-          g_free (value);
-        }
-    }
-  else
-    {
-      DEBUG ("Setting %s to %s", param_name,
-          tp_strdiff (param_name, "password") ? str : "***");
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_string (str));
-    }
-
-  curr_status = empathy_account_settings_parameter_is_valid (
-      self->priv->settings, param_name);
-
-  if (curr_status != prev_status)
-    account_widget_set_entry_highlighting (entry, !curr_status);
-}
-
-static void
-account_widget_entry_changed_cb (GtkEditable *entry,
-    EmpathyAccountWidget *self)
-{
-  if (self->priv->automatic_change)
-    return;
-
-  account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
-  empathy_account_widget_changed (self);
-}
-
-static void
-account_widget_entry_map_cb (GtkEntry *entry,
-    EmpathyAccountWidget *self)
-{
-  const gchar *param_name;
-  gboolean is_valid;
-
-  /* need to initialize input highlighting */
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-  is_valid = empathy_account_settings_parameter_is_valid (self->priv->settings,
-      param_name);
-  account_widget_set_entry_highlighting (entry, !is_valid);
-}
-
-static void
-account_widget_int_changed_cb (GtkWidget *widget,
-    EmpathyAccountWidget *self)
-{
-  const gchar *param_name;
-  gint value;
-  const gchar *signature;
-
-  value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  signature = empathy_account_settings_get_dbus_signature (self->priv->settings,
-    param_name);
-  g_return_if_fail (signature != NULL);
-
-  DEBUG ("Setting %s to %d", param_name, value);
-
-  switch ((int)*signature)
-    {
-    case DBUS_TYPE_INT16:
-    case DBUS_TYPE_INT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_int32 (value));
-      break;
-    case DBUS_TYPE_INT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_int64 (value));
-      break;
-    case DBUS_TYPE_UINT16:
-    case DBUS_TYPE_UINT32:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_uint32 (value));
-      break;
-    case DBUS_TYPE_UINT64:
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_uint64 (value));
-      break;
-    default:
-      g_return_if_reached ();
-    }
-
-  empathy_account_widget_changed (self);
-}
-
-static void
-account_widget_checkbutton_toggled_cb (GtkWidget *widget,
-    EmpathyAccountWidget *self)
-{
-  gboolean     value;
-  gboolean     default_value;
-  const gchar *param_name;
-
-  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  /* FIXME: This is ugly! checkbox don't have a "not-set" value so we
-   * always unset the param and set the value if different from the
-   * default value. */
-  empathy_account_settings_unset (self->priv->settings, param_name);
-  default_value = empathy_account_settings_get_boolean (self->priv->settings,
-      param_name);
-
-  if (default_value == value)
-    {
-      DEBUG ("Unset %s and restore to %d", param_name, default_value);
-    }
-  else
-    {
-      DEBUG ("Setting %s to %d", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_boolean (value));
-    }
-
-  empathy_account_widget_changed (self);
-}
-
-static void
-account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
-    EmpathyAccountWidget *self)
-{
-  gboolean   value;
-  gint32       port = 0;
-
-  value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbutton_ssl));
-  port = empathy_account_settings_get_uint32 (self->priv->settings, "port");
-
-  if (value)
-    {
-      if (port == 5222 || port == 0)
-        port = 5223;
-    }
-  else
-    {
-      if (port == 5223 || port == 0)
-        port = 5222;
-    }
-
-  gtk_spin_button_set_value (GTK_SPIN_BUTTON (self->priv->spinbutton_port),
-      port);
-
-  self->priv->contains_pending_changes = TRUE;
-}
-
-static void
-account_widget_combobox_changed_cb (GtkWidget *widget,
-    EmpathyAccountWidget *self)
-{
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  const gchar *value;
-  GVariant *v;
-  const gchar *default_value = NULL;
-  const gchar *param_name;
-
-  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
-    return;
-
-  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-  /* the param value is stored in the first column */
-  gtk_tree_model_get (model, &iter, 0, &value, -1);
-
-  param_name = g_object_get_data (G_OBJECT (widget), "param_name");
-
-  v = empathy_account_settings_dup_default (self->priv->settings, param_name);
-  if (v != NULL && g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
-    default_value = g_variant_get_string (v, NULL);
-
-  if (!tp_strdiff (value, default_value))
-    {
-      DEBUG ("Unset %s and restore to %s", param_name, default_value);
-      empathy_account_settings_unset (self->priv->settings, param_name);
-    }
-  else
-    {
-      DEBUG ("Setting %s to %s", param_name, value);
-      empathy_account_settings_set (self->priv->settings, param_name,
-          g_variant_new_string (value));
-    }
-
-  empathy_account_widget_changed (self);
-
-  tp_clear_pointer (&v, g_variant_unref);
-}
-
-static void
-clear_icon_released_cb (GtkEntry *entry,
-    GtkEntryIconPosition icon_pos,
-    GdkEvent *event,
-    EmpathyAccountWidget *self)
-{
-  const gchar *param_name;
-
-  param_name = g_object_get_data (G_OBJECT (entry), "param_name");
-
-  DEBUG ("Unset %s", param_name);
-  empathy_account_settings_unset (self->priv->settings, param_name);
-  gtk_entry_set_text (entry, "");
-
-  empathy_account_widget_changed (self);
-}
-
-static void
-password_entry_changed_cb (GtkEditable *entry,
-    EmpathyAccountWidget *self)
-{
-  const gchar *str;
-
-  str = gtk_entry_get_text (GTK_ENTRY (entry));
-
-  gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-      GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
-}
-
-static void
-password_entry_activated_cb (GtkEntry *entry,
-    EmpathyAccountWidget *self)
-{
-    if (gtk_widget_get_sensitive (self->priv->apply_button))
-        empathy_account_widget_apply_and_log_in (self);
-}
-
-static void
-account_entry_activated_cb (GtkEntry *entry,
-    EmpathyAccountWidget *self)
-{
-    if (gtk_widget_get_sensitive (self->priv->apply_button))
-        empathy_account_widget_apply_and_log_in (self);
-}
-
-void
-empathy_account_widget_setup_widget (EmpathyAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *param_name)
-{
-  g_object_set_data_full (G_OBJECT (widget), "param_name",
-      g_strdup (param_name), g_free);
-
-  if (GTK_IS_SPIN_BUTTON (widget))
-    {
-      gint value = 0;
-      const gchar *signature;
-
-      signature = empathy_account_settings_get_dbus_signature (
-          self->priv->settings, param_name);
-      g_return_if_fail (signature != NULL);
-
-      switch ((int)*signature)
-        {
-          case DBUS_TYPE_INT16:
-          case DBUS_TYPE_INT32:
-            value = empathy_account_settings_get_int32 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_INT64:
-            value = empathy_account_settings_get_int64 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_UINT16:
-          case DBUS_TYPE_UINT32:
-            value = empathy_account_settings_get_uint32 (self->priv->settings,
-              param_name);
-            break;
-          case DBUS_TYPE_UINT64:
-            value = empathy_account_settings_get_uint64 (self->priv->settings,
-                param_name);
-            break;
-          default:
-            g_return_if_reached ();
-        }
-
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
-
-      g_signal_connect (widget, "value-changed",
-          G_CALLBACK (account_widget_int_changed_cb),
-          self);
-    }
-  else if (GTK_IS_ENTRY (widget))
-    {
-      gchar *str;
-
-      str = empathy_account_settings_dup_string (self->priv->settings,
-          param_name);
-      gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
-
-      if (!tp_strdiff (param_name, "account"))
-        self->priv->param_account_widget = widget;
-      else if (!tp_strdiff (param_name, "password"))
-        self->priv->param_password_widget = widget;
-
-      if (strstr (param_name, "password"))
-        {
-          gtk_entry_set_visibility (GTK_ENTRY (widget), FALSE);
-
-          /* Add 'clear' icon */
-          gtk_entry_set_icon_from_stock (GTK_ENTRY (widget),
-              GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
-
-          gtk_entry_set_icon_sensitive (GTK_ENTRY (widget),
-              GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
-
-          g_signal_connect (widget, "icon-release",
-              G_CALLBACK (clear_icon_released_cb), self);
-          g_signal_connect (widget, "changed",
-              G_CALLBACK (password_entry_changed_cb), self);
-          g_signal_connect (widget, "activate",
-              G_CALLBACK (password_entry_activated_cb), self);
-        }
-      else if (strstr (param_name, "account"))
-        g_signal_connect (widget, "activate",
-            G_CALLBACK (account_entry_activated_cb), self);
-
-      g_signal_connect (widget, "changed",
-          G_CALLBACK (account_widget_entry_changed_cb), self);
-      g_signal_connect (widget, "map",
-          G_CALLBACK (account_widget_entry_map_cb), self);
-
-      g_free (str);
-    }
-  else if (GTK_IS_TOGGLE_BUTTON (widget))
-    {
-      gboolean value = FALSE;
-
-      value = empathy_account_settings_get_boolean (self->priv->settings,
-          param_name);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);
-
-      g_signal_connect (widget, "toggled",
-          G_CALLBACK (account_widget_checkbutton_toggled_cb),
-          self);
-    }
-  else if (GTK_IS_COMBO_BOX (widget))
-    {
-      /* The combo box's model has to contain the param value in its first
-       * column (as a string) */
-      gchar *str;
-      GtkTreeModel *model;
-      GtkTreeIter iter;
-      gboolean valid;
-
-      str = empathy_account_settings_dup_string (self->priv->settings,
-          param_name);
-      model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
-
-      valid = gtk_tree_model_get_iter_first (model, &iter);
-      while (valid)
-        {
-          gchar *name;
-
-          gtk_tree_model_get (model, &iter, 0, &name, -1);
-          if (!tp_strdiff (name, str))
-            {
-              gtk_combo_box_set_active_iter (GTK_COMBO_BOX (widget), &iter);
-              valid = FALSE;
-            }
-          else
-            {
-              valid = gtk_tree_model_iter_next (model, &iter);
-            }
-
-          g_free (name);
-        }
-
-      g_free (str);
-
-      g_signal_connect (widget, "changed",
-          G_CALLBACK (account_widget_combobox_changed_cb),
-          self);
-    }
-  else
-    {
-      DEBUG ("Unknown type of widget for param %s", param_name);
-    }
-
-  gtk_widget_set_sensitive (widget,
-      empathy_account_settings_param_is_supported (self->priv->settings,
-        param_name));
-}
-
-static GHashTable *
-build_translated_params (void)
-{
-  GHashTable *hash;
-
-  hash = g_hash_table_new (g_str_hash, g_str_equal);
-  g_hash_table_insert (hash, "account", _("Account"));
-  g_hash_table_insert (hash, "password", _("Password"));
-  g_hash_table_insert (hash, "server", _("Server"));
-  g_hash_table_insert (hash, "port", _("Port"));
-
-  return hash;
-}
-
-static gchar *
-account_widget_generic_format_param_name (const gchar *param_name)
-{
-  gchar *str;
-  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 ();
-
-  /* Translate most common parameters */
-  str = g_hash_table_lookup (translated_params, param_name);
-  if (str != NULL)
-    return g_strdup (str);
-
-  str = g_strdup (param_name);
-
-  if (str && g_ascii_isalpha (str[0]))
-    str[0] = g_ascii_toupper (str[0]);
-
-  while ((p = strchr (str, '-')) != NULL)
-    {
-      if (p[1] != '\0' && g_ascii_isalpha (p[1]))
-        {
-          p[0] = ' ';
-          p[1] = g_ascii_toupper (p[1]);
-        }
-
-      p++;
-    }
-
-  return str;
-}
-
-static void
-accounts_widget_generic_setup (EmpathyAccountWidget *self,
-    GtkWidget *grid_common_settings,
-    GtkWidget *grid_advanced_settings)
-{
-  GList *params, *l;
-  guint row_common = 0, row_advanced = 0;
-
-  params = empathy_account_settings_dup_tp_params (self->priv->settings);
-
-  for (l = params; l != NULL; l = g_list_next (l))
-    {
-      TpConnectionManagerParam *param = l->data;
-      GtkWidget       *grid_settings;
-      guint           row;
-      GtkWidget       *widget = NULL;
-      gchar           *param_name_formatted;
-      const gchar *dbus_signature;
-
-      if (tp_connection_manager_param_is_required (param))
-        {
-          grid_settings = grid_common_settings;
-          row = row_common++;
-        }
-      else if (self->priv->simple)
-        {
-          continue;
-        }
-      else
-        {
-          grid_settings = grid_advanced_settings;
-          row = row_advanced++;
-        }
-
-      param_name_formatted = account_widget_generic_format_param_name (
-          tp_connection_manager_param_get_name (param));
-
-      dbus_signature = tp_connection_manager_param_get_dbus_signature (param);
-
-      if (dbus_signature[0] == 's')
-        {
-          gchar *str;
-
-          str = g_strdup_printf (_("%s"), param_name_formatted);
-          widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 1., 0.5);
-          gtk_style_context_add_class (gtk_widget_get_style_context (widget),
-              GTK_STYLE_CLASS_DIM_LABEL);
-          g_free (str);
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 1, 1);
-
-          gtk_widget_show (widget);
-
-          widget = gtk_entry_new ();
-          if (strcmp (tp_connection_manager_param_get_name (param),
-                "account") == 0)
-            {
-              g_signal_connect (widget, "realize",
-                  G_CALLBACK (gtk_widget_grab_focus),
-                  NULL);
-            }
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 1, row, 1, 1);
-
-          gtk_widget_show (widget);
-        }
-      /* int types: ynqiuxt. double type is 'd' */
-      else if (dbus_signature[0] == 'y' ||
-          dbus_signature[0] == 'n' ||
-          dbus_signature[0] == 'q' ||
-          dbus_signature[0] == 'i' ||
-          dbus_signature[0] == 'u' ||
-          dbus_signature[0] == 'x' ||
-          dbus_signature[0] == 't' ||
-          dbus_signature[0] == 'd')
-        {
-          gchar   *str = NULL;
-          gdouble  minint = 0;
-          gdouble  maxint = 0;
-          gdouble  step = 1;
-
-          switch (dbus_signature[0])
-            {
-            case 'y': minint = G_MININT8;  maxint = G_MAXINT8;   break;
-            case 'n': minint = G_MININT16; maxint = G_MAXINT16;  break;
-            case 'q': minint = 0;          maxint = G_MAXUINT16; break;
-            case 'i': minint = G_MININT32; maxint = G_MAXINT32;  break;
-            case 'u': minint = 0;          maxint = G_MAXUINT32; break;
-            case 'x': minint = G_MININT64; maxint = G_MAXINT64;  break;
-            case 't': minint = 0;          maxint = G_MAXUINT64; break;
-            case 'd': minint = G_MININT32; maxint = G_MAXINT32;
-              step = 0.1; break;
-            default: g_assert_not_reached ();
-            }
-
-          str = g_strdup_printf (_("%s:"), param_name_formatted);
-          widget = gtk_label_new (str);
-          gtk_misc_set_alignment (GTK_MISC (widget), 0, 0.5);
-          g_free (str);
-
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 1, 1);
-          gtk_widget_show (widget);
-
-          widget = gtk_spin_button_new_with_range (minint, maxint, step);
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 1, row, 1, 1);
-          gtk_widget_show (widget);
-        }
-      else if (dbus_signature[0] == 'b')
-        {
-          widget = gtk_check_button_new_with_label (param_name_formatted);
-          gtk_grid_attach (GTK_GRID (grid_settings),
-              widget, 0, row, 2, 1);
-          gtk_widget_show (widget);
-        }
-      else
-        {
-          DEBUG ("Unknown signature for param %s: %s",
-              param_name_formatted, dbus_signature);
-        }
-
-      if (widget)
-        empathy_account_widget_setup_widget (self, widget,
-            tp_connection_manager_param_get_name (param));
-
-      g_free (param_name_formatted);
-    }
-
-  g_list_free_full (params, (GDestroyNotify) tp_connection_manager_param_free);
-}
-
-static void
-account_widget_handle_params_valist (EmpathyAccountWidget *self,
-    const gchar *first_widget,
-    va_list args)
-{
-  GObject *object;
-  const gchar *name;
-
-  for (name = first_widget; name; name = va_arg (args, const gchar *))
-    {
-      const gchar *param_name;
-
-      param_name = va_arg (args, const gchar *);
-      object = gtk_builder_get_object (self->ui_details->gui, name);
-
-      if (!object)
-        {
-          g_warning ("Builder is missing object '%s'.", name);
-          continue;
-        }
-
-      empathy_account_widget_setup_widget (self, GTK_WIDGET (object),
-          param_name);
-    }
-}
-
-static void
-account_widget_cancel_clicked_cb (GtkWidget *button,
-    EmpathyAccountWidget *self)
-{
-  g_signal_emit (self, signals[CANCELLED], 0);
-  g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_CANCEL);
-}
-
-static void
-account_widget_account_enabled_cb (GObject *source_object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account = TP_ACCOUNT (source_object);
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (user_data);
-
-  tp_account_set_enabled_finish (account, res, &error);
-
-  if (error != NULL)
-    {
-      DEBUG ("Could not enable the account: %s", error->message);
-      g_error_free (error);
-    }
-  else
-    {
-      empathy_connect_new_account (account, self->priv->account_manager);
-    }
-
-  g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_APPLY);
-
-  /* unref self - part of the workaround */
-  g_object_unref (self);
-}
-
-static void
-account_widget_applied_cb (GObject *source_object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account;
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source_object);
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (user_data);
-  gboolean reconnect_required;
-  gboolean fire_close = TRUE;
-
-  empathy_account_settings_apply_finish (settings, res, &reconnect_required,
-      &error);
-
-  if (error != NULL)
-    {
-      DEBUG ("Could not apply changes to account: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  account = empathy_account_settings_get_account (self->priv->settings);
-
-  if (account != NULL)
-    {
-      if (self->priv->creating_account)
-        {
-          /* By default, when an account is created, we enable it. */
-
-          /* workaround to keep self alive during async call */
-          g_object_ref (self);
-
-          tp_account_set_enabled_async (account, TRUE,
-              account_widget_account_enabled_cb, self);
-          g_signal_emit (self, signals[ACCOUNT_CREATED], 0, account);
-
-          /* Will be fired in account_widget_account_enabled_cb */
-          fire_close = FALSE;
-        }
-      else
-        {
-          /* If the account was offline, we always want to try reconnecting,
-           * to give it a chance to connect if the previous params were wrong.
-           * tp_account_reconnect_async() won't do anything if the requested
-           * presence is offline anyway. */
-          if (tp_account_get_connection_status (account, NULL) ==
-              TP_CONNECTION_STATUS_DISCONNECTED)
-            reconnect_required = TRUE;
-
-          if (reconnect_required && tp_account_is_enabled (account)
-              && tp_account_is_enabled (account))
-            {
-              /* After having applied changes to a user account, we
-               * reconnect it if needed. This is done so the new
-               * information entered by the user is validated on the server. */
-              tp_account_reconnect_async (account, NULL, NULL);
-            }
-        }
-    }
-
-  if (!self->priv->destroyed)
-    account_widget_set_control_buttons_sensitivity (self, FALSE);
-
-  self->priv->contains_pending_changes = FALSE;
-
-  if (fire_close)
-    {
-      /* announce the widget can be closed */
-      g_signal_emit (self, signals[CLOSE], 0, GTK_RESPONSE_APPLY);
-    }
-
-  /* unref the widget - part of the workaround */
-  g_object_unref (self);
-}
-
-void
-empathy_account_widget_apply_and_log_in (EmpathyAccountWidget *self)
-{
-  gboolean display_name_overridden;
-
-  if (self->priv->radiobutton_reuse != NULL)
-    {
-      gboolean reuse = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (
-            self->priv->radiobutton_reuse));
-
-      DEBUG ("Set register param: %d", !reuse);
-      empathy_account_settings_set (self->priv->settings, "register",
-          g_variant_new_boolean (!reuse));
-    }
-
-  g_object_get (self->priv->settings,
-      "display-name-overridden", &display_name_overridden, NULL);
-
-  if (self->priv->creating_account || !display_name_overridden)
-    {
-      gchar *display_name;
-
-      /* set default display name for new accounts or update if user didn't
-       * manually override it. */
-      display_name = empathy_account_widget_get_default_display_name (self);
-
-      empathy_account_settings_set_display_name_async (self->priv->settings,
-          display_name, NULL, NULL);
-
-      g_free (display_name);
-    }
-
-  /* workaround to keep widget alive during async call */
-  g_object_ref (self);
-  empathy_account_settings_apply_async (self->priv->settings,
-      account_widget_applied_cb, self);
-}
-
-static void
-account_widget_apply_clicked_cb (GtkWidget *button,
-    EmpathyAccountWidget *self)
-{
-    empathy_account_widget_apply_and_log_in (self);
-}
-
-static void
-account_widget_setup_generic (EmpathyAccountWidget *self)
-{
-  GtkWidget *grid_common_settings;
-  GtkWidget *grid_advanced_settings;
-
-  grid_common_settings = GTK_WIDGET (gtk_builder_get_object
-      (self->ui_details->gui, "grid_common_settings"));
-  grid_advanced_settings = GTK_WIDGET (gtk_builder_get_object
-      (self->ui_details->gui, "grid_advanced_settings"));
-
-  accounts_widget_generic_setup (self, grid_common_settings,
-      grid_advanced_settings);
-
-  g_object_unref (self->ui_details->gui);
-}
-
-static void
-account_widget_settings_ready_cb (EmpathyAccountSettings *settings,
-    GParamSpec *pspec,
-    gpointer user_data)
-{
-  EmpathyAccountWidget *self = user_data;
-
-  if (empathy_account_settings_is_ready (self->priv->settings))
-    account_widget_setup_generic (self);
-}
-
-static GtkWidget *
-account_widget_build_generic (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *expander_advanced, *box;
-
-  self->ui_details->gui = empathy_builder_get_file (filename,
-      "grid_common_settings", &self->priv->grid_common_settings,
-      "vbox_generic_settings", &box,
-      "expander_advanced_settings", &expander_advanced,
-      NULL);
-
-  if (self->priv->simple)
-    gtk_widget_hide (expander_advanced);
-
-  g_object_ref (self->ui_details->gui);
-
-  if (empathy_account_settings_is_ready (self->priv->settings))
-    account_widget_setup_generic (self);
-  else
-    g_signal_connect (self->priv->settings, "notify::ready",
-        G_CALLBACK (account_widget_settings_ready_cb), self);
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_salut (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *expander_advanced, *box;
-
-  self->ui_details->gui = empathy_builder_get_file (filename,
-      "grid_common_settings", &self->priv->grid_common_settings,
-      "vbox_salut_settings", &box,
-      "expander_advanced_settings", &expander_advanced,
-      NULL);
-
-  empathy_account_widget_handle_params (self,
-      "entry_published", "published-name",
-      "entry_nickname", "nickname",
-      "entry_first_name", "first-name",
-      "entry_last_name", "last-name",
-      "entry_email", "email",
-      "entry_jid", "jid",
-      NULL);
-
-  if (self->priv->simple)
-    gtk_widget_hide (expander_advanced);
-
-  self->ui_details->default_focus = g_strdup ("entry_first_name");
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_irc (EmpathyAccountWidget *self,
-  const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_IRC);
-
-  if (self->priv->simple)
-    {
-      self->priv->irc_network_chooser = empathy_account_widget_irc_build_simple
-        (self, filename, &box);
-    }
-  else
-    {
-      self->priv->irc_network_chooser = empathy_account_widget_irc_build (self,
-          filename, &self->priv->grid_common_settings, &box);
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_sip (EmpathyAccountWidget *self,
-  const char *filename)
-{
-  GtkWidget *box;
-
-  box = empathy_account_widget_sip_build (self, filename,
-    &self->priv->grid_common_settings);
-
-  if (self->priv->simple)
-    {
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_msn (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_MSN);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_msn_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_msn_settings", &self->priv->grid_common_settings,
-          "vbox_msn_settings", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static void
-suffix_id_widget_changed_cb (GtkWidget *entry,
-    EmpathyAccountWidget *self)
-{
-  gchar *account;
-
-  g_assert (self->priv->jid_suffix != NULL);
-
-  account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
-
-  account = empathy_account_settings_dup_string (self->priv->settings,
-      "account");
-
-  if (!EMP_STR_EMPTY (account) &&
-      !g_str_has_suffix (account, self->priv->jid_suffix))
-    {
-      gchar *tmp;
-
-      tmp = g_strdup_printf ("%s%s", account, self->priv->jid_suffix);
-
-      DEBUG ("Change account from '%s' to '%s'", account, tmp);
-
-      empathy_account_settings_set (self->priv->settings, "account",
-          g_variant_new_string (tmp));
-      g_free (tmp);
-    }
-
-  empathy_account_widget_changed (self);
-
-  g_free (account);
-}
-
-static gchar *
-remove_jid_suffix (EmpathyAccountWidget *self,
-    const gchar *str)
-{
-  g_assert (self->priv->jid_suffix != NULL);
-
-  if (!g_str_has_suffix (str, self->priv->jid_suffix))
-    return g_strdup (str);
-
-  return g_strndup (str, strlen (str) - strlen (self->priv->jid_suffix));
-}
-
-static void
-setup_id_widget_with_suffix (EmpathyAccountWidget *self,
-    GtkWidget *widget,
-    const gchar *suffix)
-{
-  gchar *str = NULL;
-
-  g_object_set_data_full (G_OBJECT (widget), "param_name",
-      g_strdup ("account"), g_free);
-
-  g_assert (self->priv->jid_suffix == NULL);
-  self->priv->jid_suffix = g_strdup (suffix);
-
-  str = empathy_account_settings_dup_string (self->priv->settings, "account");
-  if (str != NULL)
-    {
-      gchar *tmp;
-
-      tmp = remove_jid_suffix (self, str);
-      gtk_entry_set_text (GTK_ENTRY (widget), tmp);
-      g_free (tmp);
-      g_free (str);
-    }
-
-  self->priv->param_account_widget = widget;
-
-  g_signal_connect (widget, "changed",
-      G_CALLBACK (suffix_id_widget_changed_cb), self);
-}
-
-static Service
-account_widget_get_service (EmpathyAccountWidget *self)
-{
-  const gchar *icon_name, *service;
-
-  icon_name = empathy_account_settings_get_icon_name (self->priv->settings);
-  service = empathy_account_settings_get_service (self->priv->settings);
-
-  /* Previous versions of Empathy didn't set the Service property on Facebook
-   * and gtalk accounts, so we check using the icon name as well. */
-  if (!tp_strdiff (icon_name, "im-google-talk") ||
-      !tp_strdiff (service, "google-talk"))
-    return GTALK_SERVICE;
-
-  if (!tp_strdiff (icon_name, "im-facebook") ||
-      !tp_strdiff (service, "facebook"))
-    return FACEBOOK_SERVICE;
-
-  return NO_SERVICE;
-}
-
-static GtkWidget *
-account_widget_build_jabber (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port;
-  GtkWidget *checkbutton_ssl;
-  GtkWidget *label_id, *label_password;
-  GtkWidget *label_id_create, *label_password_create;
-  GtkWidget *label_example_fb;
-  GtkWidget *label_example;
-  GtkWidget *expander_advanced;
-  GtkWidget *entry_id;
-  GtkWidget *box;
-  Service service;
-
-  service = account_widget_get_service (self);
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_JABBER);
-
-  if (self->priv->simple && service == NO_SERVICE)
-    {
-      /* Simple widget for XMPP */
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_jabber_simple", &box,
-          "label_id_simple", &label_id,
-          "label_id_create", &label_id_create,
-          "label_password_simple", &label_password,
-          "label_password_create", &label_password_create,
-          NULL);
-
-      if (empathy_account_settings_get_boolean (self->priv->settings,
-            "register"))
-        {
-          gtk_widget_hide (label_id);
-          gtk_widget_hide (label_password);
-          gtk_widget_show (label_id_create);
-          gtk_widget_show (label_password_create);
-        }
-
-      empathy_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else if (self->priv->simple && service == GTALK_SERVICE)
-    {
-      /* Simple widget for Google Talk */
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_gtalk_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id_g_simple", "account",
-          "entry_password_g_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_g_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_g_simple"));
-    }
-  else if (self->priv->simple && service == FACEBOOK_SERVICE)
-    {
-      /* Simple widget for Facebook */
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_fb_simple", &box,
-          "entry_id_fb_simple", &entry_id,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_password_fb_simple", "password",
-          NULL);
-
-      setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
-
-      self->ui_details->default_focus = g_strdup ("entry_id_fb_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_fb_simple"));
-    }
-  else
-    {
-      ServiceInfo info = services_infos[service];
-
-      /* Full widget for XMPP, Google Talk and Facebook*/
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_jabber_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          "checkbutton_ssl", &checkbutton_ssl,
-          "label_username_f_example", &label_example_fb,
-          info.label_username_example, &label_example,
-          "expander_advanced", &expander_advanced,
-          "entry_id", &entry_id,
-          "label_id", &label_id,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_password", "password",
-          "entry_resource", "resource",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          "spinbutton_priority", "priority",
-          "checkbutton_ssl", "old-ssl",
-          "checkbutton_ignore_ssl_errors", "ignore-ssl-errors",
-          "checkbutton_encryption", "require-encryption",
-          NULL);
-
-      if (service == FACEBOOK_SERVICE)
-        {
-          gtk_label_set_label (GTK_LABEL (label_id), _("Username:"));
-
-          /* Facebook special case the entry ID widget to hide the
-           * "@chat.facebook.com" part */
-          setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com");
-        }
-      else
-        {
-          empathy_account_widget_setup_widget (self, entry_id, "account");
-        }
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-      self->priv->spinbutton_port = spinbutton_port;
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-
-      g_signal_connect (checkbutton_ssl, "toggled",
-          G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
-          self);
-
-      if (service == FACEBOOK_SERVICE)
-        {
-          GtkContainer *parent;
-          GList *children;
-
-          /* Removing the label from list of focusable widgets */
-          parent = GTK_CONTAINER (gtk_widget_get_parent (label_example_fb));
-          children = gtk_container_get_children (parent);
-          children = g_list_remove (children, label_example_fb);
-          gtk_container_set_focus_chain (parent, children);
-          g_list_free (children);
-        }
-
-      gtk_widget_show (label_example);
-
-      if (!info.show_advanced)
-        gtk_widget_hide (expander_advanced);
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_icq (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port;
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_ICQ);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_icq_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_uin_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_uin_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_icq_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_uin", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          "entry_charset", "charset",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_uin");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_aim (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *spinbutton_port, *box;
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_aim_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_screenname_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_screenname_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_aim_settings", &box,
-          "spinbutton_port", &spinbutton_port,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_screenname", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_screenname");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_yahoo (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  empathy_account_settings_set_regex (self->priv->settings, "account",
-      ACCOUNT_REGEX_YAHOO);
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_yahoo_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_settings", &self->priv->grid_common_settings,
-          "vbox_yahoo_settings", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_locale", "room-list-locale",
-          "entry_charset", "charset",
-          "spinbutton_port", "port",
-          "checkbutton_ignore_invites", "ignore-invites",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-static GtkWidget *
-account_widget_build_groupwise (EmpathyAccountWidget *self,
-    const char *filename)
-{
-  GtkWidget *box;
-
-  if (self->priv->simple)
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "vbox_groupwise_simple", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id_simple", "account",
-          "entry_password_simple", "password",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id_simple");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui,
-            "remember_password_simple"));
-    }
-  else
-    {
-      self->ui_details->gui = empathy_builder_get_file (filename,
-          "grid_common_groupwise_settings", &self->priv->grid_common_settings,
-          "vbox_groupwise_settings", &box,
-          NULL);
-
-      empathy_account_widget_handle_params (self,
-          "entry_id", "account",
-          "entry_password", "password",
-          "entry_server", "server",
-          "spinbutton_port", "port",
-          NULL);
-
-      self->ui_details->default_focus = g_strdup ("entry_id");
-
-      self->priv->remember_password_widget = GTK_WIDGET (
-          gtk_builder_get_object (self->ui_details->gui, "remember_password"));
-    }
-
-  return box;
-}
-
-void
-empathy_account_widget_set_other_accounts_exist (EmpathyAccountWidget *self,
-    gboolean others_exist)
-{
-  self->priv->other_accounts_exist = others_exist;
-
-  if (self->priv->creating_account)
-    account_widget_handle_control_buttons_sensitivity (self);
-}
-
-static void
-do_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_SETTINGS:
-      self->priv->settings = g_value_dup_object (value);
-      break;
-    case PROP_SIMPLE:
-      self->priv->simple = g_value_get_boolean (value);
-      break;
-    case PROP_CREATING_ACCOUNT:
-      self->priv->creating_account = g_value_get_boolean (value);
-      break;
-    case PROP_OTHER_ACCOUNTS_EXIST:
-      empathy_account_widget_set_other_accounts_exist (
-          EMPATHY_ACCOUNT_WIDGET (object), g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-do_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROTOCOL:
-      g_value_set_string (value,
-        empathy_account_settings_get_protocol (self->priv->settings));
-      break;
-    case PROP_SETTINGS:
-      g_value_set_object (value, self->priv->settings);
-      break;
-    case PROP_SIMPLE:
-      g_value_set_boolean (value, self->priv->simple);
-      break;
-    case PROP_CREATING_ACCOUNT:
-      g_value_set_boolean (value, self->priv->creating_account);
-      break;
-    case PROP_OTHER_ACCOUNTS_EXIST:
-      g_value_set_boolean (value, self->priv->other_accounts_exist);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-set_apply_button (EmpathyAccountWidget *self)
-{
-  GtkWidget *image;
-
-  /* We can't use the stock button as its accelerator ('A') clashes with the
-   * Add button. */
-  gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE);
-
-  gtk_button_set_label (GTK_BUTTON (self->priv->apply_button), _("A_pply"));
-  gtk_button_set_use_underline (GTK_BUTTON (self->priv->apply_button), TRUE);
-
-  image = gtk_image_new_from_stock (GTK_STOCK_APPLY, GTK_ICON_SIZE_BUTTON);
-  gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image);
-}
-
-static void
-presence_changed_cb (TpAccountManager *manager,
-    TpConnectionPresenceType state,
-    const gchar *status,
-    const gchar *message,
-    EmpathyAccountWidget *self)
-{
-  if (self->priv->destroyed)
-    return;
-
-  if (self->priv->apply_button == NULL)
-    /* This button doesn't exist in 'simple' mode */
-    return;
-
-  if (state > TP_CONNECTION_PRESENCE_TYPE_OFFLINE &&
-      self->priv->creating_account)
-    {
-      /* We are online and creating a new account, display a Login button */
-      GtkWidget *image;
-
-      gtk_button_set_use_stock (GTK_BUTTON (self->priv->apply_button), FALSE);
-      gtk_button_set_label (GTK_BUTTON (self->priv->apply_button),
-          _("L_og in"));
-
-      image = gtk_image_new_from_stock (GTK_STOCK_CONNECT,
-          GTK_ICON_SIZE_BUTTON);
-      gtk_button_set_image (GTK_BUTTON (self->priv->apply_button), image);
-    }
-  else
-    {
-      /* We are offline or modifying an existing account, display
-       * a Save button */
-      set_apply_button (self);
-    }
-}
-
-static void
-account_manager_ready_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (user_data);
-  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
-  GError *error = NULL;
-  TpConnectionPresenceType state;
-
-  if (!tp_proxy_prepare_finish (account_manager, result, &error))
-    {
-      DEBUG ("Failed to prepare account manager: %s", error->message);
-      g_error_free (error);
-      goto out;
-    }
-
-  state = tp_account_manager_get_most_available_presence (account_manager, NULL,
-      NULL);
-
-  /* simulate a presence change so the apply button will be changed
-   * if needed */
-  presence_changed_cb (account_manager, state, NULL, NULL, self);
-
-out:
-  g_object_unref (self);
-}
-
-#define WIDGET(cm, proto) \
-  { #cm, #proto, "empathy-account-widget-"#proto".ui", \
-    account_widget_build_##proto }
-
-static void
-add_register_buttons (EmpathyAccountWidget *self,
-    TpAccount *account)
-{
-  TpProtocol *protocol;
-  GtkWidget *radiobutton_register;
-
-  if (!self->priv->creating_account)
-    return;
-
-  protocol = empathy_account_settings_get_tp_protocol (self->priv->settings);
-  if (protocol == NULL)
-    return;
-
-  if (!tp_protocol_can_register (protocol))
-    return;
-
-  if (account_widget_get_service (self) != NO_SERVICE)
-    return;
-
-  if (self->priv->simple)
-    return;
-
-  self->priv->radiobutton_reuse = gtk_radio_button_new_with_label (NULL,
-      _("This account already exists on the server"));
-  radiobutton_register = gtk_radio_button_new_with_label (
-      gtk_radio_button_get_group (
-        GTK_RADIO_BUTTON (self->priv->radiobutton_reuse)),
-      _("Create a new account on the server"));
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->radiobutton_reuse, FALSE,
-      FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (self), radiobutton_register, FALSE, FALSE, 0);
-  gtk_box_reorder_child (GTK_BOX (self), self->priv->radiobutton_reuse, 0);
-  gtk_box_reorder_child (GTK_BOX (self), radiobutton_register, 1);
-  gtk_widget_show (self->priv->radiobutton_reuse);
-  gtk_widget_show (radiobutton_register);
-}
-
-static void
-remember_password_toggled_cb (GtkToggleButton *button,
-    EmpathyAccountWidget *self)
-{
-  empathy_account_settings_set_remember_password (self->priv->settings,
-      gtk_toggle_button_get_active (button));
-
-  if (!self->priv->automatic_change)
-    empathy_account_widget_changed (self);
-}
-
-static void
-account_settings_password_retrieved_cb (GObject *object,
-    gpointer user_data)
-{
-  EmpathyAccountWidget *self = user_data;
-  gchar *password;
-
-  password = empathy_account_settings_dup_string (
-      self->priv->settings, "password");
-
-  /* We have to do this so that when we call gtk_entry_set_text,
-   * the ::changed callback doesn't think the user made the
-   * change. This is also used in remember_password_toggled_cb. */
-  self->priv->automatic_change = TRUE;
-
-  if (password != NULL)
-    {
-      gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget),
-          password);
-    }
-
-  gtk_toggle_button_set_active (
-      GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
-      !EMP_STR_EMPTY (password));
-
-  self->priv->automatic_change = FALSE;
-
-  g_free (password);
-}
-
-static void
-do_constructed (GObject *obj)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
-  TpAccount *account;
-  const gchar *display_name, *default_display_name;
-  guint i = 0;
-  struct {
-    const gchar *cm_name;
-    const gchar *protocol;
-    const char *file;
-    GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename);
-  } widgets [] = {
-    { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
-        account_widget_build_salut },
-    WIDGET (gabble, jabber),
-    WIDGET (haze, msn),
-    WIDGET (haze, icq),
-    WIDGET (haze, aim),
-    WIDGET (haze, yahoo),
-    WIDGET (haze, groupwise),
-    WIDGET (idle, irc),
-    WIDGET (sofiasip, sip),
-  };
-  const gchar *protocol, *cm_name;
-  GtkWidget *box;
-
-  account = empathy_account_settings_get_account (self->priv->settings);
-
-  cm_name = empathy_account_settings_get_cm (self->priv->settings);
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
-
-  for (i = 0 ; i < G_N_ELEMENTS (widgets); i++)
-    {
-      if (!tp_strdiff (widgets[i].cm_name, cm_name) &&
-          !tp_strdiff (widgets[i].protocol, protocol))
-        {
-          gchar *filename;
-
-          filename = empathy_file_lookup (widgets[i].file,
-              "libempathy-gtk");
-          box = widgets[i].func (self, filename);
-          g_free (filename);
-
-          break;
-        }
-    }
-
-  if (i == G_N_ELEMENTS (widgets))
-    {
-      gchar *filename = empathy_file_lookup (
-          "empathy-account-widget-generic.ui", "libempathy-gtk");
-      box = account_widget_build_generic (self, filename);
-      g_free (filename);
-    }
-
-  gtk_container_add (GTK_CONTAINER (self), box);
-
-  /* handle default focus */
-  if (self->ui_details->default_focus != NULL)
-    {
-      GObject *default_focus_entry;
-
-      default_focus_entry = gtk_builder_get_object
-        (self->ui_details->gui, self->ui_details->default_focus);
-      g_signal_connect (default_focus_entry, "realize",
-          G_CALLBACK (gtk_widget_grab_focus),
-          NULL);
-    }
-
-  /* remember password */
-  if (self->priv->param_password_widget != NULL
-      && self->priv->remember_password_widget != NULL
-      && empathy_account_settings_supports_sasl (self->priv->settings))
-    {
-      if (self->priv->simple)
-        {
-          gtk_toggle_button_set_active (
-              GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), TRUE);
-        }
-      else
-        {
-          gchar *password;
-
-          password = empathy_account_settings_dup_string (self->priv->settings,
-              "password");
-
-          /* FIXME: we should enable this checkbox only if the password is
-           * stored for good in the password storage, not only for the session
-           * (bgo #683571) */
-          gtk_toggle_button_set_active (
-              GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
-              !EMP_STR_EMPTY (password));
-
-          /* The password might not have been retrieved from the
-           * keyring yet. We should update the remember password
-           * toggle button and the password entry when/if it is. */
-          tp_g_signal_connect_object (self->priv->settings,
-              "password-retrieved",
-              G_CALLBACK (account_settings_password_retrieved_cb), self, 0);
-
-          g_free (password);
-        }
-
-      g_signal_connect (self->priv->remember_password_widget, "toggled",
-          G_CALLBACK (remember_password_toggled_cb), self);
-
-      self->priv->automatic_change = TRUE;
-      remember_password_toggled_cb (
-          GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), self);
-      self->priv->automatic_change = FALSE;
-    }
-  else if (self->priv->remember_password_widget != NULL
-      && !empathy_account_settings_supports_sasl (self->priv->settings))
-    {
-      gtk_widget_set_visible (self->priv->remember_password_widget, FALSE);
-      empathy_account_settings_set_remember_password (self->priv->settings,
-          TRUE);
-    }
-
-  /* dup and init the account-manager */
-  self->priv->account_manager = tp_account_manager_dup ();
-
-  g_object_ref (self);
-  tp_proxy_prepare_async (self->priv->account_manager, NULL,
-      account_manager_ready_cb, self);
-
-  /* handle apply and cancel button */
-  self->priv->hbox_buttons = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-
-  gtk_box_set_homogeneous (GTK_BOX (self->priv->hbox_buttons), TRUE);
-
-  self->priv->cancel_button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
-
-  self->priv->apply_button = gtk_button_new ();
-  set_apply_button (self);
-
-  /* We'll change this button to a "Log in" one if we are creating a new
-   * account and are connected. */
-  tp_g_signal_connect_object (self->priv->account_manager,
-      "most-available-presence-changed",
-      G_CALLBACK (presence_changed_cb), obj, 0);
-
-  gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons),
-      self->priv->apply_button, TRUE, TRUE, 3);
-  gtk_box_pack_end (GTK_BOX (self->priv->hbox_buttons),
-      self->priv->cancel_button, TRUE, TRUE, 3);
-
-  gtk_box_pack_end (GTK_BOX (self), self->priv->hbox_buttons, FALSE,
-      FALSE, 3);
-
-  g_signal_connect (self->priv->cancel_button, "clicked",
-      G_CALLBACK (account_widget_cancel_clicked_cb),
-      self);
-  g_signal_connect (self->priv->apply_button, "clicked",
-      G_CALLBACK (account_widget_apply_clicked_cb),
-      self);
-  gtk_widget_show_all (self->priv->hbox_buttons);
-
-  if (self->priv->creating_account)
-    /* When creating an account, the user might have nothing to enter.
-     * That means that no control interaction might occur,
-     * so we update the control button sensitivity manually.
-     */
-    account_widget_handle_control_buttons_sensitivity (self);
-  else
-    account_widget_set_control_buttons_sensitivity (self, FALSE);
-
-  add_register_buttons (self, account);
-
-  g_clear_object (&self->ui_details->gui);
-
-  display_name = empathy_account_settings_get_display_name (
-      self->priv->settings);
-  default_display_name = empathy_account_widget_get_default_display_name (self);
-
-  if (tp_strdiff (display_name, default_display_name) &&
-      !self->priv->creating_account)
-    {
-      /* The display name of the account is not the one that we'd assign by
-       * default; assume that the user changed it manually */
-      g_object_set (self->priv->settings, "display-name-overridden", TRUE,
-          NULL);
-    }
-}
-
-static void
-do_dispose (GObject *obj)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
-
-  g_clear_object (&self->priv->settings);
-  g_clear_object (&self->priv->account_manager);
-
-  if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose != NULL)
-    G_OBJECT_CLASS (empathy_account_widget_parent_class)->dispose (obj);
-}
-
-static void
-do_finalize (GObject *obj)
-{
-  EmpathyAccountWidget *self = EMPATHY_ACCOUNT_WIDGET (obj);
-
-  g_free (self->ui_details->default_focus);
-  g_slice_free (EmpathyAccountWidgetUIDetails, self->ui_details);
-
-  g_free (self->priv->jid_suffix);
-
-  if (G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (empathy_account_widget_parent_class)->finalize (obj);
-}
-
-static void
-empathy_account_widget_class_init (EmpathyAccountWidgetClass *klass)
-{
-  GObjectClass *oclass = G_OBJECT_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;
-  oclass->finalize = do_finalize;
-
-  param_spec = g_param_spec_string ("protocol",
-      "protocol", "The protocol of the account",
-      NULL,
-      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (oclass, PROP_PROTOCOL, param_spec);
-
-  param_spec = g_param_spec_object ("settings",
-      "settings", "The settings of the account",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_SETTINGS, param_spec);
-
-  param_spec = g_param_spec_boolean ("simple",
-      "simple", "Whether the account widget is a simple or an advanced one",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_SIMPLE, param_spec);
-
-  param_spec = g_param_spec_boolean ("creating-account",
-      "creating-account",
-      "TRUE if we're creating an account, FALSE if we're modifying it",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_CREATING_ACCOUNT, param_spec);
-
-  param_spec = g_param_spec_boolean ("other-accounts-exist",
-      "other-accounts-exist",
-      "TRUE if there are any other accounts (even if this isn't yet saved)",
-      FALSE,
-      G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (oclass, PROP_OTHER_ACCOUNTS_EXIST,
-                  param_spec);
-
-  signals[HANDLE_APPLY] =
-    g_signal_new ("handle-apply", G_TYPE_FROM_CLASS (klass),
-        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_generic,
-        G_TYPE_NONE,
-        1, G_TYPE_BOOLEAN);
-
-  /* This signal is emitted when an account has been created and enabled. */
-  signals[ACCOUNT_CREATED] =
-      g_signal_new ("account-created", G_TYPE_FROM_CLASS (klass),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE,
-          1, G_TYPE_OBJECT);
-
-  signals[CANCELLED] =
-      g_signal_new ("cancelled", G_TYPE_FROM_CLASS (klass),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE,
-          0);
-
-  signals[CLOSE] =
-    g_signal_new ("close", G_TYPE_FROM_CLASS (klass),
-        G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-        g_cclosure_marshal_VOID__INT,
-        G_TYPE_NONE,
-        1, G_TYPE_INT);
-
-  g_type_class_add_private (klass, sizeof (EmpathyAccountWidgetPriv));
-}
-
-static void
-empathy_account_widget_init (EmpathyAccountWidget *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE ((self), EMPATHY_TYPE_ACCOUNT_WIDGET,
-        EmpathyAccountWidgetPriv);
-
-  self->ui_details = g_slice_new0 (EmpathyAccountWidgetUIDetails);
-}
-
-/* public methods */
-
-void
-empathy_account_widget_discard_pending_changes (EmpathyAccountWidget *self)
-{
-  empathy_account_settings_discard_changes (self->priv->settings);
-  self->priv->contains_pending_changes = FALSE;
-}
-
-gboolean
-empathy_account_widget_contains_pending_changes (EmpathyAccountWidget *self)
-{
-  return self->priv->contains_pending_changes;
-}
-
-void
-empathy_account_widget_handle_params (EmpathyAccountWidget *self,
-    const gchar *first_widget,
-    ...)
-{
-  va_list args;
-
-  va_start (args, first_widget);
-  account_widget_handle_params_valist (self, first_widget, args);
-  va_end (args);
-}
-
-EmpathyAccountWidget *
-empathy_account_widget_new_for_protocol (EmpathyAccountSettings *settings,
-    gboolean simple)
-{
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), NULL);
-
-  return g_object_new (EMPATHY_TYPE_ACCOUNT_WIDGET,
-        "orientation", GTK_ORIENTATION_VERTICAL,
-        "settings", settings,
-        "simple", simple,
-        "creating-account",
-          empathy_account_settings_get_account (settings) == NULL,
-        NULL);
-}
-
-gchar *
-empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self)
-{
-  gchar *login_id;
-  const gchar *protocol, *p;
-  gchar *default_display_name;
-  Service service;
-
-  login_id = empathy_account_settings_dup_string (self->priv->settings,
-      "account");
-  protocol = empathy_account_settings_get_protocol (self->priv->settings);
-  service = account_widget_get_service (self);
-
-  if (login_id != NULL)
-    {
-      /* TODO: this should be done in empathy-account-widget-irc */
-      if (!tp_strdiff (protocol, "irc"))
-        {
-          EmpathyIrcNetwork *network;
-
-          network = empathy_irc_network_chooser_get_network (
-              self->priv->irc_network_chooser);
-          g_assert (network != NULL);
-
-          /* 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.*/
-          default_display_name = g_strdup_printf (_("%1$s on %2$s"),
-              login_id, empathy_irc_network_get_name (network));
-        }
-      else if (service == FACEBOOK_SERVICE && self->priv->jid_suffix != NULL)
-        {
-          gchar *tmp;
-
-          tmp = remove_jid_suffix (self, login_id);
-          default_display_name = g_strdup_printf ("Facebook (%s)", tmp);
-          g_free (tmp);
-        }
-      else
-        {
-          default_display_name = g_strdup (login_id);
-        }
-
-      return default_display_name;
-    }
-
-  if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL)
-    protocol = p;
-
-  if (protocol != NULL)
-    {
-      /* To translators: The parameter is the protocol name. The resulting
-       * string will be something like: "Jabber Account" */
-      default_display_name = g_strdup_printf (_("%s Account"), protocol);
-    }
-  else
-    {
-      default_display_name = g_strdup (_("New account"));
-    }
-
-  g_free (login_id);
-
-  return default_display_name;
-}
-
-/* Used by subclass to indicate that widget contains pending changes */
-void
-empathy_account_widget_changed (EmpathyAccountWidget *self)
-{
-  account_widget_handle_control_buttons_sensitivity (self);
-  self->priv->contains_pending_changes = TRUE;
-}
-
-void
-empathy_account_widget_set_account_param (EmpathyAccountWidget *self,
-    const gchar *account)
-{
-  if (self->priv->param_account_widget == NULL)
-    return;
-
-  gtk_entry_set_text (GTK_ENTRY (self->priv->param_account_widget), account);
-}
-
-void
-empathy_account_widget_set_password_param (EmpathyAccountWidget *self,
-    const gchar *account)
-{
-  if (self->priv->param_password_widget == NULL)
-    return;
-
-  gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), account);
-}
-
-EmpathyAccountSettings *
-empathy_account_widget_get_settings (EmpathyAccountWidget *self)
-{
-  return self->priv->settings;
-}
-
-void
-empathy_account_widget_hide_buttons (EmpathyAccountWidget *self)
-{
-  gtk_widget_hide (self->priv->hbox_buttons);
-}
diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
deleted file mode 100644
index 2f7d54431..000000000
--- a/libempathy-gtk/empathy-account-widget.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007-2008 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: Xavier Claessens <xclaesse@gmail.com>
- *          Martyn Russell <martyn@imendio.com>
- */
-
-#ifndef __EMPATHY_ACCOUNT_WIDGET_H__
-#define __EMPATHY_ACCOUNT_WIDGET_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-account-settings.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_ACCOUNT_WIDGET empathy_account_widget_get_type()
-#define EMPATHY_ACCOUNT_WIDGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_ACCOUNT_WIDGET, EmpathyAccountWidget))
-#define EMPATHY_ACCOUNT_WIDGET_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_ACCOUNT_WIDGET, EmpathyAccountWidgetClass))
-#define EMPATHY_IS_ACCOUNT_WIDGET(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_ACCOUNT_WIDGET))
-#define EMPATHY_IS_ACCOUNT_WIDGET_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_ACCOUNT_WIDGET))
-#define EMPATHY_ACCOUNT_WIDGET_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT_WIDGET, EmpathyAccountWidgetClass))
-
-typedef struct _EmpathyAccountWidgetPriv EmpathyAccountWidgetPriv;
-typedef struct _EmpathyAccountWidgetUIDetails EmpathyAccountWidgetUIDetails;
-
-typedef struct {
-  GtkBox parent;
-
-  EmpathyAccountWidgetUIDetails *ui_details;
-
-  EmpathyAccountWidgetPriv *priv;
-} EmpathyAccountWidget;
-
-typedef struct {
-  GtkBoxClass parent_class;
-} EmpathyAccountWidgetClass;
-
-GType empathy_account_widget_get_type (void);
-
-EmpathyAccountWidget * empathy_account_widget_new_for_protocol (
-    EmpathyAccountSettings *settings,
-    gboolean simple);
-
-gboolean empathy_account_widget_contains_pending_changes
-    (EmpathyAccountWidget *widget);
-void empathy_account_widget_discard_pending_changes
-    (EmpathyAccountWidget *widget);
-
-gchar * empathy_account_widget_get_default_display_name (
-    EmpathyAccountWidget *widget);
-
-void empathy_account_widget_set_account_param (EmpathyAccountWidget *widget,
-    const gchar *account);
-
-void empathy_account_widget_set_password_param (EmpathyAccountWidget *self,
-    const gchar *password);
-
-void empathy_account_widget_set_other_accounts_exist (
-    EmpathyAccountWidget *self, gboolean others_exist);
-
-void empathy_account_widget_hide_buttons (EmpathyAccountWidget *self);
-
-void empathy_account_widget_apply_and_log_in (EmpathyAccountWidget *self);
-
-/* protected methods */
-void empathy_account_widget_changed (EmpathyAccountWidget *widget);
-
-EmpathyAccountSettings * empathy_account_widget_get_settings (
-    EmpathyAccountWidget *self);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_ACCOUNT_WIDGET_H__ */
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
deleted file mode 100644
index 553dd4f6e..000000000
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ /dev/null
@@ -1,1223 +0,0 @@
-/*
- * Copyright (C) 2006-2007 Imendio AB.
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Based on Novell's e-image-chooser.
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-avatar-chooser.h"
-#include "empathy-images.h"
-#include "empathy-ui-utils.h"
-
-#ifdef HAVE_CHEESE
-#include <cheese-avatar-chooser.h>
-#endif /* HAVE_CHEESE */
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-/**
- * SECTION:empathy-avatar-chooser
- * @title: EmpathyAvatarChooser
- * @short_description: A widget used to change avatar
- * @include: libempathy-gtk/empathy-avatar-chooser.h
- *
- * #EmpathyAvatarChooser is a widget which extends #GtkButton to
- * provide a way of changing avatar.
- */
-
-/**
- * EmpathyAvatarChooser:
- * @parent: parent object
- *
- * Widget which extends #GtkButton to provide a way of changing avatar.
- */
-
-#define AVATAR_SIZE_SAVE 96
-#define AVATAR_SIZE_VIEW 64
-#define DEFAULT_DIR DATADIR"/pixmaps/faces"
-
-#ifdef HAVE_CHEESE
-/*
- * A custom GtkResponseType used when the user presses the
- * "Camera Picture" button. Any positive value would be sufficient.
- */
-#define EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM   10
-#endif
-#define EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE GTK_RESPONSE_NO
-#define EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL   GTK_RESPONSE_CANCEL
-#define EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE     GTK_RESPONSE_OK
-
-struct _EmpathyAvatarChooserPrivate
-{
-  TpAccount *account;
-
-  GArray *avatar;
-  gchar *mime_type;
-  gboolean changed;
-
-  GtkFileChooser *chooser_dialog;
-  GSettings *gsettings_ui;
-};
-
-enum
-{
-  PROP_0,
-  PROP_ACCOUNT
-};
-
-G_DEFINE_TYPE (EmpathyAvatarChooser, empathy_avatar_chooser, GTK_TYPE_BUTTON);
-
-/*
- * Drag and drop stuff
- */
-#define URI_LIST_TYPE "text/uri-list"
-
-enum DndTargetType
-{
-  DND_TARGET_TYPE_URI_LIST
-};
-
-static const GtkTargetEntry drop_types[] =
-{
-  { URI_LIST_TYPE, 0, DND_TARGET_TYPE_URI_LIST },
-};
-
-static void avatar_chooser_set_image (EmpathyAvatarChooser *self,
-    GArray *avatar,
-    gchar *mime_type,
-    GdkPixbuf *pixbuf,
-    gboolean maybe_convert);
-static void avatar_chooser_clear_image (EmpathyAvatarChooser *self);
-
-static void
-get_avatar_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpWeakRef *wr = user_data;
-  EmpathyAvatarChooser *self = tp_weak_ref_dup_object (wr);
-  const GArray *avatar;
-  GdkPixbuf *pixbuf;
-  gchar *mime_type;
-  GError *error = NULL;
-
-  if (self == NULL)
-    {
-      tp_weak_ref_destroy (wr);
-      return;
-    }
-
-  avatar = tp_account_get_avatar_finish (self->priv->account, result, &error);
-  if (avatar == NULL)
-    {
-      DEBUG ("Error getting account's avatar: %s", error->message);
-      g_clear_error (&error);
-      goto out;
-    }
-
-  if (avatar->len == 0)
-    {
-      avatar_chooser_clear_image (self);
-      goto out;
-    }
-
-  pixbuf = empathy_pixbuf_from_data_and_mime ((gchar *) avatar->data,
-      avatar->len, &mime_type);
-  if (pixbuf == NULL)
-    {
-      DEBUG ("couldn't make a pixbuf from avatar; giving up");
-      goto out;
-    }
-
-  avatar_chooser_set_image (self, (GArray *) avatar, mime_type, pixbuf, FALSE);
-  g_free (mime_type);
-
-  self->priv->changed = FALSE;
-
-out:
-  tp_weak_ref_destroy (wr);
-  g_object_unref (self);
-}
-
-static void
-avatar_changed_cb (TpAccount *account,
-    gpointer user_data,
-    GObject *weak_object)
-{
-  EmpathyAvatarChooser *self = (EmpathyAvatarChooser *) weak_object;
-
-  tp_account_get_avatar_async (self->priv->account,
-      get_avatar_cb, tp_weak_ref_new (self, NULL, NULL));
-}
-
-static void
-avatar_chooser_constructed (GObject *object)
-{
-  EmpathyAvatarChooser *self = (EmpathyAvatarChooser *) object;
-
-  G_OBJECT_CLASS (empathy_avatar_chooser_parent_class)->constructed (object);
-
-  tp_account_get_avatar_async (self->priv->account,
-      get_avatar_cb, tp_weak_ref_new (self, NULL, NULL));
-
-  /* FIXME: no signal on TpAccount, yet.
-   * See https://bugs.freedesktop.org/show_bug.cgi?id=52938 */
-  tp_cli_account_interface_avatar_connect_to_avatar_changed (
-      self->priv->account, avatar_changed_cb, NULL, NULL, (GObject *) self,
-      NULL);
-}
-
-static void
-avatar_chooser_get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAvatarChooser *self = (EmpathyAvatarChooser *) object;
-
-  switch (param_id)
-    {
-      case PROP_ACCOUNT:
-        g_value_set_object (value, self->priv->account);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-avatar_chooser_set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAvatarChooser *self = EMPATHY_AVATAR_CHOOSER (object);
-
-  switch (param_id)
-    {
-      case PROP_ACCOUNT:
-        g_assert (self->priv->account == NULL); /* construct-only */
-        self->priv->account = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    }
-}
-
-static void
-avatar_chooser_dispose (GObject *object)
-{
-  EmpathyAvatarChooser *self = (EmpathyAvatarChooser *) object;
-
-  tp_clear_object (&self->priv->account);
-  tp_clear_pointer (&self->priv->avatar, g_array_unref);
-  tp_clear_pointer (&self->priv->mime_type, g_free);
-  tp_clear_object (&self->priv->gsettings_ui);
-
-  G_OBJECT_CLASS (empathy_avatar_chooser_parent_class)->dispose (object);
-}
-
-static void
-empathy_avatar_chooser_class_init (EmpathyAvatarChooserClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->constructed = avatar_chooser_constructed;
-  object_class->dispose = avatar_chooser_dispose;
-  object_class->get_property = avatar_chooser_get_property;
-  object_class->set_property = avatar_chooser_set_property;
-
-  /**
-   * EmpathyAvatarChooser:account:
-   *
-   * The #TpAccount whose avatar should be shown and modified by
-   * the #EmpathyAvatarChooser instance.
-   */
-  param_spec = g_param_spec_object ("account",
-            "TpAccount",
-            "TpAccount whose avatar should be "
-            "shown and modified by this widget",
-            TP_TYPE_ACCOUNT,
-            G_PARAM_READWRITE |
-            G_PARAM_CONSTRUCT_ONLY |
-            G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class,
-           PROP_ACCOUNT,
-           param_spec);
-
-  g_type_class_add_private (object_class, sizeof (EmpathyAvatarChooserPrivate));
-}
-
-static gboolean
-avatar_chooser_drag_motion_cb (GtkWidget *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    guint time_,
-    EmpathyAvatarChooser *self)
-{
-  GList *p;
-
-  for (p = gdk_drag_context_list_targets (context); p != NULL;
-       p = p->next)
-    {
-      gchar *possible_type;
-
-      possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
-
-      if (!strcmp (possible_type, URI_LIST_TYPE))
-        {
-          g_free (possible_type);
-          gdk_drag_status (context, GDK_ACTION_COPY, time_);
-
-          return TRUE;
-        }
-
-      g_free (possible_type);
-    }
-
-  return FALSE;
-}
-
-static gboolean
-avatar_chooser_drag_drop_cb (GtkWidget *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    guint time_,
-    EmpathyAvatarChooser *self)
-{
-  GList *p;
-
-  if (gdk_drag_context_list_targets (context) == NULL)
-    return FALSE;
-
-  for (p = gdk_drag_context_list_targets (context);
-       p != NULL; p = p->next)
-    {
-      char *possible_type;
-
-      possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
-      if (!strcmp (possible_type, URI_LIST_TYPE))
-        {
-          g_free (possible_type);
-          gtk_drag_get_data (widget, context,
-                 GDK_POINTER_TO_ATOM (p->data),
-                 time_);
-
-          return TRUE;
-        }
-
-      g_free (possible_type);
-    }
-
-  return FALSE;
-}
-
-static void
-avatar_chooser_clear_image (EmpathyAvatarChooser *self)
-{
-  GtkWidget *image;
-
-  tp_clear_pointer (&self->priv->avatar, g_array_unref);
-  tp_clear_pointer (&self->priv->mime_type, g_free);
-  self->priv->changed = TRUE;
-
-  image = gtk_image_new_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT,
-    GTK_ICON_SIZE_DIALOG);
-  gtk_button_set_image (GTK_BUTTON (self), image);
-}
-
-static gboolean
-str_in_strv (const gchar  *str,
-    gchar **strv)
-{
-  if (strv == NULL)
-    return FALSE;
-
-  while (*strv != NULL)
-    {
-      if (g_str_equal (str, *strv))
-        return TRUE;
-
-      strv++;
-    }
-
-  return FALSE;
-}
-
-/* The caller must free the strings stored in satisfactory_format_name and
- * satisfactory_mime_type.
- */
-static gboolean
-avatar_chooser_need_mime_type_conversion (const gchar *current_mime_type,
-    gchar **accepted_mime_types,
-    gchar **satisfactory_format_name,
-    gchar **satisfactory_mime_type)
-{
-  gchar *good_mime_types[] = {"image/jpeg", "image/png", NULL};
-  guint i;
-  GSList *formats, *l;
-  gboolean found = FALSE;
-
-  *satisfactory_format_name = NULL;
-  *satisfactory_mime_type = NULL;
-
-  /* If there is no accepted format there is nothing we can do */
-  if (accepted_mime_types == NULL || *accepted_mime_types == NULL)
-    return TRUE;
-
-  /* If the current mime type is good and accepted, don't change it!
-   * jpeg is compress better pictures, but png is better for logos and
-   * could have an alpha layer. */
-  if (str_in_strv (current_mime_type, good_mime_types) &&
-      str_in_strv (current_mime_type, accepted_mime_types))
-    {
-      *satisfactory_mime_type = g_strdup (current_mime_type);
-      *satisfactory_format_name = g_strdup (current_mime_type +
-                    strlen ("image/"));
-      return FALSE;
-    }
-
-  /* The current mime type is either not accepted or not good to use.
-   * Check if one of the good format is supported... */
-  for (i = 0; good_mime_types[i] != NULL;  i++)
-    {
-      if (str_in_strv (good_mime_types[i], accepted_mime_types))
-        {
-          *satisfactory_mime_type = g_strdup (good_mime_types[i]);
-          *satisfactory_format_name = g_strdup (good_mime_types[i] +
-              strlen ("image/"));
-          return TRUE;
-        }
-    }
-
-  /* Pick the first supported format we can write */
-  formats = gdk_pixbuf_get_formats ();
-  for (l = formats; !found && l != NULL; l = l->next)
-    {
-      GdkPixbufFormat *format = l->data;
-      gchar **format_mime_types;
-      gchar **iter;
-
-      if (!gdk_pixbuf_format_is_writable (format))
-        continue;
-
-      format_mime_types = gdk_pixbuf_format_get_mime_types (format);
-      for (iter = format_mime_types; *iter != NULL; iter++)
-        {
-          if (str_in_strv (*iter, accepted_mime_types))
-            {
-              *satisfactory_format_name = gdk_pixbuf_format_get_name (format);
-              *satisfactory_mime_type = g_strdup (*iter);
-              found = TRUE;
-              break;
-            }
-        }
-      g_strfreev (format_mime_types);
-    }
-  g_slist_free (formats);
-
-  return TRUE;
-}
-
-static void
-avatar_chooser_error_show (EmpathyAvatarChooser *self,
-    const gchar *primary_text,
-    const gchar *secondary_text)
-{
-  GtkWidget *parent;
-  GtkWidget *dialog;
-
-  parent = gtk_widget_get_toplevel (GTK_WIDGET (self));
-  if (!GTK_IS_WINDOW (parent))
-    parent = NULL;
-
-  dialog = gtk_message_dialog_new (parent ? GTK_WINDOW (parent) : NULL,
-      GTK_DIALOG_MODAL,
-      GTK_MESSAGE_WARNING,
-      GTK_BUTTONS_CLOSE,
-      "%s", primary_text);
-
-  if (secondary_text != NULL)
-    {
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-          "%s", secondary_text);
-    }
-
-  g_signal_connect (dialog, "response",
-        G_CALLBACK (gtk_widget_destroy), NULL);
-  gtk_widget_show (dialog);
-
-}
-
-static TpAvatarRequirements *
-get_requirements (EmpathyAvatarChooser *self)
-{
-  TpConnection *connection;
-
-  /* FIXME: Should get on TpProtocol if account is offline */
-  connection = tp_account_get_connection (self->priv->account);
-  return tp_connection_get_avatar_requirements (connection);
-}
-
-
-static gboolean
-avatar_chooser_maybe_convert_and_scale (EmpathyAvatarChooser *self,
-    GdkPixbuf *pixbuf,
-    GArray *avatar,
-    gchar *mime_type,
-    GArray **ret_avatar,
-    gchar **ret_mime_type)
-{
-  TpAvatarRequirements *req;
-  gboolean needs_conversion = FALSE;
-  guint width, height;
-  gchar *new_format_name = NULL;
-  gchar *new_mime_type = NULL;
-  gdouble min_factor, max_factor;
-  gdouble factor;
-  gchar *best_image_data = NULL;
-  gsize best_image_size = 0;
-  guint count = 0;
-
-  g_assert (ret_avatar != NULL);
-  g_assert (ret_mime_type != NULL);
-
-  req = get_requirements (self);
-  if (req == NULL)
-    {
-      DEBUG ("Avatar requirements not ready");
-      return FALSE;
-    }
-
-  /* Smaller is the factor, smaller will be the image.
-   * 0 is an empty image, 1 is the full size. */
-  min_factor = 0;
-  max_factor = 1;
-  factor = 1;
-
-  /* Check if we need to convert to another image format */
-  if (avatar_chooser_need_mime_type_conversion (mime_type,
-        req->supported_mime_types, &new_format_name, &new_mime_type))
-    {
-      DEBUG ("Format conversion needed, we'll use mime type '%s' "
-             "and format name '%s'. Current mime type is '%s'",
-             new_mime_type, new_format_name, mime_type);
-      needs_conversion = TRUE;
-    }
-
-  /* If there is no format we can use, report error to the user. */
-  if (new_mime_type == NULL || new_format_name == NULL)
-    {
-      avatar_chooser_error_show (self, _("Couldn't convert image"),
-          _("None of the accepted image formats are "
-            "supported on your system"));
-      return FALSE;
-    }
-
-  /* If width or height are too big, it needs converting. */
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-  if ((req->maximum_width > 0 && width > req->maximum_width) ||
-      (req->maximum_height > 0 && height > req->maximum_height))
-    {
-      gdouble h_factor, v_factor;
-
-      h_factor = (gdouble) req->maximum_width / width;
-      v_factor = (gdouble) req->maximum_height / height;
-      factor = max_factor = MIN (h_factor, v_factor);
-
-      DEBUG ("Image dimensions (%dx%d) are too big. Max is %dx%d.",
-          width, height, req->maximum_width, req->maximum_height);
-
-      needs_conversion = TRUE;
-    }
-
-  /* If the data len is too big and no other conversion is needed,
-   * try with a lower factor. */
-  if (req->maximum_bytes > 0 && avatar->len > req->maximum_bytes &&
-      !needs_conversion)
-    {
-      DEBUG ("Image data (%u bytes) is too big "
-             "(max is %u bytes), conversion needed.",
-             avatar->len, req->maximum_bytes);
-
-      factor = 0.5;
-      needs_conversion = TRUE;
-    }
-
-  /* If no conversion is needed, return the avatar */
-  if (!needs_conversion)
-    {
-      *ret_avatar = g_array_ref (avatar);
-      *ret_mime_type = g_strdup (mime_type);
-      return TRUE;
-    }
-
-  do
-    {
-      GdkPixbuf *pixbuf_scaled = NULL;
-      gboolean saved;
-      gint new_width, new_height;
-      gchar *converted_image_data;
-      gsize converted_image_size;
-      GError *error = NULL;
-
-      if (factor != 1)
-        {
-          new_width = width * factor;
-          new_height = height * factor;
-          pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf,
-                     new_width,
-                     new_height,
-                     GDK_INTERP_HYPER);
-        }
-      else
-        {
-          new_width = width;
-          new_height = height;
-          pixbuf_scaled = g_object_ref (pixbuf);
-        }
-
-      DEBUG ("Trying with factor %f (%dx%d) and format %s...", factor,
-        new_width, new_height, new_format_name);
-
-      saved = gdk_pixbuf_save_to_buffer (pixbuf_scaled,
-          &converted_image_data,
-          &converted_image_size,
-          new_format_name,
-          &error, NULL);
-      g_object_unref (pixbuf_scaled);
-
-      if (!saved)
-        {
-          g_free (new_format_name);
-          g_free (new_mime_type);
-          avatar_chooser_error_show (self,
-            _("Couldn't convert image"),
-            error ? error->message : NULL);
-          g_clear_error (&error);
-          return FALSE;
-        }
-
-      DEBUG ("Produced an image data of %"G_GSIZE_FORMAT" bytes.",
-        converted_image_size);
-
-      /* If the new image satisfy the req, keep it as current best */
-      if (req->maximum_bytes == 0 || converted_image_size <= req->maximum_bytes)
-        {
-          g_free (best_image_data);
-
-          best_image_data = converted_image_data;
-          best_image_size = converted_image_size;
-
-          /* If this image is close enough to the optimal size,
-           * stop searching */
-          if (req->maximum_bytes == 0 ||
-              req->maximum_bytes - converted_image_size <= 1024)
-            break;
-        }
-      else
-        {
-          g_free (converted_image_data);
-        }
-
-    /* Make a binary search for the bigest factor that produce
-     * an image data size less than max_size */
-    if (converted_image_size > req->maximum_bytes)
-      max_factor = factor;
-    if (converted_image_size < req->maximum_bytes)
-      min_factor = factor;
-    factor = (min_factor + max_factor)/2;
-
-    if ((int) (width * factor) == new_width ||
-        (int) (height * factor) == new_height)
-      {
-        /* min_factor and max_factor are too close, so the new
-         * factor will produce the same image as previous
-         * iteration. No need to continue, we already found
-         * the optimal size. */
-        break;
-      }
-
-    /* Do 10 iterations in the worst case */
-  } while (++count < 10);
-
-  g_free (new_format_name);
-
-  /* FIXME: there is no way to create a GArray with zero copy? */
-  *ret_avatar = g_array_sized_new (FALSE, FALSE, sizeof (gchar),
-      best_image_size);
-  g_array_append_vals (*ret_avatar, best_image_data, best_image_size);
-  g_free (best_image_data);
-
-  *ret_mime_type = new_mime_type;
-
-  return TRUE;
-}
-
-/* Take ownership of @pixbuf */
-static void
-avatar_chooser_set_image (EmpathyAvatarChooser *self,
-    GArray *avatar,
-    gchar *mime_type,
-    GdkPixbuf *pixbuf,
-    gboolean maybe_convert)
-{
-  GdkPixbuf *pixbuf_view;
-  GtkWidget *image;
-
-  g_assert (avatar != NULL);
-  g_assert (pixbuf != NULL);
-
-  if (maybe_convert)
-    {
-      GArray *conv_avatar = NULL;
-      gchar *conv_mime_type = NULL;
-
-      if (!avatar_chooser_maybe_convert_and_scale (self,
-              pixbuf, avatar, mime_type, &conv_avatar, &conv_mime_type))
-        return;
-
-      /* Transfer ownership */
-      tp_clear_pointer (&self->priv->avatar, g_array_unref);
-      self->priv->avatar = conv_avatar;
-
-      g_free (self->priv->mime_type);
-      self->priv->mime_type = conv_mime_type;
-    }
-  else
-    {
-      tp_clear_pointer (&self->priv->avatar, g_array_unref);
-      self->priv->avatar = g_array_ref (avatar);
-
-      g_free (self->priv->mime_type);
-      self->priv->mime_type = g_strdup (mime_type);
-    }
-
-  self->priv->changed = TRUE;
-
-  pixbuf_view = empathy_pixbuf_scale_down_if_necessary (pixbuf,
-      AVATAR_SIZE_VIEW);
-  image = gtk_image_new_from_pixbuf (pixbuf_view);
-
-  gtk_button_set_image (GTK_BUTTON (self), image);
-
-  g_object_unref (pixbuf_view);
-  g_object_unref (pixbuf);
-}
-
-/* takes ownership of @data */
-static void
-avatar_chooser_set_image_from_data (EmpathyAvatarChooser *self,
-    gchar *data,
-    gsize size)
-{
-  GdkPixbuf *pixbuf;
-  GArray *avatar;
-  gchar *mime_type = NULL;
-
-  if (data == NULL)
-    {
-      avatar_chooser_clear_image (self);
-      return;
-    }
-
-  pixbuf = empathy_pixbuf_from_data_and_mime (data, size, &mime_type);
-  if (pixbuf == NULL)
-    {
-      g_free (data);
-      return;
-    }
-
-  /* FIXME: there is no way to create a GArray with zero copy? */
-  avatar = g_array_sized_new (FALSE, FALSE, sizeof (gchar), size);
-  g_array_append_vals (avatar, data, size);
-
-  avatar_chooser_set_image (self, avatar, mime_type, pixbuf, TRUE);
-
-  g_free (mime_type);
-  g_array_unref (avatar);
-  g_free (data);
-}
-
-static void
-avatar_chooser_drag_data_received_cb (GtkWidget          *widget,
-    GdkDragContext *context,
-    gint x,
-    gint y,
-    GtkSelectionData *selection_data,
-    guint info,
-    guint time_,
-    EmpathyAvatarChooser *self)
-{
-  gchar *target_type;
-  gboolean handled = FALSE;
-
-  target_type = gdk_atom_name (gtk_selection_data_get_target (selection_data));
-  if (!strcmp (target_type, URI_LIST_TYPE))
-    {
-      GFile *file;
-      gchar *nl;
-      gchar *data = NULL;
-      gsize bytes_read;
-
-      nl = strstr ((gchar *) gtk_selection_data_get_data (selection_data),
-              "\r\n");
-      if (nl != NULL)
-        {
-          gchar *uri;
-
-          uri = g_strndup (
-              (gchar *) gtk_selection_data_get_data (selection_data),
-              nl - (gchar *) gtk_selection_data_get_data (selection_data));
-
-          file = g_file_new_for_uri (uri);
-          g_free (uri);
-        }
-      else
-        {
-          file = g_file_new_for_uri ((gchar *) gtk_selection_data_get_data (
-                selection_data));
-        }
-
-      handled = g_file_load_contents (file, NULL, &data, &bytes_read,
-              NULL, NULL);
-
-      if (handled)
-        {
-          /* pass data to the avatar_chooser_set_image_from_data */
-          avatar_chooser_set_image_from_data (self, data, bytes_read);
-        }
-
-      g_object_unref (file);
-    }
-
-  gtk_drag_finish (context, handled, FALSE, time_);
-}
-
-static void
-avatar_chooser_update_preview_cb (GtkFileChooser *file_chooser,
-    EmpathyAvatarChooser *self)
-{
-  gchar *filename;
-
-  filename = gtk_file_chooser_get_preview_filename (file_chooser);
-
-  if (filename != NULL)
-    {
-      GtkWidget *image;
-      GdkPixbuf *pixbuf = NULL;
-      GdkPixbuf *scaled_pixbuf;
-
-      pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
-
-      image = gtk_file_chooser_get_preview_widget (file_chooser);
-
-      if (pixbuf != NULL)
-        {
-          scaled_pixbuf = empathy_pixbuf_scale_down_if_necessary (pixbuf,
-              AVATAR_SIZE_SAVE);
-
-          gtk_image_set_from_pixbuf (GTK_IMAGE (image), scaled_pixbuf);
-          g_object_unref (scaled_pixbuf);
-          g_object_unref (pixbuf);
-        }
-      else
-        {
-          gtk_image_set_from_stock (GTK_IMAGE (image),
-                  "gtk-dialog-question",
-                  GTK_ICON_SIZE_DIALOG);
-        }
-
-      g_free (filename);
-    }
-
-  gtk_file_chooser_set_preview_widget_active (file_chooser, TRUE);
-}
-
-static void
-avatar_chooser_set_image_from_file (EmpathyAvatarChooser *self,
-    const gchar *filename)
-{
-  gchar *image_data = NULL;
-  gsize  image_size = 0;
-  GError *error = NULL;
-
-  if (!g_file_get_contents (filename, &image_data, &image_size, &error))
-    {
-      DEBUG ("Failed to load image from '%s': %s", filename,
-        error ? error->message : "No error given");
-
-      g_clear_error (&error);
-      return;
-    }
-
-  /* pass image_data to the avatar_chooser_set_image_from_data */
-  avatar_chooser_set_image_from_data (self, image_data, image_size);
-}
-
-#ifdef HAVE_CHEESE
-static void
-avatar_chooser_set_avatar_from_pixbuf (EmpathyAvatarChooser *self,
-               GdkPixbuf *pb)
-{
-  gsize size;
-  gchar *buf;
-  GArray *avatar;
-  GError *error = NULL;
-
-  if (!gdk_pixbuf_save_to_buffer (pb, &buf, &size, "png", &error, NULL))
-    {
-      avatar_chooser_error_show (self,
-        _("Couldn't save picture to file"),
-        error ? error->message : NULL);
-      g_clear_error (&error);
-      return;
-    }
-
-  /* FIXME: there is no way to create a GArray with zero copy? */
-  avatar = g_array_sized_new (FALSE, FALSE, sizeof (gchar), size);
-  g_array_append_vals (avatar, buf, size);
-
-  avatar_chooser_set_image (self, avatar, "image/png", pb, TRUE);
-
-  g_free (buf);
-  g_array_unref (avatar);
-}
-
-static gboolean
-destroy_chooser (GtkWidget *self)
-{
-  gtk_widget_destroy (self);
-  return FALSE;
-}
-
-static void
-webcam_response_cb (GtkDialog *dialog,
-        int response,
-        EmpathyAvatarChooser *self)
-{
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      GdkPixbuf *pb;
-      CheeseAvatarChooser *cheese_chooser;
-
-      cheese_chooser = CHEESE_AVATAR_CHOOSER (dialog);
-      pb = cheese_avatar_chooser_get_picture (cheese_chooser);
-      avatar_chooser_set_avatar_from_pixbuf (self, pb);
-    }
-
-  if (response != GTK_RESPONSE_DELETE_EVENT &&
-      response != GTK_RESPONSE_NONE)
-    g_idle_add ((GSourceFunc) destroy_chooser, dialog);
-}
-
-static void
-choose_avatar_from_webcam (GtkWidget *widget,
-    EmpathyAvatarChooser *self)
-{
-  GtkWidget *window;
-
-  window = cheese_avatar_chooser_new ();
-
-  gtk_window_set_transient_for (GTK_WINDOW (window),
-      GTK_WINDOW (empathy_get_toplevel_window (GTK_WIDGET (self))));
-  gtk_window_set_modal (GTK_WINDOW (window), TRUE);
-  g_signal_connect (G_OBJECT (window), "response",
-      G_CALLBACK (webcam_response_cb), self);
-  gtk_widget_show (window);
-}
-#endif /* HAVE_CHEESE */
-
-static void
-avatar_chooser_response_cb (GtkWidget *widget,
-    gint response,
-    EmpathyAvatarChooser *self)
-{
-  self->priv->chooser_dialog = NULL;
-
-  if (response == EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE)
-    {
-      gchar *filename;
-      gchar *path;
-
-      filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
-      avatar_chooser_set_image_from_file (self, filename);
-      g_free (filename);
-
-      path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (widget));
-      if (path != NULL)
-        {
-          g_settings_set_string (self->priv->gsettings_ui,
-                     EMPATHY_PREFS_UI_AVATAR_DIRECTORY,
-                     path);
-
-          g_free (path);
-        }
-    }
-  else if (response == EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE)
-    {
-      /* This corresponds to "No Image", not to "Cancel" */
-      avatar_chooser_clear_image (self);
-    }
-  #ifdef HAVE_CHEESE
-  else if (response == EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM)
-    {
-      /* This corresponds to "Camera Picture" */
-      choose_avatar_from_webcam (widget, self);
-    }
-  #endif
-
-  gtk_widget_destroy (widget);
-}
-
-static void
-avatar_chooser_clicked_cb (GtkWidget *button,
-    EmpathyAvatarChooser *self)
-{
-  GtkFileChooser *chooser_dialog;
-  GtkWidget *image;
-  gchar *saved_dir = NULL;
-  const gchar *default_dir = DEFAULT_DIR;
-  const gchar *pics_dir;
-  GtkFileFilter *filter;
-#ifdef HAVE_CHEESE
-  GtkWidget *picture_button;
-  EmpathyCameraMonitor *monitor;
-#endif
-
-  if (self->priv->chooser_dialog != NULL)
-    {
-      gtk_window_present (GTK_WINDOW (self->priv->chooser_dialog));
-      return;
-    }
-
-  self->priv->chooser_dialog = GTK_FILE_CHOOSER (
-      gtk_file_chooser_dialog_new (_("Select Your Avatar Image"),
-        empathy_get_toplevel_window (GTK_WIDGET (self)),
-        GTK_FILE_CHOOSER_ACTION_OPEN,
-        NULL, NULL));
-
-#ifdef HAVE_CHEESE
-  picture_button = gtk_dialog_add_button (
-      GTK_DIALOG (self->priv->chooser_dialog),
-      _("Take a picture..."), EMPATHY_AVATAR_CHOOSER_RESPONSE_WEBCAM);
-
-  /* Button is sensitive only if there is one camera connected */
-  monitor = empathy_camera_monitor_dup_singleton ();
-
-  g_object_set_data_full (G_OBJECT (picture_button),
-      "monitor", monitor, g_object_unref);
-
-  g_object_bind_property (monitor, "available", picture_button, "sensitive",
-      G_BINDING_SYNC_CREATE);
-#endif
-
-  gtk_dialog_add_buttons (GTK_DIALOG (self->priv->chooser_dialog),
-      _("No Image"), EMPATHY_AVATAR_CHOOSER_RESPONSE_NO_IMAGE,
-      GTK_STOCK_CANCEL, EMPATHY_AVATAR_CHOOSER_RESPONSE_CANCEL,
-      GTK_STOCK_OPEN, EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE,
-      NULL);
-
-  chooser_dialog = self->priv->chooser_dialog;
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser_dialog), TRUE);
-
-  /* Get special dirs */
-  saved_dir = g_settings_get_string (self->priv->gsettings_ui,
-             EMPATHY_PREFS_UI_AVATAR_DIRECTORY);
-
-  if (saved_dir != NULL &&
-      !g_file_test (saved_dir, G_FILE_TEST_IS_DIR))
-    {
-      g_free (saved_dir);
-      saved_dir = NULL;
-    }
-
-  if (!g_file_test (default_dir, G_FILE_TEST_IS_DIR))
-    default_dir = NULL;
-
-  pics_dir = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
-  if (pics_dir != NULL && !g_file_test (pics_dir, G_FILE_TEST_IS_DIR))
-    pics_dir = NULL;
-
-  /* Set current dir to the last one or to DEFAULT_DIR or to home */
-  if (saved_dir != NULL)
-    gtk_file_chooser_set_current_folder (chooser_dialog, saved_dir);
-  else if (pics_dir != NULL)
-    gtk_file_chooser_set_current_folder (chooser_dialog, pics_dir);
-  else if (default_dir != NULL)
-    gtk_file_chooser_set_current_folder (chooser_dialog, default_dir);
-  else
-    gtk_file_chooser_set_current_folder (chooser_dialog, g_get_home_dir ());
-
-  /* Add shortcuts to special dirs */
-  if (saved_dir)
-    gtk_file_chooser_add_shortcut_folder (chooser_dialog, saved_dir, NULL);
-  else if (pics_dir)
-    gtk_file_chooser_add_shortcut_folder (chooser_dialog, pics_dir, NULL);
-
-  if (default_dir != NULL)
-    gtk_file_chooser_add_shortcut_folder (chooser_dialog, default_dir, NULL);
-
-  /* Setup preview image */
-  image = gtk_image_new ();
-  gtk_file_chooser_set_preview_widget (chooser_dialog, image);
-  gtk_widget_set_size_request (image, AVATAR_SIZE_SAVE, AVATAR_SIZE_SAVE);
-  gtk_widget_show (image);
-  gtk_file_chooser_set_use_preview_label (chooser_dialog, FALSE);
-  g_signal_connect (chooser_dialog, "update-preview",
-      G_CALLBACK (avatar_chooser_update_preview_cb),
-      self);
-
-  /* Setup filers */
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Images"));
-  gtk_file_filter_add_pixbuf_formats (filter);
-  gtk_file_chooser_add_filter (chooser_dialog, filter);
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All Files"));
-  gtk_file_filter_add_pattern (filter, "*");
-  gtk_file_chooser_add_filter (chooser_dialog, filter);
-
-  /* Setup response */
-  gtk_dialog_set_default_response (GTK_DIALOG (chooser_dialog),
-      EMPATHY_AVATAR_CHOOSER_RESPONSE_FILE);
-
-  g_signal_connect (chooser_dialog, "response",
-      G_CALLBACK (avatar_chooser_response_cb),
-      self);
-
-  gtk_widget_show (GTK_WIDGET (chooser_dialog));
-
-  g_free (saved_dir);
-}
-
-static void
-empathy_avatar_chooser_init (EmpathyAvatarChooser *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-    EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooserPrivate);
-
-  gtk_drag_dest_set (GTK_WIDGET (self),
-      GTK_DEST_DEFAULT_ALL,
-      drop_types,
-      G_N_ELEMENTS (drop_types),
-      GDK_ACTION_COPY);
-
-  self->priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
-
-  g_signal_connect (self, "drag-motion",
-      G_CALLBACK (avatar_chooser_drag_motion_cb),
-      self);
-  g_signal_connect (self, "drag-drop",
-      G_CALLBACK (avatar_chooser_drag_drop_cb),
-      self);
-  g_signal_connect (self, "drag-data-received",
-      G_CALLBACK (avatar_chooser_drag_data_received_cb),
-      self);
-  g_signal_connect (self, "clicked",
-      G_CALLBACK (avatar_chooser_clicked_cb),
-      self);
-
-  avatar_chooser_clear_image (self);
-}
-
-/**
- * empathy_avatar_chooser_new:
- * @account: a #TpAccount
- *
- * Creates a new #EmpathyAvatarChooser.
- *
- * Return value: a new #EmpathyAvatarChooser
- */
-GtkWidget *
-empathy_avatar_chooser_new (TpAccount *account)
-{
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
-  return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER,
-      "account", account,
-      NULL);
-}
-
-static void
-set_avatar_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *my_result = user_data;
-  GError *error = NULL;
-
-  if (!tp_account_set_avatar_finish (TP_ACCOUNT (source), result, &error))
-    g_simple_async_result_take_error (my_result, error);
-
-  g_simple_async_result_complete (my_result);
-  g_object_unref (my_result);
-}
-
-void
-empathy_avatar_chooser_apply_async (EmpathyAvatarChooser *self,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *result;
-
-  g_return_if_fail (EMPATHY_IS_AVATAR_CHOOSER (self));
-
-  result = g_simple_async_result_new ((GObject *) self, callback, user_data,
-      empathy_avatar_chooser_apply_async);
-
-  if (!self->priv->changed)
-    {
-      g_simple_async_result_complete_in_idle (result);
-      g_object_unref (result);
-      return;
-    }
-
-  self->priv->changed = FALSE;
-
-  DEBUG ("%s Account.Avatar on %s", self->priv->avatar != NULL ? "Set": "Clear",
-      tp_proxy_get_object_path (self->priv->account));
-
-  tp_account_set_avatar_async (self->priv->account,
-      self->priv->avatar != NULL ? (guchar *) self->priv->avatar->data : NULL,
-      self->priv->avatar != NULL ? self->priv->avatar->len : 0,
-      self->priv->mime_type, set_avatar_cb, result);
-}
-
-gboolean
-empathy_avatar_chooser_apply_finish (EmpathyAvatarChooser *self,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_void (self, empathy_avatar_chooser_apply_async);
-}
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
deleted file mode 100644
index dc82c0571..000000000
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2006-2007 Imendio AB.
- * Copyright (C) 2007-2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- *
- * Authors: Based on Novell's e-image-chooser.
- *          Xavier Claessens <xclaesse@gmail.com>
- */
-
-#ifndef __EMPATHY_AVATAR_CHOOSER_H__
-#define __EMPATHY_AVATAR_CHOOSER_H__
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_AVATAR_CHOOSER        (empathy_avatar_chooser_get_type ())
-#define EMPATHY_AVATAR_CHOOSER(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooser))
-#define EMPATHY_AVATAR_CHOOSER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_AVATAR_CHOOSER, EmpathyAvatarChooserClass))
-#define EMPATHY_IS_AVATAR_CHOOSER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER))
-#define EMPATHY_IS_AVATAR_CHOOSER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EMPATHY_TYPE_AVATAR_CHOOSER))
-
-typedef struct _EmpathyAvatarChooser        EmpathyAvatarChooser;
-typedef struct _EmpathyAvatarChooserClass   EmpathyAvatarChooserClass;
-typedef struct _EmpathyAvatarChooserPrivate EmpathyAvatarChooserPrivate;
-
-struct _EmpathyAvatarChooser
-{
-  GtkButton parent;
-
-  /*<private>*/
-  EmpathyAvatarChooserPrivate *priv;
-};
-
-struct _EmpathyAvatarChooserClass
-{
-  GtkButtonClass parent_class;
-};
-
-GType empathy_avatar_chooser_get_type (void);
-
-GtkWidget *empathy_avatar_chooser_new (TpAccount *account);
-
-void empathy_avatar_chooser_apply_async (EmpathyAvatarChooser *self,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-gboolean empathy_avatar_chooser_apply_finish (EmpathyAvatarChooser *self,
-    GAsyncResult *result,
-    GError **error);
-
-#endif /* __EMPATHY_AVATAR_CHOOSER_H__ */
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index acb0903e4..78a3e5ff3 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,13 +22,14 @@
  */
 
 #include "config.h"
+#include "empathy-avatar-image.h"
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /**
  * SECTION:empathy-avatar-image
@@ -211,7 +212,7 @@ avatar_image_button_press_event (GtkWidget *widget, GdkEventButton *event)
 		return TRUE;
 	}
 
-	pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE);
+	pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_LARGE);
 	popup_width = gdk_pixbuf_get_width (pixbuf);
 	popup_height = gdk_pixbuf_get_height (pixbuf);
 
@@ -302,7 +303,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image,
 	}
 
 	if (avatar) {
-		priv->pixbuf = empathy_pixbuf_from_data ((gchar *) avatar->data,
+		priv->pixbuf = tpaw_pixbuf_from_data ((gchar *) avatar->data,
 				avatar->len);
 	}
 
@@ -311,7 +312,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image,
 		return;
 	}
 
-	scaled_pixbuf = empathy_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL);
+	scaled_pixbuf = tpaw_pixbuf_scale_down_if_necessary (priv->pixbuf, MAX_SMALL);
 	gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled_pixbuf);
 
 	if (scaled_pixbuf != priv->pixbuf) {
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 9429a2874..65f088ecd 100644
--- a/libempathy-gtk/empathy-avatar-image.h
+++ b/libempathy-gtk/empathy-avatar-image.h
@@ -26,6 +26,8 @@
 
 #include <gtk/gtk.h>
 
+#include "empathy-contact.h"
+
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_AVATAR_IMAGE         (empathy_avatar_image_get_type ())
diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index a6938b3e5..5cdb90d1e 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-bad-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index ad5179806..a7d0a6f8c 100644
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -20,10 +20,7 @@
 #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
 #define __EMPATHY_BAD_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libempathy-gtk/empathy-base-password-dialog.h>
+#include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index 20238343d..f080cb7b1 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -18,14 +18,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-base-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
+
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
     GTK_TYPE_MESSAGE_DIALOG)
@@ -108,10 +109,10 @@ password_entry_changed_cb (GtkEditable *entry,
   str = gtk_entry_get_text (GTK_ENTRY (entry));
 
   gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-      GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+      GTK_ENTRY_ICON_SECONDARY, !TPAW_STR_EMPTY (str));
 
   gtk_widget_set_sensitive (self->ok_button,
-      !EMP_STR_EMPTY (str));
+      !TPAW_STR_EMPTY (str));
 }
 
 static void
diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
index 3f4cfdd5e..0c8ff5251 100644
--- a/libempathy-gtk/empathy-base-password-dialog.h
+++ b/libempathy-gtk/empathy-base-password-dialog.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
 #define __EMPATHY_BASE_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
deleted file mode 100644
index f4c82eb4e..000000000
--- a/libempathy-gtk/empathy-calendar-button.c
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * empathy-calendar-button.c - Source for EmpathyCalendarButton
- * 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
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-calendar-button.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include <libempathy/empathy-debug.h>
-
-G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
-
-/* signal enum */
-enum {
-  DATE_CHANGED,
-  LAST_SIGNAL,
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-struct _EmpathyCalendarButtonPriv {
-  GDate *date;
-
-  GtkWidget *button_date;
-  GtkWidget *button_clear;
-  GtkWidget *dialog;
-  GtkWidget *calendar;
-};
-
-static void
-empathy_calendar_button_finalize (GObject *object)
-{
-  EmpathyCalendarButton *self = (EmpathyCalendarButton *) object;
-
-  tp_clear_pointer (&self->priv->date, g_date_free);
-
-  G_OBJECT_CLASS (empathy_calendar_button_parent_class)->finalize (object);
-}
-
-static void
-update_label (EmpathyCalendarButton *self)
-{
-  if (self->priv->date == NULL)
-    {
-      gtk_button_set_label (GTK_BUTTON (self->priv->button_date),
-          _("Select..."));
-    }
-  else
-    {
-      gchar buffer[128];
-
-      g_date_strftime (buffer, 128, "%e %b %Y", self->priv->date);
-      gtk_button_set_label (GTK_BUTTON (self->priv->button_date), buffer);
-    }
-}
-
-static void
-empathy_calendar_button_constructed (GObject *object)
-{
-  EmpathyCalendarButton *self = (EmpathyCalendarButton *) object;
-
-  G_OBJECT_CLASS (empathy_calendar_button_parent_class)->constructed (
-      object);
-
-  update_label (self);
-}
-
-static void
-dialog_response (GtkDialog *dialog,
-    gint response,
-    EmpathyCalendarButton *self)
-{
-  GDate *date;
-  guint year, month, day;
-
-  if (response != GTK_RESPONSE_OK)
-    goto out;
-
-  gtk_calendar_get_date (GTK_CALENDAR (self->priv->calendar),
-      &year, &month, &day);
-  date = g_date_new_dmy (day, month + 1, year);
-
-  empathy_calendar_button_set_date (self, date);
-
-  g_date_free (date);
-
-out:
-  gtk_widget_hide (GTK_WIDGET (dialog));
-}
-
-static gboolean
-dialog_destroy (GtkWidget *widget,
-    EmpathyCalendarButton *self)
-{
-  self->priv->dialog = NULL;
-  self->priv->calendar = NULL;
-
-  return FALSE;
-}
-
-static void
-update_calendar (EmpathyCalendarButton *self)
-{
-  if (self->priv->calendar == NULL)
-    return;
-
-  gtk_calendar_clear_marks (GTK_CALENDAR (self->priv->calendar));
-
-  if (self->priv->date == NULL)
-    return;
-
-  gtk_calendar_select_day (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_day (self->priv->date));
-  gtk_calendar_select_month (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_month (self->priv->date) - 1,
-      g_date_get_year (self->priv->date));
-  gtk_calendar_mark_day (GTK_CALENDAR (self->priv->calendar),
-      g_date_get_day (self->priv->date));
-}
-
-static void
-empathy_calendar_button_date_clicked (GtkButton *button,
-    EmpathyCalendarButton *self)
-{
-  if (self->priv->dialog == NULL)
-    {
-      GtkWidget *parent, *content;
-
-      parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
-
-      self->priv->dialog = gtk_dialog_new_with_buttons (NULL,
-          GTK_WINDOW (parent), GTK_DIALOG_MODAL,
-          GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-          _("_Select"), GTK_RESPONSE_OK,
-          NULL);
-
-      gtk_window_set_transient_for (GTK_WINDOW (self->priv->dialog),
-          GTK_WINDOW (parent));
-
-      self->priv->calendar = gtk_calendar_new ();
-
-      update_calendar (self);
-
-      content = gtk_dialog_get_content_area (GTK_DIALOG (self->priv->dialog));
-
-      gtk_box_pack_start (GTK_BOX (content), self->priv->calendar, TRUE, TRUE,
-          6);
-      gtk_widget_show (self->priv->calendar);
-
-      g_signal_connect (self->priv->dialog, "response",
-          G_CALLBACK (dialog_response), self);
-      g_signal_connect (self->priv->dialog, "destroy",
-          G_CALLBACK (dialog_destroy), self);
-    }
-
-  gtk_window_present (GTK_WINDOW (self->priv->dialog));
-}
-
-static void
-empathy_calendar_button_clear_clicked (GtkButton *button,
-    EmpathyCalendarButton *self)
-{
-  empathy_calendar_button_set_date (self, NULL);
-}
-
-static void
-empathy_calendar_button_init (EmpathyCalendarButton *self)
-{
-  GtkWidget *image;
-  GtkStyleContext *context;
-
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_CALENDAR_BUTTON, EmpathyCalendarButtonPriv);
-
-  context = gtk_widget_get_style_context (GTK_WIDGET (self));
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
-
-  /* Date */
-  self->priv->button_date = gtk_button_new ();
-
-  g_signal_connect (self->priv->button_date, "clicked",
-      G_CALLBACK (empathy_calendar_button_date_clicked), self);
-
-  gtk_button_set_alignment (GTK_BUTTON (self->priv->button_date), 0, 0.5);
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->button_date, TRUE, TRUE, 0);
-  gtk_widget_show (self->priv->button_date);
-
-  /* Clear */
-  self->priv->button_clear = gtk_button_new ();
-
-  image = gtk_image_new_from_stock (GTK_STOCK_CLEAR,
-      GTK_ICON_SIZE_MENU);
-  gtk_button_set_image (GTK_BUTTON (self->priv->button_clear), image);
-  gtk_widget_show (image);
-
-  g_signal_connect (self->priv->button_clear, "clicked",
-      G_CALLBACK (empathy_calendar_button_clear_clicked), self);
-
-  gtk_box_pack_start (GTK_BOX (self), self->priv->button_clear,
-      FALSE, FALSE, 0);
-  gtk_widget_show (self->priv->button_clear);
-}
-
-static void
-empathy_calendar_button_class_init (EmpathyCalendarButtonClass *klass)
-{
-  GObjectClass *oclass = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (klass, sizeof (EmpathyCalendarButtonPriv));
-
-  oclass->finalize = empathy_calendar_button_finalize;
-  oclass->constructed = empathy_calendar_button_constructed;
-
-  signals[DATE_CHANGED] = g_signal_new ("date-changed",
-      G_TYPE_FROM_CLASS (klass),
-      G_SIGNAL_RUN_LAST, 0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE, 1, G_TYPE_DATE);
-}
-
-GtkWidget *
-empathy_calendar_button_new (void)
-{
-  return g_object_new (EMPATHY_TYPE_CALENDAR_BUTTON,
-      "orientation", GTK_ORIENTATION_HORIZONTAL,
-      NULL);
-}
-
-GDate *
-empathy_calendar_button_get_date (EmpathyCalendarButton *self)
-{
-  return self->priv->date;
-}
-
-void
-empathy_calendar_button_set_date (EmpathyCalendarButton *self,
-    GDate *date)
-{
-  if (date == self->priv->date)
-    return;
-
-  tp_clear_pointer (&self->priv->date, g_date_free);
-
-  if (date != NULL)
-    {
-      /* There is no g_date_copy()... */
-      self->priv->date = g_date_new_dmy (date->day, date->month, date->year);
-    }
-
-  update_label (self);
-  update_calendar (self);
-
-  g_signal_emit (self, signals[DATE_CHANGED], 0, self->priv->date);
-}
diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h
deleted file mode 100644
index 3f1aed1f1..000000000
--- a/libempathy-gtk/empathy-calendar-button.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * empathy-calendar-button.h - Header for EmpathyCalendarButton
- * 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
- */
-
-#ifndef __EMPATHY_CALENDAR_BUTTON_H__
-#define __EMPATHY_CALENDAR_BUTTON_H__
-
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyCalendarButton EmpathyCalendarButton;
-typedef struct _EmpathyCalendarButtonClass EmpathyCalendarButtonClass;
-typedef struct _EmpathyCalendarButtonPriv EmpathyCalendarButtonPriv;
-
-struct _EmpathyCalendarButtonClass {
-    GtkBoxClass parent_class;
-};
-
-struct _EmpathyCalendarButton {
-    GtkBox parent;
-    EmpathyCalendarButtonPriv *priv;
-};
-
-GType empathy_calendar_button_get_type (void);
-
-#define EMPATHY_TYPE_CALENDAR_BUTTON \
-  (empathy_calendar_button_get_type ())
-#define EMPATHY_CALENDAR_BUTTON(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \
-    EmpathyCalendarButton))
-#define EMPATHY_CALENDAR_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CALENDAR_BUTTON, \
-  EmpathyCalendarButtonClass))
-#define EMPATHY_IS_CALENDAR_BUTTON(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CALENDAR_BUTTON))
-#define EMPATHY_IS_CALENDAR_BUTTON_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CALENDAR_BUTTON))
-#define EMPATHY_CALENDAR_BUTTON_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CALENDAR_BUTTON, \
-  EmpathyCalendarButtonClass))
-
-GtkWidget * empathy_calendar_button_new (void);
-
-GDate * empathy_calendar_button_get_date (EmpathyCalendarButton *self);
-
-void empathy_calendar_button_set_date (EmpathyCalendarButton *self,
-    GDate *date);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_CALENDAR_BUTTON_H__*/
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 9f72ce9bb..ebb4c1d5d 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -19,19 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-call-utils.h"
 
 #include <glib/gi18n-lib.h>
-
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include "empathy-call-utils.h"
-
-#include <libempathy/empathy-request-util.h>
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 static const gchar *
 get_error_display_message (GError *error)
@@ -79,18 +75,25 @@ empathy_call_create_call_request (const gchar *contact,
     gboolean initial_audio,
     gboolean initial_video)
 {
-  return tp_asv_new (
+  GHashTable *asv = tp_asv_new (
     TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
       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,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
-      initial_audio,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
-      initial_video,
     NULL);
+
+  /* Only add InitialAudio or InitialVideo if they are true: it should work
+   * with genuinely voice-only CMs. */
+  if (initial_audio)
+    tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
+                        initial_audio);
+  if (initial_video)
+    tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
+                        initial_video);
+
+  return asv;
 }
 
 static void
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 12fca684e..788d828f5 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,6 +21,8 @@
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 
+#include <telepathy-glib/telepathy-glib.h>
+
 G_BEGIN_DECLS
 
 /* Calls */
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 3db350935..bdbf1cb09 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -21,11 +21,10 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
 #include "empathy-cell-renderer-activatable.h"
 
+#include "empathy-utils.h"
+
 enum {
   PATH_ACTIVATED,
   LAST_SIGNAL
diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index f7c873617..8653fae80 100644
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,9 +21,11 @@
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 
-#include <libempathy/empathy-utils.h>
+#include "config.h"
 #include "empathy-cell-renderer-expander.h"
 
+#include "empathy-utils.h"
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
 typedef struct {
 	GtkExpanderStyle     expander_style;
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index 0afd89748..5ce735f40 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,10 +22,12 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-text.h"
 
+#include <tp-account-widgets/tpaw-utils.h>
+
+#include "empathy-utils.h"
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
 typedef struct {
 	gchar    *name;
@@ -296,7 +298,7 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
 				gboolean                selected)
 {
 	EmpathyCellRendererTextPriv *priv;
-	const PangoFontDescription *font_desc;
+	PangoFontDescription *font_desc;
 	PangoAttrList              *attr_list;
 	PangoAttribute             *attr_color = NULL, *attr_size;
 	GtkStyleContext            *style;
@@ -328,8 +330,11 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
 
 	attr_list = pango_attr_list_new ();
 
-	font_desc = gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL);
+	gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL,
+		"font", &font_desc,
+		NULL);
 	font_size = pango_font_description_get_size (font_desc);
+	pango_font_description_free (font_desc);
 	attr_size = pango_attr_size_new (font_size / 1.2);
 	attr_size->start_index = strlen (priv->name) + 1;
 	attr_size->end_index = -1;
@@ -349,7 +354,7 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
 	}
 
 	if (priv->compact) {
-		if (EMP_STR_EMPTY (priv->status)) {
+		if (TPAW_STR_EMPTY (priv->status)) {
 			str = g_strdup (priv->name);
 		} else {
 			str = g_strdup_printf ("%s %s", priv->name, priv->status);
@@ -358,7 +363,7 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
 		const gchar *status = priv->status;
 		gboolean on_a_phone = FALSE;
 
-		if (EMP_STR_EMPTY (priv->status)) {
+		if (TPAW_STR_EMPTY (priv->status)) {
 			status = empathy_presence_get_default_message (priv->presence_type);
 		}
 
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ffd92b1cd..a7364e4ca 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,33 +26,35 @@
  *          Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include "config.h"
 /* for GCompletion */
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
-#include <glib/gi18n-lib.h>
+#include "config.h"
+#include "empathy-chat.h"
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-keyring.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-client-factory.h>
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-chat.h"
-#include "empathy-spell.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
 #include "empathy-individual-information-dialog.h"
 #include "empathy-individual-store-channel.h"
 #include "empathy-individual-view.h"
 #include "empathy-input-text-view.h"
+#include "empathy-request-util.h"
 #include "empathy-search-bar.h"
-#include "empathy-theme-manager.h"
 #include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-spell.h"
 #include "empathy-string-parser.h"
-#include "extensions/extensions.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
 #define COMPOSING_STOP_TIMEOUT 5
@@ -327,7 +329,7 @@ chat_new_connection_cb (TpAccount   *account,
 
 	if (priv->tp_chat != NULL || account != priv->account ||
 	    priv->handle_type == TP_HANDLE_TYPE_NONE ||
-	    EMP_STR_EMPTY (priv->id))
+	    TPAW_STR_EMPTY (priv->id))
 		return;
 
 	g_object_ref (chat);
@@ -732,7 +734,7 @@ chat_command_msg_cb (GObject *source,
 		goto OUT;
 	}
 
-	if (!EMP_STR_EMPTY (data->message) && TP_IS_TEXT_CHANNEL (channel)) {
+	if (!TPAW_STR_EMPTY (data->message) && TP_IS_TEXT_CHANNEL (channel)) {
 		TpTextChannel *text = (TpTextChannel *) channel;
 		TpMessage *msg;
 
@@ -822,7 +824,7 @@ chat_command_join (EmpathyChat *chat,
 	* https://bugs.freedesktop.org/show_bug.cgi?id=13422 */
 	while (rooms[i] != NULL) {
 		/* ignore empty strings */
-		if (!EMP_STR_EMPTY (rooms[i])) {
+		if (!TPAW_STR_EMPTY (rooms[i])) {
 			empathy_chat_join_muc (chat, rooms[i]);
 		}
 		i++;
@@ -1193,7 +1195,7 @@ chat_command_parse (const gchar *text, guint max_parts)
 
 	/* Append last part if not empty */
 	item = g_strstrip (g_strdup (text));
-	if (!EMP_STR_EMPTY (item)) {
+	if (!TPAW_STR_EMPTY (item)) {
 		g_ptr_array_add (array, item);
 		DEBUG ("\tITEM: \"%s\"", item);
 	} else {
@@ -1221,7 +1223,7 @@ chat_send (EmpathyChat  *chat,
 	TpMessage  *message;
 	guint            i;
 
-	if (EMP_STR_EMPTY (msg)) {
+	if (TPAW_STR_EMPTY (msg)) {
 		return;
 	}
 
@@ -1673,13 +1675,13 @@ chat_subject_changed_cb (EmpathyChat *chat)
 		priv->subject = g_strdup (empathy_tp_chat_get_subject (priv->tp_chat));
 		g_object_notify (G_OBJECT (chat), "subject");
 
-		if (EMP_STR_EMPTY (priv->subject)) {
+		if (TPAW_STR_EMPTY (priv->subject)) {
 			gtk_widget_hide (priv->hbox_topic);
 		} else {
 			gchar *markup_topic;
 			gchar *markup_text;
 
-			markup_topic = empathy_add_link_markup (priv->subject);
+			markup_topic = tpaw_add_link_markup (priv->subject);
 			markup_text = g_strdup_printf ("<span weight=\"bold\">%s</span> %s",
 				_("Topic:"), markup_topic);
 
@@ -1692,7 +1694,7 @@ chat_subject_changed_cb (EmpathyChat *chat)
 		if (priv->block_events_timeout_id == 0) {
 			gchar *str = NULL;
 
-			if (!EMP_STR_EMPTY (priv->subject)) {
+			if (!TPAW_STR_EMPTY (priv->subject)) {
 				const gchar *actor = empathy_tp_chat_get_subject_actor (priv->tp_chat);
 
 				if (tp_str_empty (actor)) {
@@ -2411,7 +2413,7 @@ chat_input_populate_popup_cb (GtkTextView *view,
 	/* Add the Send menu item. */
 	gtk_text_buffer_get_bounds (buffer, &start, &end);
 	str = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
-	if (!EMP_STR_EMPTY (str)) {
+	if (!TPAW_STR_EMPTY (str)) {
 		item = gtk_menu_item_new_with_mnemonic (_("_Send"));
 		g_signal_connect (G_OBJECT (item), "activate",
 				  G_CALLBACK (chat_text_send_cb), chat);
@@ -2458,7 +2460,7 @@ chat_input_populate_popup_cb (GtkTextView *view,
 		str = gtk_text_buffer_get_text (buffer,
 						&start, &end, FALSE);
 	}
-	if (!EMP_STR_EMPTY (str)) {
+	if (!TPAW_STR_EMPTY (str)) {
 		chat_spell = chat_spell_new (chat, str, start, end);
 		g_object_set_data_full (G_OBJECT (menu),
 					"chat-spell", chat_spell,
@@ -2851,7 +2853,7 @@ build_part_message (guint           reason,
 		g_string_append_printf (s, _("%s has left the room"), name);
 	}
 
-	if (!EMP_STR_EMPTY (message)) {
+	if (!TPAW_STR_EMPTY (message)) {
 		/* 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,
@@ -3251,7 +3253,7 @@ chat_create_ui (EmpathyChat *chat)
 
 	filename = empathy_file_lookup ("empathy-chat.ui",
 					"libempathy-gtk");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 					"chat_widget", &priv->widget,
 					"hpaned", &priv->hpaned,
 					"vbox_left", &priv->vbox_left,
@@ -3264,7 +3266,7 @@ chat_create_ui (EmpathyChat *chat)
 					"info_bar_vbox", &priv->info_bar_vbox,
 					NULL);
 
-	empathy_builder_connect (gui, chat,
+	tpaw_builder_connect (gui, chat,
 		"expander_topic", "notify::expanded", chat_topic_expander_activate_cb,
 		"label_topic", "size-allocate", chat_topic_label_size_allocate_cb,
 		NULL);
@@ -3735,7 +3737,7 @@ remember_password_infobar_response_cb (GtkWidget *info_bar,
 
 	if (response_id == GTK_RESPONSE_OK) {
 		DEBUG ("Saving room password");
-		empathy_keyring_set_room_password_async (priv->account,
+		tpaw_keyring_set_room_password_async (priv->account,
 							 empathy_tp_chat_get_id (priv->tp_chat),
 							 data->password,
 							 NULL, NULL);
@@ -3855,14 +3857,8 @@ provide_password_cb (GObject *tp_chat,
 		return;
 	}
 
-	if (empathy_keyring_is_available ()) {
-		/* ask whether they want to save the password */
-		chat_prompt_to_save_password (self, data);
-	} else {
-		/* Get rid of the password info bar finally */
-		gtk_widget_destroy (data->info_bar);
-		g_slice_free (PasswordData, data);
-	}
+    /* ask whether they want to save the password */
+    chat_prompt_to_save_password (self, data);
 
 	/* Room joined */
 	gtk_widget_set_sensitive (priv->hpaned, TRUE);
@@ -3928,7 +3924,7 @@ password_entry_changed_cb (GtkEditable *entry,
 	str = gtk_entry_get_text (GTK_ENTRY (entry));
 
 	gtk_entry_set_icon_sensitive (GTK_ENTRY (entry),
-	    GTK_ENTRY_ICON_SECONDARY, !EMP_STR_EMPTY (str));
+	    GTK_ENTRY_ICON_SECONDARY, !TPAW_STR_EMPTY (str));
 }
 
 static void
@@ -4077,7 +4073,7 @@ chat_room_got_password_cb (GObject *source,
 	const gchar *password;
 	GError *error = NULL;
 
-	password = empathy_keyring_get_room_password_finish (priv->account,
+	password = tpaw_keyring_get_room_password_finish (priv->account,
 	    result, &error);
 
 	if (error != NULL) {
@@ -4099,7 +4095,7 @@ chat_password_needed_changed_cb (EmpathyChat *self)
 	EmpathyChatPriv *priv = GET_PRIV (self);
 
 	if (tp_channel_password_needed (TP_CHANNEL (priv->tp_chat))) {
-		empathy_keyring_get_room_password_async (priv->account,
+		tpaw_keyring_get_room_password_async (priv->account,
 							 empathy_tp_chat_get_id (priv->tp_chat),
 							 chat_room_got_password_cb, self);
 	}
@@ -4301,7 +4297,7 @@ empathy_chat_get_contact_menu (EmpathyChat *chat)
 	if (individual == NULL)
 		return NULL;
 
-	menu = empathy_individual_menu_new (individual,
+	menu = empathy_individual_menu_new (individual, NULL,
 					 EMPATHY_INDIVIDUAL_FEATURE_CALL |
 					 EMPATHY_INDIVIDUAL_FEATURE_LOG |
 					 EMPATHY_INDIVIDUAL_FEATURE_INFO |
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 269b00596..2a983622b 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -30,10 +30,9 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-tp-chat.h>
-
-#include <libempathy-gtk/empathy-theme-adium.h>
+#include "empathy-contact.h"
+#include "empathy-theme-adium.h"
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 9a0498c5a..046356ae1 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -21,19 +21,19 @@
  *
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-blocking-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-contact-blocking-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv)
 #define DECLARE_CALLBACK(func) \
@@ -615,7 +615,7 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
   filename = empathy_file_lookup ("empathy-contact-blocking-dialog.ui",
       "libempathy-gtk");
 
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "contents", &contents,
       "account-hbox", &account_hbox,
       "add-button", &self->priv->add_button,
@@ -627,7 +627,7 @@ empathy_contact_blocking_dialog_init (EmpathyContactBlockingDialog *self)
       "remove-toolbar", &remove_toolbar,
       NULL);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "add-button", "clicked", contact_blocking_dialog_add_contact,
       "add-contact-entry", "activate", contact_blocking_dialog_add_contact,
       "remove-button", "clicked", contact_blocking_dialog_remove_contacts,
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 80ea9765a..e31b22fe1 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -10,15 +10,13 @@
  */
 
 #include "config.h"
-
 #include "empathy-contact-chooser.h"
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-individual-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-client-factory.h"
+#include "empathy-individual-store-manager.h"
+#include "empathy-individual-view.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyContactChooser,
     empathy_contact_chooser, GTK_TYPE_BOX);
@@ -314,7 +312,7 @@ search_text_changed (GtkEntry *entry,
 
   id = gtk_entry_get_text (entry);
 
-  self->priv->search_words = empathy_live_search_strip_utf8_string (id);
+  self->priv->search_words = tpaw_live_search_strip_utf8_string (id);
   self->priv->search_str = g_strdup (id);
 
   add_temporary_individuals (self, id);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 0b01bf88d..e5810597b 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -22,21 +22,22 @@
  *     Danielle Madeley <danielle.madeley@collabora.co.uk>
  *     Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-search-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-cell-renderer-text.h>
-#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
-#include <libempathy-gtk/empathy-individual-information-dialog.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "empathy-account-chooser.h"
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-client-factory.h"
+#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #include "empathy-contact-search-dialog.h"
 
@@ -53,7 +54,8 @@ enum
 
 enum {
    PAGE_SEARCH_RESULTS,
-   PAGE_NO_MATCH
+   PAGE_NO_MATCH,
+   PAGE_NOT_SUPPORTED,
 };
 
 typedef struct _EmpathyContactSearchDialogPrivate EmpathyContactSearchDialogPrivate;
@@ -68,7 +70,6 @@ struct _EmpathyContactSearchDialogPrivate
   GtkWidget *spinner;
   GtkWidget *add_button;
   GtkWidget *find_button;
-  GtkWidget *no_contact_found;
   GtkWidget *search_entry;
   /* GtkWidget *server_entry; */
   GtkWidget *message;
@@ -102,10 +103,16 @@ on_searcher_reset (GObject *source_object,
   if (error != NULL)
     {
       DEBUG ("Failed to reset the TpContactSearch: %s", error->message);
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
+          PAGE_NOT_SUPPORTED);
+
       g_error_free (error);
       return;
     }
 
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
+      PAGE_SEARCH_RESULTS);
+
   search = g_hash_table_new (g_str_hash, g_str_equal);
 
   search_criteria = gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
@@ -314,16 +321,23 @@ on_searcher_created (GObject *source_object,
   if (error != NULL)
     {
       DEBUG ("Failed to create a TpContactSearch: %s", error->message);
+      gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
+          PAGE_NOT_SUPPORTED);
+
       g_error_free (error);
       return;
     }
 
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
+      PAGE_SEARCH_RESULTS);
+
   g_signal_connect (priv->searcher, "search-results-received",
       G_CALLBACK (_search_results_received), self);
   g_signal_connect (priv->searcher, "notify::state",
       G_CALLBACK (_on_search_state_changed_cb), self);
 
   gtk_widget_set_sensitive (priv->find_button, TRUE);
+  gtk_widget_set_sensitive (priv->search_entry, TRUE);
 }
 
 static void
@@ -372,6 +386,7 @@ _account_chooser_changed (EmpathyAccountChooser *chooser,
 
   /* gtk_widget_set_sensitive (priv->server_entry, can_set_server); */
   gtk_widget_set_sensitive (priv->find_button, FALSE);
+  gtk_widget_set_sensitive (priv->search_entry, FALSE);
 
   DEBUG ("New account is %s", tp_proxy_get_object_path (account));
 
@@ -506,6 +521,24 @@ on_profile_button_clicked_cb (EmpathyCellRendererActivatable *cell,
 }
 
 static void
+append_message_page (EmpathyContactSearchDialog *self,
+    const gchar *message)
+{
+  EmpathyContactSearchDialogPrivate *priv = GET_PRIVATE (self);
+  GtkWidget *label;
+  gchar *tmp;
+
+  label = gtk_label_new (NULL);
+  tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>", message);
+  gtk_label_set_markup (GTK_LABEL (label), tmp);
+  g_free (tmp);
+
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+
+  gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), label, NULL);
+}
+
+static void
 empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
 {
   EmpathyContactSearchDialogPrivate *priv = GET_PRIVATE (self);
@@ -514,7 +547,6 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
   GtkTreeViewColumn *col;
   GtkTreeSelection *selection;
   GtkSizeGroup *size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-  gchar *tmp;
 
   /* Title */
   gtk_window_set_title (GTK_WINDOW (self), _("Search contacts"));
@@ -621,19 +653,11 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
 
   gtk_container_add (GTK_CONTAINER (scrolled_window), priv->tree_view);
 
-  priv->no_contact_found = gtk_label_new (NULL);
-  tmp = g_strdup_printf ("<b><span size='xx-large'>%s</span></b>",
-      _("No contacts found"));
-  gtk_label_set_markup (GTK_LABEL (priv->no_contact_found), tmp);
-  g_free (tmp);
-
-  gtk_label_set_ellipsize (GTK_LABEL (priv->no_contact_found),
-      PANGO_ELLIPSIZE_END);
-
   gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), scrolled_window,
       NULL);
-  gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-      priv->no_contact_found, NULL);
+
+  append_message_page (self, _("No contacts found"));
+  append_message_page (self, _("Contact search is not supported on this account"));
 
   gtk_box_pack_start (GTK_BOX (vbox), priv->notebook, TRUE, TRUE, 3);
 
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index cef06d309..505dad402 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -20,20 +20,21 @@
  */
 
 #include "config.h"
+#include "empathy-contact-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-string-parser.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include "empathy-contact-widget.h"
 #include "empathy-avatar-image.h"
+#include "empathy-client-factory.h"
 #include "empathy-groups-widget.h"
 #include "empathy-ui-utils.h"
-#include "empathy-string-parser.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-contact-widget
@@ -359,7 +360,7 @@ contact_widget_presence_notify_cb (EmpathyContactWidget *self)
 
   status = empathy_contact_get_status (self->priv->contact);
   if (status != NULL)
-    markup_text = empathy_add_link_markup (status);
+    markup_text = tpaw_add_link_markup (status);
   gtk_label_set_markup (GTK_LABEL (self->priv->label_status), markup_text);
   g_free (markup_text);
 
@@ -505,7 +506,7 @@ contact_widget_change_contact (EmpathyContactWidget *self)
       return;
 
   id = gtk_entry_get_text (GTK_ENTRY (self->priv->widget_id));
-  if (!EMP_STR_EMPTY (id))
+  if (!TPAW_STR_EMPTY (id))
     {
       EmpathyClientFactory *factory;
 
@@ -661,7 +662,7 @@ empathy_contact_widget_new (EmpathyContact *contact)
 
   filename = empathy_file_lookup ("empathy-contact-widget.ui",
       "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
        "vbox_contact_widget", &main_vbox,
        "hbox_presence", &self->priv->hbox_presence,
        "label_alias", &self->priv->label_alias,
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 6f8045d3e..5f44adb6b 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-contact.h>
 #include "empathy-account-chooser.h"
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
deleted file mode 100644
index 7ec61310d..000000000
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/*
- * Copyright (C) 2007-2011 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Xavier Claessens <xclaesse@gmail.com>
- *          Philip Withnall <philip.withnall@collabora.co.uk>
- *          Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-request-util.h>
-
-#include "empathy-contactinfo-utils.h"
-#include "empathy-string-parser.h"
-#include "empathy-ui-utils.h"
-
-static gchar *
-linkify_first_value (GStrv values)
-{
-  return empathy_add_link_markup (values[0]);
-}
-
-static gchar *
-format_idle_time (GStrv values)
-{
-  const gchar *value = values[0];
-  int duration = strtol (value, NULL, 10);
-
-  if (duration <= 0)
-    return NULL;
-
-  return empathy_duration_to_string (duration);
-}
-
-static gchar *
-format_server (GStrv values)
-{
-  g_assert (values[0] != NULL);
-
-  if (values[1] == NULL)
-    return g_markup_escape_text (values[0], -1);
-  else
-    return g_markup_printf_escaped ("%s (%s)", values[0], values[1]);
-}
-
-static gchar *
-presence_hack (GStrv values)
-{
-  if (tp_str_empty (values[0]))
-    return NULL;
-
-  return g_markup_escape_text (values[0], -1);
-}
-
-typedef struct
-{
-  const gchar *field_name;
-  const gchar *title;
-  EmpathyContactInfoFormatFunc format;
-} InfoFieldData;
-
-/* keep this syncronised with info_field_data below */
-static const char *info_field_names[] =
-{
-  "fn",
-  "tel",
-  "email",
-  "url",
-  "bday",
-
-  "x-idle-time",
-  "x-irc-server",
-  "x-host",
-
-  "x-presence-status-message",
-
-  NULL
-};
-
-static InfoFieldData info_field_data[G_N_ELEMENTS (info_field_names)] =
-{
-  { "fn",    N_("Full name"),      NULL },
-  { "tel",   N_("Phone number"),   NULL },
-  { "email", N_("E-mail address"), linkify_first_value },
-  { "url",   N_("Website"),        linkify_first_value },
-  { "bday",  N_("Birthday"),       NULL },
-
-  /* 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. */
-  { "x-idle-time",  N_("Last seen:"),      format_idle_time },
-  { "x-irc-server", N_("Server:"),         format_server },
-  { "x-host",       N_("Connected from:"), format_server },
-
-  /* FIXME: once Idle implements SimplePresence using this information, we can
-   * and should bin this. */
-  { "x-presence-status-message", N_("Away message:"), presence_hack },
-
-  { NULL, NULL }
-};
-
-typedef struct
-{
-  const gchar *type;
-  const gchar *title;
-} InfoParameterData;
-
-static InfoParameterData info_parameter_data[] =
-{
-  { "work", N_("work") },
-  { "home", N_("home") },
-  { "cell", N_("mobile") },
-  { "voice", N_("voice") },
-  { "pref", N_("preferred") },
-  { "postal", N_("postal") },
-  { "parcel", N_("parcel") },
-  { NULL, NULL }
-};
-
-const char **
-empathy_contact_info_get_field_names (guint *nnames)
-{
-  if (nnames != NULL)
-    *nnames = G_N_ELEMENTS (info_field_names) - 1;
-
-  return info_field_names;
-}
-
-gboolean
-empathy_contact_info_lookup_field (const gchar *field_name,
-    const gchar **title,
-    EmpathyContactInfoFormatFunc *format)
-{
-  guint i;
-
-  for (i = 0; info_field_data[i].field_name != NULL; i++)
-    {
-      if (tp_strdiff (info_field_data[i].field_name, field_name) == FALSE)
-        {
-          if (title != NULL)
-            *title = gettext (info_field_data[i].title);
-
-          if (format != NULL)
-            *format = info_field_data[i].format;
-
-          return TRUE;
-        }
-    }
-
-  return FALSE;
-}
-
-static char *
-build_parameters_string (GStrv parameters)
-{
-  GPtrArray *output = g_ptr_array_new ();
-  char *join;
-  GStrv iter;
-
-  for (iter = parameters; iter != NULL && *iter != NULL; iter++)
-    {
-      static const char *prefix = "type=";
-      const char *param = *iter;
-      InfoParameterData *iter2;
-
-      if (!g_str_has_prefix (param, prefix))
-        continue;
-
-      param += strlen (prefix);
-
-      for (iter2 = info_parameter_data; iter2->type != NULL; iter2++)
-        {
-          if (!tp_strdiff (iter2->type, param))
-            {
-              g_ptr_array_add (output, gettext (iter2->title));
-              break;
-            }
-        }
-    }
-
-  if (output->len == 0)
-    return NULL;
-
-  g_ptr_array_add (output, NULL); /* NULL-terminate */
-
-  join = g_strjoinv (", ", (char **) output->pdata);
-  g_ptr_array_unref (output);
-
-  return join;
-}
-
-char *
-empathy_contact_info_field_label (const char *field_name,
-    GStrv parameters,
-    gboolean show_parameters)
-{
-  char *ret;
-  const char *title;
-  char *join = NULL;
-
-  if (!empathy_contact_info_lookup_field (field_name, &title, NULL))
-    return NULL;
-
-  if (show_parameters)
-    join = build_parameters_string (parameters);
-
-  if (join != NULL)
-    ret = g_strdup_printf ("%s (%s)", title, join);
-  else
-    ret = g_strdup_printf ("%s", title);
-
-  g_free (join);
-
-  return ret;
-}
-
-static gint
-contact_info_field_name_cmp (const gchar *name1,
-    const gchar *name2)
-{
-  guint i;
-
-  if (tp_strdiff (name1, name2) == FALSE)
-    return 0;
-
-  /* We use the order of info_field_data */
-  for (i = 0; info_field_data[i].field_name != NULL; i++)
-    {
-      if (tp_strdiff (info_field_data[i].field_name, name1) == FALSE)
-        return -1;
-      if (tp_strdiff (info_field_data[i].field_name, name2) == FALSE)
-        return +1;
-    }
-
-  return g_strcmp0 (name1, name2);
-}
-
-gint
-empathy_contact_info_field_cmp (TpContactInfoField *field1,
-    TpContactInfoField *field2)
-{
-  return contact_info_field_name_cmp (field1->field_name, field2->field_name);
-}
-
-gint
-empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
-    TpContactInfoFieldSpec *spec2)
-{
-    return contact_info_field_name_cmp (spec1->name, spec2->name);
-}
-
-static gboolean
-channel_name_activated_cb (
-    GtkLabel *label,
-    gchar *uri,
-    TpAccount *account)
-{
-  empathy_join_muc (account, uri, empathy_get_current_action_time ());
-  return TRUE;
-}
-
-GtkWidget *
-empathy_contact_info_create_channel_list_label (TpAccount *account,
-    GList *info,
-    guint row)
-{
-  GtkWidget *label = NULL;
-  GString *label_markup = g_string_new ("");
-  guint i;
-  GPtrArray *channels;
-  GList *l;
-
-  /* Is there channels? */
-  channels = g_ptr_array_new ();
-
-  for (l = info; l != NULL; l = l->next)
-    {
-      TpContactInfoField *field = l->data;
-
-      if (!tp_strdiff (field->field_name, "x-irc-channel"))
-        g_ptr_array_add (channels, (gpointer) field->field_value[0]);
-    }
-
-  if (channels->len == 0)
-    goto out;
-
-  for (i = 0; i < channels->len; i++)
-    {
-      const gchar *channel_name = g_ptr_array_index (channels, i);
-      /* We abuse the URI of the link to hold the channel name. It seems to
-       * be okay to just use it essentially verbatim, rather than trying to
-       * ensure it's actually a valid URI. */
-      gchar *escaped = g_markup_escape_text (channel_name, -1);
-
-      if (i > 0)
-        g_string_append (label_markup, ", ");
-
-      g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
-          escaped, escaped);
-      g_free (escaped);
-    }
-
-  label = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (label), label_markup->str);
-  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-
-  g_signal_connect (label, "activate-link",
-      (GCallback) channel_name_activated_cb, account);
-
-out:
-  g_ptr_array_unref (channels);
-  g_string_free (label_markup, TRUE);
-
-  return label;
-}
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
deleted file mode 100644
index 80c18ffae..000000000
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2011 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: Danielle Madeley <danielle.madeley@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_CONTACTINFO_UTILS_H__
-#define __EMPATHY_CONTACTINFO_UTILS_H__
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-G_BEGIN_DECLS
-
-typedef gchar * (* EmpathyContactInfoFormatFunc) (GStrv);
-
-const char **empathy_contact_info_get_field_names (guint *nnames);
-gboolean empathy_contact_info_lookup_field (const gchar *field_name,
-    const gchar **title, EmpathyContactInfoFormatFunc *linkify);
-char *empathy_contact_info_field_label (const char *field_name,
-    GStrv parameters,
-    gboolean show_parameters);
-
-gint empathy_contact_info_field_cmp (TpContactInfoField *field1,
-    TpContactInfoField *field2);
-gint empathy_contact_info_field_spec_cmp (TpContactInfoFieldSpec *spec1,
-    TpContactInfoFieldSpec *spec2);
-
-GtkWidget * empathy_contact_info_create_channel_list_label (TpAccount *account,
-    GList *info,
-    guint row);
-
-G_END_DECLS
-
-#endif /*  __EMPATHY_UTILS_H__ */
diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c
index bddf42bf2..792241fd8 100644
--- a/libempathy-gtk/empathy-dialpad-button.c
+++ b/libempathy-gtk/empathy-dialpad-button.c
@@ -20,9 +20,7 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-
 #include "config.h"
-
 #include "empathy-dialpad-button.h"
 
 G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON)
diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h
index cca96f3b2..cd312bda1 100644
--- a/libempathy-gtk/empathy-dialpad-button.h
+++ b/libempathy-gtk/empathy-dialpad-button.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_DIALPAD_BUTTON_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 8fd65bdb2..6c85c7971 100644
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -20,10 +20,9 @@
  */
 
 #include "config.h"
-
 #include "empathy-dialpad-widget.h"
 
-#include <libempathy-gtk/empathy-dialpad-button.h>
+#include "empathy-dialpad-button.h"
 
 G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX);
 
diff --git a/libempathy-gtk/empathy-geoclue-helper.c b/libempathy-gtk/empathy-geoclue-helper.c
new file mode 100644
index 000000000..97d4fc6d3
--- /dev/null
+++ b/libempathy-gtk/empathy-geoclue-helper.c
@@ -0,0 +1,523 @@
+/*
+ * empathy-geoclue-helper.c
+ *
+ * Copyright (C) 2013 Collabora Ltd. <http://www.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 <gio/gio.h>
+
+#include "empathy-geoclue-helper.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
+#include "empathy-debug.h"
+
+#define GEOCLUE_BUS_NAME "org.freedesktop.GeoClue2"
+
+/**
+ * SECTION: empathy-geoclue-helper
+ * @title: EmpathyGeoclueHelper
+ * @short_description: TODO
+ *
+ * TODO
+ */
+
+/**
+ * EmpathyGeoclueHelper:
+ *
+ * Data structure representing a #EmpathyGeoclueHelper.
+ *
+ * Since: UNRELEASED
+ */
+
+/**
+ * EmpathyGeoclueHelperClass:
+ *
+ * The class of a #EmpathyGeoclueHelper.
+ *
+ * Since: UNRELEASED
+ */
+
+static void async_initable_iface_init (GAsyncInitableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (EmpathyGeoclueHelper, empathy_geoclue_helper,
+    G_TYPE_OBJECT,
+    G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init));
+
+enum
+{
+  PROP_DISTANCE_THRESHOLD = 1,
+  PROP_LOCATION,
+  N_PROPS
+};
+
+enum
+{
+  SIG_LOCATION_CHANGED,
+  LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+struct _EmpathyGeoclueHelperPriv
+{
+  guint distance_threshold;
+  GClueLocation *location;
+
+  gboolean started;
+  GClueClient *client;
+};
+
+static void
+empathy_geoclue_helper_get_property (GObject *object,
+    guint property_id,
+    GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
+
+  switch (property_id)
+    {
+      case PROP_DISTANCE_THRESHOLD:
+        g_value_set_uint (value, self->priv->distance_threshold);
+        break;
+      case PROP_LOCATION:
+        g_value_set_object (value, self->priv->location);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+empathy_geoclue_helper_set_property (GObject *object,
+    guint property_id,
+    const GValue *value,
+    GParamSpec *pspec)
+{
+  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
+
+  switch (property_id)
+    {
+      case PROP_DISTANCE_THRESHOLD:
+        self->priv->distance_threshold = g_value_get_uint (value);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+        break;
+    }
+}
+
+static void
+empathy_geoclue_helper_constructed (GObject *object)
+{
+  //EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
+  void (*chain_up) (GObject *) =
+      ((GObjectClass *) empathy_geoclue_helper_parent_class)->constructed;
+
+  chain_up (object);
+}
+
+static void
+empathy_geoclue_helper_dispose (GObject *object)
+{
+  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
+  void (*chain_up) (GObject *) =
+      ((GObjectClass *) empathy_geoclue_helper_parent_class)->dispose;
+
+  if (self->priv->started)
+    {
+      gclue_client_call_stop (self->priv->client, NULL, NULL, NULL);
+
+      self->priv->started = FALSE;
+    }
+
+  g_clear_object (&self->priv->location);
+  g_clear_object (&self->priv->client);
+
+  chain_up (object);
+}
+
+static void
+empathy_geoclue_helper_finalize (GObject *object)
+{
+  //EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (object);
+  void (*chain_up) (GObject *) =
+      ((GObjectClass *) empathy_geoclue_helper_parent_class)->finalize;
+
+  chain_up (object);
+}
+
+static void
+empathy_geoclue_helper_class_init (
+    EmpathyGeoclueHelperClass *klass)
+{
+  GObjectClass *oclass = G_OBJECT_CLASS (klass);
+  GParamSpec *spec;
+
+  oclass->get_property = empathy_geoclue_helper_get_property;
+  oclass->set_property = empathy_geoclue_helper_set_property;
+  oclass->constructed = empathy_geoclue_helper_constructed;
+  oclass->dispose = empathy_geoclue_helper_dispose;
+  oclass->finalize = empathy_geoclue_helper_finalize;
+
+  /**
+   * EmpathyGeoclueHelper:distance-threshold:
+   *
+   * TODO
+   *
+   * Since: UNRELEASED
+   */
+  spec = g_param_spec_uint ("distance-threshold", "distance-threshold",
+      "DistanceThreshold",
+      0, G_MAXUINT32, 0,
+      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_DISTANCE_THRESHOLD, spec);
+
+  /**
+   * EmpathyGeoclueHelper:location:
+   *
+   * TODO
+   *
+   * Since: UNRELEASED
+   */
+  spec = g_param_spec_object ("location", "location", "GClueLocation",
+      GCLUE_TYPE_LOCATION,
+      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+  g_object_class_install_property (oclass, PROP_LOCATION, spec);
+
+  /**
+   * EmpathyGeoclueHelper::location-changed:
+   * @self: a #EmpathyGeoclueHelper
+   *
+   * TODO
+   *
+   * Since: UNRELEASED
+   */
+  signals[SIG_LOCATION_CHANGED] = g_signal_new ("location-changed",
+      G_OBJECT_CLASS_TYPE (klass),
+      G_SIGNAL_RUN_LAST,
+      0, NULL, NULL, NULL,
+      G_TYPE_NONE,
+      1, GCLUE_TYPE_LOCATION);
+
+  g_type_class_add_private (klass, sizeof (EmpathyGeoclueHelperPriv));
+}
+
+static void
+empathy_geoclue_helper_init (EmpathyGeoclueHelper *self)
+{
+  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      EMPATHY_TYPE_GEOCLUE_HELPER, EmpathyGeoclueHelperPriv);
+}
+
+static void
+location_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyGeoclueHelper *self = user_data;
+  GError *error = NULL;
+
+  g_clear_object (&self->priv->location);
+
+  self->priv->location = gclue_location_proxy_new_finish (result, &error);
+  if (self->priv->location == NULL)
+    {
+      DEBUG ("Failed to create Location proxy: %s", error->message);
+      g_error_free (error);
+    }
+
+  g_signal_emit (self, signals[SIG_LOCATION_CHANGED], 0, self->priv->location);
+
+  g_object_notify (G_OBJECT (self), "location");
+}
+
+static void
+location_updated_cb (GClueClient *client,
+    const gchar *old,
+    const gchar *new,
+    EmpathyGeoclueHelper *self)
+{
+  gclue_location_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
+      GEOCLUE_BUS_NAME, new,
+      NULL, location_cb, self);
+}
+
+static void
+client_start_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GTask *task = user_data;
+  EmpathyGeoclueHelper *self = g_task_get_source_object (task);
+  GClueClient *client = GCLUE_CLIENT (source);
+  GError *error = NULL;
+
+  if (!gclue_client_call_start_finish (client, result, &error))
+    {
+      DEBUG ("Failed to start Geoclue client: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  self->priv->started = TRUE;
+
+  g_task_return_boolean (task, TRUE);
+  g_object_unref (task);
+}
+
+static void
+client_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GTask *task = user_data;
+  EmpathyGeoclueHelper *self = g_task_get_source_object (task);
+  GError *error = NULL;
+
+  self->priv->client = gclue_client_proxy_new_finish (result, &error);
+  if (!gclue_client_proxy_new_for_bus_finish (result, &error))
+    {
+      DEBUG ("Failed to create Geoclue client: %s", error->message);
+      g_task_return_error (task, error);
+      goto out;
+    }
+
+  g_signal_connect_object (self->priv->client, "location-updated",
+      G_CALLBACK (location_updated_cb), self, 0);
+
+  g_object_set (self->priv->client,
+      "distance-threshold", self->priv->distance_threshold,
+      NULL);
+
+  g_task_return_boolean (task, TRUE);
+
+out:
+  g_object_unref (task);
+}
+
+static void
+get_client_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GTask *task = user_data;
+  GError *error = NULL;
+  gchar *path;
+
+  if (!gclue_manager_call_get_client_finish (GCLUE_MANAGER (source), &path,
+        result, &error))
+    {
+      DEBUG ("GetClient failed: %s", error->message);
+      g_task_return_error (task, error);
+      g_object_unref (task);
+      return;
+    }
+
+  gclue_client_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
+      GEOCLUE_BUS_NAME, path, NULL, client_cb, task);
+
+  g_free (path);
+}
+
+static void
+manager_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GTask *task = user_data;
+  GError *error = NULL;
+  GClueManager *mgr;
+
+  mgr = gclue_manager_proxy_new_for_bus_finish (result, &error);
+  if (mgr == NULL)
+    {
+      DEBUG ("Failed to create Geoclue manager: %s", error->message);
+      g_task_return_error (task, error);
+      g_object_unref (task);
+      return;
+    }
+
+  gclue_manager_call_get_client (mgr, NULL, get_client_cb, task);
+  g_object_unref (mgr);
+}
+
+void
+empathy_geoclue_helper_start_async (EmpathyGeoclueHelper *self,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GTask *task;
+
+  task = g_task_new (self, NULL, callback, user_data);
+
+  if (self->priv->started)
+    {
+      g_task_return_boolean (task, TRUE);
+      g_object_unref (task);
+      return;
+    }
+
+  gclue_client_call_start (self->priv->client, NULL, client_start_cb, task);
+}
+
+gboolean
+empathy_geoclue_helper_start_finish (EmpathyGeoclueHelper *self,
+    GAsyncResult *result,
+    GError **error)
+{
+  g_return_val_if_fail (g_task_is_valid (result, self), FALSE);
+
+  return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+GClueLocation *
+empathy_geoclue_helper_get_location (EmpathyGeoclueHelper *self)
+{
+  return self->priv->location;
+}
+
+static void
+empathy_geoclue_helper_init_async (GAsyncInitable *initable,
+    gint io_priority,
+    GCancellable *cancellable,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GTask *task;
+
+  task = g_task_new (initable, cancellable, callback, user_data);
+
+  gclue_manager_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, G_DBUS_PROXY_FLAGS_NONE,
+      GEOCLUE_BUS_NAME, "/org/freedesktop/GeoClue2/Manager",
+      NULL, manager_cb, task);
+}
+
+static gboolean
+empathy_geoclue_helper_init_finish (GAsyncInitable *initable,
+    GAsyncResult *result,
+    GError **error)
+{
+  g_return_val_if_fail (g_task_is_valid (result, initable), FALSE);
+
+  return g_task_propagate_boolean (G_TASK (result), error);
+}
+
+static void
+async_initable_iface_init (GAsyncInitableIface *iface)
+{
+  iface->init_async = empathy_geoclue_helper_init_async;
+  iface->init_finish = empathy_geoclue_helper_init_finish;
+}
+
+void
+empathy_geoclue_helper_new_async (guint distance_threshold,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  g_async_initable_new_async (EMPATHY_TYPE_GEOCLUE_HELPER,
+      G_PRIORITY_DEFAULT, NULL, callback, user_data,
+      "distance-threshold", distance_threshold,
+      NULL);
+}
+
+EmpathyGeoclueHelper *
+empathy_geoclue_helper_new_finish (GAsyncResult *result,
+    GError **error)
+{
+  GObject *object, *source_object;
+
+  source_object = g_async_result_get_source_object (result);
+
+  object = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
+      result, error);
+  g_object_unref (source_object);
+
+  if (object != NULL)
+    return EMPATHY_GEOCLUE_HELPER (object);
+  else
+    return NULL;
+}
+
+static void
+new_started_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  EmpathyGeoclueHelper *self = EMPATHY_GEOCLUE_HELPER (source);
+  GTask *new_started_task = user_data;
+  GError *error = NULL;
+
+  if (!empathy_geoclue_helper_start_finish (self, result, &error))
+    {
+      g_task_return_error (new_started_task, error);
+      g_object_unref (self);
+      goto out;
+    }
+
+  /* pass ownership of self to g_task_return_error */
+  g_task_return_pointer (new_started_task, self, g_object_unref);
+
+out:
+  g_object_unref (new_started_task);
+}
+
+static void
+new_started_init_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  GTask *new_started_task = user_data;
+  EmpathyGeoclueHelper *self;
+  GError *error = NULL;
+
+  self = empathy_geoclue_helper_new_finish (result, &error);
+  if (self == NULL)
+    {
+      g_task_return_error (new_started_task, error);
+      g_object_unref (new_started_task);
+      return;
+    }
+
+  /* Pass owernship of 'self' to new_started_cb */
+  empathy_geoclue_helper_start_async (self, new_started_cb, new_started_task);
+}
+
+void
+empathy_geoclue_helper_new_started_async (guint distance_threshold,
+    GAsyncReadyCallback callback,
+    gpointer user_data)
+{
+  GTask *new_started_task;
+
+  new_started_task = g_task_new (NULL, NULL, callback, user_data);
+
+  empathy_geoclue_helper_new_async (distance_threshold, new_started_init_cb,
+      new_started_task);
+}
+
+EmpathyGeoclueHelper *
+empathy_geoclue_helper_new_started_finish (GAsyncResult *result,
+    GError **error)
+{
+  g_return_val_if_fail (g_task_is_valid (result, NULL), NULL);
+
+  return g_task_propagate_pointer (G_TASK (result), error);
+}
diff --git a/libempathy-gtk/empathy-geoclue-helper.h b/libempathy-gtk/empathy-geoclue-helper.h
new file mode 100644
index 000000000..16a6b620a
--- /dev/null
+++ b/libempathy-gtk/empathy-geoclue-helper.h
@@ -0,0 +1,99 @@
+/*
+ * empathy-geoclue-helper.h
+ *
+ * Copyright (C) 2013 Collabora Ltd. <http://www.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_GEOCLUE_HELPER_H__
+#define __EMPATHY_GEOCLUE_HELPER_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#include "geoclue-interface.h"
+
+typedef struct _EmpathyGeoclueHelper EmpathyGeoclueHelper;
+typedef struct _EmpathyGeoclueHelperClass EmpathyGeoclueHelperClass;
+typedef struct _EmpathyGeoclueHelperPriv EmpathyGeoclueHelperPriv;
+
+struct _EmpathyGeoclueHelperClass
+{
+  /*<private>*/
+  GObjectClass parent_class;
+};
+
+struct _EmpathyGeoclueHelper
+{
+  /*<private>*/
+  GObject parent;
+  EmpathyGeoclueHelperPriv *priv;
+};
+
+GType empathy_geoclue_helper_get_type (void);
+
+/* TYPE MACROS */
+#define EMPATHY_TYPE_GEOCLUE_HELPER \
+  (empathy_geoclue_helper_get_type ())
+#define EMPATHY_GEOCLUE_HELPER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+    EMPATHY_TYPE_GEOCLUE_HELPER, \
+    EmpathyGeoclueHelper))
+#define EMPATHY_GEOCLUE_HELPER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), \
+    EMPATHY_TYPE_GEOCLUE_HELPER, \
+    EmpathyGeoclueHelperClass))
+#define EMPATHY_IS_GEOCLUE_HELPER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
+    EMPATHY_TYPE_GEOCLUE_HELPER))
+#define EMPATHY_IS_GEOCLUE_HELPER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), \
+    EMPATHY_TYPE_GEOCLUE_HELPER))
+#define EMPATHY_GEOCLUE_HELPER_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+    EMPATHY_TYPE_GEOCLUE_HELPER, \
+    EmpathyGeoclueHelperClass))
+
+void empathy_geoclue_helper_new_async (guint distance_threshold,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+EmpathyGeoclueHelper * empathy_geoclue_helper_new_finish (GAsyncResult *result,
+    GError **error);
+
+void empathy_geoclue_helper_new_started_async (guint distance_threshold,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+EmpathyGeoclueHelper * empathy_geoclue_helper_new_started_finish (
+    GAsyncResult *result,
+    GError **error);
+
+void empathy_geoclue_helper_start_async (EmpathyGeoclueHelper *self,
+    GAsyncReadyCallback callback,
+    gpointer user_data);
+
+gboolean empathy_geoclue_helper_start_finish (EmpathyGeoclueHelper *self,
+    GAsyncResult *result,
+    GError **error);
+
+GClueLocation * empathy_geoclue_helper_get_location (
+    EmpathyGeoclueHelper *self);
+
+G_END_DECLS
+
+#endif /* #ifndef __EMPATHY_GEOCLUE_HELPER_H__*/
diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index d171f72fc..6874cd796 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,15 +22,16 @@
  */
 
 #include "config.h"
+#include "empathy-geometry.h"
 
 #include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "libempathy/empathy-utils.h"
-#include "empathy-geometry.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GEOMETRY_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
 #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
@@ -211,7 +212,7 @@ empathy_geometry_load (GtkWindow *window,
   gboolean  maximized;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!EMP_STR_EMPTY (name));
+  g_return_if_fail (!TPAW_STR_EMPTY (name));
 
   /* escape the name so that unwanted characters such as # are removed */
   escaped_name = g_uri_escape_string (name, NULL, TRUE);
@@ -294,7 +295,7 @@ empathy_geometry_bind (GtkWindow *window,
   gboolean connect_sigs = FALSE;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
-  g_return_if_fail (!EMP_STR_EMPTY (name));
+  g_return_if_fail (!TPAW_STR_EMPTY (name));
 
   /* Check if this window is already bound */
   names = g_object_get_data (G_OBJECT (window), GEOMETRY_NAME_KEY);
diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h
index f9f85c1c9..e1412ab8a 100644
--- a/libempathy-gtk/empathy-geometry.h
+++ b/libempathy-gtk/empathy-geometry.h
@@ -24,7 +24,6 @@
 #ifndef __EMPATHY_GEOMETRY_H__
 #define __EMPATHY_GEOMETRY_H__
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 6b6a0d0dc..b7f4b256a 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -20,13 +20,13 @@
  */
 
 #include "config.h"
+#include "empathy-groups-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-aggregator.h>
-
-#include "empathy-groups-widget.h"
+#include "empathy-utils.h"
+#include "empathy-connection-aggregator.h"
 
 /**
  * SECTION:empathy-groups-widget
@@ -118,7 +118,7 @@ model_find_name (EmpathyGroupsWidget *self,
   EmpathyGroupsWidgetPriv *priv = GET_PRIV (self);
   FindNameData data;
 
-  if (EMP_STR_EMPTY (name))
+  if (TPAW_STR_EMPTY (name))
     return FALSE;
 
   data.widget = self;
@@ -193,7 +193,7 @@ add_group_entry_changed_cb (GtkEditable *editable,
   else
     {
       gtk_widget_set_sensitive (GTK_WIDGET (priv->add_group_button),
-          !EMP_STR_EMPTY (group));
+          !TPAW_STR_EMPTY (group));
     }
 }
 
diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h
index 1085fac4f..2b59db62c 100644
--- a/libempathy-gtk/empathy-groups-widget.h
+++ b/libempathy-gtk/empathy-groups-widget.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_GROUPS_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h
index 8ee40f2a9..3b7b8fdf9 100644
--- a/libempathy-gtk/empathy-images.h
+++ b/libempathy-gtk/empathy-images.h
@@ -45,7 +45,6 @@ G_BEGIN_DECLS
 #define EMPATHY_IMAGE_VIDEO_CALL          "camera-web"
 #define EMPATHY_IMAGE_LOG                 "document-open-recent"
 #define EMPATHY_IMAGE_DOCUMENT_SEND       "document-send"
-#define EMPATHY_IMAGE_AVATAR_DEFAULT      "avatar-default-symbolic"
 /* FIXME: need a better icon! */
 #define EMPATHY_IMAGE_EDIT_MESSAGE        "format-text-direction-ltr"
 #define EMPATHY_IMAGE_MIC                 "audio-input-microphone-symbolic"
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 03874c905..ce03d0a28 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -20,14 +20,13 @@
  */
 
 #include "config.h"
+#include "empathy-individual-dialogs.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-dialogs.h"
 #include "empathy-contact-widget.h"
+#include "empathy-individual-manager.h"
+#include "empathy-utils.h"
 
 #define BULLET_POINT "\342\200\242"
 
diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h
index e07105676..b603c5765 100644
--- a/libempathy-gtk/empathy-individual-dialogs.h
+++ b/libempathy-gtk/empathy-individual-dialogs.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_DIALOGS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index bd43adeb8..dbd01c970 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -21,13 +21,12 @@
  */
 
 #include "config.h"
+#include "empathy-individual-edit-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-widget.h"
+#include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog)
 
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h
index 4f580fb03..747e6824f 100644
--- a/libempathy-gtk/empathy-individual-edit-dialog.h
+++ b/libempathy-gtk/empathy-individual-edit-dialog.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index cd6392a9b..2b8d64bd3 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -22,19 +22,18 @@
  */
 
 #include "config.h"
+#include "empathy-individual-information-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-pkg-kit.h>
-
-#include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
 #include "empathy-individual-widget.h"
+#include "empathy-pkg-kit.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
 typedef struct {
diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h
index cdba07a61..58c229577 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.h
+++ b/libempathy-gtk/empathy-individual-information-dialog.h
@@ -24,7 +24,6 @@
 #define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index 4cadf22a2..02babc2ab 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -21,51 +21,60 @@
  */
 
 #include "config.h"
+#include "empathy-individual-menu.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
 #include "empathy-account-selector-dialog.h"
+#include "empathy-call-utils.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gtk-enum-types.h"
 #include "empathy-images.h"
-#include "empathy-log-window.h"
 #include "empathy-individual-dialogs.h"
-#include "empathy-gtk-enum-types.h"
 #include "empathy-individual-dialogs.h"
 #include "empathy-individual-edit-dialog.h"
-#include "empathy-ui-utils.h"
-#include "empathy-share-my-desktop.h"
-#include "empathy-call-utils.h"
-#include "empathy-individual-store-channel.h"
 #include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store-channel.h"
+#include "empathy-log-window.h"
+#include "empathy-request-util.h"
+#include "empathy-share-my-desktop.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu)
 
 typedef struct {
+  gchar *active_group; /* may be NULL */
   FolksIndividual *individual; /* owned */
   EmpathyIndividualFeatureFlags features;
   EmpathyIndividualStore *store; /* may be NULL */
 } EmpathyIndividualMenuPriv;
 
 enum {
-  PROP_INDIVIDUAL = 1,
+  PROP_ACTIVE_GROUP = 1,
+  PROP_INDIVIDUAL,
   PROP_FEATURES,
   PROP_STORE,
 };
 
+enum {
+  MENU_ITEM_ACTIVATED,
+  LAST_SIGNAL
+};
+
+static guint signals [LAST_SIGNAL] = { 0 };
+
 G_DEFINE_TYPE (EmpathyIndividualMenu, empathy_individual_menu, GTK_TYPE_MENU);
 
 static GtkWidget * empathy_individual_chat_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 static GtkWidget * empathy_individual_sms_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 static GtkWidget * empathy_individual_log_menu_item_new  (
     FolksIndividual *individual);
 static GtkWidget * empathy_individual_info_menu_item_new (
@@ -76,9 +85,9 @@ static GtkWidget * empathy_individual_invite_menu_item_new (
     FolksIndividual *individual,
     EmpathyContact *contact);
 static GtkWidget * empathy_individual_file_transfer_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 static GtkWidget * empathy_individual_share_my_desktop_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 static GtkWidget * empathy_individual_favourite_menu_item_new (
     FolksIndividual *individual);
 static GtkWidget * empathy_individual_add_menu_item_new (
@@ -87,10 +96,11 @@ static GtkWidget * empathy_individual_add_menu_item_new (
 static GtkWidget * empathy_individiual_block_menu_item_new (
     FolksIndividual *individual);
 static GtkWidget * empathy_individiual_remove_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self);
 
 static void
-individual_menu_add_personas (GtkMenuShell *menu,
+individual_menu_add_personas (EmpathyIndividualMenu *self,
+    GtkMenuShell *menu,
     FolksIndividual *individual,
     EmpathyIndividualFeatureFlags features)
 {
@@ -181,7 +191,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
       /* Chat */
       if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
         {
-          action = empathy_individual_chat_menu_item_new (single_individual);
+          action = empathy_individual_chat_menu_item_new (self,
+              single_individual);
           gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
           gtk_widget_show (action);
         }
@@ -189,7 +200,8 @@ individual_menu_add_personas (GtkMenuShell *menu,
       /* SMS */
       if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
         {
-          action = empathy_individual_sms_menu_item_new (single_individual);
+          action = empathy_individual_sms_menu_item_new (self,
+              single_individual);
           gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
           gtk_widget_show (action);
         }
@@ -198,13 +210,13 @@ individual_menu_add_personas (GtkMenuShell *menu,
         {
           /* Audio Call */
           action = empathy_individual_audio_call_menu_item_new (
-              single_individual);
+              self, single_individual);
           gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
           gtk_widget_show (action);
 
           /* Video Call */
           action = empathy_individual_video_call_menu_item_new (
-              single_individual);
+              self, single_individual);
           gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
           gtk_widget_show (action);
         }
@@ -226,14 +238,14 @@ individual_menu_add_personas (GtkMenuShell *menu,
       if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
         {
           action = empathy_individual_file_transfer_menu_item_new (
-              single_individual);
+              self, single_individual);
           gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
           gtk_widget_show (action);
         }
 
       /* Share my desktop */
       action = empathy_individual_share_my_desktop_menu_item_new (
-          single_individual);
+          self, single_individual);
       gtk_menu_shell_append (GTK_MENU_SHELL (contact_submenu), action);
       gtk_widget_show (action);
 
@@ -294,7 +306,7 @@ find_phone_accounts (void)
           TP_CONNECTION_STATUS_CONNECTED)
         continue;
 
-      if (!empathy_account_has_uri_scheme_tel (account))
+      if (!tp_account_associated_with_uri_scheme (account, "tel"))
         continue;
 
       found = g_list_prepend (found, g_object_ref (account));
@@ -685,13 +697,16 @@ enum
   REMOVE_DIALOG_RESPONSE_CANCEL = 0,
   REMOVE_DIALOG_RESPONSE_DELETE,
   REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK,
+  REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP
 };
 
 static int
 remove_dialog_show (const gchar *message,
     const gchar *secondary_text,
+    gboolean show_remove_from_group,
     gboolean block_button,
-    GdkPixbuf *avatar)
+    GdkPixbuf *avatar,
+    const gchar *active_group)
 {
   GtkWidget *dialog;
   gboolean res;
@@ -706,6 +721,23 @@ remove_dialog_show (const gchar *message,
       gtk_widget_show (image);
     }
 
+  if (show_remove_from_group)
+    {
+      GtkWidget *button;
+      gchar *button_text = g_strdup_printf (_("Remove from _Group \'%s\'"),
+          active_group);
+
+      /* gtk_dialog_add_button() doesn't allow us to pass a string with a
+       * mnemonic so we have to create the button manually. */
+      button = gtk_button_new_with_mnemonic (button_text);
+      g_free (button_text);
+
+      gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
+          REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP);
+
+      gtk_widget_show (button);
+    }
+
   if (block_button)
     {
       GtkWidget *button;
@@ -736,11 +768,31 @@ remove_dialog_show (const gchar *message,
 }
 
 static void
+individual_removed_from_group_cb (GObject *source_object,
+    GAsyncResult *res,
+    gpointer user_data)
+{
+  GError *error = NULL;
+  FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object);
+
+  folks_group_details_change_group_finish (
+      FOLKS_GROUP_DETAILS (individual), res, &error);
+  if (error != NULL)
+    {
+      DEBUG ("Individual could not be removed from group: %s",
+          error->message);
+      g_error_free (error);
+    }
+}
+
+static void
 remove_got_avatar (GObject *source_object,
     GAsyncResult *result,
     gpointer user_data)
 {
   FolksIndividual *individual = FOLKS_INDIVIDUAL (source_object);
+  EmpathyIndividualMenu *self = EMPATHY_INDIVIDUAL_MENU (user_data);
+  EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
   GdkPixbuf *avatar;
   EmpathyIndividualManager *manager;
   gchar *text;
@@ -749,6 +801,8 @@ remove_got_avatar (GObject *source_object,
   gboolean can_block;
   GError *error = NULL;
   gint res;
+  gboolean show_remove_from_group;
+  GeeSet *groups;
 
   avatar = empathy_pixbuf_avatar_from_individual_scaled_finish (individual,
       result, &error);
@@ -762,6 +816,10 @@ remove_got_avatar (GObject *source_object,
   /* We couldn't retrieve the avatar, but that isn't a fatal error,
    * so we still display the remove dialog. */
 
+  groups = folks_group_details_get_groups (FOLKS_GROUP_DETAILS (individual));
+  show_remove_from_group =
+      gee_collection_get_size (GEE_COLLECTION (groups)) > 1;
+
   personas = folks_individual_get_personas (individual);
 
   persona_count = gee_collection_get_size (GEE_COLLECTION (personas));
@@ -795,7 +853,15 @@ remove_got_avatar (GObject *source_object,
   manager = empathy_individual_manager_dup_singleton ();
   can_block = empathy_individual_manager_supports_blocking (manager,
       individual);
-  res = remove_dialog_show (_("Removing contact"), text, can_block, avatar);
+  res = remove_dialog_show (_("Removing contact"), text,
+      show_remove_from_group, can_block, avatar, priv->active_group);
+
+  if (res == REMOVE_DIALOG_RESPONSE_REMOVE_FROM_GROUP)
+    {
+      folks_group_details_change_group (FOLKS_GROUP_DETAILS (individual),
+          priv->active_group, false, individual_removed_from_group_cb, NULL);
+      goto finally;
+    }
 
   if (res == REMOVE_DIALOG_RESPONSE_DELETE ||
       res == REMOVE_DIALOG_RESPONSE_DELETE_AND_BLOCK)
@@ -818,29 +884,33 @@ remove_got_avatar (GObject *source_object,
  finally:
   g_free (text);
   g_object_unref (manager);
+  g_object_unref (self);
 }
 
 static void
 remove_activate_cb (GtkMenuItem *menuitem,
-    FolksIndividual *individual)
+    EmpathyIndividualMenu *self)
 {
-  empathy_pixbuf_avatar_from_individual_scaled_async (individual,
-      48, 48, NULL, remove_got_avatar, NULL);
+  EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
+
+  empathy_pixbuf_avatar_from_individual_scaled_async (priv->individual,
+      48, 48, NULL, remove_got_avatar, g_object_ref (self));
 }
 
 static GtkWidget *
-empathy_individiual_remove_menu_item_new (FolksIndividual *individual)
+empathy_individiual_remove_menu_item_new (EmpathyIndividualMenu *self)
 {
   GeeSet *personas;
   GeeIterator *iter;
   gboolean can_remove = FALSE;
   GtkWidget *item, *image;
+  EmpathyIndividualMenuPriv *priv = GET_PRIV (self);
 
   /* If any of the Individual's personas can be removed, add an option to
    * remove. This will act as a best-effort option. If any Personas cannot be
    * removed from the server, then this option will just be inactive upon
    * subsequent menu openings */
-  personas = folks_individual_get_personas (individual);
+  personas = folks_individual_get_personas (priv->individual);
   iter = gee_iterable_iterator (GEE_ITERABLE (personas));
   while (!can_remove && gee_iterator_next (iter))
     {
@@ -865,7 +935,7 @@ empathy_individiual_remove_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
 
   g_signal_connect (item, "activate",
-      G_CALLBACK (remove_activate_cb), individual);
+      G_CALLBACK (remove_activate_cb), self);
 
   return item;
 }
@@ -873,7 +943,7 @@ empathy_individiual_remove_menu_item_new (FolksIndividual *individual)
 static void
 constructed (GObject *object)
 {
-  EmpathyIndividualMenu *self = (EmpathyIndividualMenu *) object;
+  EmpathyIndividualMenu *self = EMPATHY_INDIVIDUAL_MENU (object);
   EmpathyIndividualMenuPriv *priv = GET_PRIV (object);
   GtkMenuShell *shell;
   GtkWidget *item;
@@ -899,7 +969,7 @@ constructed (GObject *object)
   /* Chat */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_CHAT)
     {
-      item = empathy_individual_chat_menu_item_new (individual);
+      item = empathy_individual_chat_menu_item_new (self, individual);
       if (item != NULL)
         {
           gtk_menu_shell_append (shell, item);
@@ -910,7 +980,7 @@ constructed (GObject *object)
   /* SMS */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_SMS)
     {
-      item = empathy_individual_sms_menu_item_new (individual);
+      item = empathy_individual_sms_menu_item_new (self, individual);
       if (item != NULL)
         {
           gtk_menu_shell_append (shell, item);
@@ -921,12 +991,12 @@ constructed (GObject *object)
   if (features & EMPATHY_INDIVIDUAL_FEATURE_CALL)
     {
       /* Audio Call */
-      item = empathy_individual_audio_call_menu_item_new (individual);
+      item = empathy_individual_audio_call_menu_item_new (self, individual);
       gtk_menu_shell_append (shell, item);
       gtk_widget_show (item);
 
       /* Video Call */
-      item = empathy_individual_video_call_menu_item_new (individual);
+      item = empathy_individual_video_call_menu_item_new (self, individual);
       gtk_menu_shell_append (shell, item);
       gtk_widget_show (item);
     }
@@ -942,7 +1012,7 @@ constructed (GObject *object)
   /* File transfer */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER)
     {
-      item = empathy_individual_file_transfer_menu_item_new (individual);
+      item = empathy_individual_file_transfer_menu_item_new (self, individual);
       gtk_menu_shell_append (shell, item);
       gtk_widget_show (item);
     }
@@ -950,12 +1020,13 @@ constructed (GObject *object)
   /* Share my desktop */
   /* FIXME we should add the "Share my desktop" menu item if Vino is
   a registered handler in MC5 */
-  item = empathy_individual_share_my_desktop_menu_item_new (individual);
+  item = empathy_individual_share_my_desktop_menu_item_new (self, individual);
   gtk_menu_shell_append (shell, item);
   gtk_widget_show (item);
 
   /* Menu items to target specific contacts */
-  individual_menu_add_personas (GTK_MENU_SHELL (object), individual, features);
+  individual_menu_add_personas (self, GTK_MENU_SHELL (object),
+      individual, features);
 
   /* Separator */
   if (features & (EMPATHY_INDIVIDUAL_FEATURE_EDIT |
@@ -1014,7 +1085,7 @@ constructed (GObject *object)
 
   /* Separator & Remove */
   if (features & EMPATHY_INDIVIDUAL_FEATURE_REMOVE &&
-      (item = empathy_individiual_remove_menu_item_new (individual)) != NULL) {
+      (item = empathy_individiual_remove_menu_item_new (self)) != NULL) {
     GtkWidget *sep;
 
     sep = gtk_separator_menu_item_new ();
@@ -1038,6 +1109,9 @@ get_property (GObject *object,
 
   switch (param_id)
     {
+      case PROP_ACTIVE_GROUP:
+        g_value_set_string (value, priv->active_group);
+        break;
       case PROP_INDIVIDUAL:
         g_value_set_object (value, priv->individual);
         break;
@@ -1065,6 +1139,10 @@ set_property (GObject *object,
 
   switch (param_id)
     {
+      case PROP_ACTIVE_GROUP:
+        g_assert (priv->active_group == NULL); /* construct only */
+        priv->active_group = g_value_dup_string (value);
+        break;
       case PROP_INDIVIDUAL:
         priv->individual = g_value_dup_object (value);
         break;
@@ -1092,6 +1170,16 @@ dispose (GObject *object)
 }
 
 static void
+finalize (GObject *object)
+{
+  EmpathyIndividualMenuPriv *priv = GET_PRIV (object);
+
+  g_free (priv->active_group);
+
+  G_OBJECT_CLASS (empathy_individual_menu_parent_class)->finalize (object);
+}
+
+static void
 empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -1100,6 +1188,19 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
   object_class->get_property = get_property;
   object_class->set_property = set_property;
   object_class->dispose = dispose;
+  object_class->finalize = finalize;
+
+  /**
+   * gchar *:active-group:
+   *
+   * The group the selected roster-contact widget belongs, or NULL.
+   */
+  g_object_class_install_property (object_class, PROP_ACTIVE_GROUP,
+      g_param_spec_string ("active-group",
+          "Active group",
+          "The group the selected roster-contact widget belongs, or NULL",
+          NULL,
+          G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
   /**
    * EmpathyIndividualMenu:individual:
@@ -1133,11 +1234,22 @@ empathy_individual_menu_class_init (EmpathyIndividualMenuClass *klass)
           EMPATHY_TYPE_INDIVIDUAL_STORE,
           G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
 
+  signals[MENU_ITEM_ACTIVATED] =
+      g_signal_new ("menu-item-activated",
+          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 (EmpathyIndividualMenuPriv));
 }
 
 GtkWidget *
 empathy_individual_menu_new (FolksIndividual *individual,
+    const gchar *active_group,
     EmpathyIndividualFeatureFlags features,
     EmpathyIndividualStore *store)
 {
@@ -1147,6 +1259,7 @@ empathy_individual_menu_new (FolksIndividual *individual,
   g_return_val_if_fail (features != EMPATHY_INDIVIDUAL_FEATURE_NONE, NULL);
 
   return g_object_new (EMPATHY_TYPE_INDIVIDUAL_MENU,
+      "active-group", active_group,
       "individual", individual,
       "features", features,
       "store", store,
@@ -1205,16 +1318,29 @@ menu_item_set_first_contact (GtkWidget *item,
 }
 
 static void
+emit_menu_item_activated (GtkMenuItem *item)
+{
+  EmpathyIndividualMenu *self;
+
+  self = EMPATHY_INDIVIDUAL_MENU (g_object_get_data (G_OBJECT (item),
+      "individual-menu"));
+  g_signal_emit (self, signals [MENU_ITEM_ACTIVATED], 0);
+}
+
+static void
 empathy_individual_chat_menu_item_activated (GtkMenuItem *item,
   EmpathyContact *contact)
 {
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
   empathy_chat_with_contact (contact, empathy_get_current_action_time ());
+
+  emit_menu_item_activated (item);
 }
 
 static GtkWidget *
-empathy_individual_chat_menu_item_new (FolksIndividual *individual)
+empathy_individual_chat_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
@@ -1228,6 +1354,7 @@ empathy_individual_chat_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_chat_menu_item_activated),
       EMPATHY_ACTION_CHAT);
@@ -1246,10 +1373,13 @@ empathy_individual_sms_menu_item_activated (GtkMenuItem *item,
       empathy_contact_get_id (contact),
       empathy_get_current_action_time (),
       NULL, NULL);
+
+  emit_menu_item_activated (item);
 }
 
 static GtkWidget *
-empathy_individual_sms_menu_item_new (FolksIndividual *individual)
+empathy_individual_sms_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
@@ -1263,6 +1393,7 @@ empathy_individual_sms_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_sms_menu_item_activated),
       EMPATHY_ACTION_SMS);
@@ -1280,10 +1411,13 @@ empathy_individual_audio_call_menu_item_activated (GtkMenuItem *item,
       empathy_contact_get_account (contact),
       TRUE, FALSE,
       empathy_get_current_action_time ());
+
+  emit_menu_item_activated (item);
 }
 
 GtkWidget *
-empathy_individual_audio_call_menu_item_new (FolksIndividual *individual)
+empathy_individual_audio_call_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
@@ -1295,6 +1429,7 @@ empathy_individual_audio_call_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_audio_call_menu_item_activated),
       EMPATHY_ACTION_AUDIO_CALL);
@@ -1312,14 +1447,17 @@ empathy_individual_video_call_menu_item_activated (GtkMenuItem *item,
       empathy_contact_get_account (contact),
       TRUE, TRUE,
       empathy_get_current_action_time ());
+
+  emit_menu_item_activated (item);
 }
 
 GtkWidget *
-empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
+empathy_individual_video_call_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;
 
   g_return_val_if_fail (FOLKS_IS_INDIVIDUAL (individual), NULL);
 
@@ -1329,6 +1467,7 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_video_call_menu_item_activated),
       EMPATHY_ACTION_VIDEO_CALL);
@@ -1336,7 +1475,7 @@ empathy_individual_video_call_menu_item_new (FolksIndividual *individual)
   /* Only follow available cameras if the contact can do Video calls */
   if (gtk_widget_get_sensitive (item))
     {
-      monitor = empathy_camera_monitor_dup_singleton ();
+      monitor = tpaw_camera_monitor_dup_singleton ();
       g_object_set_data_full (G_OBJECT (item),
           "monitor", monitor, g_object_unref);
       g_object_bind_property (monitor, "available", item, "sensitive",
@@ -1383,10 +1522,13 @@ empathy_individual_file_transfer_menu_item_activated (GtkMenuItem *item,
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
   empathy_send_file_with_file_chooser (contact);
+
+  emit_menu_item_activated (item);
 }
 
 static GtkWidget *
-empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
+empathy_individual_file_transfer_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
@@ -1399,6 +1541,7 @@ empathy_individual_file_transfer_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_file_transfer_menu_item_activated),
       EMPATHY_ACTION_SEND_FILE);
@@ -1413,10 +1556,13 @@ empathy_individual_share_my_desktop_menu_item_activated (GtkMenuItem *item,
   g_return_if_fail (EMPATHY_IS_CONTACT (contact));
 
   empathy_share_my_desktop_share_with_contact (contact);
+
+  emit_menu_item_activated (item);
 }
 
 static GtkWidget *
-empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual)
+empathy_individual_share_my_desktop_menu_item_new (EmpathyIndividualMenu *self,
+    FolksIndividual *individual)
 {
   GtkWidget *item;
   GtkWidget *image;
@@ -1428,6 +1574,7 @@ empathy_individual_share_my_desktop_menu_item_new (FolksIndividual *individual)
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
   gtk_widget_show (image);
 
+  g_object_set_data (G_OBJECT (item), "individual-menu", self);
   menu_item_set_first_contact (item, individual,
       G_CALLBACK (empathy_individual_share_my_desktop_menu_item_activated),
       EMPATHY_ACTION_SHARE_MY_DESKTOP);
diff --git a/libempathy-gtk/empathy-individual-menu.h b/libempathy-gtk/empathy-individual-menu.h
index 41e289f91..2ed1f1bc7 100644
--- a/libempathy-gtk/empathy-individual-menu.h
+++ b/libempathy-gtk/empathy-individual-menu.h
@@ -72,13 +72,14 @@ typedef struct {
 GType empathy_individual_menu_get_type (void) G_GNUC_CONST;
 
 GtkWidget * empathy_individual_menu_new (FolksIndividual *individual,
+    const gchar *active_group,
     EmpathyIndividualFeatureFlags features,
     EmpathyIndividualStore *store);
 
 GtkWidget * empathy_individual_audio_call_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 GtkWidget * empathy_individual_video_call_menu_item_new (
-    FolksIndividual *individual);
+    EmpathyIndividualMenu *self, FolksIndividual *individual);
 
 G_END_DECLS
 
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 0fefb9c85..eb0f3f593 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -24,13 +24,16 @@
  */
 
 #include "config.h"
+#include "empathy-individual-store-channel.h"
 
-#include <libempathy/empathy-utils.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include "empathy-individual-store-channel.h"
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyIndividualStoreChannelPriv
 {
@@ -125,6 +128,67 @@ group_contacts_changed_cb (TpChannel *channel,
 }
 
 static void
+individual_store_channel_contact_chat_state_changed (TpTextChannel *channel,
+    TpContact *tp_contact,
+    TpChannelChatState state,
+    EmpathyIndividualStoreChannel *self)
+{
+  FolksIndividual *individual;
+  EmpathyContact *contact = NULL;
+  GList *iters, *l;
+  GdkPixbuf *pixbuf;
+
+  contact = empathy_contact_dup_from_tp_contact (tp_contact);
+  if (empathy_contact_is_user (contact))
+    {
+      /* We don't care about our own chat composing states */
+      goto finally;
+    }
+
+  DEBUG ("Contact %s entered chat state %d",
+      tp_contact_get_identifier (tp_contact), state);
+
+  individual = g_hash_table_lookup (self->priv->individuals, tp_contact);
+  if (individual == NULL)
+    {
+      g_warning ("individual is NULL");
+      goto finally;
+    }
+
+  iters = empathy_individual_store_find_contact (
+      EMPATHY_INDIVIDUAL_STORE (self), individual);
+
+  if (state == TP_CHANNEL_CHAT_STATE_COMPOSING)
+    {
+      gchar *icon_filename =
+          tpaw_filename_from_icon_name (EMPATHY_IMAGE_TYPING,
+            GTK_ICON_SIZE_MENU);
+
+      pixbuf = gdk_pixbuf_new_from_file (icon_filename, NULL);
+      g_free (icon_filename);
+    }
+  else
+    {
+       pixbuf = empathy_individual_store_get_individual_status_icon (
+           EMPATHY_INDIVIDUAL_STORE (self), individual);
+    }
+
+  for (l = iters; l != NULL; l = l->next)
+    {
+      gtk_tree_store_set (GTK_TREE_STORE (self), l->data,
+          EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf,
+          -1);
+    }
+  /* Store takes it's own ref */
+  g_object_unref (pixbuf);
+
+  empathy_individual_store_free_iters (iters);
+
+  finally:
+    g_object_unref (contact);
+}
+
+static void
 individual_store_channel_set_individual_channel (
     EmpathyIndividualStoreChannel *self,
     TpChannel *channel)
@@ -144,6 +208,10 @@ individual_store_channel_set_individual_channel (
 
   tp_g_signal_connect_object (channel, "group-contacts-changed",
       G_CALLBACK (group_contacts_changed_cb), self, 0);
+
+  tp_g_signal_connect_object (channel, "contact-chat-state-changed",
+      G_CALLBACK (individual_store_channel_contact_chat_state_changed),
+      self, 0);
 }
 
 static void
diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 468effe21..07cc096ee 100644
--- a/libempathy-gtk/empathy-individual-store-channel.h
+++ b/libempathy-gtk/empathy-individual-store-channel.h
@@ -27,8 +27,9 @@
 #define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__
 
 #include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy-gtk/empathy-individual-store.h>
+#include "empathy-individual-store.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL         (empathy_individual_store_channel_get_type ())
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index ea872b1d1..d080242ea 100644
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -24,11 +24,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyIndividualStoreManagerPriv
 {
diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 7656b50ea..d442e7ca5 100644
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -26,11 +26,10 @@
 #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 
-#include <gtk/gtk.h>
+#include <glib-object.h>
 
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-individual-store.h>
+#include "empathy-individual-manager.h"
+#include "empathy-individual-store.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER         (empathy_individual_store_manager_get_type ())
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index ddaea26b4..9b685ee5f 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -25,16 +25,17 @@
  */
 
 #include "config.h"
+#include "empathy-individual-store.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-ui-utils.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).
@@ -199,8 +200,9 @@ individual_store_get_group (EmpathyIndividualStore *self,
     }
 }
 
-static GList *
-individual_store_find_contact (EmpathyIndividualStore *self,
+GList *
+/* (transfer full) free with empathy_individual_store_free_iters() */
+empathy_individual_store_find_contact (EmpathyIndividualStore *self,
     FolksIndividual *individual)
 {
   GQueue *row_refs_queue;
@@ -222,8 +224,8 @@ individual_store_find_contact (EmpathyIndividualStore *self,
   return iters_list;
 }
 
-static void
-free_iters (GList *iters)
+void
+empathy_individual_store_free_iters (GList *iters)
 {
   g_list_foreach (iters, (GFunc) gtk_tree_iter_free, NULL);
   g_list_free (iters);
@@ -282,7 +284,7 @@ empathy_individual_store_add_individual (EmpathyIndividualStore *self,
   GeeSet *group_set = NULL;
   gboolean grouped = FALSE;
 
-  if (EMP_STR_EMPTY (folks_alias_details_get_alias (
+  if (TPAW_STR_EMPTY (folks_alias_details_get_alias (
           FOLKS_ALIAS_DETAILS (individual))))
     return;
 
@@ -386,7 +388,7 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
 
   model = GTK_TREE_MODEL (self);
 
-  iters = individual_store_find_contact (self, individual);
+  iters = empathy_individual_store_find_contact (self, individual);
   for (l = iters; l; l = l->next)
     {
       GtkTreePath *path;
@@ -403,7 +405,7 @@ individual_store_contact_set_active (EmpathyIndividualStore *self,
         }
     }
 
-  free_iters (iters);
+  empathy_individual_store_free_iters (iters);
 }
 
 static void individual_store_contact_active_free (ShowActiveData *data);
@@ -521,7 +523,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
     {
       GList *iters, *l;
 
-      iters = individual_store_find_contact (data->store, individual);
+      iters = empathy_individual_store_find_contact (data->store, individual);
       for (l = iters; l; l = l->next)
         {
           gtk_tree_store_set (GTK_TREE_STORE (data->store), l->data,
@@ -529,7 +531,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual,
               -1);
         }
 
-      free_iters (iters);
+      empathy_individual_store_free_iters (iters);
     }
 
   /* Free things */
@@ -566,7 +568,7 @@ individual_store_contact_update (EmpathyIndividualStore *self,
 
   model = GTK_TREE_MODEL (self);
 
-  iters = individual_store_find_contact (self, individual);
+  iters = empathy_individual_store_find_contact (self, individual);
   if (!iters)
     {
       in_list = FALSE;
@@ -694,7 +696,7 @@ individual_store_contact_update (EmpathyIndividualStore *self,
    * timeout removes the user from the contact list, really we
    * should remove the first timeout.
    */
-  free_iters (iters);
+  empathy_individual_store_free_iters (iters);
 }
 
 static void
diff --git a/libempathy-gtk/empathy-individual-store.h b/libempathy-gtk/empathy-individual-store.h
index 402f451b8..c709348fc 100644
--- a/libempathy-gtk/empathy-individual-store.h
+++ b/libempathy-gtk/empathy-individual-store.h
@@ -145,6 +145,11 @@ void individual_store_remove_individual_and_disconnect (
 
 /* protected */
 
+GList *empathy_individual_store_find_contact (EmpathyIndividualStore *self,
+    FolksIndividual *individual);
+
+void empathy_individual_store_free_iters (GList *iters);
+
 void empathy_individual_store_disconnect_individual (
     EmpathyIndividualStore *self,
     FolksIndividual *individual);
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 7e36fe19a..e7ca49a3d 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,25 +25,27 @@
  */
 
 #include "config.h"
+#include "empathy-individual-view.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-individual-edit-dialog.h"
-#include "empathy-images.h"
+#include "empathy-cell-renderer-activatable.h"
 #include "empathy-cell-renderer-expander.h"
 #include "empathy-cell-renderer-text.h"
-#include "empathy-cell-renderer-activatable.h"
-#include "empathy-ui-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-contact-groups.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-images.h"
+#include "empathy-individual-edit-dialog.h"
+#include "empathy-individual-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).
@@ -1069,12 +1071,12 @@ individual_view_call_activated_cb (EmpathyCellRendererActivatable *cell,
   shell = GTK_MENU_SHELL (menu);
 
   /* audio */
-  item = empathy_individual_audio_call_menu_item_new (individual);
+  item = empathy_individual_audio_call_menu_item_new (NULL, individual);
   gtk_menu_shell_append (shell, item);
   gtk_widget_show (item);
 
   /* video */
-  item = empathy_individual_video_call_menu_item_new (individual);
+  item = empathy_individual_video_call_menu_item_new (NULL, individual);
   gtk_menu_shell_append (shell, item);
   gtk_widget_show (item);
 
@@ -1160,12 +1162,12 @@ individual_view_group_icon_cell_data_func (GtkTreeViewColumn *tree_column,
 
   if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_FAVORITE))
     {
-      pixbuf = empathy_pixbuf_from_icon_name ("emblem-favorite",
+      pixbuf = tpaw_pixbuf_from_icon_name ("emblem-favorite",
           GTK_ICON_SIZE_MENU);
     }
   else if (!tp_strdiff (name, EMPATHY_INDIVIDUAL_STORE_PEOPLE_NEARBY))
     {
-      pixbuf = empathy_pixbuf_from_icon_name ("im-local-xmpp",
+      pixbuf = tpaw_pixbuf_from_icon_name ("im-local-xmpp",
           GTK_ICON_SIZE_MENU);
     }
 
@@ -1327,7 +1329,7 @@ individual_view_start_search_cb (EmpathyIndividualView *view,
 }
 
 static void
-individual_view_search_text_notify_cb (EmpathyLiveSearch *search,
+individual_view_search_text_notify_cb (TpawLiveSearch *search,
     GParamSpec *pspec,
     EmpathyIndividualView *view)
 {
@@ -1420,7 +1422,7 @@ individual_view_search_key_navigation_cb (GtkWidget *search,
 }
 
 static void
-individual_view_search_hide_cb (EmpathyLiveSearch *search,
+individual_view_search_hide_cb (TpawLiveSearch *search,
     EmpathyIndividualView *view)
 {
   EmpathyIndividualViewPriv *priv = GET_PRIV (view);
@@ -1489,7 +1491,7 @@ individual_view_search_hide_cb (EmpathyLiveSearch *search,
 }
 
 static void
-individual_view_search_show_cb (EmpathyLiveSearch *search,
+individual_view_search_show_cb (TpawLiveSearch *search,
     EmpathyIndividualView *view)
 {
   /* block expand or collapse handlers during expand all, they would
@@ -1595,7 +1597,7 @@ individual_view_row_has_child_toggled_cb (GtkTreeModel *model,
       EMPATHY_INDIVIDUAL_STORE_COL_NAME, &name,
       -1);
 
-  if (!is_group || EMP_STR_EMPTY (name))
+  if (!is_group || TPAW_STR_EMPTY (name))
     {
       g_free (name);
       return;
@@ -1639,7 +1641,7 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
     guint event_count)
 {
   EmpathyIndividualViewPriv *priv = GET_PRIV (self);
-  EmpathyLiveSearch *live = EMPATHY_LIVE_SEARCH (priv->search_widget);
+  TpawLiveSearch *live = TPAW_LIVE_SEARCH (priv->search_widget);
   GeeSet *personas;
   GeeIterator *iter;
   gboolean is_favorite;
@@ -1691,8 +1693,8 @@ individual_view_is_visible_individual (EmpathyIndividualView *self,
   }
 
   return empathy_individual_match_string (individual,
-      empathy_live_search_get_text (live),
-      empathy_live_search_get_words (live));
+      tpaw_live_search_get_text (live),
+      tpaw_live_search_get_words (live));
 }
 
 static gchar *
@@ -2359,7 +2361,7 @@ individual_view_group_remove_activate_cb (GtkMenuItem *menuitem,
       text =
           g_strdup_printf (_("Do you really want to remove the group '%s'?"),
           group);
-      parent = empathy_get_toplevel_window (GTK_WIDGET (view));
+      parent = tpaw_get_toplevel_window (GTK_WIDGET (view));
       if (individual_view_remove_dialog_show (parent, _("Removing group"),
               text) == REMOVE_DIALOG_RESPONSE_DELETE)
         {
@@ -2472,8 +2474,8 @@ empathy_individual_view_get_individual_menu (EmpathyIndividualView *view)
   if (!empathy_folks_individual_contains_contact (individual))
     goto out;
 
-  menu = empathy_individual_menu_new (individual, priv->individual_features,
-      priv->store);
+  menu = empathy_individual_menu_new (individual, NULL,
+      priv->individual_features, priv->store);
 
 out:
   g_object_unref (individual);
@@ -2483,7 +2485,7 @@ out:
 
 void
 empathy_individual_view_set_live_search (EmpathyIndividualView *view,
-    EmpathyLiveSearch *search)
+    TpawLiveSearch *search)
 {
   EmpathyIndividualViewPriv *priv = GET_PRIV (view);
 
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index baac701ed..2fd0bce5f 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -28,10 +28,9 @@
 #define __EMPATHY_INDIVIDUAL_VIEW_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
+#include <tp-account-widgets/tpaw-live-search.h>
 
-#include "empathy-live-search.h"
 #include "empathy-individual-menu.h"
 #include "empathy-individual-store.h"
 
@@ -101,7 +100,7 @@ GtkWidget *empathy_individual_view_get_individual_menu (
 GtkWidget *empathy_individual_view_get_group_menu (EmpathyIndividualView *view);
 
 void empathy_individual_view_set_live_search (EmpathyIndividualView *view,
-    EmpathyLiveSearch *search);
+    TpawLiveSearch *search);
 
 gboolean empathy_individual_view_get_show_offline (
     EmpathyIndividualView *view);
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 12093b577..41d939966 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -20,26 +20,29 @@
  */
 
 #include "config.h"
+#include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-contactinfo-utils.h>
+#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-location.h>
-#include <libempathy/empathy-time.h>
-
 #include "empathy-avatar-image.h"
-#include "empathy-contactinfo-utils.h"
 #include "empathy-groups-widget.h"
 #include "empathy-gtk-enum-types.h"
+#include "empathy-location.h"
+#include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-individual-widget
@@ -218,6 +221,70 @@ add_row (GtkGrid *grid,
   gtk_widget_show (value);
 }
 
+static gboolean
+channel_name_activated_cb (
+    GtkLabel *label,
+    gchar *uri,
+    TpAccount *account)
+{
+  empathy_join_muc (account, uri, empathy_get_current_action_time ());
+  return TRUE;
+}
+
+static GtkWidget *
+create_channel_list_label (TpAccount *account,
+    GList *info,
+    guint row)
+{
+  GtkWidget *label = NULL;
+  GString *label_markup = g_string_new ("");
+  guint i;
+  GPtrArray *channels;
+  GList *l;
+
+  /* Is there channels? */
+  channels = g_ptr_array_new ();
+
+  for (l = info; l != NULL; l = l->next)
+    {
+      TpContactInfoField *field = l->data;
+
+      if (!tp_strdiff (field->field_name, "x-irc-channel"))
+        g_ptr_array_add (channels, (gpointer) field->field_value[0]);
+    }
+
+  if (channels->len == 0)
+    goto out;
+
+  for (i = 0; i < channels->len; i++)
+    {
+      const gchar *channel_name = g_ptr_array_index (channels, i);
+      /* We abuse the URI of the link to hold the channel name. It seems to
+       * be okay to just use it essentially verbatim, rather than trying to
+       * ensure it's actually a valid URI. */
+      gchar *escaped = g_markup_escape_text (channel_name, -1);
+
+      if (i > 0)
+        g_string_append (label_markup, ", ");
+
+      g_string_append_printf (label_markup, "<a href='%s'>%s</a>",
+          escaped, escaped);
+      g_free (escaped);
+    }
+
+  label = gtk_label_new (NULL);
+  gtk_label_set_markup (GTK_LABEL (label), label_markup->str);
+  gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+
+  g_signal_connect (label, "activate-link",
+      (GCallback) channel_name_activated_cb, account);
+
+out:
+  g_ptr_array_unref (channels);
+  g_string_free (label_markup, TRUE);
+
+  return label;
+}
 static guint
 details_update_show (EmpathyIndividualWidget *self,
     TpContact *contact)
@@ -230,13 +297,13 @@ details_update_show (EmpathyIndividualWidget *self,
   TpAccount *account;
 
   info = tp_contact_dup_contact_info (contact);
-  info = g_list_sort (info, (GCompareFunc) empathy_contact_info_field_cmp);
+  info = g_list_sort (info, (GCompareFunc) tpaw_contact_info_field_cmp);
   for (l = info; l != NULL; l = l->next)
     {
       TpContactInfoField *field = l->data;
       gchar *title;
       const gchar *value;
-      EmpathyContactInfoFormatFunc format;
+      TpawContactInfoFormatFunc format;
       GtkWidget *title_widget, *value_widget;
 
       if (field->field_value == NULL || field->field_value[0] == NULL)
@@ -244,7 +311,7 @@ details_update_show (EmpathyIndividualWidget *self,
 
       value = field->field_value[0];
 
-      if (!empathy_contact_info_lookup_field (field->field_name,
+      if (!tpaw_contact_info_lookup_field (field->field_name,
           NULL, &format))
         {
           DEBUG ("Unhandled ContactInfo field: %s", field->field_name);
@@ -256,7 +323,7 @@ details_update_show (EmpathyIndividualWidget *self,
         continue;
 
       /* Add Title */
-      title = empathy_contact_info_field_label (field->field_name,
+      title = tpaw_contact_info_field_label (field->field_name,
           field->parameters, TRUE);
       title_widget = gtk_label_new (title);
 
@@ -284,8 +351,7 @@ details_update_show (EmpathyIndividualWidget *self,
   conn = tp_contact_get_connection (contact);
   account = tp_connection_get_account (conn);
 
-  channels_label = empathy_contact_info_create_channel_list_label (account,
-      info, n_rows);
+  channels_label = create_channel_list_label (account, info, n_rows);
 
   if (channels_label != NULL)
     {
@@ -593,7 +659,7 @@ location_update (EmpathyIndividualWidget *self)
 
       stamp = g_value_get_int64 (value);
 
-      user_date = empathy_time_to_string_relative (stamp);
+      user_date = tpaw_time_to_string_relative (stamp);
 
       tmp = g_strdup_printf ("<b>%s</b>", _("Location"));
       /* translators: format is "Location, $date" */
@@ -646,7 +712,7 @@ location_update (EmpathyIndividualWidget *self)
           gint64 time_;
 
           time_ = g_value_get_int64 (value);
-          svalue = empathy_time_to_string_utc (time_, _("%B %e, %Y at %R UTC"));
+          svalue = tpaw_time_to_string_utc (time_, _("%B %e, %Y at %R UTC"));
         }
 
       if (svalue != NULL)
@@ -1231,13 +1297,13 @@ notify_presence_cb (gpointer folks_object,
   /* FIXME: Default messages should be moved into libfolks (bgo#627403) */
   message = folks_presence_details_get_presence_message (
       FOLKS_PRESENCE_DETAILS (folks_object));
-  if (EMP_STR_EMPTY (message))
+  if (TPAW_STR_EMPTY (message))
     {
       message = empathy_presence_get_default_message (presence);
     }
 
   if (message != NULL)
-    markup_text = empathy_add_link_markup (message);
+    markup_text = tpaw_add_link_markup (message);
   gtk_label_set_markup (GTK_LABEL (status_label), markup_text);
   g_free (markup_text);
 
@@ -1965,7 +2031,7 @@ empathy_individual_widget_init (EmpathyIndividualWidget *self)
 
   filename = empathy_file_lookup ("empathy-individual-widget.ui",
       "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "scrolled_window_individual", &priv->scrolled_window_individual,
       "viewport_individual", &priv->viewport_individual,
       "vbox_individual_widget", &priv->vbox_individual_widget,
diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index b8156c48a..fd63377f2 100644
--- a/libempathy-gtk/empathy-individual-widget.h
+++ b/libempathy-gtk/empathy-individual-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_INDIVIDUAL_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c
index 78502ef83..d7c24a68d 100644
--- a/libempathy-gtk/empathy-input-text-view.c
+++ b/libempathy-gtk/empathy-input-text-view.c
@@ -25,6 +25,7 @@
  *          Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
+#include "config.h"
 #include "empathy-input-text-view.h"
 
 G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view,
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
deleted file mode 100644
index 00e9bf0eb..000000000
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ /dev/null
@@ -1,740 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- * 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: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-irc-network-manager.h>
-
-#include "empathy-irc-network-dialog.h"
-#include "empathy-live-search.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-irc-network-chooser-dialog.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetworkChooserDialog)
-
-enum {
-    PROP_SETTINGS = 1,
-    PROP_NETWORK
-};
-
-enum {
-	RESPONSE_RESET = 0
-};
-
-typedef struct {
-    EmpathyAccountSettings *settings;
-    EmpathyIrcNetwork *network;
-
-    EmpathyIrcNetworkManager *network_manager;
-    gboolean changed;
-
-    GtkWidget *treeview;
-    GtkListStore *store;
-    GtkTreeModelFilter *filter;
-    GtkWidget *search;
-    GtkWidget *select_button;
-
-    gulong search_sig;
-    gulong activate_sig;
-} EmpathyIrcNetworkChooserDialogPriv;
-
-enum {
-  COL_NETWORK_OBJ,
-  COL_NETWORK_NAME,
-};
-
-G_DEFINE_TYPE (EmpathyIrcNetworkChooserDialog, empathy_irc_network_chooser_dialog,
-    GTK_TYPE_DIALOG);
-
-static void
-empathy_irc_network_chooser_dialog_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        priv->settings = g_value_dup_object (value);
-        break;
-      case PROP_NETWORK:
-        priv->network = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_network_chooser_dialog_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        g_value_set_object (value, priv->settings);
-        break;
-      case PROP_NETWORK:
-        g_value_set_object (value, priv->network);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-/* The iter returned by *it is a priv->store iter (not a filter one) */
-static EmpathyIrcNetwork *
-dup_selected_network (EmpathyIrcNetworkChooserDialog *self,
-    GtkTreeIter *it)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-  GtkTreeSelection *selection;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
-  if (selection == NULL)
-    return NULL;
-
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return NULL;
-
-  gtk_tree_model_get (model, &iter, COL_NETWORK_OBJ, &network, -1);
-  g_assert (network != NULL);
-
-  if (it != NULL)
-    {
-      gtk_tree_model_filter_convert_iter_to_child_iter (priv->filter, it,
-          &iter);
-    }
-
-  return network;
-}
-
-static void
-treeview_changed_cb (GtkTreeView *treeview,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-
-  network = dup_selected_network (self, NULL);
-  if (network == priv->network)
-    {
-      g_clear_object (&network);
-      return;
-    }
-
-  tp_clear_object (&priv->network);
-  /* Transfer the reference */
-  priv->network = network;
-
-  priv->changed = TRUE;
-}
-
-/* Take a filter iterator as argument */
-static void
-scroll_to_iter (EmpathyIrcNetworkChooserDialog *self,
-    GtkTreeIter *filter_iter)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreePath *path;
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
-
-  if (path != NULL)
-    {
-      gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (priv->treeview),
-          path, NULL, FALSE, 0, 0);
-
-      gtk_tree_path_free (path);
-    }
-}
-
-/* Take a filter iterator as argument */
-static void
-select_iter (EmpathyIrcNetworkChooserDialog *self,
-    GtkTreeIter *filter_iter,
-    gboolean emulate_changed)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreeSelection *selection;
-  GtkTreePath *path;
-
-  /* Select the network */
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (priv->treeview));
-
-  gtk_tree_selection_select_iter (selection, filter_iter);
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->filter), filter_iter);
-  if (path != NULL)
-    {
-      gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->treeview), path,
-          NULL, FALSE);
-
-      gtk_tree_path_free (path);
-    }
-
-  /* Scroll to the selected network */
-  scroll_to_iter (self, filter_iter);
-
-  if (emulate_changed)
-    {
-      /* gtk_tree_selection_select_iter doesn't fire the 'cursor-changed' signal
-       * so we call the callback manually. */
-      treeview_changed_cb (GTK_TREE_VIEW (priv->treeview), self);
-    }
-}
-
-static GtkTreeIter
-iter_to_filter_iter (EmpathyIrcNetworkChooserDialog *self,
-    GtkTreeIter *iter)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreeIter filter_iter;
-
-  g_assert (gtk_tree_model_filter_convert_child_iter_to_iter (priv->filter,
-        &filter_iter, iter));
-
-  return filter_iter;
-}
-
-static void
-fill_store (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GSList *networks, *l;
-
-  networks = empathy_irc_network_manager_get_networks (
-      priv->network_manager);
-
-  for (l = networks; l != NULL; l = g_slist_next (l))
-    {
-      EmpathyIrcNetwork *network = l->data;
-      GtkTreeIter iter;
-
-      gtk_list_store_insert_with_values (priv->store, &iter, -1,
-          COL_NETWORK_OBJ, network,
-          COL_NETWORK_NAME, empathy_irc_network_get_name (network),
-          -1);
-
-      if (network == priv->network)
-        {
-          GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
-
-          select_iter (self, &filter_iter, FALSE);
-        }
-
-      g_object_unref (network);
-    }
-
-  g_slist_free (networks);
-}
-
-static void
-irc_network_dialog_destroy_cb (GtkWidget *widget,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-  GtkTreeIter iter, filter_iter;
-
-  priv->changed = TRUE;
-
-  network = dup_selected_network (self, &iter);
-  if (network == NULL)
-    return;
-
-  /* name could be changed */
-  gtk_list_store_set (GTK_LIST_STORE (priv->store), &iter,
-      COL_NETWORK_NAME, empathy_irc_network_get_name (network), -1);
-
-  filter_iter = iter_to_filter_iter (self, &iter);
-  scroll_to_iter (self, &filter_iter);
-
-  gtk_widget_grab_focus (priv->treeview);
-
-  g_object_unref (network);
-}
-
-static void
-display_irc_network_dialog (EmpathyIrcNetworkChooserDialog *self,
-    EmpathyIrcNetwork *network)
-{
-  GtkWidget *dialog;
-
-  dialog = empathy_irc_network_dialog_show (network, GTK_WIDGET (self));
-
-  g_signal_connect (dialog, "destroy",
-      G_CALLBACK (irc_network_dialog_destroy_cb), self);
-}
-
-static void
-edit_network (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetwork *network;
-
-  network = dup_selected_network (self, NULL);
-  if (network == NULL)
-    return;
-
-  display_irc_network_dialog (self, network);
-
-  g_object_unref (network);
-}
-
-static void
-add_network (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-  GtkTreeIter iter, filter_iter;
-
-  gtk_widget_hide (priv->search);
-
-  network = empathy_irc_network_new (_("New Network"));
-  empathy_irc_network_manager_add (priv->network_manager, network);
-
-  gtk_list_store_insert_with_values (priv->store, &iter, -1,
-      COL_NETWORK_OBJ, network,
-      COL_NETWORK_NAME, empathy_irc_network_get_name (network),
-      -1);
-
-  filter_iter = iter_to_filter_iter (self, &iter);
-  select_iter (self, &filter_iter, TRUE);
-
-  display_irc_network_dialog (self, network);
-
-  g_object_unref (network);
-}
-
-static void
-remove_network (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-  GtkTreeIter iter;
-
-  network = dup_selected_network (self, &iter);
-  if (network == NULL)
-    return;
-
-  /* Hide the search after picking the network to get the right one */
-  gtk_widget_hide (priv->search);
-
-  DEBUG ("Remove network %s", empathy_irc_network_get_name (network));
-
-  /* Delete network and select next network */
-  if (gtk_list_store_remove (priv->store, &iter))
-    {
-      GtkTreeIter filter_iter = iter_to_filter_iter (self, &iter);
-
-      select_iter (self, &filter_iter, TRUE);
-    }
-  else
-    {
-      /* this should only happen if the last network was deleted */
-      GtkTreeIter last, filter_iter;
-      gint n_elements;
-
-      n_elements = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->store),
-          NULL);
-
-      if (n_elements > 0)
-        {
-          gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (priv->store), &last,
-              NULL, (n_elements-1));
-          filter_iter = iter_to_filter_iter (self, &last);
-
-          select_iter (self, &filter_iter, TRUE);
-        }
-    }
-
-  empathy_irc_network_manager_remove (priv->network_manager, network);
-  gtk_widget_grab_focus (priv->treeview);
-
-  g_object_unref (network);
-}
-
-static void
-reset_networks (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GSList *networks, *l;
-
-  networks = empathy_irc_network_manager_get_dropped_networks (
-      priv->network_manager);
-
-  for (l = networks; l != NULL; l = g_slist_next (l))
-    {
-      EmpathyIrcNetwork *network;
-      GtkTreeIter iter;
-
-      network = EMPATHY_IRC_NETWORK (l->data);
-      empathy_irc_network_activate (network);
-
-      gtk_list_store_insert_with_values (priv->store, &iter, -1,
-          COL_NETWORK_OBJ, network,
-          COL_NETWORK_NAME, empathy_irc_network_get_name (network),
-          -1);
-    }
-
-  g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
-}
-
-static void
-dialog_response_cb (GtkDialog *dialog,
-    gint response,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  if (response == RESPONSE_RESET)
-    reset_networks (self);
-}
-
-static gboolean
-filter_visible_func (GtkTreeModel *model,
-    GtkTreeIter *iter,
-    gpointer user_data)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (user_data);
-  EmpathyIrcNetwork *network;
-  gboolean visible;
-
-  gtk_tree_model_get (model, iter, COL_NETWORK_OBJ, &network, -1);
-
-  visible = empathy_live_search_match (EMPATHY_LIVE_SEARCH (priv->search),
-      empathy_irc_network_get_name (network));
-
-  g_object_unref (network);
-  return visible;
-}
-
-static void
-search_activate_cb (GtkWidget *search,
-  EmpathyIrcNetworkChooserDialog *self)
-{
-  gtk_widget_hide (search);
-  gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE);
-}
-
-static void
-search_text_notify_cb (EmpathyLiveSearch *search,
-    GParamSpec *pspec,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkTreeIter filter_iter;
-  gboolean sensitive = FALSE;
-
-  gtk_tree_model_filter_refilter (priv->filter);
-
-  /* Is there at least one network in the view ? */
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->filter),
-        &filter_iter))
-    {
-      const gchar *text;
-
-      text = empathy_live_search_get_text (EMPATHY_LIVE_SEARCH (priv->search));
-      if (!EMP_STR_EMPTY (text))
-        {
-          /* We are doing a search, select the first matching network */
-          select_iter (self, &filter_iter, TRUE);
-        }
-      else
-        {
-          /* Search has been cancelled. Scroll to the selected network */
-          GtkTreeSelection *selection;
-
-          selection = gtk_tree_view_get_selection (
-              GTK_TREE_VIEW (priv->treeview));
-
-          if (gtk_tree_selection_get_selected (selection, NULL, &filter_iter))
-            scroll_to_iter (self, &filter_iter);
-        }
-
-      sensitive = TRUE;
-    }
-
-  gtk_widget_set_sensitive (priv->select_button, sensitive);
-}
-
-static void
-add_clicked_cb (GtkToolButton *button,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  add_network (self);
-}
-
-static void
-remove_clicked_cb (GtkToolButton *button,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  remove_network (self);
-}
-
-static void
-edit_clicked_cb (GtkToolButton *button,
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  edit_network (self);
-}
-
-static void
-empathy_irc_network_chooser_dialog_constructed (GObject *object)
-{
-  EmpathyIrcNetworkChooserDialog *self = (EmpathyIrcNetworkChooserDialog *) object;
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-  GtkDialog *dialog = GTK_DIALOG (self);
-  GtkCellRenderer *renderer;
-  GtkWidget *vbox;
-  GtkTreeViewColumn *column;
-  GtkWidget *scroll;
-  GtkWidget *toolbar;
-  GtkToolItem *item;
-  GtkStyleContext *context;
-
-  g_assert (priv->settings != NULL);
-
-  gtk_window_set_title (GTK_WINDOW (self), _("Choose an IRC network"));
-
-  /* Create store and treeview */
-  priv->store = gtk_list_store_new (2, G_TYPE_OBJECT, G_TYPE_STRING);
-
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
-      COL_NETWORK_NAME,
-      GTK_SORT_ASCENDING);
-
-  priv->treeview = gtk_tree_view_new ();
-  gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->treeview), FALSE);
-  gtk_tree_view_set_enable_search (GTK_TREE_VIEW (priv->treeview), FALSE);
-
-  column = gtk_tree_view_column_new ();
-  gtk_tree_view_append_column (GTK_TREE_VIEW (priv->treeview), column);
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (column), renderer, TRUE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column),
-      renderer,
-      "text", COL_NETWORK_NAME,
-      NULL);
-
-  /* add the treeview in a GtkScrolledWindow */
-  vbox = gtk_dialog_get_content_area (dialog);
-
-  scroll = gtk_scrolled_window_new (NULL, NULL);
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
-      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-
-  gtk_container_add (GTK_CONTAINER (scroll), priv->treeview);
-  gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 6);
-
-  /* Treeview toolbar */
-  toolbar = gtk_toolbar_new ();
-  gtk_toolbar_set_icon_size (GTK_TOOLBAR (toolbar), GTK_ICON_SIZE_MENU);
-  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, TRUE, 0);
-
-  item = gtk_tool_button_new (NULL, "");
-  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item), "list-add-symbolic");
-  g_signal_connect (item, "clicked", G_CALLBACK (add_clicked_cb), self);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  item = gtk_tool_button_new (NULL, "");
-  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
-      "list-remove-symbolic");
-  g_signal_connect (item, "clicked", G_CALLBACK (remove_clicked_cb), self);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  item = gtk_tool_button_new (NULL, "");
-  gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (item),
-      "preferences-system-symbolic");
-  g_signal_connect (item, "clicked", G_CALLBACK (edit_clicked_cb), self);
-  gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
-
-  context = gtk_widget_get_style_context (scroll);
-  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
-
-  context = gtk_widget_get_style_context (toolbar);
-  gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
-  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
-
-  /* Live search */
-  priv->search = empathy_live_search_new (priv->treeview);
-
-  gtk_box_pack_start (GTK_BOX (vbox), priv->search, FALSE, TRUE, 0);
-
-  priv->filter = GTK_TREE_MODEL_FILTER (gtk_tree_model_filter_new (
-          GTK_TREE_MODEL (priv->store), NULL));
-  gtk_tree_model_filter_set_visible_func (priv->filter,
-          filter_visible_func, self, NULL);
-
-  gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview),
-          GTK_TREE_MODEL (priv->filter));
-
-  priv->search_sig = g_signal_connect (priv->search, "notify::text",
-      G_CALLBACK (search_text_notify_cb), self);
-
-  priv->activate_sig = g_signal_connect (priv->search, "activate",
-      G_CALLBACK (search_activate_cb), self);
-
-  /* Add buttons */
-  gtk_dialog_add_buttons (dialog,
-      _("Reset _Networks List"), RESPONSE_RESET,
-      NULL);
-
-  priv->select_button = gtk_dialog_add_button (dialog,
-      C_("verb displayed on a button to select an IRC network", "Select"),
-      GTK_RESPONSE_CLOSE);
-
-  fill_store (self);
-
-  g_signal_connect (priv->treeview, "cursor-changed",
-      G_CALLBACK (treeview_changed_cb), self);
-
-  g_signal_connect (self, "response",
-      G_CALLBACK (dialog_response_cb), self);
-
-  /* Request a side ensuring to display at least some networks */
-  gtk_widget_set_size_request (GTK_WIDGET (self), -1, 300);
-
-  gtk_window_set_modal (GTK_WINDOW (self), TRUE);
-}
-
-static void
-empathy_irc_network_chooser_dialog_dispose (GObject *object)
-{
-  EmpathyIrcNetworkManager *self = (EmpathyIrcNetworkManager *) object;
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-
-  if (priv->search_sig != 0)
-    {
-      g_signal_handler_disconnect (priv->search, priv->search_sig);
-      priv->search_sig = 0;
-    }
-
-  if (priv->activate_sig != 0)
-    {
-      g_signal_handler_disconnect (priv->search, priv->activate_sig);
-      priv->activate_sig = 0;
-    }
-
-  if (priv->search != NULL)
-    {
-      empathy_live_search_set_hook_widget (EMPATHY_LIVE_SEARCH (priv->search),
-          NULL);
-
-      priv->search = NULL;
-    }
-
-  tp_clear_object (&priv->settings);
-  tp_clear_object (&priv->network);
-  tp_clear_object (&priv->network_manager);
-  tp_clear_object (&priv->store);
-  tp_clear_object (&priv->filter);
-
-  if (G_OBJECT_CLASS (empathy_irc_network_chooser_dialog_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_irc_network_chooser_dialog_parent_class)->dispose (object);
-}
-
-static void
-empathy_irc_network_chooser_dialog_class_init (EmpathyIrcNetworkChooserDialogClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = empathy_irc_network_chooser_dialog_get_property;
-  object_class->set_property = empathy_irc_network_chooser_dialog_set_property;
-  object_class->constructed = empathy_irc_network_chooser_dialog_constructed;
-  object_class->dispose = empathy_irc_network_chooser_dialog_dispose;
-
-  g_object_class_install_property (object_class, PROP_SETTINGS,
-    g_param_spec_object ("settings",
-      "Settings",
-      "The EmpathyAccountSettings to show and edit",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_NETWORK,
-    g_param_spec_object ("network",
-      "Network",
-      "The EmpathyIrcNetwork selected in the treeview",
-      EMPATHY_TYPE_IRC_NETWORK,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_type_class_add_private (object_class,
-      sizeof (EmpathyIrcNetworkChooserDialogPriv));
-}
-
-static void
-empathy_irc_network_chooser_dialog_init (EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG, EmpathyIrcNetworkChooserDialogPriv);
-  self->priv = priv;
-
-  priv->network_manager = empathy_irc_network_manager_dup_default ();
-}
-
-GtkWidget *
-empathy_irc_network_chooser_dialog_new (EmpathyAccountSettings *settings,
-    EmpathyIrcNetwork *network,
-    GtkWindow *parent)
-{
-  return g_object_new (EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG,
-      "settings", settings,
-      "network", network,
-      "transient-for", parent,
-      NULL);
-}
-
-EmpathyIrcNetwork *
-empathy_irc_network_chooser_dialog_get_network (
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-
-  return priv->network;
-}
-
-gboolean
-empathy_irc_network_chooser_dialog_get_changed (
-    EmpathyIrcNetworkChooserDialog *self)
-{
-  EmpathyIrcNetworkChooserDialogPriv *priv = GET_PRIV (self);
-
-  return priv->changed;
-}
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
deleted file mode 100644
index 0d4f24e7f..000000000
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- * 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: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_NETWORK_CHOOSER_DIALOG_H__
-#define __EMPATHY_IRC_NETWORK_CHOOSER_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-irc-network.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG (empathy_irc_network_chooser_dialog_get_type ())
-#define EMPATHY_IRC_NETWORK_CHOOSER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG, EmpathyIrcNetworkChooserDialog))
-#define EMPATHY_IRC_NETWORK_CHOOSER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG, EmpathyIrcNetworkChooserDialogClass))
-#define EMPATHY_IS_IRC_NETWORK_CHOOSER_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG))
-#define EMPATHY_IS_IRC_NETWORK_CHOOSER_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG))
-#define EMPATHY_IRC_NETWORK_CHOOSER_DIALOG_GET_CLASS(o) ( \
-    G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_IRC_NETWORK_CHOOSER_DIALOG, \
-        EmpathyIrcNetworkChooserDialogClass))
-
-typedef struct {
-  GtkDialog parent;
-
-  /*<private>*/
-  gpointer priv;
-} EmpathyIrcNetworkChooserDialog;
-
-typedef struct {
-  GtkDialogClass parent_class;
-} EmpathyIrcNetworkChooserDialogClass;
-
-GType empathy_irc_network_chooser_dialog_get_type (void) G_GNUC_CONST;
-
-GtkWidget * empathy_irc_network_chooser_dialog_new (
-    EmpathyAccountSettings *settings,
-    EmpathyIrcNetwork *network,
-    GtkWindow *parent);
-
-EmpathyIrcNetwork * empathy_irc_network_chooser_dialog_get_network (
-    EmpathyIrcNetworkChooserDialog *self);
-
-gboolean empathy_irc_network_chooser_dialog_get_changed (
-    EmpathyIrcNetworkChooserDialog *self);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_NETWORK_CHOOSER_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
deleted file mode 100644
index e19b3e8ab..000000000
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- * 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: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-irc-network-manager.h>
-
-#include "empathy-ui-utils.h"
-#include "empathy-irc-network-chooser-dialog.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-irc-network-chooser.h"
-
-#define DEFAULT_IRC_NETWORK "irc.gimp.org"
-#define DEFAULT_IRC_PORT 6667
-#define DEFAULT_IRC_SSL FALSE
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetworkChooser)
-
-enum {
-    PROP_SETTINGS = 1
-};
-
-enum {
-    SIG_CHANGED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-typedef struct {
-    EmpathyAccountSettings *settings;
-
-    EmpathyIrcNetworkManager *network_manager;
-    GtkWidget *dialog;
-    /* Displayed network */
-    EmpathyIrcNetwork *network;
-} EmpathyIrcNetworkChooserPriv;
-
-G_DEFINE_TYPE (EmpathyIrcNetworkChooser, empathy_irc_network_chooser,
-    GTK_TYPE_BUTTON);
-
-static void
-empathy_irc_network_chooser_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        priv->settings = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_network_chooser_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (object);
-
-  switch (prop_id)
-    {
-      case PROP_SETTINGS:
-        g_value_set_object (value, priv->settings);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-unset_server_params (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-
-  DEBUG ("Unset server, port and use-ssl");
-  empathy_account_settings_unset (priv->settings, "server");
-  empathy_account_settings_unset (priv->settings, "port");
-  empathy_account_settings_unset (priv->settings, "use-ssl");
-}
-
-static gchar *
-dup_network_service (EmpathyIrcNetwork *network)
-{
-  /* Account.Service has to be a lower case alphanumeric string which may
-   * also contain '-' but not start with it. */
-#define VALID G_CSET_a_2_z G_CSET_DIGITS "-"
-  gchar *service, *tmp;
-
-  service = g_strdup (empathy_irc_network_get_name (network));
-  service = g_strstrip (service);
-
-  if (tp_str_empty (service))
-    {
-      g_free (service);
-      return NULL;
-    }
-
-  tmp = service;
-  service = g_ascii_strdown (service, -1);
-  g_free (tmp);
-
-  service = g_strcanon (service, VALID, '-');
-
-  if (service[0] == '-')
-    {
-      tmp = service;
-      service = g_strdup (service + 1);
-
-      g_free (tmp);
-    }
-
-  return service;
-}
-
-static void
-update_server_params (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-  GSList *servers;
-  const gchar *charset;
-
-  g_assert (priv->network != NULL);
-
-  charset = empathy_irc_network_get_charset (priv->network);
-  DEBUG ("Setting charset to %s", charset);
-  empathy_account_settings_set (priv->settings, "charset",
-      g_variant_new_string (charset));
-
-  servers = empathy_irc_network_get_servers (priv->network);
-  if (g_slist_length (servers) > 0)
-    {
-      /* set the first server as CM server */
-      EmpathyIrcServer *server = servers->data;
-      gchar *address;
-      guint port;
-      gboolean ssl;
-      gchar *service;
-
-      g_object_get (server,
-          "address", &address,
-          "port", &port,
-          "ssl", &ssl,
-          NULL);
-
-      DEBUG ("Setting server to %s", address);
-      empathy_account_settings_set (priv->settings, "server",
-          g_variant_new_string (address));
-      DEBUG ("Setting port to %u", port);
-      empathy_account_settings_set (priv->settings, "port",
-          g_variant_new_uint32 (port));
-      DEBUG ("Setting use-ssl to %s", ssl ? "TRUE": "FALSE" );
-      empathy_account_settings_set (priv->settings, "use-ssl",
-          g_variant_new_boolean (ssl));
-
-      /* Set Account.Service */
-      service = dup_network_service (priv->network);
-      DEBUG ("Setting Service to %s", service);
-      empathy_account_settings_set_service (priv->settings, service);
-
-      g_free (address);
-      g_free (service);
-    }
-  else
-    {
-      /* No server. Unset values */
-      unset_server_params (self);
-    }
-
-  g_slist_foreach (servers, (GFunc) g_object_unref, NULL);
-  g_slist_free (servers);
-}
-
-static void
-set_label (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-
-  g_assert (priv->network != NULL);
-
-  gtk_button_set_label (GTK_BUTTON (self),
-      empathy_irc_network_get_name (priv->network));
-}
-
-static void
-set_label_from_settings (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-  gchar *server;
-
-  tp_clear_object (&priv->network);
-
-  server = empathy_account_settings_dup_string (priv->settings, "server");
-
-  if (server != NULL)
-    {
-      EmpathyIrcServer *srv;
-      gint port;
-      gboolean ssl;
-
-      priv->network = empathy_irc_network_manager_find_network_by_address (
-          priv->network_manager, server);
-
-      if (priv->network != NULL)
-        {
-          /* The network is known */
-          g_object_ref (priv->network);
-          set_label (self);
-          return;
-        }
-
-      /* We don't have this network. Let's create it */
-      port = empathy_account_settings_get_uint32 (priv->settings, "port");
-      ssl = empathy_account_settings_get_boolean (priv->settings,
-          "use-ssl");
-
-      DEBUG ("Create a network %s", server);
-      priv->network = empathy_irc_network_new (server);
-      srv = empathy_irc_server_new (server, port, ssl);
-
-      empathy_irc_network_append_server (priv->network, srv);
-      empathy_irc_network_manager_add (priv->network_manager, priv->network);
-
-      set_label (self);
-
-      g_object_unref (srv);
-      g_free (server);
-      return;
-    }
-
-  /* Set default network */
-  priv->network = empathy_irc_network_manager_find_network_by_address (
-          priv->network_manager, DEFAULT_IRC_NETWORK);
-
-  if (priv->network == NULL)
-    {
-      /* Default network is not known, recreate it */
-      EmpathyIrcServer *srv;
-
-      priv->network = empathy_irc_network_new (DEFAULT_IRC_NETWORK);
-
-      srv = empathy_irc_server_new (DEFAULT_IRC_NETWORK, DEFAULT_IRC_PORT,
-          DEFAULT_IRC_SSL);
-
-      empathy_irc_network_append_server (priv->network, srv);
-      empathy_irc_network_manager_add (priv->network_manager, priv->network);
-
-      g_object_unref (srv);
-    }
-
-  set_label (self);
-  update_server_params (self);
-  g_object_ref (priv->network);
-}
-
-static void
-dialog_response_cb (GtkDialog *dialog,
-    gint response,
-    EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetworkChooserDialog *chooser =
-    EMPATHY_IRC_NETWORK_CHOOSER_DIALOG (priv->dialog);
-
-  if (response != GTK_RESPONSE_CLOSE &&
-      response != GTK_RESPONSE_DELETE_EVENT)
-    return;
-
-  if (empathy_irc_network_chooser_dialog_get_changed (chooser))
-    {
-      tp_clear_object (&priv->network);
-
-      priv->network = g_object_ref (
-          empathy_irc_network_chooser_dialog_get_network (chooser));
-
-      update_server_params (self);
-      set_label (self);
-
-      g_signal_emit (self, signals[SIG_CHANGED], 0);
-    }
-
-  gtk_widget_destroy (priv->dialog);
-  priv->dialog = NULL;
-}
-
-static void
-clicked_cb (GtkButton *button,
-    gpointer user_data)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (button);
-  GtkWindow *window;
-
-  if (priv->dialog != NULL)
-    goto out;
-
-  window = empathy_get_toplevel_window (GTK_WIDGET (button));
-
-  priv->dialog = empathy_irc_network_chooser_dialog_new (priv->settings,
-      priv->network, window);
-  gtk_widget_show_all (priv->dialog);
-
-  tp_g_signal_connect_object (priv->dialog, "response",
-      G_CALLBACK (dialog_response_cb), button, 0);
-
-out:
-  empathy_window_present (GTK_WINDOW (priv->dialog));
-}
-
-static void
-empathy_irc_network_chooser_constructed (GObject *object)
-{
-  EmpathyIrcNetworkChooser *self = (EmpathyIrcNetworkChooser *) object;
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-
-  g_assert (priv->settings != NULL);
-
-  set_label_from_settings (self);
-
-  g_signal_connect (self, "clicked", G_CALLBACK (clicked_cb), self);
-}
-
-static void
-empathy_irc_network_chooser_dispose (GObject *object)
-{
-  EmpathyIrcNetworkManager *self = (EmpathyIrcNetworkManager *) object;
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-
-  tp_clear_object (&priv->settings);
-  tp_clear_object (&priv->network_manager);
-  tp_clear_object (&priv->network);
-
-  if (G_OBJECT_CLASS (empathy_irc_network_chooser_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_irc_network_chooser_parent_class)->dispose (object);
-}
-
-static void
-empathy_irc_network_chooser_class_init (EmpathyIrcNetworkChooserClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = empathy_irc_network_chooser_get_property;
-  object_class->set_property = empathy_irc_network_chooser_set_property;
-  object_class->constructed = empathy_irc_network_chooser_constructed;
-  object_class->dispose = empathy_irc_network_chooser_dispose;
-
-  g_object_class_install_property (object_class, PROP_SETTINGS,
-    g_param_spec_object ("settings",
-      "Settings",
-      "The EmpathyAccountSettings to show and edit",
-      EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  signals[SIG_CHANGED] = g_signal_new ("changed",
-      G_OBJECT_CLASS_TYPE (object_class),
-      G_SIGNAL_RUN_LAST,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE,
-      0);
-
-  g_type_class_add_private (object_class,
-      sizeof (EmpathyIrcNetworkChooserPriv));
-}
-
-static void
-empathy_irc_network_chooser_init (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv;
-
-  priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_IRC_NETWORK_CHOOSER, EmpathyIrcNetworkChooserPriv);
-  self->priv = priv;
-
-  priv->network_manager = empathy_irc_network_manager_dup_default ();
-}
-
-GtkWidget *
-empathy_irc_network_chooser_new (EmpathyAccountSettings *settings)
-{
-  return g_object_new (EMPATHY_TYPE_IRC_NETWORK_CHOOSER,
-      "settings", settings,
-      NULL);
-}
-
-EmpathyIrcNetwork *
-empathy_irc_network_chooser_get_network (EmpathyIrcNetworkChooser *self)
-{
-  EmpathyIrcNetworkChooserPriv *priv = GET_PRIV (self);
-
-  return priv->network;
-}
diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h
deleted file mode 100644
index 3b6125050..000000000
--- a/libempathy-gtk/empathy-irc-network-chooser.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- * 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: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_NETWORK_CHOOSER_H__
-#define __EMPATHY_IRC_NETWORK_CHOOSER_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-irc-network.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_IRC_NETWORK_CHOOSER (empathy_irc_network_chooser_get_type ())
-#define EMPATHY_IRC_NETWORK_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER, EmpathyIrcNetworkChooser))
-#define EMPATHY_IRC_NETWORK_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER, EmpathyIrcNetworkChooserClass))
-#define EMPATHY_IS_IRC_NETWORK_CHOOSER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER))
-#define EMPATHY_IS_IRC_NETWORK_CHOOSER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), \
-    EMPATHY_TYPE_IRC_NETWORK_CHOOSER))
-#define EMPATHY_IRC_NETWORK_CHOOSER_GET_CLASS(o) ( \
-    G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_IRC_NETWORK_CHOOSER, \
-        EmpathyIrcNetworkChooserClass))
-
-typedef struct {
-  GtkButton parent;
-
-  /*<private>*/
-  gpointer priv;
-} EmpathyIrcNetworkChooser;
-
-typedef struct {
-  GtkButtonClass parent_class;
-} EmpathyIrcNetworkChooserClass;
-
-GType empathy_irc_network_chooser_get_type (void) G_GNUC_CONST;
-
-GtkWidget * empathy_irc_network_chooser_new (EmpathyAccountSettings *settings);
-
-EmpathyIrcNetwork * empathy_irc_network_chooser_get_network (
-    EmpathyIrcNetworkChooser *self);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_NETWORK_CHOOSER_H__ */
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
deleted file mode 100644
index aedb5dc79..000000000
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-ui-utils.h"
-#include "totem-subtitle-encoding.h"
-
-#include "empathy-irc-network-dialog.h"
-
-typedef struct {
-  EmpathyIrcNetwork *network;
-
-  GtkWidget *dialog;
-  GtkWidget *button_close;
-
-  GtkWidget *entry_network;
-  GtkWidget *combobox_charset;
-
-  GtkWidget *treeview_servers;
-  GtkWidget *button_add;
-  GtkWidget *button_remove;
-  GtkWidget *button_up;
-  GtkWidget *button_down;
-} EmpathyIrcNetworkDialog;
-
-static void
-irc_network_dialog_destroy_cb (GtkWidget *widget,
-                               EmpathyIrcNetworkDialog *dialog)
-{
-  g_object_unref (dialog->network);
-
-  g_slice_free (EmpathyIrcNetworkDialog, dialog);
-}
-
-static void
-irc_network_dialog_close_clicked_cb (GtkWidget *widget,
-                                     EmpathyIrcNetworkDialog *dialog)
-{
-  gtk_widget_destroy (dialog->dialog);
-}
-
-enum {
-  COL_SRV_OBJ,
-  COL_ADR,
-  COL_PORT,
-  COL_SSL
-};
-
-static void
-add_server_to_store (GtkListStore *store,
-                     EmpathyIrcServer *server,
-                     GtkTreeIter *iter)
-{
-  gchar *address;
-  guint port;
-  gboolean ssl;
-
-  g_object_get (server,
-      "address", &address,
-      "port", &port,
-      "ssl", &ssl,
-      NULL);
-
-  gtk_list_store_insert_with_values (store, iter, -1,
-      COL_SRV_OBJ, server,
-      COL_ADR, address,
-      COL_PORT, port,
-      COL_SSL, ssl,
-      -1);
-
-  g_free (address);
-}
-
-static void
-irc_network_dialog_setup (EmpathyIrcNetworkDialog *dialog)
-{
-  gchar *name, *charset;
-  GSList *servers, *l;
-  GtkListStore *store;
-
-  g_object_get (dialog->network,
-      "name", &name,
-      "charset", &charset,
-      NULL);
-  gtk_entry_set_text (GTK_ENTRY (dialog->entry_network), name);
-
-  store = GTK_LIST_STORE (gtk_tree_view_get_model (
-        GTK_TREE_VIEW (dialog->treeview_servers)));
-
-  servers = empathy_irc_network_get_servers (dialog->network);
-  for (l = servers; l != NULL; l = g_slist_next (l))
-    {
-      EmpathyIrcServer *server = l->data;
-      GtkTreeIter iter;
-
-      add_server_to_store (store, server, &iter);
-    }
-
-  totem_subtitle_encoding_set (GTK_COMBO_BOX (dialog->combobox_charset),
-      charset);
-
-  g_slist_foreach (servers, (GFunc) g_object_unref, NULL);
-  g_slist_free (servers);
-  g_free (name);
-  g_free (charset);
-}
-
-static void
-irc_network_dialog_address_edited_cb (GtkCellRendererText *renderer,
-                                      gchar *path,
-                                      gchar *new_text,
-                                      EmpathyIrcNetworkDialog *dialog)
-{
-  EmpathyIrcServer *server;
-  GtkTreeModel *model;
-  GtkTreePath  *treepath;
-  GtkTreeIter iter;
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview_servers));
-  treepath = gtk_tree_path_new_from_string (path);
-  gtk_tree_model_get_iter (model, &iter, treepath);
-  gtk_tree_model_get (model, &iter,
-      COL_SRV_OBJ, &server,
-      -1);
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-      COL_ADR, new_text,
-      -1);
-
-  g_object_set (server, "address", new_text, NULL);
-
-  gtk_tree_path_free (treepath);
-  g_object_unref (server);
-}
-
-static void
-irc_network_dialog_port_edited_cb (GtkCellRendererText *renderer,
-                                   gchar *path,
-                                   gchar *new_text,
-                                   EmpathyIrcNetworkDialog *dialog)
-{
-  EmpathyIrcServer *server;
-  GtkTreeModel *model;
-  GtkTreePath  *treepath;
-  GtkTreeIter iter;
-  guint port;
-
-  port = strtoul (new_text, NULL, 10);
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview_servers));
-  treepath = gtk_tree_path_new_from_string (path);
-  gtk_tree_model_get_iter (model, &iter, treepath);
-  gtk_tree_model_get (model, &iter,
-      COL_SRV_OBJ, &server,
-      -1);
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-      COL_PORT, port,
-      -1);
-
-  g_object_set (server, "port", port, NULL);
-
-  gtk_tree_path_free (treepath);
-  g_object_unref (server);
-}
-
-static void
-irc_network_dialog_ssl_toggled_cb (GtkCellRendererText *renderer,
-                                   gchar *path,
-                                   EmpathyIrcNetworkDialog *dialog)
-{
-  EmpathyIrcServer *server;
-  GtkTreeModel *model;
-  GtkTreePath  *treepath;
-  GtkTreeIter iter;
-  gboolean ssl;
-
-  model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->treeview_servers));
-  treepath = gtk_tree_path_new_from_string (path);
-  gtk_tree_model_get_iter (model, &iter, treepath);
-  gtk_tree_model_get (model, &iter,
-      COL_SRV_OBJ, &server,
-      COL_SSL, &ssl,
-      -1);
-  ssl = !ssl;
-  gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-      COL_SSL, ssl,
-      -1);
-
-  g_object_set (server, "ssl", ssl, NULL);
-
-  gtk_tree_path_free (treepath);
-  g_object_unref (server);
-}
-
-static gboolean
-irc_network_dialog_network_focus_cb (GtkWidget *widget,
-                                     GdkEventFocus *event,
-                                     EmpathyIrcNetworkDialog *dialog)
-{
-  const gchar *str;
-
-  str = gtk_entry_get_text (GTK_ENTRY (widget));
-
-  g_object_set (dialog->network, "name", str, NULL);
-
-  return FALSE;
-}
-
-static void
-irc_network_dialog_network_update_buttons (EmpathyIrcNetworkDialog *dialog)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel *model;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-  gboolean can_remove = FALSE, can_move_up = FALSE, can_move_down = FALSE;
-  int selected;
-
-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (
-        dialog->treeview_servers));
-
-  if (gtk_tree_selection_get_selected (selection, &model, &iter))
-  {
-    path = gtk_tree_model_get_path (model, &iter);
-
-    selected = gtk_tree_path_get_indices (path)[0];
-
-    can_remove = TRUE;
-    can_move_up = selected > 0;
-    can_move_down =
-      selected < gtk_tree_model_iter_n_children (model, NULL) - 1;
-
-    gtk_tree_path_free (path);
-  }
-
-  gtk_widget_set_sensitive (dialog->button_remove, can_remove);
-  gtk_widget_set_sensitive (dialog->button_up, can_move_up);
-  gtk_widget_set_sensitive (dialog->button_down, can_move_down);
-}
-
-static void
-irc_network_dialog_button_add_clicked_cb (GtkWidget *widget,
-                                          EmpathyIrcNetworkDialog *dialog)
-{
-  EmpathyIrcServer *server;
-  GtkListStore *store;
-  GtkTreeIter iter;
-  GtkTreePath *path;
-  GtkTreeViewColumn *column;
-
-  store = GTK_LIST_STORE (gtk_tree_view_get_model (
-        GTK_TREE_VIEW (dialog->treeview_servers)));
-
-  server = empathy_irc_server_new (_("new server"), 6667, FALSE);
-  empathy_irc_network_append_server (dialog->network, server);
-  add_server_to_store (store, server, &iter);
-
-  path = gtk_tree_model_get_path (GTK_TREE_MODEL (store), &iter);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
-      0);
-  gtk_tree_view_set_cursor (GTK_TREE_VIEW (dialog->treeview_servers), path,
-      column, TRUE);
-
-  irc_network_dialog_network_update_buttons (dialog);
-
-  gtk_tree_path_free (path);
-  g_object_unref (server);
-}
-
-static void
-irc_network_dialog_button_remove_clicked_cb (GtkWidget *widget,
-                                             EmpathyIrcNetworkDialog *dialog)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  EmpathyIrcServer *server;
-
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (dialog->treeview_servers));
-
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return;
-
-  gtk_tree_model_get (model, &iter, COL_SRV_OBJ, &server, -1);
-
-  gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
-  empathy_irc_network_remove_server (dialog->network, server);
-
-  irc_network_dialog_network_update_buttons (dialog);
-
-  g_object_unref (server);
-}
-
-static void
-irc_network_dialog_button_up_clicked_cb (GtkWidget *widget,
-                                         EmpathyIrcNetworkDialog *dialog)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel *model;
-  GtkTreeIter iter, iter_prev;
-  GtkTreePath *path;
-  gint *pos;
-  EmpathyIrcServer *server;
-
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (dialog->treeview_servers));
-
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return;
-
-  path = gtk_tree_model_get_path (model, &iter);
-
-  if (!gtk_tree_path_prev (path))
-  {
-    gtk_tree_path_free (path);
-    return;
-  }
-
-  gtk_tree_model_get (model, &iter, COL_SRV_OBJ, &server, -1);
-
-  gtk_tree_model_get_iter (model, &iter_prev, path);
-  gtk_list_store_swap (GTK_LIST_STORE (model), &iter_prev, &iter);
-
-  pos = gtk_tree_path_get_indices (path);
-  empathy_irc_network_set_server_position (dialog->network, server, *pos);
-
-  irc_network_dialog_network_update_buttons (dialog);
-
-  g_object_unref (server);
-  gtk_tree_path_free (path);
-}
-
-static void
-irc_network_dialog_button_down_clicked_cb (GtkWidget *widget,
-                                           EmpathyIrcNetworkDialog *dialog)
-{
-  GtkTreeSelection *selection;
-  GtkTreeModel *model;
-  GtkTreeIter iter, iter_prev;
-  GtkTreePath *path;
-  EmpathyIrcServer *server;
-  gint *pos;
-
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (dialog->treeview_servers));
-
-  if (!gtk_tree_selection_get_selected (selection, &model, &iter))
-    return;
-
-  path = gtk_tree_model_get_path (model, &iter);
-
-  gtk_tree_path_next (path);
-  if (!gtk_tree_model_get_iter (model, &iter_prev, path))
-    {
-      gtk_tree_path_free (path);
-      return;
-    }
-
-  gtk_tree_model_get (model, &iter, COL_SRV_OBJ, &server, -1);
-
-  gtk_list_store_swap (GTK_LIST_STORE (model), &iter_prev, &iter);
-
-  pos = gtk_tree_path_get_indices (path);
-  empathy_irc_network_set_server_position (dialog->network, server, *pos);
-
-  irc_network_dialog_network_update_buttons (dialog);
-
-  gtk_tree_path_free (path);
-}
-
-static void
-irc_network_dialog_selection_changed_cb (GtkTreeSelection  *treeselection,
-                                         EmpathyIrcNetworkDialog *dialog)
-{
-  irc_network_dialog_network_update_buttons (dialog);
-}
-
-static void
-irc_network_dialog_combobox_charset_changed_cb (GtkWidget *combobox,
-                                                EmpathyIrcNetworkDialog *dialog)
-{
-  const gchar *charset;
-
-  charset = totem_subtitle_encoding_get_selected (GTK_COMBO_BOX (combobox));
-  g_object_set (dialog->network, "charset", charset, NULL);
-}
-
-static void
-change_network (EmpathyIrcNetworkDialog *dialog,
-                EmpathyIrcNetwork *network)
-{
-  GtkListStore *store;
-
-  if (dialog->network == network)
-    /* No need to change */
-    return;
-
-  if (dialog->network != NULL)
-    {
-      g_object_unref (dialog->network);
-    }
-
-  dialog->network = network;
-  g_object_ref (network);
-
-  store = GTK_LIST_STORE (gtk_tree_view_get_model (
-        GTK_TREE_VIEW (dialog->treeview_servers)));
-  gtk_list_store_clear (store);
-
-  irc_network_dialog_setup (dialog);
-}
-
-/**
- * empathy_irc_network_dialog_show:
- * @network: the #EmpathyIrcNetwork to configure
- * @parent: the parent of this dialog
- *
- * Display a dialog to configure a given #EmpathyIrcNetwork.
- * This function is a singleton so if a configuration dialog already
- * exists we use this one to edit the network.
- *
- * Returns: The displayed #GtkDialog
- */
-GtkWidget *
-empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
-                                 GtkWidget *parent)
-{
-  static EmpathyIrcNetworkDialog *dialog = NULL;
-  GtkBuilder *gui;
-  GtkListStore *store;
-  GtkCellRenderer *renderer;
-  GtkAdjustment *adjustment;
-  GtkTreeSelection *selection;
-  GtkTreeViewColumn *column;
-  gchar *filename;
-  GtkWidget *sw, *toolbar;
-  GtkStyleContext *context;
-
-  g_return_val_if_fail (network != NULL, NULL);
-
-  if (dialog != NULL)
-    {
-      change_network (dialog, network);
-      gtk_window_present (GTK_WINDOW (dialog->dialog));
-
-      return dialog->dialog;
-    }
-
-  dialog = g_slice_new0 (EmpathyIrcNetworkDialog);
-
-  dialog->network = network;
-  g_object_ref (dialog->network);
-
-  filename = empathy_file_lookup ("empathy-account-widget-irc.ui",
-      "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
-      "irc_network_dialog", &dialog->dialog,
-      "button_close", &dialog->button_close,
-      "entry_network", &dialog->entry_network,
-      "combobox_charset", &dialog->combobox_charset,
-      "treeview_servers", &dialog->treeview_servers,
-      "button_add", &dialog->button_add,
-      "button_remove", &dialog->button_remove,
-      "button_up", &dialog->button_up,
-      "button_down", &dialog->button_down,
-      "scrolledwindow_network_server", &sw,
-      "toolbar_network_server", &toolbar,
-      NULL);
-  g_free (filename);
-
-  store = gtk_list_store_new (4, G_TYPE_OBJECT, G_TYPE_STRING,
-      G_TYPE_UINT, G_TYPE_BOOLEAN);
-  gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->treeview_servers),
-      GTK_TREE_MODEL (store));
-  g_object_unref (store);
-
-  /* address */
-  renderer = gtk_cell_renderer_text_new ();
-  g_object_set (renderer, "editable", TRUE, NULL);
-  g_signal_connect (renderer, "edited",
-      G_CALLBACK (irc_network_dialog_address_edited_cb), dialog);
-  gtk_tree_view_insert_column_with_attributes (
-      GTK_TREE_VIEW (dialog->treeview_servers),
-      -1, _("Server"), renderer, "text", COL_ADR,
-      NULL);
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
-      0);
-
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-  gtk_tree_view_column_set_expand (column, TRUE);
-
-  /* port */
-  adjustment = (GtkAdjustment *) gtk_adjustment_new (6667, 1, G_MAXUINT16,
-      1, 10, 0);
-  renderer = gtk_cell_renderer_spin_new ();
-  g_object_set (renderer,
-      "editable", TRUE,
-      "adjustment", adjustment,
-      NULL);
-  g_signal_connect (renderer, "edited",
-      G_CALLBACK (irc_network_dialog_port_edited_cb), dialog);
-
-  gtk_tree_view_insert_column_with_attributes (
-      GTK_TREE_VIEW (dialog->treeview_servers),
-      -1, _("Port"), renderer, "text", COL_PORT,
-      NULL);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
-      1);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-  gtk_tree_view_column_set_expand (column, TRUE);
-
-  /* SSL */
-  renderer = gtk_cell_renderer_toggle_new ();
-  g_object_set (renderer, "activatable", TRUE, NULL);
-  g_signal_connect (renderer, "toggled",
-      G_CALLBACK (irc_network_dialog_ssl_toggled_cb), dialog);
-  gtk_tree_view_insert_column_with_attributes (
-      GTK_TREE_VIEW (dialog->treeview_servers),
-      -1, _("SSL"), renderer, "active", COL_SSL,
-      NULL);
-
-  selection = gtk_tree_view_get_selection (
-      GTK_TREE_VIEW (dialog->treeview_servers));
-  gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-
-  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
-      2);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
-
-  gtk_tree_view_column_set_expand (column, TRUE);
-  /* charset */
-  totem_subtitle_encoding_init (GTK_COMBO_BOX (dialog->combobox_charset));
-
-  irc_network_dialog_setup (dialog);
-
-  empathy_builder_connect (gui, dialog,
-      "irc_network_dialog", "destroy", irc_network_dialog_destroy_cb,
-      "button_close", "clicked", irc_network_dialog_close_clicked_cb,
-      "entry_network", "focus-out-event", irc_network_dialog_network_focus_cb,
-      "button_add", "clicked", irc_network_dialog_button_add_clicked_cb,
-      "button_remove", "clicked", irc_network_dialog_button_remove_clicked_cb,
-      "button_up", "clicked", irc_network_dialog_button_up_clicked_cb,
-      "button_down", "clicked", irc_network_dialog_button_down_clicked_cb,
-      "combobox_charset", "changed", irc_network_dialog_combobox_charset_changed_cb,
-      NULL);
-
-  g_object_unref (gui);
-
-  g_object_add_weak_pointer (G_OBJECT (dialog->dialog),
-      (gpointer) &dialog);
-
-  g_signal_connect (selection, "changed",
-      G_CALLBACK (irc_network_dialog_selection_changed_cb),
-      dialog);
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog->dialog),
-      GTK_WINDOW (parent));
-  gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
-
-  /* join the add/remove toolbar to the treeview */
-  context = gtk_widget_get_style_context (sw);
-  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
-
-  context = gtk_widget_get_style_context (toolbar);
-  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
-
-  irc_network_dialog_network_update_buttons (dialog);
-  gtk_widget_show_all (dialog->dialog);
-
-  gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
-
-  return dialog->dialog;
-}
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
deleted file mode 100644
index df4a8b152..000000000
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_NETWORK_DIALOG_H__
-#define __EMPATHY_IRC_NETWORK_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-irc-network.h>
-
-G_BEGIN_DECLS
-
-GtkWidget * empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
-    GtkWidget *parent);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_NETWORK_DIALOG_H__ */
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
deleted file mode 100644
index e65adbe4c..000000000
--- a/libempathy-gtk/empathy-live-search.c
+++ /dev/null
@@ -1,729 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- * Copyright (C) 2007-2010 Nokia Corporation.
- *
- * 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: Felix Kaser <felix.kaser@collabora.co.uk>
- *          Xavier Claessens <xavier.claessens@collabora.co.uk>
- *          Claudio Saavedra <csaavedra@igalia.com>
- */
-
-#include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-live-search.h"
-
-G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch)
-
-typedef struct
-{
-  GtkWidget *search_entry;
-  GtkWidget *hook_widget;
-
-  GPtrArray *stripped_words;
-} EmpathyLiveSearchPriv;
-
-enum
-{
-  PROP_0,
-  PROP_HOOK_WIDGET,
-  PROP_TEXT
-};
-
-enum
-{
-  ACTIVATE,
-  KEYNAV,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-static void live_search_hook_widget_destroy_cb (GtkWidget *object,
-    gpointer user_data);
-
-/**
- * stripped_char:
- *
- * Returns a stripped version of @ch, removing any case, accentuation
- * mark, or any special mark on it.
- **/
-static gunichar
-stripped_char (gunichar ch)
-{
-  gunichar retval = 0;
-  GUnicodeType utype;
-
-  utype = g_unichar_type (ch);
-
-  switch (utype)
-    {
-    case G_UNICODE_CONTROL:
-    case G_UNICODE_FORMAT:
-    case G_UNICODE_UNASSIGNED:
-    case G_UNICODE_NON_SPACING_MARK:
-    case G_UNICODE_COMBINING_MARK:
-    case G_UNICODE_ENCLOSING_MARK:
-      /* Ignore those */
-      break;
-    case G_UNICODE_PRIVATE_USE:
-    case G_UNICODE_SURROGATE:
-    case G_UNICODE_LOWERCASE_LETTER:
-    case G_UNICODE_MODIFIER_LETTER:
-    case G_UNICODE_OTHER_LETTER:
-    case G_UNICODE_TITLECASE_LETTER:
-    case G_UNICODE_UPPERCASE_LETTER:
-    case G_UNICODE_DECIMAL_NUMBER:
-    case G_UNICODE_LETTER_NUMBER:
-    case G_UNICODE_OTHER_NUMBER:
-    case G_UNICODE_CONNECT_PUNCTUATION:
-    case G_UNICODE_DASH_PUNCTUATION:
-    case G_UNICODE_CLOSE_PUNCTUATION:
-    case G_UNICODE_FINAL_PUNCTUATION:
-    case G_UNICODE_INITIAL_PUNCTUATION:
-    case G_UNICODE_OTHER_PUNCTUATION:
-    case G_UNICODE_OPEN_PUNCTUATION:
-    case G_UNICODE_CURRENCY_SYMBOL:
-    case G_UNICODE_MODIFIER_SYMBOL:
-    case G_UNICODE_MATH_SYMBOL:
-    case G_UNICODE_OTHER_SYMBOL:
-    case G_UNICODE_LINE_SEPARATOR:
-    case G_UNICODE_PARAGRAPH_SEPARATOR:
-    case G_UNICODE_SPACE_SEPARATOR:
-    default:
-      ch = g_unichar_tolower (ch);
-      g_unichar_fully_decompose (ch, FALSE, &retval, 1);
-    }
-
-  return retval;
-}
-
-static void
-append_word (GPtrArray **word_array,
-    GString **word)
-{
-  if (*word != NULL)
-    {
-      if (*word_array == NULL)
-        *word_array = g_ptr_array_new_with_free_func (g_free);
-      g_ptr_array_add (*word_array, g_string_free (*word, FALSE));
-      *word = NULL;
-    }
-}
-
-GPtrArray *
-empathy_live_search_strip_utf8_string (const gchar *string)
-{
-  GPtrArray *word_array = NULL;
-  GString *word = NULL;
-  const gchar *p;
-
-  if (EMP_STR_EMPTY (string))
-    return NULL;
-
-  for (p = string; *p != '\0'; p = g_utf8_next_char (p))
-    {
-      gunichar sc;
-
-      /* Make the char lower-case, remove its accentuation marks, and ignore it
-       * if it is just unicode marks */
-      sc = stripped_char (g_utf8_get_char (p));
-      if (sc == 0)
-        continue;
-
-      /* If it is not alpha-num, it is separator between words */
-      if (!g_unichar_isalnum (sc))
-        {
-          append_word (&word_array, &word);
-          continue;
-        }
-
-      /* It is alpha-num, append this char to current word, or start new word */
-      if (word == NULL)
-        word = g_string_new (NULL);
-      g_string_append_unichar (word, sc);
-    }
-
-  append_word (&word_array, &word);
-
-  return word_array;
-}
-
-static gboolean
-live_search_match_prefix (const gchar *string,
-    const gchar *prefix)
-{
-  const gchar *p;
-  const gchar *prefix_p;
-  gboolean next_word = FALSE;
-
-  if (prefix == NULL || prefix[0] == 0)
-    return TRUE;
-
-  if (EMP_STR_EMPTY (string))
-    return FALSE;
-
-  prefix_p = prefix;
-  for (p = string; *p != '\0'; p = g_utf8_next_char (p))
-    {
-      gunichar sc;
-
-      /* Make the char lower-case, remove its accentuation marks, and ignore it
-       * if it is just unicode marks */
-      sc = stripped_char (g_utf8_get_char (p));
-      if (sc == 0)
-        continue;
-
-      /* If we want to go to next word, ignore alpha-num chars */
-      if (next_word && g_unichar_isalnum (sc))
-        continue;
-      next_word = FALSE;
-
-      /* Ignore word separators */
-      if (!g_unichar_isalnum (sc))
-        continue;
-
-      /* If this char does not match prefix_p, go to next word and start again
-       * from the beginning of prefix */
-      if (sc != g_utf8_get_char (prefix_p))
-        {
-          next_word = TRUE;
-          prefix_p = prefix;
-          continue;
-        }
-
-      /* prefix_p match, verify to next char. If this was the last of prefix,
-       * it means it completely machted and we are done. */
-      prefix_p = g_utf8_next_char (prefix_p);
-      if (*prefix_p == '\0')
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-gboolean
-empathy_live_search_match_words (const gchar *string,
-    GPtrArray *words)
-{
-  guint i;
-
-  if (words == NULL)
-    return TRUE;
-
-  for (i = 0; i < words->len; i++)
-    if (!live_search_match_prefix (string, g_ptr_array_index (words, i)))
-      return FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-fire_key_navigation_sig (EmpathyLiveSearch *self,
-    GdkEventKey *event)
-{
-  gboolean ret;
-
-  g_signal_emit (self, signals[KEYNAV], 0, event, &ret);
-  return ret;
-}
-
-static gboolean
-live_search_entry_key_pressed_cb (GtkEntry *entry,
-    GdkEventKey *event,
-    gpointer user_data)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
-
-  /* if esc key pressed, hide the search */
-  if (event->keyval == GDK_KEY_Escape)
-    {
-      gtk_widget_hide (GTK_WIDGET (self));
-      return TRUE;
-    }
-
-  /* emit key navigation signal, so other widgets can respond to it properly */
-  if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down
-      || event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down
-      || event->keyval == GDK_KEY_Menu)
-     {
-       return fire_key_navigation_sig (self, event);
-     }
-
-  if (event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_End ||
-      event->keyval == GDK_KEY_space)
-    {
-      /* If the live search is visible, the entry should catch the Home/End
-       * and space events */
-      if (!gtk_widget_get_visible (GTK_WIDGET (self)))
-        {
-          return fire_key_navigation_sig (self, event);
-        }
-    }
-
-  return FALSE;
-}
-
-static void
-live_search_text_changed (GtkEntry *entry,
-    gpointer user_data)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-  const gchar *text;
-
-  text = gtk_entry_get_text (entry);
-
-  if (EMP_STR_EMPTY (text))
-    gtk_widget_hide (GTK_WIDGET (self));
-  else
-    gtk_widget_show (GTK_WIDGET (self));
-
-  if (priv->stripped_words != NULL)
-    g_ptr_array_unref (priv->stripped_words);
-
-  priv->stripped_words = empathy_live_search_strip_utf8_string (text);
-
-  g_object_notify (G_OBJECT (self), "text");
-}
-
-static void
-live_search_close_pressed (GtkEntry *entry,
-    GtkEntryIconPosition icon_pos,
-    GdkEvent *event,
-    gpointer user_data)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
-
-  gtk_widget_hide (GTK_WIDGET (self));
-}
-
-static gboolean
-live_search_key_press_event_cb (GtkWidget *widget,
-    GdkEventKey *event,
-    gpointer user_data)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-  GdkEvent *new_event;
-  gboolean ret;
-
-  /* dont forward this event to the entry, else the event is consumed by the
-   * entry and does not close the window */
-  if (!gtk_widget_get_visible (GTK_WIDGET (self)) &&
-      event->keyval == GDK_KEY_Escape)
-    return FALSE;
-
-  /* do not show the search if CTRL and/or ALT are pressed with a key
-   * this is needed, because otherwise the CTRL + F accel would not work,
-   * because the entry consumes it */
-  if (event->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK) ||
-      event->keyval == GDK_KEY_Control_L ||
-      event->keyval == GDK_KEY_Control_R)
-    return FALSE;
-
-  /* dont forward the up/down and Page Up/Down arrow keys to the entry,
-   * they are needed for navigation in the treeview and are not needed in
-   * the search entry */
-   if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down ||
-       event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down ||
-       event->keyval == GDK_KEY_Menu)
-     return FALSE;
-
-   if (event->keyval == GDK_KEY_Home || event->keyval == GDK_KEY_End ||
-       event->keyval == GDK_KEY_space)
-     {
-       /* Home/End and space keys have to be forwarded to the entry only if
-        * the live search is visible (to move the cursor inside the entry). */
-       if (!gtk_widget_get_visible (GTK_WIDGET (self)))
-         return FALSE;
-     }
-
-   /* Don't forward shift keys events as focusing the search entry would
-    * cancel an in-progress editing on a cell renderer (like when renaming a
-    * group). There is no point focusing it anyway as we don't display the
-    * search entry when only a shift key is pressed. */
-   if (event->keyval == GDK_KEY_Shift_L ||
-       event->keyval == GDK_KEY_Shift_R)
-       return FALSE;
-
-  /* realize the widget if it is not realized yet */
-  gtk_widget_realize (priv->search_entry);
-  if (!gtk_widget_has_focus (priv->search_entry))
-    {
-      gtk_widget_grab_focus (priv->search_entry);
-      gtk_editable_set_position (GTK_EDITABLE (priv->search_entry), -1);
-    }
-
-  /* forward the event to the search entry */
-  new_event = gdk_event_copy ((GdkEvent *) event);
-  ret = gtk_widget_event (priv->search_entry, new_event);
-  gdk_event_free (new_event);
-
-  return ret;
-}
-
-static void
-live_search_entry_activate_cb (GtkEntry *entry,
-    EmpathyLiveSearch *self)
-{
-  g_signal_emit (self, signals[ACTIVATE], 0);
-}
-
-static void
-live_search_release_hook_widget (EmpathyLiveSearch *self)
-{
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  /* remove old handlers if old source was not null */
-  if (priv->hook_widget != NULL)
-    {
-      g_signal_handlers_disconnect_by_func (priv->hook_widget,
-          live_search_key_press_event_cb, self);
-      g_signal_handlers_disconnect_by_func (priv->hook_widget,
-          live_search_hook_widget_destroy_cb, self);
-      g_object_unref (priv->hook_widget);
-      priv->hook_widget = NULL;
-    }
-}
-
-static void
-live_search_hook_widget_destroy_cb (GtkWidget *object,
-    gpointer user_data)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (user_data);
-
-  /* unref the hook widget and hide search */
-  gtk_widget_hide (GTK_WIDGET (self));
-  live_search_release_hook_widget (self);
-}
-
-static void
-live_search_dispose (GObject *obj)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (obj);
-
-  live_search_release_hook_widget (self);
-
-  if (G_OBJECT_CLASS (empathy_live_search_parent_class)->dispose != NULL)
-    G_OBJECT_CLASS (empathy_live_search_parent_class)->dispose (obj);
-}
-
-static void
-live_search_finalize (GObject *obj)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (obj);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  if (priv->stripped_words != NULL)
-    g_ptr_array_unref (priv->stripped_words);
-
-  if (G_OBJECT_CLASS (empathy_live_search_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (empathy_live_search_parent_class)->finalize (obj);
-}
-
-static void
-live_search_get_property (GObject *object,
-    guint param_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (object);
-
-  switch (param_id)
-    {
-    case PROP_HOOK_WIDGET:
-      g_value_set_object (value, empathy_live_search_get_hook_widget (self));
-      break;
-    case PROP_TEXT:
-      g_value_set_string (value, empathy_live_search_get_text (self));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-      break;
-    }
-}
-
-static void
-live_search_set_property (GObject *object,
-    guint param_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (object);
-
-  switch (param_id) {
-  case PROP_HOOK_WIDGET:
-    empathy_live_search_set_hook_widget (self, g_value_get_object (value));
-    break;
-  case PROP_TEXT:
-    empathy_live_search_set_text (self, g_value_get_string (value));
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-    break;
-  };
-}
-
-static void
-live_search_unmap (GtkWidget *widget)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (widget);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  GTK_WIDGET_CLASS (empathy_live_search_parent_class)->unmap (widget);
-
-  /* unmap can happen if a parent gets hidden, in that case we want to hide
-   * the live search as well, so when it gets mapped again, the live search
-   * won't be shown. */
-  gtk_widget_hide (widget);
-
-  gtk_entry_set_text (GTK_ENTRY (priv->search_entry), "");
-
-  if (priv->hook_widget != NULL)
-    gtk_widget_grab_focus (priv->hook_widget);
-}
-
-static void
-live_search_show (GtkWidget *widget)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (widget);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  if (!gtk_widget_has_focus (priv->search_entry))
-    gtk_widget_grab_focus (priv->search_entry);
-
-  GTK_WIDGET_CLASS (empathy_live_search_parent_class)->show (widget);
-}
-
-static void
-live_search_grab_focus (GtkWidget *widget)
-{
-  EmpathyLiveSearch *self = EMPATHY_LIVE_SEARCH (widget);
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  if (!gtk_widget_has_focus (priv->search_entry))
-    {
-      gtk_widget_grab_focus (priv->search_entry);
-      gtk_editable_set_position (GTK_EDITABLE (priv->search_entry), -1);
-    }
-}
-
-static void
-empathy_live_search_class_init (EmpathyLiveSearchClass *klass)
-{
-  GObjectClass *object_class = (GObjectClass *) klass;
-  GtkWidgetClass *widget_class = (GtkWidgetClass *) klass;
-  GParamSpec *param_spec;
-
-  object_class->finalize = live_search_finalize;
-  object_class->dispose = live_search_dispose;
-  object_class->get_property = live_search_get_property;
-  object_class->set_property = live_search_set_property;
-
-  widget_class->unmap = live_search_unmap;
-  widget_class->show = live_search_show;
-  widget_class->grab_focus = live_search_grab_focus;
-
-  signals[ACTIVATE] = g_signal_new ("activate",
-      G_TYPE_FROM_CLASS (object_class),
-      G_SIGNAL_RUN_LAST,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
-
-  signals[KEYNAV] = g_signal_new ("key-navigation",
-      G_TYPE_FROM_CLASS (object_class),
-      G_SIGNAL_RUN_LAST,
-      0,
-      g_signal_accumulator_true_handled, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
-
-  param_spec = g_param_spec_object ("hook-widget", "Live Search Hook Widget",
-      "The live search catches key-press-events on this widget",
-      GTK_TYPE_WIDGET, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_HOOK_WIDGET,
-      param_spec);
-
-  param_spec = g_param_spec_string ("text", "Live Search Text",
-      "The text of the live search entry",
-      "", G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_TEXT, param_spec);
-
-  g_type_class_add_private (klass, sizeof (EmpathyLiveSearchPriv));
-}
-
-static void
-empathy_live_search_init (EmpathyLiveSearch *self)
-{
-  EmpathyLiveSearchPriv *priv =
-    G_TYPE_INSTANCE_GET_PRIVATE ((self), EMPATHY_TYPE_LIVE_SEARCH,
-        EmpathyLiveSearchPriv);
-
-  gtk_widget_set_no_show_all (GTK_WIDGET (self), TRUE);
-
-  priv->search_entry = gtk_entry_new ();
-  gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->search_entry),
-      GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLOSE);
-  gtk_entry_set_icon_activatable (GTK_ENTRY (priv->search_entry),
-      GTK_ENTRY_ICON_SECONDARY, TRUE);
-  gtk_entry_set_icon_sensitive (GTK_ENTRY (priv->search_entry),
-      GTK_ENTRY_ICON_SECONDARY, TRUE);
-  gtk_widget_show (priv->search_entry);
-
-  gtk_box_pack_start (GTK_BOX (self), priv->search_entry, TRUE, TRUE, 0);
-
-  g_signal_connect (priv->search_entry, "icon_release",
-      G_CALLBACK (live_search_close_pressed), self);
-  g_signal_connect (priv->search_entry, "changed",
-      G_CALLBACK (live_search_text_changed), self);
-  g_signal_connect (priv->search_entry, "key-press-event",
-      G_CALLBACK (live_search_entry_key_pressed_cb), self);
-  g_signal_connect (priv->search_entry, "activate",
-      G_CALLBACK (live_search_entry_activate_cb), self);
-
-  priv->hook_widget = NULL;
-
-  self->priv = priv;
-}
-
-GtkWidget *
-empathy_live_search_new (GtkWidget *hook)
-{
-  g_return_val_if_fail (hook == NULL || GTK_IS_WIDGET (hook), NULL);
-
-  return g_object_new (EMPATHY_TYPE_LIVE_SEARCH,
-      "hook-widget", hook,
-      NULL);
-}
-
-/* public methods */
-
-GtkWidget *
-empathy_live_search_get_hook_widget (EmpathyLiveSearch *self)
-{
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  g_return_val_if_fail (EMPATHY_IS_LIVE_SEARCH (self), NULL);
-
-  return priv->hook_widget;
-}
-
-void
-empathy_live_search_set_hook_widget (EmpathyLiveSearch *self,
-    GtkWidget *hook)
-{
-  EmpathyLiveSearchPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_LIVE_SEARCH (self));
-  g_return_if_fail (hook == NULL || GTK_IS_WIDGET (hook));
-
-  priv = GET_PRIV (self);
-
-  /* release the actual widget */
-  live_search_release_hook_widget (self);
-
-  /* connect handlers if new source is not null */
-  if (hook != NULL)
-    {
-      priv->hook_widget = g_object_ref (hook);
-      g_signal_connect (priv->hook_widget, "key-press-event",
-          G_CALLBACK (live_search_key_press_event_cb),
-          self);
-      g_signal_connect (priv->hook_widget, "destroy",
-          G_CALLBACK (live_search_hook_widget_destroy_cb),
-          self);
-    }
-}
-
-const gchar *
-empathy_live_search_get_text (EmpathyLiveSearch *self)
-{
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  g_return_val_if_fail (EMPATHY_IS_LIVE_SEARCH (self), NULL);
-
-  return gtk_entry_get_text (GTK_ENTRY (priv->search_entry));
-}
-
-void
-empathy_live_search_set_text (EmpathyLiveSearch *self,
-    const gchar *text)
-{
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  g_return_if_fail (EMPATHY_IS_LIVE_SEARCH (self));
-  g_return_if_fail (text != NULL);
-
-  gtk_entry_set_text (GTK_ENTRY (priv->search_entry), text);
-}
-
-/**
- * empathy_live_search_match:
- * @self: a #EmpathyLiveSearch
- * @string: a string where to search, must be valid UTF-8.
- *
- * Search if one of the words in @string string starts with the current text
- * of @self.
- *
- * Searching for "aba" in "Abasto" will match, searching in "Moraba" will not,
- * and searching in "A tool (abacus)" will do.
- *
- * The match is not case-sensitive, and regardless of the accentuation marks.
- *
- * Returns: %TRUE if a match is found, %FALSE otherwise.
- *
- **/
-gboolean
-empathy_live_search_match (EmpathyLiveSearch *self,
-    const gchar *string)
-{
-  EmpathyLiveSearchPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_LIVE_SEARCH (self), FALSE);
-
-  priv = GET_PRIV (self);
-
-  return empathy_live_search_match_words (string, priv->stripped_words);
-}
-
-gboolean
-empathy_live_search_match_string (const gchar *string,
-    const gchar *prefix)
-{
-  GPtrArray *words;
-  gboolean match;
-
-  words = empathy_live_search_strip_utf8_string (prefix);
-  match = empathy_live_search_match_words (string, words);
-  if (words != NULL)
-    g_ptr_array_unref (words);
-
-  return match;
-}
-
-GPtrArray *
-empathy_live_search_get_words (EmpathyLiveSearch *self)
-{
-  EmpathyLiveSearchPriv *priv = GET_PRIV (self);
-
-  return priv->stripped_words;
-}
diff --git a/libempathy-gtk/empathy-live-search.h b/libempathy-gtk/empathy-live-search.h
deleted file mode 100644
index 3d0a8734f..000000000
--- a/libempathy-gtk/empathy-live-search.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2010 Collabora Ltd.
- * Copyright (C) 2007-2010 Nokia Corporation.
- *
- * 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: Felix Kaser <felix.kaser@collabora.co.uk>
- *          Xavier Claessens <xavier.claessens@collabora.co.uk>
- *          Claudio Saavedra <csaavedra@igalia.com>
- */
-
-#ifndef __EMPATHY_LIVE_SEARCH_H__
-#define __EMPATHY_LIVE_SEARCH_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_LIVE_SEARCH         (empathy_live_search_get_type ())
-#define EMPATHY_LIVE_SEARCH(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_LIVE_SEARCH, EmpathyLiveSearch))
-#define EMPATHY_LIVE_SEARCH_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_LIVE_SEARCH, EmpathyLiveSearchClass))
-#define EMPATHY_IS_LIVE_SEARCH(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_LIVE_SEARCH))
-#define EMPATHY_IS_LIVE_SEARCH_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_LIVE_SEARCH))
-#define EMPATHY_LIVE_SEARCH_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_LIVE_SEARCH, EmpathyLiveSearchClass))
-
-typedef struct _EmpathyLiveSearch      EmpathyLiveSearch;
-typedef struct _EmpathyLiveSearchClass EmpathyLiveSearchClass;
-
-struct _EmpathyLiveSearch {
-  GtkHBox parent;
-
-  /*<private>*/
-  gpointer priv;
-};
-
-struct _EmpathyLiveSearchClass {
-  GtkHBoxClass parent_class;
-};
-
-GType empathy_live_search_get_type (void) G_GNUC_CONST;
-GtkWidget *empathy_live_search_new (GtkWidget *hook);
-
-GtkWidget *empathy_live_search_get_hook_widget (EmpathyLiveSearch *self);
-void empathy_live_search_set_hook_widget (EmpathyLiveSearch *self,
-    GtkWidget *hook);
-
-const gchar *empathy_live_search_get_text (EmpathyLiveSearch *self);
-void empathy_live_search_set_text (EmpathyLiveSearch *self,
-    const gchar *text);
-
-gboolean empathy_live_search_match (EmpathyLiveSearch *self,
-    const gchar *string);
-
-GPtrArray * empathy_live_search_strip_utf8_string (const gchar *string);
-
-gboolean empathy_live_search_match_words (const gchar *string,
-    GPtrArray *words);
-
-GPtrArray * empathy_live_search_get_words (EmpathyLiveSearch *self);
-
-/* Made public for unit tests */
-gboolean empathy_live_search_match_string (const gchar *string,
-   const gchar *prefix);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_LIVE_SEARCH_H__ */
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index b714fa499..6ee8711a3 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -22,14 +22,15 @@
 #include "empathy-local-xmpp-assistant-widget.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
     empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)
@@ -43,7 +44,7 @@ static gulong signals[LAST_SIGNAL] = { 0, };
 
 struct _EmpathyLocalXmppAssistantWidgetPrivate
 {
-  EmpathyAccountSettings  *settings;
+  TpawAccountSettings  *settings;
 };
 
 static void
@@ -55,7 +56,7 @@ empathy_local_xmpp_assistant_widget_init (EmpathyLocalXmppAssistantWidget *self)
 }
 
 static void
-handle_apply_cb (EmpathyAccountWidget *widget_object,
+handle_apply_cb (TpawAccountWidget *widget_object,
     gboolean is_valid,
     EmpathyLocalXmppAssistantWidget *self)
 {
@@ -69,7 +70,7 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object)
     object;
   GtkWidget *w;
   GdkPixbuf *pix;
-  EmpathyAccountWidget *account_widget;
+  TpawAccountWidget *account_widget;
   gchar *markup;
 
   G_OBJECT_CLASS (empathy_local_xmpp_assistant_widget_parent_class)->
@@ -87,7 +88,7 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object)
   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);
+  pix = tpaw_pixbuf_from_icon_name_sized ("im-local-xmpp", 48);
   if (pix != NULL)
     {
       w = gtk_image_new_from_pixbuf (pix);
@@ -97,12 +98,12 @@ empathy_local_xmpp_assistant_widget_constructed (GObject *object)
       g_object_unref (pix);
     }
 
-  self->priv->settings = empathy_account_settings_new ("salut", "local-xmpp",
+  self->priv->settings = tpaw_account_settings_new ("salut", "local-xmpp",
       NULL, _("People nearby"));
 
-  account_widget = empathy_account_widget_new_for_protocol (
-      self->priv->settings, TRUE);
-  empathy_account_widget_hide_buttons (account_widget);
+  account_widget = tpaw_account_widget_new_for_protocol (
+      self->priv->settings, NULL, TRUE);
+  tpaw_account_widget_hide_buttons (account_widget);
 
   g_signal_connect (account_widget, "handle-apply",
       G_CALLBACK (handle_apply_cb), self);
@@ -182,7 +183,7 @@ account_enabled_cb (GObject *source,
 
   account_mgr = tp_account_manager_dup ();
 
-  empathy_connect_new_account (account, account_mgr);
+  tpaw_connect_new_account (account, account_mgr);
 
   g_object_unref (account_mgr);
 }
@@ -192,11 +193,11 @@ apply_account_cb (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
 {
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
+  TpawAccountSettings *settings = TPAW_ACCOUNT_SETTINGS (source);
   TpAccount *account;
   GError *error = NULL;
 
-  if (!empathy_account_settings_apply_finish (settings, result, NULL, &error))
+  if (!tpaw_account_settings_apply_finish (settings, result, NULL, &error))
     {
       DEBUG ("Failed to create account: %s", error->message);
       g_error_free (error);
@@ -204,7 +205,7 @@ apply_account_cb (GObject *source,
     }
 
   /* enable the newly created account */
-  account = empathy_account_settings_get_account (settings);
+  account = tpaw_account_settings_get_account (settings);
   tp_account_set_enabled_async (account, TRUE, account_enabled_cb, NULL);
 }
 
@@ -212,7 +213,7 @@ void
 empathy_local_xmpp_assistant_widget_create_account (
     EmpathyLocalXmppAssistantWidget *self)
 {
-  empathy_account_settings_apply_async (self->priv->settings,
+  tpaw_account_settings_apply_async (self->priv->settings,
       apply_account_cb, NULL);
 }
 
@@ -245,5 +246,5 @@ gboolean
 empathy_local_xmpp_assistant_widget_is_valid (
         EmpathyLocalXmppAssistantWidget *self)
 {
-  return empathy_account_settings_is_valid (self->priv->settings);
+  return tpaw_account_settings_is_valid (self->priv->settings);
 }
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index dafd7fb2a..efea64d29 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index ab72fff7d..459adb28e 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -20,24 +20,31 @@
  */
 
 #include "config.h"
-
-#include <geoclue/geoclue-master.h>
-
 #include "empathy-location-manager.h"
 
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-location.h"
-#include "libempathy/empathy-time.h"
+#include <tp-account-widgets/tpaw-time.h>
+
+#include "empathy-gsettings.h"
+#include "empathy-location.h"
+#include "empathy-geoclue-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Seconds before updating the location */
 #define TIMEOUT 10
 static EmpathyLocationManager *location_manager = NULL;
 
+typedef enum
+{
+  GEOCLUE_NONE = 0,
+  GEOCLUE_STARTING,
+  GEOCLUE_STARTED,
+  GEOCLUE_FAILED,
+} GeoclueStatus;
+
 struct _EmpathyLocationManagerPrivate {
-    gboolean geoclue_is_setup;
+    GeoclueStatus geoclue_status;
     /* Contains the location to be sent to accounts.  Geoclue is used
      * to populate it.  This HashTable uses Telepathy's style (string,
      * GValue). Keys are defined in empathy-location.h
@@ -46,13 +53,9 @@ struct _EmpathyLocationManagerPrivate {
 
     GSettings *gsettings_loc;
 
-    GeoclueResourceFlags resources;
-    GeoclueMasterClient *gc_client;
-    GeocluePosition *gc_position;
-    GeoclueAddress *gc_address;
-
     gboolean reduce_accuracy;
     TpAccountManager *account_manager;
+    EmpathyGeoclueHelper *geoclue;
 
     /* The idle id for publish_on_idle func */
     guint timeout_id;
@@ -92,9 +95,6 @@ location_manager_dispose (GObject *object)
 
   tp_clear_object (&self->priv->account_manager);
   tp_clear_object (&self->priv->gsettings_loc);
-  tp_clear_object (&self->priv->gc_client);
-  tp_clear_object (&self->priv->gc_position);
-  tp_clear_object (&self->priv->gc_address);
   tp_clear_pointer (&self->priv->location, g_hash_table_unref);
 
   if (dispose != NULL)
@@ -241,333 +241,105 @@ new_connection_cb (TpAccount *account,
 }
 
 static void
-update_timestamp (EmpathyLocationManager *self)
+update_location (EmpathyLocationManager *self,
+    GClueLocation *proxy)
 {
+  gdouble latitude, longitude, accuracy;
+  const gchar *desc;
   gint64 timestamp;
 
-  timestamp = empathy_time_get_current ();
-  tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
-      timestamp);
-
-  DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, timestamp);
-}
-
-static void
-address_changed_cb (GeoclueAddress *address,
-                    int timestamp,
-                    GHashTable *details,
-                    GeoclueAccuracy *accuracy,
-                    gpointer user_data)
-{
-  EmpathyLocationManager *self = user_data;
-  GeoclueAccuracyLevel level;
-  GHashTableIter iter;
-  gpointer key, value;
-
-  geoclue_accuracy_get_details (accuracy, &level, NULL, NULL);
-  DEBUG ("New address (accuracy level %d):", level);
-  /* FIXME: Publish accuracy level also considering the position's */
-
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_STREET);
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_AREA);
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_REGION);
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_COUNTRY);
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_COUNTRY_CODE);
-  g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_POSTAL_CODE);
-
-  if (g_hash_table_size (details) == 0)
-    {
-      DEBUG ("\t - (Empty)");
-      return;
-    }
-
-  g_hash_table_iter_init (&iter, details);
-  while (g_hash_table_iter_next (&iter, &key, &value))
-    {
-      /* Discard street information if reduced accuracy is on */
-      if (self->priv->reduce_accuracy &&
-          !tp_strdiff (key, EMPATHY_LOCATION_STREET))
-        continue;
-
-      tp_asv_set_string (self->priv->location, key, value);
-
-      DEBUG ("\t - %s: %s", (gchar *) key, (gchar *) value);
-    }
+  latitude = gclue_location_get_latitude (proxy);
+  longitude = gclue_location_get_longitude (proxy);
+  accuracy = gclue_location_get_accuracy (proxy);
+  desc = gclue_location_get_description (proxy);
 
-  update_timestamp (self);
-  if (self->priv->timeout_id == 0)
-    self->priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle,
-        self);
-}
+  DEBUG ("Location updated: (%f %f) accuracy: %f (%s)",
+      latitude, longitude, accuracy, desc);
 
-static void
-initial_address_cb (GeoclueAddress *address,
-                    int timestamp,
-                    GHashTable *details,
-                    GeoclueAccuracy *accuracy,
-                    GError *error,
-                    gpointer self)
-{
-  if (error)
+  if (self->priv->reduce_accuracy)
     {
-      DEBUG ("Error: %s", error->message);
-      g_error_free (error);
+      /* Truncate at 1 decimal place */
+      latitude = ((int) (latitude * 10)) / 10.0;
+      longitude = ((int) (longitude * 10)) / 10.0;
     }
   else
     {
-      address_changed_cb (address, timestamp, details, accuracy, self);
+      /* Include the description only if we are not asked to reduce the
+       * accuracy as it can contains a pretty specific description of the
+       * location. */
+      tp_asv_set_string (self->priv->location, EMPATHY_LOCATION_DESCRIPTION,
+          desc);
     }
-}
 
-static void
-position_changed_cb (GeocluePosition *position,
-                     GeocluePositionFields fields,
-                     int timestamp,
-                     double latitude,
-                     double longitude,
-                     double altitude,
-                     GeoclueAccuracy *accuracy,
-                     gpointer user_data)
-{
-  EmpathyLocationManager *self = user_data;
-  GeoclueAccuracyLevel level;
-  gdouble mean, horizontal, vertical;
-
-  geoclue_accuracy_get_details (accuracy, &level, &horizontal, &vertical);
-  DEBUG ("New position (accuracy level %d)", level);
-  if (level == GEOCLUE_ACCURACY_LEVEL_NONE)
-    return;
-
-  if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)
-    {
+  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LAT, latitude);
+  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LON, longitude);
+  tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ACCURACY, accuracy);
 
-      if (self->priv->reduce_accuracy)
-        /* Truncate at 1 decimal place */
-        longitude = ((int) (longitude * 10)) / 10.0;
-
-      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LON, longitude);
-
-      DEBUG ("\t - Longitude: %f", longitude);
-    }
-  else
-    {
-      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_LON);
-    }
-
-  if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE)
-    {
-      if (self->priv->reduce_accuracy)
-        /* Truncate at 1 decimal place */
-        latitude = ((int) (latitude * 10)) / 10.0;
-
-      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_LAT, latitude);
-
-      DEBUG ("\t - Latitude: %f", latitude);
-    }
-  else
-    {
-      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_LAT);
-    }
-
-  if (fields & GEOCLUE_POSITION_FIELDS_ALTITUDE)
-    {
-      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ALT, altitude);
-
-      DEBUG ("\t - Altitude: %f", altitude);
-    }
-  else
-    {
-      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_ALT);
-    }
-
-  if (level == GEOCLUE_ACCURACY_LEVEL_DETAILED)
-    {
-      mean = (horizontal + vertical) / 2.0;
-      tp_asv_set_double (self->priv->location, EMPATHY_LOCATION_ACCURACY, mean);
-
-      DEBUG ("\t - Accuracy: %f", mean);
-    }
-  else
-    {
-      g_hash_table_remove (self->priv->location, EMPATHY_LOCATION_ACCURACY);
-    }
+  timestamp = tpaw_time_get_current ();
+  tp_asv_set_int64 (self->priv->location, EMPATHY_LOCATION_TIMESTAMP,
+      timestamp);
 
-  update_timestamp (self);
   if (self->priv->timeout_id == 0)
     self->priv->timeout_id = g_timeout_add_seconds (TIMEOUT, publish_on_idle,
         self);
 }
 
 static void
-initial_position_cb (GeocluePosition *position,
-                     GeocluePositionFields fields,
-                     int timestamp,
-                     double latitude,
-                     double longitude,
-                     double altitude,
-                     GeoclueAccuracy *accuracy,
-                     GError *error,
-                     gpointer self)
-{
-  if (error)
-    {
-      DEBUG ("Error: %s", error->message);
-      g_error_free (error);
-    }
-  else
-    {
-      position_changed_cb (position, fields, timestamp, latitude, longitude,
-          altitude, accuracy, self);
-    }
-}
-
-static void
-set_requirements (EmpathyLocationManager *self,
-    GeoclueSetRequirementsCallback callback)
-{
-  geoclue_master_client_set_requirements_async (self->priv->gc_client,
-      GEOCLUE_ACCURACY_LEVEL_COUNTRY, 0, FALSE, self->priv->resources,
-      callback, self);
-}
-
-static void
-update_resources_set_requirements_cb (GeoclueMasterClient *client,
-    GError *error,
-    gpointer userdata)
-{
-  EmpathyLocationManager *self = userdata;
-
-  if (error != NULL)
-    {
-      DEBUG ("set_requirements failed: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  geoclue_address_get_address_async (self->priv->gc_address,
-      initial_address_cb, self);
-  geoclue_position_get_position_async (self->priv->gc_position,
-      initial_position_cb, self);
-}
-
-static void
-update_resources (EmpathyLocationManager *self)
+location_changed_cb (EmpathyGeoclueHelper *geoclue,
+    GClueLocation *location,
+    EmpathyLocationManager *self)
 {
-  DEBUG ("Updating resources %d", self->priv->resources);
-
-  if (!self->priv->geoclue_is_setup)
-    return;
-
-  /* As per Geoclue bug #15126, using NONE results in no address
-   * being found as geoclue-manual report an empty address with
-   * accuracy = NONE */
-  set_requirements (self, update_resources_set_requirements_cb);
+  update_location (self, location);
 }
 
 static void
-create_address_cb (GeoclueMasterClient *client,
-    GeoclueAddress *address,
-    GError *error,
-    gpointer userdata)
+geoclue_new_cb (GObject *source,
+    GAsyncResult *result,
+    gpointer user_data)
 {
-  EmpathyLocationManager *self = userdata;
-
-  if (error != NULL)
-    {
-      DEBUG ("Failed to create GeoclueAddress: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  self->priv->gc_address = address;
-
-  g_signal_connect (G_OBJECT (self->priv->gc_address), "address-changed",
-      G_CALLBACK (address_changed_cb), self);
+  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
+  GError *error = NULL;
+  GClueLocation *location;
 
-  self->priv->geoclue_is_setup = TRUE;
-}
+  self->priv->geoclue = empathy_geoclue_helper_new_started_finish (result,
+      &error);
 
-static void
-create_position_cb (GeoclueMasterClient *client,
-    GeocluePosition *position,
-    GError *error,
-    gpointer userdata)
-{
-  EmpathyLocationManager *self = userdata;
-
-  if (error != NULL)
+  if (self->priv->geoclue == NULL)
     {
-      DEBUG ("Failed to create GeocluePosition: %s", error->message);
+      DEBUG ("Failed to create Geoclue client: %s", error->message);
       g_error_free (error);
+      self->priv->geoclue_status = GEOCLUE_FAILED;
       return;
     }
 
-  self->priv->gc_position = position;
+  self->priv->geoclue_status = GEOCLUE_STARTED;
 
-  g_signal_connect (G_OBJECT (self->priv->gc_position), "position-changed",
-      G_CALLBACK (position_changed_cb), self);
+  g_signal_connect_object (self->priv->geoclue, "location-changed",
+      G_CALLBACK (location_changed_cb), self, 0);
 
-  /* Get updated when the address changes */
-  geoclue_master_client_create_address_async (self->priv->gc_client,
-      create_address_cb, self);
+  location = empathy_geoclue_helper_get_location (self->priv->geoclue);
+  if (location != NULL)
+    update_location (self, location);
 }
 
 static void
-create_client_set_requirements_cb (GeoclueMasterClient *client,
-    GError *error,
-    gpointer userdata)
+setup_geoclue (EmpathyLocationManager *self)
 {
-  EmpathyLocationManager *self = userdata;
-
-  if (error != NULL)
+  switch (self->priv->geoclue_status)
     {
-      DEBUG ("set_requirements failed: %s", error->message);
-      g_error_free (error);
+      case GEOCLUE_NONE:
+        g_assert (self->priv->geoclue == NULL);
+        self->priv->geoclue_status = GEOCLUE_STARTING;
+        empathy_geoclue_helper_new_started_async (0, geoclue_new_cb, self);
+        break;
+      case GEOCLUE_STARTED:
+      case GEOCLUE_STARTING:
+      case GEOCLUE_FAILED:
       return;
     }
-
-  /* Get updated when the position is changes */
-  geoclue_master_client_create_position_async (self->priv->gc_client,
-      create_position_cb, self);
 }
 
 static void
-create_client_cb (GeoclueMaster *master,
-    GeoclueMasterClient *client,
-    char *object_path,
-    GError *error,
-    gpointer userdata)
-{
-  EmpathyLocationManager *self = userdata;
-
-  if (error != NULL)
-    {
-      DEBUG ("Failed to create GeoclueMasterClient: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  /* @client seems be (transfer full) looking at the geoclue code; yeah for
-   * undocumented API... */
-  self->priv->gc_client = client;
-
-  set_requirements (self, create_client_set_requirements_cb);
-}
-
-static void
-setup_geoclue (EmpathyLocationManager *self)
-{
-  GeoclueMaster *master;
-
-  DEBUG ("Setting up Geoclue");
-  master = geoclue_master_get_default ();
-
-  geoclue_master_create_client_async (master, create_client_cb, self);
-
-  g_object_unref (master);
- }
-
-static void
 publish_cb (GSettings *gsettings_loc,
             const gchar *key,
             gpointer user_data)
@@ -578,16 +350,7 @@ publish_cb (GSettings *gsettings_loc,
 
   if (g_settings_get_boolean (gsettings_loc, key))
     {
-      if (!self->priv->geoclue_is_setup)
-        setup_geoclue (self);
-      /* if still not setup than the init failed */
-      if (!self->priv->geoclue_is_setup)
-        return;
-
-      geoclue_address_get_address_async (self->priv->gc_address,
-          initial_address_cb, self);
-      geoclue_position_get_position_async (self->priv->gc_position,
-          initial_position_cb, self);
+      setup_geoclue (self);
     }
   else
     {
@@ -596,54 +359,10 @@ publish_cb (GSettings *gsettings_loc,
        */
       g_hash_table_remove_all (self->priv->location);
       publish_to_all_connections (self, TRUE);
-    }
-
-}
-
-static void
-resource_cb (GSettings *gsettings_loc,
-             const gchar *key,
-             gpointer user_data)
-{
-  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
-  GeoclueResourceFlags resource = 0;
-
-  DEBUG ("%s changed", key);
 
-  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK))
-    resource = GEOCLUE_RESOURCE_NETWORK;
-  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_CELL))
-    resource = GEOCLUE_RESOURCE_CELL;
-  if (!tp_strdiff (key, EMPATHY_PREFS_LOCATION_RESOURCE_GPS))
-    resource = GEOCLUE_RESOURCE_GPS;
-
-  if (g_settings_get_boolean (gsettings_loc, key))
-    self->priv->resources |= resource;
-  else
-    self->priv->resources &= ~resource;
-
-  if (self->priv->geoclue_is_setup)
-    update_resources (self);
-}
-
-static void
-accuracy_cb (GSettings *gsettings_loc,
-             const gchar *key,
-             gpointer user_data)
-{
-  EmpathyLocationManager *self = EMPATHY_LOCATION_MANAGER (user_data);
-
-  DEBUG ("%s changed", key);
-
-  self->priv->reduce_accuracy = g_settings_get_boolean (gsettings_loc, key);
-
-  if (!self->priv->geoclue_is_setup)
-    return;
-
-  geoclue_address_get_address_async (self->priv->gc_address,
-      initial_address_cb, self);
-  geoclue_position_get_position_async (self->priv->gc_position,
-      initial_position_cb, self);
+      g_clear_object (&self->priv->geoclue);
+      self->priv->geoclue_status = GEOCLUE_NONE;
+    }
 }
 
 static void
@@ -681,7 +400,6 @@ empathy_location_manager_init (EmpathyLocationManager *self)
       EMPATHY_TYPE_LOCATION_MANAGER, EmpathyLocationManagerPrivate);
 
   self->priv = priv;
-  priv->geoclue_is_setup = FALSE;
   priv->location = tp_asv_new (NULL, NULL);
   priv->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA);
 
@@ -695,25 +413,7 @@ empathy_location_manager_init (EmpathyLocationManager *self)
   g_signal_connect (priv->gsettings_loc,
       "changed::" EMPATHY_PREFS_LOCATION_PUBLISH,
       G_CALLBACK (publish_cb), self);
-  g_signal_connect (priv->gsettings_loc,
-      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
-      G_CALLBACK (resource_cb), self);
-  g_signal_connect (priv->gsettings_loc,
-      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_CELL,
-      G_CALLBACK (resource_cb), self);
-  g_signal_connect (priv->gsettings_loc,
-      "changed::" EMPATHY_PREFS_LOCATION_RESOURCE_GPS,
-      G_CALLBACK (resource_cb), self);
-  g_signal_connect (priv->gsettings_loc,
-      "changed::" EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
-      G_CALLBACK (accuracy_cb), self);
-
-  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK,
-      self);
-  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_CELL, self);
-  resource_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_RESOURCE_GPS, self);
-  accuracy_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY,
-      self);
+
   publish_cb (priv->gsettings_loc, EMPATHY_PREFS_LOCATION_PUBLISH, self);
 }
 
diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h
index 525e490bb..6ea8b7bf9 100644
--- a/libempathy-gtk/empathy-location-manager.h
+++ b/libempathy-gtk/empathy-location-manager.h
@@ -25,7 +25,6 @@
 
 #include <glib-object.h>
 
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TYPE_LOCATION_MANAGER         (empathy_location_manager_get_type ())
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 471d80c5f..3f897a0d4 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -23,32 +23,31 @@
  */
 
 #include "config.h"
+#include "empathy-log-window.h"
 
 #include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
-
 #include <telepathy-glib/proxy-subclass.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <extensions/extensions.h>
-
-#include <libempathy/action-chain-internal.h>
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-log-window.h"
+#include "action-chain-internal.h"
 #include "empathy-account-chooser.h"
 #include "empathy-call-utils.h"
-#include "empathy-individual-information-dialog.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
 #include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-request-util.h"
 #include "empathy-theme-manager.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 #include "empathy-webkit-utils.h"
-#include "empathy-geometry.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define EMPATHY_NS "http://live.gnome.org/Empathy"
 
@@ -93,7 +92,7 @@ struct _EmpathyLogWindowPriv
   EmpathyContact *selected_contact;
   EmpathyContact *events_contact;
 
-  EmpathyCameraMonitor *camera_monitor;
+  TpawCameraMonitor *camera_monitor;
   GBinding *button_video_binding;
 
   /* Used to cancel logger calls when no longer needed */
@@ -378,7 +377,7 @@ insert_or_change_row (EmpathyLogWindow *self,
       if (icon_info != NULL)
         icon = g_strdup (gtk_icon_info_get_filename (icon_info));
 
-      gtk_icon_info_free (icon_info);
+      g_object_unref (icon_info);
     }
 
   escaped_text = g_string_new (NULL);
@@ -620,7 +619,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
 
   self->priv->chain = _tpl_action_chain_new_async (NULL, NULL, NULL);
 
-  self->priv->camera_monitor = empathy_camera_monitor_dup_singleton ();
+  self->priv->camera_monitor = tpaw_camera_monitor_dup_singleton ();
 
   self->priv->log_manager = tpl_log_manager_dup_singleton ();
 
@@ -633,7 +632,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
   gtk_window_set_default_size (GTK_WINDOW (self), 800, 600);
 
   filename = empathy_file_lookup ("empathy-log-window.ui", "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "vbox1", &self->priv->vbox,
       "toolbutton_profile", &self->priv->button_profile,
       "toolbutton_chat", &self->priv->button_chat,
@@ -651,7 +650,7 @@ empathy_log_window_init (EmpathyLogWindow *self)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "toolbutton_profile", "clicked", toolbutton_profile_clicked,
       "toolbutton_chat", "clicked", toolbutton_chat_clicked,
       "toolbutton_call", "clicked", toolbutton_av_clicked,
@@ -1269,7 +1268,7 @@ log_window_append_chat_message (TplEvent *event,
   GtkTreeIter iter, parent;
   gchar *pretty_date, *alias, *body;
   GDateTime *date;
-  EmpathyStringParser *parsers;
+  TpawStringParser *parsers;
   GString *msg;
 
   date = g_date_time_new_from_unix_local (
@@ -1288,7 +1287,7 @@ log_window_append_chat_message (TplEvent *event,
         EMPATHY_PREFS_CHAT_SHOW_SMILEYS));
   msg = g_string_new ("");
 
-  empathy_string_parser_substr (empathy_message_get_body (message), -1,
+  tpaw_string_parser_substr (empathy_message_get_body (message), -1,
       parsers, msg);
 
   if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event))
@@ -1334,7 +1333,7 @@ log_window_append_call (TplEvent *event,
   GTimeSpan span;
 
   /* If searching, only add the call if the search string appears anywhere */
-  if (!EMP_STR_EMPTY (log_window->priv->last_find))
+  if (!TPAW_STR_EMPTY (log_window->priv->last_find))
     {
       if (strstr (tpl_entity_get_identifier (tpl_event_get_sender (event)),
               log_window->priv->last_find) == NULL &&
@@ -1878,7 +1877,7 @@ add_event_to_store (EmpathyLogWindow *self,
   gtk_list_store_insert_with_values (store, NULL, -1,
       COL_WHO_TYPE, COL_TYPE_NORMAL,
       COL_WHO_ICON, room ? EMPATHY_IMAGE_GROUP_MESSAGE
-                         : EMPATHY_IMAGE_AVATAR_DEFAULT,
+                         : TPAW_IMAGE_AVATAR_DEFAULT,
       COL_WHO_NAME, name,
       COL_WHO_NAME_SORT_KEY, sort_key,
       COL_WHO_ID, tpl_entity_get_identifier (entity),
@@ -2011,7 +2010,7 @@ log_window_find_populate (EmpathyLogWindow *self,
 
   gtk_list_store_clear (store);
 
-  if (EMP_STR_EMPTY (search_criteria))
+  if (TPAW_STR_EMPTY (search_criteria))
     {
       tp_clear_pointer (&self->priv->hits, tpl_log_manager_search_free);
       webkit_web_view_set_highlight_text_matches (
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index f8f76905a..48554fc3e 100644
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,6 +25,7 @@
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 
+#include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-log-window.ui b/libempathy-gtk/empathy-log-window.ui
index d6b9f1bc5..d49099e47 100644
--- a/libempathy-gtk/empathy-log-window.ui
+++ b/libempathy-gtk/empathy-log-window.ui
@@ -46,7 +46,7 @@
                 <property name="can_focus">False</property>
                 <child>
                   <object class="GtkImageMenuItem" id="imagemenuitem_delete">
-                    <property name="label" translatable="yes">Delete All History...</property>
+                    <property name="label" translatable="yes">Delete All History…</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="use_action_appearance">False</property>
@@ -335,7 +335,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">&lt;span size="x-large"&gt;Loading...&lt;/span&gt;</property>
+                    <property name="label" translatable="yes">&lt;span size="x-large"&gt;Loading…&lt;/span&gt;</property>
                     <property name="use_markup">True</property>
                   </object>
                   <packing>
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index c36cfcfce..1d87e21ef 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -21,12 +21,12 @@
 #include "empathy-new-account-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-protocol-chooser.h"
 
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
     GTK_TYPE_DIALOG)
@@ -34,15 +34,15 @@ G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
 struct _EmpathyNewAccountDialogPrivate
 {
   GtkWidget *chooser;
-  EmpathyAccountWidget *current_account_widget;
+  TpawAccountWidget *current_account_widget;
   GtkWidget *main_vbox;
   GtkWidget *connect_button;
 
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
 };
 
 static void
-close_cb (EmpathyAccountWidget *widget,
+close_cb (TpawAccountWidget *widget,
     GtkResponseType response,
     EmpathyNewAccountDialog *self)
 {
@@ -53,8 +53,8 @@ static void
 protocol_changed_cb (GtkComboBox *chooser,
     EmpathyNewAccountDialog *self)
 {
-  EmpathyAccountSettings *settings;
-  EmpathyAccountWidget *account_widget;
+  TpawAccountSettings *settings;
+  TpawAccountWidget *account_widget;
   gchar *password = NULL, *account = NULL;
 
   settings = empathy_protocol_chooser_create_account_settings (
@@ -66,16 +66,17 @@ protocol_changed_cb (GtkComboBox *chooser,
   /* Save "account" and "password" parameters */
   if (self->priv->settings != NULL)
     {
-      account = empathy_account_settings_dup_string (
+      account = tpaw_account_settings_dup_string (
             self->priv->settings, "account");
 
-      password = empathy_account_settings_dup_string (
+      password = tpaw_account_settings_dup_string (
             self->priv->settings, "password");
 
       g_object_unref (self->priv->settings);
     }
 
-  account_widget = empathy_account_widget_new_for_protocol (settings, TRUE);
+  account_widget = tpaw_account_widget_new_for_protocol (settings,
+      NULL, TRUE);
 
   if (self->priv->current_account_widget != NULL)
     {
@@ -95,13 +96,13 @@ protocol_changed_cb (GtkComboBox *chooser,
   /* Restore "account" and "password" parameters in the new widget */
   if (account != NULL)
     {
-      empathy_account_widget_set_account_param (account_widget, account);
+      tpaw_account_widget_set_account_param (account_widget, account);
       g_free (account);
     }
 
   if (password != NULL)
     {
-      empathy_account_widget_set_password_param (account_widget, password);
+      tpaw_account_widget_set_password_param (account_widget, password);
       g_free (password);
     }
 
@@ -148,7 +149,7 @@ empathy_new_account_dialog_init (EmpathyNewAccountDialog *self)
   /* trigger show the first account widget */
   protocol_changed_cb (GTK_COMBO_BOX (self->priv->chooser), self);
 
-  gtk_window_set_title (GTK_WINDOW (self), _("Adding new account"));
+  gtk_window_set_title (GTK_WINDOW (self), _("Add new account"));
 }
 
 static void
@@ -190,7 +191,7 @@ empathy_new_account_dialog_new (GtkWindow *parent)
   return result;
 }
 
-EmpathyAccountSettings *
+TpawAccountSettings *
 empathy_new_account_dialog_get_settings (EmpathyNewAccountDialog *self)
 {
   return self->priv->settings;
diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index 07fc22f98..1fa6b43f8 100644
--- a/libempathy-gtk/empathy-new-account-dialog.h
+++ b/libempathy-gtk/empathy-new-account-dialog.h
@@ -21,8 +21,7 @@
 #define ___EMPATHY_NEW_ACCOUNT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
-#include <libempathy/empathy-account-settings.h>
+#include <tp-account-widgets/tpaw-account-settings.h>
 
 G_BEGIN_DECLS
 
@@ -51,7 +50,7 @@ GType empathy_new_account_dialog_get_type (void) G_GNUC_CONST;
 
 GtkWidget * empathy_new_account_dialog_new (GtkWindow *parent);
 
-EmpathyAccountSettings * empathy_new_account_dialog_get_settings (
+TpawAccountSettings * empathy_new_account_dialog_get_settings (
     EmpathyNewAccountDialog *self);
 
 G_END_DECLS
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index d770d6d98..d96d0bb5b 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -19,21 +19,19 @@
  */
 
 #include "config.h"
+#include "empathy-new-call-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-call-utils.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-call-dialog.h"
-#include "empathy-call-utils.h"
+#include "empathy-debug.h"
 
 static EmpathyNewCallDialog *dialog_singleton = NULL;
 
@@ -45,7 +43,7 @@ struct _EmpathyNewCallDialogPriv {
   GtkWidget *button_audio;
   GtkWidget *button_video;
 
-  EmpathyCameraMonitor *monitor;
+  TpawCameraMonitor *monitor;
 };
 
 /* Re-use the accept and ok Gtk response so we are sure they won't be used
@@ -184,7 +182,7 @@ empathy_new_call_dialog_init (EmpathyNewCallDialog *self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_NEW_CALL_DIALOG, EmpathyNewCallDialogPriv);
 
-  self->priv->monitor = empathy_camera_monitor_dup_singleton ();
+  self->priv->monitor = tpaw_camera_monitor_dup_singleton ();
 
   content = gtk_dialog_get_content_area (GTK_DIALOG (self));
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h
index d3f05e64e..e7413568c 100644
--- a/libempathy-gtk/empathy-new-call-dialog.h
+++ b/libempathy-gtk/empathy-new-call-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_CALL_DIALOG_H__
 #define __EMPATHY_NEW_CALL_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index c38a1c75b..366147259 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -19,19 +19,17 @@
  */
 
 #include "config.h"
+#include "empathy-new-message-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-request-util.h>
+#include "empathy-request-util.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
-
-#include "empathy-new-message-dialog.h"
+#include "empathy-debug.h"
 
 static EmpathyNewMessageDialog *dialog_singleton = NULL;
 
diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index 390101a2b..5adc4cf9e 100644
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index d142b7fa3..8ca97950e 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,18 +18,17 @@
  */
 
 #include "config.h"
+#include "empathy-notify-manager.h"
 
 #include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-gsettings.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-notify-manager.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
 
@@ -176,7 +175,7 @@ empathy_notify_manager_get_pixbuf_for_notification (EmpathyNotifyManager *self,
     pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact, 48, 48);
 
   if (pixbuf == NULL)
-    pixbuf = empathy_pixbuf_from_icon_name_sized (icon_name, 48);
+    pixbuf = tpaw_pixbuf_from_icon_name_sized (icon_name, 48);
 
   return pixbuf;
 }
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index 923ab4a54..7c2fa8c4a 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -21,12 +21,10 @@
 #ifndef __EMPATHY_NOTIFY_MANAGER_H__
 #define __EMPATHY_NOTIFY_MANAGER_H__
 
-#include <glib-object.h>
-
-#include <libempathy/empathy-contact.h>
-
 #include <libnotify/notification.h>
 
+#include "empathy-contact.h"
+
 G_BEGIN_DECLS
 
 #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS             "actions"
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index 07fb69fc0..c88bf5678 100644
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-password-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
@@ -130,6 +129,8 @@ empathy_password_dialog_constructed (GObject *object)
       G_CALLBACK (password_dialog_handler_invalidated_cb),
       object, 0);
 
+  gtk_window_set_title (GTK_WINDOW (self), _("Password Required"));
+
   text = g_strdup_printf (_("Enter your password for account\n<b>%s</b>"),
       tp_account_get_display_name (base->account));
   gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (self), text);
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index ee1c993b4..1b19375a3 100644
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -20,12 +20,10 @@
 #ifndef __EMPATHY_PASSWORD_DIALOG_H__
 #define __EMPATHY_PASSWORD_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-server-sasl-handler.h>
-
-#include <libempathy-gtk/empathy-base-password-dialog.h>
+#include "empathy-base-password-dialog.h"
+#include "empathy-server-sasl-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index ddaa97b7f..e1113a073 100644
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -19,13 +19,12 @@
  */
 
 #include "config.h"
+#include "empathy-plist.h"
 
 #include <string.h>
 #include <libxml/tree.h>
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "empathy-plist.h"
-
 static GValue *empathy_plist_parse_node (xmlNode *a_node);
 
 static GValue *
diff --git a/libempathy-gtk/empathy-plist.h b/libempathy-gtk/empathy-plist.h
index a15ad6a01..216896b42 100644
--- a/libempathy-gtk/empathy-plist.h
+++ b/libempathy-gtk/empathy-plist.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_PLIST_H__
 #define __EMPATHY_PLIST_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index a047890bb..6ff113d2d 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -25,15 +25,17 @@
  */
 
 #include "config.h"
+#include "empathy-presence-chooser.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-status-presets.h>
+#include "empathy-presence-manager.h"
+#include "empathy-status-presets.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-presence-chooser.h"
@@ -271,7 +273,7 @@ get_state_and_status (EmpathyPresenceChooser *self,
 
 	state = tp_account_manager_get_most_available_presence (
 		priv->account_manager, NULL, &tmp);
-	if (EMP_STR_EMPTY (tmp)) {
+	if (TPAW_STR_EMPTY (tmp)) {
 		/* no message, use the default message */
 		g_free (tmp);
 		tmp = g_strdup (empathy_presence_get_default_message (state));
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index d5b0de7c1..837f89068 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -21,17 +21,18 @@
  */
 
 #include "config.h"
+#include "empathy-protocol-chooser.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-connection-managers.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-
-#include "empathy-protocol-chooser.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-protocol-chooser
@@ -57,259 +58,60 @@ typedef struct
   GtkListStore *store;
 
   gboolean dispose_run;
-  EmpathyConnectionManagers *cms;
 
   EmpathyProtocolChooserFilterFunc filter_func;
   gpointer filter_user_data;
-
-  GHashTable *protocols;
 } EmpathyProtocolChooserPriv;
 
 enum
 {
   COL_ICON,
   COL_LABEL,
-  COL_CM,
-  COL_PROTOCOL_NAME,
-  COL_SERVICE,
+  COL_PROTOCOL,
   COL_COUNT
 };
 
 G_DEFINE_TYPE (EmpathyProtocolChooser, empathy_protocol_chooser,
     GTK_TYPE_COMBO_BOX);
 
-static gint
-protocol_chooser_sort_protocol_value (const gchar *protocol_name)
-{
-  guint i;
-  const gchar *names[] = {
-    "jabber",
-    "local-xmpp",
-    "gtalk",
-    NULL
-  };
-
-  for (i = 0 ; names[i]; i++)
-    {
-      if (strcmp (protocol_name, names[i]) == 0)
-        return i;
-    }
-
-  return i;
-}
-
-static gint
-protocol_chooser_sort_func (GtkTreeModel *model,
-    GtkTreeIter  *iter_a,
-    GtkTreeIter  *iter_b,
-    gpointer      user_data)
-{
-  gchar *protocol_a;
-  gchar *protocol_b;
-  gint cmp = 0;
-
-  gtk_tree_model_get (model, iter_a,
-      COL_PROTOCOL_NAME, &protocol_a,
-      -1);
-  gtk_tree_model_get (model, iter_b,
-      COL_PROTOCOL_NAME, &protocol_b,
-      -1);
-
-  cmp = protocol_chooser_sort_protocol_value (protocol_a);
-  cmp -= protocol_chooser_sort_protocol_value (protocol_b);
-  if (cmp == 0)
-    {
-      cmp = strcmp (protocol_a, protocol_b);
-      /* only happens for jabber where there is one entry for gtalk and one for
-       * non-gtalk */
-      if (cmp == 0)
-        {
-          gchar *service;
-
-          gtk_tree_model_get (model, iter_a,
-            COL_SERVICE, &service,
-            -1);
-
-          if (service != NULL)
-            cmp = 1;
-          else
-            cmp = -1;
-
-          g_free (service);
-        }
-    }
-
-  g_free (protocol_a);
-  g_free (protocol_b);
-  return cmp;
-}
-
 static void
-protocol_choosers_add_cm (EmpathyProtocolChooser *chooser,
-    TpConnectionManager *cm)
+protocol_chooser_add_protocol (EmpathyProtocolChooser *chooser,
+    TpawProtocol *protocol)
 {
   EmpathyProtocolChooserPriv *priv = GET_PRIV (chooser);
-  GList *protocols, *l;
-  const gchar *cm_name;
-
-  cm_name = tp_connection_manager_get_name (cm);
-
-  protocols = tp_connection_manager_dup_protocols (cm);
-
-  for (l = protocols; l != NULL; l = g_list_next (l))
-    {
-      TpProtocol *protocol = l->data;
-      gchar *icon_name;
-      const gchar *display_name;
-      const gchar *saved_cm_name;
-      const gchar *proto_name;
-      GdkPixbuf *pixbuf;
-
-      proto_name = tp_protocol_get_name (protocol);
-      saved_cm_name = g_hash_table_lookup (priv->protocols, proto_name);
-
-      if (!tp_strdiff (cm_name, "haze") && saved_cm_name != NULL &&
-          tp_strdiff (saved_cm_name, "haze"))
-        /* the CM we're adding is a haze implementation of something we already
-         * have; drop it.
-         */
-        continue;
-
-      if (!tp_strdiff (cm_name, "haze") &&
-          !tp_strdiff (proto_name, "facebook"))
-        /* Facebook now supports XMPP so drop the purple facebook plugin; user
-         * should use Gabble */
-        continue;
-
-      if (!tp_strdiff (cm_name, "haze") &&
-          !tp_strdiff (proto_name, "sip"))
-        /* 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;
-          gboolean valid;
-          TpConnectionManager *haze_cm;
-
-          /* let's this CM replace the haze implementation */
-          valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (priv->store),
-              &titer);
-
-          while (valid)
-            {
-              gchar *haze_proto_name = NULL;
-
-              gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &titer,
-                  COL_PROTOCOL_NAME, &haze_proto_name,
-                  COL_CM, &haze_cm, -1);
-
-              if (haze_cm == NULL)
-                continue;
-
-              if (!tp_strdiff (tp_connection_manager_get_name (haze_cm), "haze")
-                  && !tp_strdiff (haze_proto_name, proto_name))
-                {
-                  gtk_list_store_remove (priv->store, &titer);
-                  g_object_unref (haze_cm);
-                  g_free (haze_proto_name);
-                  break;
-                }
-
-              g_object_unref (haze_cm);
-              g_free (haze_proto_name);
-              valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (priv->store),
-                  &titer);
-            }
-        }
-
-      g_hash_table_insert (priv->protocols,
-          g_strdup (proto_name), g_strdup (cm_name));
-
-      icon_name = empathy_protocol_icon_name (proto_name);
-      pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
-
-      display_name = empathy_protocol_name_to_display_name (proto_name);
-
-      gtk_list_store_insert_with_values (priv->store,
-          NULL, 0,
-          COL_ICON, pixbuf,
-          COL_LABEL, display_name,
-          COL_CM, cm,
-          COL_PROTOCOL_NAME, proto_name,
-          -1);
-
-      g_clear_object (&pixbuf);
-
-      if (!tp_strdiff (proto_name, "jabber") &&
-          !tp_strdiff (cm_name, "gabble"))
-        {
-          display_name = empathy_service_name_to_display_name ("google-talk");
-          pixbuf = empathy_pixbuf_from_icon_name ("im-google-talk",
-                  GTK_ICON_SIZE_BUTTON);
-
-          gtk_list_store_insert_with_values (priv->store,
-             NULL, 0,
-             COL_ICON, pixbuf,
-             COL_LABEL, display_name,
-             COL_CM, cm,
-             COL_PROTOCOL_NAME, proto_name,
-             COL_SERVICE, "google-talk",
-             -1);
-
-          g_clear_object (&pixbuf);
-
-          display_name = empathy_service_name_to_display_name ("facebook");
-          pixbuf = empathy_pixbuf_from_icon_name ("im-facebook",
-                  GTK_ICON_SIZE_BUTTON);
-
-          gtk_list_store_insert_with_values (priv->store,
-             NULL, 0,
-             COL_ICON, pixbuf,
-             COL_LABEL, display_name,
-             COL_CM, cm,
-             COL_PROTOCOL_NAME, proto_name,
-             COL_SERVICE, "facebook",
-             -1);
-
-          g_clear_object (&pixbuf);
-        }
-
-      g_free (icon_name);
-    }
-
-  g_list_free_full (protocols, g_object_unref);
-}
+  GdkPixbuf *pixbuf;
 
-static void
-protocol_chooser_add_cms_list (EmpathyProtocolChooser *protocol_chooser,
-    GList *cms)
-{
-  GList *l;
+  pixbuf = tpaw_pixbuf_from_icon_name (tpaw_protocol_get_icon_name (protocol),
+      GTK_ICON_SIZE_BUTTON);
 
-  for (l = cms; l != NULL; l = l->next)
-    protocol_choosers_add_cm (protocol_chooser, l->data);
+  gtk_list_store_insert_with_values (priv->store,
+      NULL, -1,
+      COL_ICON, pixbuf,
+      COL_LABEL, tpaw_protocol_get_display_name (protocol),
+      COL_PROTOCOL, protocol,
+      -1);
 
-  gtk_combo_box_set_active (GTK_COMBO_BOX (protocol_chooser), 0);
+  g_clear_object (&pixbuf);
 }
 
 static void
-protocol_chooser_cms_prepare_cb (GObject *source,
+protocol_chooser_get_protocols_cb (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
 {
-  EmpathyConnectionManagers *cms = EMPATHY_CONNECTION_MANAGERS (source);
   EmpathyProtocolChooser *protocol_chooser = user_data;
+  GList *protocols = NULL;
+  GList *l;
 
-  if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
+  if (!tpaw_protocol_get_all_finish(&protocols, result, NULL))
     return;
 
-  protocol_chooser_add_cms_list (protocol_chooser,
-      empathy_connection_managers_get_cms (cms));
+  for (l = protocols; l != NULL; l = l->next)
+    protocol_chooser_add_protocol (protocol_chooser, l->data);
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (protocol_chooser), 0);
+
+  g_list_free_full (protocols, g_object_unref);
 }
 
 static void
@@ -326,18 +128,7 @@ protocol_chooser_constructed (GObject *object)
   priv->store = gtk_list_store_new (COL_COUNT,
           GDK_TYPE_PIXBUF,  /* Icon */
           G_TYPE_STRING,    /* Label     */
-          G_TYPE_OBJECT,    /* CM */
-          G_TYPE_STRING,    /* protocol name  */
-          G_TYPE_STRING);   /* service */
-
-  /* Set the protocol sort function */
-  gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (priv->store),
-      COL_PROTOCOL_NAME,
-      protocol_chooser_sort_func,
-      NULL, NULL);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (priv->store),
-      COL_PROTOCOL_NAME,
-      GTK_SORT_ASCENDING);
+          G_TYPE_OBJECT);   /* protocol */
 
   gtk_combo_box_set_model (GTK_COMBO_BOX (object),
       GTK_TREE_MODEL (priv->store));
@@ -354,8 +145,7 @@ protocol_chooser_constructed (GObject *object)
       "text", COL_LABEL,
       NULL);
 
-  empathy_connection_managers_prepare_async (priv->cms,
-      protocol_chooser_cms_prepare_cb, protocol_chooser);
+  tpaw_protocol_get_all_async (protocol_chooser_get_protocols_cb, protocol_chooser);
 
   if (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->constructed)
     G_OBJECT_CLASS
@@ -370,29 +160,10 @@ empathy_protocol_chooser_init (EmpathyProtocolChooser *protocol_chooser)
         EMPATHY_TYPE_PROTOCOL_CHOOSER, EmpathyProtocolChooserPriv);
 
   priv->dispose_run = FALSE;
-  priv->cms = empathy_connection_managers_dup_singleton ();
-  priv->protocols = g_hash_table_new_full (g_str_hash, g_str_equal,
-      g_free, g_free);
-
   protocol_chooser->priv = priv;
 }
 
 static void
-protocol_chooser_finalize (GObject *object)
-{
-  EmpathyProtocolChooser *protocol_chooser = EMPATHY_PROTOCOL_CHOOSER (object);
-  EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
-
-  if (priv->protocols)
-    {
-      g_hash_table_unref (priv->protocols);
-      priv->protocols = NULL;
-    }
-
-  (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->finalize) (object);
-}
-
-static void
 protocol_chooser_dispose (GObject *object)
 {
   EmpathyProtocolChooser *protocol_chooser = EMPATHY_PROTOCOL_CHOOSER (object);
@@ -409,12 +180,6 @@ protocol_chooser_dispose (GObject *object)
       priv->store = NULL;
     }
 
-  if (priv->cms)
-    {
-      g_object_unref (priv->cms);
-      priv->cms = NULL;
-    }
-
   (G_OBJECT_CLASS (empathy_protocol_chooser_parent_class)->dispose) (object);
 }
 
@@ -425,7 +190,6 @@ empathy_protocol_chooser_class_init (EmpathyProtocolChooserClass *klass)
 
   object_class->constructed = protocol_chooser_constructed;
   object_class->dispose = protocol_chooser_dispose;
-  object_class->finalize = protocol_chooser_finalize;
 
   g_type_class_add_private (object_class, sizeof (EmpathyProtocolChooserPriv));
 }
@@ -437,57 +201,46 @@ protocol_chooser_filter_visible_func (GtkTreeModel *model,
 {
   EmpathyProtocolChooser *protocol_chooser = user_data;
   EmpathyProtocolChooserPriv *priv = GET_PRIV (protocol_chooser);
-  TpConnectionManager *cm = NULL;
-  gchar *protocol_name = NULL;
+  TpawProtocol *protocol;
+  TpProtocol *tp_protocol;
   gboolean visible = FALSE;
-  gchar *service;
 
   gtk_tree_model_get (model, iter,
-      COL_CM, &cm,
-      COL_PROTOCOL_NAME, &protocol_name,
-      COL_SERVICE, &service,
+      COL_PROTOCOL, &protocol,
       -1);
 
-  if (cm != NULL && protocol_name != NULL)
-    {
-      TpProtocol *protocol;
-
-      protocol = tp_connection_manager_get_protocol_object (cm, protocol_name);
+  tp_protocol = tp_connection_manager_get_protocol_object (
+      tpaw_protocol_get_cm (protocol),
+      tpaw_protocol_get_protocol_name (protocol));
 
-      if (protocol != NULL)
-        {
-          visible = priv->filter_func (cm, protocol, service,
-              priv->filter_user_data);
-        }
+  if (tp_protocol != NULL)
+    {
+      visible = priv->filter_func (tpaw_protocol_get_cm (protocol),
+          tp_protocol, tpaw_protocol_get_service_name (protocol),
+          priv->filter_user_data);
     }
 
-  if (cm != NULL)
-    g_object_unref (cm);
-
-  g_free (service);
   return visible;
 }
 
 /* public methods */
 
 /**
- * empathy_protocol_chooser_get_selected_protocol:
+ * empathy_protocol_chooser_dup_selected:
  * @protocol_chooser: an #EmpathyProtocolChooser
  *
- * Returns a pointer to the selected #TpConnectionManagerProtocol in
+ * Returns a pointer to the selected #TpawProtocol in
  * @protocol_chooser.
  *
- * Return value: a pointer to the selected #TpConnectionManagerProtocol
+ * Return value: a pointer to the selected #TpawProtocol
  */
-TpConnectionManager *
+TpawProtocol *
 empathy_protocol_chooser_dup_selected (
-    EmpathyProtocolChooser *protocol_chooser,
-    TpProtocol **protocol,
-    gchar **service)
+    EmpathyProtocolChooser *protocol_chooser)
 {
   GtkTreeIter iter;
-  TpConnectionManager *cm = NULL;
   GtkTreeModel *cur_model;
+  TpawProtocol *protocol = NULL;
 
   g_return_val_if_fail (EMPATHY_IS_PROTOCOL_CHOOSER (protocol_chooser), NULL);
 
@@ -499,40 +252,11 @@ empathy_protocol_chooser_dup_selected (
   if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (protocol_chooser), &iter))
     {
       gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
-          COL_CM, &cm,
+          COL_PROTOCOL, &protocol,
           -1);
-
-      if (protocol != NULL)
-        {
-          gchar *protocol_name = NULL;
-
-          gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
-              COL_PROTOCOL_NAME, &protocol_name,
-              -1);
-
-          *protocol = tp_connection_manager_get_protocol_object (cm,
-              protocol_name);
-
-          g_free (protocol_name);
-
-          if (*protocol == NULL)
-            {
-              /* For some reason the CM doesn't know about this protocol
-               * any more */
-              g_object_unref (cm);
-              return NULL;
-            }
-        }
-
-      if (service != NULL)
-        {
-          gtk_tree_model_get (GTK_TREE_MODEL (cur_model), &iter,
-              COL_SERVICE, service,
-              -1);
-        }
     }
 
-  return cm;
+  return protocol;
 }
 
 /**
@@ -577,84 +301,19 @@ empathy_protocol_chooser_set_visible (EmpathyProtocolChooser *protocol_chooser,
   gtk_combo_box_set_active (GTK_COMBO_BOX (protocol_chooser), 0);
 }
 
-EmpathyAccountSettings *
+TpawAccountSettings *
 empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
 {
-  EmpathyAccountSettings *settings = NULL;
-  gchar *str;
-  const gchar *display_name;
-  TpConnectionManager *cm;
-  TpProtocol *proto;
-  gchar *service = NULL;
-
-  cm = empathy_protocol_chooser_dup_selected (self, &proto, &service);
-  if (cm == NULL || proto == NULL)
-    goto out;
-
-  if (service != NULL)
-    display_name = empathy_service_name_to_display_name (service);
-  else
-    display_name = empathy_protocol_name_to_display_name (
-        tp_protocol_get_name (proto));
-
-  /* Create account */
-  /* To translator: %s is the name of the protocol, such as "Google Talk" or
-   * "Yahoo!"
-   */
-  str = g_strdup_printf (_("New %s account"), display_name);
+  TpawProtocol *protocol;
+  TpawAccountSettings *settings;
 
-  settings = empathy_account_settings_new (tp_connection_manager_get_name (cm),
-      tp_protocol_get_name (proto), service, str);
+  protocol = empathy_protocol_chooser_dup_selected (self);
+  if (protocol == NULL)
+    return NULL;
 
-  g_free (str);
+  settings = tpaw_protocol_create_account_settings (protocol);
 
-  if (!tp_strdiff (service, "google-talk"))
-    {
-      const gchar *fallback_servers[] = {
-          "talkx.l.google.com",
-          "talkx.l.google.com:443,oldssl",
-          "talkx.l.google.com:80",
-          NULL};
-
-      const gchar *extra_certificate_identities[] = {
-          "talk.google.com",
-          NULL};
-
-      empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
-          NULL, NULL);
-      empathy_account_settings_set (settings, "server",
-          g_variant_new_string (extra_certificate_identities[0]));
-      empathy_account_settings_set (settings, "require-encryption",
-          g_variant_new_boolean (TRUE));
-      empathy_account_settings_set (settings, "fallback-servers",
-          g_variant_new_strv (fallback_servers, -1));
-
-      if (empathy_account_settings_have_tp_param (settings,
-              "extra-certificate-identities"))
-        {
-          empathy_account_settings_set (settings,
-              "extra-certificate-identities",
-              g_variant_new_strv (extra_certificate_identities, -1));
-        }
-    }
-  else if (!tp_strdiff (service, "facebook"))
-    {
-      const gchar *fallback_servers[] = {
-          "chat.facebook.com:443",
-          NULL };
-
-      empathy_account_settings_set_icon_name_async (settings, "im-facebook",
-          NULL, NULL);
-      empathy_account_settings_set (settings, "require-encryption",
-          g_variant_new_boolean (TRUE));
-      empathy_account_settings_set (settings, "server",
-          g_variant_new_string ("chat.facebook.com"));
-      empathy_account_settings_set (settings, "fallback-servers",
-          g_variant_new_strv (fallback_servers, -1));
-    }
+  tp_clear_object (&protocol);
 
-out:
-  tp_clear_object (&cm);
-  g_free (service);
   return settings;
 }
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index eeaab60c0..7797afc5c 100644
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -23,12 +23,10 @@
 #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__
 #define __EMPATHY_PROTOCOL_CHOOSER_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-account-settings.h>
+#include <tp-account-widgets/tpaw-account-settings.h>
+#include <tp-account-widgets/tpaw-protocol.h>
 
 G_BEGIN_DECLS
 
@@ -67,17 +65,15 @@ typedef gboolean (*EmpathyProtocolChooserFilterFunc) (TpConnectionManager *cm,
 
 GType empathy_protocol_chooser_get_type (void) G_GNUC_CONST;
 GtkWidget * empathy_protocol_chooser_new (void);
-TpConnectionManager *empathy_protocol_chooser_dup_selected (
-    EmpathyProtocolChooser *protocol_chooser,
-    TpProtocol **protocol,
-    gchar **service);
+TpawProtocol *empathy_protocol_chooser_dup_selected (
+    EmpathyProtocolChooser *protocol_chooser);
 
 void empathy_protocol_chooser_set_visible (
     EmpathyProtocolChooser *protocol_chooser,
     EmpathyProtocolChooserFilterFunc func,
     gpointer user_data);
 
-EmpathyAccountSettings * empathy_protocol_chooser_create_account_settings (
+TpawAccountSettings * empathy_protocol_chooser_create_account_settings (
     EmpathyProtocolChooser *self);
 
 G_END_DECLS
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index d8410b5e6..df57a87fb 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,15 +1,14 @@
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-roster-contact.h"
 
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
+G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_LIST_BOX_ROW)
 
 #define AVATAR_SIZE 48
 
@@ -126,8 +125,8 @@ avatar_loaded_cb (GObject *source,
 
   if (pixbuf == NULL)
     {
-      pixbuf = empathy_pixbuf_from_icon_name_sized (
-          EMPATHY_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE);
+      pixbuf = tpaw_pixbuf_from_icon_name_sized (
+          TPAW_IMAGE_AVATAR_DEFAULT, AVATAR_SIZE);
     }
 
   gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->avatar), pixbuf);
@@ -392,12 +391,16 @@ empathy_roster_contact_class_init (
 static void
 empathy_roster_contact_init (EmpathyRosterContact *self)
 {
-  GtkWidget *main_box, *box, *first_line_box;
+  GtkWidget *alig, *main_box, *box, *first_line_box;
   GtkStyleContext *context;
 
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       EMPATHY_TYPE_ROSTER_CONTACT, EmpathyRosterContactPriv);
 
+  alig = gtk_alignment_new (0.5, 0.5, 1, 1);
+  gtk_widget_show (alig);
+  gtk_alignment_set_padding (GTK_ALIGNMENT (alig), 4, 4, 4, 12);
+
   main_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 
   /* Avatar */
@@ -455,7 +458,8 @@ empathy_roster_contact_init (EmpathyRosterContact *self)
       FALSE, FALSE, 0);
   gtk_widget_show (self->priv->presence_icon);
 
-  gtk_container_add (GTK_CONTAINER (self), main_box);
+  gtk_container_add (GTK_CONTAINER (self), alig);
+  gtk_container_add (GTK_CONTAINER (alig), main_box);
   gtk_widget_show (main_box);
 }
 
@@ -468,10 +472,6 @@ empathy_roster_contact_new (FolksIndividual *individual,
   return g_object_new (EMPATHY_TYPE_ROSTER_CONTACT,
       "individual", individual,
       "group", group,
-      "bottom-padding", 4,
-      "top-padding", 4,
-      "left-padding", 4,
-      "right-padding", 12,
       NULL);
 }
 
diff --git a/libempathy-gtk/empathy-roster-contact.h b/libempathy-gtk/empathy-roster-contact.h
index 7b87e76d4..6e05959f7 100644
--- a/libempathy-gtk/empathy-roster-contact.h
+++ b/libempathy-gtk/empathy-roster-contact.h
@@ -13,13 +13,13 @@ typedef struct _EmpathyRosterContactPriv EmpathyRosterContactPriv;
 struct _EmpathyRosterContactClass
 {
   /*<private>*/
-  GtkAlignmentClass parent_class;
+  GtkListBoxRowClass parent_class;
 };
 
 struct _EmpathyRosterContact
 {
   /*<private>*/
-  GtkAlignment parent;
+  GtkListBoxRow parent;
   EmpathyRosterContactPriv *priv;
 };
 
diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c
index 643fed526..753655ab5 100644
--- a/libempathy-gtk/empathy-roster-group.c
+++ b/libempathy-gtk/empathy-roster-group.c
@@ -1,10 +1,9 @@
 #include "config.h"
-
 #include "empathy-roster-group.h"
 
 #include <telepathy-glib/telepathy-glib.h>
 
-G_DEFINE_TYPE (EmpathyRosterGroup, empathy_roster_group, GTK_TYPE_EXPANDER)
+G_DEFINE_TYPE (EmpathyRosterGroup, empathy_roster_group, GTK_TYPE_LIST_BOX_ROW)
 
 enum
 {
@@ -117,7 +116,7 @@ empathy_roster_group_constructed (GObject *object)
 
   gtk_widget_show_all (box);
 
-  gtk_expander_set_label_widget (GTK_EXPANDER (self), box);
+  gtk_expander_set_label_widget (self->expander, box);
 }
 
 static void
@@ -182,6 +181,13 @@ empathy_roster_group_init (EmpathyRosterGroup *self)
       EMPATHY_TYPE_ROSTER_GROUP, EmpathyRosterGroupPriv);
 
   self->priv->widgets = g_hash_table_new (NULL, NULL);
+
+  self->expander = GTK_EXPANDER (gtk_expander_new (NULL));
+  gtk_expander_set_use_markup (self->expander, TRUE);
+  gtk_expander_set_expanded (self->expander, TRUE);
+  gtk_widget_show (GTK_WIDGET (self->expander));
+
+  gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->expander));
 }
 
 GtkWidget *
@@ -191,8 +197,6 @@ empathy_roster_group_new (const gchar *name,
   return g_object_new (EMPATHY_TYPE_ROSTER_GROUP,
       "name", name,
       "icon", icon,
-      "use-markup", TRUE,
-      "expanded", TRUE,
       NULL);
 }
 
diff --git a/libempathy-gtk/empathy-roster-group.h b/libempathy-gtk/empathy-roster-group.h
index 405455bf5..d5ad70e57 100644
--- a/libempathy-gtk/empathy-roster-group.h
+++ b/libempathy-gtk/empathy-roster-group.h
@@ -12,14 +12,17 @@ typedef struct _EmpathyRosterGroupPriv EmpathyRosterGroupPriv;
 struct _EmpathyRosterGroupClass
 {
   /*<private>*/
-  GtkExpanderClass parent_class;
+  GtkListBoxRowClass parent_class;
 };
 
 struct _EmpathyRosterGroup
 {
   /*<private>*/
-  GtkExpander parent;
+  GtkListBoxRow parent;
   EmpathyRosterGroupPriv *priv;
+
+  /*<public>*/
+  GtkExpander *expander;
 };
 
 GType empathy_roster_group_get_type (void);
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index a81b2c254..b82fd1620 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.c
+++ b/libempathy-gtk/empathy-roster-model-aggregator.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
+#include "empathy-roster-model-aggregator.h"
 
 #include <folks/folks-telepathy.h>
 
-#include "empathy-roster-model-aggregator.h"
-
 /**
  * SECTION: empathy-roster-model-aggregator
  * @title: EmpathyRosterModelAggregator
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h
index e29e36eb0..3b9c0202b 100644
--- a/libempathy-gtk/empathy-roster-model-aggregator.h
+++ b/libempathy-gtk/empathy-roster-model-aggregator.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <folks/folks.h>
 
 #include "empathy-roster-model.h"
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 859edb7a9..e0fff03e9 100644
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -22,14 +22,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-roster-model-manager.h"
 
-#include "empathy-roster-model.h"
-
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
+#include "empathy-roster-model.h"
+#include "empathy-utils.h"
 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
 
diff --git a/libempathy-gtk/empathy-roster-model-manager.h b/libempathy-gtk/empathy-roster-model-manager.h
index f7ce1f4e5..a38e6593a 100644
--- a/libempathy-gtk/empathy-roster-model-manager.h
+++ b/libempathy-gtk/empathy-roster-model-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <libempathy/empathy-individual-manager.h>
+#include "empathy-individual-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c
index 3fd84b7fc..994ab9896 100644
--- a/libempathy-gtk/empathy-roster-model.c
+++ b/libempathy-gtk/empathy-roster-model.c
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include "config.h"
-
 #include "empathy-roster-model.h"
 
 G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT)
diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 27c5482f3..1b35f1a1c 100644
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -20,8 +20,6 @@
 #ifndef __EMPATHY_ROSTER_MODEL_H__
 #define __EMPATHY_ROSTER_MODEL_H__
 
-#include <glib-object.h>
-
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index ed57be3d4..e3d8c7a6e 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -1,16 +1,14 @@
 #include "config.h"
-
 #include "empathy-roster-view.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-contact-groups.h>
-
-#include <libempathy-gtk/empathy-roster-contact.h>
-#include <libempathy-gtk/empathy-roster-group.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-contact-groups.h"
+#include "empathy-roster-contact.h"
+#include "empathy-roster-group.h"
+#include "empathy-ui-utils.h"
 
-G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
+G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, GTK_TYPE_LIST_BOX)
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
@@ -69,11 +67,16 @@ struct _EmpathyRosterViewPriv
   gboolean show_groups;
   gboolean empty;
 
-  EmpathyLiveSearch *search;
+  TpawLiveSearch *search;
 
   EmpathyRosterModel *model;
 };
 
+/* Prototypes to break cycles */
+static void remove_from_group (EmpathyRosterView *self,
+    FolksIndividual *individual,
+    const gchar *group);
+
 typedef struct
 {
   guint id;
@@ -162,11 +165,11 @@ empathy_roster_view_set_property (GObject *object,
 }
 
 static void
-roster_contact_changed_cb (GtkWidget *child,
+roster_contact_changed_cb (GtkListBoxRow *child,
     GParamSpec *spec,
     EmpathyRosterView *self)
 {
-  egg_list_box_child_changed (EGG_LIST_BOX (self), child);
+  gtk_list_box_row_changed (child);
 }
 
 static GtkWidget *
@@ -202,13 +205,13 @@ group_expanded_cb (EmpathyRosterGroup *group,
   widgets = empathy_roster_group_get_widgets (group);
   for (l = widgets; l != NULL; l = g_list_next (l))
     {
-      egg_list_box_child_changed (EGG_LIST_BOX (self), l->data);
+      gtk_list_box_row_changed (l->data);
     }
 
   g_list_free (widgets);
 
   empathy_contact_group_set_expanded (empathy_roster_group_get_name (group),
-      gtk_expander_get_expanded (GTK_EXPANDER (group)));
+      gtk_expander_get_expanded (group->expander));
 }
 
 static EmpathyRosterGroup *
@@ -235,7 +238,7 @@ ensure_roster_group (EmpathyRosterView *self,
   else
     roster_group = empathy_roster_group_new (group, NULL);
 
-  gtk_expander_set_expanded (GTK_EXPANDER (roster_group),
+  gtk_expander_set_expanded (EMPATHY_ROSTER_GROUP (roster_group)->expander,
       empathy_contact_group_get_expanded (group));
 
   g_signal_connect (roster_group, "notify::expanded",
@@ -314,7 +317,7 @@ update_group_widgets (EmpathyRosterView *self,
 
   if (count != old_count)
     {
-      egg_list_box_child_changed (EGG_LIST_BOX (self), GTK_WIDGET (group));
+      gtk_list_box_row_changed (GTK_LIST_BOX_ROW (group));
 
       check_if_empty (self);
     }
@@ -347,6 +350,14 @@ add_to_group (EmpathyRosterView *self,
       update_group_widgets (self, roster_group,
           EMPATHY_ROSTER_CONTACT (contact), TRUE);
     }
+
+  if (tp_strdiff (group, NO_GROUP) &&
+      tp_strdiff (group, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED) &&
+      g_hash_table_size (contacts) == 2 /* 1:Ungrouped and 2:first group */)
+    {
+      remove_from_group (self, individual,
+          EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED);
+    }
 }
 
 static void
@@ -372,7 +383,7 @@ individual_favourite_change_cb (FolksIndividual *individual,
   if (contact == NULL)
     return;
 
-  egg_list_box_child_changed (EGG_LIST_BOX (self), contact);
+  gtk_list_box_row_changed (GTK_LIST_BOX_ROW (contact));
 }
 
 static void
@@ -627,7 +638,7 @@ compare_roster_contacts_by_alias (EmpathyRosterContact *a,
   alias_a = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (ind_a));
   alias_b = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (ind_b));
 
-  return g_ascii_strcasecmp (alias_a, alias_b);
+  return g_utf8_collate (alias_a, alias_b);
 }
 
 static gint
@@ -665,7 +676,7 @@ compare_group_names (const gchar *group_a,
   else if (!tp_strdiff (group_b, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED))
     return -1;
 
-  return g_ascii_strcasecmp (group_a, group_b);
+  return g_utf8_collate (group_a, group_b);
 }
 
 static gint
@@ -727,8 +738,8 @@ compare_contact_group (EmpathyRosterContact *contact,
 }
 
 static gint
-roster_view_sort (gconstpointer a,
-    gconstpointer b,
+roster_view_sort (GtkListBoxRow *a,
+    GtkListBoxRow *b,
     gpointer user_data)
 {
   EmpathyRosterView *self = user_data;
@@ -750,23 +761,22 @@ roster_view_sort (gconstpointer a,
 }
 
 static void
-update_separator (GtkWidget **separator,
-    GtkWidget *child,
-    GtkWidget *before,
+update_header (GtkListBoxRow *row,
+    GtkListBoxRow *before,
     gpointer user_data)
 {
   if (before == NULL)
     {
       /* No separator before the first row */
-      g_clear_object (separator);
+      gtk_list_box_row_set_header(row, NULL);
       return;
     }
 
-  if (*separator != NULL)
+  if (gtk_list_box_row_get_header(row) != NULL)
     return;
 
-  *separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-  g_object_ref_sink (*separator);
+  gtk_list_box_row_set_header (row,
+      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
 }
 
 static gboolean
@@ -808,13 +818,13 @@ add_to_displayed (EmpathyRosterView *self,
   while (g_hash_table_iter_next (&iter, &k, NULL))
     {
       const gchar *group_name = k;
-      GtkWidget *group;
+      GtkListBoxRow *group;
 
       group = g_hash_table_lookup (self->priv->roster_groups, group_name);
       if (group == NULL)
         continue;
 
-      egg_list_box_child_changed (EGG_LIST_BOX (self), group);
+      gtk_list_box_row_changed (group);
     }
 }
 
@@ -853,8 +863,8 @@ contact_should_be_displayed (EmpathyRosterView *self,
       individual = empathy_roster_contact_get_individual (contact);
 
       return empathy_individual_match_string (individual,
-          empathy_live_search_get_text (self->priv->search),
-          empathy_live_search_get_words (self->priv->search));
+          tpaw_live_search_get_text (self->priv->search),
+          tpaw_live_search_get_words (self->priv->search));
     }
 
   if (self->priv->show_offline)
@@ -889,7 +899,7 @@ filter_contact (EmpathyRosterView *self,
         {
           /* When searching, always display even if the group is closed */
           if (!is_searching (self) &&
-              !gtk_expander_get_expanded (GTK_EXPANDER (group)))
+              !gtk_expander_get_expanded (group->expander))
             displayed = FALSE;
         }
     }
@@ -932,7 +942,7 @@ filter_group (EmpathyRosterView *self,
 }
 
 static gboolean
-filter_list (GtkWidget *child,
+filter_list (GtkListBoxRow *child,
     gpointer user_data)
 {
   EmpathyRosterView *self = user_data;
@@ -1006,7 +1016,7 @@ groups_changed_cb (EmpathyRosterModel *model,
 {
   if (!self->priv->show_groups)
     {
-      egg_list_box_resort (EGG_LIST_BOX (self));
+      gtk_list_box_invalidate_sort (GTK_LIST_BOX (self));
       return;
     }
 
@@ -1044,15 +1054,14 @@ empathy_roster_view_constructed (GObject *object)
   tp_g_signal_connect_object (self->priv->model, "groups-changed",
       G_CALLBACK (groups_changed_cb), self, 0);
 
-  egg_list_box_set_sort_func (EGG_LIST_BOX (self),
+  gtk_list_box_set_sort_func (GTK_LIST_BOX (self),
       roster_view_sort, self, NULL);
 
-  egg_list_box_set_separator_funcs (EGG_LIST_BOX (self), update_separator,
-      self, NULL);
+  gtk_list_box_set_header_func (GTK_LIST_BOX (self), update_header, self, NULL);
 
-  egg_list_box_set_filter_func (EGG_LIST_BOX (self), filter_list, self, NULL);
+  gtk_list_box_set_filter_func (GTK_LIST_BOX (self), filter_list, self, NULL);
 
-  egg_list_box_set_activate_on_single_click (EGG_LIST_BOX (self), FALSE);
+  gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (self), FALSE);
 }
 
 static void
@@ -1109,18 +1118,18 @@ empathy_roster_view_finalize (GObject *object)
 }
 
 static void
-empathy_roster_view_child_activated (EggListBox *box,
-    GtkWidget *child)
+empathy_roster_view_row_activated (GtkListBox *box,
+    GtkListBoxRow *row)
 {
   EmpathyRosterView *self = EMPATHY_ROSTER_VIEW (box);
   EmpathyRosterContact *contact;
   FolksIndividual *individual;
   GList *l;
 
-  if (!EMPATHY_IS_ROSTER_CONTACT (child))
+  if (!EMPATHY_IS_ROSTER_CONTACT (row))
     return;
 
-  contact = EMPATHY_ROSTER_CONTACT (child);
+  contact = EMPATHY_ROSTER_CONTACT (row);
   individual = empathy_roster_contact_get_individual (contact);
 
   /* Activate the oldest event associated with this contact, if any */
@@ -1142,21 +1151,23 @@ empathy_roster_view_child_activated (EggListBox *box,
 
 static void
 fire_popup_individual_menu (EmpathyRosterView *self,
-    GtkWidget *child,
+    GtkListBoxRow *row,
     guint button,
     guint time)
 {
   EmpathyRosterContact *contact;
   FolksIndividual *individual;
+  const gchar *active_group;
 
-  if (!EMPATHY_IS_ROSTER_CONTACT (child))
+  if (!EMPATHY_IS_ROSTER_CONTACT (row))
     return;
 
-  contact = EMPATHY_ROSTER_CONTACT (child);
+  contact = EMPATHY_ROSTER_CONTACT (row);
   individual = empathy_roster_contact_get_individual (contact);
 
+  active_group = empathy_roster_contact_get_group (contact);
   g_signal_emit (self, signals[SIG_POPUP_INDIVIDUAL_MENU], 0,
-      individual, button, time);
+      active_group, individual, button, time);
 }
 
 static gboolean
@@ -1169,15 +1180,15 @@ empathy_roster_view_button_press_event (GtkWidget *widget,
 
   if (event->button == 3)
     {
-      GtkWidget *child;
+      GtkListBoxRow *row;
 
-      child = egg_list_box_get_child_at_y (EGG_LIST_BOX (self), event->y);
+      row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (self), event->y);
 
-      if (child != NULL)
+      if (row != NULL)
         {
-          egg_list_box_select_child (EGG_LIST_BOX (self), child);
+          gtk_list_box_select_row (GTK_LIST_BOX (self), row);
 
-          fire_popup_individual_menu (self, child, event->button, event->time);
+          fire_popup_individual_menu (self, row, event->button, event->time);
         }
     }
 
@@ -1194,53 +1205,50 @@ empathy_roster_view_key_press_event (GtkWidget *widget,
 
   if (event->keyval == GDK_KEY_Menu)
     {
-      GtkWidget *child;
+      GtkListBoxRow *row;
 
-      child = egg_list_box_get_selected_child (EGG_LIST_BOX (self));
+      row = gtk_list_box_get_selected_row (GTK_LIST_BOX (self));
 
-      if (child != NULL)
-        fire_popup_individual_menu (self, child, 0, event->time);
+      if (row != NULL)
+        fire_popup_individual_menu (self, row, 0, event->time);
     }
 
   return chain_up (widget, event);
 }
 
 /**
- * @out_child: (out) (allow-none)
+ * @out_row: (out) (allow-none)
  */
 FolksIndividual *
 empathy_roster_view_get_individual_at_y (EmpathyRosterView *self,
     gint y,
-    GtkWidget **out_child)
+    GtkListBoxRow **out_row)
 {
-  GtkWidget *child;
+  GtkListBoxRow *row;
 
-  child = egg_list_box_get_child_at_y (EGG_LIST_BOX (self), y);
+  row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (self), y);
 
-  if (out_child != NULL)
-    *out_child = child;
+  if (out_row != NULL)
+    *out_row = row;
 
-  if (!EMPATHY_IS_ROSTER_CONTACT (child))
+  if (!EMPATHY_IS_ROSTER_CONTACT (row))
     return NULL;
 
-  return empathy_roster_contact_get_individual (EMPATHY_ROSTER_CONTACT (child));
+  return empathy_roster_contact_get_individual (EMPATHY_ROSTER_CONTACT (row));
 }
 
-/**
- * @out_child: (out) (allow-none)
- */
 const gchar *
 empathy_roster_view_get_group_at_y (EmpathyRosterView *self,
     gint y)
 {
-  GtkWidget *child;
+  GtkListBoxRow *row;
 
-  child = egg_list_box_get_child_at_y (EGG_LIST_BOX (self), y);
+  row = gtk_list_box_get_row_at_y (GTK_LIST_BOX (self), y);
 
-  if (EMPATHY_IS_ROSTER_CONTACT (child))
-    return empathy_roster_contact_get_group (EMPATHY_ROSTER_CONTACT (child));
-  else if (EMPATHY_IS_ROSTER_GROUP (child))
-    return empathy_roster_group_get_name (EMPATHY_ROSTER_GROUP (child));
+  if (EMPATHY_IS_ROSTER_CONTACT (row))
+    return empathy_roster_contact_get_group (EMPATHY_ROSTER_CONTACT (row));
+  else if (EMPATHY_IS_ROSTER_GROUP (row))
+    return empathy_roster_group_get_name (EMPATHY_ROSTER_GROUP (row));
 
   return NULL;
 }
@@ -1255,9 +1263,9 @@ empathy_roster_view_query_tooltip (GtkWidget *widget,
   EmpathyRosterView *self = EMPATHY_ROSTER_VIEW (widget);
   FolksIndividual *individual;
   gboolean result;
-  GtkWidget *child;
+  GtkListBoxRow *row;
 
-  individual = empathy_roster_view_get_individual_at_y (self, y, &child);
+  individual = empathy_roster_view_get_individual_at_y (self, y, &row);
   if (individual == NULL)
     return FALSE;
 
@@ -1268,7 +1276,7 @@ empathy_roster_view_query_tooltip (GtkWidget *widget,
     {
       GtkAllocation allocation;
 
-      gtk_widget_get_allocation (child, &allocation);
+      gtk_widget_get_allocation (GTK_WIDGET (row), &allocation);
       gtk_tooltip_set_tip_area (tooltip, (GdkRectangle *) &allocation);
     }
 
@@ -1294,7 +1302,7 @@ empathy_roster_view_class_init (
     EmpathyRosterViewClass *klass)
 {
   GObjectClass *oclass = G_OBJECT_CLASS (klass);
-  EggListBoxClass *box_class = EGG_LIST_BOX_CLASS (klass);
+  GtkListBoxClass *box_class = GTK_LIST_BOX_CLASS (klass);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
   GParamSpec *spec;
@@ -1311,7 +1319,7 @@ empathy_roster_view_class_init (
 
   container_class->remove = empathy_roster_view_remove;
 
-  box_class->child_activated = empathy_roster_view_child_activated;
+  box_class->row_activated = empathy_roster_view_row_activated;
 
   spec = g_param_spec_object ("model", "Model",
       "EmpathyRosterModel",
@@ -1349,7 +1357,8 @@ empathy_roster_view_class_init (
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL, NULL,
       G_TYPE_NONE,
-      3, FOLKS_TYPE_INDIVIDUAL, G_TYPE_UINT, G_TYPE_UINT);
+      4, G_TYPE_STRING, FOLKS_TYPE_INDIVIDUAL, G_TYPE_UINT,
+          G_TYPE_UINT);
 
   signals[SIG_EVENT_ACTIVATED] = g_signal_new ("event-activated",
       G_OBJECT_CLASS_TYPE (klass),
@@ -1403,7 +1412,7 @@ empathy_roster_view_show_offline (EmpathyRosterView *self,
     return;
 
   self->priv->show_offline = show;
-  egg_list_box_refilter (EGG_LIST_BOX (self));
+  gtk_list_box_invalidate_filter (GTK_LIST_BOX (self));
 
   g_object_notify (G_OBJECT (self), "show-offline");
 }
@@ -1440,7 +1449,7 @@ select_first_contact (EmpathyRosterView *self)
       if (!EMPATHY_IS_ROSTER_CONTACT (child))
         continue;
 
-      egg_list_box_select_child (EGG_LIST_BOX (self), child);
+      gtk_list_box_select_row (GTK_LIST_BOX (self), GTK_LIST_BOX_ROW (child));
       break;
     }
 
@@ -1450,7 +1459,7 @@ select_first_contact (EmpathyRosterView *self)
 static gboolean
 search_timeout_cb (EmpathyRosterView *self)
 {
-  egg_list_box_refilter (EGG_LIST_BOX (self));
+  gtk_list_box_invalidate_filter (GTK_LIST_BOX (self));
 
   select_first_contact (self);
 
@@ -1459,7 +1468,7 @@ search_timeout_cb (EmpathyRosterView *self)
 }
 
 static void
-search_text_notify_cb (EmpathyLiveSearch *search,
+search_text_notify_cb (TpawLiveSearch *search,
     GParamSpec *pspec,
     EmpathyRosterView *self)
 {
@@ -1474,19 +1483,19 @@ static void
 search_activate_cb (GtkWidget *search,
   EmpathyRosterView *self)
 {
-  EggListBox *box = EGG_LIST_BOX (self);
-  GtkWidget *child;
+  GtkListBox *box = GTK_LIST_BOX (self);
+  GtkListBoxRow *row;
 
-  child = egg_list_box_get_selected_child (box);
-  if (child == NULL)
+  row = gtk_list_box_get_selected_row (box);
+  if (row == NULL)
     return;
 
-  empathy_roster_view_child_activated (box, child);
+  empathy_roster_view_row_activated (box, row);
 }
 
 void
 empathy_roster_view_set_live_search (EmpathyRosterView *self,
-    EmpathyLiveSearch *search)
+    TpawLiveSearch *search)
 {
   if (self->priv->search != NULL)
     {
@@ -1568,12 +1577,12 @@ empathy_roster_view_remove_event (EmpathyRosterView *self,
 FolksIndividual *
 empathy_roster_view_get_selected_individual (EmpathyRosterView *self)
 {
-  GtkWidget *child;
+  GtkListBoxRow *row;
 
-  child = egg_list_box_get_selected_child (EGG_LIST_BOX (self));
+  row = gtk_list_box_get_selected_row (GTK_LIST_BOX (self));
 
-  if (!EMPATHY_IS_ROSTER_CONTACT (child))
+  if (!EMPATHY_IS_ROSTER_CONTACT (row))
     return NULL;
 
-  return empathy_roster_contact_get_individual (EMPATHY_ROSTER_CONTACT (child));
+  return empathy_roster_contact_get_individual (EMPATHY_ROSTER_CONTACT (row));
 }
diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 0077b6843..6a8d30c14 100644
--- a/libempathy-gtk/empathy-roster-view.h
+++ b/libempathy-gtk/empathy-roster-view.h
@@ -2,10 +2,9 @@
 #ifndef __EMPATHY_ROSTER_VIEW_H__
 #define __EMPATHY_ROSTER_VIEW_H__
 
-#include <libempathy-gtk/egg-list-box/egg-list-box.h>
-#include <libempathy-gtk/empathy-live-search.h>
+#include <tp-account-widgets/tpaw-live-search.h>
 
-#include <libempathy-gtk/empathy-roster-model.h>
+#include "empathy-roster-model.h"
 
 G_BEGIN_DECLS
 
@@ -16,13 +15,13 @@ typedef struct _EmpathyRosterViewPriv EmpathyRosterViewPriv;
 struct _EmpathyRosterViewClass
 {
   /*<private>*/
-  EggListBoxClass parent_class;
+  GtkListBoxClass parent_class;
 };
 
 struct _EmpathyRosterView
 {
   /*<private>*/
-  EggListBox parent;
+  GtkListBox parent;
   EmpathyRosterViewPriv *priv;
 };
 
@@ -59,7 +58,7 @@ void empathy_roster_view_show_groups (EmpathyRosterView *self,
     gboolean show);
 
 void empathy_roster_view_set_live_search (EmpathyRosterView *self,
-    EmpathyLiveSearch *search);
+    TpawLiveSearch *search);
 
 gboolean empathy_roster_view_is_empty (EmpathyRosterView *self);
 
@@ -76,7 +75,7 @@ void empathy_roster_view_remove_event (EmpathyRosterView *self,
 FolksIndividual * empathy_roster_view_get_individual_at_y (
     EmpathyRosterView *self,
     gint y,
-    GtkWidget **out_child);
+    GtkListBoxRow **out_row);
 
 const gchar * empathy_roster_view_get_group_at_y (
     EmpathyRosterView *self,
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 018a068ab..3383b9a12 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,13 +18,14 @@
  */
 
 #include "config.h"
+#include "empathy-search-bar.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar)
 
@@ -72,9 +73,9 @@ empathy_search_bar_update_buttons (EmpathySearchBar *self,
       &can_go_backward, &can_go_forward);
 
   gtk_widget_set_sensitive (priv->search_previous,
-      can_go_backward && !EMP_STR_EMPTY (search));
+      can_go_backward && !TPAW_STR_EMPTY (search));
   gtk_widget_set_sensitive (priv->search_next,
-      can_go_forward && !EMP_STR_EMPTY (search));
+      can_go_forward && !TPAW_STR_EMPTY (search));
 }
 
 static void
@@ -158,7 +159,7 @@ empathy_search_bar_search (EmpathySearchBar *self,
 
   /* (don't) display the not found label */
   gtk_widget_set_visible (priv->search_not_found,
-      !(found || EMP_STR_EMPTY (search)));
+      !(found || TPAW_STR_EMPTY (search)));
 
   /* update the buttons */
   empathy_search_bar_update_buttons (self, search, match_case);
@@ -264,7 +265,7 @@ empathy_search_bar_init (EmpathySearchBar * self)
   self->priv = priv;
 
   filename = empathy_file_lookup ("empathy-search-bar.ui", "libempathy-gtk");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "search_widget", &internal,
       "search_close", &priv->search_close,
       "search_entry", &priv->search_entry,
@@ -276,7 +277,7 @@ empathy_search_bar_init (EmpathySearchBar * self)
   g_free (filename);
 
   /* Add the signals */
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "search_close", "clicked", empathy_search_bar_close_cb,
       "search_entry", "changed", empathy_search_bar_entry_changed,
       "search_previous", "clicked", empathy_search_bar_previous_cb,
diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h
index afda250b2..a710965b5 100644
--- a/libempathy-gtk/empathy-search-bar.h
+++ b/libempathy-gtk/empathy-search-bar.h
@@ -20,8 +20,7 @@
 #ifndef __EMPATHY_SEARCH_BAR_H__
 #define __EMPATHY_SEARCH_BAR_H__
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>
 
 #include "empathy-theme-adium.h"
 
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 8b0845048..9c29533c7 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-share-my-desktop.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-share-my-desktop.h"
+#include "empathy-debug.h"
 
 static void
 create_tube_channel_cb (GObject *source,
diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h
index 3efeecc14..5953e15e8 100644
--- a/libempathy-gtk/empathy-share-my-desktop.h
+++ b/libempathy-gtk/empathy-share-my-desktop.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__
 #define __EMPATHY_SHARE_MY_DESKTOP_H__
 
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact);
 
diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 99caa51d7..44ea817be 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -21,10 +21,13 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
 #include "empathy-smiley-manager.h"
+
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 typedef struct _SmileyManagerTree SmileyManagerTree;
 
@@ -242,15 +245,15 @@ empathy_smiley_manager_add (EmpathySmileyManager *manager,
 	va_list    var_args;
 
 	g_return_if_fail (EMPATHY_IS_SMILEY_MANAGER (manager));
-	g_return_if_fail (!EMP_STR_EMPTY (icon_name));
-	g_return_if_fail (!EMP_STR_EMPTY (first_str));
+	g_return_if_fail (!TPAW_STR_EMPTY (icon_name));
+	g_return_if_fail (!TPAW_STR_EMPTY (first_str));
 
-	pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+	pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 	if (pixbuf) {
 		gchar *path;
 
 		va_start (var_args, first_str);
-		path = empathy_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+		path = tpaw_filename_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
 		smiley_manager_add_valist (manager, pixbuf, path, first_str, var_args);
 		va_end (var_args);
 		g_object_unref (pixbuf);
diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h
index 1d6eaac54..b9e753bf6 100644
--- a/libempathy-gtk/empathy-smiley-manager.h
+++ b/libempathy-gtk/empathy-smiley-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_SMILEY_MANAGER__H__
 #define __EMPATHY_SMILEY_MANAGER_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 3291a9a92..3453e8f2c 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -18,15 +18,16 @@
  */
 
 #include "config.h"
-
 #include "empathy-sound-manager.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-gsettings.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
 
 typedef struct {
   EmpathySound sound_id;
@@ -162,6 +163,45 @@ empathy_sound_manager_dup_singleton (void)
 }
 
 static gboolean
+empathy_check_available_state (void)
+{
+  TpConnectionPresenceType most_available_requested_presence;
+  TpAccountManager *am;
+  GList *accounts;
+
+  /* We cannot use tp_account_manager_get_most_available_presence() or
+   * empathy_presence_manager_get_state() because it is the requested presence
+   * that matters, not the current presence.
+   * See https://bugzilla.gnome.org/show_bug.cgi?id=704454 */
+  most_available_requested_presence = TP_CONNECTION_PRESENCE_TYPE_UNSET;
+  am = tp_account_manager_dup ();
+  accounts = tp_account_manager_dup_valid_accounts (am);
+  while (accounts != NULL)
+    {
+      TpAccount *account = accounts->data;
+      TpConnectionPresenceType requested_presence;
+
+      requested_presence = tp_account_get_requested_presence (account,
+          NULL, NULL);
+
+      if (tp_connection_presence_type_cmp_availability (requested_presence,
+              most_available_requested_presence) > 0)
+        most_available_requested_presence = requested_presence;
+
+      g_object_unref (account);
+      accounts = g_list_delete_link (accounts, accounts);
+    }
+
+  g_object_unref (am);
+
+  if (most_available_requested_presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
+    most_available_requested_presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
+    return FALSE;
+
+  return TRUE;
+}
+
+static gboolean
 empathy_sound_pref_is_enabled (EmpathySoundManager *self,
     EmpathySound sound_id)
 {
diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 99e96c571..b2fd0d291 100644
--- a/libempathy-gtk/empathy-sound-manager.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_SOUND_MANAGER_H__
 #define __EMPATHY_SOUND_MANAGER_H__
 
-#include <gtk/gtk.h>
-
 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 4242b5738..27f27f902 100644
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -22,6 +22,7 @@
  */
 
 #include "config.h"
+#include "empathy-spell.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -29,11 +30,10 @@
 #include <enchant.h>
 #endif
 
-#include "empathy-spell.h"
+#include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-gsettings.h>
+#include "empathy-debug.h"
 
 #ifdef HAVE_ENCHANT
 
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 19f1fee6a..f487b8cc1 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -35,17 +35,17 @@
  */
 
 #include "config.h"
+#include "empathy-status-preset-dialog.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-status-presets.h>
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-ui-utils.h"
-#include "empathy-status-preset-dialog.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog)
 
@@ -299,7 +299,7 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
 
 	filename = empathy_file_lookup ("empathy-status-preset-dialog.ui",
 			"libempathy-gtk");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 			"toplevel-vbox", &toplevel_vbox,
 			"presets-sw", &presets_sw,
 			"presets-treeview", &priv->presets_treeview,
@@ -322,7 +322,7 @@ empathy_status_preset_dialog_init (EmpathyStatusPresetDialog *self)
 			remove_button);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 
-	empathy_builder_connect (gui, self,
+	tpaw_builder_connect (gui, self,
 			"remove-button", "clicked", status_preset_dialog_preset_remove,
 			NULL);
 
diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5cf0e3397..625547fe5 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.h
+++ b/libempathy-gtk/empathy-status-preset-dialog.h
@@ -28,7 +28,7 @@
 #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 
-#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c
index cb7d3c3e1..f17fc9c03 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -19,106 +19,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-string-parser.h"
-#include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
-
-#define SCHEMES           "([a-zA-Z\\+]+)"
-#define INVALID_CHARS     "\\s\"<>"
-#define INVALID_CHARS_EXT INVALID_CHARS "\\[\\](){},;:"
-#define INVALID_CHARS_FULL INVALID_CHARS_EXT "?'"
-#define BODY              "([^"INVALID_CHARS_FULL"])([^"INVALID_CHARS_EXT"]*)"
-#define BODY_END          "([^"INVALID_CHARS"]*)[^"INVALID_CHARS_FULL".]"
-#define URI_REGEX         "("SCHEMES"://"BODY_END")" \
-		          "|((www|ftp)\\."BODY_END")" \
-		          "|((mailto:)?"BODY"@"BODY"\\."BODY_END")"
-
-static GRegex *
-uri_regex_dup_singleton (void)
-{
-	static GRegex *uri_regex = NULL;
-
-	/* We intentionally leak the regex so it's not recomputed */
-	if (!uri_regex) {
-		GError *error = NULL;
-
-		uri_regex = g_regex_new (URI_REGEX, 0, 0, &error);
-		if (uri_regex == NULL) {
-			g_warning ("Failed to create reg exp: %s", error->message);
-			g_error_free (error);
-			return NULL;
-		}
-	}
-
-	return g_regex_ref (uri_regex);
-}
-
-void
-empathy_string_parser_substr (const gchar *text,
-			      gssize len,
-			      EmpathyStringParser *parsers,
-			      gpointer user_data)
-{
-	if (parsers != NULL && parsers[0].match_func != NULL) {
-		parsers[0].match_func (text, len,
-				       parsers[0].replace_func, parsers + 1,
-				       user_data);
-	}
-}
-
-void
-empathy_string_match_link (const gchar *text,
-			   gssize len,
-			   EmpathyStringReplace replace_func,
-			   EmpathyStringParser *sub_parsers,
-			   gpointer user_data)
-{
-	GRegex     *uri_regex;
-	GMatchInfo *match_info;
-	gboolean    match;
-	gint        last = 0;
-
-	uri_regex = uri_regex_dup_singleton ();
-	if (uri_regex == NULL) {
-		empathy_string_parser_substr (text, len, sub_parsers, user_data);
-		return;
-	}
-
-	match = g_regex_match_full (uri_regex, text, len, 0, 0, &match_info, NULL);
-	if (match) {
-		gint s = 0, e = 0;
-
-		do {
-			g_match_info_fetch_pos (match_info, 0, &s, &e);
 
-			if (s > last) {
-				/* Append the text between last link (or the
-				 * start of the message) and this link */
-				empathy_string_parser_substr (text + last,
-							      s - last,
-							      sub_parsers,
-							      user_data);
-			}
-
-			replace_func (text + s, e - s, NULL, user_data);
-
-			last = e;
-		} while (g_match_info_next (match_info, NULL));
-	}
-
-	empathy_string_parser_substr (text + last, len - last,
-				      sub_parsers, user_data);
-
-	g_match_info_free (match_info);
-	g_regex_unref (uri_regex);
-}
+#include "empathy-smiley-manager.h"
 
 void
 empathy_string_match_smiley (const gchar *text,
 			     gssize len,
-			     EmpathyStringReplace replace_func,
-			     EmpathyStringParser *sub_parsers,
+			     TpawStringReplace replace_func,
+			     TpawStringParser *sub_parsers,
 			     gpointer user_data)
 {
 	guint last = 0;
@@ -134,9 +43,9 @@ empathy_string_match_smiley (const gchar *text,
 		if (hit->start > last) {
 			/* Append the text between last smiley (or the
 			 * start of the message) and this smiley */
-			empathy_string_parser_substr (text + last,
-						      hit->start - last,
-						      sub_parsers, user_data);
+			tpaw_string_parser_substr (text + last,
+						   hit->start - last,
+						   sub_parsers, user_data);
 		}
 
 		replace_func (text + hit->start, hit->end - hit->start,
@@ -149,91 +58,6 @@ empathy_string_match_smiley (const gchar *text,
 	g_slist_free (hits);
 	g_object_unref (smiley_manager);
 
-	empathy_string_parser_substr (text + last, len - last,
-				      sub_parsers, user_data);
+	tpaw_string_parser_substr (text + last, len - last,
+				   sub_parsers, user_data);
 }
-
-void
-empathy_string_match_all (const gchar *text,
-			  gssize len,
-			  EmpathyStringReplace replace_func,
-			  EmpathyStringParser *sub_parsers,
-			  gpointer user_data)
-{
-	replace_func (text, len, NULL, user_data);
-}
-
-void
-empathy_string_replace_link (const gchar *text,
-                             gssize len,
-                             gpointer match_data,
-                             gpointer user_data)
-{
-	GString *string = user_data;
-	gchar *real_url;
-	gchar *title;
-	gchar *markup;
-
-	real_url = empathy_make_absolute_url_len (text, len);
-
-	/* Need to copy manually, because g_markup_printf_escaped does not work
-	 * with string precision pitfalls. */
-	title = g_strndup (text, len);
-
-	/* Append the link inside <a href=""></a> tag */
-	markup = g_markup_printf_escaped ("<a href=\"%s\">%s</a>",
-			real_url, title);
-
-	g_string_append (string, markup);
-
-	g_free (real_url);
-	g_free (title);
-	g_free (markup);
-}
-
-void
-empathy_string_replace_escaped (const gchar *text,
-				gssize len,
-				gpointer match_data,
-				gpointer user_data)
-{
-	GString *string = user_data;
-	gchar *escaped;
-	guint i;
-	gsize escaped_len, old_len;
-
-	escaped = g_markup_escape_text (text, len);
-	escaped_len = strlen (escaped);
-
-	/* Allocate more space to string (we really need a g_string_extend...) */
-	old_len = string->len;
-	g_string_set_size (string, old_len + escaped_len);
-	g_string_truncate (string, old_len);
-
-	/* Remove '\r' */
-	for (i = 0; i < escaped_len; i++) {
-		if (escaped[i] != '\r')
-			g_string_append_c (string, escaped[i]);
-	}
-
-	g_free (escaped);
-}
-
-gchar *
-empathy_add_link_markup (const gchar *text)
-{
-	EmpathyStringParser parsers[] = {
-		{empathy_string_match_link, empathy_string_replace_link},
-		{empathy_string_match_all, empathy_string_replace_escaped},
-		{NULL, NULL}
-	};
-	GString *string;
-
-	g_return_val_if_fail (text != NULL, NULL);
-
-	string = g_string_sized_new (strlen (text));
-	empathy_string_parser_substr (text, -1, parsers, string);
-
-	return g_string_free (string, FALSE);
-}
-
diff --git a/libempathy-gtk/empathy-string-parser.h b/libempathy-gtk/empathy-string-parser.h
index 78a822652..57b784aeb 100644
--- a/libempathy-gtk/empathy-string-parser.h
+++ b/libempathy-gtk/empathy-string-parser.h
@@ -22,71 +22,17 @@
 #define __EMPATHY_STRING_PARSER_H__
 
 #include <glib.h>
+#include <tp-account-widgets/tpaw-string-parser.h>
 
 G_BEGIN_DECLS
 
-typedef struct _EmpathyStringParser EmpathyStringParser;
-
-typedef void (*EmpathyStringReplace) (const gchar *text,
-				      gssize len,
-				      gpointer match_data,
-				      gpointer user_data);
-typedef void (*EmpathyStringMatch) (const gchar *text,
-				    gssize len,
-				    EmpathyStringReplace replace_func,
-				    EmpathyStringParser *sub_parsers,
-				    gpointer user_data);
-
-struct _EmpathyStringParser {
-	EmpathyStringMatch match_func;
-	EmpathyStringReplace replace_func;
-};
-
-void
-empathy_string_parser_substr (const gchar *text,
-			      gssize len,
-			      EmpathyStringParser *parsers,
-			      gpointer user_data);
-
-void
-empathy_string_match_link (const gchar *text,
-			   gssize len,
-			   EmpathyStringReplace replace_func,
-			   EmpathyStringParser *sub_parsers,
-			   gpointer user_data);
-
 void
 empathy_string_match_smiley (const gchar *text,
 			     gssize len,
-			     EmpathyStringReplace replace_func,
-			     EmpathyStringParser *sub_parsers,
+			     TpawStringReplace replace_func,
+			     TpawStringParser *sub_parsers,
 			     gpointer user_data);
 
-void
-empathy_string_match_all (const gchar *text,
-			  gssize len,
-			  EmpathyStringReplace replace_func,
-			  EmpathyStringParser *sub_parsers,
-			  gpointer user_data);
-
-/* Replace functions assume user_data is a GString */
-void
-empathy_string_replace_link (const gchar *text,
-                             gssize len,
-                             gpointer match_data,
-                             gpointer user_data);
-
-void
-empathy_string_replace_escaped (const gchar *text,
-				gssize len,
-				gpointer match_data,
-				gpointer user_data);
-
-/* Returns a new string with <a> html tag around links, and escape the rest.
- * To be used with gtk_label_set_markup() for example */
-gchar *
-empathy_add_link_markup (const gchar *text);
-
 G_END_DECLS
 
 #endif /*  __EMPATHY_STRING_PARSER_H__ */
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 04fae6d18..878832657 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
-
 #include "empathy-subscription-dialog.h"
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-individual-widget.h>
-
 #include <glib/gi18n-lib.h>
 
+#include "empathy-individual-widget.h"
+#include "empathy-utils.h"
+
 G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG)
 
 enum
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 67ec4d08f..652315949 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -20,22 +20,24 @@
  */
 
 #include "config.h"
+#include "empathy-theme-adium.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-theme-adium.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-plist.h"
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
-#include "empathy-plist.h"
-#include "empathy-images.h"
+#include "empathy-utils.h"
 #include "empathy-webkit-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define BORING_DPI_DEFAULT 96
 
@@ -249,7 +251,7 @@ theme_adium_parse_body (EmpathyThemeAdium *self,
   const gchar *text,
   const gchar *token)
 {
-  EmpathyStringParser *parsers;
+  TpawStringParser *parsers;
   GString *string;
 
   /* Check if we have to parse smileys */
@@ -269,7 +271,7 @@ theme_adium_parse_body (EmpathyThemeAdium *self,
       "<span id=\"message-token-%s\">",
       token);
 
-  empathy_string_parser_substr (text, -1, parsers, string);
+  tpaw_string_parser_substr (text, -1, parsers, string);
 
   if (!tp_str_empty (token))
     g_string_append (string, "</span>");
@@ -648,20 +650,20 @@ theme_adium_add_html (EmpathyThemeAdium *self,
 
           strftime_format = nsdate_to_strftime (self->priv->data, format);
           if (is_backlog)
-            dup_replace = empathy_time_to_string_local (timestamp,
+            dup_replace = tpaw_time_to_string_local (timestamp,
               strftime_format ? strftime_format :
-              EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT);
+              TPAW_TIME_DATE_FORMAT_DISPLAY_SHORT);
           else
-            dup_replace = empathy_time_to_string_local (timestamp,
+            dup_replace = tpaw_time_to_string_local (timestamp,
               strftime_format ? strftime_format :
-              EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
+              TPAW_TIME_FORMAT_DISPLAY_SHORT);
 
           replace = dup_replace;
         }
       else if (theme_adium_match (&cur, "%shortTime%"))
         {
-          dup_replace = empathy_time_to_string_local (timestamp,
-            EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
+          dup_replace = tpaw_time_to_string_local (timestamp,
+            TPAW_TIME_FORMAT_DISPLAY_SHORT);
           replace = dup_replace;
         }
       else if (theme_adium_match (&cur, "%service%"))
@@ -730,6 +732,9 @@ theme_adium_add_html (EmpathyThemeAdium *self,
   bytes = g_resources_lookup_data ("/org/gnome/Empathy/Chat/empathy-chat.js",
       G_RESOURCE_LOOKUP_FLAGS_NONE,
       NULL);
+  if (bytes == NULL)
+    return;
+
   js = (const gchar *) g_bytes_get_data (bytes, NULL);
   g_string_prepend (string, js);
   g_bytes_unref (bytes);
@@ -746,7 +751,7 @@ theme_adium_append_event_escaped (EmpathyThemeAdium *self,
 {
   theme_adium_add_html (self, "appendMessage",
       self->priv->data->status_html, escaped, NULL, NULL, NULL,
-      NULL, "event", empathy_time_get_current (), FALSE, FALSE, direction);
+      NULL, "event", tpaw_time_get_current (), FALSE, FALSE, direction);
 
   /* There is no last contact */
   if (self->priv->last_contact)
@@ -902,7 +907,7 @@ theme_adium_add_message (EmpathyThemeAdium *self,
   /* Get information */
   sender = empathy_message_get_sender (msg);
   account = empathy_contact_get_account (sender);
-  service_name = empathy_protocol_name_to_display_name
+  service_name = tpaw_protocol_name_to_display_name
     (tp_account_get_protocol_name (account));
   if (service_name == NULL)
     service_name = tp_account_get_protocol_name (account);
@@ -953,7 +958,7 @@ theme_adium_add_message (EmpathyThemeAdium *self,
         {
           if (!self->priv->data->default_avatar_filename)
             self->priv->data->default_avatar_filename =
-              empathy_filename_from_icon_name (EMPATHY_IMAGE_AVATAR_DEFAULT,
+              tpaw_filename_from_icon_name (TPAW_IMAGE_AVATAR_DEFAULT,
                        GTK_ICON_SIZE_DIALOG);
 
           avatar_filename = self->priv->data->default_avatar_filename;
@@ -1206,7 +1211,7 @@ empathy_theme_adium_edit_message (EmpathyThemeAdium *self,
     }
 
   /* set a tooltip */
-  timestamp = empathy_time_to_string_local (
+  timestamp = tpaw_time_to_string_local (
     empathy_message_get_timestamp (message),
     "%H:%M:%S");
   tooltip = g_strdup_printf (_("Message edited at %s"), timestamp);
@@ -1243,7 +1248,7 @@ empathy_theme_adium_edit_message (EmpathyThemeAdium *self,
         }
 
       g_free (style);
-      gtk_icon_info_free (icon_info);
+      g_object_unref (icon_info);
     }
 
   goto finally;
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index 880667615..698d2846c 100644
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -23,7 +23,7 @@
 
 #include <webkit/webkitwebview.h>
 
-#include <libempathy/empathy-message.h>
+#include "empathy-message.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index f3d8d67bc..81361c1ef 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -21,17 +21,12 @@
  */
 
 #include "config.h"
-
-#include <string.h>
-
-#include <gtk/gtk.h>
-
-#include <libempathy/empathy-gsettings.h>
-
 #include "empathy-theme-manager.h"
 
+#include "empathy-gsettings.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyThemeManagerPriv
 {
diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index 812b02616..590c343f3 100644
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_THEME_MANAGER_H__
 #define __EMPATHY_THEME_MANAGER_H__
 
-#include <glib-object.h>
 #include "empathy-theme-adium.h"
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 82244403a..def31d224 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -19,15 +19,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-tls-dialog.h"
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
     GTK_TYPE_MESSAGE_DIALOG)
diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h
index a9c37ad5e..b85e7d097 100644
--- a/libempathy-gtk/empathy-tls-dialog.h
+++ b/libempathy-gtk/empathy-tls-dialog.h
@@ -21,9 +21,7 @@
 #ifndef __EMPATHY_TLS_DIALOG_H__
 #define __EMPATHY_TLS_DIALOG_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 9f4300840..5e01d9fcc 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -30,20 +30,22 @@
  */
 
 #include "config.h"
+#include "empathy-ui-utils.h"
 
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
+#include <tp-account-widgets/tpaw-live-search.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-ui-utils.h"
+#include "empathy-ft-factory.h"
 #include "empathy-images.h"
-#include "empathy-live-search.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-ft-factory.h>
+#include "empathy-debug.h"
 
 void
 empathy_gtk_init (void)
@@ -75,119 +77,6 @@ empathy_gtk_init (void)
   initialized = TRUE;
 }
 
-static GtkBuilder *
-builder_get_file_valist (const gchar *filename,
-    const gchar *first_object,
-    va_list args)
-{
-  GtkBuilder *gui;
-  const gchar *name;
-  GObject **object_ptr;
-  GError *error = NULL;
-
-  DEBUG ("Loading file %s", filename);
-
-  gui = gtk_builder_new ();
-  gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE);
-
-  if (!gtk_builder_add_from_file (gui, filename, &error))
-    {
-      g_critical ("GtkBuilder Error (%s): %s",
-          filename, error->message);
-
-      g_clear_error (&error);
-      g_object_unref (gui);
-
-      /* we need to iterate and set all of the pointers to NULL */
-      for (name = first_object; name; name = va_arg (args, const gchar *))
-        {
-          object_ptr = va_arg (args, GObject**);
-
-          *object_ptr = NULL;
-        }
-
-      return NULL;
-    }
-
-  for (name = first_object; name; name = va_arg (args, const gchar *))
-    {
-      object_ptr = va_arg (args, GObject**);
-
-      *object_ptr = gtk_builder_get_object (gui, name);
-
-      if (!*object_ptr)
-        {
-          g_warning ("File is missing object '%s'.", name);
-          continue;
-        }
-    }
-
-  return gui;
-}
-
-GtkBuilder *
-empathy_builder_get_file (const gchar *filename,
-    const gchar *first_object,
-    ...)
-{
-  GtkBuilder *gui;
-  va_list args;
-
-  va_start (args, first_object);
-  gui = builder_get_file_valist (filename, first_object, args);
-  va_end (args);
-
-  return gui;
-}
-
-void
-empathy_builder_connect (GtkBuilder *gui,
-    gpointer user_data,
-    const gchar *first_object,
-    ...)
-{
-  va_list args;
-  const gchar *name;
-  const gchar *sig;
-  GObject *object;
-  GCallback callback;
-
-  va_start (args, first_object);
-  for (name = first_object; name; name = va_arg (args, const gchar *))
-    {
-      sig = va_arg (args, const gchar *);
-      callback = va_arg (args, GCallback);
-
-      object = gtk_builder_get_object (gui, name);
-      if (!object)
-        {
-          g_warning ("File is missing object '%s'.", name);
-          continue;
-        }
-
-      g_signal_connect (object, sig, callback, user_data);
-    }
-
-  va_end (args);
-}
-
-GtkWidget *
-empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
-    GtkWidget *widget)
-{
-  /* On construction gui sinks the initial reference to widget. When gui
-   * is finalized it will drop its ref to widget. We take our own ref to
-   * prevent widget being finalised. The widget is forced to have a
-   * floating reference, like when it was initially unowned so that it can
-   * be used like any other GtkWidget. */
-
-  g_object_ref (widget);
-  g_object_force_floating (G_OBJECT (widget));
-  g_object_unref (gui);
-
-  return widget;
-}
-
 const gchar *
 empathy_icon_name_for_presence (TpConnectionPresenceType presence)
 {
@@ -267,69 +156,6 @@ empathy_protocol_name_for_contact (EmpathyContact *contact)
   return tp_account_get_icon_name (account);
 }
 
-GdkPixbuf *
-empathy_pixbuf_from_data (gchar *data,
-    gsize data_size)
-{
-  return empathy_pixbuf_from_data_and_mime (data, data_size, NULL);
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_data_and_mime (gchar *data,
-           gsize data_size,
-           gchar **mime_type)
-{
-  GdkPixbufLoader *loader;
-  GdkPixbufFormat *format;
-  GdkPixbuf *pixbuf = NULL;
-  gchar **mime_types;
-  GError *error = NULL;
-
-  if (!data)
-    return NULL;
-
-  loader = gdk_pixbuf_loader_new ();
-  if (!gdk_pixbuf_loader_write (loader, (guchar *) data, data_size, &error))
-    {
-      DEBUG ("Failed to write to pixbuf loader: %s",
-        error ? error->message : "No error given");
-      goto out;
-    }
-
-  if (!gdk_pixbuf_loader_close (loader, &error))
-    {
-      DEBUG ("Failed to close pixbuf loader: %s",
-        error ? error->message : "No error given");
-      goto out;
-    }
-
-  pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
-  if (pixbuf)
-    {
-      g_object_ref (pixbuf);
-
-      if (mime_type != NULL)
-        {
-          format = gdk_pixbuf_loader_get_format (loader);
-          mime_types = gdk_pixbuf_format_get_mime_types (format);
-
-          *mime_type = g_strdup (*mime_types);
-          if (mime_types[1] != NULL)
-            DEBUG ("Loader supports more than one mime "
-              "type! Picking the first one, %s",
-              *mime_type);
-
-          g_strfreev (mime_types);
-        }
-    }
-
-out:
-  g_clear_error (&error);
-  g_object_unref (loader);
-
-  return pixbuf;
-}
-
 struct SizeData
 {
   gint width;
@@ -766,7 +592,7 @@ empathy_pixbuf_contact_status_icon_with_icon_name (EmpathyContact *contact,
   numerator = 3;
   denominator = 4;
 
-  icon_filename = empathy_filename_from_icon_name (icon_name,
+  icon_filename = tpaw_filename_from_icon_name (icon_name,
       GTK_ICON_SIZE_MENU);
 
   if (icon_filename == NULL)
@@ -823,7 +649,7 @@ empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact *contact,
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
 
   account = empathy_contact_get_account (contact);
-  filename = empathy_filename_from_icon_name (
+  filename = tpaw_filename_from_icon_name (
       tp_account_get_icon_name (account), GTK_ICON_SIZE_MENU);
 
   if (filename != NULL)
@@ -835,190 +661,6 @@ empathy_pixbuf_protocol_from_contact_scaled (EmpathyContact *contact,
   return pixbuf;
 }
 
-GdkPixbuf *
-empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf,
-    gint max_size)
-{
-  gint width, height;
-  gdouble factor;
-
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-
-  if (width > 0 && (width > max_size || height > max_size))
-    {
-      factor = (gdouble) max_size / MAX (width, height);
-
-      width = width * factor;
-      height = height * factor;
-
-      return gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_HYPER);
-    }
-
-  return g_object_ref (pixbuf);
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
-    gint size)
-{
-  GtkIconTheme *theme;
-  GdkPixbuf *pixbuf;
-  GError *error = NULL;
-
-  if (!icon_name)
-    return NULL;
-
-  theme = gtk_icon_theme_get_default ();
-
-  pixbuf = gtk_icon_theme_load_icon (theme, icon_name, size, 0, &error);
-
-  if (error)
-    {
-      DEBUG ("Error loading icon: %s", error->message);
-      g_clear_error (&error);
-    }
-
-  return pixbuf;
-}
-
-GdkPixbuf *
-empathy_pixbuf_from_icon_name (const gchar *icon_name,
-    GtkIconSize  icon_size)
-{
-  gint w, h;
-  gint size = 48;
-
-  if (!icon_name)
-    return NULL;
-
-  if (gtk_icon_size_lookup (icon_size, &w, &h))
-    size = (w + h) / 2;
-
-  return empathy_pixbuf_from_icon_name_sized (icon_name, size);
-}
-
-gchar *
-empathy_filename_from_icon_name (const gchar *icon_name,
-    GtkIconSize icon_size)
-{
-  GtkIconTheme *icon_theme;
-  GtkIconInfo *icon_info;
-  gint w, h;
-  gint size = 48;
-  gchar *ret;
-
-  icon_theme = gtk_icon_theme_get_default ();
-
-  if (gtk_icon_size_lookup (icon_size, &w, &h))
-    size = (w + h) / 2;
-
-  icon_info = gtk_icon_theme_lookup_icon (icon_theme, icon_name, size, 0);
-  if (icon_info == NULL)
-    return NULL;
-
-  ret = g_strdup (gtk_icon_info_get_filename (icon_info));
-  gtk_icon_info_free (icon_info);
-
-  return ret;
-}
-
-/* Takes care of moving the window to the current workspace. */
-void
-empathy_window_present_with_time (GtkWindow *window,
-    guint32 timestamp)
-{
-  GdkWindow *gdk_window;
-
-  g_return_if_fail (GTK_IS_WINDOW (window));
-
-  /* Move the window to the current workspace before trying to show it.
-   * This is the behaviour people expect when clicking on the statusbar icon. */
-  gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
-
-  if (gdk_window)
-    {
-      gint x, y;
-      gint w, h;
-
-      /* Has no effect if the WM has viewports, like compiz */
-      gdk_x11_window_move_to_current_desktop (gdk_window);
-
-      /* If window is still off-screen, hide it to force it to
-       * reposition on the current workspace. */
-      gtk_window_get_position (window, &x, &y);
-      gtk_window_get_size (window, &w, &h);
-      if (!EMPATHY_RECT_IS_ON_SCREEN (x, y, w, h))
-        gtk_widget_hide (GTK_WIDGET (window));
-    }
-
-  if (timestamp == GDK_CURRENT_TIME)
-    gtk_window_present (window);
-  else
-    gtk_window_present_with_time (window, timestamp);
-}
-
-void
-empathy_window_present (GtkWindow *window)
-{
-  empathy_window_present_with_time (window, gtk_get_current_event_time ());
-}
-
-GtkWindow *
-empathy_get_toplevel_window (GtkWidget *widget)
-{
-  GtkWidget *toplevel;
-
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-  toplevel = gtk_widget_get_toplevel (widget);
-  if (GTK_IS_WINDOW (toplevel) &&
-      gtk_widget_is_toplevel (toplevel))
-    return GTK_WINDOW (toplevel);
-
-  return NULL;
-}
-
-/** empathy_make_absolute_url_len:
- * @url: an url
- * @len: a length
- *
- * Same as #empathy_make_absolute_url but for a limited string length
- */
-gchar *
-empathy_make_absolute_url_len (const gchar *url,
-    guint len)
-{
-  g_return_val_if_fail (url != NULL, NULL);
-
-  if (g_str_has_prefix (url, "help:") ||
-      g_str_has_prefix (url, "mailto:") ||
-      strstr (url, ":/"))
-    return g_strndup (url, len);
-
-  if (strstr (url, "@"))
-    return g_strdup_printf ("mailto:%.*s", len, url);
-
-  return g_strdup_printf ("http://%.*s", len, url);
-}
-
-/** empathy_make_absolute_url:
- * @url: an url
- *
- * The URL opening code can't handle schemeless strings, so we try to be
- * smart and add http if there is no scheme or doesn't look like a mail
- * address. This should work in most cases, and let us click on strings
- * like "www.gnome.org".
- *
- * Returns: a newly allocated url with proper mailto: or http:// prefix, use
- * g_free when your are done with it
- */
-gchar *
-empathy_make_absolute_url (const gchar *url)
-{
-  return empathy_make_absolute_url_len (url, strlen (url));
-}
-
 void
 empathy_url_show (GtkWidget *parent,
       const char *url)
@@ -1029,7 +671,7 @@ empathy_url_show (GtkWidget *parent,
   g_return_if_fail (parent == NULL || GTK_IS_WIDGET (parent));
   g_return_if_fail (url != NULL);
 
-  real_url = empathy_make_absolute_url (url);
+  real_url = tpaw_make_absolute_url (url);
 
   gtk_show_uri (parent ? gtk_widget_get_screen (parent) : NULL, real_url,
       gtk_get_current_event_time (), &error);
@@ -1371,7 +1013,7 @@ empathy_get_current_action_time (void)
   return (tp_user_action_time_from_x11 (gtk_get_current_event_time ()));
 }
 
-/* @words = empathy_live_search_strip_utf8_string (@text);
+/* @words = tpaw_live_search_strip_utf8_string (@text);
  *
  * User has to pass both so we don't have to compute @words ourself each time
  * this function is called. */
@@ -1388,7 +1030,7 @@ empathy_individual_match_string (FolksIndividual *individual,
   /* check alias name */
   str = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual));
 
-  if (empathy_live_search_match_words (str, words))
+  if (tpaw_live_search_match_words (str, words))
     return TRUE;
 
   personas = folks_individual_get_personas (individual);
@@ -1419,7 +1061,7 @@ empathy_individual_match_string (FolksIndividual *individual,
               if (p != NULL)
                 str = dup_str = g_strndup (str, p - str);
 
-              visible = empathy_live_search_match_words (str, words);
+              visible = tpaw_live_search_match_words (str, words);
               g_free (dup_str);
               if (visible)
                 retval = TRUE;
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 73232cf52..24ad6a717 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -33,11 +33,10 @@
 #define __EMPATHY_UI_UTILS_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-ft-handler.h>
+#include "empathy-contact.h"
+#include "empathy-ft-handler.h"
 
 G_BEGIN_DECLS
 
@@ -53,28 +52,12 @@ typedef void (*EmpathyPixbufAvatarFromIndividualCb) (
 
 void empathy_gtk_init (void);
 
-/* Glade */
-GtkBuilder * empathy_builder_get_file (const gchar *filename,
-    const gchar *first_object,
-    ...);
-void empathy_builder_connect (GtkBuilder *gui,
-    gpointer user_data,
-    const gchar *first_object,
-    ...);
-GtkWidget * empathy_builder_unref_and_keep_widget (GtkBuilder *gui,
-    GtkWidget *root);
-
 /* Pixbufs */
 const gchar * empathy_icon_name_for_presence (
     TpConnectionPresenceType presence);
 const gchar * empathy_icon_name_for_contact (EmpathyContact *contact);
 const gchar * empathy_icon_name_for_individual (FolksIndividual *individual);
 const gchar * empathy_protocol_name_for_contact (EmpathyContact *contact);
-GdkPixbuf * empathy_pixbuf_from_data (gchar *data,
-    gsize data_size);
-GdkPixbuf * empathy_pixbuf_from_data_and_mime (gchar *data,
-    gsize data_size,
-    gchar **mime_type);
 void empathy_pixbuf_avatar_from_individual_scaled_async (
     FolksIndividual *individual,
     gint width,
@@ -95,29 +78,11 @@ GdkPixbuf * empathy_pixbuf_contact_status_icon_with_icon_name (
     EmpathyContact *contact,
     const gchar *icon_name,
     gboolean show_protocol);
-GdkPixbuf * empathy_pixbuf_scale_down_if_necessary (GdkPixbuf *pixbuf,
-    gint max_size);
-GdkPixbuf * empathy_pixbuf_from_icon_name (const gchar *icon_name,
-    GtkIconSize icon_size);
-GdkPixbuf * empathy_pixbuf_from_icon_name_sized (const gchar *icon_name,
-    gint size);
-gchar * empathy_filename_from_icon_name (const gchar *icon_name,
-    GtkIconSize icon_size);
-
-/* Windows */
-void empathy_window_present (GtkWindow *window);
-void empathy_window_present_with_time (GtkWindow *window,
-    guint32 timestamp);
-GtkWindow * empathy_get_toplevel_window (GtkWidget *widget);
 
 void empathy_move_to_window_desktop (GtkWindow *window,
     guint32 timestamp);
 
 /* URL */
-gchar * empathy_make_absolute_url (const gchar *url);
-
-gchar * empathy_make_absolute_url_len (const gchar *url,
-    guint len);
 void empathy_url_show (GtkWidget *parent,
     const char *url);
 
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
deleted file mode 100644
index 77b0798f2..000000000
--- a/libempathy-gtk/empathy-user-info.c
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * empathy-user-info.c - Source for EmpathyUserInfo
- *
- * 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-user-info.h"
-
-#include <glib/gi18n-lib.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-avatar-chooser.h"
-#include "empathy-calendar-button.h"
-#include "empathy-contactinfo-utils.h"
-
-G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID)
-
-struct _EmpathyUserInfoPrivate
-{
-  TpAccount *account;
-
-  GtkWidget *avatar_chooser;
-  GtkWidget *nickname_entry;
-  GtkWidget *details_label;
-  GtkWidget *details_spinner;
-
-  GList *details_to_set;
-  gboolean details_changed;
-  GCancellable *details_cancellable;
-};
-
-enum
-{
-  PROP_0,
-  PROP_ACCOUNT,
-};
-
-#define DATA_FIELD "contact-info-field"
-#define DATA_IS_CONTACT_INFO "is-contact-info"
-
-static void
-contact_info_changed_cb (GtkEntry *entry,
-    EmpathyUserInfo *self)
-{
-  const gchar *strv[] = { NULL, NULL };
-  TpContactInfoField *field;
-
-  self->priv->details_changed = TRUE;
-
-  field = g_object_get_data ((GObject *) entry, DATA_FIELD);
-  g_assert (field != NULL);
-
-  strv[0] = gtk_entry_get_text (entry);
-
-  if (field->field_value != NULL)
-    g_strfreev (field->field_value);
-  field->field_value = g_strdupv ((GStrv) strv);
-}
-
-static void
-bday_changed_cb (EmpathyCalendarButton *button,
-    GDate *date,
-    EmpathyUserInfo *self)
-{
-  const gchar *strv[] = { NULL, NULL };
-  TpContactInfoField *field;
-
-  self->priv->details_changed = TRUE;
-
-  field = g_object_get_data ((GObject *) button, DATA_FIELD);
-  g_assert (field != NULL);
-
-  if (date != NULL)
-    {
-      gchar tmp[255];
-
-      g_date_strftime (tmp, sizeof (tmp), EMPATHY_DATE_FORMAT_DISPLAY_SHORT,
-          date);
-      strv[0] = tmp;
-    }
-
-  if (field->field_value != NULL)
-    g_strfreev (field->field_value);
-  field->field_value = g_strdupv ((GStrv) strv);
-}
-
-static gboolean
-field_name_in_field_list (GList *list,
-    const gchar *name)
-{
-  GList *l;
-
-  for (l = list; l != NULL; l = g_list_next (l))
-    {
-      TpContactInfoField *field = l->data;
-
-      if (!tp_strdiff (field->field_name, name))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static TpContactInfoFieldSpec *
-get_spec_from_list (GList *list,
-    const gchar *name)
-{
-  GList *l;
-
-  for (l = list; l != NULL; l = g_list_next (l))
-    {
-      TpContactInfoFieldSpec *spec = l->data;
-
-      if (!tp_strdiff (spec->name, name))
-        return spec;
-    }
-
-  return NULL;
-}
-
-static void
-add_row (GtkGrid *grid,
-    GtkWidget *title,
-    GtkWidget *value,
-    gboolean contact_info)
-{
-  /* Title */
-  gtk_grid_attach_next_to (grid, title, NULL, GTK_POS_BOTTOM, 1, 1);
-  gtk_misc_set_alignment (GTK_MISC (title), 1, 0.5);
-  gtk_style_context_add_class (gtk_widget_get_style_context (title),
-      GTK_STYLE_CLASS_DIM_LABEL);
-  gtk_widget_show (title);
-
-  /* Value */
-  gtk_grid_attach_next_to (grid, value, title, GTK_POS_RIGHT,
-      contact_info ? 2 : 1, 1);
-  gtk_widget_set_hexpand (value, TRUE);
-  if (GTK_IS_LABEL (value))
-    {
-      gtk_misc_set_alignment (GTK_MISC (value), 0, 0.5);
-      gtk_label_set_selectable (GTK_LABEL (value), TRUE);
-    }
-  gtk_widget_show (value);
-
-  if (contact_info)
-    {
-      g_object_set_data (G_OBJECT (title),
-          DATA_IS_CONTACT_INFO, (gpointer) TRUE);
-      g_object_set_data (G_OBJECT (value),
-          DATA_IS_CONTACT_INFO, (gpointer) TRUE);
-    }
-}
-
-static guint
-fill_contact_info_grid (EmpathyUserInfo *self)
-{
-  TpConnection *connection;
-  TpContact *contact;
-  GList *specs, *l;
-  guint n_rows = 0;
-  GList *info;
-  const char **field_names = empathy_contact_info_get_field_names (NULL);
-  guint i;
-
-  g_assert (self->priv->details_to_set == NULL);
-
-  connection = tp_account_get_connection (self->priv->account);
-  contact = tp_connection_get_self_contact (connection);
-  specs = tp_connection_dup_contact_info_supported_fields (connection);
-  info = tp_contact_dup_contact_info (contact);
-
-  /* Look at the fields set in our vCard */
-  for (l = info; l != NULL; l = l->next)
-    {
-      TpContactInfoField *field = l->data;
-
-      /* For some reason it can happen that the vCard contains fields the CM
-       * claims to be not supported. This is a workaround for gabble bug
-       * https://bugs.freedesktop.org/show_bug.cgi?id=64319. But we shouldn't
-       * crash on buggy CM anyway. */
-      if (get_spec_from_list (specs, field->field_name) == NULL)
-        {
-          DEBUG ("Buggy CM: self's vCard contains %s field but it is not in "
-              "Connection' supported fields", field->field_name);
-          continue;
-        }
-
-      /* make a copy for the details_to_set list */
-      field = tp_contact_info_field_copy (field);
-      DEBUG ("Field %s is in our vCard", field->field_name);
-
-      self->priv->details_to_set = g_list_prepend (self->priv->details_to_set,
-          field);
-    }
-
-  /* Add fields which are supported but not in the vCard */
-  for (i = 0; field_names[i] != NULL; i++)
-    {
-      TpContactInfoFieldSpec *spec;
-      TpContactInfoField *field;
-
-      /* Check if the field was in the vCard */
-      if (field_name_in_field_list (self->priv->details_to_set,
-            field_names[i]))
-        continue;
-
-      /* Check if the CM supports the field */
-      spec = get_spec_from_list (specs, field_names[i]);
-      if (spec == NULL)
-        continue;
-
-      /* add an empty field so user can set a value */
-      field = tp_contact_info_field_new (spec->name, spec->parameters, NULL);
-
-      self->priv->details_to_set = g_list_prepend (self->priv->details_to_set,
-          field);
-    }
-
-  /* Add widgets for supported fields */
-  self->priv->details_to_set = g_list_sort (self->priv->details_to_set,
-      (GCompareFunc) empathy_contact_info_field_spec_cmp);
-
-  for (l = self->priv->details_to_set; l != NULL; l= g_list_next (l))
-    {
-      TpContactInfoField *field = l->data;
-      GtkWidget *label, *w;
-      TpContactInfoFieldSpec *spec;
-      gboolean has_field;
-      char *title;
-
-      has_field = empathy_contact_info_lookup_field (field->field_name,
-          NULL, NULL);
-      if (!has_field)
-        {
-          /* Empathy doesn't display this field so we can't change it.
-           * But we put it in the details_to_set list so it won't be erased
-           * when calling SetContactInfo (bgo #630427) */
-          DEBUG ("Unhandled ContactInfo field spec: %s", field->field_name);
-          continue;
-        }
-
-      spec = get_spec_from_list (specs, field->field_name);
-      /* We shouldn't have added the field to details_to_set if it's not
-       * supported by the CM */
-      g_assert (spec != NULL);
-
-      if (spec->flags & TP_CONTACT_INFO_FIELD_FLAG_OVERWRITTEN_BY_NICKNAME)
-        {
-          DEBUG ("Ignoring field '%s' due it to having the "
-              "Overwritten_By_Nickname flag", field->field_name);
-          continue;
-        }
-
-      /* Add Title */
-      title = empathy_contact_info_field_label (field->field_name,
-          field->parameters,
-          (spec->flags & TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT));
-      label = gtk_label_new (title);
-      g_free (title);
-
-      /* TODO: if TP_CONTACT_INFO_FIELD_FLAG_PARAMETERS_EXACT is not set we
-       * should allow user to tag the vCard fields (bgo#672034) */
-
-      /* Add Value */
-      if (!tp_strdiff (field->field_name, "bday"))
-        {
-          w = empathy_calendar_button_new ();
-
-          if (field->field_value[0])
-            {
-              GDate date;
-
-              g_date_set_parse (&date, field->field_value[0]);
-              if (g_date_valid (&date))
-                {
-                  empathy_calendar_button_set_date (EMPATHY_CALENDAR_BUTTON (w),
-                      &date);
-                }
-            }
-
-          g_signal_connect (w, "date-changed",
-            G_CALLBACK (bday_changed_cb), self);
-        }
-      else
-        {
-          w = gtk_entry_new ();
-          gtk_entry_set_text (GTK_ENTRY (w),
-              field->field_value[0] ? field->field_value[0] : "");
-          g_signal_connect (w, "changed",
-            G_CALLBACK (contact_info_changed_cb), self);
-        }
-
-      add_row (GTK_GRID (self), label, w, TRUE);
-
-      g_object_set_data ((GObject *) w, DATA_FIELD, field);
-
-      n_rows++;
-    }
-
-  tp_contact_info_spec_list_free (specs);
-  tp_contact_info_list_free (info);
-
-  return n_rows;
-}
-
-static void
-grid_foreach_cb (GtkWidget *widget,
-    gpointer data)
-{
-  if (g_object_get_data (G_OBJECT (widget), DATA_IS_CONTACT_INFO) != NULL)
-    gtk_widget_destroy (widget);
-}
-
-static void
-request_contact_info_cb (GObject *object,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  EmpathyUserInfo *self = user_data;
-  TpContact *contact = TP_CONTACT (object);
-  guint n_rows;
-  GError *error = NULL;
-
-  if (!tp_contact_request_contact_info_finish (contact, res, &error))
-    {
-      /* If the request got cancelled it could mean the contact widget is
-       * destroyed, so we should not dereference self */
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        {
-          g_clear_error (&error);
-          return;
-        }
-      g_clear_error (&error);
-    }
-
-  n_rows = fill_contact_info_grid (self);
-
-  gtk_widget_set_visible (self->priv->details_label, n_rows > 0);
-  gtk_spinner_stop (GTK_SPINNER (self->priv->details_spinner));
-  gtk_widget_hide (self->priv->details_spinner);
-}
-
-static void
-reload_contact_info (EmpathyUserInfo *self)
-{
-  TpConnection *connection;
-  TpContact *contact = NULL;
-  TpContactInfoFlags flags;
-
-  /* Cancel previous RequestContactInfo, if any */
-  if (self->priv->details_cancellable != NULL)
-    g_cancellable_cancel (self->priv->details_cancellable);
-  g_clear_object (&self->priv->details_cancellable);
-
-  /* Remove current contact info widgets, if any */
-  gtk_container_foreach (GTK_CONTAINER (self), grid_foreach_cb, NULL);
-  gtk_widget_hide (self->priv->details_label);
-  gtk_widget_hide (self->priv->details_spinner);
-
-  tp_clear_pointer (&self->priv->details_to_set, tp_contact_info_list_free);
-  self->priv->details_changed = FALSE;
-
-  connection = tp_account_get_connection (self->priv->account);
-  if (connection != NULL)
-    contact = tp_connection_get_self_contact (connection);
-
-  /* Display infobar if we don't have a self contact (probably offline) */
-  if (contact == NULL)
-    {
-      GtkWidget *infobar;
-      GtkWidget *content;
-      GtkWidget *label;
-
-      infobar = gtk_info_bar_new ();
-      gtk_info_bar_set_message_type (GTK_INFO_BAR (infobar), GTK_MESSAGE_INFO);
-      content = gtk_info_bar_get_content_area (GTK_INFO_BAR (infobar));
-      label = gtk_label_new (_("Go online to edit your personal information."));
-      gtk_container_add (GTK_CONTAINER (content), label);
-      gtk_widget_show (label);
-
-      gtk_grid_attach_next_to ((GtkGrid *) self, infobar,
-          NULL, GTK_POS_BOTTOM, 3, 1);
-      gtk_widget_show (infobar);
-
-      g_object_set_data (G_OBJECT (infobar),
-          DATA_IS_CONTACT_INFO, (gpointer) TRUE);
-      return;
-    }
-
-  if (!tp_proxy_has_interface_by_id (connection,
-          TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_INFO))
-    return;
-
-  flags = tp_connection_get_contact_info_flags (connection);
-  if ((flags & TP_CONTACT_INFO_FLAG_CAN_SET) == 0)
-    return;
-
-  /* Request the contact's info */
-  gtk_widget_show (self->priv->details_spinner);
-  gtk_spinner_start (GTK_SPINNER (self->priv->details_spinner));
-
-  g_assert (self->priv->details_cancellable == NULL);
-  self->priv->details_cancellable = g_cancellable_new ();
-  tp_contact_request_contact_info_async (contact,
-      self->priv->details_cancellable, request_contact_info_cb,
-      self);
-}
-
-static void
-connection_notify_cb (EmpathyUserInfo *self)
-{
-  TpConnection *connection = tp_account_get_connection (self->priv->account);
-
-  if (connection != NULL)
-    {
-      tp_g_signal_connect_object (connection, "notify::self-contact",
-          G_CALLBACK (reload_contact_info), self, G_CONNECT_SWAPPED);
-    }
-
-  reload_contact_info (self);
-}
-
-static void
-empathy_user_info_constructed (GObject *object)
-{
-  EmpathyUserInfo *self = (EmpathyUserInfo *) object;
-  GtkGrid *grid = (GtkGrid *) self;
-  GtkWidget *title;
-  GtkWidget *value;
-
-  G_OBJECT_CLASS (empathy_user_info_parent_class)->constructed (object);
-
-  gtk_grid_set_column_spacing (grid, 6);
-  gtk_grid_set_row_spacing (grid, 6);
-
-  /* Setup id label */
-  title = gtk_label_new (_("Identifier"));
-  value = gtk_label_new (tp_account_get_normalized_name (self->priv->account));
-  add_row (grid, title, value, FALSE);
-
-  /* Setup nickname entry */
-  title = gtk_label_new (_("Alias"));
-  self->priv->nickname_entry = gtk_entry_new ();
-  gtk_entry_set_text (GTK_ENTRY (self->priv->nickname_entry),
-      tp_account_get_nickname (self->priv->account));
-  add_row (grid, title, self->priv->nickname_entry, FALSE);
-
-  /* Set up avatar chooser */
-  self->priv->avatar_chooser = empathy_avatar_chooser_new (self->priv->account);
-  gtk_grid_attach (grid, self->priv->avatar_chooser,
-      2, 0, 1, 3);
-  gtk_widget_show (self->priv->avatar_chooser);
-
-  /* Details label */
-  self->priv->details_label = gtk_label_new (NULL);
-  gtk_label_set_markup (GTK_LABEL (self->priv->details_label),
-      _("<b>Personal Details</b>"));
-  gtk_misc_set_alignment (GTK_MISC (self->priv->details_label), 0, 0.5);
-  gtk_grid_attach_next_to (grid, self->priv->details_label, NULL,
-      GTK_POS_BOTTOM, 3, 1);
-
-  /* Details spinner */
-  self->priv->details_spinner = gtk_spinner_new ();
-  gtk_widget_set_hexpand (self->priv->details_spinner, TRUE);
-  gtk_widget_set_vexpand (self->priv->details_spinner, TRUE);
-  gtk_grid_attach_next_to (grid, self->priv->details_spinner, NULL,
-      GTK_POS_BOTTOM, 3, 1);
-
-  g_signal_connect_swapped (self->priv->account, "notify::connection",
-      G_CALLBACK (connection_notify_cb), self);
-  connection_notify_cb (self);
-}
-
-static void
-empathy_user_info_dispose (GObject *object)
-{
-  EmpathyUserInfo *self = (EmpathyUserInfo *) object;
-
-  if (self->priv->account != NULL)
-    {
-      /* Disconnect the signal manually, because TpAccount::dispose will emit
-       * "notify::connection" signal before tp_g_signal_connect_object() had
-       * a chance to disconnect. */
-      g_signal_handlers_disconnect_by_func (self->priv->account,
-          connection_notify_cb, self);
-      g_clear_object (&self->priv->account);
-    }
-
-  if (self->priv->details_cancellable != NULL)
-    g_cancellable_cancel (self->priv->details_cancellable);
-  g_clear_object (&self->priv->details_cancellable);
-
-  G_OBJECT_CLASS (empathy_user_info_parent_class)->dispose (object);
-}
-
-static void
-empathy_user_info_get_property (GObject *object,
-    guint property_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyUserInfo *self = (EmpathyUserInfo *) object;
-
-  switch (property_id)
-    {
-      case PROP_ACCOUNT:
-        g_value_set_object (value, self->priv->account);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_user_info_set_property (GObject *object,
-    guint property_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyUserInfo *self = (EmpathyUserInfo *) object;
-
-  switch (property_id)
-    {
-      case PROP_ACCOUNT:
-        g_assert (self->priv->account == NULL); /* construct-only */
-        self->priv->account = g_value_dup_object (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_user_info_init (EmpathyUserInfo *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_USER_INFO, EmpathyUserInfoPrivate);
-}
-
-static void
-empathy_user_info_class_init (EmpathyUserInfoClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->constructed = empathy_user_info_constructed;
-  object_class->dispose = empathy_user_info_dispose;
-  object_class->get_property = empathy_user_info_get_property;
-  object_class->set_property = empathy_user_info_set_property;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyUserInfoPrivate));
-
-  param_spec = g_param_spec_object ("account",
-      "account",
-      "The #TpAccount on which user info should be edited",
-      TP_TYPE_ACCOUNT,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  g_object_class_install_property (object_class, PROP_ACCOUNT, param_spec);
-}
-
-GtkWidget *
-empathy_user_info_new (TpAccount *account)
-{
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), NULL);
-
-  return g_object_new (EMPATHY_TYPE_USER_INFO,
-      "account", account,
-      NULL);
-}
-
-void
-empathy_user_info_discard (EmpathyUserInfo *self)
-{
-  g_return_if_fail (EMPATHY_IS_USER_INFO (self));
-
-  reload_contact_info (self);
-  gtk_entry_set_text ((GtkEntry *) self->priv->nickname_entry,
-      tp_account_get_nickname (self->priv->account));
-}
-
-static void
-apply_complete_one (GSimpleAsyncResult *result)
-{
-  guint count;
-
-  count = g_simple_async_result_get_op_res_gssize (result);
-  count--;
-  g_simple_async_result_set_op_res_gssize (result, count);
-
-  if (count == 0)
-    g_simple_async_result_complete (result);
-}
-
-static void
-avatar_chooser_apply_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAvatarChooser *avatar_chooser = (EmpathyAvatarChooser *) source;
-  GSimpleAsyncResult *my_result = user_data;
-  GError *error = NULL;
-
-  if (!empathy_avatar_chooser_apply_finish (avatar_chooser, result, &error))
-    g_simple_async_result_take_error (my_result, error);
-
-  apply_complete_one (my_result);
-  g_object_unref (my_result);
-}
-
-static void
-set_nickname_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpAccount *account = (TpAccount *) source;
-  GSimpleAsyncResult *my_result = user_data;
-  GError *error = NULL;
-
-  if (!tp_account_set_nickname_finish (account, result, &error))
-    g_simple_async_result_take_error (my_result, error);
-
-  apply_complete_one (my_result);
-  g_object_unref (my_result);
-}
-
-static void
-set_contact_info_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpConnection *connection = (TpConnection *) source;
-  GSimpleAsyncResult *my_result = user_data;
-  GError *error = NULL;
-
-  if (!tp_connection_set_contact_info_finish (connection, result, &error))
-    g_simple_async_result_take_error (my_result, error);
-
-  apply_complete_one (my_result);
-  g_object_unref (my_result);
-}
-
-static gboolean
-field_value_is_empty (TpContactInfoField *field)
-{
-  guint i;
-
-  if (field->field_value == NULL)
-    return TRUE;
-
-  /* Field is empty if all its values are empty */
-  for (i = 0; field->field_value[i] != NULL; i++)
-    {
-      if (!tp_str_empty (field->field_value[i]))
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-void
-empathy_user_info_apply_async (EmpathyUserInfo *self,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *result;
-  const gchar *new_nickname;
-  guint count = 0;
-  GList *l, *next;
-
-  g_return_if_fail (EMPATHY_IS_USER_INFO (self));
-
-  result = g_simple_async_result_new ((GObject *) self, callback, user_data,
-      empathy_user_info_apply_async);
-
-  /* Apply avatar */
-  empathy_avatar_chooser_apply_async (
-      (EmpathyAvatarChooser *) self->priv->avatar_chooser,
-      avatar_chooser_apply_cb, g_object_ref (result));
-  count++;
-
-  /* Apply nickname */
-  new_nickname = gtk_entry_get_text (GTK_ENTRY (self->priv->nickname_entry));
-  if (tp_strdiff (new_nickname, tp_account_get_nickname (self->priv->account)))
-    {
-      tp_account_set_nickname_async (self->priv->account, new_nickname,
-          set_nickname_cb, g_object_ref (result));
-      count++;
-    }
-
-  /* Remove empty fields */
-  for (l = self->priv->details_to_set; l != NULL; l = next)
-    {
-      TpContactInfoField *field = l->data;
-
-      next = l->next;
-      if (field_value_is_empty (field))
-        {
-          DEBUG ("Drop empty field: %s", field->field_name);
-          tp_contact_info_field_free (field);
-          self->priv->details_to_set =
-              g_list_delete_link (self->priv->details_to_set, l);
-        }
-    }
-
-  if (self->priv->details_to_set != NULL)
-    {
-      if (self->priv->details_changed)
-        {
-          tp_connection_set_contact_info_async (
-              tp_account_get_connection (self->priv->account),
-              self->priv->details_to_set, set_contact_info_cb,
-              g_object_ref (result));
-          count++;
-        }
-
-      tp_contact_info_list_free (self->priv->details_to_set);
-      self->priv->details_to_set = NULL;
-    }
-
-  self->priv->details_changed = FALSE;
-
-  g_simple_async_result_set_op_res_gssize (result, count);
-
-  g_object_unref (result);
-}
-
-gboolean
-empathy_user_info_apply_finish (EmpathyUserInfo *self,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_void (self, empathy_user_info_apply_async);
-}
diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h
deleted file mode 100644
index 117bfd325..000000000
--- a/libempathy-gtk/empathy-user-info.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * empathy-user-info.h - Header for EmpathyUserInfo
- *
- * 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_USER_INFO_H__
-#define __EMPATHY_USER_INFO_H__
-
-#include <gtk/gtk.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_USER_INFO \
-    (empathy_user_info_get_type ())
-#define EMPATHY_USER_INFO(obj) \
-    (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_USER_INFO, \
-        EmpathyUserInfo))
-#define EMPATHY_USER_INFO_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_CAST ((klass), EMPATHY_TYPE_USER_INFO, \
-        EmpathyUserInfoClass))
-#define EMPATHY_IS_USER_INFO(obj) \
-    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EMPATHY_TYPE_USER_INFO))
-#define EMPATHY_IS_USER_INFO_CLASS(klass) \
-    (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_USER_INFO))
-#define EMPATHY_USER_INFO_GET_CLASS(obj) \
-    (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_USER_INFO, \
-        EmpathyUserInfoClass))
-
-typedef struct _EmpathyUserInfo EmpathyUserInfo;
-typedef struct _EmpathyUserInfoClass EmpathyUserInfoClass;
-typedef struct _EmpathyUserInfoPrivate EmpathyUserInfoPrivate;
-
-struct _EmpathyUserInfo {
-  GtkGrid parent;
-
-  EmpathyUserInfoPrivate *priv;
-};
-
-struct _EmpathyUserInfoClass {
-  GtkGridClass parent_class;
-};
-
-GType empathy_user_info_get_type (void) G_GNUC_CONST;
-
-GtkWidget *empathy_user_info_new (TpAccount *account);
-
-void empathy_user_info_discard (EmpathyUserInfo *self);
-
-void empathy_user_info_apply_async (EmpathyUserInfo *self,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-gboolean empathy_user_info_apply_finish (EmpathyUserInfo *self,
-    GAsyncResult *result,
-    GError **error);
-
-
-G_END_DECLS
-
-#endif /* __EMPATHY_USER_INFO_H__ */
-
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index d221e5f98..90dc28c17 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -19,21 +19,22 @@
  */
 
 #include "config.h"
+#include "empathy-webkit-utils.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-webkit-utils.h"
 #include "empathy-smiley-manager.h"
-#include "empathy-ui-utils.h"
+#include "empathy-string-parser.h"
 #include "empathy-theme-adium.h"
+#include "empathy-ui-utils.h"
 
 #define BORING_DPI_DEFAULT 96
 
 static void
 empathy_webkit_match_newline (const gchar *text,
     gssize len,
-    EmpathyStringReplace replace_func,
-    EmpathyStringParser *sub_parsers,
+    TpawStringReplace replace_func,
+    TpawStringParser *sub_parsers,
     gpointer user_data)
 {
   GString *string = user_data;
@@ -48,14 +49,14 @@ empathy_webkit_match_newline (const gchar *text,
     {
       if (text[i] == '\n')
         {
-          empathy_string_parser_substr (text + prev, i - prev,
+          tpaw_string_parser_substr (text + prev, i - prev,
               sub_parsers, user_data);
           g_string_append (string, "<br/>");
           prev = i + 1;
         }
     }
 
-  empathy_string_parser_substr (text + prev, i - prev,
+  tpaw_string_parser_substr (text + prev, i - prev,
               sub_parsers, user_data);
 }
 
@@ -74,22 +75,22 @@ empathy_webkit_replace_smiley (const gchar *text,
       hit->path, (int)len, text, (int)len, text);
 }
 
-static EmpathyStringParser string_parsers[] = {
-  { empathy_string_match_link, empathy_string_replace_link },
+static TpawStringParser string_parsers[] = {
+  { tpaw_string_match_link, tpaw_string_replace_link },
   { empathy_webkit_match_newline, NULL },
-  { empathy_string_match_all, empathy_string_replace_escaped },
+  { tpaw_string_match_all, tpaw_string_replace_escaped },
   { NULL, NULL}
 };
 
-static EmpathyStringParser string_parsers_with_smiley[] = {
-  { empathy_string_match_link, empathy_string_replace_link },
+static TpawStringParser string_parsers_with_smiley[] = {
+  { tpaw_string_match_link, tpaw_string_replace_link },
   { empathy_string_match_smiley, empathy_webkit_replace_smiley },
   { empathy_webkit_match_newline, NULL },
-  { empathy_string_match_all, empathy_string_replace_escaped },
+  { tpaw_string_match_all, tpaw_string_replace_escaped },
   { NULL, NULL }
 };
 
-EmpathyStringParser *
+TpawStringParser *
 empathy_webkit_get_string_parser (gboolean smileys)
 {
   if (smileys)
diff --git a/libempathy-gtk/empathy-webkit-utils.h b/libempathy-gtk/empathy-webkit-utils.h
index 034e3bf55..98fdc4dcb 100644
--- a/libempathy-gtk/empathy-webkit-utils.h
+++ b/libempathy-gtk/empathy-webkit-utils.h
@@ -21,10 +21,9 @@
 #ifndef _EMPATHY_WEBKIT_UTILS__H_
 #define _EMPATHY_WEBKIT_UTILS__H_
 
+#include <tp-account-widgets/tpaw-string-parser.h>
 #include <webkit/webkit.h>
 
-#include "empathy-string-parser.h"
-
 G_BEGIN_DECLS
 
 typedef enum {
@@ -32,7 +31,7 @@ typedef enum {
     EMPATHY_WEBKIT_MENU_INSPECT = 1 << 1,
 } EmpathyWebKitMenuFlags;
 
-EmpathyStringParser * empathy_webkit_get_string_parser (gboolean smileys);
+TpawStringParser * empathy_webkit_get_string_parser (gboolean smileys);
 
 void empathy_webkit_bind_font_setting (WebKitWebView *webview,
     GSettings *gsettings,
diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c
deleted file mode 100644
index 2db1c23c0..000000000
--- a/libempathy-gtk/totem-subtitle-encoding.c
+++ /dev/null
@@ -1,584 +0,0 @@
-/* 
- * Copyright (C) 2001-2006 Bastien Nocera <hadess@hadess.net>
- *
- * encoding list copied from gnome-terminal/encoding.c
- *
- * This program 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 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
- * 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 Street, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
- * See license_change file for details.
- *
- */
-
-#include "config.h"
-#include <glib/gi18n-lib.h>
-#include "totem-subtitle-encoding.h"
-
-typedef enum
-{
-  SUBTITLE_ENCODING_CURRENT_LOCALE,
-
-  SUBTITLE_ENCODING_ISO_8859_6,
-  SUBTITLE_ENCODING_IBM_864,
-  SUBTITLE_ENCODING_MAC_ARABIC,
-  SUBTITLE_ENCODING_WINDOWS_1256,
-
-  SUBTITLE_ENCODING_ARMSCII_8,
-
-  SUBTITLE_ENCODING_ISO_8859_4,
-  SUBTITLE_ENCODING_ISO_8859_13,
-  SUBTITLE_ENCODING_WINDOWS_1257,
-
-  SUBTITLE_ENCODING_ISO_8859_14,
-
-  SUBTITLE_ENCODING_ISO_8859_2,
-  SUBTITLE_ENCODING_IBM_852,
-  SUBTITLE_ENCODING_MAC_CE,
-  SUBTITLE_ENCODING_WINDOWS_1250,
-
-  SUBTITLE_ENCODING_GB18030,
-  SUBTITLE_ENCODING_GB2312,
-  SUBTITLE_ENCODING_GBK,
-  SUBTITLE_ENCODING_HZ,
-
-  SUBTITLE_ENCODING_BIG5,
-  SUBTITLE_ENCODING_BIG5_HKSCS,
-  SUBTITLE_ENCODING_EUC_TW,
-
-  SUBTITLE_ENCODING_MAC_CROATIAN,
-
-  SUBTITLE_ENCODING_ISO_8859_5,
-  SUBTITLE_ENCODING_IBM_855,
-  SUBTITLE_ENCODING_ISO_IR_111,
-  SUBTITLE_ENCODING_KOI8_R,
-  SUBTITLE_ENCODING_MAC_CYRILLIC,
-  SUBTITLE_ENCODING_WINDOWS_1251,
-
-  SUBTITLE_ENCODING_CP_866,
-
-  SUBTITLE_ENCODING_MAC_UKRAINIAN,
-  SUBTITLE_ENCODING_KOI8_U,
-
-  SUBTITLE_ENCODING_GEOSTD8,
-
-  SUBTITLE_ENCODING_ISO_8859_7,
-  SUBTITLE_ENCODING_MAC_GREEK,
-  SUBTITLE_ENCODING_WINDOWS_1253,
-
-  SUBTITLE_ENCODING_MAC_GUJARATI,
-
-  SUBTITLE_ENCODING_MAC_GURMUKHI,
-
-  SUBTITLE_ENCODING_ISO_8859_8_I,
-  SUBTITLE_ENCODING_IBM_862,
-  SUBTITLE_ENCODING_MAC_HEBREW,
-  SUBTITLE_ENCODING_WINDOWS_1255,
-
-  SUBTITLE_ENCODING_ISO_8859_8,
-
-  SUBTITLE_ENCODING_MAC_DEVANAGARI,
-
-  SUBTITLE_ENCODING_MAC_ICELANDIC,
-
-  SUBTITLE_ENCODING_EUC_JP,
-  SUBTITLE_ENCODING_ISO_2022_JP,
-  SUBTITLE_ENCODING_SHIFT_JIS,
-
-  SUBTITLE_ENCODING_EUC_KR,
-  SUBTITLE_ENCODING_ISO_2022_KR,
-  SUBTITLE_ENCODING_JOHAB,
-  SUBTITLE_ENCODING_UHC,
-
-  SUBTITLE_ENCODING_ISO_8859_10,
-
-  SUBTITLE_ENCODING_MAC_FARSI,
-
-  SUBTITLE_ENCODING_ISO_8859_16,
-  SUBTITLE_ENCODING_MAC_ROMANIAN,
-
-  SUBTITLE_ENCODING_ISO_8859_3,
-
-  SUBTITLE_ENCODING_TIS_620,
-
-  SUBTITLE_ENCODING_ISO_8859_9,
-  SUBTITLE_ENCODING_IBM_857,
-  SUBTITLE_ENCODING_MAC_TURKISH,
-  SUBTITLE_ENCODING_WINDOWS_1254,
-
-  SUBTITLE_ENCODING_UTF_7,
-  SUBTITLE_ENCODING_UTF_8,
-  SUBTITLE_ENCODING_UTF_16,
-  SUBTITLE_ENCODING_UCS_2,
-  SUBTITLE_ENCODING_UCS_4,
-
-  SUBTITLE_ENCODING_ISO_8859_1,
-  SUBTITLE_ENCODING_ISO_8859_15,
-  SUBTITLE_ENCODING_IBM_850,
-  SUBTITLE_ENCODING_MAC_ROMAN,
-  SUBTITLE_ENCODING_WINDOWS_1252,
-
-  SUBTITLE_ENCODING_TCVN,
-  SUBTITLE_ENCODING_VISCII,
-  SUBTITLE_ENCODING_WINDOWS_1258,
-
-  SUBTITLE_ENCODING_LAST
-} SubtitleEncodingIndex;
-
-
-typedef struct
-{
-  int index;
-  gboolean valid;
-  const char *charset;
-  const char *name;
-} SubtitleEncoding;
-
-
-static SubtitleEncoding encodings[] = {
-
-  {SUBTITLE_ENCODING_CURRENT_LOCALE, TRUE,
-      NULL, N_("Current Locale")},
-
-  {SUBTITLE_ENCODING_ISO_8859_6, FALSE,
-      "ISO-8859-6", N_("Arabic")},
-  {SUBTITLE_ENCODING_IBM_864, FALSE,
-      "IBM864", N_("Arabic")},
-  {SUBTITLE_ENCODING_MAC_ARABIC, FALSE,
-      "MAC_ARABIC", N_("Arabic")},
-  {SUBTITLE_ENCODING_WINDOWS_1256, FALSE,
-      "WINDOWS-1256", N_("Arabic")},
-
-  {SUBTITLE_ENCODING_ARMSCII_8, FALSE,
-      "ARMSCII-8", N_("Armenian")},
-
-  {SUBTITLE_ENCODING_ISO_8859_4, FALSE,
-      "ISO-8859-4", N_("Baltic")},
-  {SUBTITLE_ENCODING_ISO_8859_13, FALSE,
-      "ISO-8859-13", N_("Baltic")},
-  {SUBTITLE_ENCODING_WINDOWS_1257, FALSE,
-      "WINDOWS-1257", N_("Baltic")},
-
-  {SUBTITLE_ENCODING_ISO_8859_14, FALSE,
-      "ISO-8859-14", N_("Celtic")},
-
-  {SUBTITLE_ENCODING_ISO_8859_2, FALSE,
-      "ISO-8859-2", N_("Central European")},
-  {SUBTITLE_ENCODING_IBM_852, FALSE,
-      "IBM852", N_("Central European")},
-  {SUBTITLE_ENCODING_MAC_CE, FALSE,
-      "MAC_CE", N_("Central European")},
-  {SUBTITLE_ENCODING_WINDOWS_1250, FALSE,
-      "WINDOWS-1250", N_("Central European")},
-
-  {SUBTITLE_ENCODING_GB18030, FALSE,
-      "GB18030", N_("Chinese Simplified")},
-  {SUBTITLE_ENCODING_GB2312, FALSE,
-      "GB2312", N_("Chinese Simplified")},
-  {SUBTITLE_ENCODING_GBK, FALSE,
-      "GBK", N_("Chinese Simplified")},
-  {SUBTITLE_ENCODING_HZ, FALSE,
-      "HZ", N_("Chinese Simplified")},
-
-  {SUBTITLE_ENCODING_BIG5, FALSE,
-      "BIG5", N_("Chinese Traditional")},
-  {SUBTITLE_ENCODING_BIG5_HKSCS, FALSE,
-      "BIG5-HKSCS", N_("Chinese Traditional")},
-  {SUBTITLE_ENCODING_EUC_TW, FALSE,
-      "EUC-TW", N_("Chinese Traditional")},
-
-  {SUBTITLE_ENCODING_MAC_CROATIAN, FALSE,
-      "MAC_CROATIAN", N_("Croatian")},
-
-  {SUBTITLE_ENCODING_ISO_8859_5, FALSE,
-      "ISO-8859-5", N_("Cyrillic")},
-  {SUBTITLE_ENCODING_IBM_855, FALSE,
-      "IBM855", N_("Cyrillic")},
-  {SUBTITLE_ENCODING_ISO_IR_111, FALSE,
-      "ISO-IR-111", N_("Cyrillic")},
-  {SUBTITLE_ENCODING_KOI8_R, FALSE,
-      "KOI8-R", N_("Cyrillic")},
-  {SUBTITLE_ENCODING_MAC_CYRILLIC, FALSE,
-      "MAC-CYRILLIC", N_("Cyrillic")},
-  {SUBTITLE_ENCODING_WINDOWS_1251, FALSE,
-      "WINDOWS-1251", N_("Cyrillic")},
-
-  {SUBTITLE_ENCODING_CP_866, FALSE,
-      "CP866", N_("Cyrillic/Russian")},
-
-  {SUBTITLE_ENCODING_MAC_UKRAINIAN, FALSE,
-      "MAC_UKRAINIAN", N_("Cyrillic/Ukrainian")},
-  {SUBTITLE_ENCODING_KOI8_U, FALSE,
-      "KOI8-U", N_("Cyrillic/Ukrainian")},
-
-  {SUBTITLE_ENCODING_GEOSTD8, FALSE,
-      "GEORGIAN-PS", N_("Georgian")},
-
-  {SUBTITLE_ENCODING_ISO_8859_7, FALSE,
-      "ISO-8859-7", N_("Greek")},
-  {SUBTITLE_ENCODING_MAC_GREEK, FALSE,
-      "MAC_GREEK", N_("Greek")},
-  {SUBTITLE_ENCODING_WINDOWS_1253, FALSE,
-      "WINDOWS-1253", N_("Greek")},
-
-  {SUBTITLE_ENCODING_MAC_GUJARATI, FALSE,
-      "MAC_GUJARATI", N_("Gujarati")},
-
-  {SUBTITLE_ENCODING_MAC_GURMUKHI, FALSE,
-      "MAC_GURMUKHI", N_("Gurmukhi")},
-
-  {SUBTITLE_ENCODING_ISO_8859_8_I, FALSE,
-      "ISO-8859-8-I", N_("Hebrew")},
-  {SUBTITLE_ENCODING_IBM_862, FALSE,
-      "IBM862", N_("Hebrew")},
-  {SUBTITLE_ENCODING_MAC_HEBREW, FALSE,
-      "MAC_HEBREW", N_("Hebrew")},
-  {SUBTITLE_ENCODING_WINDOWS_1255, FALSE,
-      "WINDOWS-1255", N_("Hebrew")},
-
-  {SUBTITLE_ENCODING_ISO_8859_8, FALSE,
-      "ISO-8859-8", N_("Hebrew Visual")},
-
-  {SUBTITLE_ENCODING_MAC_DEVANAGARI, FALSE,
-      "MAC_DEVANAGARI", N_("Hindi")},
-
-  {SUBTITLE_ENCODING_MAC_ICELANDIC, FALSE,
-      "MAC_ICELANDIC", N_("Icelandic")},
-
-  {SUBTITLE_ENCODING_EUC_JP, FALSE,
-      "EUC-JP", N_("Japanese")},
-  {SUBTITLE_ENCODING_ISO_2022_JP, FALSE,
-      "ISO2022JP", N_("Japanese")},
-  {SUBTITLE_ENCODING_SHIFT_JIS, FALSE,
-      "SHIFT-JIS", N_("Japanese")},
-
-  {SUBTITLE_ENCODING_EUC_KR, FALSE,
-      "EUC-KR", N_("Korean")},
-  {SUBTITLE_ENCODING_ISO_2022_KR, FALSE,
-      "ISO2022KR", N_("Korean")},
-  {SUBTITLE_ENCODING_JOHAB, FALSE,
-      "JOHAB", N_("Korean")},
-  {SUBTITLE_ENCODING_UHC, FALSE,
-      "UHC", N_("Korean")},
-
-  {SUBTITLE_ENCODING_ISO_8859_10, FALSE,
-      "ISO-8859-10", N_("Nordic")},
-
-  {SUBTITLE_ENCODING_MAC_FARSI, FALSE,
-      "MAC_FARSI", N_("Persian")},
-
-  {SUBTITLE_ENCODING_ISO_8859_16, FALSE,
-      "ISO-8859-16", N_("Romanian")},
-  {SUBTITLE_ENCODING_MAC_ROMANIAN, FALSE,
-      "MAC_ROMANIAN", N_("Romanian")},
-
-  {SUBTITLE_ENCODING_ISO_8859_3, FALSE,
-      "ISO-8859-3", N_("South European")},
-
-  {SUBTITLE_ENCODING_TIS_620, FALSE,
-      "TIS-620", N_("Thai")},
-
-  {SUBTITLE_ENCODING_ISO_8859_9, FALSE,
-      "ISO-8859-9", N_("Turkish")},
-  {SUBTITLE_ENCODING_IBM_857, FALSE,
-      "IBM857", N_("Turkish")},
-  {SUBTITLE_ENCODING_MAC_TURKISH, FALSE,
-      "MAC_TURKISH", N_("Turkish")},
-  {SUBTITLE_ENCODING_WINDOWS_1254, FALSE,
-      "WINDOWS-1254", N_("Turkish")},
-
-  {SUBTITLE_ENCODING_UTF_7, FALSE,
-      "UTF-7", N_("Unicode")},
-  {SUBTITLE_ENCODING_UTF_8, FALSE,
-      "UTF-8", N_("Unicode")},
-  {SUBTITLE_ENCODING_UTF_16, FALSE,
-      "UTF-16", N_("Unicode")},
-  {SUBTITLE_ENCODING_UCS_2, FALSE,
-      "UCS-2", N_("Unicode")},
-  {SUBTITLE_ENCODING_UCS_4, FALSE,
-      "UCS-4", N_("Unicode")},
-
-  {SUBTITLE_ENCODING_ISO_8859_1, FALSE,
-      "ISO-8859-1", N_("Western")},
-  {SUBTITLE_ENCODING_ISO_8859_15, FALSE,
-      "ISO-8859-15", N_("Western")},
-  {SUBTITLE_ENCODING_IBM_850, FALSE,
-      "IBM850", N_("Western")},
-  {SUBTITLE_ENCODING_MAC_ROMAN, FALSE,
-      "MAC_ROMAN", N_("Western")},
-  {SUBTITLE_ENCODING_WINDOWS_1252, FALSE,
-      "WINDOWS-1252", N_("Western")},
-
-  {SUBTITLE_ENCODING_TCVN, FALSE,
-      "TCVN", N_("Vietnamese")},
-  {SUBTITLE_ENCODING_VISCII, FALSE,
-      "VISCII", N_("Vietnamese")},
-  {SUBTITLE_ENCODING_WINDOWS_1258, FALSE,
-      "WINDOWS-1258", N_("Vietnamese")}
-};
-
-static const SubtitleEncoding *
-find_encoding_by_charset (const char *charset)
-{
-  int i;
-
-  i = 1;                        /* skip current locale */
-  while (i < SUBTITLE_ENCODING_LAST) {
-    if (strcasecmp (charset, encodings[i].charset) == 0)
-      return &encodings[i];
-
-    ++i;
-  }
-
-  if (strcasecmp (charset,
-          encodings[SUBTITLE_ENCODING_CURRENT_LOCALE].charset) == 0)
-    return &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
-
-  return NULL;
-}
-
-static void
-subtitle_encoding_init (void)
-{
-  int i;
-  gsize bytes_read, bytes_written;
-  gchar *converted;
-  gchar ascii_sample[96];
-
-  g_get_charset ((const char **)
-      &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE].charset);
-
-  g_assert (G_N_ELEMENTS (encodings) == SUBTITLE_ENCODING_LAST);
-
-  /* Initialize the sample text with all of the printing ASCII characters
-   * from space (32) to the tilde (126), 95 in all. */
-  for (i = 0; i < (int) sizeof (ascii_sample); i++)
-    ascii_sample[i] = i + 32;
-
-  ascii_sample[sizeof (ascii_sample) - 1] = '\0';
-
-  i = 0;
-  while (i < SUBTITLE_ENCODING_LAST) {
-    bytes_read = 0;
-    bytes_written = 0;
-
-    g_assert (encodings[i].index == i);
-
-    /* Translate the names */
-    encodings[i].name = _(encodings[i].name);
-
-    /* Test that the encoding is a proper superset of ASCII (which naive
-     * apps are going to use anyway) by attempting to validate the text
-     * using the current encoding.  This also flushes out any encodings
-     * which the underlying GIConv implementation can't support.
-     */
-    converted = g_convert (ascii_sample, sizeof (ascii_sample) - 1,
-        encodings[i].charset, encodings[i].charset,
-        &bytes_read, &bytes_written, NULL);
-
-    /* The encoding is only valid if ASCII passes through cleanly. */
-    if (i == SUBTITLE_ENCODING_CURRENT_LOCALE)
-      encodings[i].valid = TRUE;
-    else
-      encodings[i].valid =
-          (bytes_read == (sizeof (ascii_sample) - 1)) &&
-          (converted != NULL) && (strcmp (converted, ascii_sample) == 0);
-
-#ifdef DEBUG_ENCODINGS
-    if (!encodings[i].valid) {
-      g_print ("Rejecting encoding %s as invalid:\n", encodings[i].charset);
-      g_print (" input  \"%s\"\n", ascii_sample);
-      g_print (" output \"%s\"\n\n", converted ? converted : "(null)");
-    }
-#endif
-
-    /* Discard the converted string. */
-    g_free (converted);
-
-    ++i;
-  }
-}
-
-static int
-subtitle_encoding_get_index (const char *charset)
-{
-  const SubtitleEncoding *e;
-
-  e = find_encoding_by_charset (charset);
-  if (e != NULL)
-    return e->index;
-  else
-    return SUBTITLE_ENCODING_CURRENT_LOCALE;
-}
-
-static const char *
-subtitle_encoding_get_charset (int index_)
-{
-  const SubtitleEncoding *e;
-
-  if (index_ >= SUBTITLE_ENCODING_LAST)
-    e = &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
-  else if (index_ < SUBTITLE_ENCODING_CURRENT_LOCALE)
-    e = &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
-  else if (!encodings[index_].valid)
-    e = &encodings[SUBTITLE_ENCODING_CURRENT_LOCALE];
-  else
-    e = &encodings[index_];
-  return e->charset;
-}
-
-enum
-{
-  INDEX_COL,
-  NAME_COL
-};
-
-static gint
-compare (GtkTreeModel * model, GtkTreeIter * a, GtkTreeIter * b, gpointer data)
-{
-  gchar *str_a, *str_b;
-  gint result;
-
-  gtk_tree_model_get (model, a, NAME_COL, &str_a, -1);
-  gtk_tree_model_get (model, b, NAME_COL, &str_b, -1);
-
-  result = strcmp (str_a, str_b);
-
-  g_free (str_a);
-  g_free (str_b);
-
-  return result;
-}
-
-static void
-is_encoding_sensitive (GtkCellLayout * cell_layout,
-    GtkCellRenderer * cell,
-    GtkTreeModel * tree_model, GtkTreeIter * iter, gpointer data)
-{
-
-  gboolean sensitive;
-
-  sensitive = !gtk_tree_model_iter_has_child (tree_model, iter);
-  g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
-static GtkTreeModel *
-subtitle_encoding_create_store (void)
-{
-  gchar *label;
-  const gchar *lastlang = "";
-  GtkTreeIter iter, iter2;
-  GtkTreeStore *store;
-  int i;
-
-  store = gtk_tree_store_new (2, G_TYPE_INT, G_TYPE_STRING);
-
-  for (i = 0; i < SUBTITLE_ENCODING_LAST; i++) {
-    if (encodings[i].valid) {
-      if (strcmp (lastlang, encodings[i].name)) {
-        lastlang = encodings[i].name;
-        gtk_tree_store_append (store, &iter, NULL);
-        gtk_tree_store_set (store, &iter, INDEX_COL,
-            -1, NAME_COL, lastlang, -1);
-      }
-      label = g_strdup_printf("%s (%s)", lastlang, encodings[i].charset);
-      gtk_tree_store_append (store, &iter2, &iter);
-      gtk_tree_store_set (store, &iter2, INDEX_COL,
-          encodings[i].index, NAME_COL, label, -1);
-      g_free(label);
-    }
-  }
-  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (store),
-      compare, NULL, NULL);
-  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
-      NAME_COL, GTK_SORT_ASCENDING);
-  return GTK_TREE_MODEL (store);
-}
-
-static void
-subtitle_encoding_combo_render (GtkComboBox * combo)
-{
-  GtkCellRenderer *renderer;
-
-  renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
-      "text", NAME_COL, NULL);
-  gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-      renderer, is_encoding_sensitive, NULL, NULL);
-}
-
-const char *
-totem_subtitle_encoding_get_selected (GtkComboBox * combo)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter;
-  gint index_ = -1;
-
-  model = gtk_combo_box_get_model (combo);
-  if (gtk_combo_box_get_active_iter (combo, &iter)) {
-    gtk_tree_model_get (model, &iter, INDEX_COL, &index_, -1);
-  }
-  if (index_ == -1)
-    return NULL;
-  return subtitle_encoding_get_charset (index_);
-}
-
-void
-totem_subtitle_encoding_set (GtkComboBox * combo, const char *encoding)
-{
-  GtkTreeModel *model;
-  GtkTreeIter iter, iter2;
-  gint index_, i;
-
-  g_return_if_fail (encoding != NULL);
-
-  model = gtk_combo_box_get_model (combo);
-  index_ = subtitle_encoding_get_index (encoding);
-  gtk_tree_model_get_iter_first (model, &iter);
-  do {
-    if (!gtk_tree_model_iter_has_child (model, &iter))
-      continue;
-    if (!gtk_tree_model_iter_children (model, &iter2, &iter))
-      continue;
-    do {
-      gtk_tree_model_get (model, &iter2, INDEX_COL, &i, -1);
-      if (i == index_)
-        break;
-    } while (gtk_tree_model_iter_next (model, &iter2));
-    if (i == index_)
-      break;
-  } while (gtk_tree_model_iter_next (model, &iter));
-  gtk_combo_box_set_active_iter (combo, &iter2);
-}
-
-void
-totem_subtitle_encoding_init (GtkComboBox *combo)
-{
-  GtkTreeModel *model;
-  subtitle_encoding_init ();
-  model = subtitle_encoding_create_store ();
-  gtk_combo_box_set_model (combo, model);
-  g_object_unref (model);
-  subtitle_encoding_combo_render (combo);
-}
-
-/*
- * vim: sw=2 ts=8 cindent noai bs=2
- */
diff --git a/libempathy-gtk/totem-subtitle-encoding.h b/libempathy-gtk/totem-subtitle-encoding.h
deleted file mode 100644
index 656c0dec5..000000000
--- a/libempathy-gtk/totem-subtitle-encoding.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 
- * Copyright (C) 2001-2006 Bastien Nocera <hadess@hadess.net>
- *
- * encoding list copied from gnome-terminal/encoding.c
- *
- * This program 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 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
- * 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 Street, Fifth Floor, Boston, MA  02110-1301 USA
- *
- * The Totem project hereby grant permission for non-gpl compatible GStreamer
- * plugins to be used and distributed together with GStreamer and Totem. This
- * permission are above and beyond the permissions granted by the GPL license
- * Totem is covered by.
- *
- * Monday 7th February 2005: Christian Schaller: Add exception clause.
- * See license_change file for details.
- *
- */
-
-/* Encoding stuff */
-
-#ifndef TOTEM_SUBTITLE_ENCODING_H
-#define TOTEM_SUBTITLE_ENCODING_H
-
-#include <gtk/gtk.h>
-
-void totem_subtitle_encoding_init (GtkComboBox *combo);
-void totem_subtitle_encoding_set (GtkComboBox *combo, const char *encoding);
-const char * totem_subtitle_encoding_get_selected (GtkComboBox *combo);
-
-#endif /* SUBTITLE_ENCODING_H */
diff --git a/libempathy/.gitignore b/libempathy/.gitignore
index 8617dcbd0..5cc6b3397 100644
--- a/libempathy/.gitignore
+++ b/libempathy/.gitignore
@@ -1,4 +1,5 @@
 empathy-chandler-glue.h
+empathy-dtd-resources.[ch]
 empathy-marshal.*
 empathy-filter-glue.h
 tp-stream-engine-gen.h
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 36de4d6c2..267781185 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,37 +2,35 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
 	$(ERROR_CFLAGS)					\
-	-I.                                             \
-	-I$(top_srcdir)                                 \
+	-I$(top_srcdir)/extensions                      \
 	-I$(top_builddir)                               \
 	-DDATADIR=\""$(datadir)"\"              	\
 	-DLOCALEDIR=\""$(datadir)/locale"\"		\
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(GEOCLUE_CFLAGS)				\
 	$(GEOCODE_CFLAGS)				\
 	$(NETWORK_MANAGER_CFLAGS)			\
 	$(CONNMAN_CFLAGS)				\
-	$(UDEV_CFLAGS)					\
 	$(GOA_CFLAGS)					\
 	$(UOA_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
+	empathy-dtd-resources.c				\
+	empathy-dtd-resources.h				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c
 
 libempathy_headers =				\
 	action-chain-internal.h			\
-	empathy-account-settings.h		\
 	empathy-auth-factory.h			\
-	empathy-camera-monitor.h		\
 	empathy-chatroom-manager.h		\
 	empathy-chatroom.h			\
 	empathy-client-factory.h \
-	empathy-connection-managers.h		\
 	empathy-connection-aggregator.h		\
 	empathy-contact-groups.h		\
 	empathy-contact.h			\
@@ -42,10 +40,6 @@ libempathy_headers =				\
 	empathy-gsettings.h			\
 	empathy-presence-manager.h				\
 	empathy-individual-manager.h		\
-	empathy-irc-network-manager.h		\
-	empathy-irc-network.h			\
-	empathy-irc-server.h			\
-	empathy-keyring.h 			\
 	empathy-location.h			\
 	empathy-message.h			\
 	empathy-pkg-kit.h		\
@@ -54,7 +48,6 @@ libempathy_headers =				\
 	empathy-server-sasl-handler.h		\
 	empathy-server-tls-handler.h		\
 	empathy-status-presets.h		\
-	empathy-time.h				\
 	empathy-tls-verifier.h			\
 	empathy-tp-chat.h			\
 	empathy-types.h				\
@@ -63,13 +56,10 @@ libempathy_headers =				\
 libempathy_handwritten_source =				\
 	$(libempathy_headers)				\
 	action-chain.c					\
-	empathy-account-settings.c			\
 	empathy-auth-factory.c				\
-	empathy-camera-monitor.c			\
 	empathy-chatroom-manager.c			\
 	empathy-chatroom.c				\
 	empathy-client-factory.c \
-	empathy-connection-managers.c			\
 	empathy-connection-aggregator.c		\
 	empathy-contact-groups.c			\
 	empathy-contact.c				\
@@ -78,10 +68,6 @@ libempathy_handwritten_source =				\
 	empathy-ft-handler.c				\
 	empathy-presence-manager.c					\
 	empathy-individual-manager.c			\
-	empathy-irc-network-manager.c			\
-	empathy-irc-network.c				\
-	empathy-irc-server.c				\
-	empathy-keyring.c				\
 	empathy-message.c				\
 	empathy-pkg-kit.c		\
 	empathy-request-util.c				\
@@ -89,7 +75,6 @@ libempathy_handwritten_source =				\
 	empathy-server-sasl-handler.c			\
 	empathy-server-tls-handler.c			\
 	empathy-status-presets.c			\
-	empathy-time.c					\
 	empathy-tls-verifier.c				\
 	empathy-tp-chat.c				\
 	empathy-utils.c
@@ -104,8 +89,6 @@ goa_sources = \
 uoa_sources = \
 	empathy-uoa-auth-handler.c \
 	empathy-uoa-auth-handler.h \
-	empathy-uoa-utils.c \
-	empathy-uoa-utils.h \
 	$(NULL)
 
 pkglib_LTLIBRARIES = libempathy.la
@@ -119,12 +102,13 @@ libempathy_la_LDFLAGS = \
 
 libempathy_la_SOURCES = \
 	$(libempathy_handwritten_source) \
-	cheese-camera-device-monitor.c cheese-camera-device-monitor.h
+	$(NULL)
 
 libempathy_la_LIBADD =		\
 	$(top_builddir)/extensions/libemp-extensions.la \
 	$(GCR_LIBS) \
 	$(EMPATHY_LIBS) \
+	$(TPAW_LIBS) \
 	$(GEOCLUE_LIBS) \
 	$(GEOCODE_LIBS) \
 	$(NETWORK_MANAGER_LIBS) \
@@ -134,20 +118,24 @@ libempathy_la_LIBADD =		\
 	$(UOA_LIBS) \
 	$(LIBM)
 
-dtddir = $(datadir)/empathy
-dtd_DATA = 					\
+dtd_resources_files =				\
 	empathy-status-presets.dtd		\
 	empathy-contact-groups.dtd		\
 	empathy-chatroom-manager.dtd		\
-	empathy-irc-networks.dtd
+	$(NULL)
+
+dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/empathy-dtd.gresource.xml)
 
-ircnetworksdir = $(datadir)/empathy
-ircnetworks_DATA =		\
-	irc-networks.xml
+empathy-dtd-resources.c: empathy-dtd.gresource.xml $(dtd_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
 
-EXTRA_DIST = 			\
-	$(dtd_DATA)		\
-	$(ircnetworks_DATA)
+empathy-dtd-resources.h: empathy-dtd.gresource.xml $(dtd_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+
+EXTRA_DIST = 				\
+	empathy-dtd.gresource.xml	\
+	$(dtd_resources_files)		\
+	$(NULL)
 
 CLEANFILES = 				\
 	$(BUILT_SOURCES)		\
@@ -189,7 +177,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
 			--ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \
-			--fprod "#include <libempathy/@filename@>\n" \
+			--fprod '#include "@filename@"\n' \
 			--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
 			--eprod "GType @enum_name@_get_type (void);\n" \
 		$(libempathy_headers) ) > xgen-gth \
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
deleted file mode 100644
index 3b937ce9a..000000000
--- a/libempathy/cheese-camera-device-monitor.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/* This file is a copy of cheese-camera-device-monitor.c from Empathy. We
- * just renamespaced it to avoid conflicts when linking on libcheese. */
-/*
- * Copyright © 2007,2008 Jaap Haitsma <jaap@haitsma.org>
- * Copyright © 2007-2009 daniel g. siegel <dgsiegel@gnome.org>
- * Copyright © 2008 Ryan Zeigler <zeiglerr@gmail.com>
- * Copyright © 2010 Filippo Argiolas <filippo.argiolas@gmail.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-#ifdef HAVE_CONFIG_H
-  #include "config.h"
-#endif
-
-#include <string.h>
-
-#ifdef HAVE_UDEV
-  #define G_UDEV_API_IS_SUBJECT_TO_CHANGE 1
-  #include <gudev/gudev.h>
-#else
-  #include <fcntl.h>
-  #include <unistd.h>
-  #include <sys/ioctl.h>
-  #if USE_SYS_VIDEOIO_H > 0
-    #include <sys/types.h>
-    #include <sys/videoio.h>
-  #elif defined (__sun)
-    #include <sys/types.h>
-    #include <sys/videodev2.h>
-  #endif /* USE_SYS_VIDEOIO_H */
-#endif
-
-#include "cheese-camera-device-monitor.h"
-
-/**
- * SECTION:cheese-camera-device-monitor
- * @short_description: Simple object to enumerate v4l devices
- * @include: cheese/cheese-camera-device-monitor.h
- *
- * #EmpathyCameraDeviceMonitor provides a basic interface for
- * video4linux device enumeration and hotplugging.
- *
- * It uses either GUdev or some platform specific code to list video
- * devices.  It is also capable (right now in linux only, with the
- * udev backend) to monitor device plugging and emit a
- * EmpathyCameraDeviceMonitor::added or
- * EmpathyCameraDeviceMonitor::removed signal when an event happens.
- */
-
-G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE_OBJECT)
-
-#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),                               \
-                                                                                  EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                                  EmpathyCameraDeviceMonitorPrivate))
-
-#define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-enum EmpathyCameraDeviceMonitorError
-{
-  EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_UNKNOWN,
-  EMPATHY_CAMERA_DEVICE_MONITOR_ERROR_ELEMENT_NOT_FOUND
-};
-
-typedef struct
-{
-#ifdef HAVE_UDEV
-  GUdevClient *client;
-#else
-  guint filler;
-#endif /* HAVE_UDEV */
-} EmpathyCameraDeviceMonitorPrivate;
-
-enum
-{
-  ADDED,
-  REMOVED,
-  LAST_SIGNAL
-};
-
-static guint monitor_signals[LAST_SIGNAL];
-
-#if 0
-GQuark
-empathy_camera_device_monitor_error_quark (void)
-{
-  return g_quark_from_static_string ("empathy-camera-error-quark");
-}
-#endif
-
-#ifdef HAVE_UDEV
-static void
-empathy_camera_device_monitor_added (EmpathyCameraDeviceMonitor *monitor,
-                                    GUdevDevice               *udevice)
-{
-  const char *device_file;
-  const char *product_name;
-  const char *vendor;
-  const char *product;
-  const char *bus;
-  gint        vendor_id   = 0;
-  gint        product_id  = 0;
-  gint        v4l_version = 0;
-
-  const gchar *devpath = g_udev_device_get_property (udevice, "DEVPATH");
-
-  DEBUG ("Checking udev device '%s'", devpath);
-
-  bus = g_udev_device_get_property (udevice, "ID_BUS");
-  if (g_strcmp0 (bus, "usb") == 0)
-  {
-    vendor = g_udev_device_get_property (udevice, "ID_VENDOR_ID");
-    if (vendor != NULL)
-      vendor_id = g_ascii_strtoll (vendor, NULL, 16);
-    product = g_udev_device_get_property (udevice, "ID_MODEL_ID");
-    if (product != NULL)
-      product_id = g_ascii_strtoll (product, NULL, 16);
-    if (vendor_id == 0 || product_id == 0)
-    {
-      DEBUG ("Error getting vendor and product id");
-    }
-    else
-    {
-      DEBUG ("Found device %04x:%04x, getting capabilities...", vendor_id, product_id);
-    }
-  }
-  else
-  {
-    DEBUG ("Not an usb device, skipping vendor and model id retrieval");
-  }
-
-  device_file = g_udev_device_get_device_file (udevice);
-  if (device_file == NULL)
-  {
-    DEBUG ("Error getting V4L device");
-    return;
-  }
-
-  /* vbi devices support capture capability too, but cannot be used,
-   * so detect them by device name */
-  if (strstr (device_file, "vbi"))
-  {
-    DEBUG ("Skipping vbi device: %s", device_file);
-    return;
-  }
-
-  v4l_version = g_udev_device_get_property_as_int (udevice, "ID_V4L_VERSION");
-  if (v4l_version == 2 || v4l_version == 1)
-  {
-    const char *caps;
-
-    caps = g_udev_device_get_property (udevice, "ID_V4L_CAPABILITIES");
-    if (caps == NULL || strstr (caps, ":capture:") == NULL)
-    {
-      DEBUG ("Device %s seems to not have the capture capability, (radio tuner?)"
-                   "Removing it from device list.", device_file);
-      return;
-    }
-    product_name = g_udev_device_get_property (udevice, "ID_V4L_PRODUCT");
-  }
-  else if (v4l_version == 0)
-  {
-    DEBUG ("Fix your udev installation to include v4l_id, ignoring %s", device_file);
-    return;
-  }
-  else
-  {
-    g_assert_not_reached ();
-  }
-
-  g_signal_emit (monitor, monitor_signals[ADDED], 0,
-                 devpath,
-                 device_file,
-                 product_name,
-                 v4l_version);
-}
-
-static void
-empathy_camera_device_monitor_removed (EmpathyCameraDeviceMonitor *monitor,
-                                      GUdevDevice               *udevice)
-{
-  g_signal_emit (monitor, monitor_signals[REMOVED], 0,
-                 g_udev_device_get_property (udevice, "DEVPATH"));
-}
-
-static void
-empathy_camera_device_monitor_uevent_cb (GUdevClient               *client,
-                                        const gchar               *action,
-                                        GUdevDevice               *udevice,
-                                        EmpathyCameraDeviceMonitor *monitor)
-{
-  if (g_str_equal (action, "remove"))
-    empathy_camera_device_monitor_removed (monitor, udevice);
-  else if (g_str_equal (action, "add"))
-    empathy_camera_device_monitor_added (monitor, udevice);
-}
-
-/**
- * empathy_camera_device_monitor_coldplug:
- * @monitor: a #EmpathyCameraDeviceMonitor object.
- *
- * Will actively look for plugged in cameras and emit
- * ::added for those new cameras.
- * This is only required when your program starts, so as to connect
- * to those signals before they are emitted.
- */
-void
-empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
-{
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
-  GList                            *devices, *l;
-  gint                              i = 0;
-
-  if (priv->client == NULL)
-    return;
-
-  DEBUG ("Probing devices with udev...");
-
-  devices = g_udev_client_query_by_subsystem (priv->client, "video4linux");
-
-  /* Initialize camera structures */
-  for (l = devices; l != NULL; l = l->next)
-  {
-    empathy_camera_device_monitor_added (monitor, l->data);
-    g_object_unref (l->data);
-    i++;
-  }
-  g_list_free (devices);
-
-  if (i == 0) DEBUG ("No device found");
-}
-
-#else /* HAVE_UDEV */
-void
-empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor)
-{
-  #if 0
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
-  struct v4l2_capability            v2cap;
-  struct video_capability           v1cap;
-  int                               fd, ok;
-
-  if ((fd = open (device_path, O_RDONLY | O_NONBLOCK)) < 0)
-  {
-    g_warning ("Failed to open %s: %s", device_path, strerror (errno));
-    return;
-  }
-  ok = ioctl (fd, VIDIOC_QUERYCAP, &v2cap);
-  if (ok < 0)
-  {
-    ok = ioctl (fd, VIDIOCGCAP, &v1cap);
-    if (ok < 0)
-    {
-      g_warning ("Error while probing v4l capabilities for %s: %s",
-                 device_path, strerror (errno));
-      close (fd);
-      return;
-    }
-    g_print ("Detected v4l device: %s\n", v1cap.name);
-    g_print ("Device type: %d\n", v1cap.type);
-    gstreamer_src = "v4lsrc";
-    product_name  = v1cap.name;
-  }
-  else
-  {
-    guint cap = v2cap.capabilities;
-    g_print ("Detected v4l2 device: %s\n", v2cap.card);
-    g_print ("Driver: %s, version: %d\n", v2cap.driver, v2cap.version);
-
-    /* g_print ("Bus info: %s\n", v2cap.bus_info); */ /* Doesn't seem anything useful */
-    g_print ("Capabilities: 0x%08X\n", v2cap.capabilities);
-    if (!(cap & V4L2_CAP_VIDEO_CAPTURE))
-    {
-      g_print ("Device %s seems to not have the capture capability, (radio tuner?)\n"
-               "Removing it from device list.\n", device_path);
-      close (fd);
-      return;
-    }
-    gstreamer_src = "v4l2src";
-    product_name  = (char *) v2cap.card;
-  }
-  close (fd);
-
-  GList *devices, *l;
-
-  g_print ("Probing devices with udev...\n");
-
-  if (priv->client == NULL)
-    return;
-
-  devices = g_udev_client_query_by_subsystem (priv->client, "video4linux");
-
-  /* Initialize camera structures */
-  for (l = devices; l != NULL; l = l->next)
-  {
-    empathy_camera_device_monitor_added (monitor, l->data);
-    g_object_unref (l->data);
-  }
-  g_list_free (devices);
-  #endif
-}
-
-#endif /* HAVE_UDEV */
-
-static void
-empathy_camera_device_monitor_finalize (GObject *object)
-{
-#ifdef HAVE_UDEV
-  EmpathyCameraDeviceMonitor *monitor = EMPATHY_CAMERA_DEVICE_MONITOR (object);
-  EmpathyCameraDeviceMonitorPrivate *priv = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
-
-  if (priv->client != NULL)
-  {
-    g_object_unref (priv->client);
-    priv->client = NULL;
-  }
-#endif /* HAVE_UDEV */
-  G_OBJECT_CLASS (empathy_camera_device_monitor_parent_class)->finalize (object);
-}
-
-static void
-empathy_camera_device_monitor_class_init (EmpathyCameraDeviceMonitorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = empathy_camera_device_monitor_finalize;
-
-  /**
-   * EmpathyCameraDeviceMonitor::added:
-   * @device: A private object representing the newly added camera.
-   * @id: Device unique identifier.
-   * @device: Device file name  (e.g. /dev/video2).
-   * @product_name: Device product name (human readable, intended to be displayed in a UI).
-   * @api_version: Supported video4linux API: 1 for v4l, 2 for v4l2.
-   *
-   * The ::added signal is emitted when a camera is added, or on start-up
-   * after #empathy_camera_device_monitor_colplug is called.
-   **/
-  monitor_signals[ADDED] = g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
-                                         G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                                         G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, added),
-                                         NULL, NULL,
-                                         g_cclosure_marshal_generic,
-                                         G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
-
-  /**
-   * EmpathyCameraDeviceMonitor::removed:
-   * @device: A private object representing the newly added camera
-   * @id: Device unique identifier.
-   *
-   * The ::removed signal is emitted when a camera is un-plugged, or
-   * disabled on the system.
-   **/
-  monitor_signals[REMOVED] = g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
-                                           G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-                                           G_STRUCT_OFFSET (EmpathyCameraDeviceMonitorClass, removed),
-                                           NULL, NULL,
-                                           g_cclosure_marshal_generic,
-                                           G_TYPE_NONE, 1, G_TYPE_STRING);
-
-  g_type_class_add_private (klass, sizeof (EmpathyCameraDeviceMonitorPrivate));
-}
-
-static void
-empathy_camera_device_monitor_init (EmpathyCameraDeviceMonitor *monitor)
-{
-#ifdef HAVE_UDEV
-  EmpathyCameraDeviceMonitorPrivate *priv         = EMPATHY_CAMERA_DEVICE_MONITOR_GET_PRIVATE (monitor);
-  const gchar *const                subsystems[] = {"video4linux", NULL};
-
-  priv->client = g_udev_client_new (subsystems);
-  g_signal_connect (G_OBJECT (priv->client), "uevent",
-                    G_CALLBACK (empathy_camera_device_monitor_uevent_cb), monitor);
-#endif /* HAVE_UDEV */
-}
-
-/**
- * empathy_camera_device_monitor_new:
- *
- * Returns a new #EmpathyCameraDeviceMonitor object.
- *
- * Return value: a new #EmpathyCameraDeviceMonitor object.
- **/
-EmpathyCameraDeviceMonitor *
-empathy_camera_device_monitor_new (void)
-{
-  return g_object_new (EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, NULL);
-}
-
-/*
- * vim: sw=2 ts=8 cindent noai bs=2
- */
diff --git a/libempathy/cheese-camera-device-monitor.h b/libempathy/cheese-camera-device-monitor.h
deleted file mode 100644
index f3cc3db14..000000000
--- a/libempathy/cheese-camera-device-monitor.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* This file is a copy of cheese-camera-device-monitor.h from Empathy. We
- * just renamespaced it to avoid conflicts when linking on libcheese. */
-/*
- * Copyright © 2007,2008 Jaap Haitsma <jaap@haitsma.org>
- * Copyright © 2007-2009 daniel g. siegel <dgsiegel@gnome.org>
- * Copyright © 2008 Ryan zeigler <zeiglerr@gmail.com>
- *
- * Licensed under the GNU General Public License Version 2
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifndef __EMPATHY_CAMERA_DEVICE_MONITOR_H__
-#define __EMPATHY_CAMERA_DEVICE_MONITOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define EMPATHY_TYPE_CAMERA_DEVICE_MONITOR (empathy_camera_device_monitor_get_type ())
-#define EMPATHY_CAMERA_DEVICE_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                               EmpathyCameraDeviceMonitor))
-#define EMPATHY_CAMERA_DEVICE_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                            EmpathyCameraDeviceMonitorClass))
-#define EMPATHY_IS_CAMERA_DEVICE_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR))
-#define EMPATHY_IS_CAMERA_DEVICE_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR))
-#define EMPATHY_CAMERA_DEVICE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CAMERA_DEVICE_MONITOR, \
-                                                                              EmpathyCameraDeviceMonitorClass))
-
-typedef struct _EmpathyCameraDeviceMonitorClass EmpathyCameraDeviceMonitorClass;
-typedef struct _EmpathyCameraDeviceMonitor EmpathyCameraDeviceMonitor;
-
-struct _EmpathyCameraDeviceMonitor
-{
-  GObject parent;
-};
-
-struct _EmpathyCameraDeviceMonitorClass
-{
-  GObjectClass parent_class;
-
-  void (*added)(EmpathyCameraDeviceMonitor *camera,
-                const char                *id,
-                const char                *device_file,
-                const char                *product_name,
-                int                        api_version);
-  void (*removed)(EmpathyCameraDeviceMonitor *camera, const char *id);
-};
-
-GType                      empathy_camera_device_monitor_get_type (void) G_GNUC_CONST;
-EmpathyCameraDeviceMonitor *empathy_camera_device_monitor_new (void);
-void                       empathy_camera_device_monitor_coldplug (EmpathyCameraDeviceMonitor *monitor);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_CAMERA_DEVICE_MONITOR_H__ */
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
deleted file mode 100644
index 12b28b8ba..000000000
--- a/libempathy/empathy-account-settings.c
+++ /dev/null
@@ -1,1727 +0,0 @@
-/*
- * empathy-account-settings.c - Source for EmpathyAccountSettings
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@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-account-settings.h"
-#include "empathy-connection-managers.h"
-#include "empathy-keyring.h"
-#include "empathy-utils.h"
-#include "empathy-presence-manager.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings)
-
-G_DEFINE_TYPE(EmpathyAccountSettings, empathy_account_settings, G_TYPE_OBJECT)
-
-enum {
-  PROP_ACCOUNT = 1,
-  PROP_CM_NAME,
-  PROP_PROTOCOL,
-  PROP_SERVICE,
-  PROP_DISPLAY_NAME,
-  PROP_DISPLAY_NAME_OVERRIDDEN,
-  PROP_READY
-};
-
-enum {
-  PASSWORD_RETRIEVED = 1,
-  LAST_SIGNAL
-};
-
-static gulong signals[LAST_SIGNAL] = { 0, };
-
-/* private structure */
-typedef struct _EmpathyAccountSettingsPriv EmpathyAccountSettingsPriv;
-
-struct _EmpathyAccountSettingsPriv
-{
-  gboolean dispose_has_run;
-  EmpathyConnectionManagers *managers;
-  TpAccountManager *account_manager;
-
-  TpConnectionManager *manager;
-  TpProtocol *protocol_obj;
-
-  TpAccount *account;
-  gchar *cm_name;
-  gchar *protocol;
-  gchar *service;
-  gchar *display_name;
-  gchar *icon_name;
-  gchar *storage_provider;
-  gboolean display_name_overridden;
-  gboolean ready;
-
-  gboolean supports_sasl;
-  gboolean remember_password;
-
-  gchar *password;
-  gchar *password_original;
-
-  gboolean password_retrieved;
-  gboolean password_requested;
-
-  /* Parameter name (gchar *) -> parameter value (GVariant) */
-  GHashTable *parameters;
-  /* Keys are parameter names from the hash above (gchar *).
-   * Values are regular expresions that should match corresponding parameter
-   * values (GRegex *). Possible regexp patterns are defined in
-   * empathy-account-widget.c */
-  GHashTable *param_regexps;
-  GArray *unset_parameters;
-  GList *required_params;
-
-  gulong managers_ready_id;
-  gboolean preparing_protocol;
-
-  /* If TRUE, the account should have 'tel' in its
-   * Account.Interface.Addressing.URISchemes property. */
-  gboolean uri_scheme_tel;
-  /* If TRUE, Service property needs to be updated when applying changes */
-  gboolean update_service;
-
-  GSimpleAsyncResult *apply_result;
-};
-
-static void
-empathy_account_settings_init (EmpathyAccountSettings *obj)
-{
-  EmpathyAccountSettingsPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE ((obj),
-    EMPATHY_TYPE_ACCOUNT_SETTINGS, EmpathyAccountSettingsPriv);
-
-  obj->priv = priv;
-
-  /* allocate any data required by the object here */
-  priv->managers = empathy_connection_managers_dup_singleton ();
-  priv->account_manager = tp_account_manager_dup ();
-
-  priv->parameters = g_hash_table_new_full (g_str_hash, g_str_equal,
-    g_free, (GDestroyNotify) g_variant_unref);
-
-  priv->param_regexps = g_hash_table_new_full (g_str_hash, g_str_equal,
-    g_free, (GDestroyNotify) g_regex_unref);
-
-  priv->unset_parameters = g_array_new (TRUE, FALSE, sizeof (gchar *));
-
-  priv->required_params = NULL;
-}
-
-static void empathy_account_settings_dispose (GObject *object);
-static void empathy_account_settings_finalize (GObject *object);
-static void empathy_account_settings_account_ready_cb (GObject *source_object,
-    GAsyncResult *result, gpointer user_data);
-static void empathy_account_settings_managers_ready_cb (GObject *obj,
-    GParamSpec *pspec, gpointer user_data);
-static void empathy_account_settings_check_readyness (
-    EmpathyAccountSettings *self);
-
-static void
-empathy_account_settings_set_property (GObject *object,
-    guint prop_id,
-    const GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (object);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  switch (prop_id)
-    {
-      case PROP_ACCOUNT:
-        priv->account = g_value_dup_object (value);
-        break;
-      case PROP_CM_NAME:
-        priv->cm_name = g_value_dup_string (value);
-        break;
-      case PROP_PROTOCOL:
-        priv->protocol = g_value_dup_string (value);
-        break;
-      case PROP_SERVICE:
-        priv->service = g_value_dup_string (value);
-        break;
-      case PROP_DISPLAY_NAME:
-        priv->display_name = g_value_dup_string (value);
-        break;
-      case PROP_DISPLAY_NAME_OVERRIDDEN:
-        priv->display_name_overridden = g_value_get_boolean (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_account_settings_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (object);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  switch (prop_id)
-    {
-      case PROP_ACCOUNT:
-        g_value_set_object (value, priv->account);
-        break;
-      case PROP_CM_NAME:
-        g_value_set_string (value, priv->cm_name);
-        break;
-      case PROP_PROTOCOL:
-        g_value_set_string (value, priv->protocol);
-        break;
-      case PROP_SERVICE:
-        g_value_set_string (value, priv->service);
-        break;
-      case PROP_DISPLAY_NAME:
-        g_value_set_string (value, priv->display_name);
-        break;
-      case PROP_DISPLAY_NAME_OVERRIDDEN:
-        g_value_set_boolean (value, priv->display_name_overridden);
-        break;
-      case PROP_READY:
-        g_value_set_boolean (value, priv->ready);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_account_settings_constructed (GObject *object)
-{
-  EmpathyAccountSettings *self = EMPATHY_ACCOUNT_SETTINGS (object);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  if (priv->account != NULL)
-    {
-      g_free (priv->cm_name);
-      g_free (priv->protocol);
-      g_free (priv->service);
-
-      priv->cm_name =
-        g_strdup (tp_account_get_cm_name (priv->account));
-      priv->protocol =
-        g_strdup (tp_account_get_protocol_name (priv->account));
-      priv->service =
-        g_strdup (tp_account_get_service (priv->account));
-      priv->icon_name = g_strdup
-        (tp_account_get_icon_name (priv->account));
-    }
-  else
-    {
-      priv->icon_name = empathy_protocol_icon_name (priv->protocol);
-    }
-
-  g_assert (priv->cm_name != NULL && priv->protocol != NULL);
-
-  empathy_account_settings_check_readyness (self);
-
-  if (!priv->ready)
-    {
-      GQuark features[] = {
-          TP_ACCOUNT_FEATURE_CORE,
-          TP_ACCOUNT_FEATURE_STORAGE,
-          TP_ACCOUNT_FEATURE_ADDRESSING,
-          0 };
-
-      if (priv->account != NULL)
-        {
-          tp_proxy_prepare_async (priv->account, features,
-              empathy_account_settings_account_ready_cb, self);
-        }
-
-      tp_g_signal_connect_object (priv->managers, "notify::ready",
-        G_CALLBACK (empathy_account_settings_managers_ready_cb), object, 0);
-    }
-
-  if (G_OBJECT_CLASS (
-        empathy_account_settings_parent_class)->constructed != NULL)
-    G_OBJECT_CLASS (
-        empathy_account_settings_parent_class)->constructed (object);
-}
-
-
-static void
-empathy_account_settings_class_init (
-    EmpathyAccountSettingsClass *empathy_account_settings_class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (empathy_account_settings_class);
-
-  g_type_class_add_private (empathy_account_settings_class, sizeof
-      (EmpathyAccountSettingsPriv));
-
-  object_class->dispose = empathy_account_settings_dispose;
-  object_class->finalize = empathy_account_settings_finalize;
-  object_class->set_property = empathy_account_settings_set_property;
-  object_class->get_property = empathy_account_settings_get_property;
-  object_class->constructed = empathy_account_settings_constructed;
-
-  g_object_class_install_property (object_class, PROP_ACCOUNT,
-    g_param_spec_object ("account",
-      "Account",
-      "The TpAccount backing these settings",
-      TP_TYPE_ACCOUNT,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_CM_NAME,
-    g_param_spec_string ("connection-manager",
-      "connection-manager",
-      "The name of the connection manager this account uses",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_PROTOCOL,
-    g_param_spec_string ("protocol",
-      "Protocol",
-      "The name of the protocol this account uses",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_SERVICE,
-    g_param_spec_string ("service",
-      "Service",
-      "The service of this account, or NULL",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_DISPLAY_NAME,
-    g_param_spec_string ("display-name",
-      "display-name",
-      "The display name account these settings belong to",
-      NULL,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class, PROP_DISPLAY_NAME_OVERRIDDEN,
-      g_param_spec_boolean ("display-name-overridden",
-        "display-name-overridden",
-        "Whether the display name for this account has been manually "
-        "overridden",
-        FALSE,
-        G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class, PROP_READY,
-    g_param_spec_boolean ("ready",
-      "Ready",
-      "Whether this account is ready to be used",
-      FALSE,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  signals[PASSWORD_RETRIEVED] =
-      g_signal_new ("password-retrieved",
-          G_TYPE_FROM_CLASS (empathy_account_settings_class),
-          G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE, 0);
-}
-
-static void
-empathy_account_settings_dispose (GObject *object)
-{
-  EmpathyAccountSettings *self = EMPATHY_ACCOUNT_SETTINGS (object);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  if (priv->managers_ready_id != 0)
-    g_signal_handler_disconnect (priv->managers, priv->managers_ready_id);
-  priv->managers_ready_id = 0;
-
-  tp_clear_object (&priv->managers);
-  tp_clear_object (&priv->manager);
-  tp_clear_object (&priv->account_manager);
-  tp_clear_object (&priv->account);
-  tp_clear_object (&priv->protocol_obj);
-
-  /* release any references held by the object here */
-  if (G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_account_settings_parent_class)->dispose (object);
-}
-
-static void
-empathy_account_settings_free_unset_parameters (
-    EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  guint i;
-
-  for (i = 0 ; i < priv->unset_parameters->len; i++)
-    g_free (g_array_index (priv->unset_parameters, gchar *, i));
-
-  g_array_set_size (priv->unset_parameters, 0);
-}
-
-static void
-empathy_account_settings_finalize (GObject *object)
-{
-  EmpathyAccountSettings *self = EMPATHY_ACCOUNT_SETTINGS (object);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-  GList *l;
-
-  /* free any data held directly by the object here */
-  g_free (priv->cm_name);
-  g_free (priv->protocol);
-  g_free (priv->service);
-  g_free (priv->display_name);
-  g_free (priv->icon_name);
-  g_free (priv->password);
-  g_free (priv->password_original);
-  g_free (priv->storage_provider);
-
-  if (priv->required_params != NULL)
-    {
-      for (l = priv->required_params; l; l = l->next)
-        g_free (l->data);
-      g_list_free (priv->required_params);
-    }
-
-  g_hash_table_unref (priv->parameters);
-  g_hash_table_unref (priv->param_regexps);
-
-  empathy_account_settings_free_unset_parameters (self);
-  g_array_unref (priv->unset_parameters);
-
-  G_OBJECT_CLASS (empathy_account_settings_parent_class)->finalize (object);
-}
-
-static void
-empathy_account_settings_protocol_obj_prepared_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *self = user_data;
-  GError *error = NULL;
-
-  if (!tp_proxy_prepare_finish (source, result, &error))
-    {
-      DEBUG ("Failed to prepare protocol object: %s", error->message);
-      g_clear_error (&error);
-      return;
-    }
-
-  empathy_account_settings_check_readyness (self);
-}
-
-static void
-empathy_account_settings_get_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *self = user_data;
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-  const gchar *password;
-  GError *error = NULL;
-
-  password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source),
-      result, &error);
-
-  if (error != NULL)
-    {
-      DEBUG ("Failed to get password: %s", error->message);
-      g_clear_error (&error);
-    }
-
-  /* It doesn't really matter if getting the password failed; that
-   * just means that it's not there, or let's act like that at
-   * least. */
-
-  g_assert (priv->password == NULL);
-
-  priv->password = g_strdup (password);
-  priv->password_original = g_strdup (password);
-
-  g_signal_emit (self, signals[PASSWORD_RETRIEVED], 0);
-}
-
-static GVariant * empathy_account_settings_dup (
-    EmpathyAccountSettings *settings,
-    const gchar *param);
-
-static void
-empathy_account_settings_check_readyness (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-  GQuark features[] = { TP_PROTOCOL_FEATURE_CORE, 0 };
-
-  if (priv->ready)
-    return;
-
-  if (priv->account != NULL
-      && !tp_account_is_prepared (priv->account, TP_ACCOUNT_FEATURE_CORE))
-      return;
-
-  if (!empathy_connection_managers_is_ready (priv->managers))
-    return;
-
-  if (priv->manager == NULL)
-    {
-      priv->manager = empathy_connection_managers_get_cm (
-          priv->managers, priv->cm_name);
-    }
-
-  if (priv->manager == NULL)
-    return;
-
-  g_object_ref (priv->manager);
-
-  if (priv->account != NULL)
-    {
-      g_free (priv->display_name);
-      priv->display_name =
-        g_strdup (tp_account_get_display_name (priv->account));
-
-      g_free (priv->icon_name);
-      priv->icon_name =
-        g_strdup (tp_account_get_icon_name (priv->account));
-
-      priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
-    }
-
-  if (priv->protocol_obj == NULL)
-    {
-      priv->protocol_obj = g_object_ref (
-          tp_connection_manager_get_protocol_object (priv->manager,
-            priv->protocol));
-    }
-
-  if (!tp_proxy_is_prepared (priv->protocol_obj, TP_PROTOCOL_FEATURE_CORE)
-      && !priv->preparing_protocol)
-    {
-      priv->preparing_protocol = TRUE;
-      tp_proxy_prepare_async (priv->protocol_obj, features,
-          empathy_account_settings_protocol_obj_prepared_cb, self);
-      return;
-    }
-  else
-    {
-      if (tp_strv_contains (tp_protocol_get_authentication_types (
-                  priv->protocol_obj),
-              TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION))
-        {
-          priv->supports_sasl = TRUE;
-        }
-    }
-
-  if (priv->required_params == NULL)
-    {
-      GList *params, *l;
-
-      params = tp_protocol_dup_params (priv->protocol_obj);
-      for (l = params; l != NULL; l = g_list_next (l))
-        {
-          TpConnectionManagerParam *cur = l->data;
-
-          if (tp_connection_manager_param_is_required (cur))
-            {
-              priv->required_params = g_list_append (priv->required_params,
-                  g_strdup (tp_connection_manager_param_get_name (cur)));
-            }
-        }
-
-       g_list_free_full (params,
-           (GDestroyNotify) tp_connection_manager_param_free);
-    }
-
-  /* priv->account won't be a proper account if it's the account
-   * assistant showing this widget. */
-  if (priv->supports_sasl && !priv->password_requested
-      && priv->account != NULL)
-    {
-      priv->password_requested = TRUE;
-
-      /* Make this call but don't block on its readiness. We'll signal
-       * if it's updated later with ::password-retrieved. */
-      empathy_keyring_get_account_password_async (priv->account,
-          empathy_account_settings_get_password_cb, self);
-    }
-
-  priv->ready = TRUE;
-  g_object_notify (G_OBJECT (self), "ready");
-}
-
-static void
-empathy_account_settings_account_ready_cb (GObject *source_object,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (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;
-    }
-
-  empathy_account_settings_check_readyness (settings);
-}
-
-static void
-empathy_account_settings_managers_ready_cb (GObject *object,
-    GParamSpec *pspec,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
-
-  empathy_account_settings_check_readyness (settings);
-}
-
-EmpathyAccountSettings *
-empathy_account_settings_new (const gchar *connection_manager,
-    const gchar *protocol,
-    const gchar *service,
-    const char *display_name)
-{
-  return g_object_new (EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      "connection-manager", connection_manager,
-      "protocol", protocol,
-      "service", service,
-      "display-name", display_name,
-      NULL);
-}
-
-EmpathyAccountSettings *
-empathy_account_settings_new_for_account (TpAccount *account)
-{
-  return g_object_new (EMPATHY_TYPE_ACCOUNT_SETTINGS,
-      "account", account,
-      NULL);
-}
-
-GList *
-empathy_account_settings_dup_tp_params (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  g_return_val_if_fail (priv->protocol_obj != NULL, NULL);
-
-  return tp_protocol_dup_params (priv->protocol_obj);
-}
-
-gboolean
-empathy_account_settings_is_ready (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->ready;
-}
-
-const gchar *
-empathy_account_settings_get_cm (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->cm_name;
-}
-
-const gchar *
-empathy_account_settings_get_protocol (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->protocol;
-}
-
-const gchar *
-empathy_account_settings_get_service (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->service;
-}
-
-void
-empathy_account_settings_set_service (EmpathyAccountSettings *settings,
-    const gchar *service)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  if (!tp_strdiff (priv->service, service))
-    return;
-
-  g_free (priv->service);
-  priv->service = g_strdup (service);
-  g_object_notify (G_OBJECT (settings), "service");
-  priv->update_service = TRUE;
-}
-
-gchar *
-empathy_account_settings_get_icon_name (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->icon_name;
-}
-
-const gchar *
-empathy_account_settings_get_display_name (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->display_name;
-}
-
-TpAccount *
-empathy_account_settings_get_account (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return priv->account;
-}
-
-static gboolean
-empathy_account_settings_is_unset (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GArray *a;
-  guint i;
-
-  a = priv->unset_parameters;
-
-  for (i = 0; i < a->len; i++)
-    {
-      if (!tp_strdiff (g_array_index (a, gchar *, i), param))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
-static const TpConnectionManagerParam *
-empathy_account_settings_get_tp_param (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  return tp_protocol_get_param (priv->protocol_obj, param);
-}
-
-gboolean
-empathy_account_settings_have_tp_param (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  return (empathy_account_settings_get_tp_param (settings, param) != NULL);
-}
-
-static void
-account_settings_remove_from_unset (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  guint idx;
-  gchar *val;
-
-  for (idx = 0; idx < priv->unset_parameters->len; idx++)
-    {
-      val = g_array_index (priv->unset_parameters, gchar *, idx);
-
-      if (!tp_strdiff (val, param))
-        {
-          priv->unset_parameters =
-            g_array_remove_index (priv->unset_parameters, idx);
-          g_free (val);
-
-          break;
-        }
-    }
-}
-
-GVariant *
-empathy_account_settings_dup_default (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  const TpConnectionManagerParam *p;
-
-  p = empathy_account_settings_get_tp_param (settings, param);
-  if (p == NULL)
-    return NULL;
-
-  return tp_connection_manager_param_dup_default_variant (p);
-}
-
-const gchar *
-empathy_account_settings_get_dbus_signature (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  const TpConnectionManagerParam *p;
-
-  p = empathy_account_settings_get_tp_param (settings, param);
-
-  if (p == NULL)
-    return NULL;
-
-  return tp_connection_manager_param_get_dbus_signature (p);
-}
-
-static GVariant *
-empathy_account_settings_dup (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GVariant *result;
-
-  /* Lookup the update parameters we set */
-  result = g_hash_table_lookup (priv->parameters, param);
-  if (result != NULL)
-    return g_variant_ref (result);
-
-  /* If the parameters isn't unset use the accounts setting if any */
-  if (priv->account != NULL
-      && !empathy_account_settings_is_unset (settings, param))
-    {
-      GVariant *parameters;
-
-      parameters = tp_account_dup_parameters_vardict (priv->account);
-      result = g_variant_lookup_value (parameters, param, NULL);
-      g_variant_unref (parameters);
-
-      if (result != NULL)
-        /* g_variant_lookup_value() is (transfer full) */
-        return result;
-    }
-
-  /* fallback to the default */
-  return empathy_account_settings_dup_default (settings, param);
-}
-
-void
-empathy_account_settings_unset (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  gchar *v;
-  if (empathy_account_settings_is_unset (settings, param))
-    return;
-
-  if (priv->supports_sasl && !tp_strdiff (param, "password"))
-    {
-      g_free (priv->password);
-      priv->password = NULL;
-      return;
-    }
-
-  v = g_strdup (param);
-
-  g_array_append_val (priv->unset_parameters, v);
-  g_hash_table_remove (priv->parameters, param);
-}
-
-void
-empathy_account_settings_discard_changes (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  g_hash_table_remove_all (priv->parameters);
-  empathy_account_settings_free_unset_parameters (settings);
-
-  g_free (priv->password);
-  priv->password = g_strdup (priv->password_original);
-
-  if (priv->account != NULL)
-    priv->uri_scheme_tel = empathy_account_has_uri_scheme_tel (priv->account);
-  else
-    priv->uri_scheme_tel = FALSE;
-}
-
-gchar *
-empathy_account_settings_dup_string (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GVariant *v;
-  gchar *result = NULL;
-
-  if (!tp_strdiff (param, "password") && priv->supports_sasl)
-    {
-      return g_strdup (priv->password);
-    }
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return NULL;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
-    result = g_variant_dup_string (v, NULL);
-
-  g_variant_unref (v);
-  return result;
-}
-
-GStrv
-empathy_account_settings_dup_strv (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  GStrv result = NULL;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return NULL;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_STRING_ARRAY))
-    result = g_variant_dup_strv (v, NULL);
-
-  g_variant_unref (v);
-  return result;
-}
-
-gint32
-empathy_account_settings_get_int32 (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  gint32 ret = 0;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return 0;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
-    ret = g_variant_get_byte (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
-    ret = g_variant_get_int32 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
-    ret = CLAMP (g_variant_get_uint32 (v), (guint) G_MININT32,
-        G_MAXINT32);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
-    ret = CLAMP (g_variant_get_int64 (v), G_MININT32, G_MAXINT32);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
-    ret = CLAMP (g_variant_get_uint64 (v), (guint64) G_MININT32, G_MAXINT32);
-  else
-    {
-      gchar *tmp;
-
-      tmp = g_variant_print (v, TRUE);
-      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
-      g_free (tmp);
-    }
-
-  g_variant_unref (v);
-  return ret;
-}
-
-gint64
-empathy_account_settings_get_int64 (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  gint64 ret = 0;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return 0;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
-    ret = g_variant_get_byte (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
-    ret = g_variant_get_int32 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
-    ret = g_variant_get_uint32 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
-    ret = g_variant_get_int64 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
-    ret = CLAMP (g_variant_get_uint64 (v), (guint64) G_MININT64, G_MAXINT64);
-  else
-    {
-      gchar *tmp;
-
-      tmp = g_variant_print (v, TRUE);
-      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
-      g_free (tmp);
-    }
-
-  g_variant_unref (v);
-  return ret;
-}
-
-guint32
-empathy_account_settings_get_uint32 (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  guint32 ret = 0;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return 0;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
-    ret = g_variant_get_byte (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
-    ret = MAX (0, g_variant_get_int32 (v));
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
-    ret = g_variant_get_uint32 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
-    ret = CLAMP (g_variant_get_int64 (v), 0, G_MAXUINT32);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
-    ret = MIN (g_variant_get_uint64 (v), G_MAXUINT32);
-  else
-    {
-      gchar *tmp;
-
-      tmp = g_variant_print (v, TRUE);
-      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
-      g_free (tmp);
-    }
-
-  g_variant_unref (v);
-  return ret;
-}
-
-guint64
-empathy_account_settings_get_uint64 (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  guint64 ret = 0;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return 0;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BYTE))
-    ret = g_variant_get_byte (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT32))
-    ret = MAX (0, g_variant_get_int32 (v));
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT32))
-    ret = g_variant_get_uint32 (v);
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_INT64))
-    ret = MAX (0, g_variant_get_int64 (v));
-  else if (g_variant_is_of_type (v, G_VARIANT_TYPE_UINT64))
-    ret = g_variant_get_uint64 (v);
-  else
-    {
-      gchar *tmp;
-
-      tmp = g_variant_print (v, TRUE);
-      DEBUG ("Unsupported type for param '%s': %s'", param, tmp);
-      g_free (tmp);
-    }
-
-
-  g_variant_unref (v);
-  return ret;
-}
-
-gboolean
-empathy_account_settings_get_boolean (EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  GVariant *v;
-  gboolean result = FALSE;
-
-  v = empathy_account_settings_dup (settings, param);
-  if (v == NULL)
-    return result;
-
-  if (g_variant_is_of_type (v, G_VARIANT_TYPE_BOOLEAN))
-    result = g_variant_get_boolean (v);
-
-  return result;
-}
-
-void
-empathy_account_settings_set (EmpathyAccountSettings *settings,
-    const gchar *param,
-    GVariant *v)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  g_return_if_fail (param != NULL);
-  g_return_if_fail (v != NULL);
-
-  if (!tp_strdiff (param, "password") && priv->supports_sasl &&
-      g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
-    {
-      g_free (priv->password);
-      priv->password = g_variant_dup_string (v, NULL);
-    }
-  else
-    {
-      g_hash_table_insert (priv->parameters, g_strdup (param),
-          g_variant_ref_sink (v));
-    }
-
-  account_settings_remove_from_unset (settings, param);
-}
-
-static void
-account_settings_display_name_set_cb (GObject *src,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account = TP_ACCOUNT (src);
-  GSimpleAsyncResult *set_result = user_data;
-
-  tp_account_set_display_name_finish (account, res, &error);
-
-  if (error != NULL)
-    {
-      g_simple_async_result_set_from_error (set_result, error);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (set_result);
-  g_object_unref (set_result);
-}
-
-void
-empathy_account_settings_set_display_name_async (
-  EmpathyAccountSettings *settings,
-  const gchar *name,
-  GAsyncReadyCallback callback,
-  gpointer user_data)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GSimpleAsyncResult *result;
-
-  g_return_if_fail (name != NULL);
-
-  result = g_simple_async_result_new (G_OBJECT (settings),
-      callback, user_data, empathy_account_settings_set_display_name_finish);
-
-  if (!tp_strdiff (name, priv->display_name))
-    {
-      /* Nothing to do */
-      g_simple_async_result_complete_in_idle (result);
-      return;
-    }
-
-  if (priv->account == NULL)
-    {
-      if (priv->display_name != NULL)
-        g_free (priv->display_name);
-
-      priv->display_name = g_strdup (name);
-
-      g_simple_async_result_complete_in_idle (result);
-
-      return;
-    }
-
-  tp_account_set_display_name_async (priv->account, name,
-      account_settings_display_name_set_cb, result);
-}
-
-gboolean
-empathy_account_settings_set_display_name_finish (
-  EmpathyAccountSettings *settings,
-  GAsyncResult *result,
-  GError **error)
-{
-  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
-      error))
-    return FALSE;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (result,
-    G_OBJECT (settings), empathy_account_settings_set_display_name_finish),
-      FALSE);
-
-  return TRUE;
-}
-
-static void
-account_settings_icon_name_set_cb (GObject *src,
-    GAsyncResult *res,
-    gpointer user_data)
-{
-  GError *error = NULL;
-  TpAccount *account = TP_ACCOUNT (src);
-  GSimpleAsyncResult *set_result = user_data;
-
-  tp_account_set_icon_name_finish (account, res, &error);
-
-  if (error != NULL)
-    {
-      g_simple_async_result_set_from_error (set_result, error);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (set_result);
-  g_object_unref (set_result);
-}
-
-void
-empathy_account_settings_set_icon_name_async (
-  EmpathyAccountSettings *settings,
-  const gchar *name,
-  GAsyncReadyCallback callback,
-  gpointer user_data)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GSimpleAsyncResult *result;
-
-  g_return_if_fail (name != NULL);
-
-  result = g_simple_async_result_new (G_OBJECT (settings),
-      callback, user_data, empathy_account_settings_set_icon_name_finish);
-
-  if (priv->account == NULL)
-    {
-      if (priv->icon_name != NULL)
-        g_free (priv->icon_name);
-
-      priv->icon_name = g_strdup (name);
-
-      g_simple_async_result_complete_in_idle (result);
-
-      return;
-    }
-
-  tp_account_set_icon_name_async (priv->account, name,
-      account_settings_icon_name_set_cb, result);
-}
-
-gboolean
-empathy_account_settings_set_icon_name_finish (
-  EmpathyAccountSettings *settings,
-  GAsyncResult *result,
-  GError **error)
-{
-  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
-      error))
-    return FALSE;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (result,
-    G_OBJECT (settings), empathy_account_settings_set_icon_name_finish),
-      FALSE);
-
-  return TRUE;
-}
-
-static void
-empathy_account_settings_processed_password (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data,
-    gpointer finish_func)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GSimpleAsyncResult *r;
-  GError *error = NULL;
-  gboolean (*func) (TpAccount *source, GAsyncResult *result, GError **error) =
-    finish_func;
-
-  g_free (priv->password_original);
-  priv->password_original = g_strdup (priv->password);
-
-  if (!func (TP_ACCOUNT (source), result, &error))
-    {
-      g_simple_async_result_set_from_error (priv->apply_result, error);
-      g_error_free (error);
-    }
-
-  empathy_account_settings_discard_changes (settings);
-
-  r = priv->apply_result;
-  priv->apply_result = NULL;
-
-  g_simple_async_result_complete (r);
-  g_object_unref (r);
-}
-
-static void
-empathy_account_settings_set_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  empathy_account_settings_processed_password (source, result, user_data,
-      empathy_keyring_set_account_password_finish);
-}
-
-static void
-empathy_account_settings_delete_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  empathy_account_settings_processed_password (source, result, user_data,
-      empathy_keyring_delete_account_password_finish);
-}
-
-static void
-update_account_uri_schemes (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  if (priv->uri_scheme_tel == empathy_account_has_uri_scheme_tel (
-        priv->account))
-    return;
-
-  tp_account_set_uri_scheme_association_async (priv->account, "tel",
-      priv->uri_scheme_tel, NULL, NULL);
-}
-
-static void
-set_service_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GError *error = NULL;
-
-  if (!tp_account_set_service_finish (TP_ACCOUNT (source), result, &error))
-    {
-      DEBUG ("Failed to set Account.Service: %s", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-update_account_service (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  if (!priv->update_service)
-    return;
-
-  tp_account_set_service_async (priv->account,
-      priv->service != NULL ? priv->service : "", set_service_cb, self);
-}
-
-static void
-empathy_account_settings_account_updated (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GSimpleAsyncResult *r;
-  GError *error = NULL;
-  GStrv reconnect_required = NULL;
-
-  if (!tp_account_update_parameters_vardict_finish (TP_ACCOUNT (source),
-          result, &reconnect_required, &error))
-    {
-      g_simple_async_result_set_from_error (priv->apply_result, error);
-      g_error_free (error);
-      goto out;
-    }
-
-  update_account_uri_schemes (settings);
-  update_account_service (settings);
-
-  g_simple_async_result_set_op_res_gboolean (priv->apply_result,
-      g_strv_length (reconnect_required) > 0);
-
-  /* Only set the password in the keyring if the CM supports SASL. */
-  if (priv->supports_sasl)
-    {
-      if (priv->password != NULL)
-        {
-          /* FIXME: we shouldn't save the password if we
-           * can't (MaySaveResponse=False) but we don't have API to check that
-           * at this point (fdo #35382). */
-          empathy_keyring_set_account_password_async (priv->account,
-              priv->password, priv->remember_password,
-              empathy_account_settings_set_password_cb, settings);
-        }
-      else
-        {
-          empathy_keyring_delete_account_password_async (priv->account,
-              empathy_account_settings_delete_password_cb, settings);
-        }
-
-      return;
-    }
-
-out:
-  empathy_account_settings_discard_changes (settings);
-
-  r = priv->apply_result;
-  priv->apply_result = NULL;
-
-  g_simple_async_result_complete (r);
-  g_object_unref (r);
-  g_strfreev (reconnect_required);
-}
-
-static void
-empathy_account_settings_created_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (user_data);
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GError *error = NULL;
-  GSimpleAsyncResult *r;
-
-  priv->account = tp_account_request_create_account_finish (
-      TP_ACCOUNT_REQUEST (source), result, &error);
-
-  if (priv->account == NULL)
-    {
-      g_simple_async_result_set_from_error (priv->apply_result, error);
-    }
-  else
-    {
-      if (priv->supports_sasl && priv->password != NULL)
-        {
-          /* Save the password before connecting */
-          /* FIXME: we shouldn't save the password if we
-           * can't (MaySaveResponse=False) but we don't have API to check that
-           * at this point (fdo #35382). */
-          empathy_keyring_set_account_password_async (priv->account,
-              priv->password, priv->remember_password,
-              empathy_account_settings_set_password_cb,
-              settings);
-          return;
-        }
-
-      update_account_uri_schemes (settings);
-
-      empathy_account_settings_discard_changes (settings);
-    }
-
-  r = priv->apply_result;
-  priv->apply_result = NULL;
-
-  g_simple_async_result_complete (r);
-  g_object_unref (r);
-}
-
-static void
-empathy_account_settings_do_create_account (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-  TpAccountRequest *account_req;
-  TpConnectionPresenceType type;
-  gchar *status;
-  gchar *message;
-  EmpathyPresenceManager *presence_mgr;
-  GHashTableIter iter;
-  gpointer k, v;
-
-  account_req = tp_account_request_new (priv->account_manager, priv->cm_name,
-      priv->protocol, "New Account");
-
-  presence_mgr = empathy_presence_manager_dup_singleton ();
-  type = empathy_presence_manager_get_requested_presence (presence_mgr, &status,
-      &message);
-  g_object_unref (presence_mgr);
-
-  if (type != TP_CONNECTION_PRESENCE_TYPE_UNSET)
-    {
-      tp_account_request_set_requested_presence (account_req, type,
-          status, message);
-    }
-
-  tp_account_request_set_icon_name (account_req, priv->icon_name);
-
-  tp_account_request_set_display_name (account_req, priv->display_name);
-
-  if (priv->service != NULL)
-    tp_account_request_set_service (account_req, priv->service);
-
-  g_hash_table_iter_init (&iter, priv->parameters);
-  while (g_hash_table_iter_next (&iter, &k, &v))
-    {
-      const gchar *key = k;
-      GVariant *value = v;
-
-      tp_account_request_set_parameter (account_req, key, value);
-    }
-
-  if (priv->storage_provider != NULL)
-    {
-      tp_account_request_set_storage_provider (account_req,
-          priv->storage_provider);
-    }
-
-  tp_account_request_create_account_async (account_req,
-      empathy_account_settings_created_cb, self);
-}
-
-static GVariant *
-build_parameters_variant (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-  GVariantBuilder *builder;
-  GHashTableIter iter;
-  gpointer k, v;
-
-  builder = g_variant_builder_new (G_VARIANT_TYPE_VARDICT);
-
-  g_hash_table_iter_init (&iter, priv->parameters);
-  while (g_hash_table_iter_next (&iter, &k, &v))
-    {
-      const gchar *key = k;
-      GVariant *value = v;
-      GVariant *entry;
-
-      entry = g_variant_new_dict_entry (g_variant_new_string (key),
-          g_variant_new_variant (value));
-
-      g_variant_builder_add_value (builder, entry);
-    }
-
-  return g_variant_builder_end (builder);
-}
-
-void
-empathy_account_settings_apply_async (EmpathyAccountSettings *settings,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-
-  if (priv->apply_result != NULL)
-    {
-      g_simple_async_report_error_in_idle (G_OBJECT (settings),
-          callback, user_data,
-          G_IO_ERROR, G_IO_ERROR_PENDING, "Applying already in progress");
-      return;
-    }
-
-  priv->apply_result = g_simple_async_result_new (G_OBJECT (settings),
-      callback, user_data, empathy_account_settings_apply_finish);
-
-  /* We'll have to reconnect only if we change none DBus_Property on an
-   * existing account. */
-  g_simple_async_result_set_op_res_gboolean (priv->apply_result, FALSE);
-
-  if (priv->account == NULL)
-    {
-      g_assert (priv->apply_result != NULL && priv->account == NULL);
-
-      empathy_account_settings_do_create_account (settings);
-    }
-  else
-    {
-      tp_account_update_parameters_vardict_async (priv->account,
-          build_parameters_variant (settings),
-          (const gchar **) priv->unset_parameters->data,
-          empathy_account_settings_account_updated, settings);
-    }
-}
-
-gboolean
-empathy_account_settings_apply_finish (EmpathyAccountSettings *settings,
-    GAsyncResult *result,
-    gboolean *reconnect_required,
-    GError **error)
-{
-  if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result),
-      error))
-    return FALSE;
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (result,
-    G_OBJECT (settings), empathy_account_settings_apply_finish), FALSE);
-
-  if (reconnect_required != NULL)
-    *reconnect_required = g_simple_async_result_get_op_res_gboolean (
-        G_SIMPLE_ASYNC_RESULT (result));
-
-  return TRUE;
-}
-
-gboolean
-empathy_account_settings_has_account (EmpathyAccountSettings *settings,
-    TpAccount *account)
-{
-  EmpathyAccountSettingsPriv *priv;
-  const gchar *account_path;
-  const gchar *priv_account_path;
-
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
-  g_return_val_if_fail (TP_IS_ACCOUNT (account), FALSE);
-
-  priv = GET_PRIV (settings);
-
-  if (priv->account == NULL)
-    return FALSE;
-
-  account_path = tp_proxy_get_object_path (TP_PROXY (account));
-  priv_account_path = tp_proxy_get_object_path (TP_PROXY (priv->account));
-
-  return (!tp_strdiff (account_path, priv_account_path));
-}
-
-void
-empathy_account_settings_set_regex (EmpathyAccountSettings *settings,
-    const gchar *param,
-    const gchar *pattern)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (settings);
-  GRegex *regex;
-  GError *error = NULL;
-
-  regex = g_regex_new (pattern, 0, 0, &error);
-  if (regex == NULL)
-    {
-      g_warning ("Failed to create reg exp: %s", error->message);
-      g_error_free (error);
-      return;
-    }
-
-  g_hash_table_insert (priv->param_regexps, g_strdup (param), regex);
-}
-
-gboolean
-empathy_account_settings_parameter_is_valid (
-    EmpathyAccountSettings *settings,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv;
-  const GRegex *regex;
-
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
-
-  priv = GET_PRIV (settings);
-
-  if (g_list_find_custom (priv->required_params, param, (GCompareFunc) strcmp))
-    {
-      /* first, look if it's set in our own parameters */
-      if (g_hash_table_lookup (priv->parameters, param) != NULL)
-        goto test_regex;
-
-      /* if we did not unset the parameter, look if it's in the account */
-      if (priv->account != NULL &&
-          !empathy_account_settings_is_unset (settings, param))
-        {
-          const GHashTable *account_params;
-
-          account_params = tp_account_get_parameters (priv->account);
-          if (tp_asv_lookup (account_params, param))
-            goto test_regex;
-        }
-
-      return FALSE;
-    }
-
-test_regex:
-  /* test whether parameter value matches its regex */
-  regex = g_hash_table_lookup (priv->param_regexps, param);
-  if (regex)
-    {
-      gchar *value;
-      gboolean match;
-
-      value = empathy_account_settings_dup_string (settings, param);
-      if (value == NULL)
-        return FALSE;
-
-      match = g_regex_match (regex, value, 0, NULL);
-
-      g_free (value);
-      return match;
-    }
-
-  return TRUE;
-}
-
-gboolean
-empathy_account_settings_is_valid (EmpathyAccountSettings *settings)
-{
-  EmpathyAccountSettingsPriv *priv;
-  const gchar *param;
-  GHashTableIter iter;
-  GList *l;
-
-  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_SETTINGS (settings), FALSE);
-
-  priv = GET_PRIV (settings);
-
-  for (l = priv->required_params; l; l = l->next)
-    {
-      if (!empathy_account_settings_parameter_is_valid (settings, l->data))
-        return FALSE;
-    }
-
-  g_hash_table_iter_init (&iter, priv->param_regexps);
-  while (g_hash_table_iter_next (&iter, (gpointer *) &param, NULL))
-    {
-      if (!empathy_account_settings_parameter_is_valid (settings, param))
-        return FALSE;
-    }
-
-  return TRUE;
-}
-
-TpProtocol *
-empathy_account_settings_get_tp_protocol (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  return priv->protocol_obj;
-}
-
-gboolean
-empathy_account_settings_supports_sasl (EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  return priv->supports_sasl;
-}
-
-gboolean
-empathy_account_settings_param_is_supported (EmpathyAccountSettings *self,
-    const gchar *param)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  return tp_protocol_has_param (priv->protocol_obj, param);
-}
-
-void
-empathy_account_settings_set_uri_scheme_tel (EmpathyAccountSettings *self,
-    gboolean associate)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  priv->uri_scheme_tel = associate;
-}
-
-gboolean
-empathy_account_settings_has_uri_scheme_tel (
-    EmpathyAccountSettings *self)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  return priv->uri_scheme_tel;
-}
-
-void
-empathy_account_settings_set_storage_provider (EmpathyAccountSettings *self,
-    const gchar *storage)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  g_free (priv->storage_provider);
-  priv->storage_provider = g_strdup (storage);
-}
-
-void
-empathy_account_settings_set_remember_password (EmpathyAccountSettings *self,
-    gboolean remember)
-{
-  EmpathyAccountSettingsPriv *priv = GET_PRIV (self);
-
-  priv->remember_password = remember;
-}
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
deleted file mode 100644
index 162def48c..000000000
--- a/libempathy/empathy-account-settings.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * empathy-account-settings.h - Header for EmpathyAccountSettings
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@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_ACCOUNT_SETTINGS_H__
-#define __EMPATHY_ACCOUNT_SETTINGS_H__
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyAccountSettings EmpathyAccountSettings;
-typedef struct _EmpathyAccountSettingsClass EmpathyAccountSettingsClass;
-
-struct _EmpathyAccountSettingsClass {
-    GObjectClass parent_class;
-};
-
-struct _EmpathyAccountSettings {
-    GObject parent;
-    gpointer priv;
-};
-
-GType empathy_account_settings_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_ACCOUNT_SETTINGS \
-  (empathy_account_settings_get_type ())
-#define EMPATHY_ACCOUNT_SETTINGS(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), \
-    EMPATHY_TYPE_ACCOUNT_SETTINGS, EmpathyAccountSettings))
-#define EMPATHY_ACCOUNT_SETTINGS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_ACCOUNT_SETTINGS, \
-    EmpathyAccountSettingsClass))
-#define EMPATHY_IS_ACCOUNT_SETTINGS(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_ACCOUNT_SETTINGS))
-#define EMPATHY_IS_ACCOUNT_SETTINGS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_ACCOUNT_SETTINGS))
-#define EMPATHY_ACCOUNT_SETTINGS_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_ACCOUNT_SETTINGS, \
-    EmpathyAccountSettingsClass))
-
-EmpathyAccountSettings * empathy_account_settings_new (
-    const gchar *connection_manager,
-    const gchar *protocol,
-    const gchar *service,
-    const char *display_name);
-
-EmpathyAccountSettings * empathy_account_settings_new_for_account (
-    TpAccount *account);
-
-gboolean empathy_account_settings_is_ready (EmpathyAccountSettings *settings);
-
-const gchar *empathy_account_settings_get_cm (EmpathyAccountSettings *settings);
-const gchar *empathy_account_settings_get_protocol (
-    EmpathyAccountSettings *settings);
-
-const gchar *empathy_account_settings_get_service (
-    EmpathyAccountSettings *settings);
-
-void empathy_account_settings_set_service (EmpathyAccountSettings *settings,
-    const gchar *service);
-
-TpAccount *empathy_account_settings_get_account (
-    EmpathyAccountSettings *settings);
-
-gboolean empathy_account_settings_has_account (
-    EmpathyAccountSettings *settings, TpAccount *account);
-
-GList * empathy_account_settings_dup_tp_params (
-    EmpathyAccountSettings *settings);
-
-gboolean empathy_account_settings_have_tp_param (
-    EmpathyAccountSettings *settings,
-    const gchar *param);
-
-void empathy_account_settings_unset (EmpathyAccountSettings *settings,
-    const gchar *param);
-
-void empathy_account_settings_discard_changes (
-    EmpathyAccountSettings *settings);
-
-const gchar *
-empathy_account_settings_get_dbus_signature (EmpathyAccountSettings *setting,
-  const gchar *param);
-
-GVariant *
-empathy_account_settings_dup_default (EmpathyAccountSettings *settings,
-  const gchar *param);
-
-gchar * empathy_account_settings_dup_string (
-    EmpathyAccountSettings *settings,
-    const gchar *param);
-GStrv empathy_account_settings_dup_strv (
-    EmpathyAccountSettings *settings,
-    const gchar *param);
-
-gint32 empathy_account_settings_get_int32 (EmpathyAccountSettings *settings,
-    const gchar *param);
-gint64 empathy_account_settings_get_int64 (EmpathyAccountSettings *settings,
-    const gchar *param);
-guint32 empathy_account_settings_get_uint32 (EmpathyAccountSettings *settings,
-    const gchar *param);
-guint64 empathy_account_settings_get_uint64 (EmpathyAccountSettings *settings,
-    const gchar *param);
-gboolean empathy_account_settings_get_boolean (EmpathyAccountSettings *settings,
-    const gchar *param);
-
-void empathy_account_settings_set (EmpathyAccountSettings *settings,
-    const gchar *param,
-    GVariant *v);
-
-gchar *empathy_account_settings_get_icon_name (
-  EmpathyAccountSettings *settings);
-
-void empathy_account_settings_set_icon_name_async (
-  EmpathyAccountSettings *settings,
-  const gchar *name,
-  GAsyncReadyCallback callback,
-  gpointer user_data);
-
-gboolean empathy_account_settings_set_icon_name_finish (
-  EmpathyAccountSettings *settings,
-  GAsyncResult *result,
-  GError **error);
-
-const gchar *empathy_account_settings_get_display_name (
-  EmpathyAccountSettings *settings);
-
-void empathy_account_settings_set_display_name_async (
-  EmpathyAccountSettings *settings,
-  const gchar *name,
-  GAsyncReadyCallback callback,
-  gpointer user_data);
-
-gboolean empathy_account_settings_set_display_name_finish (
-  EmpathyAccountSettings *settings,
-  GAsyncResult *result,
-  GError **error);
-
-void empathy_account_settings_apply_async (EmpathyAccountSettings *settings,
-  GAsyncReadyCallback callback,
-  gpointer user_data);
-
-gboolean empathy_account_settings_apply_finish (
-  EmpathyAccountSettings *settings,
-  GAsyncResult *result,
-  gboolean *reconnect_required,
-  GError **error);
-
-void empathy_account_settings_set_regex (EmpathyAccountSettings *settings,
-  const gchar *param,
-  const gchar *regex);
-
-gboolean empathy_account_settings_parameter_is_valid (
-    EmpathyAccountSettings *settings,
-    const gchar *param);
-
-gboolean empathy_account_settings_is_valid (EmpathyAccountSettings *settings);
-
-TpProtocol * empathy_account_settings_get_tp_protocol (
-    EmpathyAccountSettings *settings);
-
-gboolean empathy_account_settings_supports_sasl (EmpathyAccountSettings *self);
-
-gboolean empathy_account_settings_param_is_supported (
-    EmpathyAccountSettings *self,
-    const gchar *param);
-
-void empathy_account_settings_set_uri_scheme_tel (EmpathyAccountSettings *self,
-    gboolean associate);
-
-gboolean empathy_account_settings_has_uri_scheme_tel (
-    EmpathyAccountSettings *self);
-
-void empathy_account_settings_set_storage_provider (
-    EmpathyAccountSettings *self,
-    const gchar *storage);
-
-void empathy_account_settings_set_remember_password (
-    EmpathyAccountSettings *self,
-    gboolean remember);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_ACCOUNT_SETTINGS_H__*/
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index b2f2b802f..cbf7020ba 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -19,12 +19,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-auth-factory.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
-#include "empathy-keyring.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
 #include "empathy-server-tls-handler.h"
@@ -38,7 +36,10 @@
 #include "empathy-uoa-auth-handler.h"
 #endif /* HAVE_UOA */
 
-#include "extensions/extensions.h"
+#include "extensions.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
 
@@ -431,7 +432,7 @@ get_password_cb (GObject *source,
 {
   ObserveChannelsData *data = user_data;
 
-  if (empathy_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
+  if (tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source), result, NULL) == NULL)
     {
       /* We don't actually mind if this fails, just let the approver
        * go ahead and take the channel. */
@@ -584,7 +585,7 @@ observe_channels (TpBaseClient *client,
           return;
         }
 
-      empathy_keyring_get_account_password_async (data->account,
+      tpaw_keyring_get_account_password_async (data->account,
           get_password_cb, data);
       tp_observe_channels_context_delay (context);
       return;
diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 16d6ad34f..73e905782 100644
--- a/libempathy/empathy-auth-factory.h
+++ b/libempathy/empathy-auth-factory.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_AUTH_FACTORY_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
deleted file mode 100644
index 1e603e989..000000000
--- a/libempathy/empathy-camera-monitor.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (C) 2011 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: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
- */
-
-#include "config.h"
-
-#include "empathy-camera-monitor.h"
-#include "cheese-camera-device-monitor.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-
-struct _EmpathyCameraMonitorPrivate
-{
-  EmpathyCameraDeviceMonitor *empathy_monitor;
-  GQueue *cameras;
-  gint num_cameras;
-};
-
-enum
-{
-  PROP_0,
-  PROP_AVAILABLE,
-};
-
-enum
-{
-  CAMERA_ADDED,
-  CAMERA_REMOVED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE (EmpathyCameraMonitor, empathy_camera_monitor, G_TYPE_OBJECT);
-
-static EmpathyCameraMonitor *manager_singleton = NULL;
-
-static EmpathyCamera *
-empathy_camera_new (const gchar *id,
-    const gchar *device,
-    const gchar *name)
-{
-  EmpathyCamera *camera = g_slice_new (EmpathyCamera);
-
-  camera->id = g_strdup (id);
-  camera->device = g_strdup (device);
-  camera->name = g_strdup (name);
-
-  return camera;
-}
-
-static EmpathyCamera *
-empathy_camera_copy (EmpathyCamera *camera)
-{
-  return empathy_camera_new (camera->id, camera->device, camera->name);
-}
-
-static void
-empathy_camera_free (EmpathyCamera *camera)
-{
-  g_free (camera->id);
-  g_free (camera->device);
-  g_free (camera->name);
-
-  g_slice_free (EmpathyCamera, camera);
-}
-
-G_DEFINE_BOXED_TYPE (EmpathyCamera, empathy_camera,
-    empathy_camera_copy, empathy_camera_free)
-
-static gint
-empathy_camera_find (gconstpointer a,
-    gconstpointer b)
-{
-  const EmpathyCamera *camera = a;
-  const gchar *id = b;
-
-  return g_strcmp0 (camera->id, id);
-}
-
-static void
-empathy_camera_monitor_free_camera_foreach (gpointer data,
-    gpointer user_data)
-{
-  empathy_camera_free (data);
-}
-
-static void
-on_camera_added (EmpathyCameraDeviceMonitor *device,
-    gchar *id,
-    gchar *filename,
-    gchar *product_name,
-    gint api_version,
-    EmpathyCameraMonitor *self)
-{
-  EmpathyCamera *camera;
-
-  if (self->priv->cameras == NULL)
-    return;
-
-  camera = empathy_camera_new (id, filename, product_name);
-
-  g_queue_push_tail (self->priv->cameras, camera);
-
-  self->priv->num_cameras++;
-
-  if (self->priv->num_cameras == 1)
-    g_object_notify (G_OBJECT (self), "available");
-
-  g_signal_emit (self, signals[CAMERA_ADDED], 0, camera);
-}
-
-static void
-on_camera_removed (EmpathyCameraDeviceMonitor *device,
-    gchar *id,
-    EmpathyCameraMonitor *self)
-{
-  EmpathyCamera *camera;
-  GList *l;
-
-  if (self->priv->cameras == NULL)
-    return;
-
-  l = g_queue_find_custom (self->priv->cameras, id, empathy_camera_find);
-
-  g_return_if_fail (l != NULL);
-
-  camera = l->data;
-
-  g_queue_delete_link (self->priv->cameras, l);
-
-  self->priv->num_cameras--;
-
-  if (self->priv->num_cameras == 0)
-    g_object_notify (G_OBJECT (self), "available");
-
-  g_signal_emit (self, signals[CAMERA_REMOVED], 0, camera);
-
-  empathy_camera_free (camera);
-}
-
-const GList *
-empathy_camera_monitor_get_cameras (EmpathyCameraMonitor *self)
-{
-  if (self->priv->cameras != NULL)
-    return self->priv->cameras->head;
-  else
-    return NULL;
-}
-
-static void
-empathy_camera_monitor_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyCameraMonitor *self = (EmpathyCameraMonitor *) object;
-
-  switch (prop_id)
-    {
-    case PROP_AVAILABLE:
-      g_value_set_boolean (value, self->priv->num_cameras > 0);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-empathy_camera_monitor_dispose (GObject *object)
-{
-  EmpathyCameraMonitor *self = EMPATHY_CAMERA_MONITOR (object);
-
-  tp_clear_object (&self->priv->empathy_monitor);
-
-  g_queue_foreach (self->priv->cameras,
-      empathy_camera_monitor_free_camera_foreach, NULL);
-  tp_clear_pointer (&self->priv->cameras, g_queue_free);
-
-  G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->dispose (object);
-}
-
-static void
-empathy_camera_monitor_constructed (GObject *object)
-{
-  EmpathyCameraMonitor *self = (EmpathyCameraMonitor *) object;
-
-  G_OBJECT_CLASS (empathy_camera_monitor_parent_class)->constructed (object);
-
-  empathy_camera_device_monitor_coldplug (self->priv->empathy_monitor);
-}
-
-static void
-empathy_camera_monitor_class_init (EmpathyCameraMonitorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = empathy_camera_monitor_dispose;
-  object_class->constructed = empathy_camera_monitor_constructed;
-  object_class->get_property = empathy_camera_monitor_get_property;
-
-  g_object_class_install_property (object_class, PROP_AVAILABLE,
-      g_param_spec_boolean ("available", "Available",
-      "Camera available", TRUE, G_PARAM_READABLE));
-
-  signals[CAMERA_ADDED] =
-      g_signal_new ("added", G_OBJECT_CLASS_TYPE (klass),
-          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-          0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
-
-  signals[CAMERA_REMOVED] =
-      g_signal_new ("removed", G_OBJECT_CLASS_TYPE (klass),
-          G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-          0, NULL, NULL,
-          g_cclosure_marshal_generic,
-          G_TYPE_NONE, 1, EMPATHY_TYPE_CAMERA);
-
-  g_type_class_add_private (object_class,
-      sizeof (EmpathyCameraMonitorPrivate));
-}
-
-static void
-empathy_camera_monitor_init (EmpathyCameraMonitor *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_CAMERA_MONITOR, EmpathyCameraMonitorPrivate);
-
-  self->priv->cameras = g_queue_new ();
-
-  self->priv->empathy_monitor = empathy_camera_device_monitor_new ();
-
-  g_signal_connect (self->priv->empathy_monitor, "added",
-      G_CALLBACK (on_camera_added), self);
-  g_signal_connect (self->priv->empathy_monitor, "removed",
-      G_CALLBACK (on_camera_removed), self);
-
-#ifndef HAVE_UDEV
-  /* No udev, assume there are cameras present */
-  self->priv->num_cameras = 1;
-#endif
-}
-
-EmpathyCameraMonitor *
-empathy_camera_monitor_dup_singleton (void)
-{
-  GObject *retval;
-
-  if (manager_singleton)
-    {
-      retval = g_object_ref (manager_singleton);
-    }
-  else
-    {
-      retval = g_object_new (EMPATHY_TYPE_CAMERA_MONITOR, NULL);
-
-      manager_singleton = EMPATHY_CAMERA_MONITOR (retval);
-      g_object_add_weak_pointer (retval, (gpointer) &manager_singleton);
-    }
-
-  return EMPATHY_CAMERA_MONITOR (retval);
-}
-
-EmpathyCameraMonitor *
-empathy_camera_monitor_new (void)
-{
-  return EMPATHY_CAMERA_MONITOR (
-      g_object_new (EMPATHY_TYPE_CAMERA_MONITOR, NULL));
-}
-
-gboolean empathy_camera_monitor_get_available (EmpathyCameraMonitor *self)
-{
-  g_return_val_if_fail (EMPATHY_IS_CAMERA_MONITOR (self), FALSE);
-
-  return self->priv->num_cameras > 0;
-}
diff --git a/libempathy/empathy-camera-monitor.h b/libempathy/empathy-camera-monitor.h
deleted file mode 100644
index f627f7b58..000000000
--- a/libempathy/empathy-camera-monitor.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2011 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: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
- */
-
-#ifndef __EMPATHY_CAMERA_MONITOR_H__
-#define __EMPATHY_CAMERA_MONITOR_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-#define EMPATHY_TYPE_CAMERA_MONITOR         (empathy_camera_monitor_get_type ())
-#define EMPATHY_CAMERA_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_CAMERA_MONITOR, EmpathyCameraMonitor))
-#define EMPATHY_CAMERA_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_CAMERA_MONITOR, EmpathyCameraMonitorClass))
-#define EMPATHY_IS_CAMERA_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_CAMERA_MONITOR))
-#define EMPATHY_IS_CAMERA_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_CAMERA_MONITOR))
-#define EMPATHY_CAMERA_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_CAMERA_MONITOR, EmpathyCameraMonitorClass))
-
-typedef struct _EmpathyCameraMonitor EmpathyCameraMonitor;
-typedef struct _EmpathyCameraMonitorClass EmpathyCameraMonitorClass;
-typedef struct _EmpathyCameraMonitorPrivate EmpathyCameraMonitorPrivate;
-
-struct _EmpathyCameraMonitor
-{
-  GObject parent;
-  EmpathyCameraMonitorPrivate *priv;
-};
-
-struct _EmpathyCameraMonitorClass
-{
-  GObjectClass parent_class;
-};
-
-typedef struct
-{
-  gchar *id;
-  gchar *device;
-  gchar *name;
-} EmpathyCamera;
-
-#define EMPATHY_TYPE_CAMERA (empathy_camera_get_type ())
-GType empathy_camera_get_type (void) G_GNUC_CONST;
-
-GType empathy_camera_monitor_get_type (void) G_GNUC_CONST;
-
-EmpathyCameraMonitor *empathy_camera_monitor_dup_singleton (void);
-EmpathyCameraMonitor *empathy_camera_monitor_new (void);
-
-gboolean empathy_camera_monitor_get_available (EmpathyCameraMonitor *self);
-
-const GList * empathy_camera_monitor_get_cameras (EmpathyCameraMonitor *self);
-
-G_END_DECLS
-#endif /* __EMPATHY_CAMERA_MONITOR_H__ */
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index ebdc50433..215d8edbc 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -22,18 +22,19 @@
  */
 
 #include "config.h"
+#include "empathy-chatroom-manager.h"
 
 #include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define CHATROOMS_XML_FILENAME "chatrooms.xml"
-#define CHATROOMS_DTD_FILENAME "empathy-chatroom-manager.dtd"
+#define CHATROOMS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-chatroom-manager.dtd"
 #define SAVE_TIMER 4
 
 static EmpathyChatroomManager *chatroom_manager_singleton = NULL;
@@ -320,7 +321,7 @@ chatroom_manager_file_parse (EmpathyChatroomManager *manager,
       return FALSE;
     }
 
-  if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME))
+  if (!tpaw_xml_validate_from_resource (doc, CHATROOMS_DTD_RESOURCENAME))
     {
       g_warning ("Failed to validate file:'%s'", filename);
       xmlFreeDoc (doc);
diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index b8232dc64..498d225ad 100644
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_CHATROOM_MANAGER_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"
diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index dcc72d5f7..b186b2dd2 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,8 +20,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-chatroom.h"
+
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
@@ -413,7 +415,7 @@ empathy_chatroom_get_name (EmpathyChatroom *chatroom)
 
 	priv = GET_PRIV (chatroom);
 
-	if (EMP_STR_EMPTY (priv->name)) {
+	if (TPAW_STR_EMPTY (priv->name)) {
 		return priv->room;
 	}
 
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 57ca685cb..98ed04b96 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -23,10 +23,9 @@
 #define __EMPATHY_CHATROOM_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy/empathy-tp-chat.h>
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c
index 1c8fc58cf..e82b8620b 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -20,9 +20,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-client-factory.h"
 
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-tp-chat.h"
 #include "empathy-utils.h"
 
@@ -275,6 +276,6 @@ empathy_client_factory_dup_contact_by_id_finish (
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_return_copy_pointer (self,
+  tpaw_implement_finish_return_copy_pointer (self,
       empathy_client_factory_dup_contact_by_id_async, g_object_ref);
 }
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 83e15f15d..763715f9e 100644
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-aggregator.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h
index 71e6e4392..267b20937 100644
--- a/libempathy/empathy-connection-aggregator.h
+++ b/libempathy/empathy-connection-aggregator.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_CONNECTION_AGGREGATOR_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
deleted file mode 100644
index abf862bca..000000000
--- a/libempathy/empathy-connection-managers.c
+++ /dev/null
@@ -1,349 +0,0 @@
-/*
- * empathy-connection-managers.c - Source for EmpathyConnectionManagers
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@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-connection-managers.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-static GObject *managers = NULL;
-
-G_DEFINE_TYPE(EmpathyConnectionManagers, empathy_connection_managers,
-    G_TYPE_OBJECT)
-
-/* signal enum */
-enum
-{
-    UPDATED,
-    LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-/* properties */
-enum {
-  PROP_READY = 1
-};
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyConnectionManagers)
-
-
-/* private structure */
-typedef struct _EmpathyConnectionManagersPriv
-  EmpathyConnectionManagersPriv;
-
-struct _EmpathyConnectionManagersPriv
-{
-  gboolean dispose_has_run;
-  gboolean ready;
-
-  GList *cms;
-
-  TpDBusDaemon *dbus;
-};
-
-static void
-empathy_connection_managers_init (EmpathyConnectionManagers *obj)
-{
-  EmpathyConnectionManagersPriv *priv =
-    G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-      EMPATHY_TYPE_CONNECTION_MANAGERS, EmpathyConnectionManagersPriv);
-
-  obj->priv = priv;
-
-  priv->dbus = tp_dbus_daemon_dup (NULL);
-  g_assert (priv->dbus != NULL);
-
-  empathy_connection_managers_update (obj);
-
-  /* allocate any data required by the object here */
-}
-
-static void empathy_connection_managers_dispose (GObject *object);
-
-static GObject *
-empathy_connection_managers_constructor (GType type,
-                        guint n_construct_params,
-                        GObjectConstructParam *construct_params)
-{
-  if (managers != NULL)
-    return g_object_ref (managers);
-
-  managers =
-      G_OBJECT_CLASS (empathy_connection_managers_parent_class)->constructor
-          (type, n_construct_params, construct_params);
-
-  g_object_add_weak_pointer (managers, (gpointer) &managers);
-
-  return managers;
-}
-
-
-
-static void
-empathy_connection_managers_get_property (GObject *object,
-    guint prop_id,
-    GValue *value,
-    GParamSpec *pspec)
-{
-  EmpathyConnectionManagers *self = EMPATHY_CONNECTION_MANAGERS (object);
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-
-  switch (prop_id)
-    {
-      case PROP_READY:
-        g_value_set_boolean (value, priv->ready);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_connection_managers_class_init (
-    EmpathyConnectionManagersClass *empathy_connection_managers_class)
-{
-  GObjectClass *object_class =
-      G_OBJECT_CLASS (empathy_connection_managers_class);
-
-  g_type_class_add_private (empathy_connection_managers_class, sizeof
-      (EmpathyConnectionManagersPriv));
-
-  object_class->constructor = empathy_connection_managers_constructor;
-  object_class->dispose = empathy_connection_managers_dispose;
-  object_class->get_property = empathy_connection_managers_get_property;
-
-  g_object_class_install_property (object_class, PROP_READY,
-    g_param_spec_boolean ("ready",
-      "Ready",
-      "Whether the connection manager information is ready to be used",
-      FALSE,
-      G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
-
-  signals[UPDATED] = g_signal_new ("updated",
-    G_TYPE_FROM_CLASS (object_class),
-    G_SIGNAL_RUN_LAST,
-    0, NULL, NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE, 0);
-}
-
-static void
-empathy_connection_managers_free_cm_list (EmpathyConnectionManagers *self)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-  GList *l;
-
-  for (l = priv->cms ; l != NULL ; l = g_list_next (l))
-    {
-      g_object_unref (l->data);
-    }
-  g_list_free (priv->cms);
-
-  priv->cms = NULL;
-}
-
-static void
-empathy_connection_managers_dispose (GObject *object)
-{
-  EmpathyConnectionManagers *self = EMPATHY_CONNECTION_MANAGERS (object);
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-
-  if (priv->dispose_has_run)
-    return;
-
-  priv->dispose_has_run = TRUE;
-
-  if (priv->dbus != NULL)
-    g_object_unref (priv->dbus);
-  priv->dbus = NULL;
-
-  empathy_connection_managers_free_cm_list (self);
-
-  /* release any references held by the object here */
-
-  if (G_OBJECT_CLASS (empathy_connection_managers_parent_class)->dispose)
-    G_OBJECT_CLASS (empathy_connection_managers_parent_class)->dispose (object);
-}
-
-EmpathyConnectionManagers *
-empathy_connection_managers_dup_singleton (void)
-{
-  return EMPATHY_CONNECTION_MANAGERS (
-      g_object_new (EMPATHY_TYPE_CONNECTION_MANAGERS, NULL));
-}
-
-gboolean
-empathy_connection_managers_is_ready (EmpathyConnectionManagers *self)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-  return priv->ready;
-}
-
-static void
-empathy_connection_managers_listed_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  TpWeakRef *wr = user_data;
-  GError *error = NULL;
-  EmpathyConnectionManagers *self = tp_weak_ref_dup_object (wr);
-  GList *cms, *l;
-  EmpathyConnectionManagersPriv *priv;
-
-  if (self == NULL)
-    {
-      tp_weak_ref_destroy (wr);
-      return;
-    }
-
-  priv = GET_PRIV (self);
-
-  empathy_connection_managers_free_cm_list (self);
-
-  cms = tp_list_connection_managers_finish (result, &error);
-  if (error != NULL)
-    {
-      DEBUG ("Failed to get connection managers: %s", error->message);
-      g_error_free (error);
-      goto out;
-    }
-
-  for (l = cms ; l != NULL; l = g_list_next (l))
-    {
-      TpConnectionManager *cm = l->data;
-
-      /* only list cms that didn't hit errors */
-      if (tp_proxy_is_prepared (cm, TP_CONNECTION_MANAGER_FEATURE_CORE))
-        priv->cms = g_list_prepend (priv->cms, g_object_ref (cm));
-    }
-
-out:
-  if (!priv->ready)
-    {
-      priv->ready = TRUE;
-      g_object_notify (G_OBJECT (self), "ready");
-    }
-
-  g_signal_emit (self, signals[UPDATED], 0);
-  g_object_unref (self);
-  tp_weak_ref_destroy (wr);
-}
-
-void
-empathy_connection_managers_update (EmpathyConnectionManagers *self)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-
-  tp_list_connection_managers_async (priv->dbus,
-    empathy_connection_managers_listed_cb,
-    tp_weak_ref_new (self, NULL, NULL));
-}
-
-GList *
-empathy_connection_managers_get_cms (EmpathyConnectionManagers *self)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-
-  return priv->cms;
-}
-
-TpConnectionManager *
-empathy_connection_managers_get_cm (EmpathyConnectionManagers *self,
-  const gchar *cm)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-  GList *l;
-
-  for (l = priv->cms ; l != NULL; l = g_list_next (l))
-    {
-      TpConnectionManager *c = TP_CONNECTION_MANAGER (l->data);
-
-      if (!tp_strdiff (tp_connection_manager_get_name (c), cm))
-        return c;
-    }
-
-  return NULL;
-}
-
-guint
-empathy_connection_managers_get_cms_num (EmpathyConnectionManagers *self)
-{
-  EmpathyConnectionManagersPriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (self), 0);
-
-  priv = GET_PRIV (self);
-
-  return g_list_length (priv->cms);
-}
-
-static void
-notify_ready_cb (EmpathyConnectionManagers *self,
-    GParamSpec *spec,
-    GSimpleAsyncResult *result)
-{
-  g_simple_async_result_complete (result);
-  g_object_unref (result);
-}
-
-void
-empathy_connection_managers_prepare_async (
-    EmpathyConnectionManagers *self,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  EmpathyConnectionManagersPriv *priv = GET_PRIV (self);
-  GSimpleAsyncResult *result;
-
-  result = g_simple_async_result_new (G_OBJECT (managers),
-      callback, user_data, empathy_connection_managers_prepare_finish);
-
-  if (priv->ready)
-    {
-      g_simple_async_result_complete_in_idle (result);
-      g_object_unref (result);
-      return;
-    }
-
-  g_signal_connect (self, "notify::ready", G_CALLBACK (notify_ready_cb),
-      result);
-}
-
-gboolean
-empathy_connection_managers_prepare_finish (
-    EmpathyConnectionManagers *self,
-    GAsyncResult *result,
-    GError **error)
-{
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  g_return_val_if_fail (g_simple_async_result_is_valid (result,
-          G_OBJECT (self), empathy_connection_managers_prepare_finish), FALSE);
-
-  if (g_simple_async_result_propagate_error (simple, error))
-    return FALSE;
-
-  return TRUE;
-}
diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
deleted file mode 100644
index d8bcb390a..000000000
--- a/libempathy/empathy-connection-managers.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * empathy-connection-managers.h - Header for EmpathyConnectionManagers
- * Copyright (C) 2009 Collabora Ltd.
- * @author Sjoerd Simons <sjoerd.simons@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_CONNECTION_MANAGERS_H__
-#define __EMPATHY_CONNECTION_MANAGERS_H__
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyConnectionManagers EmpathyConnectionManagers;
-typedef struct _EmpathyConnectionManagersClass EmpathyConnectionManagersClass;
-
-struct _EmpathyConnectionManagersClass {
-    GObjectClass parent_class;
-};
-
-struct _EmpathyConnectionManagers {
-    GObject parent;
-    gpointer priv;
-};
-
-GType empathy_connection_managers_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_CONNECTION_MANAGERS \
-  (empathy_connection_managers_get_type ())
-#define EMPATHY_CONNECTION_MANAGERS(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj), EMPATHY_TYPE_CONNECTION_MANAGERS, \
-    EmpathyConnectionManagers))
-#define EMPATHY_CONNECTION_MANAGERS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_CONNECTION_MANAGERS, \
-    EmpathyConnectionManagersClass))
-#define EMPATHY_IS_CONNECTION_MANAGERS(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj), EMPATHY_TYPE_CONNECTION_MANAGERS))
-#define EMPATHY_IS_CONNECTION_MANAGERS_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass), EMPATHY_TYPE_CONNECTION_MANAGERS))
-#define EMPATHY_CONNECTION_MANAGERS_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), EMPATHY_TYPE_CONNECTION_MANAGERS, \
-    EmpathyConnectionManagersClass))
-
-EmpathyConnectionManagers *empathy_connection_managers_dup_singleton (void);
-gboolean empathy_connection_managers_is_ready (
-    EmpathyConnectionManagers *managers);
-
-void empathy_connection_managers_update (EmpathyConnectionManagers *managers);
-
-GList * empathy_connection_managers_get_cms (
-    EmpathyConnectionManagers *managers);
-guint empathy_connection_managers_get_cms_num
-    (EmpathyConnectionManagers *managers);
-
-TpConnectionManager *empathy_connection_managers_get_cm (
-  EmpathyConnectionManagers *managers, const gchar *cm);
-
-void empathy_connection_managers_prepare_async (
-    EmpathyConnectionManagers *managers,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean empathy_connection_managers_prepare_finish (
-    EmpathyConnectionManagers *managers,
-    GAsyncResult *result,
-    GError **error);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_CONNECTION_MANAGERS_H__*/
diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
index 8d49f0519..7818eb557 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -21,17 +21,18 @@
  */
 
 #include "config.h"
+#include "empathy-contact-groups.h"
 
 #include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-utils.h"
-#include "empathy-contact-groups.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
 
 #define CONTACT_GROUPS_XML_FILENAME "contact-groups.xml"
-#define CONTACT_GROUPS_DTD_FILENAME "empathy-contact-groups.dtd"
+#define CONTACT_GROUPS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-contact-groups.dtd"
 
 typedef struct {
 	gchar    *name;
@@ -91,7 +92,7 @@ contact_groups_file_parse (const gchar *filename)
 		return;
 	}
 
-	if (!empathy_xml_validate (doc, CONTACT_GROUPS_DTD_FILENAME)) {
+	if (!tpaw_xml_validate_from_resource (doc, CONTACT_GROUPS_DTD_RESOURCENAME)) {
 		g_warning ("Failed to validate file:'%s'", filename);
 		xmlFreeDoc (doc);
 		xmlFreeParserCtxt (ctxt);
diff --git a/libempathy/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h
index 181b28753..0be1c81b3 100644
--- a/libempathy/empathy-contact-groups.h
+++ b/libempathy/empathy-contact-groups.h
@@ -23,10 +23,10 @@
 #ifndef __EMPATHY_CONTACT_GROUPS_H__
 #define __EMPATHY_CONTACT_GROUPS_H__
 
-G_BEGIN_DECLS
-
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 void     empathy_contact_groups_get_all     (void);
 
 gboolean empathy_contact_group_get_expanded (const gchar *group);
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 3c91e6319..2f381a5be 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,11 +20,15 @@
  */
 
 #include "config.h"
+#include "empathy-contact.h"
+
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
 #endif
 
+#include "empathy-location.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
 
@@ -460,7 +464,7 @@ empathy_contact_set_id (EmpathyContact *contact,
       priv->id = g_strdup (id);
 
       g_object_notify (G_OBJECT (contact), "id");
-      if (EMP_STR_EMPTY (priv->alias))
+      if (TPAW_STR_EMPTY (priv->alias))
           g_object_notify (G_OBJECT (contact), "alias");
     }
 
@@ -766,7 +770,7 @@ empathy_contact_from_tpl_contact (TpAccount *account,
         }
     }
 
-  if (!EMP_STR_EMPTY (tpl_entity_get_avatar_token (tpl_entity)))
+  if (!TPAW_STR_EMPTY (tpl_entity_get_avatar_token (tpl_entity)))
     contact_load_avatar_cache (retval,
         tpl_entity_get_avatar_token (tpl_entity));
 
@@ -810,12 +814,12 @@ empathy_contact_get_alias (EmpathyContact *contact)
 
   priv = GET_PRIV (contact);
 
-  if (!EMP_STR_EMPTY (priv->alias))
+  if (!TPAW_STR_EMPTY (priv->alias))
     alias = priv->alias;
   else if (priv->tp_contact != NULL)
     alias = tp_contact_get_alias (priv->tp_contact);
 
-  if (!EMP_STR_EMPTY (alias))
+  if (!TPAW_STR_EMPTY (alias))
     return alias;
   else
     return empathy_contact_get_id (contact);
@@ -1183,7 +1187,7 @@ empathy_contact_get_status (EmpathyContact *contact)
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), "");
 
   message = empathy_contact_get_presence_message (contact);
-  if (!EMP_STR_EMPTY (message))
+  if (!TPAW_STR_EMPTY (message))
     return message;
 
   return empathy_presence_get_default_message (
@@ -1328,7 +1332,7 @@ contact_get_avatar_filename (EmpathyContact *contact,
   gchar *avatar_file;
   gchar *token_escaped;
 
-  if (EMP_STR_EMPTY (empathy_contact_get_id (contact)))
+  if (TPAW_STR_EMPTY (empathy_contact_get_id (contact)))
     return NULL;
 
   token_escaped = tp_escape_as_identifier (token);
@@ -1361,7 +1365,7 @@ contact_load_avatar_cache (EmpathyContact *contact,
   GError *error = NULL;
 
   g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), FALSE);
-  g_return_val_if_fail (!EMP_STR_EMPTY (token), FALSE);
+  g_return_val_if_fail (!TPAW_STR_EMPTY (token), FALSE);
 
   /* Load the avatar from file if it exists */
   filename = contact_get_avatar_filename (contact, token);
@@ -1616,7 +1620,6 @@ geocode_cb (GObject *source,
   GeocodeLocation *loc;
   GHashTable *new_location;
   GHashTable *resolved = NULL;
-  gdouble latitude, longitude;
 
   if (priv->location == NULL)
     goto out;
@@ -1634,14 +1637,14 @@ geocode_cb (GObject *source,
   loc = res->data;
 
   new_location = tp_asv_new (
-      EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, loc->latitude,
-      EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, loc->longitude,
+      EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, geocode_location_get_latitude (loc),
+      EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, geocode_location_get_longitude (loc),
       NULL);
 
-  DEBUG ("\t - Latitude: %f", loc->latitude);
-  DEBUG ("\t - Longitude: %f", loc->longitude);
+  DEBUG ("\t - Latitude: %f", geocode_location_get_latitude (loc));
+  DEBUG ("\t - Longitude: %f", geocode_location_get_longitude (loc));
 
-  g_list_free_full (res, (GDestroyNotify) geocode_location_free);
+  g_list_free_full (res, g_object_unref);
 
   /* Copy remaning fields. LAT and LON were not defined so we won't overwrite
    * the values we just set. */
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 14c3f6440..e7ce10e4b 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_CONTACT_H__
 
 #include <glib-object.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>
diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 09573c39a..d919743eb 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,9 +19,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-debug.h"
 
+#include <tp-account-widgets/tpaw-debug.h>
+
 #ifdef ENABLE_DEBUG
 
 static EmpathyDebugFlags flags = 0;
@@ -31,7 +32,6 @@ static GDebugKey keys[] = {
   { "Chat", EMPATHY_DEBUG_CHAT },
   { "Contact", EMPATHY_DEBUG_CONTACT },
   { "Account", EMPATHY_DEBUG_ACCOUNT },
-  { "Irc", EMPATHY_DEBUG_IRC },
   { "Dispatcher", EMPATHY_DEBUG_DISPATCHER },
   { "Ft", EMPATHY_DEBUG_FT },
   { "Location", EMPATHY_DEBUG_LOCATION },
@@ -60,6 +60,7 @@ empathy_debug_set_flags (const gchar *flags_string)
   for (nkeys = 0; keys[nkeys].value; nkeys++);
 
   tp_debug_set_flags (flags_string);
+  tpaw_debug_set_flags (flags_string);
 
   if (flags_string)
       debug_set_flags (g_parse_debug_string (flags_string, keys, nkeys));
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index e6b93cc7a..5058f4ba0 100644
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -21,9 +21,6 @@
 #ifndef __EMPATHY_DEBUG_H__
 #define __EMPATHY_DEBUG_H__
 
-#include "config.h"
-
-
 #include <glib.h>
 #include <telepathy-glib/telepathy-glib.h>
 
@@ -36,19 +33,18 @@ typedef enum
   EMPATHY_DEBUG_CHAT = 1 << 2,
   EMPATHY_DEBUG_CONTACT = 1 << 3,
   EMPATHY_DEBUG_ACCOUNT = 1 << 4,
-  EMPATHY_DEBUG_IRC = 1 << 5,
-  EMPATHY_DEBUG_DISPATCHER = 1 << 6,
-  EMPATHY_DEBUG_FT = 1 << 7,
-  EMPATHY_DEBUG_LOCATION = 1 << 8,
-  EMPATHY_DEBUG_OTHER = 1 << 9,
-  EMPATHY_DEBUG_SHARE_DESKTOP = 1 << 10,
-  EMPATHY_DEBUG_CONNECTIVITY = 1 << 11,
-  EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS = 1 << 11,
-  EMPATHY_DEBUG_TESTS = 1 << 12,
-  EMPATHY_DEBUG_VOIP = 1 << 13,
-  EMPATHY_DEBUG_TLS = 1 << 14,
-  EMPATHY_DEBUG_SASL = 1 << 15,
-  EMPATHY_DEBUG_CAMERA = 1 << 16,
+  EMPATHY_DEBUG_DISPATCHER = 1 << 5,
+  EMPATHY_DEBUG_FT = 1 << 6,
+  EMPATHY_DEBUG_LOCATION = 1 << 7,
+  EMPATHY_DEBUG_OTHER = 1 << 8,
+  EMPATHY_DEBUG_SHARE_DESKTOP = 1 << 9,
+  EMPATHY_DEBUG_CONNECTIVITY = 1 << 10,
+  EMPATHY_DEBUG_IMPORT_MC4_ACCOUNTS = 1 << 10,
+  EMPATHY_DEBUG_TESTS = 1 << 11,
+  EMPATHY_DEBUG_VOIP = 1 << 12,
+  EMPATHY_DEBUG_TLS = 1 << 13,
+  EMPATHY_DEBUG_SASL = 1 << 14,
+  EMPATHY_DEBUG_CAMERA = 1 << 15,
 } EmpathyDebugFlags;
 
 gboolean empathy_debug_flag_is_set (EmpathyDebugFlags flag);
diff --git a/libempathy/empathy-dtd.gresource.xml b/libempathy/empathy-dtd.gresource.xml
new file mode 100644
index 000000000..f222363ce
--- /dev/null
+++ b/libempathy/empathy-dtd.gresource.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Empathy">
+    <file>empathy-status-presets.dtd</file>
+    <file>empathy-contact-groups.dtd</file>
+    <file>empathy-chatroom-manager.dtd</file>
+  </gresource>
+</gresources>
+
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9cf90014b..855ddb98f 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -21,7 +21,9 @@
 
 /* empathy-ft-factory.c */
 
+#include "config.h"
 #include "empathy-ft-factory.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 30711c7d1..d7e112a2f 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -22,11 +22,12 @@
 /* empathy-ft-handler.c */
 
 #include "config.h"
+#include "empathy-ft-handler.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-ft-handler.h"
-#include "empathy-time.h"
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
@@ -601,7 +602,7 @@ check_hash_incoming (EmpathyFTHandler *handler)
   HashingData *hash_data;
   EmpathyFTHandlerPriv *priv = GET_PRIV (handler);
 
-  if (!EMP_STR_EMPTY (priv->content_hash))
+  if (!TPAW_STR_EMPTY (priv->content_hash))
     {
       hash_data = g_slice_new0 (HashingData);
       hash_data->total_bytes = priv->total_bytes;
@@ -643,7 +644,7 @@ update_remaining_time_and_speed (EmpathyFTHandler *handler,
   last_transferred_bytes = priv->transferred_bytes;
   priv->transferred_bytes = transferred_bytes;
 
-  current_time = empathy_time_get_current ();
+  current_time = tpaw_time_get_current ();
   elapsed_time = current_time - priv->last_update_time;
 
   if (elapsed_time >= 1)
@@ -672,7 +673,7 @@ ft_transfer_transferred_bytes_cb (TpFileTransferChannel *channel,
 
   if (priv->transferred_bytes == 0)
     {
-      priv->last_update_time = empathy_time_get_current ();
+      priv->last_update_time = tpaw_time_get_current ();
       g_signal_emit (handler, signals[TRANSFER_STARTED], 0, channel);
     }
 
@@ -1512,7 +1513,7 @@ empathy_ft_handler_incoming_set_destination (EmpathyFTHandler *handler,
   /* check if hash is supported. if it isn't, set use_hash to FALSE
    * anyway, so that clients won't be expecting us to checksum.
    */
-  if (EMP_STR_EMPTY (priv->content_hash) ||
+  if (TPAW_STR_EMPTY (priv->content_hash) ||
       priv->content_hash_type == TP_FILE_HASH_TYPE_NONE)
     priv->use_hash = FALSE;
   else
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index a120f241b..2fc1b609f 100644
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -26,7 +26,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c
index 3659b3728..379730004 100644
--- a/libempathy/empathy-goa-auth-handler.c
+++ b/libempathy/empathy-goa-auth-handler.c
@@ -19,14 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-goa-auth-handler.h"
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>
 
+#include "empathy-sasl-mechanisms.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-goa-auth-handler.h"
-#include "empathy-sasl-mechanisms.h"
 
 struct _EmpathyGoaAuthHandlerPriv
 {
diff --git a/libempathy/empathy-gsettings.h b/libempathy/empathy-gsettings.h
index 0a7a18c3e..5256ec0b3 100644
--- a/libempathy/empathy-gsettings.h
+++ b/libempathy/empathy-gsettings.h
@@ -73,7 +73,6 @@ G_BEGIN_DECLS
 #define EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS     "separate-chat-windows"
 #define EMPATHY_PREFS_UI_EVENTS_NOTIFY_AREA        "events-notify-area"
 #define EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN        "main-window-hidden"
-#define EMPATHY_PREFS_UI_AVATAR_DIRECTORY          "avatar-directory"
 #define EMPATHY_PREFS_UI_SHOW_BALANCES             "show-balance-in-roster"
 #define EMPATHY_PREFS_UI_CHAT_WINDOW_PANED_POS     "chat-window-paned-pos"
 #define EMPATHY_PREFS_UI_SHOW_OFFLINE              "show-offline"
@@ -84,9 +83,6 @@ G_BEGIN_DECLS
 
 #define EMPATHY_PREFS_LOCATION_SCHEMA EMPATHY_PREFS_SCHEMA ".location"
 #define EMPATHY_PREFS_LOCATION_PUBLISH             "publish"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK    "resource-network"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_CELL       "resource-cell"
-#define EMPATHY_PREFS_LOCATION_RESOURCE_GPS        "resource-gps"
 #define EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY     "reduce-accuracy"
 
 #define EMPATHY_PREFS_LOGGER_SCHEMA "org.freedesktop.Telepathy.Logger"
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index f3c7565a1..851898531 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -21,8 +21,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-manager.h"
+
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -946,6 +948,6 @@ empathy_individual_manager_unprepare_finish (
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (self,
+  tpaw_implement_finish_void (self,
       empathy_individual_manager_unprepare_async)
 }
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
deleted file mode 100644
index 7f6ed9df8..000000000
--- a/libempathy/empathy-irc-network-manager.c
+++ /dev/null
@@ -1,852 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include <sys/stat.h>
-
-#include "empathy-utils.h"
-#include "empathy-irc-network-manager.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
-
-#define IRC_NETWORKS_DTD_FILENAME "empathy-irc-networks.dtd"
-#define IRC_NETWORKS_FILENAME "irc-networks.xml"
-#define SAVE_TIMER 4
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetworkManager)
-typedef struct {
-  GHashTable *networks;
-
-  gchar *global_file;
-  gchar *user_file;
-  guint last_id;
-
-  /* Do we have to save modifications to the user file ? */
-  gboolean have_to_save;
-  /* Are we loading networks from XML files ? */
-  gboolean loading;
-  /* source id of the autosave timer */
-  gint save_timer_id;
-} EmpathyIrcNetworkManagerPriv;
-
-/* properties */
-enum
-{
-  PROP_GLOBAL_FILE = 1,
-  PROP_USER_FILE,
-  LAST_PROPERTY
-};
-
-G_DEFINE_TYPE (EmpathyIrcNetworkManager, empathy_irc_network_manager,
-    G_TYPE_OBJECT);
-
-static void irc_network_manager_load_servers (
-    EmpathyIrcNetworkManager *manager);
-static gboolean irc_network_manager_file_parse (
-    EmpathyIrcNetworkManager *manager, const gchar *filename,
-    gboolean user_defined);
-static gboolean irc_network_manager_file_save (
-    EmpathyIrcNetworkManager *manager);
-
-static void
-empathy_irc_network_manager_get_property (GObject *object,
-                                          guint property_id,
-                                          GValue *value,
-                                          GParamSpec *pspec)
-{
-  EmpathyIrcNetworkManager *self = EMPATHY_IRC_NETWORK_MANAGER (object);
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_GLOBAL_FILE:
-        g_value_set_string (value, priv->global_file);
-        break;
-      case PROP_USER_FILE:
-        g_value_set_string (value, priv->user_file);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_network_manager_set_property (GObject *object,
-                                          guint property_id,
-                                          const GValue *value,
-                                          GParamSpec *pspec)
-{
-  EmpathyIrcNetworkManager *self = EMPATHY_IRC_NETWORK_MANAGER (object);
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_GLOBAL_FILE:
-        g_free (priv->global_file);
-        priv->global_file = g_value_dup_string (value);
-        break;
-      case PROP_USER_FILE:
-        g_free (priv->user_file);
-        priv->user_file = g_value_dup_string (value);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static GObject *
-empathy_irc_network_manager_constructor (GType type,
-                                         guint n_props,
-                                         GObjectConstructParam *props)
-{
-  GObject *obj;
-  EmpathyIrcNetworkManager *self;
-
-  /* Parent constructor chain */
-  obj = G_OBJECT_CLASS (empathy_irc_network_manager_parent_class)->
-        constructor (type, n_props, props);
-
-  self = EMPATHY_IRC_NETWORK_MANAGER (obj);
-  irc_network_manager_load_servers (self);
-
-  return obj;
-}
-
-static void
-empathy_irc_network_manager_finalize (GObject *object)
-{
-  EmpathyIrcNetworkManager *self = EMPATHY_IRC_NETWORK_MANAGER (object);
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  if (priv->save_timer_id > 0)
-    {
-      g_source_remove (priv->save_timer_id);
-    }
-
-  if (priv->have_to_save)
-    {
-      irc_network_manager_file_save (self);
-    }
-
-  g_free (priv->global_file);
-  g_free (priv->user_file);
-
-  g_hash_table_unref (priv->networks);
-
-  G_OBJECT_CLASS (empathy_irc_network_manager_parent_class)->finalize (object);
-}
-
-static void
-empathy_irc_network_manager_init (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_IRC_NETWORK_MANAGER, EmpathyIrcNetworkManagerPriv);
-
-  self->priv = priv;
-
-  priv->networks = g_hash_table_new_full (g_str_hash, g_str_equal,
-      (GDestroyNotify) g_free, (GDestroyNotify) g_object_unref);
-
-  priv->last_id = 0;
-
-  priv->have_to_save = FALSE;
-  priv->loading = FALSE;
-  priv->save_timer_id = 0;
-}
-
-static void
-empathy_irc_network_manager_class_init (EmpathyIrcNetworkManagerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->constructor = empathy_irc_network_manager_constructor;
-  object_class->get_property = empathy_irc_network_manager_get_property;
-  object_class->set_property = empathy_irc_network_manager_set_property;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyIrcNetworkManagerPriv));
-
-  object_class->finalize = empathy_irc_network_manager_finalize;
-
-  param_spec = g_param_spec_string (
-      "global-file",
-      "path of the global networks file",
-      "The path of the system-wide filename from which we have to load"
-      " the networks list",
-      NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_GLOBAL_FILE, param_spec);
-
-  param_spec = g_param_spec_string (
-      "user-file",
-      "path of the user networks file",
-      "The path of user's  filename from which we have to load"
-      " the networks list and to which we'll save his modifications",
-      NULL,
-      G_PARAM_CONSTRUCT_ONLY |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_USER_FILE, param_spec);
-}
-
-/**
- * empathy_irc_network_manager_new:
- * @global_file: the path of the global networks file, or %NULL
- * @user_file: the path of the user networks file, or %NULL
- *
- * Creates a new #EmpathyIrcNetworkManager
- *
- * Returns: a new #EmpathyIrcNetworkManager
- */
-EmpathyIrcNetworkManager *
-empathy_irc_network_manager_new (const gchar *global_file,
-                                 const gchar *user_file)
-{
-  EmpathyIrcNetworkManager *manager;
-
-  manager = g_object_new (EMPATHY_TYPE_IRC_NETWORK_MANAGER,
-      "global-file", global_file,
-      "user-file", user_file,
-      NULL);
-
-  return manager;
-}
-
-static gboolean
-save_timeout (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  priv->save_timer_id = 0;
-  irc_network_manager_file_save (self);
-
-  return FALSE;
-}
-
-static void
-reset_save_timeout (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  if (priv->save_timer_id > 0)
-    {
-      g_source_remove (priv->save_timer_id);
-    }
-
-  priv->save_timer_id = g_timeout_add_seconds (SAVE_TIMER,
-      (GSourceFunc) save_timeout, self);
-}
-
-static void
-network_modified (EmpathyIrcNetwork *network,
-                  EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  network->user_defined = TRUE;
-
-  if (!priv->loading)
-    {
-      priv->have_to_save = TRUE;
-      reset_save_timeout (self);
-    }
-}
-
-static void
-add_network (EmpathyIrcNetworkManager *self,
-             EmpathyIrcNetwork *network,
-             const gchar *id)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  g_hash_table_insert (priv->networks, g_strdup (id), g_object_ref (network));
-
-  g_signal_connect (network, "modified", G_CALLBACK (network_modified), self);
-}
-
-/**
- * empathy_irc_network_manager_add:
- * @manager: an #EmpathyIrcNetworkManager
- * @network: the #EmpathyIrcNetwork to add
- *
- * Add an #EmpathyIrcNetwork to the given #EmpathyIrcNetworkManager.
- *
- */
-void
-empathy_irc_network_manager_add (EmpathyIrcNetworkManager *self,
-                                 EmpathyIrcNetwork *network)
-{
-  EmpathyIrcNetworkManagerPriv *priv;
-  gchar *id = NULL;
-
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK_MANAGER (self));
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (network));
-
-  priv = GET_PRIV (self);
-
-  /* generate an id for this network */
-  do
-    {
-      g_free (id);
-      id = g_strdup_printf ("id%u", ++priv->last_id);
-    } while (g_hash_table_lookup (priv->networks, id) != NULL &&
-        priv->last_id < G_MAXUINT);
-
-  if (priv->last_id == G_MAXUINT)
-    {
-      DEBUG ("Can't add network: too many networks using a similar ID");
-      return;
-    }
-
-  DEBUG ("add server with \"%s\" as ID", id);
-
-  network->user_defined = TRUE;
-  add_network (self, network, id);
-
-  priv->have_to_save = TRUE;
-  reset_save_timeout (self);
-
-  g_free (id);
-}
-
-/**
- * empathy_irc_network_manager_remove:
- * @manager: an #EmpathyIrcNetworkManager
- * @network: the #EmpathyIrcNetwork to remove
- *
- * Remove an #EmpathyIrcNetwork from the given #EmpathyIrcNetworkManager.
- *
- */
-void
-empathy_irc_network_manager_remove (EmpathyIrcNetworkManager *self,
-                                    EmpathyIrcNetwork *network)
-{
-  EmpathyIrcNetworkManagerPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK_MANAGER (self));
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (network));
-
-  priv = GET_PRIV (self);
-
-  network->user_defined = TRUE;
-  network->dropped = TRUE;
-
-  priv->have_to_save = TRUE;
-  reset_save_timeout (self);
-}
-
-static void
-append_active_networks_to_list (const gchar *id,
-                        EmpathyIrcNetwork *network,
-                        GSList **list)
-{
-  if (network->dropped)
-    return;
-
-  *list = g_slist_prepend (*list, g_object_ref (network));
-}
-
-static void
-append_dropped_networks_to_list (const gchar *id,
-                        EmpathyIrcNetwork *network,
-                        GSList **list)
-{
-  if (!network->dropped)
-    return;
-
-  *list = g_slist_prepend (*list, g_object_ref (network));
-}
-
-static GSList *
-get_network_list (EmpathyIrcNetworkManager *self,
-    gboolean get_active)
-{
-  EmpathyIrcNetworkManagerPriv *priv;
-  GSList *irc_networks = NULL;
-
-  g_return_val_if_fail (EMPATHY_IS_IRC_NETWORK_MANAGER (self), NULL);
-
-  priv = GET_PRIV (self);
-
-  if (get_active)
-    {
-      g_hash_table_foreach (priv->networks,
-          (GHFunc) append_active_networks_to_list, &irc_networks);
-    }
-  else
-    {
-      g_hash_table_foreach (priv->networks,
-          (GHFunc) append_dropped_networks_to_list, &irc_networks);
-    }
-
-  return irc_networks;
-}
-
-/**
- * empathy_irc_network_manager_get_networks:
- * @manager: an #EmpathyIrcNetworkManager
- *
- * Get the list of #EmpathyIrcNetwork associated with the given
- * manager.
- *
- * Returns: a new #GSList of refed #EmpathyIrcNetwork
- */
-GSList *
-empathy_irc_network_manager_get_networks (EmpathyIrcNetworkManager *self)
-{
-  return get_network_list (self, TRUE);
-}
-
-/**
- * empathy_irc_network_manager_get_dropped_networks:
- * @manager: an #EmpathyIrcNetworkManager
- *
- * Get the list of dropped #EmpathyIrcNetworks associated with the given
- * manager.
- *
- * Returns: a new #GSList of refed dropped #EmpathyIrcNetworks
- */
-GSList *
-empathy_irc_network_manager_get_dropped_networks (EmpathyIrcNetworkManager *self)
-{
-  return get_network_list (self, FALSE);
-}
-
-/*
- * API to save/load and parse the irc_networks file.
- */
-
-static void
-load_global_file (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  if (priv->global_file == NULL)
-    return;
-
-  if (!g_file_test (priv->global_file, G_FILE_TEST_EXISTS))
-    {
-      DEBUG ("Global networks file %s doesn't exist", priv->global_file);
-      return;
-    }
-
-  irc_network_manager_file_parse (self, priv->global_file, FALSE);
-}
-
-static void
-load_user_file (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  if (priv->user_file == NULL)
-    return;
-
-  if (!g_file_test (priv->user_file, G_FILE_TEST_EXISTS))
-    {
-      DEBUG ("User networks file %s doesn't exist", priv->global_file);
-      return;
-    }
-
-  irc_network_manager_file_parse (self, priv->user_file, TRUE);
-}
-
-static void
-irc_network_manager_load_servers (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-
-  priv->loading = TRUE;
-
-  load_global_file (self);
-  load_user_file (self);
-
-  priv->loading = FALSE;
-  priv->have_to_save = FALSE;
-}
-
-static void
-irc_network_manager_parse_irc_server (EmpathyIrcNetwork *network,
-                                      xmlNodePtr node)
-{
-  xmlNodePtr server_node;
-
-  for (server_node = node->children; server_node;
-      server_node = server_node->next)
-    {
-      gchar *address = NULL, *port = NULL, *ssl = NULL;
-
-      if (strcmp ((const gchar *) server_node->name, "server") != 0)
-        continue;
-
-      address = (gchar *) xmlGetProp (server_node, (const xmlChar *) "address");
-      port = (gchar *) xmlGetProp (server_node, (const xmlChar *) "port");
-      ssl = (gchar *) xmlGetProp (server_node, (const xmlChar *) "ssl");
-
-      if (address != NULL)
-        {
-          gint port_nb = 0;
-          gboolean have_ssl = FALSE;
-          EmpathyIrcServer *server;
-
-          if (port != NULL)
-            port_nb = strtol (port, NULL, 10);
-
-          if (port_nb <= 0 || port_nb > G_MAXUINT16)
-            port_nb = 6667;
-
-          if (ssl == NULL || strcmp (ssl, "TRUE") == 0)
-            have_ssl = TRUE;
-
-          DEBUG ("parsed server %s port %d ssl %d", address, port_nb, have_ssl);
-
-          server = empathy_irc_server_new (address, port_nb, have_ssl);
-          empathy_irc_network_append_server (network, server);
-        }
-
-      if (address)
-        xmlFree (address);
-      if (port)
-        xmlFree (port);
-      if (ssl)
-        xmlFree (ssl);
-    }
-}
-
-static void
-irc_network_manager_parse_irc_network (EmpathyIrcNetworkManager *self,
-                                       xmlNodePtr node,
-                                       gboolean user_defined)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork  *network;
-  xmlNodePtr child;
-  gchar *str;
-  gchar *id, *name;
-
-  id = (gchar *) xmlGetProp (node, (const xmlChar *) "id");
-  if (xmlHasProp (node, (const xmlChar *) "dropped"))
-    {
-      if (!user_defined)
-        {
-          DEBUG ("the 'dropped' attribute shouldn't be used in the global file");
-        }
-
-      network = g_hash_table_lookup (priv->networks, id);
-      if (network != NULL)
-        {
-          network->dropped = TRUE;
-          network->user_defined = TRUE;
-        }
-       xmlFree (id);
-      return;
-    }
-
-  if (!xmlHasProp (node, (const xmlChar *) "name"))
-    return;
-
-  name = (gchar *) xmlGetProp (node, (const xmlChar *) "name");
-  network = empathy_irc_network_new (name);
-
-  if (xmlHasProp (node, (const xmlChar *) "network_charset"))
-    {
-      gchar *charset;
-      charset = (gchar *) xmlGetProp (node, (const xmlChar *) "network_charset");
-      g_object_set (network, "charset", charset, NULL);
-      xmlFree (charset);
-    }
-
-  add_network (self, network, id);
-  DEBUG ("add network %s (id %s)", name, id);
-
-  for (child = node->children; child; child = child->next)
-    {
-      gchar *tag;
-
-      tag = (gchar *) child->name;
-      str = (gchar *) xmlNodeGetContent (child);
-
-      if (!str)
-        continue;
-
-      if (strcmp (tag, "servers") == 0)
-        {
-          irc_network_manager_parse_irc_server (network, child);
-        }
-
-      xmlFree (str);
-    }
-
-  network->user_defined = user_defined;
-  g_object_unref (network);
-  xmlFree (name);
-  xmlFree (id);
-}
-
-static gboolean
-irc_network_manager_file_parse (EmpathyIrcNetworkManager *self,
-                                const gchar *filename,
-                                gboolean user_defined)
-{
-  xmlParserCtxtPtr ctxt;
-  xmlDocPtr doc;
-  xmlNodePtr networks;
-  xmlNodePtr node;
-
-  DEBUG ("Attempting to parse file:'%s'...", filename);
-
-  ctxt = xmlNewParserCtxt ();
-
-  /* Parse and validate the file. */
-  doc = xmlCtxtReadFile (ctxt, filename, NULL, 0);
-  if (!doc)
-    {
-      g_warning ("Failed to parse file:'%s'", filename);
-      xmlFreeParserCtxt (ctxt);
-      return FALSE;
-    }
-
-  if (!empathy_xml_validate (doc, IRC_NETWORKS_DTD_FILENAME)) {
-    g_warning ("Failed to validate file:'%s'", filename);
-    xmlFreeDoc (doc);
-    xmlFreeParserCtxt (ctxt);
-    return FALSE;
-  }
-
-  /* The root node, networks. */
-  networks = xmlDocGetRootElement (doc);
-
-  for (node = networks->children; node; node = node->next)
-    {
-      irc_network_manager_parse_irc_network (self, node, user_defined);
-    }
-
-  xmlFreeDoc (doc);
-  xmlFreeParserCtxt (ctxt);
-
-  return TRUE;
-}
-
-static void
-write_network_to_xml (const gchar *id,
-                      EmpathyIrcNetwork *network,
-                      xmlNodePtr root)
-{
-  xmlNodePtr network_node, servers_node;
-  GSList *servers, *l;
-  gchar *name, *charset;
-
-  if (!network->user_defined)
-    /* no need to write this network to the XML */
-    return;
-
-  network_node = xmlNewChild (root, NULL, (const xmlChar *) "network", NULL);
-  xmlNewProp (network_node, (const xmlChar *) "id", (const xmlChar *) id);
-
-  if (network->dropped)
-    {
-      xmlNewProp (network_node, (const xmlChar *) "dropped",
-          (const xmlChar *)  "1");
-      return;
-    }
-
-  g_object_get (network,
-      "name", &name,
-      "charset", &charset,
-      NULL);
-  xmlNewProp (network_node, (const xmlChar *) "name", (const xmlChar *) name);
-  xmlNewProp (network_node, (const xmlChar *) "network_charset",
-      (const xmlChar *) charset);
-  g_free (name);
-  g_free (charset);
-
-  servers = empathy_irc_network_get_servers (network);
-
-  servers_node = xmlNewChild (network_node, NULL, (const xmlChar *) "servers",
-      NULL);
-  for (l = servers; l != NULL; l = g_slist_next (l))
-    {
-      EmpathyIrcServer *server;
-      xmlNodePtr server_node;
-      gchar *address, *tmp;
-      guint port;
-      gboolean ssl;
-
-      server = l->data;
-
-      server_node = xmlNewChild (servers_node, NULL, (const xmlChar *) "server",
-          NULL);
-
-      g_object_get (server,
-          "address", &address,
-          "port", &port,
-          "ssl", &ssl,
-          NULL);
-
-      xmlNewProp (server_node, (const xmlChar *) "address",
-          (const xmlChar *) address);
-
-      tmp = g_strdup_printf ("%u", port);
-      xmlNewProp (server_node, (const xmlChar *) "port",
-          (const xmlChar *) tmp);
-      g_free (tmp);
-
-      xmlNewProp (server_node, (const xmlChar *) "ssl",
-          ssl ? (const xmlChar *) "TRUE": (const xmlChar *) "FALSE");
-
-      g_free (address);
-    }
-
-  /* free the list */
-  g_slist_foreach (servers, (GFunc) g_object_unref, NULL);
-  g_slist_free (servers);
-}
-
-static gboolean
-irc_network_manager_file_save (EmpathyIrcNetworkManager *self)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-  xmlDocPtr doc;
-  xmlNodePtr root;
-
-  if (priv->user_file == NULL)
-    {
-      DEBUG ("can't save: no user file defined");
-      return FALSE;
-    }
-
-  DEBUG ("Saving IRC networks");
-
-  doc = xmlNewDoc ((const xmlChar *)  "1.0");
-  root = xmlNewNode (NULL, (const xmlChar *) "networks");
-  xmlDocSetRootElement (doc, root);
-
-  g_hash_table_foreach (priv->networks, (GHFunc) write_network_to_xml, root);
-
-  /* Make sure the XML is indented properly */
-  xmlIndentTreeOutput = 1;
-
-  xmlSaveFormatFileEnc (priv->user_file, doc, "utf-8", 1);
-  xmlFreeDoc (doc);
-
-  xmlMemoryDump ();
-
-  priv->have_to_save = FALSE;
-
-  return TRUE;
-}
-
-static gboolean
-find_network_by_address (const gchar *id,
-                         EmpathyIrcNetwork *network,
-                         const gchar *address)
-{
-  GSList *servers, *l;
-  gboolean found = FALSE;
-
-  if (network->dropped)
-    return FALSE;
-
-  servers = empathy_irc_network_get_servers (network);
-
-  for (l = servers; l != NULL && !found; l = g_slist_next (l))
-    {
-      EmpathyIrcServer *server = l->data;
-      gchar *_address;
-
-      g_object_get (server, "address", &_address, NULL);
-      found = (_address != NULL && strcmp (address, _address) == 0);
-
-      g_free (_address);
-    }
-
-  g_slist_foreach (servers, (GFunc) g_object_unref, NULL);
-  g_slist_free (servers);
-
-  return found;
-}
-
-/**
- * empathy_irc_network_manager_find_network_by_address:
- * @manager: an #EmpathyIrcNetworkManager
- * @address: the server address to look for
- *
- * Find the #EmpathyIrcNetwork which owns an #EmpathyIrcServer
- * that has the given address.
- *
- * Returns: the found #EmpathyIrcNetwork, or %NULL if not found.
- */
-EmpathyIrcNetwork *
-empathy_irc_network_manager_find_network_by_address (
-    EmpathyIrcNetworkManager *self,
-    const gchar *address)
-{
-  EmpathyIrcNetworkManagerPriv *priv = GET_PRIV (self);
-  EmpathyIrcNetwork *network;
-
-  g_return_val_if_fail (address != NULL, NULL);
-
-  network = g_hash_table_find (priv->networks,
-      (GHRFunc) find_network_by_address, (gchar *) address);
-
-  return network;
-}
-
-EmpathyIrcNetworkManager *
-empathy_irc_network_manager_dup_default (void)
-{
-  static EmpathyIrcNetworkManager *default_mgr = NULL;
-  gchar *dir, *user_file_with_path, *global_file_with_path;
-
-  if (default_mgr != NULL)
-    return g_object_ref (default_mgr);
-
-  dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
-  g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
-  user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL);
-  g_free (dir);
-
-  global_file_with_path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"),
-      "libempathy", IRC_NETWORKS_FILENAME, NULL);
-  if (!g_file_test (global_file_with_path, G_FILE_TEST_EXISTS))
-    {
-      g_free (global_file_with_path);
-      global_file_with_path = g_build_filename (DATADIR, "empathy",
-          IRC_NETWORKS_FILENAME, NULL);
-    }
-
-  default_mgr = empathy_irc_network_manager_new (
-      global_file_with_path, user_file_with_path);
-
-  g_object_add_weak_pointer (G_OBJECT (default_mgr), (gpointer *) &default_mgr);
-
-  g_free (global_file_with_path);
-  g_free (user_file_with_path);
-  return default_mgr;
-}
diff --git a/libempathy/empathy-irc-network-manager.h b/libempathy/empathy-irc-network-manager.h
deleted file mode 100644
index 19df2f7e1..000000000
--- a/libempathy/empathy-irc-network-manager.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_NETWORK_MANAGER_H__
-#define __EMPATHY_IRC_NETWORK_MANAGER_H__
-
-#include <glib-object.h>
-
-#include "empathy-irc-network.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyIrcNetworkManager      EmpathyIrcNetworkManager;
-typedef struct _EmpathyIrcNetworkManagerClass EmpathyIrcNetworkManagerClass;
-
-struct _EmpathyIrcNetworkManager
-{
-  GObject parent;
-  gpointer priv;
-};
-
-struct _EmpathyIrcNetworkManagerClass
-{
-  GObjectClass parent_class;
-};
-
-GType empathy_irc_network_manager_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_IRC_NETWORK_MANAGER \
-  (empathy_irc_network_manager_get_type ())
-#define EMPATHY_IRC_NETWORK_MANAGER(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_IRC_NETWORK_MANAGER, \
-                               EmpathyIrcNetworkManager))
-#define EMPATHY_IRC_NETWORK_MANAGER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_IRC_NETWORK_MANAGER, \
-                            EmpathyIrcNetworkManagerClass))
-#define EMPATHY_IS_IRC_NETWORK_MANAGER(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_IRC_NETWORK_MANAGER))
-#define EMPATHY_IS_IRC_NETWORK_MANAGER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_IRC_NETWORK_MANAGER))
-#define EMPATHY_IRC_NETWORK_MANAGER_GET_CLASS(o) \
-  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_IRC_NETWORK_MANAGER, \
-                              EmpathyIrcNetworkManagerClass))
-
-EmpathyIrcNetworkManager * empathy_irc_network_manager_new (
-    const gchar *global_file, const gchar *user_file);
-
-EmpathyIrcNetworkManager * empathy_irc_network_manager_dup_default (void);
-
-void empathy_irc_network_manager_add (EmpathyIrcNetworkManager *manager,
-    EmpathyIrcNetwork *network);
-
-void empathy_irc_network_manager_remove (EmpathyIrcNetworkManager *manager,
-    EmpathyIrcNetwork *network);
-
-GSList * empathy_irc_network_manager_get_networks (
-    EmpathyIrcNetworkManager *manager);
-
-GSList * empathy_irc_network_manager_get_dropped_networks (
-    EmpathyIrcNetworkManager *manager);
-
-EmpathyIrcNetwork * empathy_irc_network_manager_find_network_by_address (
-    EmpathyIrcNetworkManager *manager, const gchar *address);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_NETWORK_MANAGER_H__ */
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
deleted file mode 100644
index e0bc84f7d..000000000
--- a/libempathy/empathy-irc-network.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (C) 2007 Guillaume Desmottes
- *
- * 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: Guillaume Desmottes <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include "empathy-irc-network.h"
-#include "empathy-utils.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
-typedef struct
-{
-  gchar *name;
-  gchar *charset;
-  GSList *servers;
-} EmpathyIrcNetworkPriv;
-
-/* properties */
-enum
-{
-  PROP_NAME = 1,
-  PROP_CHARSET,
-  LAST_PROPERTY
-};
-
-/* signals */
-enum
-{
-  MODIFIED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-G_DEFINE_TYPE (EmpathyIrcNetwork, empathy_irc_network, G_TYPE_OBJECT);
-
-static void
-server_modified_cb (EmpathyIrcServer *server,
-                    EmpathyIrcNetwork *self)
-{
-  g_signal_emit (self, signals[MODIFIED], 0);
-}
-
-static void
-empathy_irc_network_get_property (GObject *object,
-                                  guint property_id,
-                                  GValue *value,
-                                  GParamSpec *pspec)
-{
-  EmpathyIrcNetwork *self = EMPATHY_IRC_NETWORK (object);
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_NAME:
-        g_value_set_string (value, priv->name);
-        break;
-      case PROP_CHARSET:
-        g_value_set_string (value, priv->charset);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_network_set_property (GObject *object,
-                                  guint property_id,
-                                  const GValue *value,
-                                  GParamSpec *pspec)
-{
-  EmpathyIrcNetwork *self = EMPATHY_IRC_NETWORK (object);
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_NAME:
-        if (tp_strdiff (priv->name, g_value_get_string (value)))
-          {
-            g_free (priv->name);
-            priv->name = g_value_dup_string (value);
-            g_signal_emit (object, signals[MODIFIED], 0);
-          }
-        break;
-      case PROP_CHARSET:
-        if (tp_strdiff (priv->charset, g_value_get_string (value)))
-          {
-            g_free (priv->charset);
-            priv->charset = g_value_dup_string (value);
-            g_signal_emit (object, signals[MODIFIED], 0);
-          }
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_network_dispose (GObject *object)
-{
-  EmpathyIrcNetwork *self = EMPATHY_IRC_NETWORK (object);
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-  GSList *l;
-
-  for (l = priv->servers; l != NULL; l = g_slist_next (l))
-    {
-      g_signal_handlers_disconnect_by_func (l->data,
-          G_CALLBACK (server_modified_cb), self);
-      g_object_unref (l->data);
-    }
-
-  G_OBJECT_CLASS (empathy_irc_network_parent_class)->dispose (object);
-}
-
-static void
-empathy_irc_network_finalize (GObject *object)
-{
-  EmpathyIrcNetwork *self = EMPATHY_IRC_NETWORK (object);
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-
-  g_slist_free (priv->servers);
-  g_free (priv->name);
-  g_free (priv->charset);
-
-  G_OBJECT_CLASS (empathy_irc_network_parent_class)->finalize (object);
-}
-
-static void
-empathy_irc_network_init (EmpathyIrcNetwork *self)
-{
-  EmpathyIrcNetworkPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_IRC_NETWORK, EmpathyIrcNetworkPriv);
-
-  self->priv = priv;
-
-  priv->servers = NULL;
-
-  self->user_defined = TRUE;
-  self->dropped = FALSE;
-}
-
-static void
-empathy_irc_network_class_init (EmpathyIrcNetworkClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->get_property = empathy_irc_network_get_property;
-  object_class->set_property = empathy_irc_network_set_property;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyIrcNetworkPriv));
-
-  object_class->dispose = empathy_irc_network_dispose;
-  object_class->finalize = empathy_irc_network_finalize;
-
-  param_spec = g_param_spec_string (
-      "name",
-      "Network name",
-      "The displayed name of this network",
-      NULL,
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_NAME, param_spec);
-
-  param_spec = g_param_spec_string (
-      "charset",
-      "Charset",
-      "The charset to use on this network",
-      "UTF-8",
-      G_PARAM_CONSTRUCT |
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_CHARSET, param_spec);
-
-  /**
-   * EmpathyIrcNetwork::modified:
-   * @network: the object that received the signal
-   *
-   * Emitted when either a property or a server of the network is modified or
-   * when a network is activated.
-   *
-   */
-  signals[MODIFIED] = g_signal_new (
-      "modified",
-      G_OBJECT_CLASS_TYPE (object_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
-}
-
-/**
- * empathy_irc_network_activate:
- * @self: the name of the network
- *
- * Activates a #EmpathyIrcNetwork.
- *
- */
-void
-empathy_irc_network_activate (EmpathyIrcNetwork *self)
-{
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (self));
-  g_return_if_fail (self->dropped);
-
-  self->dropped = FALSE;
-
-  g_signal_emit (self, signals[MODIFIED], 0);
-}
-
-/**
- * empathy_irc_network_new:
- * @name: the name of the network
- *
- * Creates a new #EmpathyIrcNetwork.
- *
- * Returns: a new #EmpathyIrcNetwork
- */
-EmpathyIrcNetwork *
-empathy_irc_network_new (const gchar *name)
-{
-  return g_object_new (EMPATHY_TYPE_IRC_NETWORK,
-      "name", name,
-      NULL);
-}
-
-/**
- * empathy_irc_network_get_servers:
- * @network: an #EmpathyIrcNetwork
- *
- * Get the list of #EmpathyIrcServer that belongs to this network.
- * These servers are sorted according their priority.
- * So the first one will be the first used when trying to connect to
- * the network.
- *
- * Returns: a new #GSList of refed #EmpathyIrcServer.
- */
-GSList *
-empathy_irc_network_get_servers (EmpathyIrcNetwork *self)
-{
-  EmpathyIrcNetworkPriv *priv;
-  GSList *servers = NULL, *l;
-
-  g_return_val_if_fail (EMPATHY_IS_IRC_NETWORK (self), NULL);
-  priv = GET_PRIV (self);
-
-  for (l = priv->servers; l != NULL; l = g_slist_next (l))
-    {
-      servers = g_slist_prepend (servers, g_object_ref (l->data));
-    }
-
-  return g_slist_reverse (servers);
-}
-
-/**
- * empathy_irc_network_append_server:
- * @network: an #EmpathyIrcNetwork
- * @server: the #EmpathyIrcServer to add
- *
- * Add an #EmpathyIrcServer to the given #EmpathyIrcNetwork. The server
- * is added at the last position in network's servers list.
- *
- */
-void
-empathy_irc_network_append_server (EmpathyIrcNetwork *self,
-                                   EmpathyIrcServer *server)
-{
-  EmpathyIrcNetworkPriv *priv;
-
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (self));
-  g_return_if_fail (server != NULL && EMPATHY_IS_IRC_SERVER (server));
-
-  priv = GET_PRIV (self);
-
-  g_return_if_fail (g_slist_find (priv->servers, server) == NULL);
-
-  priv->servers = g_slist_append (priv->servers, g_object_ref (server));
-
-  g_signal_connect (server, "modified", G_CALLBACK (server_modified_cb), self);
-
-  g_signal_emit (self, signals[MODIFIED], 0);
-}
-
-/**
- * empathy_irc_network_remove_server:
- * @network: an #EmpathyIrcNetwork
- * @server: the #EmpathyIrcServer to remove
- *
- * Remove an #EmpathyIrcServer from the servers list of the
- * given #EmpathyIrcNetwork.
- *
- */
-void
-empathy_irc_network_remove_server (EmpathyIrcNetwork *self,
-                                   EmpathyIrcServer *server)
-{
-  EmpathyIrcNetworkPriv *priv;
-  GSList *l;
-
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (self));
-  g_return_if_fail (server != NULL && EMPATHY_IS_IRC_SERVER (server));
-
-  priv = GET_PRIV (self);
-
-  l = g_slist_find (priv->servers, server);
-  if (l == NULL)
-    return;
-
-  g_object_unref (l->data);
-  priv->servers = g_slist_delete_link (priv->servers, l);
-  g_signal_handlers_disconnect_by_func (server, G_CALLBACK (server_modified_cb),
-      self);
-
-  g_signal_emit (self, signals[MODIFIED], 0);
-}
-
-/**
- * empathy_irc_network_set_server_position:
- * @network: an #EmpathyIrcNetwork
- * @server: the #EmpathyIrcServer to move
- * @pos: the position to move the server. If this is negative, or is larger than
- * the number of servers in the list, the server is moved to the end of the
- * list.
- *
- * Move an #EmpathyIrcServer in the servers list of the given
- * #EmpathyIrcNetwork.
- *
- */
-void
-empathy_irc_network_set_server_position (EmpathyIrcNetwork *self,
-                                         EmpathyIrcServer *server,
-                                         gint pos)
-{
-  EmpathyIrcNetworkPriv *priv;
-  GSList *l;
-
-  g_return_if_fail (EMPATHY_IS_IRC_NETWORK (self));
-  g_return_if_fail (server != NULL && EMPATHY_IS_IRC_SERVER (server));
-
-  priv = GET_PRIV (self);
-
-  l = g_slist_find (priv->servers, server);
-  if (l == NULL)
-    return;
-
-  priv->servers = g_slist_delete_link (priv->servers, l);
-  priv->servers = g_slist_insert (priv->servers, server, pos);
-
-  g_signal_emit (self, signals[MODIFIED], 0);
-}
-
-const gchar *
-empathy_irc_network_get_name (EmpathyIrcNetwork *self)
-{
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-
-  return priv->name;
-}
-
-const gchar *
-empathy_irc_network_get_charset (EmpathyIrcNetwork *self)
-{
-  EmpathyIrcNetworkPriv *priv = GET_PRIV (self);
-
-  return priv->charset;
-}
diff --git a/libempathy/empathy-irc-network.h b/libempathy/empathy-irc-network.h
deleted file mode 100644
index a298ced9a..000000000
--- a/libempathy/empathy-irc-network.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_NETWORK_H__
-#define __EMPATHY_IRC_NETWORK_H__
-
-#include <glib-object.h>
-
-#include "empathy-irc-server.h"
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyIrcNetwork EmpathyIrcNetwork;
-typedef struct _EmpathyIrcNetworkClass EmpathyIrcNetworkClass;
-
-struct _EmpathyIrcNetwork
-{
-  GObject parent;
-  gpointer priv;
-
-  gboolean user_defined;
-  gboolean dropped;
-};
-
-struct _EmpathyIrcNetworkClass
-{
-    GObjectClass parent_class;
-};
-
-GType empathy_irc_network_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_IRC_NETWORK (empathy_irc_network_get_type ())
-#define EMPATHY_IRC_NETWORK(o) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_IRC_NETWORK, \
-                               EmpathyIrcNetwork))
-#define EMPATHY_IRC_NETWORK_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_IRC_NETWORK,\
-                            EmpathyIrcNetworkClass))
-#define EMPATHY_IS_IRC_NETWORK(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_IRC_NETWORK))
-#define EMPATHY_IS_IRC_NETWORK_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_IRC_NETWORK))
-#define EMPATHY_IRC_NETWORK_GET_CLASS(o) \
-  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_IRC_NETWORK, \
-                              EmpathyIrcNetworkClass))
-
-void empathy_irc_network_activate (EmpathyIrcNetwork *self);
-
-EmpathyIrcNetwork * empathy_irc_network_new (const gchar *name);
-
-GSList * empathy_irc_network_get_servers (EmpathyIrcNetwork *network);
-
-void empathy_irc_network_append_server (EmpathyIrcNetwork *network,
-    EmpathyIrcServer *server);
-
-void empathy_irc_network_remove_server (EmpathyIrcNetwork *network,
-    EmpathyIrcServer *server);
-
-void empathy_irc_network_set_server_position (EmpathyIrcNetwork *network,
-    EmpathyIrcServer *server, gint pos);
-
-const gchar * empathy_irc_network_get_name (EmpathyIrcNetwork *network);
-
-const gchar * empathy_irc_network_get_charset (EmpathyIrcNetwork *network);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_NETWORK_H__ */
diff --git a/libempathy/empathy-irc-networks.dtd b/libempathy/empathy-irc-networks.dtd
deleted file mode 100644
index 692e613c1..000000000
--- a/libempathy/empathy-irc-networks.dtd
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-  DTD for Empathys irc networks.
-  by Xavier Claessens <xclaesse@gmail.com>
--->
-
-
-<!ELEMENT networks (network*)>
-<!ELEMENT network (servers*)>
-<!ATTLIST network id ID #REQUIRED>
-<!ATTLIST network name CDATA #IMPLIED>
-<!ATTLIST network network_charset CDATA #IMPLIED>
-<!ATTLIST network dropped CDATA #IMPLIED>
-
-<!ELEMENT servers (server*)>
-<!ELEMENT server EMPTY>
-<!ATTLIST server address CDATA #REQUIRED>
-<!ATTLIST server port CDATA #REQUIRED>
-<!ATTLIST server ssl CDATA #REQUIRED>
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
deleted file mode 100644
index 5457f23a1..000000000
--- a/libempathy/empathy-irc-server.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#include "config.h"
-
-#include "empathy-irc-server.h"
-#include "empathy-utils.h"
-
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
-typedef struct
-{
-  gchar *address;
-  guint port;
-  gboolean ssl;
-} EmpathyIrcServerPriv;
-
-/* properties */
-enum
-{
-  PROP_ADDRESS = 1,
-  PROP_PORT,
-  PROP_SSL,
-  LAST_PROPERTY
-};
-
-/* signals */
-enum
-{
-  MODIFIED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = {0};
-
-G_DEFINE_TYPE (EmpathyIrcServer, empathy_irc_server, G_TYPE_OBJECT);
-
-static void
-empathy_irc_server_get_property (GObject *object,
-                                 guint property_id,
-                                 GValue *value,
-                                 GParamSpec *pspec)
-{
-  EmpathyIrcServer *self = EMPATHY_IRC_SERVER (object);
-  EmpathyIrcServerPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_ADDRESS:
-        g_value_set_string (value, priv->address);
-        break;
-      case PROP_PORT:
-        g_value_set_uint (value, priv->port);
-        break;
-      case PROP_SSL:
-        g_value_set_boolean (value, priv->ssl);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_server_set_property (GObject *object,
-                                 guint property_id,
-                                 const GValue *value,
-                                 GParamSpec *pspec)
-{
-  EmpathyIrcServer *self = EMPATHY_IRC_SERVER (object);
-  EmpathyIrcServerPriv *priv = GET_PRIV (self);
-
-  switch (property_id)
-    {
-      case PROP_ADDRESS:
-        if (tp_strdiff (priv->address, g_value_get_string (value)))
-          {
-            g_free (priv->address);
-            priv->address = g_value_dup_string (value);
-            g_signal_emit (object, signals[MODIFIED], 0);
-          }
-        break;
-      case PROP_PORT:
-        if (priv->port != g_value_get_uint (value))
-          {
-            priv->port = g_value_get_uint (value);
-            g_signal_emit (object, signals[MODIFIED], 0);
-          }
-        break;
-      case PROP_SSL:
-        if (priv->ssl != g_value_get_boolean (value))
-          {
-            priv->ssl = g_value_get_boolean (value);
-            g_signal_emit (object, signals[MODIFIED], 0);
-          }
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-        break;
-    }
-}
-
-static void
-empathy_irc_server_finalize (GObject *object)
-{
-  EmpathyIrcServer *self = EMPATHY_IRC_SERVER (object);
-  EmpathyIrcServerPriv *priv = GET_PRIV (self);
-
-  g_free (priv->address);
-
-  G_OBJECT_CLASS (empathy_irc_server_parent_class)->finalize (object);
-}
-
-static void
-empathy_irc_server_init (EmpathyIrcServer *self)
-{
-  EmpathyIrcServerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      EMPATHY_TYPE_IRC_SERVER, EmpathyIrcServerPriv);
-
-  self->priv = priv;
-}
-
-static void
-empathy_irc_server_class_init (EmpathyIrcServerClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GParamSpec *param_spec;
-
-  object_class->get_property = empathy_irc_server_get_property;
-  object_class->set_property = empathy_irc_server_set_property;
-
-  g_type_class_add_private (object_class, sizeof (EmpathyIrcServerPriv));
-
-  object_class->finalize = empathy_irc_server_finalize;
-
-  param_spec = g_param_spec_string (
-      "address",
-      "Server address",
-      "The address of this server",
-      NULL,
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_ADDRESS, param_spec);
-
-  param_spec = g_param_spec_uint (
-      "port",
-      "Server port",
-      "The port to use to connect on this server",
-      1, G_MAXUINT16, 6667,
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_PORT, param_spec);
-
-  param_spec = g_param_spec_boolean (
-      "ssl",
-      "SSL",
-      "If this server needs SSL connection",
-      FALSE,
-      G_PARAM_READWRITE |
-      G_PARAM_STATIC_NAME |
-      G_PARAM_STATIC_NICK |
-      G_PARAM_STATIC_BLURB);
-  g_object_class_install_property (object_class, PROP_SSL, param_spec);
-
-  /**
-   * EmpathyIrcServer::modified:
-   * @server: the object that received the signal
-   *
-   * Emitted when a property of the server is modified.
-   *
-   */
-  signals[MODIFIED] = g_signal_new (
-      "modified",
-      G_OBJECT_CLASS_TYPE (object_class),
-      G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
-      0,
-      NULL, NULL,
-      g_cclosure_marshal_generic,
-      G_TYPE_NONE, 0);
-}
-
-/**
- * empathy_irc_server_new:
- * @address: the address
- * @port: the port
- * @ssl: %TRUE if the server needs a SSL connection
- *
- * Creates a new #EmpathyIrcServer
- *
- * Returns: a new #EmpathyIrcServer
- */
-EmpathyIrcServer *
-empathy_irc_server_new (const gchar *address,
-                        guint port,
-                        gboolean ssl)
-{
-  return g_object_new (EMPATHY_TYPE_IRC_SERVER,
-      "address", address,
-      "port", port,
-      "ssl", ssl,
-      NULL);
-}
diff --git a/libempathy/empathy-irc-server.h b/libempathy/empathy-irc-server.h
deleted file mode 100644
index d72af64ac..000000000
--- a/libempathy/empathy-irc-server.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Guillaume Desmottes
- *
- * 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 <gdesmott@gnome.org>
- */
-
-#ifndef __EMPATHY_IRC_SERVER_H__
-#define __EMPATHY_IRC_SERVER_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _EmpathyIrcServer EmpathyIrcServer;
-typedef struct _EmpathyIrcServerClass EmpathyIrcServerClass;
-
-struct _EmpathyIrcServer
-{
-  GObject parent;
-  gpointer priv;
-};
-
-struct _EmpathyIrcServerClass
-{
-    GObjectClass parent_class;
-};
-
-GType empathy_irc_server_get_type (void);
-
-/* TYPE MACROS */
-#define EMPATHY_TYPE_IRC_SERVER (empathy_irc_server_get_type ())
-#define EMPATHY_IRC_SERVER(o)  \
-  (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_IRC_SERVER, EmpathyIrcServer))
-#define EMPATHY_IRC_SERVER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_CAST ((k), EMPATHY_TYPE_IRC_SERVER, \
-                            EmpathyIrcServerClass))
-#define EMPATHY_IS_IRC_SERVER(o) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_IRC_SERVER))
-#define EMPATHY_IS_IRC_SERVER_CLASS(k) \
-  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_IRC_SERVER))
-#define EMPATHY_IRC_SERVER_GET_CLASS(o) \
-  (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_IRC_SERVER,\
-                              EmpathyIrcServerClass))
-
-EmpathyIrcServer * empathy_irc_server_new (const gchar *address, guint port,
-    gboolean ssl);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_IRC_SERVER_H__ */
diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
deleted file mode 100644
index 09ab4dd18..000000000
--- a/libempathy/empathy-keyring.c
+++ /dev/null
@@ -1,726 +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
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-keyring.h"
-
-#include <libsecret/secret.h>
-
-#ifdef HAVE_UOA
-#include <libaccounts-glib/ag-account.h>
-#include <libaccounts-glib/ag-account-service.h>
-#include <libaccounts-glib/ag-auth-data.h>
-#include <libaccounts-glib/ag-manager.h>
-#include <libaccounts-glib/ag-service.h>
-#include <libsignon-glib/signon-identity.h>
-#include "empathy-uoa-utils.h"
-#endif
-
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
-
-static const SecretSchema account_keyring_schema =
-  { "org.gnome.Empathy.Account", SECRET_SCHEMA_DONT_MATCH_NAME,
-    { { "account-id", SECRET_SCHEMA_ATTRIBUTE_STRING },
-      { "param-name", SECRET_SCHEMA_ATTRIBUTE_STRING },
-      { NULL } } };
-
-static const SecretSchema room_keyring_schema =
-  { "org.gnome.Empathy.Room", SECRET_SCHEMA_DONT_MATCH_NAME,
-    { { "account-id", SECRET_SCHEMA_ATTRIBUTE_STRING },
-      { "room-id", SECRET_SCHEMA_ATTRIBUTE_STRING },
-      { NULL } } };
-
-gboolean
-empathy_keyring_is_available (void)
-{
-  return TRUE;
-}
-
-/* get */
-
-static void
-lookup_item_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
-  GError *error = NULL;
-  gchar *password;
-
-  password = secret_password_lookup_finish (result, &error);
-  if (error != NULL)
-    {
-      g_simple_async_result_set_error (simple, TP_ERROR,
-          TP_ERROR_DOES_NOT_EXIST, "%s", error->message);
-      g_clear_error (&error);
-      goto out;
-    }
-
-  if (password == NULL)
-    {
-      g_simple_async_result_set_error (simple, TP_ERROR,
-          TP_ERROR_DOES_NOT_EXIST, _("Password not found"));
-      goto out;
-    }
-
-  g_simple_async_result_set_op_res_gpointer (simple, password,
-      (GDestroyNotify) secret_password_free);
-
-out:
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-#ifdef HAVE_UOA
-static AgAccountService *
-uoa_password_common (TpAccount *tp_account,
-    GSimpleAsyncResult *result,
-    AgAuthData **ret_auth_data)
-{
-  const GValue *storage_id;
-  AgAccountId account_id;
-  AgManager *manager = NULL;
-  AgAccount *account = NULL;
-  GList *l;
-  AgAccountService *service = NULL;
-  AgAuthData *auth_data = NULL;
-
-  g_assert (ret_auth_data != NULL);
-  *ret_auth_data = NULL;
-
-  storage_id = tp_account_get_storage_identifier (tp_account);
-  account_id = g_value_get_uint (storage_id);
-  if (account_id == 0)
-    {
-      g_simple_async_result_set_error (result,
-          TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-          "StorageId is invalid, cannot get the AgAccount for this TpAccount");
-      g_simple_async_result_complete_in_idle (result);
-      goto error;
-    }
-
-  manager = empathy_uoa_manager_dup ();
-  account = ag_manager_get_account (manager, account_id);
-
-  /* Assuming there is only one IM service */
-  l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE);
-  if (l == NULL)
-    {
-      g_simple_async_result_set_error (result,
-          TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-          "AgAccount has no IM service");
-      g_simple_async_result_complete_in_idle (result);
-      goto error;
-    }
-  service = ag_account_service_new (account, l->data);
-  ag_service_list_free (l);
-
-  auth_data = ag_account_service_get_auth_data (service);
-  if (auth_data == NULL)
-    {
-      g_simple_async_result_set_error (result,
-          TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-          "Service has no AgAuthData");
-      g_simple_async_result_complete_in_idle (result);
-      goto error;
-    }
-
-  if (tp_strdiff (ag_auth_data_get_mechanism (auth_data), "password") ||
-      tp_strdiff (ag_auth_data_get_method (auth_data), "password"))
-    {
-      g_simple_async_result_set_error (result,
-          TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-          "Service does not use password authentication");
-      g_simple_async_result_complete_in_idle (result);
-      goto error;
-    }
-
-  g_object_unref (manager);
-  g_object_unref (account);
-
-  *ret_auth_data = auth_data;
-  return service;
-
-error:
-  g_clear_object (&manager);
-  g_clear_object (&account);
-  g_clear_object (&service);
-  tp_clear_pointer (&auth_data, ag_auth_data_unref);
-  return NULL;
-}
-
-static void
-uoa_session_process_cb (SignonAuthSession *session,
-    GHashTable *session_data,
-    const GError *error,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *result = user_data;
-  const gchar *password;
-
-  if (error != NULL)
-    {
-      g_simple_async_result_set_from_error (result, error);
-      goto out;
-    }
-
-  password = tp_asv_get_string (session_data, "Secret");
-  if (tp_str_empty (password))
-    {
-      g_simple_async_result_set_error (result, TP_ERROR,
-          TP_ERROR_DOES_NOT_EXIST, _("Password not found"));
-      goto out;
-    }
-
-  g_simple_async_result_set_op_res_gpointer (result, g_strdup (password),
-      g_free);
-
-out:
-  /* libaccounts-glib API does not guarantee the callback happens after
-   * reentering mainloop */
-  g_simple_async_result_complete_in_idle (result);
-  g_object_unref (result);
-  g_object_unref (session);
-}
-
-static void
-uoa_get_account_password (TpAccount *tp_account,
-    GSimpleAsyncResult *result)
-{
-  AgAccountService *service;
-  AgAuthData *auth_data;
-  guint cred_id;
-  SignonIdentity *identity;
-  SignonAuthSession *session;
-  GError *error = NULL;
-
-  DEBUG ("Store password for %s in signond",
-      tp_account_get_path_suffix (tp_account));
-
-  service = uoa_password_common (tp_account, result, &auth_data);
-  if (service == NULL)
-    return;
-
-  cred_id = ag_auth_data_get_credentials_id (auth_data);
-  if (cred_id == 0)
-    {
-      g_simple_async_result_set_error (result,
-          TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
-          "AgAccount has no CredentialsId");
-      g_simple_async_result_complete_in_idle (result);
-      goto out;
-    }
-
-  identity = signon_identity_new_from_db (cred_id);
-  session = signon_identity_create_session (identity,
-      ag_auth_data_get_method (auth_data), &error);
-  g_object_unref (identity);
-
-  if (session == NULL)
-    {
-      g_simple_async_result_set_from_error (result, error);
-      g_simple_async_result_complete_in_idle (result);
-      goto out;
-    }
-
-  signon_auth_session_process (session,
-      ag_auth_data_get_parameters (auth_data),
-      ag_auth_data_get_mechanism (auth_data),
-      uoa_session_process_cb,
-      g_object_ref (result));
-
-out:
-  ag_auth_data_unref (auth_data);
-  g_object_unref (service);
-}
-#endif
-
-void
-empathy_keyring_get_account_password_async (TpAccount *account,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple;
-  const gchar *account_id;
-
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-  g_return_if_fail (callback != NULL);
-
-  simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_get_account_password_async);
-
-  account_id = tp_proxy_get_object_path (account) +
-    strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  DEBUG ("Trying to get password for: %s", account_id);
-
-#ifdef HAVE_UOA
-    {
-      const gchar *provider;
-
-      provider = tp_account_get_storage_provider (account);
-      if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER))
-        {
-          uoa_get_account_password (account, simple);
-          g_object_unref (simple);
-          return;
-        }
-    }
-#endif
-
-  secret_password_lookup (&account_keyring_schema, NULL,
-          lookup_item_cb, simple,
-          "account-id", account_id,
-          "param-name", "password",
-          NULL);
-}
-
-void
-empathy_keyring_get_room_password_async (TpAccount *account,
-    const gchar *id,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple;
-  const gchar *account_id;
-
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-  g_return_if_fail (id != NULL);
-  g_return_if_fail (callback != NULL);
-
-  simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_get_room_password_async);
-
-  account_id = tp_proxy_get_object_path (account) +
-    strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  DEBUG ("Trying to get password for room '%s' on account '%s'",
-      id, account_id);
-
-  secret_password_lookup (&room_keyring_schema, NULL,
-          lookup_item_cb, simple,
-          "account-id", account_id,
-          "room-id", id,
-          NULL);
-}
-
-const gchar *
-empathy_keyring_get_account_password_finish (TpAccount *account,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_return_pointer (account,
-      empathy_keyring_get_account_password_async);
-}
-
-const gchar *
-empathy_keyring_get_room_password_finish (TpAccount *account,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_return_pointer (account,
-      empathy_keyring_get_room_password_async);
-}
-
-/* set */
-
-static void
-store_password_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
-  GError *error = NULL;
-
-  if (!secret_password_store_finish (result, &error))
-    {
-      g_simple_async_result_set_error (simple, TP_ERROR,
-          TP_ERROR_DOES_NOT_EXIST, "%s", error->message);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-#ifdef HAVE_UOA
-typedef struct
-{
-  AgAccountService *service;
-  gchar *password;
-  gboolean remember;
-  GSimpleAsyncResult *result;
-} UoaChangePasswordData;
-
-static UoaChangePasswordData *
-uoa_change_password_data_new (AgAccountService *service,
-    const gchar *password,
-    gboolean remember,
-    GSimpleAsyncResult *result)
-{
-  UoaChangePasswordData *data;
-
-  data = g_slice_new0 (UoaChangePasswordData);
-  data->service = g_object_ref (service);
-  data->password = g_strdup (password);
-  data->remember = remember;
-  data->result = g_object_ref (result);
-
-  return data;
-}
-
-static void
-uoa_change_password_data_free (UoaChangePasswordData *data)
-{
-  g_object_unref (data->service);
-  g_free (data->password);
-  g_object_unref (data->result);
-  g_slice_free (UoaChangePasswordData, data);
-}
-
-static void
-uoa_identity_store_cb (SignonIdentity *identity,
-    guint32 id,
-    const GError *error,
-    gpointer user_data)
-{
-  UoaChangePasswordData *data = user_data;
-
-  if (error != NULL)
-    g_simple_async_result_set_from_error (data->result, error);
-
-  g_simple_async_result_complete (data->result);
-  uoa_change_password_data_free (data);
-  g_object_unref (identity);
-}
-
-static void
-uoa_identity_query_info_cb (SignonIdentity *identity,
-    const SignonIdentityInfo *info,
-    const GError *error,
-    gpointer user_data)
-{
-  UoaChangePasswordData *data = user_data;
-
-  if (error != NULL)
-    {
-      g_simple_async_result_set_from_error (data->result, error);
-      /* libaccounts-glib API does not guarantee the callback happens after
-       * reentering mainloop */
-      g_simple_async_result_complete_in_idle (data->result);
-      uoa_change_password_data_free (data);
-      g_object_unref (identity);
-      return;
-    }
-
-  /* const SignonIdentityInfo is a lie, cast it! - Mardy */
-  signon_identity_info_set_secret ((SignonIdentityInfo *) info,
-      data->password, data->remember);
-
-  signon_identity_store_credentials_with_info (identity, info,
-      uoa_identity_store_cb, data);
-}
-
-static void
-uoa_initial_account_store_cb (AgAccount *account,
-    const GError *error,
-    gpointer user_data)
-{
-  UoaChangePasswordData *data = user_data;
-
-  if (error != NULL)
-    g_simple_async_result_set_from_error (data->result, error);
-
-      /* libaccounts-glib API does not guarantee the callback happens after
-       * reentering mainloop */
-  g_simple_async_result_complete_in_idle (data->result);
-  uoa_change_password_data_free (data);
-}
-
-static void
-uoa_initial_identity_store_cb (SignonIdentity *identity,
-    guint32 id,
-    const GError *error,
-    gpointer user_data)
-{
-  UoaChangePasswordData *data = user_data;
-  AgAccount *account = ag_account_service_get_account (data->service);
-  GValue value = G_VALUE_INIT;
-
-  if (error != NULL)
-    {
-      g_simple_async_result_set_from_error (data->result, error);
-      /* libaccounts-glib API does not guarantee the callback happens after
-       * reentering mainloop */
-      g_simple_async_result_complete_in_idle (data->result);
-      uoa_change_password_data_free (data);
-      g_object_unref (identity);
-      return;
-    }
-
-  g_value_init (&value, G_TYPE_UINT);
-  g_value_set_uint (&value, id);
-  ag_account_select_service (account, NULL);
-  ag_account_set_value (account, "CredentialsId", &value);
-  g_value_unset (&value);
-
-  ag_account_store (account, uoa_initial_account_store_cb, data);
-
-  g_object_unref (identity);
-}
-
-static void
-uoa_set_account_password (TpAccount *tp_account,
-    const gchar *password,
-    gboolean remember,
-    GSimpleAsyncResult *result)
-{
-  AgAccountService *service;
-  AgAuthData *auth_data;
-  guint cred_id;
-  UoaChangePasswordData *data;
-  SignonIdentity *identity;
-
-  DEBUG ("Store password for %s in signond",
-      tp_account_get_path_suffix (tp_account));
-
-  service = uoa_password_common (tp_account, result, &auth_data);
-  if (service == NULL)
-    return;
-
-  data = uoa_change_password_data_new (service, password, remember, result);
-
-  cred_id = ag_auth_data_get_credentials_id (auth_data);
-  if (cred_id == 0)
-    {
-      SignonIdentityInfo *info;
-      const GHashTable *params;
-      const gchar *username;
-      const gchar *acl_all[] = { "*", NULL };
-
-      /* This is the first time we store password for this account.
-       * First check if we have an 'username' param as this is more accurate
-       * in the tp-idle case. */
-      params = tp_account_get_parameters (tp_account);
-      username = tp_asv_get_string (params, "username");
-      if (username == NULL)
-        username = tp_asv_get_string (params, "account");
-
-      identity = signon_identity_new ();
-      info = signon_identity_info_new ();
-      signon_identity_info_set_username (info, username);
-      signon_identity_info_set_secret (info, password, remember);
-      signon_identity_info_set_access_control_list (info, acl_all);
-
-      /* Give identity and data ownership to the callback */
-      signon_identity_store_credentials_with_info (identity, info,
-          uoa_initial_identity_store_cb, data);
-
-      signon_identity_info_free (info);
-    }
-  else
-    {
-      /* There is already a password stored, query info to update it.
-       * Give identity and data ownership to the callback */
-      identity = signon_identity_new_from_db (cred_id);
-      signon_identity_query_info (identity,
-          uoa_identity_query_info_cb, data);
-    }
-
-  g_object_unref (service);
-  ag_auth_data_unref (auth_data);
-}
-#endif
-
-void
-empathy_keyring_set_account_password_async (TpAccount *account,
-    const gchar *password,
-    gboolean remember,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple;
-  const gchar *account_id;
-  gchar *name;
-
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-  g_return_if_fail (password != NULL);
-
-  simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_set_account_password_async);
-
-  account_id = tp_proxy_get_object_path (account) +
-    strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  DEBUG ("Remembering password for %s", account_id);
-
-#ifdef HAVE_UOA
-    {
-      const gchar *provider;
-
-      provider = tp_account_get_storage_provider (account);
-      if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER))
-        {
-          uoa_set_account_password (account, password, remember, simple);
-          g_object_unref (simple);
-          return;
-        }
-    }
-#endif
-
-  name = g_strdup_printf (_("IM account password for %s (%s)"),
-      tp_account_get_display_name (account), account_id);
-
-  secret_password_store (&account_keyring_schema,
-      remember ? NULL : SECRET_COLLECTION_SESSION,
-      name, password,
-      NULL, store_password_cb, simple,
-      "account-id", account_id,
-      "param-name", "password",
-      NULL);
-
-  g_free (name);
-}
-
-void
-empathy_keyring_set_room_password_async (TpAccount *account,
-    const gchar *id,
-    const gchar *password,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple;
-  const gchar *account_id;
-  gchar *name;
-
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-  g_return_if_fail (id != NULL);
-  g_return_if_fail (password != NULL);
-
-  simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_set_room_password_async);
-
-  account_id = tp_proxy_get_object_path (account) +
-    strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  DEBUG ("Remembering password for room '%s' on account '%s'", id, account_id);
-
-  name = g_strdup_printf (_("Password for chatroom '%s' on account %s (%s)"),
-      id, tp_account_get_display_name (account), account_id);
-
-  secret_password_store (&room_keyring_schema, NULL, name, password,
-      NULL, store_password_cb, simple,
-      "account-id", account_id,
-      "room-id", id,
-      NULL);
-
-  g_free (name);
-}
-
-gboolean
-empathy_keyring_set_account_password_finish (TpAccount *account,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_void (account, empathy_keyring_set_account_password_async);
-}
-
-gboolean
-empathy_keyring_set_room_password_finish (TpAccount *account,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_void (account, empathy_keyring_set_room_password_async);
-}
-
-/* delete */
-
-static void
-items_delete_cb (GObject *source,
-    GAsyncResult *result,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
-  GError *error = NULL;
-
-  secret_password_clear_finish (result, &error);
-  if (error != NULL)
-    {
-      g_simple_async_result_set_error (simple, TP_ERROR,
-              TP_ERROR_DOES_NOT_EXIST, "%s", error->message);
-      g_error_free (error);
-    }
-
-  g_simple_async_result_complete (simple);
-  g_object_unref (simple);
-}
-
-void
-empathy_keyring_delete_account_password_async (TpAccount *account,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  GSimpleAsyncResult *simple;
-  const gchar *account_id;
-
-  g_return_if_fail (TP_IS_ACCOUNT (account));
-
-  simple = g_simple_async_result_new (G_OBJECT (account), callback,
-      user_data, empathy_keyring_delete_account_password_async);
-
-  account_id = tp_proxy_get_object_path (account) +
-    strlen (TP_ACCOUNT_OBJECT_PATH_BASE);
-
-  DEBUG ("Deleting password for %s", account_id);
-
-#ifdef HAVE_UOA
-    {
-      const gchar *provider;
-
-      provider = tp_account_get_storage_provider (account);
-      if (!tp_strdiff (provider, EMPATHY_UOA_PROVIDER))
-        {
-          /* I see no other way to forget the stored password than overwriting
-           * with an empty one. */
-          uoa_set_account_password (account, "", FALSE, simple);
-          g_object_unref (simple);
-          return;
-        }
-    }
-#endif
-
-  secret_password_clear (&account_keyring_schema, NULL,
-          items_delete_cb, simple,
-          "account-id", account_id,
-          "param-name", "password",
-          NULL);
-}
-
-gboolean
-empathy_keyring_delete_account_password_finish (TpAccount *account,
-    GAsyncResult *result,
-    GError **error)
-{
-  empathy_implement_finish_void (account, empathy_keyring_delete_account_password_async);
-}
diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
deleted file mode 100644
index 7e945dc02..000000000
--- a/libempathy/empathy-keyring.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
- */
-
-#ifndef __EMPATHY_KEYRING_H__
-#define __EMPATHY_KEYRING_H__
-
-#include <gio/gio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-G_BEGIN_DECLS
-
-gboolean empathy_keyring_is_available (void);
-
-void empathy_keyring_get_account_password_async (TpAccount *account,
-    GAsyncReadyCallback callback, gpointer user_data);
-
-const gchar * empathy_keyring_get_account_password_finish (TpAccount *account,
-    GAsyncResult *result, GError **error);
-
-void empathy_keyring_get_room_password_async (TpAccount *account,
-    const gchar *id,
-    GAsyncReadyCallback callback, gpointer user_data);
-
-const gchar * empathy_keyring_get_room_password_finish (TpAccount *account,
-    GAsyncResult *result, GError **error);
-
-void empathy_keyring_set_account_password_async (TpAccount *account,
-    const gchar *password, gboolean remember, GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean empathy_keyring_set_account_password_finish (TpAccount *account,
-    GAsyncResult *result, GError **error);
-
-void empathy_keyring_set_room_password_async (TpAccount *account,
-    const gchar *id, const gchar *password, GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean empathy_keyring_set_room_password_finish (TpAccount *account,
-    GAsyncResult *result, GError **error);
-
-void empathy_keyring_delete_account_password_async (TpAccount *account,
-    GAsyncReadyCallback callback, gpointer user_data);
-
-gboolean empathy_keyring_delete_account_password_finish (TpAccount *account,
-    GAsyncResult *result, GError **error);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_KEYRING_H__ */
-
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index e19f69b09..d6f30a678 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -23,12 +23,12 @@
  */
 
 #include "config.h"
+#include "empathy-message.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-time.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-message.h"
-#include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
 
@@ -196,7 +196,7 @@ empathy_message_init (EmpathyMessage *message)
 		EMPATHY_TYPE_MESSAGE, EmpathyMessagePriv);
 
 	message->priv = priv;
-	priv->timestamp = empathy_time_get_current ();
+	priv->timestamp = tpaw_time_get_current ();
 }
 
 static void
@@ -314,7 +314,7 @@ message_set_property (GObject      *object,
 	case PROP_TIMESTAMP:
 		priv->timestamp = g_value_get_int64 (value);
 		if (priv->timestamp <= 0)
-			priv->timestamp = empathy_time_get_current ();
+			priv->timestamp = tpaw_time_get_current ();
 		break;
 	case PROP_ORIGINAL_TIMESTAMP:
 		priv->original_timestamp = g_value_get_int64 (value);
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index 1d01b931d..21f703b68 100644
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -19,8 +19,7 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-pkg-kit.h>
+#include "empathy-pkg-kit.h"
 
 typedef struct
 {
diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index cdc45fbe9..6eab7f15b 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,9 +19,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-presence-manager.h"
 
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
@@ -108,7 +109,7 @@ most_available_presence_changed (TpAccountManager *manager,
 
   g_free (self->priv->status);
   self->priv->state = state;
-  if (EMP_STR_EMPTY (status_message))
+  if (TPAW_STR_EMPTY (status_message))
     self->priv->status = NULL;
   else
     self->priv->status = g_strdup (status_message);
diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 6357aeecd..f616647ad 100644
--- a/libempathy/empathy-presence-manager.h
+++ b/libempathy/empathy-presence-manager.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_PRESENCE_MANAGER_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 8532da57b..c5f693f04 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 void
 empathy_chat_with_contact (EmpathyContact *contact,
diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index 497c65ee5..9c168d7a3 100644
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -23,7 +23,6 @@
 
 #include <glib.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c
index 303bf9e3e..75a924f0c 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -19,13 +19,14 @@
  */
 
 #include "config.h"
+#include "empathy-sasl-mechanisms.h"
 
 #include <libsoup/soup.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
 #include "empathy-utils.h"
-#include "empathy-sasl-mechanisms.h"
 
 #define MECH_FACEBOOK "X-FACEBOOK-PLATFORM"
 #define MECH_WLM "X-MESSENGER-OAUTH2"
@@ -336,7 +337,7 @@ empathy_sasl_auth_finish (TpChannel *channel,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (channel, empathy_sasl_auth_common_async);
+  tpaw_implement_finish_void (channel, empathy_sasl_auth_common_async);
 }
 
 gboolean
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index bdca7b623..e98134ebb 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -18,15 +18,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-sasl-handler.h"
 
-#include <extensions/extensions.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+
+#include "empathy-sasl-mechanisms.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
-#include "empathy-keyring.h"
-#include "empathy-sasl-mechanisms.h"
 
 enum {
   PROP_CHANNEL = 1,
@@ -68,7 +68,7 @@ empathy_server_sasl_handler_set_password_cb (GObject *source,
 {
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
+  if (!tpaw_keyring_set_account_password_finish (TP_ACCOUNT (source), result,
           &error))
     {
       DEBUG ("Failed to set password: %s", error->message);
@@ -103,7 +103,7 @@ empathy_server_sasl_handler_get_password_async_cb (GObject *source,
 
   priv = EMPATHY_SERVER_SASL_HANDLER (user_data)->priv;
 
-  password = empathy_keyring_get_account_password_finish (TP_ACCOUNT (source),
+  password = tpaw_keyring_get_account_password_finish (TP_ACCOUNT (source),
       result, &error);
 
   if (password != NULL)
@@ -134,7 +134,7 @@ empathy_server_sasl_handler_init_async (GAsyncInitable *initable,
   priv->async_init_res = g_simple_async_result_new (G_OBJECT (self),
       callback, user_data, empathy_server_sasl_handler_new_async);
 
-  empathy_keyring_get_account_password_async (priv->account,
+  tpaw_keyring_get_account_password_async (priv->account,
       empathy_server_sasl_handler_get_password_async_cb, self);
 }
 
@@ -355,7 +355,7 @@ auth_cb (GObject *source,
   else
     {
       DEBUG ("Saving password in keyring");
-      empathy_keyring_set_account_password_async (priv->account,
+      tpaw_keyring_set_account_password_async (priv->account,
           priv->password, priv->save_password,
           empathy_server_sasl_handler_set_password_cb,
           NULL);
@@ -430,7 +430,7 @@ empathy_server_sasl_handler_provide_password (
   if (!may_save_response)
     {
       /* delete any password present, it shouldn't be there */
-      empathy_keyring_delete_account_password_async (priv->account, NULL, NULL);
+      tpaw_keyring_delete_account_password_async (priv->account, NULL, NULL);
     }
 
   /* Additionally, if we implement Ch.I.CredentialsStorage, inform that
diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index d25d90ab7..8bf7e3b7f 100644
--- a/libempathy/empathy-server-sasl-handler.h
+++ b/libempathy/empathy-server-sasl-handler.h
@@ -22,7 +22,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index d58155f58..34c3147a3 100644
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -19,14 +19,13 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-tls-handler.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-utils.h"
+#include "extensions.h"
 
-#include "extensions/extensions.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h
index f4caf3539..ed19c72ff 100644
--- a/libempathy/empathy-server-tls-handler.h
+++ b/libempathy/empathy-server-tls-handler.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index d8faa4fe9..9895d4d42 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -21,17 +21,18 @@
  */
 
 #include "config.h"
+#include "empathy-status-presets.h"
 
 #include <sys/stat.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-utils.h"
-#include "empathy-status-presets.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define STATUS_PRESETS_XML_FILENAME "status-presets.xml"
-#define STATUS_PRESETS_DTD_FILENAME "empathy-status-presets.dtd"
+#define STATUS_PRESETS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-status-presets.dtd"
 #define STATUS_PRESETS_MAX_EACH     15
 
 typedef struct {
@@ -92,7 +93,7 @@ status_presets_file_parse (const gchar *filename)
 		return;
 	}
 
-	if (!empathy_xml_validate (doc, STATUS_PRESETS_DTD_FILENAME)) {
+	if (!tpaw_xml_validate_from_resource (doc, STATUS_PRESETS_DTD_RESOURCENAME)) {
 		g_warning ("Failed to validate file:'%s'", filename);
 		xmlFreeDoc (doc);
 		xmlFreeParserCtxt (ctxt);
diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
deleted file mode 100644
index cbb6b3bdb..000000000
--- a/libempathy/empathy-time.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2003-2007 Imendio AB
- * Copyright (C) 2007-2012 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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: Richard Hult <richard@imendio.com>
- */
-
-#include "config.h"
-
-#include <glib/gi18n-lib.h>
-
-#include "empathy-time.h"
-
-/* Note: EmpathyTime is always in UTC. */
-
-gint64
-empathy_time_get_current (void)
-{
-  GDateTime *now;
-  gint64 result;
-
-  now = g_date_time_new_now_utc ();
-  result = g_date_time_to_unix (now);
-  g_date_time_unref (now);
-
-  return result;
-}
-
-/* Converts the UTC timestamp to a string, also in UTC.
- * Returns NULL on failure. */
-gchar *
-empathy_time_to_string_utc (gint64 t,
-    const gchar *format)
-{
-  GDateTime *d;
-  char *result;
-
-  g_return_val_if_fail (format != NULL, NULL);
-
-  d = g_date_time_new_from_unix_utc (t);
-  result = g_date_time_format (d, format);
-  g_date_time_unref (d);
-
-  return result;
-}
-
-/* Converts the UTC timestamp to a string, in local time.
- * Returns NULL on failure. */
-gchar *
-empathy_time_to_string_local (gint64 t,
-    const gchar *format)
-{
-  GDateTime *d, *local;
-  gchar *result;
-
-  g_return_val_if_fail (format != NULL, NULL);
-
-  d = g_date_time_new_from_unix_utc (t);
-  local = g_date_time_to_local (d);
-  g_date_time_unref (d);
-
-  result = g_date_time_format (local, format);
-  g_date_time_unref (local);
-
-  return result;
-}
-
-gchar *
-empathy_duration_to_string (guint seconds)
-{
-  if (seconds < 60)
-    {
-      return g_strdup_printf (ngettext ("%d second ago",
-        "%d seconds ago", seconds), seconds);
-    }
-  else if (seconds < (60 * 60))
-    {
-      seconds /= 60;
-      return g_strdup_printf (ngettext ("%d minute ago",
-        "%d minutes ago", seconds), seconds);
-    }
-  else if (seconds < (60 * 60 * 24))
-    {
-      seconds /= 60 * 60;
-      return g_strdup_printf (ngettext ("%d hour ago",
-        "%d hours ago", seconds), seconds);
-    }
-  else if (seconds < (60 * 60 * 24 * 7))
-    {
-      seconds /= 60 * 60 * 24;
-      return g_strdup_printf (ngettext ("%d day ago",
-        "%d days ago", seconds), seconds);
-    }
-  else if (seconds < (60 * 60 * 24 * 30))
-    {
-      seconds /= 60 * 60 * 24 * 7;
-      return g_strdup_printf (ngettext ("%d week ago",
-        "%d weeks ago", seconds), seconds);
-    }
-  else
-    {
-      seconds /= 60 * 60 * 24 * 30;
-      return g_strdup_printf (ngettext ("%d month ago",
-        "%d months ago", seconds), seconds);
-    }
-}
-
-gchar  *
-empathy_time_to_string_relative (gint64 t)
-{
-  GDateTime *now, *then;
-  gint   seconds;
-  GTimeSpan delta;
-  gchar *result;
-
-  now = g_date_time_new_now_utc ();
-  then = g_date_time_new_from_unix_utc (t);
-
-  delta = g_date_time_difference (now, then);
-  seconds = delta / G_TIME_SPAN_SECOND;
-
-  if (seconds > 0)
-    result = empathy_duration_to_string (seconds);
-  else
-    result = g_strdup (_("in the future"));
-
-  g_date_time_unref (now);
-  g_date_time_unref (then);
-
-  return result;
-}
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
deleted file mode 100644
index 59bd9269b..000000000
--- a/libempathy/empathy-time.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2004 Imendio AB
- * Copyright (C) 2007-2012 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * 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_TIME_H__
-#define __EMPATHY_TIME_H__
-
-#ifndef __USE_XOPEN
-#define __USE_XOPEN
-#endif
-#include <time.h>
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-/* FIXME: ideally we should only display the hour and minutes but
- * there is no localized format for that (bgo #668323) */
-#define EMPATHY_TIME_FORMAT_DISPLAY_SHORT "%X"
-#define EMPATHY_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y"
-#define EMPATHY_TIME_DATE_FORMAT_DISPLAY_SHORT "%a %d %b %Y, %X"
-
-gint64  empathy_time_get_current     (void);
-gchar  *empathy_time_to_string_utc   (gint64 t,
-    const gchar *format);
-gchar  *empathy_time_to_string_local (gint64 t,
-    const gchar *format);
-gchar  *empathy_time_to_string_relative (gint64 t);
-gchar *empathy_duration_to_string (guint seconds);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_TIME_H__ */
-
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 00447cc40..fcbc559b3 100644
--- a/libempathy/empathy-tls-verifier.c
+++ b/libempathy/empathy-tls-verifier.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-tls-verifier.h"
 
 #include <gcr/gcr.h>
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
-#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier,
     G_TYPE_OBJECT)
diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h
index 2f66acb9c..c25d9756c 100644
--- a/libempathy/empathy-tls-verifier.h
+++ b/libempathy/empathy-tls-verifier.h
@@ -23,7 +23,6 @@
 
 #include <glib-object.h>
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index e15a8c41b..e0fd4c2cb 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -19,8 +19,10 @@
  */
 
 #include "config.h"
-
 #include "empathy-tp-chat.h"
+
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
@@ -1115,7 +1117,7 @@ empathy_tp_chat_get_id (EmpathyTpChat *self)
   g_return_val_if_fail (EMPATHY_IS_TP_CHAT (self), NULL);
 
   id = tp_channel_get_identifier ((TpChannel *) self);
-  if (!EMP_STR_EMPTY (id))
+  if (!TPAW_STR_EMPTY (id))
     return id;
   else if (self->priv->remote_contact)
     return empathy_contact_get_id (self->priv->remote_contact);
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d8d4ac31d..20fb4e1e0 100644
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_TP_CHAT_H__
 
 #include <glib.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"
diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c
index a57dd6335..5048013e1 100644
--- a/libempathy/empathy-uoa-auth-handler.c
+++ b/libempathy/empathy-uoa-auth-handler.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-auth-handler.h"
 
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.h>
@@ -29,14 +30,15 @@
 #include <libsignon-glib/signon-identity.h>
 #include <libsignon-glib/signon-auth-session.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_SASL
-#include "empathy-debug.h"
-#include "empathy-keyring.h"
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-uoa-utils.h>
+
 #include "empathy-utils.h"
-#include "empathy-uoa-auth-handler.h"
-#include "empathy-uoa-utils.h"
 #include "empathy-sasl-mechanisms.h"
 
+#define DEBUG_FLAG EMPATHY_DEBUG_SASL
+#include "empathy-debug.h"
+
 struct _EmpathyUoaAuthHandlerPriv
 {
   AgManager *manager;
@@ -292,7 +294,7 @@ set_account_password_cb (GObject *source,
   AuthContext *new_ctx;
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (tp_account, result, &error))
+  if (!tpaw_keyring_set_account_password_finish (tp_account, result, &error))
     {
       DEBUG ("Failed to set empty password on UOA account: %s", error->message);
       auth_context_done (ctx);
@@ -338,7 +340,7 @@ empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self,
 
   account = ag_manager_get_account (self->priv->manager, id);
   if (account != NULL)
-    l = ag_account_list_services_by_type (account, EMPATHY_UOA_SERVICE_TYPE);
+    l = ag_account_list_services_by_type (account, TPAW_UOA_SERVICE_TYPE);
   if (l == NULL)
     {
       DEBUG ("Couldn't find IM service for AgAccountId %u", id);
@@ -359,7 +361,7 @@ empathy_uoa_auth_handler_start (EmpathyUoaAuthHandler *self,
        * To ask user to type his password SSO needs a SignonIdentity bound to
        * our account. Let's store an empty password. */
       DEBUG ("Couldn't create a signon session");
-      empathy_keyring_set_account_password_async (tp_account, "", FALSE,
+      tpaw_keyring_set_account_password_async (tp_account, "", FALSE,
           set_account_password_cb, ctx);
     }
   else
diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c
deleted file mode 100644
index f63a15193..000000000
--- a/libempathy/empathy-uoa-utils.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * empathy-uoa-utils.c - Source for UOA utilities
- * Copyright (C) 2012 Collabora Ltd.
- * @author Xavier Claessens <xavier.claessens@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"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
-#include "empathy-uoa-utils.h"
-
-static AgManager *singleton = NULL;
-
-void
-empathy_uoa_manager_set_default (AgManager *manager)
-{
-  if (singleton != NULL)
-    return;
-
-  singleton = manager;
-  g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton);
-}
-
-AgManager *
-empathy_uoa_manager_dup (void)
-{
-  if (singleton != NULL)
-    return g_object_ref (singleton);
-
-  singleton = ag_manager_new_for_service_type (EMPATHY_UOA_SERVICE_TYPE);
-  g_object_add_weak_pointer ((GObject *) singleton, (gpointer) &singleton);
-
-  return singleton;
-}
diff --git a/libempathy/empathy-uoa-utils.h b/libempathy/empathy-uoa-utils.h
deleted file mode 100644
index 2cd7a41a2..000000000
--- a/libempathy/empathy-uoa-utils.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * empathy-utils.h - Header for UOA utilities
- * Copyright (C) 2012 Collabora Ltd.
- * @author Xavier Claessens <xavier.claessens@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_UOA_UTILS_H__
-#define __EMPATHY_UOA_UTILS_H__
-
-#include <libaccounts-glib/ag-manager.h>
-
-#define EMPATHY_UOA_SERVICE_TYPE "IM"
-
-G_BEGIN_DECLS
-
-void empathy_uoa_manager_set_default (AgManager *manager);
-AgManager *empathy_uoa_manager_dup (void);
-
-G_END_DECLS
-
-#endif /* #ifndef __EMPATHY_UOA_UTILS_H__*/
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index b8f54baa4..ba39f49b7 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,17 +27,14 @@
  */
 
 #include "config.h"
+#include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <libxml/uri.h>
 #include <dbus/dbus-protocol.h>
+#include <math.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-utils.h"
-#include "empathy-presence-manager.h"
-
-#include <extensions/extensions.h>
+#include "extensions.h"
 
 #include <math.h>
 
@@ -110,41 +107,6 @@ empathy_init (void)
   g_object_unref (am);
 }
 
-gboolean
-empathy_xml_validate (xmlDoc      *doc,
-    const gchar *dtd_filename)
-{
-  gchar *path;
-  xmlChar *escaped;
-  xmlValidCtxt  cvp;
-  xmlDtd *dtd;
-  gboolean ret;
-
-  path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy",
-         dtd_filename, NULL);
-  if (!g_file_test (path, G_FILE_TEST_EXISTS))
-    {
-      g_free (path);
-      path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL);
-    }
-
-  DEBUG ("Loading dtd file %s", path);
-
-  /* The list of valid chars is taken from libxml. */
-  escaped = xmlURIEscapeStr ((const xmlChar *) path,
-    (const xmlChar *)":@&=+$,/?;");
-  g_free (path);
-
-  memset (&cvp, 0, sizeof (cvp));
-  dtd = xmlParseDTD (NULL, escaped);
-  ret = xmlValidateDtd (&cvp, doc, dtd);
-
-  xmlFree (escaped);
-  xmlFreeDtd (dtd);
-
-  return ret;
-}
-
 xmlNodePtr
 empathy_xml_node_get_child (xmlNodePtr   node,
     const gchar *child_name)
@@ -424,23 +386,6 @@ empathy_file_lookup (const gchar *filename, const gchar *subdir)
   return path;
 }
 
-gboolean
-empathy_check_available_state (void)
-{
-  TpConnectionPresenceType presence;
-  EmpathyPresenceManager *presence_mgr;
-
-  presence_mgr = empathy_presence_manager_dup_singleton ();
-  presence = empathy_presence_manager_get_state (presence_mgr);
-  g_object_unref (presence_mgr);
-
-  if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
-    presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
-    return FALSE;
-
-  return TRUE;
-}
-
 gint
 empathy_uint_compare (gconstpointer a,
     gconstpointer b)
@@ -448,21 +393,6 @@ empathy_uint_compare (gconstpointer a,
   return *(guint *) a - *(guint *) b;
 }
 
-gchar *
-empathy_protocol_icon_name (const gchar *protocol)
-{
-  if (!tp_strdiff (protocol, "yahoojp"))
-    /* Yahoo Japan uses the same icon as Yahoo */
-    protocol = "yahoo";
-  else if (!tp_strdiff (protocol, "simple"))
-    /* SIMPLE uses the same icon as SIP */
-    protocol = "sip";
-  else if (!tp_strdiff (protocol, "sms"))
-    return g_strdup ("phone");
-
-  return g_strdup_printf ("im-%s", protocol);
-}
-
 GType
 empathy_type_dbus_ao (void)
 {
@@ -474,77 +404,6 @@ empathy_type_dbus_ao (void)
   return t;
 }
 
-const char *
-empathy_protocol_name_to_display_name (const gchar *proto_name)
-{
-  int i;
-  static struct {
-    const gchar *proto;
-    const gchar *display;
-    gboolean translated;
-  } names[] = {
-    { "jabber", "Jabber", FALSE },
-    { "msn", "Windows Live (MSN)", FALSE, },
-    { "local-xmpp", N_("People Nearby"), TRUE },
-    { "irc", "IRC", FALSE },
-    { "icq", "ICQ", FALSE },
-    { "aim", "AIM", FALSE },
-    { "yahoo", "Yahoo!", FALSE },
-    { "yahoojp", N_("Yahoo! Japan"), TRUE },
-    { "groupwise", "GroupWise", FALSE },
-    { "sip", "SIP", FALSE },
-    { "gadugadu", "Gadu-Gadu", FALSE },
-    { "mxit", "Mxit", FALSE },
-    { "myspace", "Myspace", FALSE },
-    { "sametime", "Sametime", FALSE },
-    { "skype-dbus", "Skype (D-BUS)", FALSE },
-    { "skype-x11", "Skype (X11)", FALSE },
-    { "zephyr", "Zephyr", FALSE },
-    { NULL, NULL }
-  };
-
-  for (i = 0; names[i].proto != NULL; i++)
-    {
-      if (!tp_strdiff (proto_name, names[i].proto))
-        {
-          if (names[i].translated)
-            return gettext (names[i].display);
-          else
-            return names[i].display;
-        }
-    }
-
-  return proto_name;
-}
-
-const char *
-empathy_service_name_to_display_name (const gchar *service_name)
-{
-  int i;
-  static struct {
-    const gchar *service;
-    const gchar *display;
-    gboolean translated;
-  } names[] = {
-    { "google-talk", N_("Google Talk"), FALSE },
-    { "facebook", N_("Facebook Chat"), TRUE },
-    { NULL, NULL }
-  };
-
-  for (i = 0; names[i].service != NULL; i++)
-    {
-      if (!tp_strdiff (service_name, names[i].service))
-        {
-          if (names[i].translated)
-            return gettext (names[i].display);
-          else
-            return names[i].display;
-        }
-    }
-
-  return service_name;
-}
-
 gboolean
 empathy_account_manager_get_accounts_connected (gboolean *connecting)
 {
@@ -584,49 +443,6 @@ empathy_account_manager_get_accounts_connected (gboolean *connecting)
   return out_connected;
 }
 
-/* Change the RequestedPresence of a newly created account to ensure that it
- * is actually connected. */
-void
-empathy_connect_new_account (TpAccount *account,
-    TpAccountManager *account_manager)
-{
-  TpConnectionPresenceType presence;
-  gchar *status, *message;
-
-  /* only force presence if presence was offline, unknown or unset */
-  presence = tp_account_get_requested_presence (account, NULL, NULL);
-  switch (presence)
-    {
-      case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
-      case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
-      case TP_CONNECTION_PRESENCE_TYPE_UNSET:
-        presence = tp_account_manager_get_most_available_presence (
-            account_manager, &status, &message);
-
-        if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE)
-          /* Global presence is offline; we force it so user doesn't have to
-           * manually change the presence to connect his new account. */
-          presence = TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
-
-        tp_account_request_presence_async (account, presence,
-            status, NULL, NULL, NULL);
-
-        g_free (status);
-        g_free (message);
-        break;
-
-       case TP_CONNECTION_PRESENCE_TYPE_AVAILABLE:
-       case TP_CONNECTION_PRESENCE_TYPE_AWAY:
-       case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
-       case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
-       case TP_CONNECTION_PRESENCE_TYPE_BUSY:
-       case TP_CONNECTION_PRESENCE_TYPE_ERROR:
-       default:
-        /* do nothing if the presence is not offline */
-        break;
-    }
-}
-
 /* Translate Folks' general presence type to the Tp presence type */
 TpConnectionPresenceType
 empathy_folks_presence_type_to_tp (FolksPresenceType type)
@@ -938,25 +754,6 @@ empathy_format_currency (gint amount,
   return money;
 }
 
-gboolean
-empathy_account_has_uri_scheme_tel (TpAccount *account)
-{
-  const gchar * const * uri_schemes;
-  guint i;
-
-  uri_schemes = tp_account_get_uri_schemes (account);
-  if (uri_schemes == NULL)
-    return FALSE;
-
-  for (i = 0; uri_schemes[i] != NULL; i++)
-    {
-      if (!tp_strdiff (uri_schemes[i], "tel"))
-        return TRUE;
-    }
-
-  return FALSE;
-}
-
 /* Return the TpContact on @conn associated with @individual, if any */
 TpContact *
 empathy_get_tp_contact_for_individual (FolksIndividual *individual,
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 5fe79e9ee..40291b971 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
 #include <gnutls/x509.h>
 #include <libxml/tree.h>
 #include <folks/folks.h>
@@ -37,15 +36,12 @@
 #include "empathy-contact.h"
 
 #define EMPATHY_GET_PRIV(obj,type) ((type##Priv *) ((type *) obj)->priv)
-#define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
 G_BEGIN_DECLS
 
 void empathy_init (void);
 
 /* XML */
-gboolean empathy_xml_validate (xmlDoc *doc,
-    const gchar *dtd_filename);
 xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node,
     const gchar *child_name);
 xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node,
@@ -61,25 +57,17 @@ const gchar * empathy_presence_to_str (TpConnectionPresenceType presence);
 TpConnectionPresenceType empathy_presence_from_str (const gchar *str);
 gchar * empathy_file_lookup (const gchar *filename,
     const gchar *subdir);
-gboolean empathy_check_available_state (void);
 gint empathy_uint_compare (gconstpointer a,
     gconstpointer b);
 
 const gchar * empathy_account_get_error_message (TpAccount *account,
     gboolean *user_requested);
 
-gchar *empathy_protocol_icon_name (const gchar *protocol);
-const gchar *empathy_protocol_name_to_display_name (const gchar *proto_name);
-const gchar *empathy_service_name_to_display_name (const gchar *proto_name);
-
 #define EMPATHY_ARRAY_TYPE_OBJECT (empathy_type_dbus_ao ())
 GType empathy_type_dbus_ao (void);
 
 gboolean empathy_account_manager_get_accounts_connected (gboolean *connecting);
 
-void empathy_connect_new_account (TpAccount *account,
-    TpAccountManager *account_manager);
-
 TpConnectionPresenceType empathy_folks_presence_type_to_tp (
     FolksPresenceType type);
 gboolean empathy_folks_individual_contains_contact (
@@ -103,8 +91,6 @@ gchar *empathy_format_currency (gint amount,
     guint scale,
     const gchar *currency);
 
-gboolean empathy_account_has_uri_scheme_tel (TpAccount *account);
-
 TpContact * empathy_get_tp_contact_for_individual (FolksIndividual *individual,
     TpConnection *conn);
 
@@ -131,51 +117,6 @@ GVariant * empathy_boxed_to_variant (GType gtype,
     const gchar *variant_type,
     gpointer boxed);
 
-/* Copied from wocky/wocky-utils.h */
-
-#define empathy_implement_finish_void(source, tag) \
-    if (g_simple_async_result_propagate_error (\
-      G_SIMPLE_ASYNC_RESULT (result), error)) \
-      return FALSE; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT(source), tag), \
-        FALSE); \
-    return TRUE;
-
-#define empathy_implement_finish_copy_pointer(source, tag, copy_func, \
-    out_param) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return FALSE; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        FALSE); \
-    if (out_param != NULL) \
-      *out_param = copy_func ( \
-          g_simple_async_result_get_op_res_gpointer (_simple)); \
-    return TRUE;
-
-#define empathy_implement_finish_return_copy_pointer(source, tag, copy_func) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return NULL; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        NULL); \
-    return copy_func (g_simple_async_result_get_op_res_gpointer (_simple));
-
-#define empathy_implement_finish_return_pointer(source, tag) \
-    GSimpleAsyncResult *_simple; \
-    _simple = (GSimpleAsyncResult *) result; \
-    if (g_simple_async_result_propagate_error (_simple, error)) \
-      return NULL; \
-    g_return_val_if_fail (g_simple_async_result_is_valid (result, \
-            G_OBJECT (source), tag), \
-        NULL); \
-    return g_simple_async_result_get_op_res_gpointer (_simple);
-
 G_END_DECLS
 
 #endif /*  __EMPATHY_UTILS_H__ */
diff --git a/libempathy/irc-networks.xml b/libempathy/irc-networks.xml
deleted file mode 100644
index 2526785c2..000000000
--- a/libempathy/irc-networks.xml
+++ /dev/null
@@ -1,545 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<networks>
-  <network name="Debian Servers" id="debian_servers">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.debian.org"/>
-    </servers>
-  </network>
-  <network name="2600net" id="a2600net">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.2600.net"/>
-    </servers>
-  </network>
-  <network name="AccessIRC" id="accessirc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.accessirc.net"/>
-      <server ssl="FALSE" port="6667" address="eu.accessirc.net"/>
-    </servers>
-  </network>
-  <network name="AfterNET" id="afternet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.afternet.org"/>
-      <server ssl="FALSE" port="6667" address="us.afternet.org"/>
-      <server ssl="FALSE" port="6667" address="eu.afternet.org"/>
-    </servers>
-  </network>
-  <network name="Aitvaras" id="aitvaras">
-    <servers>
-      <server ssl="TRUE" port="6668" address="irc.data.lt"/>
-      <server ssl="TRUE" port="6668" address="irc-ssl.omnitel.net"/>
-      <server ssl="TRUE" port="9999" address="irc-ssl.le.lt"/>
-      <server ssl="FALSE" port="6667" address="irc.data.lt"/>
-      <server ssl="FALSE" port="6667" address="irc.omnitel.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ktu.lt"/>
-      <server ssl="FALSE" port="6667" address="irc.le.lt"/>
-      <server ssl="FALSE" port="6667" address="irc.takas.lt"/>
-      <server ssl="FALSE" port="6667" address="irc.5ci.net"/>
-      <server ssl="FALSE" port="6667" address="irc.kis.lt"/>
-    </servers>
-  </network>
-  <network name="AmigaNet" id="amiganet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.amiganet.org"/>
-      <server ssl="FALSE" port="6667" address="us.amiganet.org"/>
-      <server ssl="FALSE" port="6667" address="uk.amiganet.org"/>
-    </servers>
-  </network>
-  <network name="ARCNet" id="arcnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="se1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="us1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="us2.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="us3.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="ca1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="de1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="de3.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="ch1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="be1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="nl3.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="uk1.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="uk2.arcnet.vapor.com"/>
-      <server ssl="FALSE" port="6667" address="fr1.arcnet.vapor.com"/>
-    </servers>
-  </network>
-  <network name="AstroLink" id="astrolink">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.astrolink.org"/>
-    </servers>
-  </network>
-  <network name="AustNet" id="austnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="au.austnet.org"/>
-      <server ssl="FALSE" port="6667" address="us.austnet.org"/>
-      <server ssl="FALSE" port="6667" address="ca.austnet.org"/>
-    </servers>
-  </network>
-  <network name="AzzurraNet" id="azzurranet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.azzurra.org"/>
-      <server ssl="FALSE" port="6667" address="crypto.azzurra.org"/>
-    </servers>
-  </network>
-  <network name="Beirut" id="beirut">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.beirut.com"/>
-    </servers>
-  </network>
-  <network name="ChatJunkies" id="chatjunkies">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.chatjunkies.org"/>
-      <server ssl="FALSE" port="6667" address="nl.chatjunkies.org"/>
-    </servers>
-  </network>
-  <network name="ChatNet" id="chatnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="US.ChatNet.Org"/>
-      <server ssl="FALSE" port="6667" address="EU.ChatNet.Org"/>
-    </servers>
-  </network>
-  <network name="ChatSociety" id="chatsociety">
-    <servers>
-      <server ssl="FALSE" port="6667" address="us.chatsociety.net"/>
-      <server ssl="FALSE" port="6667" address="eu.chatsociety.net"/>
-    </servers>
-  </network>
-  <network name="ChatSpike" id="chatspike">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.chatspike.net"/>
-    </servers>
-  </network>
-  <network name="ChillFactory" id="chillfactory">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.chillfactory.net"/>
-    </servers>
-  </network>
-  <network name="CoolChat" id="coolchat">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.coolchat.net"/>
-    </servers>
-  </network>
-  <network name="Criten" id="criten">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.criten.net"/>
-      <server ssl="FALSE" port="6667" address="irc.eu.criten.net"/>
-    </servers>
-  </network>
-  <network name="DALnet" id="dalnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.dal.net"/>
-      <server ssl="FALSE" port="6667" address="irc.eu.dal.net"/>
-    </servers>
-  </network>
-  <network name="Dark-Tou-Net" id="dark-tou-net">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.d-t-net.de"/>
-      <server ssl="FALSE" port="6667" address="bw.d-t-net.de"/>
-      <server ssl="FALSE" port="6667" address="nc.d-t-net.de"/>
-      <server ssl="FALSE" port="6667" address="wakka.d-t-net.de"/>
-    </servers>
-  </network>
-  <network name="DarkMyst" id="darkmyst">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.darkmyst.org"/>
-    </servers>
-  </network>
-  <network name="DeepIRC" id="deepirc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.deepirc.net"/>
-    </servers>
-  </network>
-  <network name="DeltaAnime" id="deltaanime">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.deltaanime.net"/>
-    </servers>
-  </network>
-  <network name="EFnet" id="efnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.blackened.com"/>
-      <server ssl="FALSE" port="6667" address="irc.Prison.NET"/>
-      <server ssl="FALSE" port="6667" address="irc.Qeast.net"/>
-      <server ssl="FALSE" port="6667" address="irc.efnet.pl"/>
-      <server ssl="FALSE" port="6667" address="efnet.demon.co.uk"/>
-      <server ssl="FALSE" port="6667" address="irc.lightning.net"/>
-      <server ssl="FALSE" port="6667" address="irc.mindspring.com"/>
-      <server ssl="FALSE" port="6667" address="irc.easynews.com"/>
-      <server ssl="FALSE" port="6667" address="irc.servercentral.net"/>
-    </servers>
-  </network>
-  <network name="EnterTheGame" id="enterthegame">
-    <servers>
-      <server ssl="FALSE" port="6667" address="IRC.EnterTheGame.Com"/>
-    </servers>
-  </network>
-  <network name="EUIrc" id="euirc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ham.de.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ber.de.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ffm.de.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.bre.de.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.hes.de.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.vie.at.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.inn.at.euirc.net"/>
-      <server ssl="FALSE" port="6667" address="irc.bas.ch.euirc.net"/>
-    </servers>
-  </network>
-  <network name="EuropNet" id="europnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.europnet.org"/>
-    </servers>
-  </network>
-  <network name="EU-IRC" id="eu-irc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.eu-irc.net"/>
-    </servers>
-  </network>
-  <network name="FDFNet" id="fdfnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.fdfnet.net"/>
-      <server ssl="FALSE" port="6667" address="irc.eu.fdfnet.net"/>
-    </servers>
-  </network>
-  <network name="FEFNet" id="fefnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.fef.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ggn.net"/>
-      <server ssl="FALSE" port="6667" address="irc.vendetta.com"/>
-    </servers>
-  </network>
-  <network name="freenode" id="freenode">
-    <servers>
-      <server ssl="TRUE" port="6697" address="chat.freenode.net"/>
-      <server ssl="TRUE" port="7000" address="chat.freenode.net"/>
-      <server ssl="TRUE" port="7070" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="6665" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="6666" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="6667" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="8000" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="8001" address="chat.freenode.net"/>
-      <server ssl="FALSE" port="8002" address="chat.freenode.net"/>
-    </servers>
-  </network>
-  <network name="GalaxyNet" id="galaxynet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.galaxynet.org"/>
-    </servers>
-  </network>
-  <network name="GamesNET" id="gamesnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.gamesnet.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ca.gamesnet.net"/>
-      <server ssl="FALSE" port="6667" address="irc.eu.gamesnet.net"/>
-    </servers>
-  </network>
-  <network name="German-Elite" id="german-elite">
-    <servers>
-      <server ssl="FALSE" port="6667" address="dominion.german-elite.net"/>
-      <server ssl="FALSE" port="6667" address="komatu.german-elite.net"/>
-    </servers>
-  </network>
-  <network name="GimpNet" id="gimpnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.gimp.org"/>
-      <server ssl="FALSE" port="6667" address="irc.us.gimp.org"/>
-    </servers>
-  </network>
-  <network name="HabberNet" id="habbernet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.habber.net"/>
-    </servers>
-  </network>
-  <network name="Hashmark" id="hashmark">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.hashmark.net"/>
-    </servers>
-  </network>
-  <network name="IdleMonkeys" id="idlemonkeys">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.idlemonkeys.net"/>
-    </servers>
-  </network>
-  <network name="insiderZ.DE" id="insiderz.de">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.insiderz.de"/>
-      <server ssl="FALSE" port="6666" address="irc.insiderz.de"/>
-    </servers>
-  </network>
-  <network name="IrcLink" id="irclink">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.irclink.net"/>
-      <server ssl="FALSE" port="6667" address="Alesund.no.eu.irclink.net"/>
-      <server ssl="FALSE" port="6667" address="Oslo.no.eu.irclink.net"/>
-      <server ssl="FALSE" port="6667" address="frogn.no.eu.irclink.net"/>
-      <server ssl="FALSE" port="6667" address="tonsberg.no.eu.irclink.net"/>
-    </servers>
-  </network>
-  <network name="IRCNet" id="ircnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.ircnet.com"/>
-      <server ssl="FALSE" port="6668" address="irc.stealth.net"/>
-      <server ssl="FALSE" port="6667" address="ircnet.demon.co.uk"/>
-      <server ssl="FALSE" port="6667" address="irc.datacomm.ch"/>
-      <server ssl="FALSE" port="6667" address="random.ircd.de"/>
-      <server ssl="FALSE" port="6667" address="ircnet.netvision.net.il"/>
-      <server ssl="FALSE" port="6667" address="irc.cs.hut.fi"/>
-    </servers>
-  </network>
-  <network name="Irctoo.net" id="irctoo.net">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.irctoo.net"/>
-    </servers>
-  </network>
-  <network name="Krstarica" id="krstarica">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.krstarica.com"/>
-    </servers>
-  </network>
-  <network name="Librenet" id="librenet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.librenet.net"/>
-      <server ssl="FALSE" port="6667" address="ielf.fr.librenet.net"/>
-    </servers>
-  </network>
-  <network name="LinkNet" id="linknet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.link-net.org"/>
-      <server ssl="FALSE" port="6667" address="irc.no.link-net.org"/>
-      <server ssl="FALSE" port="6667" address="irc.bahnhof.se"/>
-    </servers>
-  </network>
-  <network name="MagicStar" id="magicstar">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.magicstar.net"/>
-    </servers>
-  </network>
-  <network name="Majistic" id="majistic">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.majistic.net"/>
-    </servers>
-  </network>
-  <network name="MindForge" id="mindforge">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.mindforge.org"/>
-    </servers>
-  </network>
-  <network name="MIXXnet" id="mixxnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.mixxnet.net"/>
-    </servers>
-  </network>
-  <network name="NeverNET" id="nevernet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.nevernet.net"/>
-      <server ssl="FALSE" port="6667" address="imagine.nevernet.net"/>
-      <server ssl="FALSE" port="6667" address="dimension.nevernet.net"/>
-      <server ssl="FALSE" port="6667" address="universe.nevernet.net"/>
-      <server ssl="FALSE" port="6667" address="wayland.nevernet.net"/>
-      <server ssl="FALSE" port="6667" address="forte.nevernet.net"/>
-    </servers>
-  </network>
-  <network name="NixHelpNet" id="nixhelpnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="us.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="uk.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="uk2.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="uk3.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="nl.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="ca.ld.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="us.co.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="us.ca.nixhelp.org"/>
-      <server ssl="FALSE" port="6667" address="us.pa.nixhelp.org"/>
-    </servers>
-  </network>
-  <network name="NullusNet" id="nullusnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.nullus.net"/>
-    </servers>
-  </network>
-  <network name="Oceanius" id="oceanius">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.oceanius.com"/>
-    </servers>
-  </network>
-  <network name="OFTC" id="oftc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.oftc.net"/>
-    </servers>
-  </network>
-  <network name="OtherNet" id="othernet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.othernet.org"/>
-    </servers>
-  </network>
-  <network name="Oz.org" id="oz.org">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.oz.org"/>
-      <server ssl="FALSE" port="6667" address="germany.oz.org"/>
-      <server ssl="FALSE" port="6667" address="sandiego.oz.org"/>
-      <server ssl="FALSE" port="6667" address="us.oz.org"/>
-      <server ssl="FALSE" port="6667" address="au.oz.org"/>
-      <server ssl="FALSE" port="6667" address="rockhampton.oz.org"/>
-      <server ssl="FALSE" port="6667" address="wollongong.oz.org"/>
-      <server ssl="FALSE" port="6667" address="waix.oz.org"/>
-    </servers>
-  </network>
-  <network name="PTlink" id="ptlink">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.PTlink.net"/>
-      <server ssl="FALSE" port="6667" address="aaia.PTlink.net"/>
-    </servers>
-  </network>
-  <network name="PTNe" id="ptne">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.PTNet.org"/>
-      <server ssl="FALSE" port="6667" address="rccn.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="uevora.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="umoderna.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="ist.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="aaum.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="uc.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="ualg.ptnet.org"/>
-      <server ssl="FALSE" port="6667" address="madinfo.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="ua.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="ipg.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="isec.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="utad.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="iscte.PTnet.org"/>
-      <server ssl="FALSE" port="6667" address="ubi.PTnet.org"/>
-    </servers>
-  </network>
-  <network name="QuakeNet" id="quakenet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.se.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.dk.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.no.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.fi.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.be.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.uk.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.de.quakenet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.it.quakenet.org"/>
-    </servers>
-  </network>
-  <network name="RebelChat" id="rebelchat">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.rebelchat.org"/>
-    </servers>
-  </network>
-  <network name="RizeNET" id="rizenet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.rizenet.org"/>
-      <server ssl="FALSE" port="6667" address="omega.rizenet.org"/>
-      <server ssl="FALSE" port="6667" address="evelance.rizenet.org"/>
-      <server ssl="FALSE" port="6667" address="lisa.rizenet.org"/>
-      <server ssl="FALSE" port="6667" address="scott.rizenet.org"/>
-    </servers>
-  </network>
-  <network name="RusNet" id="rusnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.tomsk.net"/>
-      <server ssl="FALSE" port="6667" address="irc.rinet.ru"/>
-      <server ssl="FALSE" port="6667" address="irc.run.net"/>
-      <server ssl="FALSE" port="6667" address="irc.ru"/>
-      <server ssl="FALSE" port="6667" address="irc.lucky.net"/>
-    </servers>
-  </network>
-  <network name="SceneNet" id="scenenet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.scene.org"/>
-      <server ssl="FALSE" port="6667" address="irc.eu.scene.org"/>
-      <server ssl="FALSE" port="6667" address="irc.us.scene.org"/>
-    </servers>
-  </network>
-  <network name="SlashNET" id="slashnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.slashnet.org"/>
-      <server ssl="FALSE" port="6667" address="area51.slashnet.org"/>
-      <server ssl="FALSE" port="6667" address="moo.slashnet.org"/>
-      <server ssl="FALSE" port="6667" address="radon.slashnet.org"/>
-    </servers>
-  </network>
-  <network name="Sohbet.Net" id="sohbet.net">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.sohbet.net"/>
-    </servers>
-  </network>
-  <network name="SolidIRC" id="solidirc">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.solidirc.com"/>
-    </servers>
-  </network>
-  <network name="SorceryNet" id="sorcerynet">
-    <servers>
-      <server ssl="FALSE" port="9000" address="irc.sorcery.net"/>
-      <server ssl="FALSE" port="9000" address="irc.us.sorcery.net"/>
-      <server ssl="FALSE" port="9000" address="irc.eu.sorcery.net"/>
-    </servers>
-  </network>
-  <network name="Spidernet" id="spidernet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="us.spidernet.org"/>
-      <server ssl="FALSE" port="6667" address="eu.spidernet.org"/>
-      <server ssl="FALSE" port="6667" address="irc.spidernet.org"/>
-    </servers>
-  </network>
-  <network name="StarChat" id="starchat">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="gainesville.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="freebsd.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="sunset.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="revenge.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="tahoma.starchat.net"/>
-      <server ssl="FALSE" port="6667" address="neo.starchat.net"/>
-    </servers>
-  </network>
-  <network name="TNI3" id="tni3">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.tni3.com"/>
-    </servers>
-  </network>
-  <network name="UnderNet" id="undernet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="us.undernet.org"/>
-      <server ssl="FALSE" port="6667" address="eu.undernet.org"/>
-    </servers>
-  </network>
-  <network name="UniBG" id="unibg">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.lirex.com"/>
-      <server ssl="FALSE" port="6667" address="irc.naturella.com"/>
-      <server ssl="FALSE" port="6667" address="irc.spnet.net"/>
-      <server ssl="FALSE" port="6667" address="irc.techno-link.com"/>
-      <server ssl="FALSE" port="6667" address="irc.telecoms.bg"/>
-      <server ssl="FALSE" port="6667" address="irc.tu-varna.edu"/>
-    </servers>
-  </network>
-  <network name="Whiffle" id="whiffle">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.whiffle.org"/>
-    </servers>
-  </network>
-  <network name="Worldnet" id="worldnet">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.worldnet.net"/>
-      <server ssl="FALSE" port="6667" address="irc.fr.worldnet.net"/>
-    </servers>
-  </network>
-  <network name="Xentonix.net" id="xentonix.net">
-    <servers>
-      <server ssl="FALSE" port="6667" address="irc.ffm.de.eu.xentonix.net"/>
-      <server ssl="FALSE" port="6667" address="irc.kar.de.eu.xentonix.net"/>
-      <server ssl="FALSE" port="6667" address="irc.vie.at.eu.xentonix.net"/>
-    </servers>
-  </network>
-  <network name="XWorld" id="xworld">
-    <servers>
-      <server ssl="FALSE" port="6667" address="Buffalo.NY.US.XWorld.org"/>
-      <server ssl="FALSE" port="6667" address="Minneapolis.MN.US.Xworld.Org"/>
-      <server ssl="FALSE" port="6667" address="Rochester.NY.US.XWorld.org"/>
-      <server ssl="FALSE" port="6667" address="Bayern.DE.EU.XWorld.Org"/>
-      <server ssl="FALSE" port="6667" address="Chicago.IL.US.XWorld.Org"/>
-    </servers>
-  </network>
-</networks>
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 171ba2ed2..0bd286f6d 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -2,12 +2,14 @@ plugindir = $(libdir)/nautilus-sendto/plugins
 
 INCLUDES =					\
 	-I$(top_builddir)			\
-	-I$(top_srcdir)				\
+	-I$(top_srcdir)/libempathy		\
+	-I$(top_srcdir)/libempathy-gtk		\
 	-DLOCALEDIR=\""$(datadir)/locale"\"	\
 	$(NST_CFLAGS)				\
 	$(WARN_CFLAGS)				\
 	$(ERROR_CFLAGS)				\
 	$(DISABLE_DEPRECATED)			\
+	$(TPAW_CFLAGS)				\
 	$(EMPATHY_CFLAGS)
 
 plugin_LTLIBRARIES = libnstempathy.la
@@ -16,5 +18,6 @@ libnstempathy_la_SOURCES = empathy-nautilus-sendto.c
 libnstempathy_la_LDFLAGS = -module -avoid-version
 libnstempathy_la_LIBADD =				\
 	$(NST_LIBS)					\
+	$(TPAW_LIBS)					\
 	$(top_builddir)/libempathy/libempathy.la \
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 8b1bafb78..de7923858 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -22,24 +22,16 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-ft-factory.h>
-#include <libempathy/empathy-ft-handler.h>
-
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-roster-contact.h>
+
+
+#include "empathy-debug.h"
+#include "empathy-ft-factory.h"
+
+#include "empathy-roster-model-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-roster-contact.h"
 
 
 #include "nautilus-sendto-plugin.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 629654048..431b4ed5b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,36 +5,18 @@ data/empathy.desktop.in.in
 [type: gettext/gsettings]data/org.gnome.Empathy.gschema.xml
 
 libempathy/empathy-ft-handler.c
-libempathy/empathy-keyring.c
 libempathy/empathy-message.c
-libempathy/empathy-time.c
 libempathy/empathy-utils.c
 
 libempathy-gtk/empathy-account-chooser.c
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-aim.ui
-libempathy-gtk/empathy-account-widget.c
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-generic.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-groupwise.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-icq.ui
-libempathy-gtk/empathy-account-widget-irc.c
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-irc.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-jabber.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-local-xmpp.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-msn.ui
-libempathy-gtk/empathy-account-widget-sip.c
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-sip.ui
-[type: gettext/glade]libempathy-gtk/empathy-account-widget-yahoo.ui
-libempathy-gtk/empathy-avatar-chooser.c
 libempathy-gtk/empathy-avatar-image.c
 libempathy-gtk/empathy-bad-password-dialog.c
 libempathy-gtk/empathy-base-password-dialog.c
-libempathy-gtk/empathy-calendar-button.c
 libempathy-gtk/empathy-call-utils.c
 libempathy-gtk/empathy-chat.c
 [type: gettext/glade]libempathy-gtk/empathy-chat.ui
 libempathy-gtk/empathy-contact-blocking-dialog.c
 [type: gettext/glade]libempathy-gtk/empathy-contact-blocking-dialog.ui
-libempathy-gtk/empathy-contactinfo-utils.c
 libempathy-gtk/empathy-contact-search-dialog.c
 libempathy-gtk/empathy-contact-widget.c
 [type: gettext/glade]libempathy-gtk/empathy-contact-widget.ui
@@ -46,8 +28,6 @@ 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-local-xmpp-assistant-widget.c
 libempathy-gtk/empathy-log-window.c
 [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
@@ -67,9 +47,7 @@ libempathy-gtk/empathy-theme-adium.c
 libempathy-gtk/empathy-theme-manager.c
 libempathy-gtk/empathy-tls-dialog.c
 libempathy-gtk/empathy-ui-utils.c
-libempathy-gtk/empathy-user-info.c
 libempathy-gtk/empathy-webkit-utils.c
-libempathy-gtk/totem-subtitle-encoding.c
 libempathy-gtk/empathy-roster-model.h
 libempathy-gtk/empathy-roster-contact.c
 
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index bfcb0d54f..7488a6158 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,3 +1,5 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in
+
+telepathy-account-widgets
diff --git a/po/be.po b/po/be.po
index f7a4d934d..83bbf3861 100644
--- a/po/be.po
+++ b/po/be.po
@@ -1,5 +1,5 @@
 # insomnia <defragbrain@gmail.com>, 2009.
-# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011.
+# Ihar Hrachyshka <ihar.hrachyshka@gmail.com>, 2011, 2013.
 # Kasia Bondarava <kasia.bondarava@gmail.com>, 2011.
 #
 msgid ""
@@ -7,9 +7,9 @@ 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: 2013-01-09 14:05+0000\n"
+"POT-Creation-Date: 2013-09-07 03:22+0000\n"
 "PO-Revision-Date: 2012-09-29 18:15+0300\n"
-"Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
+"Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -36,7 +36,9 @@ msgstr "Чат у Google Talk, Facebook, MSN ды інш."
 
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
-msgstr "чат;гутарка;размова;размаўл�ць;паведамленне;irc;voip;гола�;gtalk;facebook;jabber;"
+msgstr ""
+"чат;гутарка;размова;размаўл�ць;паведамленне;irc;voip;гола�;gtalk;facebook;"
+"jabber;"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
@@ -458,36 +460,10 @@ msgstr ""
 "Ці можа Empathy паведамл�ць аб ме�цазнаходжанні кары�тальніка �го кантактам."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy можа выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць �етку дл� вызнач�нн� ме�цазнаходжанн�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy можа выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Ці можа Empathy выкары�тоўваць �отавую �етку дл� вызнач�нн� ме�цазнаходжанн�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy можа выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ці можа Empathy выкары�тоўваць GPS дл� вызнач�нн� ме�цазнаходжанн�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy му�іць пагаршаць дакладна�ць ме�цазнаходжанн�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -518,7 +494,7 @@ msgstr "Памылка пры �пробе перадачы файла"
 msgid "The other participant is unable to transfer the file"
 msgstr "Суразмоўца не здолеў ажыцц�віць перадачу файла"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "�ев�дома� прычына"
 
@@ -538,219 +514,153 @@ msgstr "Выбраны файл не з'�ўл�ецца звычайным фа
 msgid "The selected file is empty"
 msgstr "Выбраны файл пу�ты"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Пароль не знойдзены"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Пароль да конта камунікатара %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Пароль да пако� \"%s\" дл� конта %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Прапушчаны званок ад %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Званок да %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Званок ад %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d �екунда таму"
-msgstr[1] "%d �екунды таму"
-msgstr[2] "%d �екунд таму"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d хвіліна таму"
-msgstr[1] "%d хвіліны таму"
-msgstr[2] "%d хвілін таму"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d гадзіна таму"
-msgstr[1] "%d гадзіны таму"
-msgstr[2] "%d гадзін таму"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d дзень таму"
-msgstr[1] "%d дні таму"
-msgstr[2] "%d дзён таму"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d тыдзень таму"
-msgstr[1] "%d тыдні таму"
-msgstr[2] "%d тыдн�ў таму"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ме��ц таму"
-msgstr[1] "%d ме��цы таму"
-msgstr[2] "%d ме��цаў таму"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "у будучыні"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Да�тупны"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Зан�ты"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "�д�утны"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "��бачны"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Па-за �еткай"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�ев�дома"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Прычына не азначана"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Уключаны р�жым па-за �еткай"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Сеткава� памылка"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "��ўдала� ід�нтыфікацы�"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Памылка шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Ім� ўжо зан�та"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Сертыфікат не пададзены"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Сертыфікат не за�лугоўвае даверу"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Сертыфікат �а�тар�ў"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Сертыфікат не актывізаваны"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "�азва камп'ютара ў �ертыфікаце не адпав�дае патр�бнай"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "�дбітак �ертыфіката не адпав�дае патр�бнаму"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Сертыфікат ула�наручна падпі�аны"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Памылка �ертыфіката"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Шыфраванне неда�тупнае"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Хібны �ертыфікат"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "�дмоўлена ў злуч�нні"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "�е ўдало�� ў�тал�ваць злуч�нне"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Злуч�нне �трачана"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Г�ты конт ужо злучаны з �ерверам"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Злуч�нне заменена новым дл� таго ж �амага р��ур�у"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Такі конт ужо і�нуе на �ерверы"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер надта зан�ты і не можа аб�лужыць г�та злуч�нне"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Сертыфікат быў адкліканы"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Дл� �ертыфіката выкары�таны �лабы або неб��печны алгарытм шыфраванн�"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -758,589 +668,33 @@ msgstr ""
 "Даўжын� �ертыфіката �ервера або глыбін� �го ланцуга перавышае абмежаванне, "
 "вы�таўленае крыптаграфічнай біблі�т�кай"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Ваша апраграмаванне надта �тарое"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Унутрана� памылка"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Людзі паблізу"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Японі�"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "У�е конты"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "_Пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Запомніць пароль"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Порт"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Сервер"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Запомніць пароль"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Конт"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Пароль"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Сервер"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Порт"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Ім� кары�тальніка:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "У_жыць"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Увай�ці"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Такі конт ужо і�нуе на г�тым �ерверы"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Стварыць новы конт на г�тым �ерверы"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Конт %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "�овы конт"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "Ід_�нтыфікатар конта"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "Ваш пароль да конта GroupWise"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "_Знаказбор"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "Ваш пароль да конта ICQ"
-
-#: ../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 "Знаказбор"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Дадаць..."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Выдаліць"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Уверх"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Уніз"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Серверы"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Больша�ць IRC-�ервераў не патрабуе парол�ў, таму калі вы не ўп�ўнены, про�та "
-"пакіньце графу парол� пу�той."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "М�нушка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Развітальнае паведамленне"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Сапраўднае ім�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Ім� кары�тальніка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "IRC-�етка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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.com/<b>badger</b>, упішыце <b>badger</"
-"b>.\n"
-"Каб выбраць �абе ім�, наведайце <a href=\"http://www.facebook.com/username/"
-"\">г�ту �таронку</a>."
-
-#: ../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: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 "Override server settings"
-msgstr "За�ланіць на�тройкі �ервера ўла�нымі"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "_Выкары�тоўваць �тары SSL-пратакол"
-
-#: ../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:25
-msgid "What is your desired Jabber ID?"
-msgstr "Пажаданы ід�нтыфікатар Jabber"
-
-#: ../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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_М�нушка"
-
-#: ../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 "E-_mail address"
-msgstr "_Электронны паштовы адра�"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Прыклад:</b> user@hotmail.com"
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr "Ваш пароль да конта Windows Live"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "�ўтаматычна"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Options"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "�ічога"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "Ім� _кары�тальніка"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Выкары�тоўваць г�ты конт дл� званкоў на _хатні� і мабільны� т�лефоны"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Опцыі праходу праз NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Опцыі прок�і-�ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Разна�тайны� опцыі"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN-�ервер"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "�ўтаматычны пошук STUN-�ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Пошук �ув�зі"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Опцыі падтрымкі �ув�зі"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Механізм"
-
-#: ../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 "Transport"
-msgstr "Тран�парт"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Вольна� маршрутызацы�"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ігнараваць памылкі TLS-пратакола"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "М��цовы IP-адра�"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Ваш пароль да конта SIP"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Пароль:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "_�а�тройкі м��цова�ці дл� �пі�а пако�ў:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_Знаказбор:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-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:11
-msgid "What is your Yahoo! password?"
-msgstr "Ваш пароль да конта Yahoo!"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "�е ўдало�� пераўтварыць вы�ву"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "�і адзін з магчымых фарматаў вы�ў не падтрымліваецца г�тай �і�т�май"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "�е ўдало�� захаваць вы�ву ў файле"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Выбар вы�вы дл� �ваёй аватары"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Зрабіць здымак..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "��ма вы�вы"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Вы�вы"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "У�е файлы"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "П�трыкніце, каб пав�лічыць"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "��ўдала� ід�нтыфікацы� дл� конта <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Паўтарыць"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1350,72 +704,69 @@ msgstr ""
 "Упішыце пароль да вашага конта\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Выбраць..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Выбраць"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Узнікла памылка пры званку"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Г�ты кантакт не падтрымлівае званкоў"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Г�ты кантакт па-за �еткай"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Г�ты кантакт хібны"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Г�ты пратакол не падтрымлівае �к�транны� званкі"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Вам не �тае грошай, каб перанакіраваць г�ты званок"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "�е ўдало�� ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Г�та� размова не падтрымлівае т�мы"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Вы не маеце дазволу на зм�ненне т�мы размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "хібны ід�нтыфікатар кантакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ачы�ціць у�е паведамленні ў адкрытым акне размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <т�ма>: прызначыць т�му дл� актыўнай размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ід�нтыфікатар пако�>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1423,24 +774,24 @@ msgstr ""
 "/part [<ід�нтыфікатар пако�>] [<прычына>]: пакінуць групавы чат, звычайна "
 "актыўны"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <кантакт> [<паведамленне>]: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <кантакт> <паведамленне>: ра�пачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <м�нушка>: зм�ніць �ваю м�нушку на актыўным �ерверы"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 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: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 "
@@ -1451,11 +802,11 @@ msgstr ""
 "\". �апрыклад: \"/say /join выкары�тоўваецца дл� далуч�нн� да новага "
 "групавога чату ў пакоі\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1463,128 +814,128 @@ msgstr ""
 "/help [<загад>]: паказаць у�е в�домы� загады. Калі пададзены <загад>, "
 "паказаць правілы �го выкары�танн�."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Правілы кары�танн�: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "�ев�домы загад"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "�ев�домы загад. Каб пагл�дзець �пі� у�іх в�домых загадаў, выканайце /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "не �тае грошай дл� па�ылкі паведамленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка па�ылкі паведамленн� \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "не �тае грошай дл� па�ылкі паведамленн�. <a href='%s'>Папоўніце рахунак</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "не падтрымліваецца"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "па-за �еткай"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "хібны кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "адмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "надта доўгае паведамленне"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "не р�алізавана"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "нев�дома"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:974
 msgid "Topic:"
 msgstr "Т�ма:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Т�ма вызначана �к: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Т�ма не вызначана"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(н�ма прапаноў)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Дадаць \"%s\" у �лоўнік (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "У�тавіць �майлік"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Па�лаць"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Прапанаваны� _вары�нты выпраўленн�"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "�е ўдало�� атрымаць �вежы� журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "Удзельнік %s ц�пер па-за �еткай"
@@ -1592,12 +943,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "Удзельніка %s выпхнулі з пако�"
@@ -1605,17 +956,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Удзельнік %2$s забаніў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "Удзельніка %s забанілі"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "Удзельнік %s пакінуў пакой"
@@ -1625,17 +976,17 @@ msgstr "Удзельнік %s пакінуў пакой"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "Удзельнік %s увайшоў у пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Удзельнік %s ц�пер называецца %s"
@@ -1643,50 +994,50 @@ msgstr "Удзельнік %s ц�пер называецца %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "�длучаны"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Ці вы хочаце захаваць г�ты пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Запомніць"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "�е зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Хібны пароль. Паўтарыце �пробу:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Г�ты пакой абаронены паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Далучыцца"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Размова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1717,8 +1068,8 @@ msgstr "РÑ�дагаванне Ñ�піÑ�а блакіраваных кантакÑ
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1728,120 +1079,63 @@ msgstr "Конт:"
 msgid "Blocked Contacts"
 msgstr "Блакіраваны� кантакты"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Поўнае ім�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Т�лефонны нумар"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Электронны паштовы адра�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Сеціўна� пл�цоўка"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Быў л� камп'ютара:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "�азва камп'ютара:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Паведамленне пры ад�утна�ці:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "працоўны"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "дамашні"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "мабільны"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "гола�ам"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "а�ноўны"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "дл� пошты"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "Выдаліць"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Пошук кантактаў"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Пошук: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Дадаць кантакт"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Кантактаў не знойдзена"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Г�ты конт не падтрымлівае пошуку кантактаў"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Прывітальнае паведамленне:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Калі ла�ка, дазвольце мне бачыць, калі вы ў �етцы. Дз�куй!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Захаваць аватару"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "�е ўдало�� захаваць аватару"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Конт"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Ід�нтыфікатар"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "П�еўданім"
 
@@ -1875,11 +1169,11 @@ msgstr "Вер�і�"
 msgid "Client"
 msgstr "Кліент"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Групы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1887,78 +1181,78 @@ msgstr ""
 "Вызначыце групы дл� г�тага кантакта. Заўважце, што можна не выбіраць ні "
 "адной групы або выбраць адразу некалькі."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Дадаць групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбар"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "�овы кантакт"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Блакіраваць %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Ці вы �апраўды хочаце блакіраваць \"%s\" у магчыма�ці кантактаванн� з вамі?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "�а�тупна� ід�нтычна�ць не можа быць заблакіраванай:"
 msgstr[1] "�а�тупны� ід�нтычна�ці не могуць быць заблакіраванымі:"
 msgstr[2] "�а�тупны� ід�нтычна�ці не могуць быць заблакіраванымі:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Блакіраваць"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Па�кардзіцца на г�ты кантакт"
 msgstr[1] "_Па�кардзіцца на г�ты� кантакты"
 msgstr[2] "_Па�кардзіцца на г�ты� кантакты"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Р�дагаванне кантактных зве�так"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Зв�заны� кантакты"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts не ў�тал�ваны"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "У�талюйце gnome-contacts, каб атрымаць до�туп да падраб�зна�ц�ў кантактаў."
@@ -1966,47 +1260,52 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Выберыце конт дл� перанакіраванн� званка"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Мабільны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Працоўны т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Хатні т�лефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Блакіраваць кантакт"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Выдаліць з _групы \"%s\""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Выдаліць і _блакіраваць"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць кантакт \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2015,218 +1314,219 @@ msgstr ""
 "Ці вы �апраўды хочаце выдаліць аб'�днальны кантакт \"%s\"? Г�та аперацы� "
 "так�ама выдаліць �го �кладовы� кантакты."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Выдаленне кантакта"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Выдаліць"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Чат"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "П_а�лаць SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Пап�р�дні� размовы"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Па�лаць файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Падз�ліцца до�тупам да �тала"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Упадабаны"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Зве�ткі"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Р�дагаваць"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1277
 msgid "Inviting you to this room"
 msgstr "Запрашаю ва� у г�ты пакой"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Запра�іць у пакой групавога чату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Дадаць кантакт..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ці вы �апраўды хочаце выдаліць групу \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Выдаленне групы"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Пера_назваць"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ISO-код краіны:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Краіна:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Штат:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Горад:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Край:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Паштовы інд�к�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Вуліца:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Будынак:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Паверх:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Офі�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Т�к�т:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "�пі�анне:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI-адра�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Ступень дакладна�ці:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Памылка:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Вертыкальна� памылка (у метрах):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Гарызантальна� памылка (у метрах):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Хутка�ць:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Кірунак:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Хутка�ць пад'ёму:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Ча� апошн�га абнаўленн�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Даўгата:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Шырата:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Вышын�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�цазнаходжанне"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y у %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "П�еўданім:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Ід�нтыфікатар:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2242,32 +1542,7 @@ msgstr "<b>Ме�цазнаходжанне</b> (дата)"
 msgid "Online from a phone or mobile device"
 msgstr "У �етцы, з т�лефона або мабільнага пры�та�аванн�"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "�ова� �етка"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Выберыце IRC-�етку"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "_�нул�ваць змены ў �пі�е �етак"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Выбраць"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "новы �ервер"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2277,11 +1552,11 @@ msgstr ""
 "кары�таюцца вашай �еткай. Калі вы хочаце выкары�таць г�ту магчыма�ць, "
 "праверце правільна�ць на�троек, пададзеных ніж�й."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Людзі паблізу"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2290,48 +1565,48 @@ msgstr ""
 "функцыю, выбраўшы <span style=\"italic\">Праўка → Конты</span> ў �пі�е "
 "кантактаў."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Журнал"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Паказаць"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Чат у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Чат з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2339,7 +1614,7 @@ msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунды"
 msgstr[2] "%s �екунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2347,80 +1622,80 @@ msgstr[0] "%s хвіліна"
 msgstr[1] "%s хвіліны"
 msgstr[2] "%s хвілін"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Званок прац�гваў�� %s, �кончаны ў %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Сённ�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Учора"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "За ўве�ь ча�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "У�е"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Калі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "У�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Т�к�тавы� чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Уваходны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Выхадны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Прапушчаны� званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Што"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ці вы �апраўды хочаце выдаліць у�е журналы мінулых размоў?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "�чы�ціць у�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Выдаліць дл�:"
 
@@ -2429,12 +1704,12 @@ msgid "_File"
 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-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Праўка"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Выдаліць у�е журналы размоў..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2442,7 +1717,7 @@ msgid "Profile"
 msgstr "Профіль"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1493 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Чат"
 
@@ -2456,113 +1731,117 @@ msgid "page 2"
 msgstr "�таронка 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Загрузка...</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Тып вашага конта дл� чату"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Ствар�нне новага конта"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Дадаць новы конт"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Упішыце ід�нтыфікатар кантакту або т�лефонны нумар:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Від�азванок"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_�ўды�званок"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "�овы званок"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Г�ты кантакт па-за �еткай"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Г�ты кантакт або хібны, або нев�домы"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Г�ты кантакт не падтрымлівае такога �по�абу размовы"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr ""
 "Дл� г�тага пратакола ад�утнічае р�алізацы� запатрабаванай функцы�нальна�ці"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "�е ўдало�� пачаць размову з азначаным кантактам"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Ва� забанілі на г�тым канале"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Г�ты канал перапоўнены"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Каб далучыцца да г�тага канала, тр�ба атрымаць запраш�нне"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "�емагчыма прац�гваць у адлучаным �тане"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "�дмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Узнікла памылка пры пачатку размовы"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "�ова� размова"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Патр�бны пароль"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Ула�нае паведамленне..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Р�дагаваць ула�ны� паведамленні..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "П�трыкніце, каб прыбраць у г�тага паведамленн� ўпадабана�ць"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "П�трыкніце, каб зрабіць г�та паведамленне ўпадабаным"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2572,25 +1851,16 @@ msgstr ""
 "<small><i>�аці�ніце Enter, каб зм�ніць паведамленне, або Esc, каб �ка�аваць "
 "�го.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Вызначыць �тан"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Ула�ны� паведамленні..."
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "�овы конт %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Улічваць р�гі�тр літар"
 
@@ -2614,167 +1884,167 @@ msgstr "_Улічваць р�гі�тр літар"
 msgid "Phrase not found"
 msgstr "Выраз не знойдзены"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "�трыманне імгненнага паведамленн�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Па�ылка імгненнага паведамленн�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Уваходна� прапанова чату"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Кантакт злучаны з �еткай"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Кантакт адлучаны ад �еткі"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Злуч�нне з �ерверам"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "�длуч�нне ад �ервера"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Уваходны гала�авы званок"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Выхадны гала�авы званок"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Гала�авы званок �кончаны"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Р�дагаванне ўла�ных паведамленн�ў"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Запыт на падпі�ку"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s про�іць дазволу на прагл�д вашага �еткавага �тану"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_�дмовіцца"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Прын�ць"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Паведамленне зменена ў %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Звычайны"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "�е ўдало�� праверыць ід�нтычна�ць, атрыманую ад чат-�ервера."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Сертыфікат не падпі�аны ц�нтрам �ертыфікацыі."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Сертыфікат �а�тар�ў."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Сертыфікат �шч� не актывізаваны."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Сертыфікат не мае чаканага адбітка."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "�азва камп'ютара, �кому выдалі г�ты �ертыфікат, не адпав�дае назве �ервера."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Сертыфікат ула�наручна падпі�аны."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Сертыфікат быў адкліканы ц�нтрам �ертыфікацыі."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Сертыфікат выкары�тоўвае �лабы шыфр."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Даўжын� �ертыфіката перавышае магчымы памер, �кі можна праверыць."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Сертыфікат мае дзіўны фармат."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Чакана� назва камп'ютара: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "�азва камп'ютара з �ертыфіката: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Прац�гнуць"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "�е вартае даверу злуч�нне"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Г�та злуч�нне не вартае даверу. У�ё роўна прац�гнуць прац�дуру?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Запомніць г�ты выбар дл� на�тупных злуч�нн�ў"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Падраб�зна�ці аб �ертыфікаце"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "�е ўдало�� адкрыць URI-адра�"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Выбар файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "�е �тае вольнай пра�торы дл� захаванн� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2783,225 +2053,54 @@ msgstr ""
 "Каб захаваць г�ты файл, патр�бна %s вольнай пра�торы, а да�тупна толькі %s. "
 "Выберыце іншае ме�ца дл� файла."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Уваходны файл ад %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Злучыце�� з �еткай, каб змагчы р�дагаваць а�абі�ты� зве�ткі."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>��абі�ты� падраб�зна�ці</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Скапіраваць адра� �па�ылкі"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_�дкрыць �па�ылку"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Да�ледаваць HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Дзейны� на�тройкі м��цова�ці"
-
-#: ../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 "�раб�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "�рм�н�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Балтый�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Кельцкі"
-
-#: ../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 "Ц�нтральнаеўрапей�кі"
-
-#: ../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 "Спрошчаны кітай�кі"
-
-#: ../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 "Традыцыйны кітай�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Харвацкі"
-
-#: ../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 "Кірыліца"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Кірыліца/Ру�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Кірыліца/Украін�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Грузін�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Гр�цкі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Гуджараці"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "Гурмукхі"
-
-#: ../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 "Іўрыт"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Іўрыт (бачны)"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Хіндзі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "І�ланд�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Япон�кі"
-
-#: ../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 "Кар�й�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Скандынаў�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Іран�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Румын�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Паўднёваеўрапей�кі"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Тай�кі"
-
-#: ../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 "Тур�цкі"
-
-#: ../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 "Унікод"
-
-#: ../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 "Заходні"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "В'етнам�кі"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Папул�рны� кантакты"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Людзі паблізу"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Без груп"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Сервер не знайшоў кантакт: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "��ма паведамленн� аб памылцы"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Імгненнае паведамленне (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3012,7 +2111,7 @@ msgstr ""
 "згодна з умовамі �гульнай Грамад�кай Ліц�нзіі GNU (GPL), апублікаванай "
 "Фондам �вабоднага апраграмаванн�, вер�іі 2 ці любой пазнейшай."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3023,7 +2122,7 @@ msgstr ""
 "гарантый, у тым ліку камерцыйнай варта�ці праграмы і наогул �е кары�ці. "
 "Падраб�зней гл�дзіце ў т�к�це �гульнай Грамад�кай Ліц�нзіі GNU (GPL)."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3034,83 +2133,83 @@ msgstr ""
 "апраграмаванн� на адра�: the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Інт�рн�т-камунікатар дл� GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "insomnia <defragbrain@gmail.com>\n"
 "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е паказваць ды�логавых акенцаў; выканаць працу (напрыклад, імпартаванне) і "
 "вый�ці"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е паказваць ды�логавых акенцаў, калі толькі не і�нуе іншых контаў акрам� "
 "\"Людзей паблізу\""
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спачатку вылучыць азначаны конт (напрыклад, \"gabble/jabber/"
 "foo_40example_2eorg0\")"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<ід�нтыфікатар-конта>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Конты Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Конты Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Ваш конт %s мае незахаваны� змены."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Ваш конт %.50s мае незахаваны� змены."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Ваш новы конт �шч� не захаваны."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Злуч�нне..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Па-за �еткай - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "�длучаны - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Па-за �еткай - ��ма �еткавага злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "�ев�домы �тан"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3120,28 +2219,28 @@ msgstr ""
 "�кі ўжо не падтрымліваецца. Каб перане�ці г�ты конт у новую вер�ію праграмы, "
 "у�талюйце пакунак telepathy-haze і перазапу�ціце �еан�."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Па-за �еткай - Конт выключаны"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Зм�ненне параметраў злуч�нн�"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr "_Зм�ніць параметры злуч�нн�..."
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Ці вы �апраўды хочаце выдаліць %s �а �вайго камп'ютара?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Ці вы �апраўды хочаце выдаліць %.50s �а �вайго камп'ютара?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Г�тае дзе�нне не выдаліць ваш конт на �ерверы."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3150,24 +2249,24 @@ msgstr ""
 "вашых змен. Ці вы �апраўды хочаце прац�гнуць прац�дуру?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Уключаны"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Пераназваць"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Прапу�ціць"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Злучыць"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3176,10 +2275,14 @@ msgstr ""
 "вашых змен. Ці вы �апраўды хочаце прац�гнуць прац�дуру?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Конты камунікатара і VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Дадаць..."
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "І_мпартаваць..."
@@ -3200,31 +2303,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Модулі дл� працы з пратаколамі не ў�тал�ваны�"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- ід�нтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Ід�нтыфікацыйны кліент Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "�е злучацца пры запу�ку"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е паказваць �пі� кантактаў ды іншы� акенцы пры запу�ку"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Інт�рн�т-камунікатар Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Памылка �ув�зі з кіраўніком контаў"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3236,7 +2339,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Ідзе званок"
 
@@ -3248,94 +2351,94 @@ msgstr "- �ўды�- і від�акліент Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "�ўды�- і від�акліент Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "Кантакт %s па�прабаваў пазваніць вам, але вы бралі ўдзел у іншай размове."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Уваходны званок"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Уваходны від�азванок ад %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Уваходны званок ад %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Скінуць"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "�дказаць"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Званок: %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "IP-адра�, �кі бачыць машына"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адра�, �кі бачыць �ервер у інт�рн�це"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адра� �уразмоўцы, бачны з іншага боку злуч�нн�"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "IP-адра� р�тран�л�тарнага �ервера"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "IP-адра� мультыка�т-групы"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "�ев�дома"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "У чаканні"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "�б�згучана"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Прац�гла�ць"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d хв"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Т�хнічны� падраб�зна�ці"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3344,7 +2447,7 @@ msgstr ""
 "�праграмаванне, �кім кары�таецца %s, не разумее ні аднаго з аўды�фарматаў, "
 "�кі� падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3353,7 +2456,7 @@ msgstr ""
 "�праграмаванне, �кім кары�таецца %s, не разумее ні аднаго з від�афарматаў, "
 "�кі� падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3362,25 +2465,25 @@ msgstr ""
 "�е ўдало�� ў�тал�ваць злуч�нне з %s. Відаць, хто�ьці з ва� далучаны да "
 "�еткі, �ка� не дазвал�е непа�р�днае злуч�нне."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "У �етцы ўзнікла памылка"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "�праграмаванне дл� аўды�фарматаў, патр�бных дл� аб�лугоўванн� г�тага званка, "
 "не ў�тал�вана на г�тым камп'ютары"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "�праграмаванне дл� від�афарматаў, патр�бных дл� аб�лугоўванн� г�тага званка, "
 "не ў�тал�вана на г�тым камп'ютары"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3391,32 +2494,32 @@ msgstr ""
 "\">паведаміце аб г�тай хібе ў праграме</a> і прычапіце журнальны вывад з "
 "акенца \"�дладка\" ў меню \"Дапамога\"."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "У рухавіку званкоў узнікла памылка"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Да��гнуты канец �трумен�"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "�е ўдало�� ра�пачаць аўды��трумен�ванне"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "�е ўдало�� ра�пачаць від�а�трумен�ванне"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Б�гучы балан�: %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вам не �тае грошай, каб выканаць г�ты званок."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Папоўніць"
 
@@ -3440,11 +2543,11 @@ msgstr "_�а�тройкі"
 msgid "_View"
 msgstr "_Від"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Дапамога"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Зме�т"
 
@@ -3532,19 +2635,19 @@ msgstr "М��цовы кандыдат:"
 msgid "Audio"
 msgstr "�ўды�"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Кліент чату Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "�азва"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Пакой"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "�ўтаматычнае злуч�нне"
 
@@ -3552,11 +2655,11 @@ msgstr "�ўтаматычнае злуч�нне"
 msgid "Manage Favorite Rooms"
 msgstr "Кіраванне �пі�ам упадабаных пако�ў дл� групавога чату"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Закрыць г�та акно?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3565,7 +2668,7 @@ msgstr ""
 "Закрыўшы г�та акно, вы выйдзеце з %s. Вы больш не будзеце атрымліваць новых "
 "паведамленн�ў да паўторнага ўваходу."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3583,12 +2686,12 @@ msgstr[2] ""
 "Закрыўшы г�та акно, вы выйдзеце з %u пако�ў. Вы больш не будзеце атрымліваць "
 "новых паведамленн�ў да паўторнага ўваходу."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Вый�ці з %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3596,15 +2699,15 @@ msgstr ""
 "Вы больш не будзеце атрымліваць новых паведамленн�ў з г�тага пако� да "
 "паўторнага ўваходу."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Закрыць акно"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Вый�ці з пако�"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:672 ../src/empathy-chat-window.c:695
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3612,7 +2715,7 @@ msgstr[0] "%s (%d непрачытана)"
 msgstr[1] "%s (%d непрачытана)"
 msgstr[2] "%s (%d непрачытана)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:687
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3620,7 +2723,7 @@ msgstr[0] "%s (і �шч� %u размова)"
 msgstr[1] "%s (і �шч� %u размовы)"
 msgstr[2] "%s (і �шч� %u размоў)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:703
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3628,7 +2731,7 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад іншÑ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад іншых)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад іншых)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:712
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3636,11 +2739,11 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад уÑ�Ñ–Ñ
 msgstr[1] "%s (%d непрачытаны� паведамленні ад у�іх)"
 msgstr[2] "%s (%d непрачытаных паведамленн�ў ад у�іх)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:949
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:957
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3648,7 +2751,7 @@ msgstr[0] "Па�ылка %d паведамленн�"
 msgstr[1] "Па�ылка %d паведамленн�ў"
 msgstr[2] "Па�ылка %d паведамленн�ў"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:977
 msgid "Typing a message."
 msgstr "Піша паведамленне."
 
@@ -3681,107 +2784,115 @@ msgid "Invite _Participant…"
 msgstr "_Запра�іць удзельнікаў..."
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Далучыцца да чату"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Вый�ці з чату"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Кантакт"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Карткі"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Да _пап�р�дн�й карткі"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Да _на�тупнай карткі"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_В�рнуць закрытую картку"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Па�унуць картку ў_лева"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Па�унуць картку ў_права"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_�дчапіць картку"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Паказаць канкр�тную �лужбу"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- �дладчык Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "�дладчык Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Захаваць"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Спа�ылка pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "�дказ pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "�адта шмат даных дл� адной у�таўкі. Заме�т г�тага захавайце журнал у файл."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "�кно адладкі"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Па�лаць �к pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Узровень "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "�дладка"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Інфармацы�"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Пап�р�джанне"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Крытычна� памылка"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Памылка"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3791,101 +2902,101 @@ msgid ""
 "when reporting it by displaying the advanced fields in the <a href=\"https://"
 "bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
 msgstr ""
-"�ават калі ў журнале не паказваюцца паролі, �ны ў�ё роўна могуць "
-"зм�шчаць �акр�тную інфармацыю, напрыклад, �пі� вашых кантактаў ці н�даўні� "
+"�ават калі ў журнале не паказваюцца паролі, �ны ў�ё роўна могуць зм�шчаць "
+"�акр�тную інфармацыю, напрыклад, �пі� вашых кантактаў ці н�даўні� "
 "паведамленні, �кі� вы атрымлівалі ці вы�ылалі.\n"
-"Калі вы не хочаце, каб така� інфармацы� трапіла ў за�ўленне пра хібу ў праграме, "
-"вы можаце вызначыць, каб хіба была бачна� толькі ра�працоўшчыкам Empathy. "
-"Г�та можна зрабіць, выбраўшы паказ адмы�ловых граф у <a href=\"https://"
-"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">за�ўленні</a>."
+"Калі вы не хочаце, каб така� інфармацы� трапіла ў за�ўленне пра хібу ў "
+"праграме, вы можаце вызначыць, каб хіба была бачна� толькі ра�працоўшчыкам "
+"Empathy. Г�та можна зрабіць, выбраўшы паказ адмы�ловых граф у <a href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">за�ўленні</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Ча�"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Дамен"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Кат�горы�"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Узровень"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Выбраны кіраўнік злуч�нн�ў не падтрымлівае пашыр�нне аддаленай адладкі."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Уваходны від�азванок"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s про�іць від�аразмовы. �дкажаце?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s·про�іць размовы. �дкажаце?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Скінуць"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_�дказаць"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_�дказаць з від�а"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Запраш�нне ў пакой дл� групавога чату"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Запраш�нне ў %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Удзельнік %s запрашае ва� далучыцца да %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
-msgstr "_Прын�ць запраш�нне"
+msgstr "_Далучыцца"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "Удзельнік %s запра�іў ва� у %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Ва� запра�ілі ў %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Уваходны файл ад %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Патр�бны пароль"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3895,105 +3006,105 @@ msgstr ""
 "Паведамленне: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�ев�дома"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s з %s, хутка�ць: %s/�"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Памылка атрыманн� \"%s\" ад %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Памылка атрыманн� файла"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Памылка па�ылкі \"%s\" да %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Памылка па�ылкі файла"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" па�ланы да %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Перадача файла закончана"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Чакаем адказу ад �уразмоўцы"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Праверка ц�ла�ці \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Падлік х�шу \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "За�тало��"
 
@@ -4006,11 +3117,11 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Вычы�ціць закончаны�, �ка�аваны� і н�ўдалы� перадачы файлаў з г�тага �пі�а"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "І_мпартаваць"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4018,49 +3129,49 @@ msgstr ""
 "�е ўдало�� адшукаць конты дл� імпартаванн�. Empathy пакуль падтрымлівае "
 "імпартаванне толькі дл� праграмы Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Імпартаванне контаў"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Імпартаванне"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Крыніца"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Запра�іць удзельніка"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Выберыце кантакт, каб запра�іць �го да размовы:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Запра�іць"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Пакой дл� чату"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Удзельнікі"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "�е ўдало�� атрымаць �пі� пако�ў"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4073,17 +3184,17 @@ msgstr ""
 "Патрабуецца пароль: %s\n"
 "Удзельнікі: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Так"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Увай�ці ў пакой"
 
@@ -4126,108 +3237,108 @@ msgstr "�е ўдало�� загрузіць �пі� пако�ў"
 msgid "Room List"
 msgstr "Спі� пако�ў"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "�дказаць"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "�дказаць з від�а"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "�дмовіцца"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Прын�ць"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "�трыманне паведамленн�"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Па�ылка паведамленн�"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "�ова� размова"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Уваход кантакту ў �етку"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Выхад кантакту з �еткі"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Злуч�нне конта"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "�длуч�нне конта"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Мары��"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Грышка"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "�х, Грышка, н�добры! Як ты �палохаў м�не, гневаю�� не жартам!.."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Гневаеш��? ��праўда! � чаму ж ты на м�не так міленька пазіраеш?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "Выбачай, − чуць золак, � з'ездзіў ужо да ме�та, кінуў�� ў ногі а���ару і "
 "пра�іў, каб ён уз�ў на� пад �ваю апеку."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Удзельнік Мары�� ц�пер па-за �еткай"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "�а�тройкі"
 
@@ -4239,7 +3350,7 @@ msgstr "Паказваць групы"
 msgid "Show account balances"
 msgstr "Паказваць грашовы балан� контаў"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Спі� кантактаў"
 
@@ -4362,58 +3473,42 @@ msgstr "Па_гаршаць дакладнаÑ�ць меÑ�цазнаходжанÐ
 msgid "Privacy"
 msgstr "Прыватна�ць"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Мабільны т�лефон"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Сетка (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Крыніцы даных аб ме�цазнаходжанні:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Спі� моў паказвае толькі мовы, дл� �кіх вы маеце ў�тал�ваны� �лоўнікі."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Прав�раць арфаграфію дл� на�тупных моў:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Праверка арфаграфіі"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "_Матыў аздабленн� чату:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Вары�нт:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Матывы"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "�длучыцца"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Каб убачыць кантакты, тр�ба на�троіць конт."
 
 #: ../src/empathy-roster-window.c:569
@@ -4427,6 +3522,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4442,7 +3541,7 @@ msgid "Online Accounts"
 msgstr "Сеціўны� конты"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "�бнавіць апраграмаванне..."
 
 #: ../src/empathy-roster-window.c:753
@@ -4488,11 +3587,13 @@ msgid "No online contacts"
 msgstr "��ма кантактаў у �етцы"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_�ова� размова..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "�овы _званок..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4500,11 +3601,11 @@ msgid "Contacts"
 msgstr "Кантакты"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
+msgid "_Add Contacts…"
 msgstr "_Дадаць кантакты..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Пошук кантактаў..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4516,8 +3617,8 @@ msgid "_Rooms"
 msgstr "Пак_оі"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Прын�ць запраш�нне..."
+msgid "_Join…"
+msgstr "_Далучыцца..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4564,28 +3665,16 @@ msgstr "_Далучыцца да �еткі"
 msgid "Show _Offline Contacts"
 msgstr "Паказваць па_за�еткавы� кантакты"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Дадаць кантакт..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_�ова� размова..."
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "�овы _званок..."
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Зроблена"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Ув�дзіце падраб�зны� даны� аб вашым конце"
 
@@ -4597,4 +3686,3 @@ msgstr "Зм�ніць опцыі конта %s"
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 msgid "Integrate your IM accounts"
 msgstr "Інт�граваны Інт�рн�т-камунікатар дл� ў�іх вашых контаў"
-
diff --git a/po/cs.po b/po/cs.po
index c9449130b..57ffe1b97 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -12,24 +12,24 @@
 # Jiri Eischmann <jiri@eischmann.cz>, 2010.
 # Pavel Šefránek <pavel@sefranek2.cz>, 2011.
 # Petr Kovar <pknbe@volny.cz>, 2008, 2009, 2010, 2011.
-# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012.
 # Adam Matoušek <adamatousek@gmail.com>, 2013.
+# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012, 2013.
 #
 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: 2013-01-09 14:05+0000\n"
-"PO-Revision-Date: 2013-02-21 22:24+0100\n"
-"Last-Translator: Adam Matoušek <adamatousek@gmail.com>\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-05 13:06+0200\n"
+"Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -49,7 +49,8 @@ msgstr "Diskutovat na serverech Google Talk, Facebook, MSN a mnoha dalších"
 
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
-msgstr "chat;diskuse;pokec;im;rychlé zprávy;zpráva;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;diskuse;pokec;im;rychlé zprávy;zpráva;irc;voip;gtalk;facebook;jabber;"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
@@ -132,11 +133,11 @@ msgstr "Skrýt hlavní okno."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
-msgstr "Výchozí adresář pro výběr obrázku avataru"
+msgstr "Výchozí složka pro výběr obrázku avataru"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
-msgstr "Poslední adresář, ze kterého byl vybrán obrázek avataru."
+msgstr "Poslední složka, ze kterého byl vybrán obrázek avataru."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
@@ -473,34 +474,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Jestli může Empathy zveřejňovat kontaktům vaši polohu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy se může pokusit ur�it vaši polohu pomocí sítě"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Zda může Empathy použít sít k ur�ení polohy."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy se může pokusit ur�it vaši polohu pomocí mobilní sítě"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Jestli může Empathy použít mobilní síť k ur�ení polohy."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy se může pokusit ur�it vaši polohu pomocí GPS"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Jestli může Empathy používat GPS k ur�ení polohy."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Přesnost plohy by měla být omezena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -530,7 +507,7 @@ msgstr "Chyba při pokusu o odeslání souboru"
 msgid "The other participant is unable to transfer the file"
 msgstr "Protistrana není schopna přenosu souborů"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -550,221 +527,155 @@ msgstr "Vybraný soubor není běžným souborem"
 msgid "The selected file is empty"
 msgstr "Vybraný soubor je prázdný"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Heslo nenalezeno"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Heslo ú�tu rychlé komunikace pro %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Heslo pro diskuzní místnost „%s“ u ú�tu %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zmeškaný hovor od kontaktu %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Hovor s kontaktem %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Příchozí hovor od kontaktu %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "před %d sekundou"
-msgstr[1] "před %d sekundami"
-msgstr[2] "před %d sekundami"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "před minutou"
-msgstr[1] "před %d minutami"
-msgstr[2] "před %d minutami"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "před hodinou"
-msgstr[1] "před %d hodinami"
-msgstr[2] "před %d hodinami"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "v�era"
-msgstr[1] "před %d dny"
-msgstr[2] "před %d dny"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "před týdnem"
-msgstr[1] "před %d týdny"
-msgstr[2] "před %d týdny"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "před měsícem"
-msgstr[1] "před %d měsíci"
-msgstr[2] "před %d měsíci"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "v budoucnosti"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Nepřítomen"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Skrytý"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Odpojen"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Neudán žádný důvod"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Stav nastaven na „Odhlášen“"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Chyba sítě"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Jméno používáno"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Certifikát nebyl poskytnut"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certifikát není aktivován"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Certifikát názvu po�íta�e nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikát otisku prstu nesouhlasí"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certifikát je podepsán sám sebou"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Spojení nemohlo být navázáno"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Tento ú�et je již připojen k serveru"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Spojení bylo nahrazeno novým spojením, které používá stejný zdroj"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Takový ú�et již na serveru existuje"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je právě příliš zaneprázdněn na to, aby obsloužil spojení"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používá nepříliš bezpe�ný šifrovací algoritmus nebo je z "
 "kryptografického hlediska slabý"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -772,589 +683,33 @@ msgstr ""
 "Délka certifikátu serveru nebo délka zřetězených certifikátů serveru "
 "přesáhla omezení dané kryptografickou knihovnou"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Váš software je příliš zastaralý"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Interní chyba"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Lidé v okolí"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook Chat"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Všechny ú�ty"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Heslo"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "Zobrazené jmé_no"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Například:</b> MojeZobrazovanéJméno"
-
-#. 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 "Zapamatovat heslo"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Pokro�ilé"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Jaké je vaše zobrazované jméno v AIM?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Jaké je vaše heslo k 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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Zapamatovat heslo"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Ú�et"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Heslo"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Port"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Uživatelské jméno:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Použít"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Přip_ojit"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Takový ú�et již existuje"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Vytvořit nový ú�et na serveru"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Ú�et služby %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nový ú�et"
-
-#: ../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 "Přihlašovací 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>Například:</b> uzivatelskejmeno"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Jaké je vaše uživatelské GroupWise ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Jaké je vaše heslo ke GroupWise?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN"
-msgstr "Čí_slo ICQ"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Například:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Zn_aková sada"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Jaké je váš UIN pro ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Jaké je vaše heslo k ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Síť"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Znaková sada"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Přidat…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Odstranit"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Nahoru"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Dolů"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Servery"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Většina serverů IRC heslo nepotřebuje, takže pokud si nejste jisti, žádné "
-"heslo nezadávejte."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Přezdívka"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Rozlou�ení"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Skute�né jméno"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Uživatelské jméno"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Kterou síť IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Jaká je vaše přezdívka v IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Jaké je vaše uživatelské jméno pro 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 ""
-"Toto je vaše uživatelské jméno, ne váš email pro přihlášení k Facebooku.\n"
-"Pokud jste na Facebooku jako facebook.com/<b>tonda</b>, zadejte <b>tonda</"
-"b>.\n"
-"Použijte <a href=\"http://www.facebook.com/username/\">tento odkaz</a> pro "
-"výběr uživatelského jména, pokud žádné ještě nemáte."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Jaké je vaše heslo k Facebooku?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Jaké je vaše Google ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Například:</b> uzivatel@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Jaké je vaše heslo pro Google?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Například:</b> uzivatel@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorovat chyby certifikátu SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Priori_ta"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "Z_droj"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Požadováno ši_frování (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Přepsat nastavení serveru"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Použít staré SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Jaké je vaše Jabber ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Jaké Jabber ID chcete?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Jaké je vaše heslo ke službě Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Jaké chcete heslo pro Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Přezdív_ka"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_Příjmení"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Jméno"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "Z_veřejněné jméno"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID"
-msgstr "ID _Jabberu"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "E-_mailová adresa"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Například:</b> uzivatel@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Jaké je ID pro Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Jaké je vaše heslo k Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Automaticky"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Zaregistrovat"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Volby"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Žádný"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Uživatelské jméno"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Například:</b> uzivatel@muj.sip.server"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Používat tento ú�et pro volání na pevné _linky a mobilní telefony"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Volby NAT průchodů"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Nastavení proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Růžné volby"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Server STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Automaticky najít server STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Vyhledat vázání"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Volby (udržovat spojení)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mechanismus"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Interval (v sekundách)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Uživatelské jméno pro ověření"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Přenos"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Volné směrování"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Nedbat chyb TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Místní adresa IP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Jaké je vaše přihlašovací ID pro SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Jaké je heslo k vašemu ú�tu SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Heslo:"
-
-#: ../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_gnorovat pozvání do konferencí a diskuzních místností"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Ná_rodní prostředí seznamu místností:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Zn_aková sada:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Jaké je vaše Yahoo! ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Jaké je vaše heslo k Yahoo?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Nelze konvertovat obrázek"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Váš systém neobsahuje žádný z podporovaných formátů obrázku"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Nelze uložit obrázek do souboru"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Vyberte si obrázek avataru"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Vyfotografovat…"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Žádný obrázek"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Obrázky"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "VÅ¡echny soubory"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Kliknutím zvětšíte"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Autentizace selhala pro ú�et <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Opakovat"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1364,72 +719,69 @@ msgstr ""
 "Zadejte své heslo pro ú�et\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Vybrat…"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Vybrat"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Zapamatovat heslo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Nepodařilo se navázat spojení"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Tento kontakt nepodporuje volání"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Vybraný kontakt je odpojen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Vybraný kontakt není platný"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Tento protokol nepodporuje tísňová volání"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Nemáte dostate�ný kredit k provedení tohoto volání"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Nepovedlo se otevřít soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Tato konverzace toto téma nepodporuje"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Nemáte oprávnění potřebná pro změnu tématu"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Neplatné ID kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: vymazat všechny zprávy z této konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: nastavit téma aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID místnosti>: vstoupit do nové místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1437,23 +789,23 @@ msgstr ""
 "/part [<ID místnosti>] [<důvod>]: opustit místnost, bez udání tu právě "
 "aktuální"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID kontaktu> [<zpráva>]: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID kontaktu> <zpráva>: otevřít novou soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <přezdívka>: změnit svoji přezdívku na aktuálním serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <zpráva>: zaslat zprávu AKCE do aktuální konverzace"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../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 "
@@ -1463,11 +815,11 @@ msgstr ""
 "posílání zpráv za�ínajících s „/“. Například: „/say /join je použito pro "
 "připojení do místnosti“"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID kontaktu>: zobrazit informace o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1475,126 +827,126 @@ msgstr ""
 "/help [<příkaz>]: vypsat seznam podporovaných příkazů. Pokud je zadán "
 "<příkaz>, vypsat jeho použití."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Použití: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznámý příkaz, pro výpis dostupných příkazů použijte /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "Nemáte dostate�ný kredit k poslání zprávy"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba při odesílání zprávy „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba při odesílání zprávy: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "nedostate�ný zůstatek k zaslání zprávy. <a href='%s'>Dobít.</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "není k dispozici"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "příliš dlouhá zpráva"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "neimplementováno"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Nastavit téma na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Téma nastavil %s na: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Nestanoveno žádné téma"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Žádné návrhy)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Přidat „%s“ do slovníku"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Přidat „%s“ do slovníku %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Vložit smajlíka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Odeslat"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Návrhy pravopi_sných oprav"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Nepovedlo se získat záznam nedávné historie"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se odpojil"
@@ -1602,12 +954,12 @@ msgstr "%s se odpojil"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s byl vyhozen uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s byl vyhozen"
@@ -1615,17 +967,17 @@ msgstr "%s byl vyhozen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s byl zakázán uživatelem %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s byl zakázán"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s opustil místnost"
@@ -1635,17 +987,17 @@ msgstr "%s opustil místnost"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s se připojil do místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je te� znám jako %s"
@@ -1653,50 +1005,50 @@ msgstr "%s je te� znám jako %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Odpojen"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Přejete si uchovat toto heslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Nyní ne"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Špatné heslo, zkuste to prosím znovu:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Tato místnost je chráněna heslem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Připojit"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Připojen"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Konverzace"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1727,8 +1079,8 @@ msgstr "Upravit blokované kontakty"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1738,120 +1090,63 @@ msgstr "Ú�et:"
 msgid "Blocked Contacts"
 msgstr "Blokované kontakty"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Celé jméno"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefonní �íslo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "E-mailová adresa"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Webové stránky"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Narozeniny"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Naposledy spatřen:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Server:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Připojen z:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Zpráva v nepřítomnosti:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "pracovní"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "domů"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobilní"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "hlasový"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "upřednostňovaný"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "poštovní"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "doru�ovací"
+#: ../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 "Odstranit"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Hledat kontakty"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Hledat: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "Přid_at kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nenalezen žádný kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "U tohoto ú�tu není hledání kontaktu podporováno"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Vaše zpráva, kterou se představujete:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Dejte mi prosím vědět, až budete připojen. Děkuji!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Uložit avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Nelze uložit avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Ú�et"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifikátor"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Přezdívka"
 
@@ -1885,11 +1180,11 @@ msgstr "Verze"
 msgid "Client"
 msgstr "Klient"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Skupiny"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1897,77 +1192,77 @@ msgstr ""
 "Vyberte skupiny, do kterých má kontakt patřit. Můžete vybrat více než jednu "
 "skupinu, ale také nevybrat žádnou skupinu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Přidat skupinu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Blokovat %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Opravdu chcete blokovat „%s“, aby vás znovu nekontaktoval?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Následující identita bude blokována:"
 msgstr[1] "Následující identity budou blokovány:"
 msgstr[2] "Následující identity budou blokovány:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Následující identitu nelze blokovat:"
 msgstr[1] "Následující identity nelze blokovat:"
 msgstr[2] "Následující identity nelze blokovat:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokovat"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Na_hlásit tento kontakt jako obtěžující"
 msgstr[1] "Na_hlásit tyto kontakty jako obtěžující"
 msgstr[2] "Na_hlásit tyto kontakty jako obtěžující"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Upravit informace o kontaktu"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Pospojované kontakty"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "Kontakty Gnome (gnome-contacts) nejsou nainstalovány"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Nainstalujte si prosím aplikaci Kontakty Gnome (gnome-contacts), abyste měli "
@@ -1976,47 +1271,52 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Výběr ú�tu pro umístění volání"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Hovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobilní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Pracovní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Soukromý"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blokovat kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Odebrat ze _skupiny „%s“"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Smazat a _blokovat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Opravdu chcete odstranit kontakt „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2025,218 +1325,219 @@ msgstr ""
 "Opravdu chcete odstranit pospojovaný kontakt „%s“? Uvědomte si, že tím se "
 "odstraní všechny kontakty, které tento pospojovaný kontakt tvoří."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Kontakt se odstraňuje"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Odstranit"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Diskuze"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiohovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Předchozí konverzace"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Odeslat soubor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Sdílet moji plochu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Oblíbený"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_mace"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upravit"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Pozvání do místnosti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "Pozvat do diskuzní místnost_i"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Přidat kontakt…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Opravdu chcete odstranit skupinu „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Skupina  se odstraňuje"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Kód země ISO:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "ZemÄ›:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Město:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Ulice:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Budova:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Podlaží:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Popis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Úroveň přesnosti:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Vertikální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Horizontální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Azimut:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Rychlost stoupání:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Poslední aktualizace:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Zeměpisná délka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Zeměpisná šířka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Nadmořská výška:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Poloha"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y v %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2252,32 +1553,7 @@ msgstr "<b>Poloha</b> (dne)\t"
 msgid "Online from a phone or mobile device"
 msgstr "On-line z telefonu nebo mobilního zařízení"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Nová síť"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Výběr sítě IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Vymazat sez_nam sítí"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Vybrat"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nový server"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2288,11 +1564,11 @@ msgstr ""
 "uvedené údaje jsou správné. Kdykoliv později to můžete snadno změnit nebo "
 "tuto funkci vypnout v dialogovém okně ú�tů."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Lidé v okolí"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2300,48 +1576,48 @@ msgstr ""
 "Tyto údaje můžete změnit později nebo tuto funkci zakázat pomocí <span style="
 "\"italic\">Upravit → Ú�ty</span> v seznamu kontaktů."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Historie"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Hledat"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Konverzace v místnosti %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Konverzace s kontaktem %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2349,7 +1625,7 @@ msgstr[0] "%s sekunda"
 msgstr[1] "%s sekundy"
 msgstr[2] "%s sekund"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2357,80 +1633,80 @@ msgstr[0] "%s minuta"
 msgstr[1] "%s minuty"
 msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hovor trval %s, skon�il %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "V�era"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Kdykoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Kdokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kdy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Cokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Příchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Odchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Opravdu chcete vymazat všechny předchozí konverzace?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Vymazat vše"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Smazat z:"
 
@@ -2439,20 +1715,20 @@ msgid "_File"
 msgstr "_Soubor"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Upravit"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Vymazat historii"
+msgid "Delete All History…"
+msgstr "Vymazat celou historii…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Diskuze"
 
@@ -2466,112 +1742,116 @@ msgid "page 2"
 msgstr "strana 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Na�ítá se…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Jaký typ ú�tu chcete vytvořit?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Přidávání nového ú�tu"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Přidání nového ú�tu"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Zadejte identifikátor kontaktu nebo telefonní �íslo:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Videohovor"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Hl_asový hovor"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nový hovor"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontakt je odpojen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Vybraný kontakt bu� není platný nebo je neznámý"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakt nepodporuje tento druh konverzace"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Požadovaná funkcionalita není pro tento protokol implementována"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Nelze za�ít konverzaci s daným kontaktem"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Na tomto kanálu máte zákaz"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Tento kanál je plný"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Abyste se mohl připojit k tomuto kanálu, musíte mít pozvání"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Nelze pokra�ovat bez připojení"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Při spouštění konverzace došlo k chybě"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nová konverzace"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Požadováno heslo"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Vlastní zpráva…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Upravit vlastní zprávy…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknutím odstraníte stav z oblíbených"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Kliknutím přidáte stav do oblíbených"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2581,25 +1861,16 @@ msgstr ""
 "<small><i>Zmá�knutím Enter nastavte novou zprávu nebo zmá�knutím Esc zrušte."
 "</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Nastavit stav"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Vlastní zprávy…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nový ú�et %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "Rozlišovat velikost _znaků"
 
@@ -2623,166 +1894,166 @@ msgstr "Rozlišovat v_elikost písmen"
 msgid "Phrase not found"
 msgstr "Fráze nenalezena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Přijata rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Odeslána rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Příchozí žádost o diskuzi"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontakt je připojen"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Připojeno k serveru"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Odpojeno od serveru"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Příchozí hovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Odchozí hovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Hovor ukon�en"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Upravit vlastní zprávy"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Požadavek na přihlášení"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s by chtěl oprávnění vidět, když jste dostupný"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "O_dmítnout"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Přijmout"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Zpráva upravena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normální"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identitu poskytovanou tímto diskuzním serverem nelze prověřit."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Certifikát není podepsán certifika�ní autoritou."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Platnost certifikátu vypršela."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Certifikát zatím nebyl aktivován."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Certifikát nemá o�ekávaný otisk."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Název po�íta�e ověřený certifikátem neodpovídá názvu serveru."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Certifikát je podepsán sám sebou."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Certifikát byl odvolán vydávající certifika�ní autoritou."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Certifikát je z kryptografického hlediska slabý."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Délka certifikátu překra�uje prověřitelnou velikost."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Certifikát je poškozený."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "O�ekávaný název po�íta�e: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Název po�íta�e v certifikátu: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "P_okra�ovat"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nedůvěryhodné připojení"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Toto spojení je nedůvěryhodné. Přejete si pokra�ovat dále?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Zapamatovat tuto volbu pro budoucí připojení"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Podrobnosti certifikátu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Nelze otevřít URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Vybrat soubor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Nedostatek volného místa pro uložení souboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2791,225 +2062,54 @@ msgstr ""
 "Pro uložení tohoto souboru je zapotřebí %s volného místa, ale k dispozici je "
 "jen %s. Zvolte prosím jiné umístění."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Příchozí soubor od %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Připojte se, abyste mohli upravovat své osobní údaje."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Osobní údaje</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Kopírovat adresu odkazu"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Otevřít odkaz"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Prozkoumat HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Aktuální národní prostředí"
-
-#: ../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 "arabské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "arménské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "baltské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "keltské"
-
-#: ../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 "středoevropské"
-
-#: ../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 "�ínské – zjednodušené"
-
-#: ../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 "�ínské – tradi�ní"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "chorvatské"
-
-#: ../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 "cyrilice"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "cyrilice – ruská"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "cyrilice – ukrajinská"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "gruzínské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "řecké"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "gudžarátské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "gurmuchské"
-
-#: ../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 "hebrejské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "hebrejské – vizuální"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "hindské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "islandské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "japonské"
-
-#: ../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 "korejské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "skandinávské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "perské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "rumunské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "jihoevropské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "thajské"
-
-#: ../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 "turecké"
-
-#: ../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 "západní"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "vietnamské"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Nejdůležitější kontakty"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Lidé v okolí"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Neseskupeno"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Server nemůže nalézt kontakt: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Není dostupné chybové hlášení"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Rychlá zpráva (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3020,7 +2120,7 @@ msgstr ""
 "ustanovení GNU General Public License vydané Free Software Foundation; bu� "
 "verze 2 této licence nebo (dle vlastního uvážení) kterékoliv pozdější verze."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3031,7 +2131,7 @@ msgstr ""
 "neposkytují se ani odvozené záruky PRODEJNOSTI anebo VHODNOSTI PRO URČIT� "
 "ÚČEL. Další podrobnosti hledejte v GNU General Public License."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3041,11 +2141,11 @@ msgstr ""
 "Empathy; pokud se tak nestalo, napište si o ni Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Klient rychlého zasílání zpráv pro pracovní prostředí GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Miloslav Trma� <mitr@volny.cz>\n"
@@ -3058,71 +2158,71 @@ msgstr ""
 "Jiri Eischmann <jiri@eischmann.cz>\n"
 "Marek Černocký <marek@manet.cz>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Nezobrazovat žádné dialogy; jednoduše provést úlohu (např. import) a skon�it"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Nezobrazovat žádná dialogová okna, existují-li ú�ty jiného typu než „Lidé v "
 "okolí“"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Ze za�átku vybrat zadaný ú�et (např. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<ID ú�tu>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "– Ú�ty Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Ú�ty Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "V ú�tu %s máte neuložené změny."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "V ú�tu %.50s máte neuložené změny."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Váš nový ú�et ještě není uložen."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Probíhá připojování…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Offline — Není k dispozici síť"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3132,28 +2232,28 @@ msgstr ""
 "�ásti. Nainstalujte prosím telepathy-haze a restartujte své sezení, ú�et se "
 "převede."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Offline — Ú�et zakázán"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Úprava parametrů připojení"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "Upravit param_etry připojení…"
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "Upravit parametry připoj_ení…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Opravdu chcete odstranit z vašeho po�íta�e „%s“?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Opravdu chcete odstranit „%.50s“ z vašeho po�íta�e?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Toto neodstraní váš ú�et na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3162,24 +2262,24 @@ msgstr ""
 "provedené změny. Jste si jisti, že chcete pokra�ovat?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Povolit"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "Pře_sko�it"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Připojit"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3188,10 +2288,14 @@ msgstr ""
 "provedené změny. Jste si jisti, že chcete pokra�ovat?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Ú�ty IM a VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Přidat…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Import…"
@@ -3212,31 +2316,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Pro tento protokol není nainstalována žádná výkonná �ást"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "– klient Empathy pro ověření totožnosti"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Klient Empathy pro ověření totožnosti"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Nepřipojovat se po spuštění"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Nezobrazovat seznam kontaktů nebo žádné jiné dialogy po spuštění"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "– komunikátor Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Chyba při kontaktování správce ú�tu"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3249,7 +2353,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Probíhá hovor"
 
@@ -3261,93 +2365,93 @@ msgstr "– audio/videoklient Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/videoklient Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s vám právě zkouší volat, ale vy máte jiný hovor."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Příchozí videohovor od %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Příchozí hovor od %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Odmítnout"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Zvednout"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Adresa IP, jak ji vidí po�íta�"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adresa IP, jak ji vidí server v Internetu"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adresa IP vzájemného spojení, jak ji vidí druhá strana"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Adresa IP přenosového serveru"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Adresa IP vysílací skupiny"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Čeká na lince"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Ztišit"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Doba"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3356,7 +2460,7 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů zvuku, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3365,7 +2469,7 @@ msgstr ""
 "Software používaný kontaktem „%s“ nerozumí žádnému z formátů videa, který je "
 "podporován na vašem po�íta�i"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3374,25 +2478,25 @@ msgstr ""
 "Nelze navázat spojení s %s. Někdo z vás není nejspíš v síti, která podporuje "
 "přímá spojení."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Někde na síti došlo k selhání"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Nemáte nainstalovánu podporu žádného z formátů zvuku potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Nemáte nainstalovánu podporu žádného z formátů videa potřebného pro tento "
 "hovor"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3403,32 +2507,32 @@ msgstr ""
 "prosím tuto chybu</a> a přiložte chybové zprávy získané z odla�ovacího okna "
 "v nabídce „Nápověda“."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Selhala funkce pro volání"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Byl dosažen konec proudu"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Nelze navázat spojení pro přenos zvuku"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Nelze navázat spojení pro přenos obrazu"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Váš aktuální zůstatek je %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Pro toto volání nemáte bohužel dostate�ný kredit."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Dobití kreditu"
 
@@ -3452,11 +2556,11 @@ msgstr "Na_stavení"
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Obsah"
 
@@ -3544,19 +2648,19 @@ msgstr "Místní ú�astník:"
 msgid "Audio"
 msgstr "Zvuk"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "– komunika�ní klient Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Místnost"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Automaticky připojit"
 
@@ -3564,11 +2668,11 @@ msgstr "Automaticky připojit"
 msgid "Manage Favorite Rooms"
 msgstr "Spravovat oblíbené místnosti"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Zavřít toto okno?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3577,7 +2681,7 @@ msgstr ""
 "Zavřením tohoto okna opustíte „%s“. Nebudete již přijímat žádné nové zprávy, "
 "dokud se znovu nepřipojíte."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3595,12 +2699,12 @@ msgstr[2] ""
 "Zavřením tohoto okna opustíte %u diskuzních místností. Nebudete již přijímat "
 "žádné nové zprávy, dokud se znovu nepřipojíte."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Opustit místnost %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3608,15 +2712,15 @@ msgstr ""
 "Nebudete již přijímat žádné nové zprávy z této diskuzní místnosti, dokud se "
 "znovu nepřipojíte."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Opustit místnost"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3624,7 +2728,7 @@ msgstr[0] "%s (%d nepře�tena)"
 msgstr[1] "%s (%d nepře�tené)"
 msgstr[2] "%s (%d nepře�tených)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3632,7 +2736,7 @@ msgstr[0] "%s (a %u další)"
 msgstr[1] "%s (a %u další)"
 msgstr[2] "%s (a %u dalších)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3640,7 +2744,7 @@ msgstr[0] "%s (%d nepře�tená od ostatních)"
 msgstr[1] "%s (%d nepře�tené od ostatních)"
 msgstr[2] "%s (%d nepře�tených od ostatních)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3648,11 +2752,11 @@ msgstr[0] "%s (%d nepře�tená ode všech)"
 msgstr[1] "%s (%d nepře�tené ode všech)"
 msgstr[2] "%s (%d nepře�tených ode všech)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3660,7 +2764,7 @@ msgstr[0] "Odesílá se zpráva"
 msgstr[1] "Odesílají se %d zprávy"
 msgstr[2] "Odesílá se %d zpráv"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Píše zprávu."
 
@@ -3693,107 +2797,115 @@ msgid "Invite _Participant…"
 msgstr "_Pozvat ú�astníka…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "Připo_jit k diskuzi"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Opustit diskuzi"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "K_ontakt"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Karty"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Předchozí karta"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Následující karta"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Znovu otevřít zavřenou záložku"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Posunout kartu do_leva"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Posunout kartu do_prava"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Oddělit kartu"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Zobrazit konkrétní službu"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "– Ladění Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Ladění Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Uložit"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Odkaz na Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Odpově� z Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Data jsou příliš rozsáhlá na jediné vložení. Uložte prosím záznam do souboru."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Ladící okno"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Odeslat na Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Úroveň "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Ladění"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informace"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Varování"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kritické"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3810,92 +2922,92 @@ msgstr ""
 "pokro�ilých polí při podávání <a href=\"https://bugzilla.gnome.org/enter_bug."
 "cgi?product=empathy\">hlášení o chybě</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Doména"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "Vybraný správce připojení nepodporuje rozšíření pro vzdálené ladění."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Příchozí videohovor"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "O_dmítnout"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Zvednout"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Videohovor"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Pozvání do místnosti"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozvánka na připojení %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vás zve do %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "Připo_jit"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vás pozval do %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Byli jste pozváni do %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Příchozí přenos souboru od %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Požadováno heslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3905,105 +3017,105 @@ msgstr ""
 "Zpráva: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s při %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Stahování „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Odesílání „%s“ kontaktu %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Nastala chyba při stahování „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Chyba při přijímání souboru"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Chyba při odesílání „%s“ kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Chyba při odesílání souboru"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ obdrženo od kontaktu %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ odeslán kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Přenos souboru byl dokon�en"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Čeká se na odpově� ostatních ú�astníků"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Ověřuje se neporušenost „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Vytváří se kontrolní sou�et „%s“"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Zbývá"
 
@@ -4015,11 +3127,11 @@ msgstr "Přenosy souborů"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Odstranit ze seznamu dokon�ené, zrušené a nepovedené přenosy"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importovat"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4027,49 +3139,49 @@ msgstr ""
 "Nenalezeny žádné ú�ty, které by bylo možno importovat. V sou�asnosti "
 "podporuje aplikace Empathy import ú�tů pouze z klienta Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Import ú�tů"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Přizvat ú�astníka"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Zvolte kontakt, který chcete přizvat do konverzace: "
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Pozvat"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Diskuzní místnost"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Členové"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Nepovedlo se získat seznam místností"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4082,17 +3194,17 @@ msgstr ""
 "Je vyžadováno heslo: %s\n"
 "Členové: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Ano"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Vstoupit do místnosti"
 
@@ -4135,104 +3247,104 @@ msgstr "Nelze na�íst seznam místností"
 msgid "Room List"
 msgstr "Seznam místností"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Odpovědět"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Videohovor"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Odmítnout"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Přijmout"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Poskytnout"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nová konverzace"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontakt se připojil"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontakt se odpojil"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Ú�et připojen"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Ú�et odpojen"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Jazyk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ach Romeo, Romeo! Pro� jsi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Své jméno zapři, odřekni se otce,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "anebo, nechceš-li, zasvěť se mně,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "a přestanu být Kapuletová."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Mám ještě poslouchat? Či odpovím?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Julie se odpojila"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -4244,7 +3356,7 @@ msgstr "Zobrazovat skupiny"
 msgid "Show account balances"
 msgstr "Zobrazovat zůstatek ú�tu"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
@@ -4367,60 +3479,44 @@ msgstr "O_mezit přesnost polohy"
 msgid "Privacy"
 msgstr "Soukromí"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Mobil"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Síť (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Zdroje polohy:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Seznam jazyků obsahuje pouze jazyky, pro které máte nainstalovány slovníky."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Povolit kontrolu pravopisu pro jazyky:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Kontrola pravopisu"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Vzhl_ed diskuze:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Varianta:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Motivy"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Poskytnout heslo"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Odpojit"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
-msgstr "Abyste zde viděli kontakty, je nejdříve zapotřebí nastavit ú�et."
+msgid "You need to set up an account to see contacts here."
+msgstr "Abyste zde viděli kontakty, je nejdříve potřeba nastavit ú�et."
 
 #: ../src/empathy-roster-window.c:569
 #, c-format
@@ -4432,6 +3528,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4447,7 +3547,7 @@ msgid "Online Accounts"
 msgstr "Ú�ty on-line"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "Aktualizovat software…"
 
 #: ../src/empathy-roster-window.c:753
@@ -4493,11 +3593,13 @@ msgid "No online contacts"
 msgstr "Žádné kontakty na příjmu"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Nová konverzace…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "Nový _hovor…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4505,11 +3607,11 @@ msgid "Contacts"
 msgstr "Kontakty"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "Přid_at kontakt…"
+msgid "_Add Contacts…"
+msgstr "_Přidat kontakty…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Hledat kontakty…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4521,8 +3623,8 @@ msgid "_Rooms"
 msgstr "_Místnosti"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Vstoupit…"
+msgid "_Join…"
+msgstr "Připo_jit…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4569,28 +3671,16 @@ msgstr "_Být na příjmu"
 msgid "Show _Offline Contacts"
 msgstr "Zobrazovat _odpojené kontakty"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "Přid_at kontakt…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nová konverzace…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nový _hovor…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stav"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Dokon�it"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Zadajte prosím údaje svého ú�tu"
 
diff --git a/po/de.po b/po/de.po
index 01463e99c..038b239f6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,29 +8,27 @@
 # Michael Kanis <mkanis@gmx.de>, 2009.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2008-2012.
 # Mario Klug <mario@klug.me>, 2010.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010, 2011.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2011, 2012.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2011.
 # Hendrik Knackstedt <hendrik.knackstedt@t-online.de>, 2012.
-# Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012, 2013.
+# Tobias Endrigkeit <tobiasendrigkeit@outlook.com>, 2012, 2013.
+# Christian Kirbach <christian.kirbach@gmail.com>, 2009, 2010, 2011, 2013.
 #
 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: 2013-02-09 00:37+0000\n"
-"PO-Revision-Date: 2013-02-10 19:35+0100\n"
-"Last-Translator: Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>\n"
+"POT-Creation-Date: 2013-08-19 11:46+0000\n"
+"PO-Revision-Date: 2013-08-19 19:26+0100\n"
+"Last-Translator: Christian Kirbach <christian.kirbach@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
-"Language: \n"
+"Language: de_DE\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-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -539,262 +537,262 @@ msgstr ""
 "Legt fest, ob Empathy die Genauigkeit der Positionsangabe aus "
 "Datenschutzgründen reduzieren soll."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Es wurde kein Grund  angegeben"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Der Wechsel des Zustands wurde angefordert"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Sie haben die Dateiübertragung abgebrochen"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Der andere Teilnehmer hat die Dateiübertragung abgebrochen"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Fehler beim Versuch, die Datei zu übertragen"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant is unable to transfer the file"
 msgstr "Der andere Teilnehmer kann die Datei nicht übertragen"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:294
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Dateiübertragung abgeschlossen, aber Datei ist beschädigt"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Dateiübertragungen werden von der Gegenseite nicht unterstützt"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Die ausgewählte Datei ist keine normale Datei"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Die ausgewählte Datei ist leer"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184
 msgid "Password not found"
 msgstr "Passwort nicht gefunden"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "IM-Konto Passwort für %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, c-format
 msgid "Password for chatroom '%s' on account %s (%s)"
 msgstr "Passwort für Chatraum »%s« von Konto %s (%s)"
 
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Anruf in Abwesenheit von %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "%s wurde angerufen"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Anruf von %s"
 
-#: ../libempathy/empathy-time.c:90
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Vor %d Sekunde"
 msgstr[1] "Vor %d Sekunden"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Vor %d Minute"
 msgstr[1] "Vor %d Minuten"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Vor %d Stunde"
 msgstr[1] "Vor %d Stunden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Vor %d Tag"
 msgstr[1] "Vor %d Tagen"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Vor %d Woche"
 msgstr[1] "Vor %d Wochen"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Vor %d Monat"
 msgstr[1] "Vor %d Monaten"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "in der Zukunft"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:214
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:216
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:219
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:221
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:223
 msgid "Offline"
 msgstr "Abgemeldet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:226
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:266
 msgid "No reason specified"
 msgstr "Es wurde kein Grund angegeben"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:324
 msgid "Status is set to offline"
 msgstr "Der Status ist nun »abgemeldet«"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Netzwerk-Fehler"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
 msgid "Authentication failed"
 msgstr "Legitimierung fehlgeschlagen"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:274 ../libempathy/empathy-utils.c:308
 msgid "Encryption error"
 msgstr "Verschlüsselungsfehler"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:276
 msgid "Name in use"
 msgstr "Name bereits in Verwendung"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
 msgid "Certificate not provided"
 msgstr "Zertifikat wurde nicht bereitgestellt"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
 msgid "Certificate untrusted"
 msgstr "Zertifikat nicht vertrauenswürdig"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
 msgid "Certificate expired"
 msgstr "Zertifikat abgelaufen"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
 msgid "Certificate not activated"
 msgstr "Zertifikat nicht aktiviert"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate hostname mismatch"
 msgstr "Rechnername des Zertifikats stimmt nicht überein"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingerabdruck des Zertifikats stimmt nicht überein"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate self-signed"
 msgstr "Selbstsigniertes Zertifikat"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:292
 msgid "Certificate error"
 msgstr "Zertifikat-Fehler"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption is not available"
 msgstr "Verschlüsselung ist nicht verfügbar"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate is invalid"
 msgstr "Zertifikat ist ungültig"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:330
 msgid "Connection has been refused"
 msgstr "Verbindungsaufbau wurde verweigert"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:332
 msgid "Connection can't be established"
 msgstr "Verbindung kann nicht hergestellt werden"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:334
 msgid "Connection has been lost"
 msgstr "Verbindung wurde unterbrochen"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:336
 msgid "This account is already connected to the server"
 msgstr "Dieses Konto ist bereits mit dem Server verbunden"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:338
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Die Verbindung wurde durch eine neue Verbindung mit der gleichen Ressource "
 "ersetzt"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:341
 msgid "The account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:343
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Der Server ist derzeit überlastet und kann die Verbindung nicht annehmen"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate has been revoked"
 msgstr "Zertifikat wurde zurückgezogen"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:347
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Das Zertifikat verwendet einen unsicheren Chiffrier-Algorithmus oder ist "
 "kryptografisch schwach"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -803,32 +801,32 @@ msgstr ""
 "überschreiten die durch die kryptografische Bibliothek gegebenen "
 "Beschränkungen"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:354
 msgid "Your software is too old"
 msgstr "Ihr Programm ist zu alt"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:356
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:468
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Personen in der Nähe"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:473
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:509 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:510
 msgid "Facebook Chat"
 msgstr "Facebook-Chat"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Alle Konten"
 
@@ -907,56 +905,56 @@ msgstr "Wie lautet Ihr AIM-Passwort?"
 msgid "Remember Password"
 msgstr "Passwort merken"
 
-#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-account-widget.c:668
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
+#: ../src/empathy-import-widget.c:316
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget.c:669
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "Passwort"
 
-#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget.c:670
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:498
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget.c:671
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:519
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:762
+#: ../libempathy-gtk/empathy-account-widget.c:755
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "An_wenden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "_Anmelden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Dieses Konto ist bereits auf dem Server vorhanden"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Ein neues Konto auf dem Server anlegen"
 
@@ -965,19 +963,19 @@ msgstr "Ein neues Konto auf dem Server anlegen"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s auf %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:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "%s-Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Neues Konto"
 
@@ -1200,32 +1198,32 @@ msgstr "Wie lautet Ihre Windows Live-Kennung?"
 msgid "What is your Windows Live password?"
 msgstr "Wie lautet Ihr Windows Live-Passwort?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
 msgid "TLS"
 msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
 msgid "Register"
 msgstr "Registrieren (Anmelden)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Einstellungen"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Kein"
 
@@ -1341,50 +1339,50 @@ msgstr "Wie lautet Ihre Yahoo!-ID?"
 msgid "What is your Yahoo! password?"
 msgstr "Wie lautet Ihr Yahoo!-Passwort?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Bild konnte nicht umgewandelt werden"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
+#: ../libempathy-gtk/empathy-avatar-chooser.c:540
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Keines der akzeptierten Bildformate wird von Ihrem System unterstützt"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "Bild konnte nicht als Datei gespeichert werden"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Benutzerbild auswählen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Ein Foto aufnehmen …"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Kein Bild"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Bilder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Alle Dateien"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 msgid "Click to enlarge"
 msgstr "Zum Vergrößern klicken"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Legitimierung für Konto <b>%s</b> ist fehlgeschlagen"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3844
 msgid "Retry"
 msgstr "Wiederholen"
 
@@ -1398,72 +1396,72 @@ msgstr ""
 "Bitte Passwort eingeben für Konto\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Auswählen …"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Auswählen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Es ist ein Fehler beim Starten des Anrufs aufgetreten"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Der angegebene Kontakt unterstützt keine Anrufe"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Der ausgewählte Kontakt ist nicht angemeldet"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Der ausgewählte Kontakt ist nicht gültig"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Notrufe werden mit diesem Protokoll nicht unterstützt"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Sie haben nicht genügend Guthaben, um diesen Anruf zu tätigen"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:731
 msgid "Failed to open private chat"
 msgstr "Ein privater Chat konnte nicht geöffnet werden"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:789
 msgid "Topic not supported on this conversation"
 msgstr "Ein Thema wird in dieser Unterhaltung nicht unterstützt"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:795
 msgid "You are not allowed to change the topic"
 msgstr "Sie sind nicht berechtigt, das Thema zu ändern"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:971
 msgid "Invalid contact ID"
 msgstr "Ungültige Kontaktkennung"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Alle Nachrichten der aktuellen Unterhaltung löschen"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <Thema>: Das Thema der aktuellen Unterhaltung festlegen"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <Chatraum-Kennung>: Einem neuen Chatraum beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1471,24 +1469,24 @@ msgstr ""
 "/part [<Chatraum-Kennung>] [<Grund>]: den Chatraum verlassen, Vorgabe ist "
 "der aktuelle Chatraum"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <Kontaktkennung> [<Nachricht>]: Einen privaten Chat starten"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <Kontaktkennung> <Nachricht>: Einen privaten Chat starten"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <Spitzname>: Den Spitznamen auf dem aktuellen Server wechseln"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <Nachricht>: Eine »ACTION«-Nachricht zur aktuellen Unterhaltung senden"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1087
 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 "
@@ -1498,11 +1496,11 @@ msgstr ""
 "um eine Nachricht zu senden, die mit »/« beginnt, wie z.B. »/say /join tritt "
 "einem Chatraum bei«"
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <Kontaktkennung>: Information über einen Kontakt anzeigen"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1510,127 +1508,127 @@ msgstr ""
 "/help [<Befehl>]: Alle verfügbaren Befehle zeigen. Falls <Befehl> angegeben "
 "wird, so wird dessen Verwendung erklärt."
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Aufruf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unbekannter Befehl; Bitte lesen Sie /help zu verfügbaren Befehlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1542
 msgid "insufficient balance to send message"
 msgstr "Nicht genügend Guthaben zum Senden der Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fehler beim Senden der Nachricht »%s«: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fehler beim Senden der Nachricht: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1554
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "Nicht genügend Guthaben zum Senden der Nachricht. <a href='%s'>Aufladen</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "not capable"
 msgstr "Nicht verfügbar"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "Abgemeldet"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "Ungültiger Kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "Zu lange Nachricht"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "Nicht implementiert"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "Thema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Thema wurde gesetzt auf: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Thema wurde von %s gesetzt auf: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1715
+#: ../libempathy-gtk/empathy-chat.c:1706
 msgid "No topic defined"
 msgstr "Kein Thema gesetzt"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Keine Vorschläge)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2290
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "»%s« zum Wörterbuch hinzufügen"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2336
+#: ../libempathy-gtk/empathy-chat.c:2327
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "»%s« zum %s-Wörterbuch hinzufügen"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2397
 msgid "Insert Smiley"
 msgstr "Emoticon einfügen"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Senden"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "Vor_schläge zur Rechtschreibung"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Letzte Protokolle konnten nicht geholt werden"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s hat sich abgemeldet"
@@ -1638,12 +1636,12 @@ msgstr "%s hat sich abgemeldet"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2833
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s wurde von %2$s rausgeworfen"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s wurde rausgeworfen"
@@ -1651,17 +1649,17 @@ msgstr "%s wurde rausgeworfen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2853
+#: ../libempathy-gtk/empathy-chat.c:2844
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s wurde von %2$s verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s wurde verbannt"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s hat den Raum verlassen"
@@ -1671,17 +1669,17 @@ msgstr "%s hat den Raum verlassen"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s hat den Raum betreten"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ist jetzt bekannt als %s"
@@ -1689,82 +1687,82 @@ msgstr "%s ist jetzt bekannt als %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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2644
+#: ../src/empathy-call-window.c:2951 ../src/empathy-event-manager.c:1169
 msgid "Disconnected"
 msgstr "Getrennt"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "Wollen Sie dieses Passwort speichern?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "Dauerhaft merken"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Jetzt nicht"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3848
 msgid "Wrong password; please try again:"
 msgstr "Falsches Kennwort; Bitte versuchen Sie es erneut:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3972
 msgid "This room is protected by a password:"
 msgstr "Dieser Raum ist durch ein Kennwort geschützt:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:3999
+#: ../src/empathy-new-chatroom-dialog.c:785
 msgid "Join"
 msgstr "Beitreten"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1190
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4246
 msgid "Conversation"
 msgstr "Unterhaltung"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4251
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261
 msgid "Unknown or invalid identifier"
 msgstr "Unbekannter oder ungültiger Bezeichner"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blockierung von Kontakten ist vorübergehend nicht verfügbar"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blockierung von Kontakten ist nicht verfügbar"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Kontakt kann nicht blockiert werden"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Blockierte Kontakte bearbeiten"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1774,120 +1772,124 @@ msgstr "Konto:"
 msgid "Blocked Contacts"
 msgstr "Blockierte Kontakte"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Telefonnummer"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "E-Mail-Adresse"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Webseite"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Birthday"
 msgstr "Geburtstag"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Zuletzt gesehen:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Server:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 msgid "Connected from:"
 msgstr "Verbunden von:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Abwesenheitsnachricht:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "Arbeit"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "Privat"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "Mobiltelefon"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "Sprachanruf"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "bevorzugt"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "postalisch"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "Paket"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Kontakte suchen"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Suchen:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "Kontakt _hinzufügen"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Keine Kontakte gefunden"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Die Kontaktsuche wird von diesem Konto nicht unterstützt."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Ihre Meldung, um sich selbst vorzustellen:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Bitte lassen Sie mich sehen, wenn Sie verfügbar sind. Danke!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 msgid "Save Avatar"
 msgstr "Benutzerbild speichern"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Benutzerbild konnte nicht gespeichert werden"
 
 #. Identifier to connect to Instant Messaging network
 #. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
+#: ../libempathy-gtk/empathy-user-info.c:473
 msgid "Identifier"
 msgstr "Bezeichner"
 
 #. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
+#: ../libempathy-gtk/empathy-user-info.c:481
 msgid "Alias"
 msgstr "Alias"
 
@@ -1921,11 +1923,11 @@ msgstr "Version"
 msgid "Client"
 msgstr "Client"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Gruppen"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:329
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1933,74 +1935,74 @@ msgstr ""
 "Wählen Sie die Gruppen, in denen Sie diesen Kontakt anzeigen möchten. Sie "
 "können mehrere Gruppen oder auch keine Gruppe auswählen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
 msgid "_Add Group"
 msgstr "Gruppe _hinzufügen"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:383
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Neuer Kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "%s blockieren?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Wollen Sie »%s« daran hindern, Sie wieder zu kontaktieren?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Die folgende Identität wird blockiert:"
 msgstr[1] "Die folgenden Identitäten werden blockiert:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Die folgende Identität kann nicht blockiert werden:"
 msgstr[1] "Die folgenden Identitäten können nicht blockiert werden:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blockieren"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Diesen Kontakt als Missb_rauch melden"
 msgstr[1] "Diese Kontakte als Missb_rauch melden"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Kontaktinformationen bearbeiten"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Verknüpfte Kontakte"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts ist nicht installiert"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Bitte installieren Sie gnome-contacts, um auf Kontaktdetails zugreifen zu "
@@ -2009,49 +2011,54 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:170
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:346
 msgid "Select account to use to place the call"
 msgstr "Konto für den Anruf wählen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:350
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Anrufen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "Work"
 msgstr "Arbeit"
 
 # Mobile, Work, Home laut Quelltext.
 # Im Original könnte auch »Home« statt »HOME« stehen.
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:419
 msgid "HOME"
 msgstr "Zu Hause"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:662
 msgid "_Block Contact"
 msgstr "Kontakt _blockieren"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Kontakt aus der _Gruppe »%s« entfernen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:738
 msgid "Delete and _Block"
 msgstr "Löschen und _blockieren"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:826
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Möchten Sie wirklich den Kontakt »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:835
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2060,218 +2067,218 @@ msgstr ""
 "Wollen Sie den Meta-Kontakt »%s« wirklich löschen? Dadurch werden alle "
 "Komponenten dieses Meta-Kontakts gelöscht."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:846
 msgid "Removing contact"
 msgstr "Kontakt wird entfernt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:922
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 msgid "_Remove"
 msgstr "_Entfernen"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1317
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Chat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1352
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "menu item"
 msgid "_Audio Call"
-msgstr "_Audioanruf"
+msgstr "_Sprachanruf"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1418
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videoanruf"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1459
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Vorherige Unterhaltungen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1488
 msgid "Send File"
 msgstr "Datei senden"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1518
 msgid "Share My Desktop"
 msgstr "Meine Arbeitsumgebung freigeben"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1544
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1573
 msgid "Infor_mation"
 msgstr "Infor_mationen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1622
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1738
+#: ../src/empathy-chat-window.c:1272
 msgid "Inviting you to this room"
 msgstr "Sie werden in diesen Chatraum eingeladen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1784
 msgid "_Invite to Chat Room"
 msgstr "In den Chatraum _einladen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1980
 msgid "_Add Contact…"
 msgstr "Kontakt _hinzufügen …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2360
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Möchten Sie wirklich die Gruppe »%s« entfernen?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Gruppe wird entfernt"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "Umbe_nennen"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanäle:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "ISO-Länderkennung:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Bundesland/Kanton:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Stadt:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Region:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Straße:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Gebäude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Etage:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "URI:"
 msgstr "Adresse:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Accuracy Level:"
 msgstr "Genauigkeitsgrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Fehler:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Vertikale Ungenauigkeit (Meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Horizontale Ungenauigkeit (Meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Peilung:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Steiggeschwindigkeit:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Zuletzt aktualisiert am:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Längengrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Breitengrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Höhe:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Position"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y um %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
 msgid "Identifier:"
 msgstr "Bezeichner:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1640
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2286,32 +2293,32 @@ msgstr "<b>Position</b> zum (Zeitpunkt)"
 msgid "Online from a phone or mobile device"
 msgstr "Angemeldet über Telefon oder anderes Mobilgerät"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Neues Netzwerk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Wählen Sie ein IRC-Netzwerk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "_Netzwerkliste zurücksetzen"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "neuer Server"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:534
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80
 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 "
@@ -2321,11 +2328,11 @@ msgstr ""
 "ihnen kommunizieren. Wenn Sie dieses Merkmal verwenden wollen, prüfen Sie "
 "bitte die Angaben unten auf Vollständigkeit."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100
 msgid "People nearby"
 msgstr "Personen in der Nähe"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2334,44 +2341,44 @@ msgstr ""
 "deaktivieren. Nutzen Sie hierzu das Menü <span style=\"italic\">Bearbeiten → "
 "Konten</span> in der Kontaktliste."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:627
 msgid "History"
 msgstr "Chronik"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:682
 msgid "Show"
 msgstr "Anzeigen"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:704
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1155
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1157
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat mit %s"
 
 # http://php.net/manual/en/function.strftime.php
-#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1207
 #: ../libempathy-gtk/empathy-log-window.c:1351
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1294
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
@@ -2475,7 +2482,7 @@ msgid "_File"
 msgstr "_Datei"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -2488,7 +2495,7 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1488 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Chat"
 
@@ -2510,105 +2517,110 @@ msgid "What kind of chat account do you have?"
 msgstr "Welche Art Chat-Konto haben Sie?"
 
 #: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Neues Konto wird hinzugefügt"
+msgid "Add new account"
+msgstr "Neues Konto hinzufügen"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Geben Sie eine Kontaktbezeichnung oder eine Telefonnummer ein:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Videoanruf"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
-msgstr "_Audioanruf"
+msgstr "_Sprachanruf"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Neuer Anruf"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Der Kontakt ist nicht angemeldet"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Der angegebene Kontakt ist nicht gültig oder unbekannt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Der Kontakt unterstützt diese Unterhaltungsart nicht"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr ""
 "Die angeforderte Funktionalität ist für dieses Protokoll nicht implemetiert"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Es konnte keine Unterhaltung mit dem Kontakt begonnen werden"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Sie sind aus diesem Raum verbannt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Dieser Raum ist voll"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Sie müssen eingeladen sein, um diesen Raum zu betreten"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Kann nicht durchgeführt werden, während Sie nicht verbunden sind"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Es ist ein Fehler beim Starten der Unterhaltung aufgetreten"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Neue Unterhaltung"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+#| msgid "Password required"
+msgid "Password Required"
+msgstr "Passwort erforderlich"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:157
+#: ../libempathy-gtk/empathy-presence-chooser.c:193
 msgid "Custom Message…"
 msgstr "Benutzerdefinierte Nachricht …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:210
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Edit Custom Messages…"
 msgstr "Benutzerdefinierte Nachrichten bearbeiten …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 msgid "Click to remove this status as a favorite"
 msgstr "Klicken, um den Status als Favorit zu entfernen"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:343
 msgid "Click to make this status a favorite"
 msgstr "Klicken, um den Status zu einem Favoriten zu machen"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2618,12 +2630,12 @@ msgstr ""
 "<small><i>Drücken Sie die Eingabetaste, um eine neue Nachricht zu erstellen, "
 "oder Esc um abzubrechen.<i/></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:386
 msgid "Set status"
 msgstr "Status setzen"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Benutzerdefinierte Nachrichten …"
 
@@ -2631,12 +2643,12 @@ msgstr "Benutzerdefinierte Nachrichten …"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
+#: ../libempathy-gtk/empathy-protocol-chooser.c:603
 #, c-format
 msgid "New %s account"
 msgstr "Neues %s-Konto"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Groß-/Kleinschreibung berücksichtigen"
 
@@ -2660,171 +2672,171 @@ msgstr "Groß-/Kleins_chreibung berücksichtigen"
 msgid "Phrase not found"
 msgstr "Ausdruck nicht gefunden"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Eine Sofortnachricht wurde empfangen"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Eine Sofortnachricht wurde gesendet"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Eingehende Chat-Anfrage"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontakt verbunden"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontakt getrennt"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Mit Server verbunden"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Vom Server getrennt"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Eingehender Anruf"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Ausgehender Anruf"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Gespräch beendet"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 msgid "Edit Custom Messages"
 msgstr "Benutzerdefinierte Nachrichten bearbeiten"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1107
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s bittet um das Recht, Ihre Online-Verfügbarkeit sehen zu dürfen"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:721
 msgid "_Decline"
 msgstr "A_blehnen"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Annehmen"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1211
 #, c-format
 msgid "Message edited at %s"
 msgstr "Nachricht bearbeitet um %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1913
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Die vom Chat-Server gelieferte Identität kann nicht überprüft werden."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Das Zertifikat ist nicht von einer Zertifizierungsstelle signiert."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Das Zertifikat ist abgelaufen."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Das Zertifikat ist noch nicht aktiviert worden."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Das Zertifikat besitzt nicht den erwarteten Fingerabdruck."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Der durch das Zertifikat geprüfte Rechnername stimmt nicht mit dem "
 "Servernamen überein."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Das Zertifikat ist selbst signiert."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 "Das Zertifikat wurde durch die herausgebende Zertifizierungsstelle "
 "zurückgezogen."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Das Zertifikat ist kryptografisch schwach."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Die Zertifikatlänge überschreitet überprüfbare Grenzen."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Das Zertifikat ist inkorrekt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Erwarteter Rechnername: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Rechnername des Zertifikats: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "F_ortfahren"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Keine vertrauenswürdige Verbindung"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr ""
 "Diese Verbindung ist nicht vertrauenswürdig. Möchten Sie dennoch fortfahren?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Diese Wahl für zukünftige Verbindungen merken"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Details zum Zertifikat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:1078
 msgid "Unable to open URI"
 msgstr "Adresse konnte nicht geöffnet werden"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
 msgid "Select a file"
 msgstr "Eine Datei auswählen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 msgid "Insufficient free space to save file"
 msgstr "Nicht genügend Platz zum Speichern der Datei"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2833,16 +2845,16 @@ msgstr ""
 "%s freier Platz ist nötig, um diese Datei zu speichern, aber es ist nur %s "
 "verfügbar. Bitte wählen Sie einen anderen Speicherort."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Eingehende Datei von %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:396
 msgid "Go online to edit your personal information."
 msgstr "Gehen Sie online, um Ihre persönlichen Informationen zu bearbeiten."
 
-#: ../libempathy-gtk/empathy-user-info.c:464
+#: ../libempathy-gtk/empathy-user-info.c:498
 msgid "<b>Personal Details</b>"
 msgstr "<b>Persönliche Angaben</b>"
 
@@ -2861,197 +2873,197 @@ msgstr "Adresse _öffnen"
 msgid "Inspect HTML"
 msgstr "HTML untersuchen"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 msgid "Current Locale"
 msgstr "Aktuelle Locale-Einstellung"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:160
+#: ../libempathy-gtk/totem-subtitle-encoding.c:162
+#: ../libempathy-gtk/totem-subtitle-encoding.c:164
+#: ../libempathy-gtk/totem-subtitle-encoding.c:166
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 msgid "Armenian"
 msgstr "Armenisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Baltisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 msgid "Celtic"
 msgstr "Keltisch"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:182
+#: ../libempathy-gtk/totem-subtitle-encoding.c:184
+#: ../libempathy-gtk/totem-subtitle-encoding.c:186
+#: ../libempathy-gtk/totem-subtitle-encoding.c:188
 msgid "Central European"
 msgstr "Mitteleuropäisch"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:191
+#: ../libempathy-gtk/totem-subtitle-encoding.c:193
+#: ../libempathy-gtk/totem-subtitle-encoding.c:195
+#: ../libempathy-gtk/totem-subtitle-encoding.c:197
 msgid "Chinese Simplified"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+#: ../libempathy-gtk/totem-subtitle-encoding.c:200
+#: ../libempathy-gtk/totem-subtitle-encoding.c:202
+#: ../libempathy-gtk/totem-subtitle-encoding.c:204
 msgid "Chinese Traditional"
 msgstr "Traditionelles Chinesisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 msgid "Croatian"
 msgstr "Kroatisch"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:210
+#: ../libempathy-gtk/totem-subtitle-encoding.c:212
+#: ../libempathy-gtk/totem-subtitle-encoding.c:214
+#: ../libempathy-gtk/totem-subtitle-encoding.c:216
+#: ../libempathy-gtk/totem-subtitle-encoding.c:218
+#: ../libempathy-gtk/totem-subtitle-encoding.c:220
 msgid "Cyrillic"
 msgstr "Kyrillisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Kyrillisch/Russisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+#: ../libempathy-gtk/totem-subtitle-encoding.c:226
+#: ../libempathy-gtk/totem-subtitle-encoding.c:228
 msgid "Cyrillic/Ukrainian"
 msgstr "Kyrillisch/Ukrainisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:247
+#: ../libempathy-gtk/totem-subtitle-encoding.c:249
+#: ../libempathy-gtk/totem-subtitle-encoding.c:251
+#: ../libempathy-gtk/totem-subtitle-encoding.c:253
 msgid "Hebrew"
 msgstr "Hebräisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Visuelles Hebräisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 msgid "Icelandic"
 msgstr "Isländisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:272
+#: ../libempathy-gtk/totem-subtitle-encoding.c:274
+#: ../libempathy-gtk/totem-subtitle-encoding.c:276
+#: ../libempathy-gtk/totem-subtitle-encoding.c:278
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nordisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+#: ../libempathy-gtk/totem-subtitle-encoding.c:287
+#: ../libempathy-gtk/totem-subtitle-encoding.c:289
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Südeuropäisch"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:298
+#: ../libempathy-gtk/totem-subtitle-encoding.c:300
+#: ../libempathy-gtk/totem-subtitle-encoding.c:302
+#: ../libempathy-gtk/totem-subtitle-encoding.c:304
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:307
+#: ../libempathy-gtk/totem-subtitle-encoding.c:309
+#: ../libempathy-gtk/totem-subtitle-encoding.c:311
+#: ../libempathy-gtk/totem-subtitle-encoding.c:313
+#: ../libempathy-gtk/totem-subtitle-encoding.c:315
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:318
+#: ../libempathy-gtk/totem-subtitle-encoding.c:320
+#: ../libempathy-gtk/totem-subtitle-encoding.c:322
+#: ../libempathy-gtk/totem-subtitle-encoding.c:324
+#: ../libempathy-gtk/totem-subtitle-encoding.c:326
 msgid "Western"
 msgstr "Westlich"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#: ../libempathy-gtk/totem-subtitle-encoding.c:329
+#: ../libempathy-gtk/totem-subtitle-encoding.c:331
+#: ../libempathy-gtk/totem-subtitle-encoding.c:333
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Favorisierte Kontakte"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Nicht gruppiert"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:201
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Der Server konnte den Kontakt nicht finden: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Keine Fehlermeldung"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Sofortnachricht (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3063,7 +3075,7 @@ msgstr ""
 "wie sie von der Free Software Foundation festgelegt wurden; entweder in "
 "Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder neueren Lizenz."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3076,7 +3088,7 @@ msgstr ""
 "Sie für weitere Informationen bitte in der »GNU General Public License« (GNU "
 "GPL) nach."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3087,11 +3099,11 @@ msgstr ""
 "Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Ein Sofortnachrichten-Programm für GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Hendrik Richter\n"
@@ -3103,72 +3115,72 @@ msgstr ""
 "Paul Seyfert\n"
 "Tobias Endrigkeit"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Keine Dialoge anzeigen, diverse Aufgaben ausführen (z.B. Importieren) und "
 "schließen"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Keine Dialoge anzeigen, außer wenn es nur »Personen in der Nähe«-Konten gibt"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Anfänglich angegebenes Konto auswählen (z.B. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<Kontokennung>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy-Konten"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy-Konten"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:52
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto »%s« vorhanden."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Es sind nicht gespeicherte Änderungen zu Ihrem Konto %.50s vorhanden."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:56
 msgid "Your new account has not been saved yet."
 msgstr "Ihr neues Konto ist noch nicht gespeichert worden."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:382 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Verbindung wird aufgebaut …"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Offline — %s"
 msgstr "Abgemeldet — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:435
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Getrennt — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:446
 msgid "Offline — No Network Connection"
 msgstr "Abgemeldet — Keine Netzwerkverbindung"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:453
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:470
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3178,28 +3190,28 @@ msgstr ""
 "unterstütztes Backend benötigt. Bitte installieren Sie telepathy-haze und "
 "starten Sie Ihre Sitzung neu, um das Konto zu migrieren."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:480
 msgid "Offline — Account Disabled"
 msgstr "Abgemeldet — Konto ist deaktiviert"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:586
 msgid "Edit Connection Parameters"
 msgstr "Verbindungsparameter bearbeiten"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:713
 msgid "_Edit Connection Parameters..."
 msgstr "V_erbindungsparameter bearbeiten …"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1243
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Möchten Sie %s wirklich von Ihrem Rechner entfernen?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Möchten Sie %.50s wirklich von Ihrem Rechner entfernen?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1247
 msgid "This will not remove your account on the server."
 msgstr "Dadurch wird Ihr Konto nicht vom Server entfernt."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1452
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3209,24 +3221,24 @@ msgstr ""
 "fortfahren möchten?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1643
 msgid "_Enabled"
 msgstr "A_ktiviert"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1666
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2068
 msgid "_Skip"
 msgstr "Ü_berspringen"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2072
 msgid "_Connect"
 msgstr "_Verbinden"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2251
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3236,7 +3248,7 @@ msgstr ""
 "fortfahren möchten?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2395
 msgid "Messaging and VoIP Accounts"
 msgstr "Sofortnachrichten- und VoIP-Konten"
 
@@ -3260,31 +3272,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Keine Protokoll-Backends installiert"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Empathy Legitimierungs-Client"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy Legitimierungs-Client"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:407
 msgid "Don't connect on startup"
 msgstr "Nicht automatisch beim Start verbinden"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Kontaktliste und andere Dialoge nicht automatisch beim Start anzeigen"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:440
 msgid "- Empathy IM Client"
 msgstr "- Empathy Sofortnachrichtenprogramm"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Fehler beim Aufruf der Kontenverwaltung"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3297,116 +3309,116 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Im Gespräch"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:223
 msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy Audio/Video-Client"
+msgstr "- Empathy Sprach/Video-Client"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:247
 msgid "Empathy Audio/Video Client"
-msgstr "Empathy Audio/Video-Client"
+msgstr "Empathy Sprach/Video-Client"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "%s hat versucht, Sie anzurufen, aber Sie führten gerade ein anderes Gespräch."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Eingehender Video-Anruf von %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Eingehender Anruf von %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1543
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Abweisen"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1544
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Antworten"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Mit %s anrufen"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 msgid "The IP address as seen by the machine"
 msgstr "Die von der Maschine gesehene IP-Adresse"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2167
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Die von einem Server im Internet gesehene IP-Adresse"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2169
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 "Die IP-Adresse des Kommunikationspartners, wie von der anderen Seite gesehen"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address of a relay server"
 msgstr "Die IP-Adresse eines Relay-Servers"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address of the multicast group"
 msgstr "Die IP-Adresse der Multicast-Gruppe"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2949
 msgid "On hold"
 msgstr "In Warteschleife"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2953
 msgid "Mute"
 msgstr "Stumm"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2955
 msgid "Duration"
 msgstr "Dauer"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2958
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3054
 msgid "Technical Details"
 msgstr "Technische Details"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3093
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"Die Software von %s unterstützt keines der Audioformate, die von Ihrem "
+"Die Software von %s unterstützt keines der Sprachformate, die von Ihrem "
 "Rechner unterstützt werden"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3098
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3415,7 +3427,7 @@ msgstr ""
 "Die Software von %s unterstützt keines der Videoformate, die von Ihrem "
 "Rechner unterstützt werden"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3104
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3424,25 +3436,25 @@ msgstr ""
 "Mit %s kann keine Verbindung hergestellt werden. Eventuell verhindert das "
 "Netzwerk des Gegenüber oder Ihres direkte Verbindungen."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3110
 msgid "There was a failure on the network"
 msgstr "Es gab im Netzwerk einen Fehler"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3114
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"Die für diesen Anruf erforderlichen Audioformate sind nicht auf Ihrem "
+"Die für diesen Anruf erforderlichen Sprachformate sind nicht auf Ihrem "
 "Rechner installiert"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3117
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Die für diesen Anruf erforderlichen Videoformate sind nicht auf Ihrem "
 "Rechner installiert"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3129
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3453,32 +3465,32 @@ msgstr ""
 "\">berichten Sie diesen Fehler</a> und fügen Sie die Protokollmeldungen aus "
 "dem Fenster »Fehlerdiagnose« im Menü »Hilfe« anbei."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3138
 msgid "There was a failure in the call engine"
 msgstr "Es gab einen Fehler im Anrufsystem"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3141
 msgid "The end of the stream was reached"
 msgstr "Das Ende des Datenstroms wurde erreicht"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3181
 msgid "Can't establish audio stream"
-msgstr "Es kann kein Audio-Strom aufgebaut werden"
+msgstr "Es kann kein Sprach-Strom aufgebaut werden"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3191
 msgid "Can't establish video stream"
 msgstr "Es kann kein Video-Strom aufgebaut werden"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3228
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ihr aktuelles Guthaben beträgt %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3232
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Sie haben nicht genügend Guthaben, um diesen Anruf zu tätigen"
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3234
 msgid "Top Up"
 msgstr "Aufladen"
 
@@ -3502,11 +3514,11 @@ msgstr "Ein_stellungen"
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "I_nhalt"
 
@@ -3556,7 +3568,7 @@ msgstr "Einen Video-Anruf starten"
 
 #: ../src/empathy-call-window.ui.h:21
 msgid "Start an audio call"
-msgstr "Einen Audio-Anruf starten"
+msgstr "Einen Sprachanruf starten"
 
 #: ../src/empathy-call-window.ui.h:22
 msgid "Show dialpad"
@@ -3592,21 +3604,21 @@ msgstr "Lokaler Kandidat:"
 
 #: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
-msgstr "Audio"
+msgstr "Sprache"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Empathy Sofortnachrichtenprogramm"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:243
 msgid "Name"
 msgstr "Name"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Raum"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Auto-Verbinden"
 
@@ -3614,11 +3626,11 @@ msgstr "Auto-Verbinden"
 msgid "Manage Favorite Rooms"
 msgstr "Raumfavoriten verwalten"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:277
 msgid "Close this window?"
 msgstr "Dieses Fenster schließen?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:283
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3627,7 +3639,7 @@ msgstr ""
 "Durch Schließen dieses Fenster verlassen Sie %s. Sie erhalten keine weiteren "
 "Nachrichten, bevor Sie sich nicht erneut anmelden."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:296
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3642,12 +3654,12 @@ msgstr[1] ""
 "Durch Schließen dieses Fenster verlassen Sie %u Chaträume. Sie erhalten "
 "keine weiteren Nachrichten, bis Sie diese erneut betreten."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:307
 #, c-format
 msgid "Leave %s?"
 msgstr "%s verlassen?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:309
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3655,54 +3667,54 @@ msgstr ""
 "Sie erhalten keine weiteren Nachrichten aus diesem Chatraum, bis Sie ihn "
 "erneut betreten."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:328
 msgid "Close window"
 msgstr "Fenster schließen"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:328
 msgid "Leave room"
 msgstr "Raum verlassen"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ungelesen)"
 msgstr[1] "%s (%d ungelesen)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (und %u weitere)"
 msgstr[1] "%s (und %u weitere)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:698
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d von anderen ungelesen)"
 msgstr[1] "%s (%d von anderen ungelesen)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:707
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d von allen nicht gelesen)"
 msgstr[1] "%s (%d von allen nicht gelesene)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:952
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d Nachricht wird gesendet"
 msgstr[1] "%d Nachrichten werden gesendet"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "Schreibt eine Nachricht."
 
@@ -3735,108 +3747,116 @@ msgid "Invite _Participant…"
 msgstr "_Teilnehmer einladen …"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "Einem Chat _beitreten"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Einen Chat _verlassen"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Kontakt"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Reiter"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Vorheriger Reiter"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Nächster Reiter"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Reiter _zurückholen"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Reiter nach _links verschieben"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Reiter nach _rechts verschieben"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "Reiter ab_trennen"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Einen bestimmten Dienst anzeigen"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Empathy-Fehlerdiagnose"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy-Fehlerdiagnose"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1589
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1649
 msgid "Pastebin link"
 msgstr "Pastebin-Verknüpfung"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1658
 msgid "Pastebin response"
 msgstr "Pastebin-Antwort"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1665
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Die Daten sind für einen einzigen Einfügevorgang zu groß. Bitte speichern "
 "Sie das Protokoll in einer Datei."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1847
 msgid "Debug Window"
 msgstr "Fehlerdiagnosefenster"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1907
 msgid "Send to pastebin"
 msgstr "An Pastebin senden"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1951
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1963
 msgid "Level "
 msgstr "Stufe"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1982
 msgid "Debug"
 msgstr "Fehlerdiagnose"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1987
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1997
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2002
 msgid "Critical"
 msgstr "Kritisch"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2007
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2020
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3855,23 +3875,23 @@ msgstr ""
 "im <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy"
 "\">Fehlerbericht</a> einblenden."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2052
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2055
 msgid "Domain"
 msgstr "Domäne"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2058
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2061
 msgid "Level"
 msgstr "Stufe"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2090
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3879,70 +3899,70 @@ msgstr ""
 "Die ausgewählte Verbindungsverwaltung unterstützt die Erweiterung zur "
 "entfernten Fehlerdiagnose nicht."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:500
 msgid "Incoming video call"
 msgstr "Eingehender Video-Anruf"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:504
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ruft Sie mit Video an, möchten Sie annehmen?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:505
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ruft Sie an, möchten Sie annehmen?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "A_bweisen"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549
 msgid "_Answer"
 msgstr "_Annehmen"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "Mit _Video annehmen"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Raumeinladung"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Einladen zum Betreten von %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:713
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s lädt Sie ein, %s beizutreten"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
 msgid "_Join"
 msgstr "_Beitreten"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s hat Sie eingeladen, %s beizutreten"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:758
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sie wurden eingeladen %s beizutreten"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:948
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Eingehende Dateiübertragung von %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:976 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Passwort erforderlich"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1113
 #, c-format
 msgid ""
 "\n"
@@ -3952,105 +3972,105 @@ msgstr ""
 "Nachricht: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:93
 #, 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:102
+#: ../src/empathy-ft-manager.c:96
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:172
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s von %s bei %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s"
 msgstr "%s von %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:299
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "»%s« wird von %s empfangen"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:302
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "»%s« wird an %s gesendet"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:332
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fehler beim Empfangen von »%s« von %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:335
 msgid "Error receiving a file"
 msgstr "Fehler beim Empfangen einer Datei"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fehler beim Versenden von »%s« an %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:343
 msgid "Error sending a file"
 msgstr "Fehler beim Senden einer Datei"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:482
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "»%s« von %s empfangen"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "»%s« an %s gesendet"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773
 msgid "Waiting for the other participant's response"
 msgstr "Auf Antwort des anderen Teilnehmers warten"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Unversehrtheit von »%s« wird geprüft"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "»%s« wird überprüft"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1019
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1031
 msgid "File"
 msgstr "Datei"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Verbleibend"
 
@@ -4064,11 +4084,11 @@ msgstr ""
 "Abgeschlossene, abgebrochene und gescheiterte Dateiübertragungen aus der "
 "Liste entfernen"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Import"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4076,49 +4096,49 @@ msgstr ""
 "Es wurden keine Benutzerkonten gefunden. Empathy unterstützt momentan nur "
 "den Import von Benutzerkonten aus Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Benutzerkonten importieren"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:296
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 msgid "Source"
 msgstr "Quelle"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Teilnehmer einladen"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Wählen Sie einen Kontakt für eine Einladung zur Unterhaltung:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:184
 msgid "Chat Room"
 msgstr "Chatraum"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Teilnehmer"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Das Auflisten der Räume ist fehlgeschlagen"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:435
 #, c-format
 msgid ""
 "%s\n"
@@ -4131,17 +4151,17 @@ msgstr ""
 "Passwort erforderlich: %s\n"
 "Teilnehmer: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "No"
 msgstr "Nein"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:789
 msgid "Join Room"
 msgstr "Raum beitreten"
 
@@ -4186,104 +4206,104 @@ msgstr "Raumliste konnte nicht abgerufen werden"
 msgid "Room List"
 msgstr "Raumliste"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Beantworten"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Mit _Video antworten"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Ablehnen"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Annehmen"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Bereitstellen"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:134
 msgid "Message received"
 msgstr "Nachricht empfangen"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Nachricht versendet"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Neue Unterhaltung"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Kontakt meldet sich an"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Kontakt meldet sich ab"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Benutzerkonto verbunden"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Benutzerkonto getrennt"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Sprache"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:635
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:641
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo! Warum denn Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:645
 msgid "Deny thy father and refuse thy name;"
 msgstr "Verleugne deinen Vater, deinen Namen!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:648
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Willst du das nicht, schwör’ dich zu meinem Liebsten,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:651
 msgid "And I'll no longer be a Capulet."
 msgstr "Und ich bin länger keine Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:654
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Hör’ ich noch länger, oder soll ich reden?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:657
 msgid "Juliet has disconnected"
 msgstr "Julia hat sich abgemeldet"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Einstellungen"
 
@@ -4295,7 +4315,7 @@ msgstr "Gruppen anzeigen"
 msgid "Show account balances"
 msgstr "Kontenguthaben anzeigen"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2238
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4463,88 +4483,88 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Erscheinungsbilder"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Passwort angeben"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+#: ../src/empathy-roster-window.c:478
+msgid "You need to set up an account to see contacts here."
 msgstr "Sie müssen ein Konto einrichten, um hier Kontakte anzeigen zu können."
 
-#: ../src/empathy-roster-window.c:569
+#: ../src/empathy-roster-window.c:554
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Verzeihung, %s Kontakte können nicht benutzt werden, bis Ihre %s-Software "
 "aktualisiert wird."
 
-#: ../src/empathy-roster-window.c:670
+#: ../src/empathy-roster-window.c:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:674
+#: ../src/empathy-roster-window.c:659
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:689
+#: ../src/empathy-roster-window.c:674
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "Das %s-Konto benötigt eine Legitimierung"
 
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Online-Konten"
 
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Software aktualisieren …"
 
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Erneut verbinden"
 
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Konto bearbeiten"
 
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Schließen"
 
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Guthaben dieses Kontos aufladen"
 
-#: ../src/empathy-roster-window.c:1590
+#: ../src/empathy-roster-window.c:1575
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
 "Sie müssen eines Ihrer Konten aktivieren, um hier Kontakte anzeigen zu "
 "können."
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1598
+#: ../src/empathy-roster-window.c:1583
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "Sie müssen %s aktivieren, um hier Kontakte anzeigen zu können."
 
-#: ../src/empathy-roster-window.c:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Ändern Sie Ihre Sichtbarkeit, um hier die Kontakte zu sehen"
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Keine Ãœbereinstimmung gefunden"
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Sie haben noch keine Kontakte hinzugefügt."
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Keine Online-Kontakte"
 
@@ -4641,12 +4661,12 @@ msgstr "Neuer _Anruf …"
 msgid "Status"
 msgstr "Status"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Fertig"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Geben Sie Ihre Kontoinformationen ein"
 
diff --git a/po/es.po b/po/es.po
index 184e36090..983262c9c 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, 2012.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013.
 #
 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-12-26 11:21+0000\n"
-"PO-Revision-Date: 2012-12-26 12:21+0100\n"
+"POT-Creation-Date: 2013-09-02 07:04+0000\n"
+"PO-Revision-Date: 2013-09-02 16:25+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -550,7 +550,7 @@ msgstr "Error la intentar transferir el archivo"
 msgid "The other participant is unable to transfer the file"
 msgstr "El otro participante no puede transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -570,217 +570,157 @@ msgstr "El archivo seleccionado no es un archivo regular"
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "No se encontró la contraseña"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Contraseña de la cuenta IM para %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, 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/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Llamada perdida de %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Llamó %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Llamada de %s"
 
-#: ../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: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: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: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: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: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:142
-msgid "in the future"
-msgstr "en el futuro"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "El estado se ha establecido a desconectado"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Esta cuenta ya está conectada al servidor"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 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:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -789,588 +729,33 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Su software es demasiado antiguo"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Error interno"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Gente cerca"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo Japón"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:642
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Chat de Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
-#: ../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
-msgid "Pass_word"
-msgstr "Contra_seña"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Recordar contraseña"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Puerto"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Servidor"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Recordar contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Cuenta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Puerto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nombre de usuario:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Aplicar"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Iniciar _sesión"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Esta cuenta ya existe en el servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Crear una cuenta nueva en el servidor"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Cuenta %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Cuenta nueva"
-
-#: ../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 inicio 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>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:9
-msgid "What is your GroupWise password?"
-msgstr "¿Cuál es su contraseña de GroupWise?"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "C_onjunto de caracteres"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "¿Cuál es su contraseña de ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Red"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Conjunto de caracteres"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Añadir…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Quitar"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Subir"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Abajo"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Servidores"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"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:11
-msgid "Nickname"
-msgstr "Apodo"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Mensaje de salida"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nombre real"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "¿Qué red de IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "¿Cuál es su apodo del IRC?"
-
-#: ../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: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 ""
-"Este es su nombre de usuario, no su inicio de sesión normal en Facebook.\n"
-"Si es facebook.com/<b>usuario</b>, introduzca <b>usuario</b>.\n"
-"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:6
-msgid "What is your Facebook password?"
-msgstr "¿Cuál es su contraseña de Facebook?"
-
-#: ../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: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 "Override server settings"
-msgstr "Sobreescribir los ajustes del servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Usar SS_L antiguo"
-
-#: ../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: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: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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Apo_do"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "Ape_llido"
-
-#: ../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 "E-_mail address"
-msgstr "Dirección de correo-_e"
-
-#: ../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: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:9
-msgid "What is your Windows Live password?"
-msgstr "¿Cuál es su contraseña de Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Registrador"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Opciones"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Ninguno"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "Nombre de _usuario"
-
-#: ../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:5
-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 "NAT Traversal Options"
-msgstr "Opciones de NAT transversal"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opciones del proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Opciones de miscelánea"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Servidor STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir el servidor STUN automáticamente"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Descubrir vinculación"
-
-#: ../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 "Mechanism"
-msgstr "Mecanismo"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Nombre de 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 "Loose Routing"
-msgstr "Enrutado impreciso"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorar errores TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Dirección IP local"
-
-#: ../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 "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:1
-msgid "Pass_word:"
-msgstr "Contra_seña:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "Configuración de la lista de _salas:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "C_onjunto de caracteres:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Puerto:"
-
-#: ../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:11
-msgid "What is your Yahoo! password?"
-msgstr "¿Cuál es su contraseña de Yahoo!?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "No se pudo convertir la imagen"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "No se pudo guardar la imagen a un archivo"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Seleccione su imagen de avatar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Tomar una imagen…"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Sin imagen"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Imágenes"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Todos los archivos"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Pulse para agrandar"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Falló la autenticación para la cuenta <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1380,72 +765,69 @@ msgstr ""
 "Introduzca su contraseña para la cuenta\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Seleccionar…"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Seleccionar"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Hubo un error al iniciar la llamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "El contacto especificado no soporta llamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "El contacto especificado está desconectado"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "El contacto especificado no es válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo no soporta llamadas de emergencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "El tema no está soportado en esta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "No le está permitido cambiar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "ID de contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 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:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 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:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 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:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 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:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1453,23 +835,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:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 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:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1083
+#: ../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 "
@@ -1479,11 +861,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:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 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:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1491,128 +873,128 @@ msgstr ""
 "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
 "definido, muestra su uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "no tiene balance suficiente para enviar el mensaje"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Añadir «%s» al diccionario de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1620,12 +1002,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s expulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1633,17 +1015,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1653,17 +1035,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:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -1671,50 +1053,50 @@ 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:2989 ../src/empathy-call-window.c:1532
-#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
-#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "¿Quiere guardar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorrecta; inténtelo de nuevo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Conversación"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1745,8 +1127,8 @@ msgstr "Editar contactos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1756,120 +1138,63 @@ msgstr "Cuenta:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nombre completo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Nu�mero de tele�fono"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Dirección de correo-e"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Página web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Cumpleaños"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Última actividad:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Conectado desde:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Mensaje de ausencia:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "trabajo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "personal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "móvil"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "voz"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "preferido"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "postal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "grupo"
+#: ../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 "Quitar"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Buscar:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Añadir contacto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "No se encontraron contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "No se soporta buscar contactos en esta cuenta"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Su mensaje de presentación:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Permítame ver cuando está en línea. Gracias."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Cuenta"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identificador"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Apodo"
 
@@ -1903,11 +1228,11 @@ msgstr "Versión"
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1915,122 +1240,127 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Se bloqueará la siguiente identidad:"
 msgstr[1] "Se bloquearán la siguientes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "No se puede bloquear la siguiente identidad:"
 msgstr[1] "No se pueden bloquear la siguientes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Info_rmar de este contacto como abusivo"
 msgstr[1] "Info_rmar de estos contacto como abusivos"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 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:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Contactos enlazados"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts no está instalado"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Instale gnome-contacts para acceder a los detalles de los contactos."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Seleccionar la cuenta que usar para realizar la llamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Llamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Quitar del _grupo «%s»"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Eliminar y _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2039,218 +1369,219 @@ 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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Quitar"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Chat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Invitándolo a esta sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Añadir contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Quitando grupo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Canales:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�rea:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Retardo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Velocidad de ascenso:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Actualizado por última vez:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Longitud_"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Ubicación geográfica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Apodo:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2265,32 +1596,7 @@ msgstr "<b>Ubicación</b> en (fecha)"
 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:335
-msgid "New Network"
-msgstr "Red nueva"
-
-#: ../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:587
-msgid "Reset _Networks List"
-msgstr "Rei_niciar lista de redes"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Seleccionar"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "servidor nuevo"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2300,11 +1606,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2313,137 +1619,137 @@ msgstr ""
 "característica eligiendo <span style=\"italic\">Editar → Cuentas</span> en "
 "la lista de contactos."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatee en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, 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:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "La llamada duró %s, finalizó a las %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Hoy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Cualquier hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Quién"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Cuándo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Cualquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Chats de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Llamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Llamadas entrantes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Llamadas salientes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Llamadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Qué"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3759
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Eliminar de:"
 
@@ -2452,12 +1758,13 @@ msgid "_File"
 msgstr "_Archivo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+#| msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Eliminar todo el histórico…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2465,7 +1772,7 @@ msgid "Profile"
 msgstr "Perfil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Chat"
 
@@ -2479,112 +1786,117 @@ msgid "page 2"
 msgstr "pa�gina 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+#| msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Cargando…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "¿Qué tipo de cuenta tiene?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Añadiendo cuenta nueva"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Añadir una cuenta nueva"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Introduzca el identificador de un contacto o un número de teléfono:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Llamada nueva"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "El contacto está desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "El contacto especificado es desconocido o no es válido"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "El contacto no soporta este tipo de conversación"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "La funcionalidad requerida no está implementada para ese protocolo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "No se pudo iniciar una conversación con el contacto dado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Se le ha bloqueado en este canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Este canal está completo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Debe estar invitado para unirse a este canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "No se puede proceder mientras esté desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Hubo un error al iniciar la conversación"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Conversación nueva"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Se requiere una contraseña"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Mensaje personalizado…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Editar mensajes personalizados…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Pulse pare eliminar este estado de los favoritos"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Pulse para hacer este estado uno favorito"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2594,25 +1906,16 @@ msgstr ""
 "<small><i>Pulse Intro para establecer el mensaje nuevo o Esc para cancelar.</"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Establecer estado"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Mensajes personalizados…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Cuenta de %s nueva"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
@@ -2636,169 +1939,169 @@ msgstr "_Coincidir con capitalización"
 msgid "Phrase not found"
 msgstr "No se encontró la frase"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Mensaje instantáneo recibido"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Enviar un mensaje instantáneo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Solicitud de chat entrante"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Conectado con el servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Desconectado del servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Llamada de voz entrante"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Llamada de voz saliente"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Finalizó la llamada de voz"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Editar mensajes personalizados"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, 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"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1101
+#: ../libempathy-gtk/empathy-theme-adium.c:1214
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaje editado a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1801
+#: ../libempathy-gtk/empathy-theme-adium.c:1916
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 "No se puede verificar la identidad proporcionada por el servidor de chat."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "El certificado no está firmado por una Autoridad de certificación."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "El certificado ha caducado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "El certificado aún no está activado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "El certificado no tiene la huella esperada."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "El nombre del servidor verificado por el certificado no coincide con el "
 "nombre del servidor."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "El certificado está firmado consigo mismo."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "La Autoridad de certificación emisora ha revocado el certificado.."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "El certificado es criptográficamente débil."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "La longitud del certificado excede de los límites verificables."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "El certificado está mal formado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nombre del servidor esperado: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nombre del servidor de certificados: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "La conexión no es de confianza"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Recordar esta opción para futuras conexiones"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Detalles del certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "No hay espacio suficiente para guardar el archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2807,225 +2110,54 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Conéctese para editar su información personal."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Detalles personales</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Copiar la dirección del enlace"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Abrir enlace"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Inspeccionar HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Configuración regional actual"
-
-#: ../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 "�rabe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armenio"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Báltico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Celta"
-
-#: ../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 "Centroeuropeo"
-
-#: ../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 "Chino simplificado"
-
-#: ../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 "Chino tradicional"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../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 "Cirílico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cirílico/Ruso"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cirílico/Ucraniano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Georgiano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Griego"
-
-#: ../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 "Hebreo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hebreo visual"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindú"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandés"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japonés"
-
-#: ../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 "Coreano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nórdico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persa"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Europa del sur"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Tailandés"
-
-#: ../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 "Turco"
-
-#: ../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 "Occidental"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Contactos favoritos"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Gente cerca"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Sin grupo"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:219
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "El servidor no puede encontrar el contacto: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Sin mensaje de eeror"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Mensaje instantáneo (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3037,7 +2169,7 @@ msgstr ""
 "Foundation; ya sea en la versión 2 de la Licencia, o (a su elección) "
 "cualquier versión posterior."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3049,7 +2181,7 @@ msgstr ""
 "PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General de GNU para "
 "más detalles."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3059,80 +2191,80 @@ msgstr ""
 "con Gossip ; si no, escriba a la Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 EE. UU."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un cliente de mensajería instantánea para GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr ": Cuentas en Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Cuentas en Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Existen modificaciones sin guardar en su cuenta %s."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Existen modificaciones sin guardar en su cuenta %.50s."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Aún no se ha guardado su cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Desconectado: sin conexión de red"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3142,28 +2274,29 @@ msgstr ""
 "soportado. Instale telepathy-haze y reinicie la sesión para migrar esta "
 "cuenta."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Editar los parámetros de la conexión…"
+#: ../src/empathy-accounts-dialog.c:716
+#| msgid "Edit Connection Parameters"
+msgid "_Edit Connection Parameters…"
+msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "¿Quiere quitar %s de su equipo?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "¿Quiere quitar %.50s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Esto no quitará su cuenta del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3172,24 +2305,24 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Activada"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3198,10 +2331,14 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Cuentas de mensajería y Voz IP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Añadir…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importar…"
@@ -3222,31 +2359,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "No hay «backends» de protocolos instalados"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr ": Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación de Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensajería instantánea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Error al contactar con el Gestor de cuentas"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3259,7 +2396,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "En una llamada"
 
@@ -3271,99 +2408,93 @@ msgstr ": Cliente de sonido/vídeo Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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:1131 ../src/empathy-call-window.c:1147
-msgid "i"
-msgstr "Información"
-
-#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Llamada de vídeo entrante de %s"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Llamada entrante de %s"
 
-#: ../src/empathy-call-window.c:1559
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Responder"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2176
 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-call-window.c:2183
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2185
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
 #: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
-#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Duracio�n"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3372,7 +2503,7 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3381,7 +2512,7 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3390,25 +2521,25 @@ 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-call-window.c:3120
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3127
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3139
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3419,32 +2550,32 @@ 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-call-window.c:3148
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "su balance actual es %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3241
 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:3244
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -3468,11 +2599,11 @@ msgstr "_Configuracio�n"
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "�nd_ice"
 
@@ -3560,19 +2691,19 @@ msgstr "Candidato local:"
 msgid "Audio"
 msgstr "Sonido"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr ": Cliente de chat Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
@@ -3580,11 +2711,11 @@ msgstr "Autoconectar"
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "¿Cerrar esta ventana?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3593,7 +2724,7 @@ msgstr ""
 "Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que "
 "se una de nuevo."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3608,65 +2739,65 @@ 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:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "¿Cerrar %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Cerrar la ventana"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Abandonar la sala"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, 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:692
+#: ../src/empathy-chat-window.c:684
 #, 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:708
+#: ../src/empathy-chat-window.c:700
 #, 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:717
+#: ../src/empathy-chat-window.c:709
 #, 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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, 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:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
@@ -3699,108 +2830,116 @@ msgid "Invite _Participant…"
 msgstr "Invitar pa_rticipante…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Unirse al chat"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "S_alir del chat"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "C_ontacto"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Pestañas"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Pestaña _anterior"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Pestaña _siguiente"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Deshacer cerrar pestaña"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Mover pestaña a la _izquierda"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Mover pestaña a la _derecha"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Desacoplar pestaña"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Mostrar un servicio en particular"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Depurador de Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Enlace a pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Respuesta de pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Enviar a pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3819,23 +2958,23 @@ msgstr ""
 "avanzados del <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy\">informe de error</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3843,70 +2982,70 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, 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:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s le está llamando. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación para unirse a %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s le ha invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Le han invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3916,105 +3055,105 @@ msgstr ""
 "Mensaje: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s en %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recibiendo «%s» de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando «%s» a %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Error al recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Error al recibir un archivo"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Error al enviar «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Error al enviar un archivo"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» recibido de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» enviado a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Transferencia de archivo completada"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Esperando la respuesta del otro participante"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Comprobando la integridad de «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obteniendo el «hash» de «%s»"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -4028,11 +3167,11 @@ msgstr ""
 "Eliminar transferencias de archivo completadas, canceladas y fallidas de la "
 "lista"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importar"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4040,49 +3179,49 @@ msgstr ""
 "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
 "soporta importar cuentas desde Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 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:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Miembros"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Falló al listar las salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4095,17 +3234,17 @@ msgstr ""
 "Se necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Unirse a sala"
 
@@ -4148,104 +3287,104 @@ msgstr "No se pudo cargar la lista de la sala"
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Respuesta"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Mensaje recibido"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Conversación nueva"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "El contacto se conecta"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "El contacto se desconecta"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Cuenta conectada"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Cuenta desconectada"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 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:654
+#: ../src/empathy-preferences.c:648
 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:657
+#: ../src/empathy-preferences.c:651
 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:660
+#: ../src/empathy-preferences.c:654
 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:663
+#: ../src/empathy-preferences.c:657
 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:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "Julieta se ha desconectado"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4257,7 +3396,7 @@ msgstr "Mostrar grupos"
 msgid "Show account balances"
 msgstr "Mostrar los balances de las cuentas"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2202
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4424,95 +3563,102 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-roster-window.c:464
-msgid "You need to setup an account to see contacts here."
+#: ../src/empathy-roster-window.c:493
+msgid "You need to set up an account to see contacts here."
 msgstr "Debe configurar una cuenta para ver contactos aquí."
 
-#: ../src/empathy-roster-window.c:540
+#: ../src/empathy-roster-window.c:569
 #, 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-roster-window.c:640
+#: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:644
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:659
+#: ../src/empathy-roster-window.c:689
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "La cuenta de %s requiere autorización"
 
-#: ../src/empathy-roster-window.c:670
+#: ../src/empathy-roster-window.c:700
 msgid "Online Accounts"
 msgstr "Cuentas en li�nea"
 
-#: ../src/empathy-roster-window.c:717
-msgid "Update software..."
+#: ../src/empathy-roster-window.c:747
+#| msgid "Update software..."
+msgid "Update software…"
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:723
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:727
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
-#: ../src/empathy-roster-window.c:732
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/empathy-roster-window.c:869
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
 msgstr "Recargar cuenta"
 
-#: ../src/empathy-roster-window.c:1551
+#: ../src/empathy-roster-window.c:1590
 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:1559
+#: ../src/empathy-roster-window.c:1598
 #, 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:1637
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
 msgstr "Cambie su presencia para ver contactos aquí"
 
-#: ../src/empathy-roster-window.c:1646
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-roster-window.c:1653
+#: ../src/empathy-roster-window.c:1692
 msgid "You haven't added any contact yet"
 msgstr "Todavi�a no ha añadido ningún contacto"
 
-#: ../src/empathy-roster-window.c:1656
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
 msgstr "No hay contactos no conectados"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_Conversación nueva…"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Conversación _nueva…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "_Llamada nueva…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4520,11 +3666,13 @@ msgid "Contacts"
 msgstr "Contactos"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Añadir contactos…"
+#| msgid "_Add Contact…"
+msgid "_Add Contacts…"
+msgstr "_Añadir contacto…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+#| msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Buscar contactos…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4536,7 +3684,8 @@ msgid "_Rooms"
 msgstr "_Salas"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+#| msgid "_Join"
+msgid "_Join…"
 msgstr "_Unirse…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
@@ -4581,33 +3730,19 @@ msgid "Go _Online"
 msgstr "Mostrarse _conectado"
 
 #: ../src/empathy-roster-window.ui.h:3
-#| msgid "Show offline contacts"
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos _desconectados"
 
-#: ../src/empathy-roster-window.ui.h:4
-#| msgid "_Add Contacts..."
-msgid "_Add Contact..."
-msgstr "_Añadir contacto…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "Conversación _nueva…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "_Llamada nueva…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Hecho"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Introduzca los detalles de su cuenta"
 
@@ -4619,3 +3754,592 @@ msgstr "Editar las opciones de la cuenta %s"
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 msgid "Integrate your IM accounts"
 msgstr "Importar sus cuentas de mensajería instantánea"
+
+#~ msgid "Password not found"
+#~ msgstr "No se encontró la contraseña"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "Contraseña de la cuenta IM para %s (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "Contraseña para la sala de chat «%s» en la cuenta %s (%s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "hace %d segundo"
+#~ msgstr[1] "hace %d segundos"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "hace %d minuto"
+#~ msgstr[1] "hace %d minutos"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "hace %d hora"
+#~ msgstr[1] "hace %d horas"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "hace %d día"
+#~ msgstr[1] "hace %d días"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "hace %d semana"
+#~ msgstr[1] "hace %d semanas"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "hace %d mes"
+#~ msgstr[1] "hace %d meses"
+
+#~ msgid "in the future"
+#~ msgstr "en el futuro"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo Japón"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Chat de Facebook"
+
+#~ msgid "Pass_word"
+#~ msgstr "Contra_seña"
+
+#~ msgid "Screen _Name"
+#~ msgstr "_Nombre en pantalla"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+
+#~ msgid "_Port"
+#~ msgstr "_Puerto"
+
+#~ msgid "_Server"
+#~ msgstr "_Servidor"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzadas"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "¿Cuál es su nombre en pantalla para AIM?"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "¿Cuál es su contraseña de AIM?"
+
+#~ msgid "Remember Password"
+#~ msgstr "Recordar contraseña"
+
+#~ msgid "Password"
+#~ msgstr "Contraseña"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Port"
+#~ msgstr "Puerto"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s:"
+
+#~ msgid "Username:"
+#~ msgstr "Nombre de usuario:"
+
+#~ msgid "A_pply"
+#~ msgstr "_Aplicar"
+
+#~ msgid "L_og in"
+#~ msgstr "Iniciar _sesión"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "Esta cuenta ya existe en el servidor"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "Crear una cuenta nueva en el servidor"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%1$s en %2$s"
+
+#~ msgid "%s Account"
+#~ msgstr "Cuenta %s"
+
+#~ msgid "New account"
+#~ msgstr "Cuenta nueva"
+
+#~ msgid "Login I_D"
+#~ msgstr "_ID de inicio de sesión"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>Ejemplo:</b> usuario"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "¿Cuál es su ID de usuario para GroupWise?"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "¿Cuál es su contraseña de GroupWise?"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "_UIN ICQ"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>Ejemplo:</b> 123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "C_onjunto de caracteres"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "¿Cuál es su UIN de ICQ?"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "¿Cuál es su contraseña de ICQ?"
+
+#~ msgid "Network"
+#~ msgstr "Red"
+
+#~ msgid "Character set"
+#~ msgstr "Conjunto de caracteres"
+
+#~ msgid "Up"
+#~ msgstr "Subir"
+
+#~ msgid "Down"
+#~ msgstr "Abajo"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ 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."
+
+#~ msgid "Nickname"
+#~ msgstr "Apodo"
+
+#~ msgid "Quit message"
+#~ msgstr "Mensaje de salida"
+
+#~ msgid "Real name"
+#~ msgstr "Nombre real"
+
+#~ msgid "Username"
+#~ msgstr "Nombre de usuario"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "¿Qué red de IRC?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "¿Cuál es su apodo del IRC?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "¿Cuál es su usuario de Facebook?"
+
+#~ 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 ""
+#~ "Este es su nombre de usuario, no su inicio de sesión normal en Facebook.\n"
+#~ "Si es facebook.com/<b>usuario</b>, introduzca <b>usuario</b>.\n"
+#~ "Use <a href=\"http://www.facebook.com/username/\">esta página</a> para "
+#~ "elegir un nombre de usuario en Facebook si no tiene uno."
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "¿Cuál es su contraseña de Facebook?"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "¿Cuál es su ID de Google?"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>Ejemplo:</b> usuario@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "¿Cuál es su contraseña de Google?"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>Ejemplo:</b> usuario@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "_Ignorar los errores de certificados SSL"
+
+#~ msgid "Priori_ty"
+#~ msgstr "Pri_oridad"
+
+#~ msgid "Reso_urce"
+#~ msgstr "Re_curso"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "Requiere ci_frado (TLS/SSL)"
+
+#~ msgid "Override server settings"
+#~ msgstr "Sobreescribir los ajustes del servidor"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "Usar SS_L antiguo"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "¿Cuál es su ID de Jabber?"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "¿Cuál es su contraseña de Jabber?"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "¿Cuál es la contraseña que quiere para Jabber?"
+
+#~ msgid "Nic_kname"
+#~ msgstr "Apo_do"
+
+#~ msgid "_Last Name"
+#~ msgstr "Ape_llido"
+
+#~ msgid "_First Name"
+#~ msgstr "_Nombre"
+
+#~ msgid "_Published Name"
+#~ msgstr "Nombre p_ublicado"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "ID _Jabber"
+
+#~ msgid "E-_mail address"
+#~ msgstr "Dirección de correo-_e"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>Ejemplo:</b> usuario@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "¿Cuál es su ID de Windows Live?"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "¿Cuál es su contraseña de Windows Live?"
+
+#~ msgid "Auto"
+#~ msgstr "Auto"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "Registrador"
+
+#~ msgid "Options"
+#~ msgstr "Opciones"
+
+#~ msgid "None"
+#~ msgstr "Ninguno"
+
+#~ msgid "_Username"
+#~ msgstr "Nombre de _usuario"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>Ejemplo:</b> usuario@mi.servidor.sip"
+
+#~ 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 "NAT Traversal Options"
+#~ msgstr "Opciones de NAT transversal"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opciones del proxy"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "Opciones de miscelánea"
+
+#~ msgid "STUN Server"
+#~ msgstr "Servidor STUN"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "Descubrir el servidor STUN automáticamente"
+
+#~ msgid "Discover Binding"
+#~ msgstr "Descubrir vinculación"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "Opciones de «keepalive»"
+
+#~ msgid "Mechanism"
+#~ msgstr "Mecanismo"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "Intervalo (segundos)"
+
+#~ msgid "Authentication username"
+#~ msgstr "Nombre de usuario para la autenticación"
+
+#~ msgid "Transport"
+#~ msgstr "Transporte"
+
+#~ msgid "Loose Routing"
+#~ msgstr "Enrutado impreciso"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "Ignorar errores TLS"
+
+#~ msgid "Local IP Address"
+#~ msgstr "Dirección IP local"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "¿Cuál es su ID de inicio de sesión SIP?"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "¿Cuál es la contraseña de su cuenta SIP?"
+
+#~ msgid "Pass_word:"
+#~ msgstr "Contra_seña:"
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "I_D de Yahoo!:"
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "_Ignorar invitaciones a conferencias y salas de chat"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "Configuración de la lista de _salas:"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "C_onjunto de caracteres:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Puerto:"
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "¿Cuál es su ID de Yahoo!?"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "¿Cuál es su contraseña de Yahoo!?"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "No se pudo convertir la imagen"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "Su sistema no soporta ninguno de los formatos de imagen aceptados"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "No se pudo guardar la imagen a un archivo"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "Seleccione su imagen de avatar"
+
+#~ msgid "Take a picture..."
+#~ msgstr "Tomar una imagen…"
+
+#~ msgid "No Image"
+#~ msgstr "Sin imagen"
+
+#~ msgid "Images"
+#~ msgstr "Imágenes"
+
+#~ msgid "All Files"
+#~ msgstr "Todos los archivos"
+
+#~ msgid "Select..."
+#~ msgstr "Seleccionar…"
+
+#~ msgid "_Select"
+#~ msgstr "_Seleccionar"
+
+#~ msgid "Full name"
+#~ msgstr "Nombre completo"
+
+#~ msgid "Phone number"
+#~ msgstr "Nu�mero de tele�fono"
+
+#~ msgid "E-mail address"
+#~ msgstr "Dirección de correo-e"
+
+#~ msgid "Website"
+#~ msgstr "Página web"
+
+#~ msgid "Birthday"
+#~ msgstr "Cumpleaños"
+
+#~ msgid "Last seen:"
+#~ msgstr "Última actividad:"
+
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
+
+#~ msgid "Connected from:"
+#~ msgstr "Conectado desde:"
+
+#~ msgid "Away message:"
+#~ msgstr "Mensaje de ausencia:"
+
+#~ msgid "work"
+#~ msgstr "trabajo"
+
+#~ msgid "home"
+#~ msgstr "personal"
+
+#~ msgid "mobile"
+#~ msgstr "móvil"
+
+#~ msgid "voice"
+#~ msgstr "voz"
+
+#~ msgid "preferred"
+#~ msgstr "preferido"
+
+#~ msgid "postal"
+#~ msgstr "postal"
+
+#~ msgid "parcel"
+#~ msgstr "grupo"
+
+#~ msgid "New Network"
+#~ msgstr "Red nueva"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "Elegir una red IRC"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "Rei_niciar lista de redes"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Seleccionar"
+
+#~ msgid "new server"
+#~ msgstr "servidor nuevo"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "Cuenta de %s nueva"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "Conéctese para editar su información personal."
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>Detalles personales</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "Configuración regional actual"
+
+#~ msgid "Arabic"
+#~ msgstr "�rabe"
+
+#~ msgid "Armenian"
+#~ msgstr "Armenio"
+
+#~ msgid "Baltic"
+#~ msgstr "Báltico"
+
+#~ msgid "Celtic"
+#~ msgstr "Celta"
+
+#~ msgid "Central European"
+#~ msgstr "Centroeuropeo"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "Chino simplificado"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "Chino tradicional"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Cirílico"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "Cirílico/Ruso"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "Cirílico/Ucraniano"
+
+#~ msgid "Georgian"
+#~ msgstr "Georgiano"
+
+#~ msgid "Greek"
+#~ msgstr "Griego"
+
+#~ msgid "Gujarati"
+#~ msgstr "Gujarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhi"
+
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "Hebreo visual"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindú"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandés"
+
+#~ msgid "Japanese"
+#~ msgstr "Japonés"
+
+#~ msgid "Korean"
+#~ msgstr "Coreano"
+
+#~ msgid "Nordic"
+#~ msgstr "Nórdico"
+
+#~ msgid "Persian"
+#~ msgstr "Persa"
+
+#~ msgid "Romanian"
+#~ msgstr "Rumano"
+
+#~ msgid "South European"
+#~ msgstr "Europa del sur"
+
+#~ msgid "Thai"
+#~ msgstr "Tailandés"
+
+#~ msgid "Turkish"
+#~ msgstr "Turco"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Western"
+#~ msgstr "Occidental"
+
+#~ msgid "Vietnamese"
+#~ msgstr "Vietnamita"
+
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "_Editar los parámetros de la conexión…"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Conversación nueva…"
+
+#~ msgid "New _Call..."
+#~ msgstr "_Llamada nueva…"
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "_Añadir contactos…"
+
+#~ msgid "_Join..."
+#~ msgstr "_Unirse…"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Añadir contacto…"
+
+#~ msgid "i"
+#~ msgstr "Información"
diff --git a/po/fr.po b/po/fr.po
index f8841087e..ed2168977 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -28,8 +28,8 @@ 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: 2013-01-09 14:05+0000\n"
-"PO-Revision-Date: 2013-03-14 16:39+0100\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-03 23:57+0200\n"
 "Last-Translator: Frederic Peters <fpeters@0d.be>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
 "Language: \n"
@@ -515,36 +515,10 @@ msgstr ""
 "Indique si Empathy peut publier la position de l'utilisateur à ses contacts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy peut utiliser le réseau pour découvrir la position"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Indique si Empathy peut utiliser le réseau pour découvrir la position."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy peut utiliser le réseau cellulaire pour découvrir la position"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indique si Empathy peut utiliser le réseau cellulaire pour découvrir la "
-"position."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy peut utiliser le GPS pour découvrir la position"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Indique si Empathy peut utiliser le GPS pour découvrir la position."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy doit réduire la précision de la position"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -575,7 +549,7 @@ msgstr "Erreur lors du téléchargement du fichier"
 msgid "The other participant is unable to transfer the file"
 msgstr "Le correspondant n'est pas capable de transférer le fichier"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -596,217 +570,157 @@ msgstr "Le fichier sélectionné n'est pas un fichier conventionnel"
 msgid "The selected file is empty"
 msgstr "Le fichier sélectionné est vide"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Mot de passe introuvable"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Mot de passe du compte de messagerie instantanée pour %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Mot de passe pour le salon de discussion « %s » sur le compte %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Appel manqué de %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Conversation avec %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Appel de %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "il y a %d seconde"
-msgstr[1] "il y a %d secondes"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "il y a %d minute"
-msgstr[1] "il y a %d minutes"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "il y a %d heure"
-msgstr[1] "il y a %d heures"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "il y a %d jour"
-msgstr[1] "il y a %d jours"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "il y a %d semaine"
-msgstr[1] "il y a %d semaines"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "il y a %d mois"
-msgstr[1] "il y a %d mois"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "dans le futur"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Occupé"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Absent"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Déconnecté"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Aucune raison n'a été indiquée"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "L'état est « déconnecté »"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Erreur réseau"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Erreur de chiffrement"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nom déjà utilisé"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Certificat non fourni"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Certificat non validé"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Le certificat a expiré"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certificat non activé"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Le nom de l'hôte du certificat ne correspond pas"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "L'empreinte du certificat ne correspond pas"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certificat auto-signé"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Erreur de certificat"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Chiffrement non disponible"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Le certificat n'est pas valide"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "La connexion a été refusée"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "La connexion ne peut pas être établie"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "La connexion a été perdue"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Ce compte est déjà connecté au serveur"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "La connexion a été remplacée par une nouvelle connexion utilisant la même "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Ce compte existe déjà sur le serveur"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Le serveur est actuellement trop chargé pour traiter la connexion"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Le certificat a été révoqué"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Le certificat utilise un algorithme de chiffrement douteux ou est "
 "cryptographiquement faible"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -815,593 +729,33 @@ msgstr ""
 "certificat du serveur dépasse les limites imposées par la bibliothèque de "
 "cryptographie"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Votre version de logiciel est trop vieille"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Erreur interne"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Personnes à proximité"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japon"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Discussion Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Tous les comptes"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Mot de passe"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "_Nom à l'écran"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exemple :</b> MonNomEcran"
-
-#. 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 "Se souvenir du mot de passe"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Serveur"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Avancé"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Quel est votre nom à l'écran AIM ?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Quel est votre mot de passe 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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Se souvenir du mot de passe"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Compte"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Mot de passe"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Serveur"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Port"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s :"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "A_ppliquer"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Se _connecter"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Ce compte existe déjà sur le serveur"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Créer un nouveau compte sur le serveur"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s sur %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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Compte %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nouveau compte"
-
-#: ../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_dentifiant de connexion"
-
-#: ../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>Exemple :</b> nom_utilisateur"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Quel est votre identifiant utilisateur GroupWise ?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Quel est votre mot de passe GroupWise ?"
-
-#: ../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>Exemple :</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Jeu de c_aractères"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Quel est votre UIN ICQ ?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Quel est votre mot de passe ICQ ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Réseau"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Jeu de caractères"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Ajouter…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Supprimer"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "En haut"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "En bas"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Serveurs"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"La plupart des serveurs IRC ne nécessitent pas de mot de passe. Si vous "
-"n'êtes pas sûr, n'en saisissez pas."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Pseudonyme"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Message de départ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nom réel"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Quel réseau IRC ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Quel est votre pseudonyme IRC ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Quel est votre nom d'utilisateur Facebook ?"
-
-#  'blaireau' has been judged an offensive name in French
-#. 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 ""
-"C'est votre nom d'utilisateur, pas votre identifiant Facebook.\n"
-"Si vous êtes facebook.com/<b>castor</b>, saisissez <b>castor</b>.\n"
-"Utilisez <a href=\"http://www.facebook.com/username/\">cette page</a> pour "
-"choisir un nom d'utilisateur Facebook si vous n'en avez pas un."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Quel est votre mot de passe Facebook ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Quel est votre identifiant Google ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exemple :</b> utilisateur@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Quel est votre mot de passe Google ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Exemple :</b> nom@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorer les erreurs de certificat SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Pri_orité"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "Resso_urce"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Chiffr_ement requis (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Outrepasser les paramètres du serveur"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Utiliser l'ancien SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Quel est votre identifiant Jabber ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Que souhaitez-vous comme identifiant Jabber ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Quel est votre mot de passe Jabber ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Que souhaitez-vous comme mot de passe Jabber ?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "P_seudonyme"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_Nom"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Prénom"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "Nom p_ublié"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID"
-msgstr "_Identifiant Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "A_dresse électronique"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Exemple :</b> nom@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Quel est votre identifiant Windows Live ?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Quel est votre mot de passe Windows Live ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Enregistrer"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Options"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Aucun"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Nom d'utilisateur"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Exemple :</b> nom@mon.serveur.sip"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"Utiliser ce compte pour appeler des _lignes fixes ou des téléphones mobiles"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Options de parcours NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Options de serveur mandataire"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Options diverses"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Serveur STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Découvrir automatiquement le serveur STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Découvrir la liaison"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Options de connexions persistantes"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mécanisme"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervalle (secondes)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Nom d'utilisateur pour l'authentification"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Transport"
-
-# Je ne trouve pas de traduction donc j'ai laissé en anglais et mis le terme approximatif entre parenthèses
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Loose Routing (routage non strict)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorer les erreurs TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Adresse IP locale"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Quel est votre identifiant de connexion SIP ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Quel est votre mot de passe de compte SIP ?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Mot de passe :"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "I_dentifiant Yahoo! :"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "I_gnore conference and chat room invitations"
-msgstr ""
-"_Ignorer les invitations à des conférences ou à des salons de discussion"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Codage de la liste des _salons :"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Jeu de c_aractères :"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port :"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Quel est votre identifiant Yahoo! ?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Quel est votre mot de passe Yahoo! ?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Impossible de convertir l'image"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Aucun des formats d'image acceptés n'est pris en charge par votre système"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Impossible d'enregistrer l'image dans le fichier"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Sélection de l'image d'avatar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Prendre une photo..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Aucune image"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Images"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Tous les fichiers"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Cliquer pour agrandir"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "L'authentification a échoué pour le compte <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Réessayer"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1411,74 +765,71 @@ msgstr ""
 "Saisissez le mot de passe du compte\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Sélectionner..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Sélectionner"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Se souvenir du mot de passe"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Une erreur est survenue au démarrage de l'appel"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Le contact spécifié ne prend pas en charge les appels"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Le contact spécifié est hors ligne."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Le contact spécifié n'est pas valable"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr ""
 "L'utilisation des appels d'urgence n'est pas pris en charge par ce protocole"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Vous n'avez pas assez de crédit pour passer cet appel"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Impossible d'ouvrir une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr ""
 "L'utilisation d'un sujet n'est pas pris en charge par cette conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Vous n'êtes pas autorisé à modifier le sujet"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Identifiant de contact non valide"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear : efface tous les messages de la conversation actuelle"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <sujet> : définit le sujet de la conversation actuelle"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id du salon> : rejoint un nouveau salon de discussion"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id du salon> : rejoint un nouveau salon de discussion"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1486,24 +837,24 @@ msgstr ""
 "/part [<id du salon>] [<raison>] : quitte le salon de discussion ; par "
 "défaut, le salon actuel"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id du contact> [<message>] : ouvre une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id du contact> <message> : ouvre une discussion privée"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonyme> : modifie votre pseudonyme sur le serveur actuel"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <message> : envoie un message d'action dans la conversation actuelle"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../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 "
@@ -1513,12 +864,12 @@ msgstr ""
 "pour envoyer un message commençant par un « / ». Par exemple : « /say /join "
 "est utilisé pour rejoindre un nouveau salon de discussion »"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 "/whois <id du contact> : affiche les informations à propos de ce contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1526,127 +877,127 @@ msgstr ""
 "/help [<commande>] : affiche toutes les commandes prises en charge. Si "
 "<commande> est définie, affiche son utilisation."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilisation : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Commande inconnue ; utilisez /help pour obtenir les commandes disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "solde insuffisant pour envoyer un message"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erreur à l'envoi du message « %s » : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Erreur à l'envoi du message : %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "solde insuffisant pour envoyer un message. <a href='%s'>Créditer</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "non capable"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "déconnecté"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "contact non valide"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "permission refusée"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "message trop long"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "non implémenté"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Sujet :"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Sujet défini : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Sujet défini par %s à : %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Pas de sujet défini"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(aucune suggestion)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Ajouter « %s » au dictionnaire"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Ajouter « %s » au dictionnaire %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Insérer la frimousse"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Envoyer"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Suggestions orthographiques"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Impossible de retrouver les journaux récents"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s s'est déconnecté"
@@ -1654,12 +1005,12 @@ msgstr "%s s'est déconnecté"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s a été expulsé par %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s a été expulsé"
@@ -1667,17 +1018,17 @@ msgstr "%s a été expulsé"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s a été banni par %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s a été banni"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s a quitté le salon"
@@ -1687,17 +1038,17 @@ msgstr "%s a quitté le salon"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s a rejoint le salon"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant connu sous le nom de %s"
@@ -1705,50 +1056,50 @@ msgstr "%s est maintenant connu sous le nom de %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:2989 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Déconnecté"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Souhaitez-vous enregistrer ce mot de passe ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Conserver"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Pas maintenant"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Mot de passe incorrect ; essayez de nouveau :"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Ce salon est protégé par un mot de passe :"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Rejoindre"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Conversation"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1779,8 +1130,8 @@ msgstr "Modifier les contacts bloqués"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1790,120 +1141,64 @@ msgstr "Compte :"
 msgid "Blocked Contacts"
 msgstr "Contacts bloqués"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nom complet"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Numéro de téléphone"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Adresse électronique"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Site Web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Anniversaire"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Dernière consultation :"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Serveur :"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Connecté de :"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Message d'absence :"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "travail"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "maison"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobile"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "voix"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "préféré"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "postal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "paquet"
+#: ../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 "Supprimer"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Recherche de contacts"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Rechercher : "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "A_jouter le contact"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Aucun contact trouvé"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr ""
+"La recherche de contacts n'est pas prise en charge sur ce compte"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Le message vous présentant :"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Merci de m'autoriser à voir quand vous êtes connecté !"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Enregistrer l'avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Impossible d'enregistrer l'avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Compte"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifiant"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alias"
 
@@ -1937,11 +1232,11 @@ msgstr "Version"
 msgid "Client"
 msgstr "Client"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Groupes"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1949,121 +1244,126 @@ msgstr ""
 "Sélectionnez les groupes auxquels ce contact appartiendra ; vous pouvez "
 "sélectionner plus d'un groupe ou aucun groupe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Ajouter un groupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Sélectionner"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Groupe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nouveau contact"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquer %s ?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Voulez-vous vraiment empêcher « %s » de vous contacter à nouveau ?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La personne suivante va être bloquée :"
 msgstr[1] "Les personnes suivantes vont être bloquées :"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "La personne suivante ne peut pas être bloquée :"
 msgstr[1] "Les personnes suivantes ne peuvent pas être bloquées :"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Bloquer"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Signaler ce contact comme abusif"
 msgstr[1] "_Signaler ces contacts comme abusifs"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Modifier les informations du contact"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Contacts liés"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts n'est pas installé"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Installez gnome-contacts pour accéder aux détails des contacts."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Sélectionner le compte à utiliser pour passer l'appel"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Appel"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Travail"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Maison"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Bloquer le contact"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Retirer du _groupe « %s »"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Supprimer et _bloquer"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Voulez-vous vraiment supprimer le contact « %s » ?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2072,219 +1372,220 @@ msgstr ""
 "Voulez-vous vraiment supprimer le contact lié « %s » ? Sachez que cela "
 "supprimera tous les contacts qui composent ce contact lié."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Suppression du contact"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Supprimer"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "Dis_cussion"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Appel _audio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Appel _vidéo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Conversations _précédentes"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Envoyer un fichier"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Partager mon bureau"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favori"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_mations"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifier"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Vous invite à ce salon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Inviter à un salon de discussion"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "A_jouter un contact…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Suppression du groupe"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Canaux :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Code ISO du pays :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Pays :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "État :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Ville :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Région :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Code postal :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Rue :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Bâtiment :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Étage :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Texte :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Description :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Niveau de précision :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Erreur :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Erreur verticale (mètres) :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Erreur horizontale (mètres) :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Vitesse :"
 
 # http://fr.wikipedia.org/wiki/Rel%C3%A8vement
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Relèvement :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Vitesse ascensionnelle :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Dernière mise à jour le :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Longitude :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Latitude :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Altitude :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Position"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y à %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias :"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifiant :"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2299,32 +1600,7 @@ msgstr "<b>Position</b> le (date)"
 msgid "Online from a phone or mobile device"
 msgstr "En ligne à partir d'un téléphone ou d'un appareil portable"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Nouveau réseau"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Choisir un réseau IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Réi_nitialiser la liste des réseaux"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Sélectionner"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nouveau serveur"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2334,11 +1610,11 @@ msgstr ""
 "connectées sur le même réseau que vous. Si vous voulez utiliser cette "
 "fonctionnalité, vérifiez que les détails ci-dessous sont corrects."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Personnes à proximité"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2347,136 +1623,136 @@ msgstr ""
 "fonctionnalité en choisissant <span style=\"italic\">Édition → Comptes</"
 "span> dans la liste des contacts."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Historique"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Afficher"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Rechercher"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Discussion par %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Discussion avec %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s :</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s seconde"
 msgstr[1] "%s secondes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minute"
 msgstr[1] "%s minutes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "L'appel a duré %s, s'est terminé à %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Hier"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "N'importe quand"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "N'importe qui"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Qui"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Quand"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "N'importe quoi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Textes de discussion"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Appels"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Appels entrants"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Appels sortants"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Appels manqués"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Quoi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Vouez-vous vraiment effacer tout l'historique des conversations précédentes ?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Tout effacer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Effacer à partir de :"
 
@@ -2485,20 +1761,20 @@ msgid "_File"
 msgstr "_Fichier"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "É_dition"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Effacer tout l'historique..."
+msgid "Delete All History…"
+msgstr "Effacer tout l'historique…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Discuter"
 
@@ -2512,112 +1788,116 @@ 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\">Chargement...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Chargement…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Quel type de compte de discussion possédez-vous ?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Ajout d'un nouveau compte"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Ajouter un nouveau compte"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Saisissez un identifiant de contact ou un numéro de téléphone :"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Appel _vidéo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Appel _audio"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nouvel appel"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Le contact est hors ligne."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Le contact spécifié n'est pas valable ou inconnu"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Le contact ne prend pas en charge ce type de conversation"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "La fonctionnalité requise n'est pas implémentée pour ce protocole"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Impossible de démarrer une conversation avec le contact spécifié"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Vous êtes banni de ce canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Ce canal est plein"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Vous devez être invité pour rejoindre ce canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Impossible de poursuivre en étant déconnecté"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Permission refusée"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Une erreur est survenue au démarrage de la conversation"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nouvelle conversation"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Mot de passe nécessaire"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Message personnalisé…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Édition des messages personnalisés…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Cliquez pour supprimer cet état des favoris"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Cliquez pour ajouter cet état aux favoris"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2627,25 +1907,16 @@ msgstr ""
 "<small><i>Appuyez sur Entrée pour définir le nouveau message ou sur Échap. "
 "pour annuler.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Changer l'état"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Messages personnalisés…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nouveau compte %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Respecter la casse"
 
@@ -2669,167 +1940,167 @@ msgstr "Respe_cter la casse"
 msgid "Phrase not found"
 msgstr "Phrase introuvable"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Réception d'un message instantané"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Envoi d'un message instantané"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Réception d'une demande de discussion"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Contact connecté"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Contact déconnecté"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Connecté au serveur"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Déconnecté du serveur"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Appel vocal entrant"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Appel vocal sortant"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Appel vocal terminé"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Édition des messages personnalisés"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Requête d'abonnement"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s aimerait être autorisé à savoir si vous êtes en ligne"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Refuser"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Accepter"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Message modifié à %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 "L'identité fournie par le serveur de discussion ne peut pas être vérifiée."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Le certificat n'a pas été signé par une autorité de certification."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Le certificat a expiré."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Le certificat n'a pas encore été activé."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Le certificat n'a pas l'empreinte attendue."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Le nom d'hôte du certificat ne correspond pas au nom du serveur."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Le certificat est auto-signé."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Le certificat a été révoqué par l'autorité de certification d'origine."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Le certificat est cryptographiquement faible."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "La taille du certificat dépasse les limites vérifiables."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Le certificat n'est pas correct."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nom d'hôte attendu : %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nom d'hôte du certificat : %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "C_ontinuer"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Connexion non sécurisée"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "La connexion n'est pas sécurisée, voulez-vous tout de même continuer ?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Se souvenir de ce choix pour les prochaines connexions"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Détails du certificat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Impossible d'ouvrir l'URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Sélectionner un fichier"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Espace disque insuffisant pour enregistrer le fichier"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2838,225 +2109,54 @@ msgstr ""
 "Un espace libre de %s est nécessaire pour enregistrer ce fichier mais "
 "seulement %s sont disponibles. Veuillez choisir un autre emplacement."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Fichier entrant de %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Mettez-vous en ligne pour modifier vos informations personnelles."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Détails personnels</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Copier l'adresse du lien"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Ouvrir le lien"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Inspecter le HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Locale actuelle"
-
-#: ../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 "Arabe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Arménien"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Balte"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Celtique"
-
-#: ../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 "Européen central"
-
-#: ../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 "Chinois simplifié"
-
-#: ../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 "Chinois traditionnel"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Croate"
-
-#: ../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 "Cyrillique"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cyrillique/Russe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cyrillique/Ukrainien"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Géorgien"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Grec"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Gujarâtî"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "Gurmukhī"
-
-#: ../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 "Hébreu"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hébreu visuel"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandais"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japonais"
-
-#: ../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 "Coréen"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nordique"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Perse"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Roumain"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Européen méridional"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Thaï"
-
-#: ../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 "Turc"
-
-#: ../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 "Occidental"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamien"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Fréquents et favoris"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Personnes à proximité"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Non groupés"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Le serveur ne peut pas trouver le contact : %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Pas de message d'erreur"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Message instantané (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3068,7 +2168,7 @@ msgstr ""
 "publiée par la Free Software Foundation ; version 2 de la licence ou (à "
 "votre discrétion) toute version ultérieure."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3080,7 +2180,7 @@ msgstr ""
 "D'ADÉQUATION À UN BESOIN PARTICULIER. Pour plus de détails, voir la Licence "
 "Publique Générale GNU."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3090,11 +2190,11 @@ msgstr ""
 "Empathy ; si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client de messagerie instantanée pour GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Frédéric Brin <duckx@mezimail.com>\n"
@@ -3116,73 +2216,73 @@ msgstr ""
 "Bruno Brouard <annoa.b@gmail.com>\n"
 "Alain Lojewski <allomervan@gmail.com>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "N'affiche aucune boîte de dialogue ; effectue la tâche (par ex. importation) "
 "et quitte"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "N'affiche aucune boîte de dialogue à moins qu'il n'y ait que des comptes "
 "« Personnes à proximité »"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Sélectionne au départ le compte indiqué (par ex. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<id_du_compte>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- comptes Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Comptes Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Votre compte %s comporte des modifications non enregistrées."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Votre compte %.50s comporte des modifications non enregistrées."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Votre nouveau compte n'est pas encore enregistré."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Connexion en cours…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Hors ligne — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Déconnecté — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Hors ligne — Pas de connexion réseau"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3192,28 +2292,28 @@ msgstr ""
 "charge. Installez telepathy-haze et redémarrez votre session pour migrer le "
 "compte."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Hors ligne — Compte désactivé"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Modifier les paramètres de la connexion"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Modifier les paramètres de la connexion..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "_Modifier les paramètres de la connexion…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Voulez-vous supprimer %s de votre ordinateur ?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Voulez-vous supprimer %.50s de votre ordinateur ?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Cela ne supprimera pas votre compte sur le serveur."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3222,24 +2322,24 @@ msgstr ""
 "annulera vos modifications. Voulez-vous vraiment continuer ?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Activé"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Ignorer"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "Se _connecter"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3248,10 +2348,14 @@ msgstr ""
 "vos modifications. Voulez-vous vraiment continuer ?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Comptes de messagerie et VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Ajouter…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importer…"
@@ -3272,33 +2376,33 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Aucun moteur de protocole installé"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Client d'authentification de Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Client d'authentification de Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Ne pas se connecter au démarrage"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne pas afficher la liste des contacts ou d'autres boîtes de dialogue au "
 "démarrage"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Client de messagerie instantanée Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Erreur de connexion au gestionnaire de compte"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3311,7 +2415,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Appel en cours"
 
@@ -3323,93 +2427,93 @@ msgstr "- Client audio/vidéo de Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Client audio/vidéo de Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s vient d'essayer de vous appeler mais vous étiez déjà en ligne."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Appel vidéo entrant de %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Appel entrant de %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Rejeter"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Répondre"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Conversation avec %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "L'adresse IP vue par la machine"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'adresse IP vue par un serveur sur Internet"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'adresse IP du client vue de l'autre côté"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "L'adresse IP d'un serveur relais"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "L'adresse IP du groupe multidiffusion"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "En attente"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Muet"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Durée"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Détails techniques"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3418,7 +2522,7 @@ msgstr ""
 "Le logiciel de %s ne comprend aucun des formats audio pris en charge par "
 "votre ordinateur"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3427,7 +2531,7 @@ msgstr ""
 "Le logiciel de %s ne comprend aucun des formats vidéo pris en charge par "
 "votre ordinateur"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3436,25 +2540,25 @@ msgstr ""
 "Impossible d'établir une connexion avec %s. L'un d'entre vous utilise peut-"
 "être un réseau qui n'autorise pas les connexions directes."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Il y a eu une panne sur le réseau"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Les formats audio nécessaires pour cet appel ne sont pas installés sur votre "
 "ordinateur"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Les formats vidéo nécessaires pour cet appel ne sont pas installés sur votre "
 "ordinateur"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3465,32 +2569,32 @@ msgstr ""
 "\"%s\">Signalez cette anomalie</a> et joignez les journaux récupérés à "
 "l'aide de la fenêtre « débogage » dans le menu d'aide."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Erreur dans le moteur d'appel"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "La fin du flux a été atteinte"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Impossible d'établir le flux audio"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Impossible d'établir le flux vidéo"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Votre crédit actuel est %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Désolé, vous n'avez pas assez de crédit pour cet appel."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Créditer"
 
@@ -3514,11 +2618,11 @@ msgstr "_Paramètres"
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Sommaire"
 
@@ -3606,19 +2710,19 @@ msgstr "Candidat local :"
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Client de discussion Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Salon"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Connexion automatique"
 
@@ -3626,11 +2730,11 @@ msgstr "Connexion automatique"
 msgid "Manage Favorite Rooms"
 msgstr "Gérer les salons favoris"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Voulez-vous fermer cette fenêtre ?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3639,7 +2743,7 @@ msgstr ""
 "La fermeture de cette fenêtre quittera %s. Vous ne recevrez plus aucun "
 "message tant que vous ne le rejoignez pas."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3654,65 +2758,65 @@ msgstr[1] ""
 "La fermeture de cette fenêtre quittera %u salons de discussion. Vous ne "
 "recevrez plus aucun message tant que vous ne les rejoignez pas."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Quitter %s ?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "Vous ne recevrez plus aucun message tant que vous ne le rejoignez pas."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Fermer la fenêtre"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Quitter le salon"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non lu)"
 msgstr[1] "%s (%d non lus)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (et %u autre)"
 msgstr[1] "%s (et %u autres)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non lu des autres)"
 msgstr[1] "%s (%d non lus des autres)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non lu de tous)"
 msgstr[1] "%s (%d non lus de tous)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS :"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Envoi de %d message"
 msgstr[1] "Envoi de %d messages"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Saisie d'un message."
 
@@ -3745,109 +2849,117 @@ msgid "Invite _Participant…"
 msgstr "Inviter un _participant…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "Re_joindre une discussion"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Q_uitter la discussion"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "C_ontact"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Onglets"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Onglet _précédent"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Onglet _suivant"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Rouvrir l'onglet fermé"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Déplacer l'onglet à _gauche"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Déplacer l'onglet à _droite"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Détacher l'onglet"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Afficher un service particulier"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Débogueur de Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Débogueur de Empathy"
 
 # Titre de fenêtre
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Enregistrer"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Lien Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Réponse Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Trop de données pour un collage simple. Enregistrez les journaux dans des "
 "fichiers."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Fenêtre de débogage"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Envoyer vers Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Débogage"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informations"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Message"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Avertissement"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Critique"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Erreur"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3866,23 +2978,23 @@ msgstr ""
 "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">rapport.</"
 "a>"
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Heure"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domaine"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Catégorie"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3890,70 +3002,70 @@ msgstr ""
 "Le gestionnaire de connexions sélectionné ne prend pas en charge l'extension "
 "de débogage distant."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Appel vidéo entrant"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vous appelle en vidéo. Souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vous appelle. Souhaitez-vous répondre ?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "Re_fuser"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Répondre"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Répondre avec la vidéo"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Invitation dans un salon"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vous invite à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vous a invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vous avez été invité à rejoindre %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transfert de fichiers entrant de %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Mot de passe nécessaire"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3963,105 +3075,105 @@ msgstr ""
 "Message : %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s sur %s à %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s sur %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Réception de « %s » de la part de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Envoi de « %s » à %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erreur lors de la réception de « %s » de la part de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Erreur de réception du fichier"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erreur lors de l'envoi de « %s » à %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Erreur d'envoi du fichier"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "« %s » reçu de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "« %s » envoyé à %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Attente de la réponse du correspondant"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Vérification de l'intégrité de « %s »"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Création de la somme de contrôle pour « %s »"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Restant"
 
@@ -4073,11 +3185,11 @@ msgstr "Transferts de fichiers"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Effacer les transferts terminés, annulés et non réussis de la liste"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4085,49 +3197,49 @@ msgstr ""
 "Aucun compte à importer n'a été trouvé. Empathy ne peut actuellement "
 "importer que des comptes en provenance de Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importer des comptes"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protocole"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Inviter un participant"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Choisissez un contact à inviter dans la conversation :"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Salon de discussion"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Membres"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Impossible de faire la liste les salons"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4140,17 +3252,17 @@ msgstr ""
 "Mot de passe nécessaire : %s\n"
 "Membres : %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Rejoindre le salon"
 
@@ -4193,104 +3305,104 @@ msgstr "Le chargement de la liste des salons de discussion a échoué"
 msgid "Room List"
 msgstr "Liste des salons"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Répondre"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Répondre avec la vidéo"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Refuser"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Accepter"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Fournir"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Message reçu"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nouvelle conversation"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Le contact est en ligne"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Le contact est hors ligne"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Compte connecté"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Compte déconnecté"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Langue"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Juliette"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Roméo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ô Roméo ! Roméo ! Pourquoi es-tu Roméo ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Renie ton père et abdique ton nom ;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou si tu ne le veux pas, jure de m'aimer"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "Et je ne serais plus une Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Dois-je l'écouter encore ou lui répondre ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Juliette s'est déconnectée"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Préférences"
 
@@ -4302,7 +3414,7 @@ msgstr "Afficher les groupes"
 msgid "Show account balances"
 msgstr "Afficher le crédit actuel"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Liste des contacts"
 
@@ -4427,23 +3539,7 @@ msgstr "_Réduire la précision de la position"
 msgid "Privacy"
 msgstr "Confidentialité"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "Téléphone _mobile"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Réseau (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Sources de positionnement :"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4451,37 +3547,37 @@ msgstr ""
 "La liste de langues ne contient que les langues pour lesquelles vous avez un "
 "dictionnaire installé."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Activer la correction orthographique pour les langues :"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Correction orthographique"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "_Thème de la fenêtre de discussion :"
 
 # http://fr.wikipedia.org/wiki/Rel%C3%A8vement
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variante :"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Thèmes"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Fournir un mot de passe"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Déconnecter"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Vous devez configurer un compte pour voir des contacts ici."
 
 #: ../src/empathy-roster-window.c:569
@@ -4495,6 +3591,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4510,8 +3610,8 @@ msgid "Online Accounts"
 msgstr "Comptes en ligne"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Mettre à jour le logiciel..."
+msgid "Update software…"
+msgstr "Mettre à jour le logiciel…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4556,24 +3656,26 @@ msgid "No online contacts"
 msgstr "Pas de contacts connectés"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_Nouvelle conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nouvelle conversation…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "Nouvel _appel..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nouvel _appel…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Contacts"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "A_jouter des contacts..."
+msgid "_Add Contacts…"
+msgstr "A_jouter des contacts…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Rechercher des contacts..."
+msgid "_Search for Contacts…"
+msgstr "_Rechercher des contacts…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4584,8 +3686,8 @@ msgid "_Rooms"
 msgstr "_Salons"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "Re_joindre..."
+msgid "_Join…"
+msgstr "Re_joindre…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4632,28 +3734,16 @@ msgstr "Passer en _ligne"
 msgid "Show _Offline Contacts"
 msgstr "Afficher les c_ontacts déconnectés"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "A_jouter un contact..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nouvelle conversation…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nouvel _appel…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "État"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Terminé"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Veuillez entrer les détails de votre compte"
 
@@ -4666,6 +3756,633 @@ msgstr "Modifier les options du compte %s"
 msgid "Integrate your IM accounts"
 msgstr "Intégrez vos comptes de messagerie instantanée"
 
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy peut utiliser le réseau pour découvrir la position"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr ""
+#~ "Indique si Empathy peut utiliser le réseau pour découvrir la position."
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr ""
+#~ "Empathy peut utiliser le réseau cellulaire pour découvrir la position"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr ""
+#~ "Indique si Empathy peut utiliser le réseau cellulaire pour découvrir la "
+#~ "position."
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy peut utiliser le GPS pour découvrir la position"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "Indique si Empathy peut utiliser le GPS pour découvrir la position."
+
+#~ msgid "Password not found"
+#~ msgstr "Mot de passe introuvable"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "Mot de passe du compte de messagerie instantanée pour %s (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr ""
+#~ "Mot de passe pour le salon de discussion « %s » sur le compte %s (%s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "il y a %d seconde"
+#~ msgstr[1] "il y a %d secondes"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "il y a %d minute"
+#~ msgstr[1] "il y a %d minutes"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "il y a %d heure"
+#~ msgstr[1] "il y a %d heures"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "il y a %d jour"
+#~ msgstr[1] "il y a %d jours"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "il y a %d semaine"
+#~ msgstr[1] "il y a %d semaines"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "il y a %d mois"
+#~ msgstr[1] "il y a %d mois"
+
+#~ msgid "in the future"
+#~ msgstr "dans le futur"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! Japon"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Discussion Facebook"
+
+#~ msgid "Pass_word"
+#~ msgstr "_Mot de passe"
+
+#~ msgid "Screen _Name"
+#~ msgstr "_Nom à l'écran"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>Exemple :</b> MonNomEcran"
+
+#~ msgid "_Port"
+#~ msgstr "_Port"
+
+#~ msgid "_Server"
+#~ msgstr "_Serveur"
+
+#~ msgid "Advanced"
+#~ msgstr "Avancé"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "Quel est votre nom à l'écran AIM ?"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "Quel est votre mot de passe AIM ?"
+
+#~ msgid "Remember Password"
+#~ msgstr "Se souvenir du mot de passe"
+
+#~ msgid "Password"
+#~ msgstr "Mot de passe"
+
+#~ msgid "Server"
+#~ msgstr "Serveur"
+
+#~ msgid "Port"
+#~ msgstr "Port"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s :"
+
+#~ msgid "Username:"
+#~ msgstr "Nom d'utilisateur :"
+
+#~ msgid "A_pply"
+#~ msgstr "A_ppliquer"
+
+#~ msgid "L_og in"
+#~ msgstr "Se _connecter"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "Ce compte existe déjà sur le serveur"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "Créer un nouveau compte sur le serveur"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%1$s sur %2$s"
+
+#~ msgid "%s Account"
+#~ msgstr "Compte %s"
+
+#~ msgid "New account"
+#~ msgstr "Nouveau compte"
+
+#~ msgid "Login I_D"
+#~ msgstr "I_dentifiant de connexion"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>Exemple :</b> nom_utilisateur"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "Quel est votre identifiant utilisateur GroupWise ?"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "Quel est votre mot de passe GroupWise ?"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "_UIN ICQ"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>Exemple :</b> 123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "Jeu de c_aractères"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "Quel est votre UIN ICQ ?"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "Quel est votre mot de passe ICQ ?"
+
+#~ msgid "Network"
+#~ msgstr "Réseau"
+
+#~ msgid "Character set"
+#~ msgstr "Jeu de caractères"
+
+#~ msgid "Up"
+#~ msgstr "En haut"
+
+#~ msgid "Down"
+#~ msgstr "En bas"
+
+#~ msgid "Servers"
+#~ msgstr "Serveurs"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr ""
+#~ "La plupart des serveurs IRC ne nécessitent pas de mot de passe. Si vous "
+#~ "n'êtes pas sûr, n'en saisissez pas."
+
+#~ msgid "Nickname"
+#~ msgstr "Pseudonyme"
+
+#~ msgid "Quit message"
+#~ msgstr "Message de départ"
+
+#~ msgid "Real name"
+#~ msgstr "Nom réel"
+
+#~ msgid "Username"
+#~ msgstr "Nom d'utilisateur"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "Quel réseau IRC ?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "Quel est votre pseudonyme IRC ?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "Quel est votre nom d'utilisateur Facebook ?"
+
+#  'blaireau' has been judged an offensive name in French
+#~ 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 ""
+#~ "C'est votre nom d'utilisateur, pas votre identifiant Facebook.\n"
+#~ "Si vous êtes facebook.com/<b>castor</b>, saisissez <b>castor</b>.\n"
+#~ "Utilisez <a href=\"http://www.facebook.com/username/\">cette page</a> "
+#~ "pour choisir un nom d'utilisateur Facebook si vous n'en avez pas un."
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "Quel est votre mot de passe Facebook ?"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "Quel est votre identifiant Google ?"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>Exemple :</b> utilisateur@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "Quel est votre mot de passe Google ?"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>Exemple :</b> nom@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "_Ignorer les erreurs de certificat SSL"
+
+#~ msgid "Priori_ty"
+#~ msgstr "Pri_orité"
+
+#~ msgid "Reso_urce"
+#~ msgstr "Resso_urce"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "Chiffr_ement requis (TLS/SSL)"
+
+#~ msgid "Override server settings"
+#~ msgstr "Outrepasser les paramètres du serveur"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "Utiliser l'ancien SS_L"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "Quel est votre identifiant Jabber ?"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "Que souhaitez-vous comme identifiant Jabber ?"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "Quel est votre mot de passe Jabber ?"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "Que souhaitez-vous comme mot de passe Jabber ?"
+
+#~ msgid "Nic_kname"
+#~ msgstr "P_seudonyme"
+
+#~ msgid "_Last Name"
+#~ msgstr "_Nom"
+
+#~ msgid "_First Name"
+#~ msgstr "_Prénom"
+
+#~ msgid "_Published Name"
+#~ msgstr "Nom p_ublié"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Identifiant Jabber"
+
+#~ msgid "E-_mail address"
+#~ msgstr "A_dresse électronique"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>Exemple :</b> nom@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "Quel est votre identifiant Windows Live ?"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "Quel est votre mot de passe Windows Live ?"
+
+#~ msgid "Auto"
+#~ msgstr "Auto"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "Enregistrer"
+
+#~ msgid "Options"
+#~ msgstr "Options"
+
+#~ msgid "None"
+#~ msgstr "Aucun"
+
+#~ msgid "_Username"
+#~ msgstr "_Nom d'utilisateur"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>Exemple :</b> nom@mon.serveur.sip"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr ""
+#~ "Utiliser ce compte pour appeler des _lignes fixes ou des téléphones "
+#~ "mobiles"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "Options de parcours NAT"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Options de serveur mandataire"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "Options diverses"
+
+#~ msgid "STUN Server"
+#~ msgstr "Serveur STUN"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "Découvrir automatiquement le serveur STUN"
+
+#~ msgid "Discover Binding"
+#~ msgstr "Découvrir la liaison"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "Options de connexions persistantes"
+
+#~ msgid "Mechanism"
+#~ msgstr "Mécanisme"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "Intervalle (secondes)"
+
+#~ msgid "Authentication username"
+#~ msgstr "Nom d'utilisateur pour l'authentification"
+
+#~ msgid "Transport"
+#~ msgstr "Transport"
+
+# Je ne trouve pas de traduction donc j'ai laissé en anglais et mis le terme approximatif entre parenthèses
+#~ msgid "Loose Routing"
+#~ msgstr "Loose Routing (routage non strict)"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "Ignorer les erreurs TLS"
+
+#~ msgid "Local IP Address"
+#~ msgstr "Adresse IP locale"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "Quel est votre identifiant de connexion SIP ?"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "Quel est votre mot de passe de compte SIP ?"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Mot de passe :"
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "I_dentifiant Yahoo! :"
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr ""
+#~ "_Ignorer les invitations à des conférences ou à des salons de discussion"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "Codage de la liste des _salons :"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "Jeu de c_aractères :"
+
+#~ msgid "_Port:"
+#~ msgstr "_Port :"
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "Quel est votre identifiant Yahoo! ?"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "Quel est votre mot de passe Yahoo! ?"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "Impossible de convertir l'image"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr ""
+#~ "Aucun des formats d'image acceptés n'est pris en charge par votre système"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "Impossible d'enregistrer l'image dans le fichier"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "Sélection de l'image d'avatar"
+
+#~ msgid "Take a picture..."
+#~ msgstr "Prendre une photo..."
+
+#~ msgid "No Image"
+#~ msgstr "Aucune image"
+
+#~ msgid "Images"
+#~ msgstr "Images"
+
+#~ msgid "All Files"
+#~ msgstr "Tous les fichiers"
+
+#~ msgid "Select..."
+#~ msgstr "Sélectionner..."
+
+#~ msgid "_Select"
+#~ msgstr "_Sélectionner"
+
+#~ msgid "Full name"
+#~ msgstr "Nom complet"
+
+#~ msgid "Phone number"
+#~ msgstr "Numéro de téléphone"
+
+#~ msgid "E-mail address"
+#~ msgstr "Adresse électronique"
+
+#~ msgid "Website"
+#~ msgstr "Site Web"
+
+#~ msgid "Birthday"
+#~ msgstr "Anniversaire"
+
+#~ msgid "Last seen:"
+#~ msgstr "Dernière consultation :"
+
+#~ msgid "Server:"
+#~ msgstr "Serveur :"
+
+#~ msgid "Connected from:"
+#~ msgstr "Connecté de :"
+
+#~ msgid "Away message:"
+#~ msgstr "Message d'absence :"
+
+#~ msgid "work"
+#~ msgstr "travail"
+
+#~ msgid "home"
+#~ msgstr "maison"
+
+#~ msgid "mobile"
+#~ msgstr "mobile"
+
+#~ msgid "voice"
+#~ msgstr "voix"
+
+#~ msgid "preferred"
+#~ msgstr "préféré"
+
+#~ msgid "postal"
+#~ msgstr "postal"
+
+#~ msgid "parcel"
+#~ msgstr "paquet"
+
+#~ msgid "New Network"
+#~ msgstr "Nouveau réseau"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "Choisir un réseau IRC"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "Réi_nitialiser la liste des réseaux"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Sélectionner"
+
+#~ msgid "new server"
+#~ msgstr "nouveau serveur"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "Nouveau compte %s"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "Mettez-vous en ligne pour modifier vos informations personnelles."
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>Détails personnels</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "Locale actuelle"
+
+#~ msgid "Arabic"
+#~ msgstr "Arabe"
+
+#~ msgid "Armenian"
+#~ msgstr "Arménien"
+
+#~ msgid "Baltic"
+#~ msgstr "Balte"
+
+#~ msgid "Celtic"
+#~ msgstr "Celtique"
+
+#~ msgid "Central European"
+#~ msgstr "Européen central"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "Chinois simplifié"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "Chinois traditionnel"
+
+#~ msgid "Croatian"
+#~ msgstr "Croate"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Cyrillique"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "Cyrillique/Russe"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "Cyrillique/Ukrainien"
+
+#~ msgid "Georgian"
+#~ msgstr "Géorgien"
+
+#~ msgid "Greek"
+#~ msgstr "Grec"
+
+#~ msgid "Gujarati"
+#~ msgstr "Gujarâtî"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhī"
+
+#~ msgid "Hebrew"
+#~ msgstr "Hébreu"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "Hébreu visuel"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindi"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandais"
+
+#~ msgid "Japanese"
+#~ msgstr "Japonais"
+
+#~ msgid "Korean"
+#~ msgstr "Coréen"
+
+#~ msgid "Nordic"
+#~ msgstr "Nordique"
+
+#~ msgid "Persian"
+#~ msgstr "Perse"
+
+#~ msgid "Romanian"
+#~ msgstr "Roumain"
+
+#~ msgid "South European"
+#~ msgstr "Européen méridional"
+
+#~ msgid "Thai"
+#~ msgstr "Thaï"
+
+#~ msgid "Turkish"
+#~ msgstr "Turc"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Western"
+#~ msgstr "Occidental"
+
+#~ msgid "Vietnamese"
+#~ msgstr "Vietnamien"
+
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "_Modifier les paramètres de la connexion..."
+
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
+
+#~ msgid "_Cellphone"
+#~ msgstr "Téléphone _mobile"
+
+#~ msgid "_Network (IP, Wi-Fi)"
+#~ msgstr "_Réseau (IP, Wi-Fi)"
+
+#~ msgid "Location sources:"
+#~ msgstr "Sources de positionnement :"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Nouvelle conversation..."
+
+#~ msgid "New _Call..."
+#~ msgstr "Nouvel _appel..."
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "A_jouter des contacts..."
+
+#~ msgid "_Join..."
+#~ msgstr "Re_joindre..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "A_jouter un contact..."
+
 #~ msgid "i"
 #~ msgstr "i"
 
diff --git a/po/ga.po b/po/ga.po
index e51f42771..392899b1a 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -1,22 +1,22 @@
 # Irish translations for empathy package.
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-# Seán de Búrca <leftmostcat@gmail.com>, 2009-2012.
+# Seán de Búrca <leftmostcat@gmail.com>, 2009-2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-28 14:18-0600\n"
-"PO-Revision-Date: 2012-10-28 14:24-0600\n"
+"POT-Creation-Date: 2013-09-03 12:00-0600\n"
+"PO-Revision-Date: 2013-09-03 15:51-0600\n"
 "Last-Translator: Seán de Búrca <leftmostcat@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
 "Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
-"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -34,6 +34,10 @@ msgstr "Cur Teachtaireachtaí Meandaracha Empathy"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "comhrá;caint;im;teachtaireacht;irc;voip;gtalk;facebook;jabber;"
+
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr ""
@@ -83,7 +87,7 @@ msgstr ""
 #: ../data/org.gnome.Empathy.gschema.xml.h:12
 #: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
-msgstr ""
+msgstr "Taispeáin teagmhálacha as líne"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
@@ -141,9 +145,8 @@ msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:26
-#, fuzzy
 msgid "Show contact groups"
-msgstr "Taispeáin liosta teagmhálacha i seomraí"
+msgstr "Taispeáin grúpaí teagmhálacha"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:27
 #, fuzzy
@@ -424,34 +427,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr ""
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -480,7 +459,7 @@ msgstr ""
 msgid "The other participant is unable to transfer the file"
 msgstr ""
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Cúis anaithnid"
 
@@ -500,1061 +479,415 @@ msgstr ""
 msgid "The selected file is empty"
 msgstr ""
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-#, fuzzy
-msgid "Password not found"
-msgstr "Focal faire:"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr ""
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr ""
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr ""
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
-#, fuzzy, c-format
+#: ../libempathy/empathy-message.c:406
+#, c-format
 msgid "Called %s"
-msgstr "Glaoch"
+msgstr "Chuir glaoch ar %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
-msgstr ""
-
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr ""
+msgstr "Glaoch ó %s"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Ar Fáil"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Gnóthach"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Amuigh"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Dofheicthe"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "As Líne"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
-msgstr ""
+msgstr "Cúis gan sonrú"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
-msgstr ""
+msgstr "Socraítear stádas ar As Líne"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
-msgstr ""
+msgstr "Earráid líonra"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
-msgstr ""
+msgstr "Theip ar fhíordheimhniú"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
-msgstr ""
+msgstr "Ainm in úsáid"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
-msgstr ""
+msgstr "Chuaigh an teastas as feidhm"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
-msgstr ""
+msgstr "Earráid teastais"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
-msgstr ""
+msgstr "Tá an teastas neamhbhailí"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
-msgstr ""
+msgstr "Cailleadh an ceangal"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr ""
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! na Seapáine"
-
-#: ../libempathy/empathy-utils.c:531
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:532
-msgid "Facebook Chat"
-msgstr "Comhrá Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
-msgstr "Cuntais"
-
-#: ../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
-#, fuzzy
-msgid "Pass_word"
-msgstr "_Focal faire:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#, fuzzy
-msgid "Screen _Name"
-msgstr "_Ainm Taispeána:"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr ""
-
-#. 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 ""
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#, fuzzy
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#, fuzzy
-msgid "_Server"
-msgstr "Frea_stalaí:"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Casta"
-
-#: ../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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-#, fuzzy
-msgid "Remember Password"
-msgstr "Focal faire:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Cuntas"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Focal faire"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Freastalaí"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "Port"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, fuzzy, c-format
-msgid "%s"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-#, fuzzy
-msgid "Username:"
-msgstr "_Ainm úsáideora:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-#, fuzzy
-msgid "Create a new account on the server"
-msgstr "Cr_uthaigh cuntas nua"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s ar %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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Cuntas %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Cuntas nua"
-
-#: ../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
-#, fuzzy
-msgid "Login I_D"
-msgstr "C_A Logála Isteach:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#, fuzzy
-msgid "ICQ _UIN"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#, fuzzy
-msgid "Ch_aracter set"
-msgstr "Tacar carachtar:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Líonra"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-#, fuzzy
-msgid "Character set"
-msgstr "Tacar carachtar:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-#, fuzzy
-msgid "Remove"
-msgstr "gtk-remove"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr ""
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Freastalaithe"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-#, fuzzy
-msgid "Nickname"
-msgstr "Leasainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-#, fuzzy
-msgid "Quit message"
-msgstr "Teachtaireacht scortha:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-#, fuzzy
-msgid "Real name"
-msgstr "Fíorainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-#, fuzzy
-msgid "Username"
-msgstr "_Ainm úsáideora:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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: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 ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr ""
-
-#: ../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 ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-#, fuzzy
-msgid "I_gnore SSL certificate errors"
-msgstr "Déan _neamhaird ar earráidí teastas SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-#, fuzzy
-msgid "Reso_urce"
-msgstr "Ac_mhainn:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-#, fuzzy
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Criptiú riachtanach (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Sáraigh socruithe freastalaí"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Úsáid sean-SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr ""
-
-#: ../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: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-local-xmpp.ui.h:1
-#, fuzzy
-msgid "Nic_kname"
-msgstr "Leasainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-#, fuzzy
-msgid "_Last Name"
-msgstr "_Sloinne:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-#, fuzzy
-msgid "_First Name"
-msgstr "_Ainm:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-#, fuzzy
-msgid "_Published Name"
-msgstr "Ainm _Foilsithe:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-#, fuzzy
-msgid "_Jabber ID"
-msgstr "CA _Jabber:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-#, fuzzy
-msgid "E-_mail address"
-msgstr "Seoladh _ríomhphoist:"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr ""
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-#, fuzzy
-msgid "Register"
-msgstr "Iartharach"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#, fuzzy
-msgid "_Username"
-msgstr "_Ainm úsáideora:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-#, fuzzy
-msgid "STUN Server"
-msgstr "Freastalaí STUN:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "Gach cuntas"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#, fuzzy
-msgid "Authentication username"
-msgstr "Cliant IM Empathy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#, fuzzy
-msgid "Transport"
-msgstr "Port STUN:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-#, fuzzy
-msgid "Local IP Address"
-msgstr "Seoladh _ríomhphoist:"
-
-#: ../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 "What is your SIP account password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Focal faire:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "C_A Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-#, fuzzy
-msgid "I_gnore conference and chat room invitations"
-msgstr "Déan _neamhaird ar chuirí comhdhála agus seomra comhrá"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Lo_gchaighdeán an Liosta Seomraí:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-#, fuzzy
-msgid "Ch_aracter set:"
-msgstr "Tacar carachtar:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Roghnaigh d'�omhá Abhatár"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Gan �omhá"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "�omhánna"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Gach Comhad"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
-msgstr ""
+msgstr "Theip ar fhíordheimniú don chuntas <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
-msgstr ""
+msgstr "Atriail"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
+"Iontráil focal faire do chuntais\n"
+"<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr ""
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Meabhraigh an focal faire"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:967
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
-msgstr "CA Teagmhála:"
+msgstr "CA teagmhála neamhbhailí"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../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 ""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Úsáid: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Ordú anaithnid"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr ""
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "as líne"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
-msgstr ""
+msgstr "teagmháil neamhbhailí"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
-msgstr ""
+msgstr "cead diúltaithe"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
-msgstr ""
+msgstr "teachtaireacht ró-fhada"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "anaithnid"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:980
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
-msgstr ""
+msgstr "�bhar:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
-msgstr ""
+msgstr "(Gan Mholtaí)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr ""
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Ionsáigh Straiseog"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Seol"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr ""
@@ -1562,12 +895,12 @@ msgstr ""
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr ""
@@ -1575,17 +908,17 @@ msgstr ""
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr ""
@@ -1595,17 +928,17 @@ msgstr ""
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
@@ -1613,52 +946,50 @@ msgstr ""
 #. 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:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2573
-#: ../src/empathy-call-window.c:2879 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr ""
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3670
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
-msgstr "Baill"
+msgstr "Meabhraigh"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
-msgstr ""
+msgstr "Ná meabhraigh anois"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
-msgstr ""
+msgstr "Focal faire mícheart; bain triail eile as, le do thoil:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
-msgstr "C_eangail"
+msgstr "Ceangail"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
-msgstr ""
+msgstr "Ceangailte"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Comhrá"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1677,7 +1008,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
-msgstr ""
+msgstr "Cead Diúltaithe"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
@@ -1685,154 +1016,85 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
-msgstr ""
+msgstr "Cuir Teagmhálacha Bactha in Eagar"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "Cuntas:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
 msgid "Blocked Contacts"
-msgstr "_Teagmhálacha As Líne"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-#, fuzzy
-msgid "Full name"
-msgstr "Ainm Iomlán:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr ""
+msgstr "Teagmhálacha Bactha"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-#, fuzzy
-msgid "E-mail address"
-msgstr "Seoladh _ríomhphoist:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-#, fuzzy
-msgid "Website"
-msgstr "Suíomh gréasáin:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-#, fuzzy
-msgid "Last seen:"
-msgstr "_Sloinne:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Freastalaí:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr ""
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-#, fuzzy
-msgid "Away message:"
-msgstr "Teachtaireacht scortha:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-#, fuzzy
-msgid "work"
-msgstr "Líonra"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-#, fuzzy
-msgid "preferred"
-msgstr "Sainroghanna"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "Bain"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
-msgstr "Roghnaigh teagmháil..."
+msgstr "Cuardaigh teagmhálacha"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Cuardaigh: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
-msgstr "_Cuir Teagmháil Leis..."
+msgstr "Cuir Teagmháil _Leis"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
+msgstr "Teagmháil gan aimsiú"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
-msgstr ""
+msgstr "Sábháil Abhatár"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
-msgstr ""
+msgstr "Ní féidir an t-abhatár a shábháil"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Cuntas"
 
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
-#, fuzzy
 msgid "Identifier"
-msgstr "Aitheantóir:"
+msgstr "Aitheantóir"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
-#, fuzzy
 msgid "Alias"
-msgstr "Ailias:"
+msgstr "Ailias"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
-msgstr ""
+msgstr "Mionsonraí Teagmhálacha"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
@@ -1842,67 +1104,64 @@ msgstr "_Eolas"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "<b>Location</b> at (date)\t"
-msgstr ""
+msgstr "<b>Suíomh</b> ag (dáta)\t"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
-msgstr ""
+msgstr "Eolas Cliaint"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#, fuzzy
 msgid "OS"
-msgstr "OS:"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-#, fuzzy
 msgid "Version"
-msgstr "Leagan:"
+msgstr "Leagan"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-#, fuzzy
 msgid "Client"
-msgstr "Cliant:"
+msgstr "Cliant"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grúpaí"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "Cuir Grúpa _Leis"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
-msgstr ""
+msgstr "Roghnaigh"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grúpa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Teagmháil Nua"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "Bac %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
@@ -1911,7 +1170,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
@@ -1920,14 +1179,14 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Bac"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] ""
@@ -1936,1062 +1195,869 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Cuir Eolas Teagmhála in Eagar"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
-msgstr "_Teagmhálacha As Líne"
+msgstr "Teagmhálacha Nasctha"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Glaoch"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
-msgstr ""
+msgstr "Fón Póca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
-msgstr ""
+msgstr "Obair"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
-msgstr ""
+msgstr "BAILE"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Bac Teagmháil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Bain ó _Ghrúpa '%s'"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
-msgstr ""
+msgstr "Scrios agus _Bac"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
-msgstr ""
+msgstr "An bhfuil tú cinnte gur mian leat an teagmháil '%s' a bhaint?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, 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 ""
+"An bhfuil tú cinnte gur mian leat an teagmháil nasctha '%s' a bhaint? "
+"Tabhair faoi deara go mbainfear gach teagmháil a dhéanann an teagmháil "
+"nasctha seo."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
-msgstr ""
+msgstr "Teagmháil á baint"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Bain"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Comhrá"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Glaoch _Fuaime"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Glaoch Fí_se"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Comhráite _Roimhe Seo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Seol Comhad"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Comhroinn Mo Dheasc"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Cuir Leis na Ceanáin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Eolas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "Cuir in E_agar"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1246
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Tabhair Cuireadh Seomra Comhrá"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "Cuir Teagmháil _Leis…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
-msgstr ""
+msgstr "Grúpa á bhaint"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
-msgstr "Fíorainm:"
+msgstr "Athai_nmnigh"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
-msgstr ""
+msgstr "Cainéil:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
-msgstr ""
+msgstr "Cód ISO na Tíre:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
-msgstr ""
+msgstr "Tír:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
-msgstr ""
+msgstr "Stát:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
-msgstr ""
+msgstr "Cathair:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
-msgstr ""
+msgstr "Ceantar:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
-msgstr ""
+msgstr "Cód Poist:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
-msgstr ""
+msgstr "Sráid:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
-msgstr ""
+msgstr "Foirgneamh:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
-msgstr ""
+msgstr "Urlár:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
-msgstr ""
+msgstr "Seomra:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
-msgstr ""
+msgstr "Téacs:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
-msgstr ""
+msgstr "Cur Síos:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
-msgstr ""
+msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
-msgstr ""
+msgstr "Leibhéal Cruinnis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
-msgstr ""
+msgstr "Earráid:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
-msgstr ""
+msgstr "Earráid Ingearach (méadair):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
-msgstr ""
+msgstr "Earráid Cothrománach (méadair):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
-msgstr ""
+msgstr "Luas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
-msgstr ""
+msgstr "Treo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
-msgstr ""
+msgstr "Luas Ardaithe:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
-msgstr ""
+msgstr "Nuashonraithe:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
-msgstr ""
+msgstr "Domhanfhad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
-msgstr ""
+msgstr "Domhanleithead:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
-msgstr ""
+msgstr "Airde:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Suíomh"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
-msgstr ""
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
-msgstr ""
+msgstr "%e %B, %Y ag %R AUL"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Ailias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Aitheantóir:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+msgstr[0] "Teagmháil nasctha ina bhfuil %u teagmháil"
+msgstr[1] "Teagmhálacha nasctha ina bhfuil %u theagmháil"
+msgstr[2] "Teagmhálacha nasctha ina bhfuil %u theagmháil"
+msgstr[3] "Teagmhálacha nasctha ina bhfuil %u dteagmháil"
+msgstr[4] "Teagmhálacha nasctha ina bhfuil %u teagmháil"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-#, fuzzy
 msgid "<b>Location</b> at (date)"
-msgstr "<b>Suíomh</b>, "
+msgstr "<b>Suíomh</b> ag (dáta)"
 
 #: ../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:335
-msgid "New Network"
-msgstr "Líonra Nua"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "freastalaí nua"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
 "details below are correct."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
-msgstr ""
+msgstr "Daoine in aice láithreach"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
-msgstr ""
+msgstr "Stair"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
-msgstr ""
+msgstr "Taispeáin"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Cuardaigh"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
-msgstr ""
+msgstr "Déan comhrá i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
-msgstr ""
+msgstr "Déan comhrá le %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %d %B %Y"
+msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1295
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
-msgstr ""
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+msgstr[0] "%s soicind"
+msgstr[1] "%s shoicind"
+msgstr[2] "%s shoicind"
+msgstr[3] "%s soicind"
+msgstr[4] "%s soicind"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+msgstr[0] "%s nóiméad"
+msgstr[1] "%s nóiméad"
+msgstr[2] "%s nóiméad"
+msgstr[3] "%s nóiméad"
+msgstr[4] "%s nóiméad"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr ""
+msgstr "Bhain an glaoch %s as, chríochnaigh sé ag %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
-msgstr ""
+msgstr "Inniu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
-msgstr "Iartharach"
+msgstr "Inné"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
-msgstr "%A %d %B %Y"
+msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
-msgstr ""
+msgstr "Am ar bith"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
-msgstr ""
+msgstr "Duine ar bith"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
-msgstr ""
+msgstr "Cé"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
-msgstr ""
+msgstr "Cathain"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
-msgstr ""
+msgstr "Rud ar bith"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
-msgstr ""
+msgstr "Comhráite téacs"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
-#, fuzzy
 msgid "Calls"
-msgstr "Glaoch"
+msgstr "Glaonna"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
-msgstr ""
+msgstr "Glaonna isteach"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
-msgstr ""
+msgstr "Glaonna amach"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
-msgstr ""
+msgstr "Glaonna imithe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
-msgstr ""
+msgstr "Cad"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
+"An bhfuil tú cinnte gur mhaith leat gach loga comhráithe roimhe seo a "
+"scriosadh?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3759
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
-msgstr "G_lan"
+msgstr "Glan Uile"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
-msgstr ""
+msgstr "Scrios ó:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "_File"
 msgstr "_Comhad"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Eagar"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr ""
+msgid "Delete All History…"
+msgstr "Scrios Stair ar Fad…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
-msgstr ""
+msgstr "Próifíl"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Comhrá"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:26
 msgid "Video"
-msgstr "Glaoch Fí_se"
+msgstr "Fís"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
 msgid "page 2"
-msgstr ""
+msgstr "leathanach 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">� luchtú…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
-msgstr ""
+msgstr "Cén cineál chuntas comhrá atá agat?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-#, fuzzy
-msgid "Adding new account"
-msgstr "Cuntas nua"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Cuir cuntas nua leis"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
-msgstr ""
+msgstr "Iontráil aitheantóir nó uimhir theileafóin teagmhála:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Glaoch Fí_se"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Glaoch _Fuaime"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Glaoch Nua"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
-msgstr "Roghnaigh teagmháil..."
+msgstr "Tá an teagmháil as líne"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
-msgstr ""
+msgstr "Tá an teagmháil socraithe neamhbhailí nó anaithnid"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
-msgstr ""
+msgstr "Cead diúltaithe"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Comhrá Nua"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Focal Faire de Dhíth"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Teachtaireacht Saincheaptha…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr ""
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
 "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
 msgstr ""
+"<b>Teachtaireacht reatha: %s</b>\n"
+"<small><i>Brúigh Enter chun an teachtaireacht nua a shocrú nó Esc chun cealú."
+"</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
-msgstr ""
+msgstr "Socraigh stádas"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
-#, fuzzy
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
-msgstr "Teachtaireachtaí saincheaptha..."
-
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Cuntas %s nua"
+msgstr "Teachtaireachtaí saincheaptha…"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
-msgstr ""
+msgstr "Co_mhoiriúnaigh an cás"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
-msgstr ""
+msgstr "Aimsigh:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "_Previous"
-msgstr ""
+msgstr "_Siar"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "_Next"
-msgstr ""
+msgstr "Ar _Aghaidh"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Mat_ch case"
-msgstr ""
+msgstr "_Comhoiriúnaigh an cás"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
-msgstr ""
+msgstr "Frása gan aimsiú"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Cuir Teachtaireachtaí Saincheaptha in Eagar"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
-msgstr ""
+msgstr "_Diúltaigh"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
-#, fuzzy
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
-msgstr "_Cuntais"
+msgstr "_Glac Leis"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, fuzzy, c-format
 msgid "Message edited at %s"
 msgstr ""
 "\n"
 "Teachtaireacht: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
-#, fuzzy
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
-msgstr "_Gnáthmhéid"
+msgstr "Gnáth"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
-#, fuzzy
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
-msgstr "Comhthéacs"
+msgstr "Ar _Aghaidh"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-#, fuzzy
-msgid "<b>Personal Details</b>"
-msgstr "Eolas Pearsanta"
+msgstr "Comhad isteach ó %s"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "Cóipeáil _Seoladh an Naisc"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Oscail Nasc"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Logchaighdeán Reatha"
-
-#: ../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 "Arabach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Airméanach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Ceilteach"
-
-#: ../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 "Lár-Eorpach"
-
-#: ../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 "Síneach Simplithe"
-
-#: ../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 "Síneach Traidisiúnta"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Crótach"
-
-#: ../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 "Coireallach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Coireallach/Rúiseach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Coireallach/Úcránach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Seoirseach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Gréagach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Gúisearátach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "Gurmúcaíoch"
-
-#: ../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 "Eabhrach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Eabhrach Infheicthe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hiondúch"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "�oslannach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Seapánach"
-
-#: ../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 "Cóiréach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nordach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Peirseach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rómánach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Deisceart na hEorpa"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Téallanach"
-
-#: ../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 "Turcach"
-
-#: ../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 "Iartharach"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vítneamach"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
+msgid "Inspect HTML"
+msgstr "Scrúdaigh HTML"
 
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 #, fuzzy
 msgid "Top Contacts"
 msgstr "Teagmháil"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Daoine in Aice Láithreach"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Gan Grúpa"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:202
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "Ní féidir leis an bhfreastalaí an teagmháil a aimsiú: %s"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
-msgstr ""
+msgstr "Gan teachtaireacht earráide"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
-msgstr ""
+msgstr "Teachtaireacht Mheandarach (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3002,7 +2068,7 @@ msgstr ""
 "théarmaí an GNU General Public License mar foilsíodh é ag an Free Software "
 "Foundation; leagan 2 an License, nó (de do rogha) aon leagan níos déanaí."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3013,7 +2079,7 @@ msgstr ""
 "an baránta intuigthe IND�OLTÓIREACHTA nó OIRIÚNACHTA D'FHEIDHM �IRITHE fiú. "
 "Féach an GNU General Public License le haghaidh tuilleadh mionsonraí."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3023,153 +2089,149 @@ msgstr ""
 "Empathy; mura bhfuair tú é, scríobh chuig an Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Cliant Cur Teachtaireachtaí Meandaracha do GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr "Seán de Búrca <leftmostcat@gmail.com>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 #, fuzzy
 msgid "<account-id>"
 msgstr "Cuntas"
 
-#: ../src/empathy-accounts.c:197
-#, fuzzy
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
-msgstr "Iompórtáil Cuntais"
+msgstr "- Cuntais Empathy"
 
-#: ../src/empathy-accounts.c:240
-#, fuzzy
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
-msgstr "Iompórtáil Cuntais"
+msgstr "Cuntais Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
+msgid "There are unsaved modifications to your %.50s account."
 msgstr ""
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
-msgstr ""
+msgstr "Ag Ceangal…"
 
-#: ../src/empathy-accounts-dialog.c:445
-#, fuzzy, c-format
+#: ../src/empathy-accounts-dialog.c:426
+#, c-format
 msgid "Offline — %s"
-msgstr "As Líne"
+msgstr "As Líne — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
-msgstr ""
+msgstr "Dícheangailte — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
-msgstr ""
+msgstr "As Líne — Gan Cheangal Líonra"
 
-#: ../src/empathy-accounts-dialog.c:475
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
-msgstr "Cúis anaithnid"
+msgstr "Stádas Anaithnid"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
-msgstr ""
+msgstr "As Líne — Díchumasaíodh an Cuntas"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:733
-msgid "_Edit Connection Parameters..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1266
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
+msgid "Do you want to remove %.50s from your computer?"
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
-msgstr "Cumasaithe"
+msgstr "_Cumasaithe"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
-msgstr "Fíorainm:"
+msgstr "Athainmnigh"
 
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
-msgstr ""
+msgstr "_Ná Bac Leis"
 
-#: ../src/empathy-accounts-dialog.c:2109
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
-msgstr "_Inneachar"
+msgstr "_Ceangail"
 
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
-msgstr ""
+msgstr "Cuntais Teachtaireachtaí agus VoIP"
+
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Cuir Leis…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-#, fuzzy
 msgid "_Import…"
-msgstr "Iompórtáil"
+msgstr "_Iompórtáil…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-#, fuzzy
 msgid "Loading account information"
-msgstr "Cuir Eolas Teagmhála in Eagar"
+msgstr "Eolas cuntais á luchtú"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3181,33 +2243,33 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr ""
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 #, fuzzy
 msgid " - Empathy authentication client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 #, fuzzy
 msgid "Empathy authentication client"
 msgstr "Cliant IM Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr ""
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3216,145 +2278,142 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:116
+msgid "In a call"
+msgstr ""
+
+#: ../src/empathy-call.c:224
 #, fuzzy
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliant IM Empathy"
 
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:248
 #, fuzzy
 msgid "Empathy Audio/Video Client"
 msgstr "Cliant IM Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr ""
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1494
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr ""
 
-#: ../src/empathy-call-window.c:1495
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr ""
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
-#: ../src/empathy-call-window.c:2527 ../src/empathy-call-window.c:2528
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
+#: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../src/empathy-call-window.c:2877
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
-msgstr ""
+msgstr "Ar feitheamh"
 
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
-msgstr ""
+msgstr "Gan fuaim"
 
-#: ../src/empathy-call-window.c:2883
-#, fuzzy
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
-msgstr "Suíomh"
+msgstr "Fad"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2886
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
-msgstr ""
+msgstr "%s — %d:%02dn"
 
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
-msgstr ""
+msgstr "Mionsonraí Teicniúla"
 
-#: ../src/empathy-call-window.c:3021
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3026
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3032
+#: ../src/empathy-call-window.c:3113
 #, 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 ""
 
-#: ../src/empathy-call-window.c:3038
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3045
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3057
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3362,47 +2421,46 @@ msgid ""
 "the Help menu."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3069
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3109
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr ""
 
-#: ../src/empathy-call-window.c:3156
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3162
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
-msgstr ""
+msgstr "Faigh Breis"
 
 #: ../src/empathy-call-window.ui.h:1
 msgid "_Call"
 msgstr "_Glaoch"
 
 #: ../src/empathy-call-window.ui.h:3
-#, fuzzy
 msgid "_Microphone"
-msgstr "Meigeafón"
+msgstr "_Micreafón"
 
 #: ../src/empathy-call-window.ui.h:4
 msgid "_Camera"
-msgstr ""
+msgstr "_Ceamara"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "_Settings"
@@ -3412,11 +2470,11 @@ msgstr "_Socruithe"
 msgid "_View"
 msgstr "_Amharc"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Cab_hair"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Inneachar"
 
@@ -3425,112 +2483,117 @@ msgid "_Debug"
 msgstr "_Dífhabhtaigh"
 
 #: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
 msgid "Swap camera"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
 msgid "Minimise me"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
 msgid "Maximise me"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
 msgid "Disable camera"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
 msgid "Hang up"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
 msgid "Hang up current call"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:16
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:18
 msgid "Video call"
-msgstr "Glaoch Fí_se"
+msgstr "Glaoch físe"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start a video call"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Start an audio call"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Show dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Display the dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
 msgid "Toggle video transmission"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
 msgid "Toggle audio transmission"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
 msgid "Encoding Codec:"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
 msgid "Decoding Codec:"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
 msgid "Remote Candidate:"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
 msgid "Local Candidate:"
 msgstr ""
 
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
-msgstr "Glaoch _Fuaime"
+msgstr "Fuaim"
 
-#: ../src/empathy-chat.c:102
-#, fuzzy
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
-msgstr "- Cliant IM Empathy"
+msgstr "- Cliant Comhrá Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Ainm"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Seomra"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
-msgstr ""
+msgstr "Uathcheangail"
 
 #: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr ""
 
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
-msgstr ""
+msgstr "Dún an fhuinneog seo?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:285
 #, 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:307
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3544,26 +2607,26 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:318
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr ""
 
-#: ../src/empathy-chat-window.c:320
+#: ../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:339
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr ""
 
-#: ../src/empathy-chat-window.c:339
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr ""
 
-#: ../src/empathy-chat-window.c:678 ../src/empathy-chat-window.c:701
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3573,7 +2636,7 @@ msgstr[2] "%s (%d gan léamh)"
 msgstr[3] "%s (%d gan léamh)"
 msgstr[4] "%s (%d gan léamh)"
 
-#: ../src/empathy-chat-window.c:693
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3583,7 +2646,7 @@ msgstr[2] "%s (agus %u dhuine eile)"
 msgstr[3] "%s (agus %u duine eile)"
 msgstr[4] "%s (agus %u duine eile)"
 
-#: ../src/empathy-chat-window.c:709
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3593,7 +2656,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:718
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3603,21 +2666,21 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: ../src/empathy-chat-window.c:955
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:963
-#, fuzzy, c-format
+#: ../src/empathy-chat-window.c:954
+#, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] "Seol agus faigh teachtaireachtaí"
-msgstr[1] "Seol agus faigh teachtaireachtaí"
-msgstr[2] "Seol agus faigh teachtaireachtaí"
-msgstr[3] "Seol agus faigh teachtaireachtaí"
-msgstr[4] "Seol agus faigh teachtaireachtaí"
+msgstr[0] "%d teachtaireacht á sheoladh"
+msgstr[1] "%d theachtaireacht á seoladh"
+msgstr[2] "%d theachtaireacht á seoladh"
+msgstr[3] "%d dteachtaireacht á seoladh"
+msgstr[4] "%d teachtaireacht á seoladh"
 
-#: ../src/empathy-chat-window.c:983
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Teachtaireacht á scríobh."
 
@@ -3651,192 +2714,210 @@ msgid "Invite _Participant…"
 msgstr "Tabhair Cuireadh do _Rannpháirtí…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "C_eangail le Comhrá"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Fág Comhrá"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Teagmháil"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "C_luaisíní"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "An Cluaisín _Roimhe Seo"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "An Chéad Chluaisín _Eile"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Cea_laigh Dúnadh Cluaisín"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Bog Cluaisín ar _Chlé"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Bog Cluaisín ar _Dheis"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "Díchean_gail Cluaisín"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
-msgstr ""
+msgstr "Taispeáin seirbhís áirithe"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr ""
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Sábháil"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
-msgstr ""
+msgstr "Nasc pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
-msgstr ""
+msgstr "Freagra pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Fuinneog Dífhabhtaithe"
 
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
-msgstr ""
+msgstr "Seol chuig pastebin"
 
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Sos"
 
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Leibhéal"
 
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Dífhabhtú"
 
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Eolas"
 
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Teachtaireacht"
 
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Criticiúil"
 
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Earráid"
 
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2021
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Am"
 
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Fearann"
 
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Catagóir"
 
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Leibhéal"
 
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
-msgstr ""
+msgstr "_Diúltaigh"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
-msgstr ""
+msgstr "_Freagair"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
-msgstr ""
+msgstr "_Freagair le fís"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "C_eangail"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr ""
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
-#, fuzzy
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
-msgstr "Focal faire:"
+msgstr "Focal faire de dhíth"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3846,105 +2927,105 @@ msgstr ""
 "Teachtaireacht: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
-msgstr ""
+msgstr "%s as %s ag %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
-msgstr ""
+msgstr "%s as %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr ""
+msgstr "\"%s\" á fháil ó %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
-msgstr ""
+msgstr "\"%s\" á sheoladh chuig %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr ""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Comhad"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Fágtha"
 
@@ -3956,60 +3037,59 @@ msgstr "Aistrithe Comhad"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#: ../src/empathy-import-dialog.c:76
-#, fuzzy
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
-msgstr "Iompórtáil"
+msgstr "_Iompórtáil"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Iompórtáil Cuntais"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Iompórtáil"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Prótacal"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Foinse"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr ""
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Seomra Comhrá"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Baill"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4018,17 +3098,17 @@ msgid ""
 "Members: %s"
 msgstr ""
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Tá"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Níl"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Ceangail le Seomra"
 
@@ -4065,119 +3145,118 @@ msgstr ""
 msgid "Room List"
 msgstr "Liosta Seomraí"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr ""
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
-msgstr ""
+msgstr "Freagair le fís"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
-msgstr ""
+msgstr "Diúltaigh"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
-msgstr ""
+msgstr "Glac leis"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr ""
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr ""
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr ""
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Comhrá nua"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 #, fuzzy
 msgid "Contact comes online"
 msgstr "Roghnaigh teagmháil..."
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr ""
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
-msgstr ""
+msgstr "Teanga"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
-msgstr ""
+msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
-msgstr ""
+msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Sainroghanna"
 
 #: ../src/empathy-preferences.ui.h:2
-#, fuzzy
 msgid "Show groups"
-msgstr "Taispeáin liosta teagmhálacha i seomraí"
+msgstr "Taispeáin grúpaí"
 
 #: ../src/empathy-preferences.ui.h:3
 #, fuzzy
 msgid "Show account balances"
 msgstr "Dlúthliosta teagmhálacha"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2107
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Liosta Teagmhálacha"
 
@@ -4187,11 +3266,11 @@ msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
-msgstr ""
+msgstr "_cluaisíní nua"
 
 #: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
-msgstr ""
+msgstr "_fuinneoga nua"
 
 #: ../src/empathy-preferences.ui.h:8
 msgid "Show _smileys as images"
@@ -4295,132 +3374,142 @@ msgstr ""
 msgid "Privacy"
 msgstr "Príobháideachas"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr ""
-
 #: ../src/empathy-preferences.ui.h:36
-#, fuzzy
-msgid "_Cellphone"
-msgstr "Meigeafón"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr ""
-
-#: ../src/empathy-preferences.ui.h:38
-#, fuzzy
-msgid "Location sources:"
-msgstr "Suíomh"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Cumasaigh litriú do theangacha:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Litriú"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
-msgstr ""
+msgstr "_Téama Comhrá:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr ""
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Téamaí"
 
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:230
 #, fuzzy
 msgid "Provide Password"
 msgstr "Focal faire:"
 
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
-msgstr ""
+msgstr "Dícheangail"
 
-#: ../src/empathy-roster-window.c:441
-msgid "You need to setup an account to see contacts here."
-msgstr ""
+#: ../src/empathy-roster-window.c:493
+msgid "You need to set up an account to see contacts here."
+msgstr "Is gá cuntas a shocrú chun teagmhálacha a fheiceáil anseo."
 
-#: ../src/empathy-roster-window.c:517
+#: ../src/empathy-roster-window.c:569
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
+"Tá brón orm, ach ní féidir cuntais %s a úsáid go dtí nuashonrú do bhogearraí "
+"%s."
+
+#: ../src/empathy-roster-window.c:670
+msgid "Windows Live"
+msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:635
-msgid "Update software..."
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:689
+#, c-format
+msgid "%s account requires authorisation"
 msgstr ""
 
-#: ../src/empathy-roster-window.c:641
+#: ../src/empathy-roster-window.c:700
+msgid "Online Accounts"
+msgstr "Cuntais ar Líne"
+
+#: ../src/empathy-roster-window.c:747
+msgid "Update software…"
+msgstr "Nuashonraigh bogearraí…"
+
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
-msgstr ""
+msgstr "Athcheangail"
 
-#: ../src/empathy-roster-window.c:645
-#, fuzzy
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
-msgstr "Cuir Cuntas Leis"
+msgstr "Cuir Cuntas in Eagar"
 
-#: ../src/empathy-roster-window.c:650
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
-msgstr ""
+msgstr "Dún"
 
-#: ../src/empathy-roster-window.c:787
-#, fuzzy
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
-msgstr "Cuntas %s nua"
+msgstr "Faigh breis don chuntas"
 
-#: ../src/empathy-roster-window.c:1469
+#: ../src/empathy-roster-window.c:1590
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
+"Is gá ceann de do chuntais a chumasú chun teagmhálacha a fheiceáil anseo."
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1477
+#: ../src/empathy-roster-window.c:1598
 #, c-format
 msgid "You need to enable %s to see contacts here."
-msgstr ""
+msgstr "Is gá %s a chumasú chun teagmhálacha a fheiceáil anseo."
 
-#: ../src/empathy-roster-window.c:1555
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
-msgstr ""
+msgstr "Athraigh do láithreacht chun teagmhálacha a fheiceáil anseo"
 
-#: ../src/empathy-roster-window.c:1564
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
-msgstr ""
+msgstr "Níor aimsíodh aon rud"
 
-#: ../src/empathy-roster-window.c:1569
-#, fuzzy
+#: ../src/empathy-roster-window.c:1692
+msgid "You haven't added any contact yet"
+msgstr "Níor chuir tú aon teagmháil leis fós"
+
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
-msgstr "_Teagmhálacha as Líne"
+msgstr "Gan teagmháil ar líne"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_Comhrá Nua..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Comhrá Nua…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "_Glaoch Nua..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "_Glaoch Nua…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Teagmhálacha"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "Cuir Teagmhálacha _Leis..."
+msgid "_Add Contacts…"
+msgstr "Cuir Teagmhálacha _Leis…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "Cuar_daigh ar Theagmhálacha..."
+msgid "_Search for Contacts…"
+msgstr "Cuar_daigh Teagmhálacha…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4431,8 +3520,8 @@ msgid "_Rooms"
 msgstr "_Seomraí"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "C_eangail..."
+msgid "_Join…"
+msgstr "C_eangail…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4468,39 +3557,34 @@ msgid "_Quit"
 msgstr "_Scoir"
 
 #: ../src/empathy-roster-window.ui.h:1
-#, fuzzy
 msgid "Account settings"
-msgstr "_Cuntais"
+msgstr "Socruithe cuntais"
 
 #: ../src/empathy-roster-window.ui.h:2
 msgid "Go _Online"
-msgstr ""
+msgstr "Téigh _ar Líne"
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Comhrá Nua…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "_Glaoch Nua…"
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "Taispeáin _Teagmhálacha as Líne"
 
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stádas"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
-msgstr ""
+msgstr "Críochnaithe"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
-msgstr ""
+msgstr "Iontráil mionsonraí do chuntais, le do thoil"
 
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Edit %s account options"
-msgstr "Cuir Eolas Teagmhála in Eagar"
+msgstr "Cuir roghanna cuntais %s in eagar"
 
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 #, fuzzy
diff --git a/po/gl.po b/po/gl.po
index 1245e94d6..48e4c0787 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,13 +8,13 @@
 # Antón Méixome <meixome@certima.net>, 2010.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012.
+# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-30 20:48+0100\n"
-"PO-Revision-Date: 2012-12-30 20:49+0200\n"
+"POT-Creation-Date: 2013-09-02 17:05+0200\n"
+"PO-Revision-Date: 2013-09-02 17:06+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -629,7 +629,7 @@ msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
@@ -650,233 +650,173 @@ msgstr "O ficheiro seleccionado non é un ficheiro regular"
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Contrasinal non atopado"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Contrasinal da conta de mensaxaría para %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Contrasinal para a sala de conversa «%s» na conta %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Chamou %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "hai %d segundo"
-msgstr[1] "hai %d segundos"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "hai %d minuto"
-msgstr[1] "hai %d minutos"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "hai %d hora"
-msgstr[1] "hai %d horas"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "hai %d día"
-msgstr[1] "hai %d días"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "hai %d semana"
-msgstr[1] "hai %d semanas"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "hai %d mes"
-msgstr[1] "hai %d meses"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "no futuro"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Non se forneceu o certificado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Certificado sen confianza"
 
 # rever
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "O certificado expirou"
 
 # rever
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Erro do certificado"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Esta conta xa está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexión foi substituída por unha conexión nova empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Nestes intres o servidor está demasiado ocupado para xestionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -885,611 +825,34 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Erro interno"
 
-# rever
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Xente cerca"
-
-# rever
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Conversa de Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Todas as contas"
 
-#: ../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
-msgid "Pass_word"
-msgstr "Con_trasinal"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "_Nome en pantalla"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
-
-#. 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 "Lembrar contrasinal"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Porto"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Servidor"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Avanzadas"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Cal é o seu nome en patalla para AIM?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Cal e o seu contrasinal para 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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Lembrar o contrasinal"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Conta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Contrasinal"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Porto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nome de usuario:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Aplicar"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Iniciar _sesión"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Esta conta xa existe no servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Crear unha nova conta no servidor"
-
-# rever
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Conta %s"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Conta nova"
-
-# rever
-#: ../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 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> usuario"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Cal é o seu ID de usuario en GroupWise?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Cal é o seu contrasinal en GroupWise?"
-
-# rever
-#: ../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>Exemplo:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Codificación de c_aracteres"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Cal é o seu UIN para ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Cal é o seu contrasinal pra ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Rede"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Codificación de caracteres"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Engadir…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Retirar"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Arriba"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Abaixo"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Servidores"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"A maioría dos servidores IRC non precisan contrasinal, polo que se non está "
-"seguro non escriba un contrasinal."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Alcume"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Mensaxe de saída"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nome real"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nome de usuario"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Que rede IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Cal é o seu alcume de IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Cal é o seu nome de usuario para 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 ""
-"Este é o seu nome de usuario do sistema, non o seu nome de usuario de "
-"Facebook.\n"
-"Se vostede é facebook.com/<b>marca</b>, insira <b>marca</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">esta páxina</a> para "
-"seleccioar o nome de usuario de Facebook se non ten ningún."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Cal é o seu contrasinal para Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-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>Exemplo:</b> usuario@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Cal é o seu contrasinal de Google?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-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 de certificados 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"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Require c_ifrado (TLS/SSL)"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Sobrescribir os axustes do servidor"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Usar SS_L antigo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-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 usuario que quere para Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-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 que desexa para Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_Alcume"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_Apelidos"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Nome"
-
-# rever
-#: ../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 de _Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "Enderezo de correo _electrónico"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-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 de Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Rexistrador"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Opcións"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Ningún"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-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> 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 te_léfonos fixos e móbiles"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Opcións de NAT transversal"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opcións do proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Opcións varias"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Servidor STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir o servidor STUN automaticamente"
-
 # rever
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Descubrir ligazón"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Opcións de «Keep-Alive»"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mecanismo"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Nome de usuario para a 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 "Loose Routing"
-msgstr "Enrutado impreciso"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorar erros TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Enderezo IP local"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Cal é o seu ID de inicio de sesión SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Cal é o contrasinal da súa conta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "Con_trasinal:"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-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 convites a conferencias e salas de conversas"
-
-# rever
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Configuración da lista de _salas:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Codificación de c_aracteres:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Porto:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-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 de Yahoo!?"
-
-# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Non foi posíbel converter a imaxe"
-
-# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Non foi posíbel gardar a imaxe a un ficheiro"
-
-# rever
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Seleccione a súa imaxe de avatar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Tomar unha foto…"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Sen imaxe"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Imaxes"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Todos os ficheiros"
-
-# rever
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Fallou a autenticación para a conta <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1499,74 +862,71 @@ msgstr ""
 "Escriba o contrasinal para a conta\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Seleccionar…"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Seleccionar"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Lembrar contrasinal"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Produciuse un erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "O contacto especificado non admite as chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "O contacto especificado está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "O contacto especificado non é válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo non admite as chamadas de emerxencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Produciuse un erro ao abrir unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "O asunto non é ocmpatíbel nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "ID de contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversas"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversas"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1574,23 +934,23 @@ msgstr ""
 "/part [<ID da sala de conversa>] [<razón>]: saír da sala de conversas, por "
 "omisión a actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id do contacto> [<mensaxe>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id do contacto> <mensaxe>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <alcume>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaxe>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../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 "
@@ -1600,11 +960,11 @@ msgstr ""
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversas\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 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:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1612,134 +972,134 @@ msgstr ""
 "/help [<orde>], mostra todas as ordes admitidas. Se <orde> está definida, "
 "mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 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:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Non se definiu o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un erro ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1747,12 +1107,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1760,17 +1120,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1780,18 +1140,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:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1799,50 +1159,50 @@ 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:2989 ../src/empathy-call-window.c:1532
-#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2655
-#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1874,8 +1234,8 @@ msgstr "Editar os contactos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1886,126 +1246,68 @@ msgstr "Conta:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nome completo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Número de teléfono"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Enderezo de correo electrónico"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Sitio web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Aniversario"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Última actividade"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Conectado desde:"
-
-# rever
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Mensaxe de ausencia:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "traballo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "persoal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "móbil"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "voz"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "prefirido"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "postal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "grupo"
+#: ../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 "Retirar"
 
 # rever
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Buscar:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Engadir contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Non se atoparon contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "A busca de contactos non é compatíbel con esta conta"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "A súa mensaxe de presentación:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Permítame ver cando está en liña. Grazas."
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Gardar o avatar"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Conta"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identificador"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alias"
 
@@ -2042,11 +1344,11 @@ msgstr "Versión"
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2054,76 +1356,76 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Bloquearase a seguinte identidade:"
 msgstr[1] "Bloquearanse as seguintes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Non é posíbel bloquear a seguinte identidade:"
 msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Informar de este contacto como abusivo"
 msgstr[1] "_Informar destes contactos como abusivos"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 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:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Contactos ligados"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts non está instalado"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Instale o programa gnome-contacts para acceder aos detalles dos contactos"
@@ -2131,49 +1433,54 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Casa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Quitar do _grupo «%s»"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere retirar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2182,226 +1489,227 @@ msgstr ""
 "Desexa retirar o contacto ligado %s? Teña en conta que se retirarán tamén "
 "todos os contactos que conforman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Retirando o contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Retirar"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Conversa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Chamada de son"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversas"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere retirar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Retirando o grupo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Canles:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�rea:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Localización"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y de %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2416,33 +1724,7 @@ msgstr "<b>Localización</b> en (date)"
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono ou un dispositivo móbil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Rede nova"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr "Seleccione unha rede IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr "Rei_niciar a lista de redes"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Seleccionar"
-
-# rever
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "servidor novo"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2453,11 +1735,11 @@ msgstr ""
 "detalles de abaixo son correctos."
 
 # rever
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Xente cerca"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2466,137 +1748,137 @@ msgstr ""
 "característica usando o diálogo <span style=\"italic\">Editar → Contas</"
 "span> na Lista de contactos."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, 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:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A chamada levou %s, rematou ás %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Mañá"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Calquera momento"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3759
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
@@ -2605,12 +1887,12 @@ msgid "_File"
 msgstr "_Ficheiro"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Eliminar todo o historial…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2618,7 +1900,7 @@ msgid "Profile"
 msgstr "Perfíl"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Conversa"
 
@@ -2632,117 +1914,121 @@ msgid "page 2"
 msgstr "páxina 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Cargando…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Que tipo de conta ten?"
 
 # rever
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Engadindo conta nova"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Engadir nova conta"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Escriba o identificador dun contacto ou un número de teléfono:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nova chamada"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "O contacto está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "O contacto especificado é descoñecido ou non é válido"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "O contacto non admite este tipo de conversa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "A funcionalidade requirida non está implementada para este protocolo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Non foi posíbel iniciar unha conversa co contacto dado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Vostede foi bloqueado nesta canle"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Esta canel está completa"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Debe ter un convite para unirse a esta canle"
 
 # rever
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Non é posíbel continuar mentres estea desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Produciuse un erro ao iniciar a conversa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Conversa nova"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Contrasinal requirido"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Mensaxe personalizada…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Editar mensaxes personalizadas…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Prema para retirar este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Faga clic para facer este estado un dos favoritos"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2752,26 +2038,16 @@ msgstr ""
 "<small><i>Prema Intro para estabelecer o novo mensaxe ou Esc para cancelar.</"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Estabelecer status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Mensaxes personalizadas…"
 
-# rever
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Conta nova de %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Coincidir con capitalizacio�n"
 
@@ -2797,185 +2073,185 @@ msgid "Phrase not found"
 msgstr "Frase non atopada"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Recibir unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Enviar unha mensaxe instantánea"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Solicitude de conversa entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Conectado co servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Chamada de voz entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Chamada de voz saínte"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
 # rever
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cando vostede está dispoñíbel"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Aceptar"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1101
+#: ../libempathy-gtk/empathy-theme-adium.c:1214
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1801
+#: ../libempathy-gtk/empathy-theme-adium.c:1916
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 "Non é posíbel verificar a identidade fornecida polo servidor de conversas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "O certificado non está asinado por unha Autoridade Certificadora."
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "O certificado caducou."
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "O certificado non está activado aínda."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "O certificado non ten a pegada dixital esperada."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "O nome de servidor verificado polo certificado non coincide co nome do "
 "servidor."
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "O certificado está autoasinado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "O certificado foi revocado pola Autoridade Certificadora."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "O certificado é criptograficamente débil."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "A lonxitude do certificado excede os límites verificábeis."
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "O certificado está mal formado."
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nome do servidor esperado: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nome do servidor do certificado: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "C_ontinuar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "A conexión non é confianza"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta elección para futuras conexións"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2984,229 +2260,58 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Conéctese para editar a súa información persoal"
-
-# rever
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Detalles persoais</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Copiar o enderezo da ligazón"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Abrir a ligazón"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Inspeccionar HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Configuración rexional actual"
-
-#: ../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 "�rabe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armenio"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Báltico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Celta"
-
-#: ../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 "Centroeuropeo"
-
-#: ../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 "Chinés simplificado"
-
-#: ../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 "Chinés tradicional"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../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 "Cirílico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cirílico/Ruso"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cirílico/Ucraíno"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Xeorxiano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Grego"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Guxarati"
-
-#: ../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 "Hebreo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hebreo visual"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandés"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Xaponés"
-
-#: ../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 "Coreano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nórdico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persa"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Romanés"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Sureuropeo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Tailandés"
-
-#: ../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 "Turco"
-
-#: ../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 "Occidental"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Contactos importantes"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+# rever
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Xente cerca"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Sen grupo"
 
 # rever
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:219
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "O servidor non puido atopar o contacto: %s"
 
 # rever
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Non hai mensaxe de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3219,7 +2324,7 @@ msgstr ""
 "versión posterior."
 
 # rever
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3231,7 +2336,7 @@ msgstr ""
 "PROPÓSITO PARTICULAR. Para máis detalles vexa a Licenza pública xeral GNU."
 
 # rever
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3242,11 +2347,11 @@ msgstr ""
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 # rever
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un cliente de mensaxaría instantánea para o GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.\n"
@@ -3259,72 +2364,72 @@ msgstr ""
 "Proxecto Trasno - Adaptación do software libre á lingua galega:  Se desexas\n"
 "colaborar connosco, podes atopar máis información en http://www.trasno.net"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Non mostra ningún diálogo, realizar calquera traballo (p.ex. importar) e sair"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 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 «Xente cerca»"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Conta fornecida inicialmente seleccionada (p.ex. gabble/jabber/exemplo)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Hai modificacións sen gardar respecto da súa conta %s."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Hai modificacións sen gardar na súa conta %.50s."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 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:404 ../src/empathy-call-window.c:1274
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3333,31 +2438,32 @@ msgstr ""
 "Esta conta desactivouse porque depende dunha infraestrutura antiga e non "
 "admitida. Instale telepathy-haze e reinicie a sesión para migrar esta conta."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
+# rever
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Está seguro de que quere retirar o grupo '%s' do seu computador?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Está seguro de que quere retirar %.50s do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Isto non retirará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3366,25 +2472,25 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Activado"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Conectar"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3393,10 +2499,15 @@ msgstr ""
 "Está seguro de que quere continuar?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Contas de mensaxaría e Voz IP"
 
+# rever
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Engadir…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importar…"
@@ -3420,34 +2531,34 @@ msgid "No protocol backends installed"
 msgstr "Non hai infraestruturas de protocolos instaladas"
 
 # rever
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticación Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
 # rever
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3461,7 +2572,7 @@ msgstr ""
 "%s"
 
 # rever
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Nunha chamada"
 
@@ -3474,103 +2585,97 @@ msgstr "- Cliente de voz/vídeo Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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:1131 ../src/empathy-call-window.c:1147
-msgid "i"
-msgstr "Información"
-
 # rever
-#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Videochamada entrante de %s"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chamada entrante de %s"
 
-#: ../src/empathy-call-window.c:1559
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Responder"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada con %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP tal como o ve a máquina"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2176
 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-call-window.c:2183
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2185
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
 #: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
-#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
 # rever
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3579,7 +2684,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3588,7 +2693,7 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3597,21 +2702,21 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados neste computador os formatos de son necesarios"
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3139
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3622,32 +2727,32 @@ msgstr ""
 "\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
 "«Depuración» no menú Axuda."
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un erro ao chamar ao motor"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de son"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "O seu crédito actual é %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3241
 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:3244
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -3671,11 +2776,11 @@ msgstr "_Preferencias"
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_�ndice"
 
@@ -3764,20 +2869,20 @@ msgid "Audio"
 msgstr "Son"
 
 # rever
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Sala"
 
 # rever
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
@@ -3787,11 +2892,11 @@ msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas favoritas"
 
 # rever
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Pechar esta xanela?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3800,7 +2905,7 @@ msgstr ""
 "Se pecha esta xanela sairá de %s. Non recibirá máis mensaxes até que se una "
 "de novo."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3815,60 +2920,60 @@ msgstr[1] ""
 "Se pecha esta xanela sairá de %u salas de conversas. Non recibirá máis "
 "mensaxes até que se una de novo a elas."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Saír de %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
 "Non recibirá máis mensaxes desta sala de conversas até que se volva unir."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Pechar a xanela"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Saír da sala"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sen ler)"
 msgstr[1] "%s (%d sen ler)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, 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:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sen ler de outros)"
 msgstr[1] "%s (%d sen ler de outros)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sen ler de todos)"
 msgstr[1] "%s (%d sen ler de todos)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3876,7 +2981,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -3912,108 +3017,116 @@ msgid "Invite _Participant…"
 msgstr "Convidar _participante…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Unirse á conversa"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Deix_ar conversa"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "C_ontacto"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Lapelas"
 
 # rever
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Lapela _anterior"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Lapela _seguinte"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Desfacer pechar lapela"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Mover lapela á _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Mover lapela á _dereita"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Desacoplar lapela"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Mostrar un servizo en particular"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Depurador de Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Ligazón a pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Resposta de pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Enviar a pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -4031,23 +3144,23 @@ msgstr ""
 "Empathy ao informalo mostrando os cambios avanzados do <a href=\"https://"
 "bugzilla.gnome.org/enter_bug.cgi?product=empathy\">informe de erro</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4056,79 +3169,79 @@ msgstr ""
 "depuración remota."
 
 # rever
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s está chamándoo con vídeo. Desexa responderlle?"
 
 # rever
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s estao chamando. Quere responder?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 # rever
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Convite a unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidándoo a unirse a %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -4138,44 +3251,44 @@ msgstr ""
 "Mensaxe: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s en %s/s"
 
 # rever
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recibindo «%s» de %s"
 
 # rever
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando «%s» a %s"
@@ -4183,30 +3296,30 @@ msgstr "Enviando «%s» a %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Produciuse un erro ao recibir «%s» de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Produciuse un erro ao recibir un ficheiro"
 
 # rever
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Produciuse un erro ao enviar «%s» a %s"
 
 # rever
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Produciuse un erro ao enviar un ficheiro"
 
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» recibido de %s"
@@ -4214,39 +3327,39 @@ msgstr "«%s» recibido de %s"
 # rever
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» enviado a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Transferencia de ficheiros rematada"
 
 # rever
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Agardando pola resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Comprobando a integridade de «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obtendo o «hash» de «%s»"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -4261,12 +3374,12 @@ msgstr ""
 "Retirar da lista as transferencias de ficheiros rematadas, canceladas e as "
 "que fallaron"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importar"
 
 # rever
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4275,51 +3388,51 @@ msgstr ""
 "permite a importación de contas do Pidgin."
 
 # rever
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Seleccione un contacto para convidalo á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Convidar"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Salas de conversas"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Membros"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Produciuse un erro ao listar as salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4332,17 +3445,17 @@ msgstr ""
 "Requírese contrasinal: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Unirse á sala"
 
@@ -4389,109 +3502,109 @@ msgstr "Non foi posíbel ler a lista da sala"
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Rexeitar"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Fornecer"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:648
 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:657
+#: ../src/empathy-preferences.c:651
 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:660
+#: ../src/empathy-preferences.c:654
 msgid "And I'll no longer be a Capulet."
 msgstr "E deixarei eu de ser un Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:657
 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:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4505,7 +3618,7 @@ msgstr "Mostrar grupos"
 msgid "Show account balances"
 msgstr "Mostrar os balances das contas"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4687,16 +3800,16 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Desconectar"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Debe configurar unha conta para ver contactos aquí."
 
 #: ../src/empathy-roster-window.c:569
@@ -4706,78 +3819,84 @@ msgstr ""
 "As contas de %s non se poden usar até que non teña actualizado o seu "
 "software %s."
 
-#: ../src/empathy-roster-window.c:669
+#: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:688
+#: ../src/empathy-roster-window.c:689
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "A conta %s require autorización"
 
-#: ../src/empathy-roster-window.c:699
+#: ../src/empathy-roster-window.c:700
 msgid "Online Accounts"
 msgstr "Contas en liña"
 
-#: ../src/empathy-roster-window.c:746
-msgid "Update software..."
+#: ../src/empathy-roster-window.c:747
+msgid "Update software…"
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "Editar a conta"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
 msgstr "Recargar conta"
 
-#: ../src/empathy-roster-window.c:1585
+#: ../src/empathy-roster-window.c:1590
 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:1593
+#: ../src/empathy-roster-window.c:1598
 #, 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:1671
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
 msgstr "Cambie a súa presencia para ver os contactos aquí"
 
 # rever
-#: ../src/empathy-roster-window.c:1680
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:1687
+#: ../src/empathy-roster-window.c:1692
 msgid "You haven't added any contact yet"
 msgstr "Non engadiu ningún contacto aínda"
 
 # rever
-#: ../src/empathy-roster-window.c:1690
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
 msgstr "Non hai contactos en liña"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Nova conversa…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "Nova _chamada…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4786,12 +3905,12 @@ msgstr "Contactos"
 
 # rever
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Engadir contactos…"
+msgid "_Add Contacts…"
+msgstr "Eng_adir contactos…"
 
 # rever
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Buscar contactos…"
 
 # rever
@@ -4804,7 +3923,7 @@ msgid "_Rooms"
 msgstr "Sa_las"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+msgid "_Join…"
 msgstr "_Unirse…"
 
 # rever
@@ -4854,29 +3973,16 @@ msgstr "C_onectarse"
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos _desconectados"
 
-# rever
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Engadir contacto…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nova conversa…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nova _chamada…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Feito"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Escriba os detalles da súa conta"
 
@@ -4890,6 +3996,621 @@ msgstr "Editar as opcións da conta %s"
 msgid "Integrate your IM accounts"
 msgstr "Integre as súas contas de MI"
 
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "_Editar os parámetros da conexión…"
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Nova conversa…"
+
+#~ msgid "New _Call..."
+#~ msgstr "Nova _chamada…"
+
+# rever
+#~ msgid "_Add Contacts..."
+#~ msgstr "_Engadir contactos…"
+
+#~ msgid "_Join..."
+#~ msgstr "_Unirse…"
+
+# rever
+#~ msgid "_Add Contact..."
+#~ msgstr "_Engadir contacto…"
+
+#~ msgid "Password not found"
+#~ msgstr "Contrasinal non atopado"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "Contrasinal da conta de mensaxaría para %s (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "Contrasinal para a sala de conversa «%s» na conta %s (%s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "hai %d segundo"
+#~ msgstr[1] "hai %d segundos"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "hai %d minuto"
+#~ msgstr[1] "hai %d minutos"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "hai %d hora"
+#~ msgstr[1] "hai %d horas"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "hai %d día"
+#~ msgstr[1] "hai %d días"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "hai %d semana"
+#~ msgstr[1] "hai %d semanas"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "hai %d mes"
+#~ msgstr[1] "hai %d meses"
+
+#~ msgid "in the future"
+#~ msgstr "no futuro"
+
+# rever
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! Japan"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Conversa de Facebook"
+
+#~ msgid "Pass_word"
+#~ msgstr "Con_trasinal"
+
+# rever
+#~ msgid "Screen _Name"
+#~ msgstr "_Nome en pantalla"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
+
+#~ msgid "_Port"
+#~ msgstr "_Porto"
+
+#~ msgid "_Server"
+#~ msgstr "_Servidor"
+
+#~ msgid "Advanced"
+#~ msgstr "Avanzadas"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "Cal é o seu nome en patalla para AIM?"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "Cal e o seu contrasinal para AIM?"
+
+#~ msgid "Remember Password"
+#~ msgstr "Lembrar o contrasinal"
+
+#~ msgid "Password"
+#~ msgstr "Contrasinal"
+
+#~ msgid "Server"
+#~ msgstr "Servidor"
+
+#~ msgid "Port"
+#~ msgstr "Porto"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s:"
+
+#~ msgid "Username:"
+#~ msgstr "Nome de usuario:"
+
+#~ msgid "A_pply"
+#~ msgstr "_Aplicar"
+
+#~ msgid "L_og in"
+#~ msgstr "Iniciar _sesión"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "Esta conta xa existe no servidor"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "Crear unha nova conta no servidor"
+
+# rever
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%1$s sobre %2$s"
+
+#~ msgid "%s Account"
+#~ msgstr "Conta %s"
+
+# rever
+#~ msgid "New account"
+#~ msgstr "Conta nova"
+
+# rever
+#~ msgid "Login I_D"
+#~ msgstr "I_D de sesión"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>Exemplo:</b> usuario"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "Cal é o seu ID de usuario en GroupWise?"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "Cal é o seu contrasinal en GroupWise?"
+
+# rever
+#~ msgid "ICQ _UIN"
+#~ msgstr "_UIN ICQ"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>Exemplo:</b> 123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "Codificación de c_aracteres"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "Cal é o seu UIN para ICQ?"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "Cal é o seu contrasinal pra ICQ?"
+
+#~ msgid "Network"
+#~ msgstr "Rede"
+
+#~ msgid "Character set"
+#~ msgstr "Codificación de caracteres"
+
+#~ msgid "Up"
+#~ msgstr "Arriba"
+
+#~ msgid "Down"
+#~ msgstr "Abaixo"
+
+#~ msgid "Servers"
+#~ msgstr "Servidores"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr ""
+#~ "A maioría dos servidores IRC non precisan contrasinal, polo que se non "
+#~ "está seguro non escriba un contrasinal."
+
+#~ msgid "Nickname"
+#~ msgstr "Alcume"
+
+# rever
+#~ msgid "Quit message"
+#~ msgstr "Mensaxe de saída"
+
+#~ msgid "Real name"
+#~ msgstr "Nome real"
+
+#~ msgid "Username"
+#~ msgstr "Nome de usuario"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "Que rede IRC?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "Cal é o seu alcume de IRC?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "Cal é o seu nome de usuario para Facebook?"
+
+#~ 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 ""
+#~ "Este é o seu nome de usuario do sistema, non o seu nome de usuario de "
+#~ "Facebook.\n"
+#~ "Se vostede é facebook.com/<b>marca</b>, insira <b>marca</b>.\n"
+#~ "Use <a href=\"http://www.facebook.com/username/\">esta páxina</a> para "
+#~ "seleccioar o nome de usuario de Facebook se non ten ningún."
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "Cal é o seu contrasinal para Facebook?"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "Cal é o seu ID de Google?"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>Exemplo:</b> usuario@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "Cal é o seu contrasinal de Google?"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>Exemplo:</b> user@jabber.org"
+
+# rever
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "I_gnorar os erros de certificados SSL"
+
+#~ msgid "Priori_ty"
+#~ msgstr "Pri_oridade"
+
+#~ msgid "Reso_urce"
+#~ msgstr "Rec_urso"
+
+# rever
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "Require c_ifrado (TLS/SSL)"
+
+# rever
+#~ msgid "Override server settings"
+#~ msgstr "Sobrescribir os axustes do servidor"
+
+# rever
+#~ msgid "Use old SS_L"
+#~ msgstr "Usar SS_L antigo"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "Cal é o seu identificador de Jabber?"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "Cal é o ID de usuario que quere para Jabber?"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "Cal é o seu contrasinal de Jabber?"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "Cal é o contrasinal que desexa para Jabber?"
+
+#~ msgid "Nic_kname"
+#~ msgstr "_Alcume"
+
+#~ msgid "_Last Name"
+#~ msgstr "_Apelidos"
+
+#~ msgid "_First Name"
+#~ msgstr "_Nome"
+
+# rever
+#~ msgid "_Published Name"
+#~ msgstr "Nome _publicado"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "ID de _Jabber"
+
+#~ msgid "E-_mail address"
+#~ msgstr "Enderezo de correo _electrónico"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>Exemplo:</b> usuario@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "Cal é o seu ID de Windows Live?"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "Cal é o seu contrasinal de Windows Live?"
+
+#~ msgid "Auto"
+#~ msgstr "Auto"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "Rexistrador"
+
+#~ msgid "Options"
+#~ msgstr "Opcións"
+
+#~ msgid "None"
+#~ msgstr "Ningún"
+
+#~ msgid "_Username"
+#~ msgstr "Nome de _usuario"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>Exemplo:</b> usuario@meu.servidor.sip"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr "Usar esta conta para chamar a te_léfonos fixos e móbiles"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "Opcións de NAT transversal"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Opcións do proxy"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "Opcións varias"
+
+#~ msgid "STUN Server"
+#~ msgstr "Servidor STUN"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "Descubrir o servidor STUN automaticamente"
+
+# rever
+#~ msgid "Discover Binding"
+#~ msgstr "Descubrir ligazón"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "Opcións de «Keep-Alive»"
+
+#~ msgid "Mechanism"
+#~ msgstr "Mecanismo"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "Intervalo (segundos)"
+
+#~ msgid "Authentication username"
+#~ msgstr "Nome de usuario para a autenticación"
+
+#~ msgid "Transport"
+#~ msgstr "Transporte"
+
+#~ msgid "Loose Routing"
+#~ msgstr "Enrutado impreciso"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "Ignorar erros TLS"
+
+#~ msgid "Local IP Address"
+#~ msgstr "Enderezo IP local"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "Cal é o seu ID de inicio de sesión SIP?"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "Cal é o contrasinal da súa conta SIP?"
+
+#~ msgid "Pass_word:"
+#~ msgstr "Con_trasinal:"
+
+# rever
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "I_D de Yahoo:"
+
+# rever
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "I_gnorar convites a conferencias e salas de conversas"
+
+# rever
+#~ msgid "_Room List locale:"
+#~ msgstr "Configuración da lista de _salas:"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "Codificación de c_aracteres:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Porto:"
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "Cal é o seu ID para Yahoo?"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "Cal é o seu contrasinal de Yahoo!?"
+
+# rever
+#~ msgid "Couldn't convert image"
+#~ msgstr "Non foi posíbel converter a imaxe"
+
+# rever
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "Non foi posíbel gardar a imaxe a un ficheiro"
+
+# rever
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "Seleccione a súa imaxe de avatar"
+
+#~ msgid "Take a picture..."
+#~ msgstr "Tomar unha foto…"
+
+#~ msgid "No Image"
+#~ msgstr "Sen imaxe"
+
+#~ msgid "Images"
+#~ msgstr "Imaxes"
+
+#~ msgid "All Files"
+#~ msgstr "Todos os ficheiros"
+
+#~ msgid "Select..."
+#~ msgstr "Seleccionar…"
+
+#~ msgid "_Select"
+#~ msgstr "_Seleccionar"
+
+#~ msgid "Full name"
+#~ msgstr "Nome completo"
+
+#~ msgid "Phone number"
+#~ msgstr "Número de teléfono"
+
+#~ msgid "E-mail address"
+#~ msgstr "Enderezo de correo electrónico"
+
+#~ msgid "Website"
+#~ msgstr "Sitio web"
+
+#~ msgid "Birthday"
+#~ msgstr "Aniversario"
+
+#~ msgid "Last seen:"
+#~ msgstr "Última actividade"
+
+#~ msgid "Server:"
+#~ msgstr "Servidor:"
+
+#~ msgid "Connected from:"
+#~ msgstr "Conectado desde:"
+
+# rever
+#~ msgid "Away message:"
+#~ msgstr "Mensaxe de ausencia:"
+
+#~ msgid "work"
+#~ msgstr "traballo"
+
+#~ msgid "home"
+#~ msgstr "persoal"
+
+#~ msgid "mobile"
+#~ msgstr "móbil"
+
+#~ msgid "voice"
+#~ msgstr "voz"
+
+#~ msgid "preferred"
+#~ msgstr "prefirido"
+
+#~ msgid "postal"
+#~ msgstr "postal"
+
+#~ msgid "parcel"
+#~ msgstr "grupo"
+
+#~ msgid "New Network"
+#~ msgstr "Rede nova"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "Seleccione unha rede IRC"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "Rei_niciar a lista de redes"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Seleccionar"
+
+# rever
+#~ msgid "new server"
+#~ msgstr "servidor novo"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+# rever
+#~ msgid "New %s account"
+#~ msgstr "Conta nova de %s"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "Conéctese para editar a súa información persoal"
+
+# rever
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>Detalles persoais</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "Configuración rexional actual"
+
+#~ msgid "Arabic"
+#~ msgstr "�rabe"
+
+#~ msgid "Armenian"
+#~ msgstr "Armenio"
+
+#~ msgid "Baltic"
+#~ msgstr "Báltico"
+
+#~ msgid "Celtic"
+#~ msgstr "Celta"
+
+#~ msgid "Central European"
+#~ msgstr "Centroeuropeo"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "Chinés simplificado"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "Chinés tradicional"
+
+#~ msgid "Croatian"
+#~ msgstr "Croata"
+
+#~ msgid "Cyrillic"
+#~ msgstr "Cirílico"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "Cirílico/Ruso"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "Cirílico/Ucraíno"
+
+#~ msgid "Georgian"
+#~ msgstr "Xeorxiano"
+
+#~ msgid "Greek"
+#~ msgstr "Grego"
+
+#~ msgid "Gujarati"
+#~ msgstr "Guxarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "Gurmukhi"
+
+#~ msgid "Hebrew"
+#~ msgstr "Hebreo"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "Hebreo visual"
+
+#~ msgid "Hindi"
+#~ msgstr "Hindi"
+
+#~ msgid "Icelandic"
+#~ msgstr "Islandés"
+
+#~ msgid "Japanese"
+#~ msgstr "Xaponés"
+
+#~ msgid "Korean"
+#~ msgstr "Coreano"
+
+#~ msgid "Nordic"
+#~ msgstr "Nórdico"
+
+#~ msgid "Persian"
+#~ msgstr "Persa"
+
+#~ msgid "Romanian"
+#~ msgstr "Romanés"
+
+#~ msgid "South European"
+#~ msgstr "Sureuropeo"
+
+#~ msgid "Thai"
+#~ msgstr "Tailandés"
+
+#~ msgid "Turkish"
+#~ msgstr "Turco"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Western"
+#~ msgstr "Occidental"
+
+#~ msgid "Vietnamese"
+#~ msgstr "Vietnamita"
+
+#~ msgid "i"
+#~ msgstr "Información"
+
 #~ msgid "Manage Messaging and VoIP accounts"
 #~ msgstr "Xestionar as contas de mensaxaría e Voz IP"
 
@@ -5033,9 +4754,6 @@ msgstr "Integre as súas contas de MI"
 #~ msgid "_Compact Size"
 #~ msgstr "Ta_maño compacto"
 
-#~ msgid "_Join…"
-#~ msgstr "_Unirse…"
-
 #~ msgid "Appearance"
 #~ msgstr "Aparencia"
 
diff --git a/po/he.po b/po/he.po
index 6eaef79f2..9a409ec2b 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,16 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-26 19:56+0200\n"
-"PO-Revision-Date: 2012-12-26 19:58+0200\n"
+"POT-Creation-Date: 2013-09-03 12:09+0300\n"
+"PO-Revision-Date: 2013-09-03 12:11+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
-"Language: \n"
+"Language: he\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-Poedit-Language: Hebrew\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -42,8 +42,12 @@ msgid "Connection managers should be used"
 msgstr "Connection managers should be used"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect."
+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.h:3
 msgid "Empathy should auto-connect on startup"
@@ -51,15 +55,18 @@ msgstr "Empathy should auto-connect on startup"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "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.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy should auto-away when idle"
 
 #: ../data/org.gnome.Empathy.gschema.xml.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."
+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.h:7
 msgid "Empathy default download folder"
@@ -75,8 +82,12 @@ 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.h:11
-msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
-msgstr "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."
+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.h:12
 #: ../src/empathy-preferences.ui.h:1
@@ -124,8 +135,12 @@ msgid "Display incoming events in the status area"
 msgstr "Display incoming events in the status area"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Display incoming events in the status area. If false, present them to the user immediately."
+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.h:24
 msgid "The position for the chat window side pane"
@@ -189,15 +204,18 @@ msgstr "Play a sound when a contact logs in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:39
 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."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:41
-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 ""
+"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.h:42
 msgid "Play a sound when we log in"
@@ -236,8 +254,12 @@ 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.h:51
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+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.h:52
 msgid "Pop up notifications when a contact logs in"
@@ -284,32 +306,44 @@ msgid "Chat window theme variant"
 msgstr "Chat window theme variant"
 
 #: ../data/org.gnome.Empathy.gschema.xml.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."
+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.h:64
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
-msgstr "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Enable WebKit Developer Tools"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:67
-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."
+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.h:68
 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.h:69
-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."
+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.h:70
 msgid "Use theme for chat rooms"
@@ -324,32 +358,42 @@ msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:73
-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 ""
+"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/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "Enable spell checker"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:75
-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 ""
+"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.h:76
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:77
-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."
+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.h:78
 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.h:79
-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."
+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.h:80
 msgid "Last account selected in Join Room dialog"
@@ -388,8 +432,12 @@ msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+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.h:90
 msgid "Empathy can publish the user's location"
@@ -428,8 +476,10 @@ msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy should reduce the location's accuracy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:99
-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 ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 
 #: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
@@ -455,8 +505,7 @@ msgstr "התרחשה שגי�ה בזמן ניסיון העברת הקובץ"
 msgid "The other participant is unable to transfer the file"
 msgstr "המשתתף ה�חר ל� יכול להעביר �ת הקובץ"
 
-#: ../libempathy/empathy-ft-handler.c:751
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "סיבה ל� ידועה"
 
@@ -476,804 +525,188 @@ msgstr "הקובץ הנבחר �ינו קובץ רגיל"
 msgid "The selected file is empty"
 msgstr "הקובץ הנבחר ריק"
 
-#: ../libempathy/empathy-keyring.c:85
-#: ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "הססמה ל� נמצ�ה"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "ססמת חשבון המסרי� המידיי� עבור %s� (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "הססמה עבור החדר '%s' דרך החשבון %s �(%s)"
-
-#: ../libempathy/empathy-message.c:403
-#: ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "שיחה של� נענתה מ�ת %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "התקשרת ל%s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "שיחה מ�ת %s"
 
-#: ../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:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "לפני דקה"
-msgstr[1] "לפני %d דקות"
-
-#: ../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:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "לפני יו�"
-msgstr[1] "לפני %d ימי�"
-
-#: ../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:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "לפני חודש"
-msgstr[1] "לפני %d חודשי�"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "בעתיד"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "בלתי נר�ה"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "ל� מחובר"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "ל� צויינה סיבה"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "המצב מוגדר כמנותק"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "שגי�ת רשת"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "ה�ימות נכשל"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "שגי�ת הצפנה"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "הש� בשימוש"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "ל� סופקה תעודה"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "התעודה �ינה מ�ובטחת"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "התעודה ל� תקפה"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "התעודה �ינה פעילה"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "ש� המ�רח בתעודה ל� תו��"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "טביעת ה�צבע של התעודה �ינה תו�מת"
 
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "תעודה בחתימה עצמית"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "שגי�ת תעודה"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "�ין הצפנה זמינה"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "התעודה שגויה"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "החיבור נתקל בסירוב"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "ל� ניתן לקיי� �ת החיבור"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "החיבור נקטע"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "חשבון זה כבר מחובר לשרת"
 
-#: ../libempathy/empathy-utils.c:350
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:303
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש ב�מצעות �ותו המש�ב"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיי� בשרת"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק מכדי לטפל בחיבור"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "התעודה נשללה"
 
-#: ../libempathy/empathy-utils.c:359
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "התעודה משתמשת ב�לגורית� הצפנה בלתי מ�ובטח �ו שהו� חלש מבחינה קריפטוגרפית"
+#: ../libempathy/empathy-utils.c:312
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"התעודה משתמשת ב�לגורית� הצפנה בלתי מ�ובטח �ו שהו� חלש מבחינה קריפטוגרפית"
 
-#: ../libempathy/empathy-utils.c:362
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "�ורך �ישור ה�בטחה של השרת �ו עומק מחרוזת �ישור ה�בטחה של השרת חורגי� מהמגבלות שהוצבו על ידי ספריית ההצפנה"
+#: ../libempathy/empathy-utils.c:315
+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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "התכנה שלך ישנה מדי"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "שגי�ה פנימית"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "�נשי� בקרבתי"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "�Yahoo! יפן"
-
-#: ../libempathy/empathy-utils.c:538
-#: ../src/empathy-roster-window.c:671
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "צ׳�ט Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "כל החשבונות"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "_ססמה"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "ש� ת_צוגה"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<span size=\"small\"><b>דוגמה:</b> MyScreenName</span>"
-
-#. 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 "שמירת הססמה"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_פתחה"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_שרת"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "שמירת הססמה"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "חשבון"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "ססמה"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "שרת"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "פתחה"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "ש_� משתמש:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "ה_חלה"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_כניסה"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "חשבון זה כבר קיי� על השרת"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "יצירת חשבון חדש על השרת"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "�%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "חשבון %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "חשבון חדש"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "מזהה _כניסה"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<span size=\"small\"><b>דוגמה:</b> username</span>"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "ססמת ה־GroupWise שלך?"
-
-#: ../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 "<span size=\"small\"><b>דוגמה:</b> 123456789</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "_ערכת תווי�"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "ססמת ה־ICQ שלך?"
-
-#: ../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 "ערכת תווי�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "הוספה…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "הסרה"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "למעלה"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "למטה"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "שרתי�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "רוב שרתי ה־IRC �ינ� דורשי� ססמה, לכן במידה של ספק, �ין להזין ססמה."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "כינוי"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "הודעת יצי�ה"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "ש� �מתי"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "ש� משתמש"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "�יזו רשת IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "מהו הכינוי שלך ב־IRC?"
-
-#: ../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: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 ""
-"זהו ש� המשתמש שלך, ל� פרטי החיבור הרגילי� שלך לפייסבוק.\n"
-"�� הנך facebook.com/<b>badger</b>, יש להזין <b>badger</b>.\n"
-"יש להשתמש ב<a href=\"http://www.facebook.com/username/\">עמוד זה</a> כדי לבחור ש� משתמש בפייסבוק �� עוד �ין לך �חד כזה."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "מהי ססמת חשבון הפייסבוק שלך?"
-
-#: ../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 "<span size=\"small\"><b>דוגמה:</b> user@gmail.com</span>"
-
-#: ../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 "<span size=\"small\"><b>דוגמה:</b> user@jabber.org</span>"
-
-#: ../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 "Override server settings"
-msgstr "מעקף הגדרת השרת"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "שימוש ב־SS_L ישן"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "מהו מזהה משתמש ה־Jabber שלך?"
-
-#: ../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: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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_כינוי"
-
-#: ../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 "E-_mail address"
-msgstr "כתובת _דו�״ל"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<span size=\"small\"><b>דוגמה:</b> user@hotmail.com</span>"
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr "מהי ססמתך ב־Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "�וטומטי"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "הרשמה"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "�פשרויות"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "לל�"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "ש_� משתמש"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<span size=\"small\"><b>דוגמה:</b> user@my.sip.server</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "יש להשתמש בחשבון זה על מנת להתקשר לטלפוני� ניי_חי� וניידי�"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "�פשרויות מעקף NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "�פשרויות מתווך"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "�פשרויות �חרות"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "שרת STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "גילוי שרת ה־STUN �וטומטית"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-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 "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 "Transport"
-msgstr "תעבורה"
-
-#: ../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 "התעלמות משגי�ות TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "כתובת IP מקומית"
-
-#: ../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 "What is your SIP account password?"
-msgstr "מהי ססמת חשבון ה־SIP שלך?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "ססמ_ה:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "שפת רשימת ה_חדרי�:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_ערכת תווי�:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-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:11
-msgid "What is your Yahoo! password?"
-msgstr "מהי ססמת חשבון ה־Yahoo! שלך?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "ל� ניתן להמיר תמונה"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "�ף �חד מסוגי התמונות המקובלי� �ינ� נתמכי� על ידי המערכת שלך"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "ל� ניתן לשמור �ת התמונה לקובץ"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "נ� לבחור �ת התמונה ה�ישית שלך"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "צילו� תמונה..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "לל� תמונה"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "תמונות"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "כל הקבצי�"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "יש ללחוץ כדי להגדיל"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "ה�ימות עבור החשבון <b>%s</b> נכשל"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "ניסיון חוזר"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1283,226 +716,231 @@ msgstr ""
 "נ� להזין �ת הססמה לחשבון\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "בחירה..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_בחירה"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "שמירת הססמה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "התחלת השיחה נכשלה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "�יש הקשר המסוי� הזה �ינו תומך בשיחות"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "�יש הקשר המסוי� הזה מנותק"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "�יש הקשר המסוי� הזה �ינו תקני"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�ין תמיכה בשיחות חירו� בפרוטוקול זה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "�ין לך די �שר�י כדי לבצע שיחה זו"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
-msgstr "פתיחת שיחה פרטית נכשלה"
+msgstr "פתיחת צ׳�ט פרטי נכשלה"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "�ין תמיכה בשימוש בנוש� בדיון זה"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "�ין לך הרש�ה לשנות �ת הנוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "מזהה �יש קשר שגוי"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <נוש�>:‎ הגדרת נוש� השיחה הנוכחית"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
+msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר צ׳�ט חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
+msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר צ׳�ט חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
-msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הו� בררת המחדל"
+#: ../libempathy-gtk/empathy-chat.c:1073
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ הצ׳�ט, הנוכחי הו� בררת המחדל"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <זיהוי �יש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳�ט �ישי"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <זיהוי �יש הקשר>‎ <הודעה>:‎ פתיחת צ׳�ט פרטי"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
-msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
-msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
+#: ../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 <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות "
+"המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר צ׳�ט חדש\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטי� על �יש הקשר"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
-msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. �� יש הגדרה ל־<פקודה> יוצג �ופן הפעלתה."
+#: ../libempathy-gtk/empathy-chat.c:1097
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. �� יש הגדרה ל־<פקודה> יוצג �ופן "
+"הפעלתה."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "שימוש: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "פקודה ל� ידועה"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "המ�זן �ינו מ�פשר לשלוח הודעה"
 
-#: ../libempathy-gtk/empathy-chat.c:1542
-#: ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגי�ה בשליחת ההודעה '%s': �%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544
-#: ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "לל� יכולת"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "ל� מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "�יש קשר שגוי"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "הרש�ה נ�סרה"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "הודעה �רוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "התכונה ל� מומשה"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "ל� ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:1680
-#: ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "נוש�:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנוש� הוגדר ל־: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "ל� נקבע נוש�"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(�ין הצעות)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "הוספת '%s' למילון %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "הוספת חייכן"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_שליחה"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "הצעות _�יות"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "קבלת הדוחות ה�חרוני� נכשלה"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "�%s התנתק"
@@ -1510,12 +948,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "�%1$s סולק על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "�%s סולק"
@@ -1523,17 +961,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "�%1$s נחס� על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "�%s נחס�"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "�%s עזב �ת החדר"
@@ -1543,17 +981,17 @@ msgstr "�%s עזב �ת החדר"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "�%s הצטרף לחדר"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "�%s נודע כעת בכינוי %s"
@@ -1561,54 +999,50 @@ msgstr "�%s נודע כעת בכינוי %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989
-#: ../src/empathy-call-window.c:1532
-#: ../src/empathy-call-window.c:1582
-#: ../src/empathy-call-window.c:2655
-#: ../src/empathy-call-window.c:2961
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "מנותק"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "ה�� ברצונך ל�חסן ססמה זו?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "ל� כעת"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "ססמה שגויה; נ� לנסות שוב:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "חדר זה מוגן בססמה:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "הצטרפות"
 
-#: ../libempathy-gtk/empathy-chat.c:4077
-#: ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "שיחה"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1639,8 +1073,8 @@ msgstr "עריכת �נשי הקשר החסומי�"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1650,120 +1084,63 @@ msgstr "חשבון:"
 msgid "Blocked Contacts"
 msgstr "�נשי קשר חסומי�"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "ש� מל�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "מספר טלפון"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "כתובת דו�״ל"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "�תר �ינטרנט"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "פעילות �חרונה:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "שרת:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "החיבור דרך:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "הודעת התרחקות:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "עבודה"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "בית"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "סלולרי"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "קול"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "מועדף"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "מיקוד"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "הסרה"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "חיפוש בין �נשי הקשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "חיפוש:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "הוספת _�יש קשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "ל� נמצ�ו �נשי קשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "�ין תמיכה בחיפוש משתמשי� בחשבון זה"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "ההודעה המציגה �ותך:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "נ� ל�פשר לי לר�ות מתי מצבך הו� מחובר. תודה!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "שמירת תמונה �ישית"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "ל� ניתן לשמור תמונה �ישית"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "חשבון"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "מזהה"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "כינוי"
 
@@ -1797,345 +1174,359 @@ msgstr "גרסה"
 msgid "Client"
 msgstr "לקוח"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "קבוצות"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
-msgstr "יש לבחור �ת הקבוצות בהן �תה מעוניין ש�יש קשר זה יופיע.  ניתן לבחור ביותר מקבוצה �חת �ו ל� לבחור קבוצות בכלל."
+#: ../libempathy-gtk/empathy-groups-widget.c:330
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"יש לבחור �ת הקבוצות בהן �תה מעוניין ש�יש קשר זה יופיע.  ניתן לבחור ביותר "
+"מקבוצה �חת �ו ל� לבחור קבוצות בכלל."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "הוס_פת קבוצה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "בחירה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "קבוצה"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "�יש קשר חדש"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "ה�� לחסו� �ת %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "ה�� �כן ברצונך לחסו� �ת �פשרות ההתקשרות של '%s' �ליך?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ל� ניתן לחסו� �ת הזהות הב�ה:"
 msgstr[1] "ל� ניתן לחסו� �ת בעלי הזהות הב�י�:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "ח_סימה"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_דיווח על משתמש זה כמטרד"
 msgstr[1] "_דיווח על משתמשי� �לה כמטרד"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "עריכת פרטי �יש קשר"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "�נשי קשר מקושרי�"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "ל� הותקנה התכנית gnome-contacts"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "נ� להתקין �ת gnome-contacts כדי לגשת לפרטי �נשי הקשר."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "נ� לבחור �ת החשבון לשימוש לצורך ההתקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "התקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "סלולרי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "עבודה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "בית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "ח_סימת �יש קשר"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "הסרה מה_קבוצה '%s'"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "מחיקה ו_חסימה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "להסיר �ת �יש הקשר '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
-msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
-msgstr "ה�� �כן ברצונך להסיר �ת �יש הקשר המקושר '%s'? נ� לשי� לב שפעולה זו תסיר �ת כל �נשי הקשר המת�גדי� ל�יש קשר מקושר זה."
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"ה�� �כן ברצונך להסיר �ת �יש הקשר המקושר '%s'? נ� לשי� לב שפעולה זו תסיר �ת "
+"כל �נשי הקשר המת�גדי� ל�יש קשר מקושר זה."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "�יש קשר מוסר"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "ה_סרה"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
-msgstr "_שיחה"
+msgstr "_צ׳�ט"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _ויד�ו"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "שליחת קובץ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "שיתוף שולחן העבודה שלי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "מועדף"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ע_ריכה"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "מזמין/ה �ותך לחדר זה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
-msgstr "ה_זמנה לחדר שיחה"
+msgstr "ה_זמנה לחדר צ׳�ט"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "הוספת _�יש קשר…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "ה�� להסיר �ת הקבוצה '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "הקבוצה מוסרת"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "שנה _ש�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "ערוצי�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "קוד המדינה בתקן ISO:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "�רץ:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "מדינה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "עיר:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�זור:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "מיקוד:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "רחוב:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "מבנה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "קומה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "חדר:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "טקסט:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "תי�ור:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "כתובת:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "רמת דיוק:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "שגי�ה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "סטייה �נכית (מטרי�):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "סטייה �ופקית (מטרי�):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "מהירות:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "�זימוט:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "מהירות הטיפוס:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "עדכון �חרון ב־:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "קו �ורך:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "קו רוחב:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "גובה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "מיקו�"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "�%B %e, %Y ב־�%R �UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "כינוי:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "מזהה:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2150,172 +1541,156 @@ msgstr "<b>מיקו�</b> ב(ת�ריך)"
 msgid "Online from a phone or mobile device"
 msgstr "בחיבור סלולרי �ו דרך התקן נייד"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "רשת חדשה"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr "בחירת רשת IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr "_�יפוס רשימת הרשתות"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "בחירה"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "שרת חדש"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
-msgstr "ב�פשרות Empathy לגלות ולנהל שיחות ע� �נשי� המחוברי� ל�ותה הרשת כמוך. �� ברצונך להשתמש בתכונה זו, נ� לבדוק שהפרטי� שלהלן נכוני�."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
+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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "�נשי� בקרבתי"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr "ב�פשרותך לשנות פרטי� �לה מ�וחר יותר �ו לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה � חשבונות</span> ברשימת �נשי הקשר."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
+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> ברשימת �נשי הקשר."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "הצגה"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
-msgstr "שיחה תחת %s"
+msgstr "צ׳�ט תחת %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
-msgstr "שיחה ע� %s"
+msgstr "צ׳�ט ע� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1295
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, 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:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "שנייה �חת"
 msgstr[1] "%s שניות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "דקה �חת"
 msgstr[1] "%s דקות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "השיחה �רכה %s, הסתיימה ב־%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "היו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "�תמול"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "ה־%e ב%B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "כל זמן שהו�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "כל �חד"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "מי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "מתי"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "כל דבר"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "צ׳�טי� בטקסט"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "שיחות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "שיחות נכנסות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "שיחות יוצ�ות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "שיחות של� נענו"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "מה"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ה�� �כן ברצונך למחוק �ת כל היומני� של הדיוני� ה�חרוני� שלך?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "מחיקת הכול"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "מחיקה עד מ־:"
 
@@ -2324,24 +1699,22 @@ msgid "_File"
 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-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "ע_ריכה"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All 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-chat-window.c:1438
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
-msgstr "שיחה"
+msgstr "צ׳�ט"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:26
@@ -2353,112 +1726,116 @@ 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>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">בטעינה…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "�ילו חשבונות יש לך?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "נוסף חשבון חדש"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "הוספת חשבון חדש"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "יש להזין מזהה ל�יש הקשר �ו מספר טלפון:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "שיֹחת _ויד�ו"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "שיחה חדשה"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "�יש קשר זה מנותק"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "�יש הקשר המסוי� הזה �ינו תקני �ו ש�ינו מוכר"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "�יש הקשר �ינו תומך בסוג כזה של דיון"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "התכונה המבוקשת �ינה מיושמת בפרוטוקול זה"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "ל� ניתן להתחיל �ת הדיון ע� �יש הקשר הנבחר"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "גישתך נחסמה לערוץ זה"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "ערוץ זה מל�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "עליך לקבל הזמנה כדי להצטרף לערוץ זה"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "ל� ניתן להמשיך בזמן ניתוק"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "ההרש�ה נדחתה"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "�ירעה שגי�ה בעת התחלת הדיון"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "שיחה חדשה"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "נדרשת ססמה"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "הודעה מות�מת �ישית…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "עריכת ההודעות המות�מות �ישית…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "יש ללחוץ כדי להסיר מצב זה מהמועדפי�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "יש ללחוץ כדי להוסיף מצב זה למועדפי�"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2467,25 +1844,16 @@ msgstr ""
 "<b>הודעה נוכחית: %s</b>\n"
 "<small>יש ללחוץ על Enter כדי להגדיר הודעה חדשה �ו Esc כדי לבטל.</small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "הגדרת מצב"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "הודעות מות�מות �ישית…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "חשבון %s חדש"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "הת�מת _רישיות"
 
@@ -2509,404 +1877,260 @@ msgstr "הת�מת _רישיות"
 msgid "Phrase not found"
 msgstr "הביטוי ל� נמצ�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "התקבלה הודעה מידית"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "שליחת הודעה מידית"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
-msgstr "בקשת שיחה נכנסת"
+msgstr "בקשת צ׳�ט נכנסת"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "�יש קשר התחבר"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "�יש קשר התנתק"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "מחובר לשרת"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "מנותק מהשרת"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "שיחה קולית נכנסת"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "שיחה קולית פעילה"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "שיחה קולית הסתיימה"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "עריכת הודעה מות�מת"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "בקשת הצטרפות"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s רוצה הרש�ות לצפייה מתי המשתמש שלך מחובר"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_סירוב"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_קבלה"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1101
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1801
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "רגיל"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "הזהות שסופקה על ידי שרת הצ׳�ט �ינה ניתנת ל�ימות."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "�ישור �בטחה זה �ינו חתו� על ידי רשות �ישורי �בטחה."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "�ישור ה�בטחה פג."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "�ישור ה�בטחה ל� הופעל."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "ל�ישור ה�בטחה �ין �ת טביעת ה�צבע המצופה."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "ש� המ�רח שצוין ב�ישור ה�בטחה �ינו תו�� לש� השרת."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 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."
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "�ישור ה�בטחה נשלל על ידי רשות �ישורי ה�בטחה המנפיקה."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "�ישור �בטחה זה חלש מבחינת הצפנה."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "�ורך �ישור ה�בטחה חורג מהגבולות הניתני� ל�ימות."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "�ישור ה�בטחה פגו�."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "המ�רח הצפוי: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "מ�רח �ישור ה�בטחה: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "המ_שך"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "חיבור מפוקפק"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "חיבור זה �ינו מהימן. ה�� ברצונך להמשיך בכל מקרה?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "יש לזכור בחירה זו עבור חיבורי� עתידיי�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "פרטי התעודה"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "ל� ניתן לפתוח �ת הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "בחירת קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "�ין די מקו� פנוי לשמירת הקובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, 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 פנויי�. נ� לבחור במיקו� �חר."
+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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "קובץ נכנס מ־%s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "עליך להתחבר כדי לערוך �ת הפרטי� ה�ישיי� שלך."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>פרטי� �ישיי�</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "העתקת _מיקו� הקישור"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_פתיחת קישור"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "ניתוח ה־HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "מיקו� ושפה נוכחיי�"
-
-#: ../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 "ערבית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "�רמנית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "בלטית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "קלטית"
-
-#: ../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 "מרכז �ירופ�י"
-
-#: ../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 "סינית מפושטת"
-
-#: ../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 "סינית מסורתית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "קרו�טית"
-
-#: ../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 "קירילית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "קירילית/רוסית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "קירילית/�וקר�ינית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "ג�ורגית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "יוונית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "גוג׳ר�טית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "גורמוחית"
-
-#: ../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 "עברית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "עברית ויזו�לית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "הינדית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "�יסלנדית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "יפנית"
-
-#: ../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 "קורי�נית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "נורדית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "פרסית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "רומנית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "דרו� �ירופ�ית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "ת�ילנדית"
-
-#: ../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 "טורקית"
-
-#: ../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 "יוניקוד"
-
-#: ../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 "מערבית"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "וייטנ�מית"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "�נשי קשר מובילי�"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "�נשי� בקרבתי"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "לל� קבוצה"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:219
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "השרת ל� יכול למצו� �ת �יש הקשר: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "�ין הודעת שגי�ה"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "הודעה מיידית (Empathy)"
 
+#: ../src/empathy-about-dialog.c:77
+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 License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+
 #: ../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 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+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 License for more "
+"details."
 
 #: ../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 License for more details."
-
-#: ../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 License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 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 ""
+"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"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "לקוח מסרי� מיידיי� עבור GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "מ�רק קרפיבנר <mark125@gmail.com>\n"
@@ -2915,92 +2139,99 @@ msgstr ""
 "פרוייקט תרגו� GNOME לעברית:\n"
 "�http://gnome-il.berlios.de"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "�ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו�) ול�חריה התכנית תסגר"
+msgstr ""
+"�ין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבו�) ול�חריה התכנית תסגר"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:175
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�ין להציג תיבות דו־שיח כלשהן �ל� �� כן ישנן חשבונות \"�נשי� בקרבתי\""
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- חשבונות Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "חשבונות Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "ישנ� שינויי� של� נשמרו בחשבון ה־%s שלך."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "ישנ� שינויי� של� נשמרו בחשבון ה־%.50s שלך."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "החשבון החדש שלך ל� נשמר עדיין."
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-call-window.c:1274
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "בהתחברות…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "ל� מחובר — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "מנותק  — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "מנותק — �ין חיבור לרשת"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "מצב ל� ידוע"
 
-#: ../src/empathy-accounts-dialog.c:492
-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:473
+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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "מנותק — החשבון מנוטרל"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "עריכת הגדרות החיבור"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "ע_ריכת הגדרות החיבור..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "_עריכת משתני החיבור…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "ה�� ברצונך להסיר �ת החשבון '%s' ממחשבך?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "ה�� ברצונך להסיר �ת %.50s ממחשבך?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "פעולה זו ל� תסיר �ת חשבונך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3009,24 +2240,24 @@ msgstr ""
 "�ת השינויי� שלך. ה�� להמשיך?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "מו_פעל"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "שינוי ש�"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_דילוג"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "הת_חברות"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3035,10 +2266,14 @@ msgstr ""
 "�ת השינויי� שלך. ה�� להמשיך?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "חשבונות התכתבות ו־VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "הוספה…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "י_בו�…"
@@ -3048,41 +2283,45 @@ 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 "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
 msgstr "�ין מנגנוני פרוטוקולי� מותקני�"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- לקוח ה�ימות של Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "לקוח ה�ימות של Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "ל� להתחבר בהפעלה"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�ין להציג �ת רשימת �נשי הקשר �ו כל דו־שיח �חר בהפעלה"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- לקוח המסרי� המידיי� Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "שגי�ה ביצירת קשר ע� מנהל החשבונות"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
 "\n"
 "%s"
 msgstr ""
@@ -3090,7 +2329,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "בשיחה"
 
@@ -3102,162 +2341,165 @@ msgstr "- לקוח השמע/הוויד�ו Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "לקוח השמע/הוויד�ו Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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:1131
-#: ../src/empathy-call-window.c:1147
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1549
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
-#: ../src/empathy-call-window.c:1555
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "שיחת ויד�ו נכנסת מ־%s"
 
-#: ../src/empathy-call-window.c:1555
-#: ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "שיחה נכנסת מ־%s"
 
-#: ../src/empathy-call-window.c:1559
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "דחייה"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "מענה"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה ע� %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי המחשב"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "כתובת ה־IP כפי שנר�ית על ידי שרת ב�ינטרנט"
 
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "כתובת ה־IP כדי שנר�ית על ידי עמית מהצד השני"
 
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "כתובת ה־IP של קבוצת התשדורת"
 
-#: ../src/empathy-call-window.c:2598
-#: ../src/empathy-call-window.c:2599
-#: ../src/empathy-call-window.c:2600
-#: ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "פרטי� טכניי�"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3102
 #, 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 �ינה מבינה �ת מבני השמע הנתמכי� על ידי המחשב שלך"
 
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3107
 #, 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 �ינה מבינה �ת מבני הוויד�ו הנתמכי� על ידי המחשב שלך"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3113
 #, 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. כנר�ה �חד ממשתתפי השיחה מחובר לרשת ש�ינה מ�פשרת חיבורי� ישירי�."
+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:3120
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "�ירעה שגי�ה ברשת"
 
-#: ../src/empathy-call-window.c:3124
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3123
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
-#: ../src/empathy-call-window.c:3127
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3126
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הוויד�ו הדרושי� לקיו� שיחה זו �ינ� מותקני� במחשבך"
 
-#: ../src/empathy-call-window.c:3139
+#: ../src/empathy-call-window.c:3138
 #, 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> ולהוסיף דוחות שנ�ספו מחלון 'ניפוי השגי�ות' שבתפריט העזרה."
+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:3148
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "�ירעה שגי�ה במנוע הקרי�ה"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "התזרי� הגיע לסיומו"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "ל� ניתן לקיי� תזרי� שמע"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "ל� ניתן לקיי� תזרי� ויד�ו"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "המ�זן הנוכחי שלך הו� %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�ין לך מספיק �שר�י כדי לבצע שיחה זו."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Top Up"
 
@@ -3281,13 +2523,11 @@ msgstr "ה_גדרות"
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "ע_זרה"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_תכני�"
 
@@ -3371,24 +2611,23 @@ msgstr "מועמד מרוחק:"
 msgid "Local Candidate:"
 msgstr "מועמד מקומי:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "שמע"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- לקוח הצ׳�טי� Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "ש�"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "חדר"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "חיבור �וטומטי"
 
@@ -3396,80 +2635,92 @@ msgstr "חיבור �וטומטי"
 msgid "Manage Favorite Rooms"
 msgstr "ניהול חדרי שיחה מועדפי�"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "ה�� לסגור חלון זה?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
-msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
-msgstr "סגירת חלון זה תגרו� לעזיבת %s. ל� יתקבלו עוד הודעות על להצטרפותך �ליו מחדש."
+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:306
+#: ../src/empathy-chat-window.c:298
 #, 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:317
+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:309
 #, c-format
 msgid "Leave %s?"
 msgstr "ה�� לעזוב �ת %s?"
 
-#: ../src/empathy-chat-window.c:319
-msgid "You will not receive any further messages from this chat room until you rejoin it."
+#: ../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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "סגירת החלון"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "עזיבת החדר"
 
-#: ../src/empathy-chat-window.c:677
-#: ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "�%s (�חת של� נקר�ה)"
 msgstr[1] "�%s �(%d של� נקר�ו)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, 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:708
+#: ../src/empathy-chat-window.c:700
 #, 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:717
+#: ../src/empathy-chat-window.c:709
 #, 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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "נשלחת הודעה �חת"
 msgstr[1] "נשלחות %d הודעות"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "הודעה מוקלדת."
 
@@ -3487,14 +2738,13 @@ msgstr "הוספת _סמיילי"
 
 #: ../src/empathy-chat-window.ui.h:4
 msgid "_Favorite Chat Room"
-msgstr "_הוספת חדר השיחה למועדפי�"
+msgstr "_הוספת חדר הצ׳�ט למועדפי�"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Notify for All Messages"
 msgstr "התרעה עבור כל ההודעות"
 
-#: ../src/empathy-chat-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
 msgstr "ה_צגת רשימת �נשי קשר"
 
@@ -3503,200 +2753,215 @@ msgid "Invite _Participant…"
 msgstr "הזמנת מ_שתתפי�…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "ה_צטרפות לצ׳�ט"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "ע_זיבת הצ׳�ט"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "�יש _קשר"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_לשוניות"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "ה_לשונית הקודמת"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "ה_לשונית הב�ה"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "ביטול _סגירת הלשונית"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "הזזת הלשונית _שמ�לה"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "הזזת הלשונית _ימינה"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_ניתוק הלשונית"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "הצגת שירות מסוי�"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- מנפה השגי�ות של Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "מנפה השגי�ות של Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "קישור ל־Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "תגובה מ־Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "הנתוני� גדולי� מדי להדבקה �חת. נ� לשמור �ת היומני� לקובץ."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "חלון ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "שליחה ל־Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "ניפוי שגי�ות"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:2002
-#: ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "�זהרה"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "שגי�ה"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
-"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
-"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
 msgstr ""
-"�פילו לל� הצגת ססמ�ות, יומני� עלולי� להכיל מידע רגיש כגון �נשי הקשר שלך �ו ההודעות ה�חרונות ששלחת �ו קיבלת.\n"
-" �� ל� תרצה לר�ות פרטי� כ�לה מופיעי� בדיווח תקלה ציבורי, ניתן להגביל �ת טווח הצופי� למפתחי Empathy בלבד בעת הדיווח על ידי הצגת השדות המתקדמי� ב<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">דוח התקלה</a>."
+"�פילו לל� הצגת ססמ�ות, יומני� עלולי� להכיל מידע רגיש כגון �נשי הקשר שלך �ו "
+"ההודעות ה�חרונות ששלחת �ו קיבלת.\n"
+" �� ל� תרצה לר�ות פרטי� כ�לה מופיעי� בדיווח תקלה ציבורי, ניתן להגביל �ת טווח "
+"הצופי� למפתחי Empathy בלבד בעת הדיווח על ידי הצגת השדות המתקדמי� ב<a href="
+"\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">דוח התקלה</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "תחו�"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:2100
-msgid "The selected connection manager does not support the remote debugging extension."
+#: ../src/empathy-debug-window.c:2091
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 msgstr "מנהל החיבורי� שנבחר �ינו תומך בהרחבת ניפוי שגי�ות מרחוק."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "שיחה קולית נכנסת"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "�%s מתקשר �ליך ע� ויד�ו, ה�� ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "�%s מתקשר �ליך, ה�� ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_דחייה"
 
-#: ../src/empathy-event-manager.c:549
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_מענה"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "מ_ענה ע� ויד�ו"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "הזמנה לחדר"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "הוזמנת להצטרף ל־%s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "�%s מזמינך �ותך להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "ה_צטרפות"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "הוזמנת על ידי �%s להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "הוזמנת להצטרף �ל %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "העברת קבצי� נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:973
-#: ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "נדרשת ססמה"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3706,108 +2971,105 @@ msgstr ""
 "הודעה: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ל� ידוע"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "�%s מתוך %s ב־%s/ש׳"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "�רעה שגי�ה בקבלת הקובץ \"%s\" מ־%s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "שגי�ה בקבלת קובץ"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "שגי�ה בשליחת הקובץ \"%s\" �ל %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "שגי�ה בשליחת קובץ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "הקובץ \"%s\" נשלח �ל %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "העברת קובץ הושלמה"
 
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "בהמתנה לתגובה של משתתפי� נוספי�"
 
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "השלמות של „%s“ נבדקת"
 
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "מתבצע גיבוב לקובץ „%s“"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "קובץ"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "נותר"
 
@@ -3819,57 +3081,60 @@ msgstr "העברות קבצי�"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "הסרת העברות קבצי� שהושלמו, בוטלו �ו נכשלו מהרשימה"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 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:82
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"ל� נמצ�ו חשבונות לייבו�. Empathy תומך כרגע בייבו� חשבונות מ־Pidgin בלבד."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "יבו� חשבונות"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "יבו�"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "הזמנת משתתפי�"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "נ� לבחור �נשי קשר להזמנה לדיון:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "הזמנה"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
-msgstr "חדר שיחה"
+msgstr "חדר צ׳�ט"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "חברי�"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "הצגת רשימת החדרי� נכשלה"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3882,35 +3147,45 @@ msgstr ""
 "נדרשת ססמה: %s\n"
 "חברי�: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "כן"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "ל�"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "הצטרפות לחדר"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "יש להזין �ת ש� החדר כדי להצטרף �ליו �ו ללחוץ על חדר �חד �ו יותר מהרשימה."
+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:2
 msgid "_Room:"
 msgstr "_חדר:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
-msgstr "יש להזין �ת כתובת השרת המ�רח �ת החדר, �ו להש�יר �ת השדה ריק �� החדר נמצ� בשרת של החשבון הנוכחי"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"יש להזין �ת כתובת השרת המ�רח �ת החדר, �ו להש�יר �ת השדה ריק �� החדר נמצ� "
+"בשרת של החשבון הנוכחי"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
-msgstr "יש להזין �ת כתובת השרת המ�רח �ת החדר, �ו להש�יר �ת השדה ריק �� החדר נמצ� בשרת של החשבון הנוכחי"
+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 "_Server:"
@@ -3924,104 +3199,104 @@ msgstr "ל� ניתן לטעון �ת רשימת החדרי�"
 msgid "Room List"
 msgstr "רשימת חדרי�"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "תגובה"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "מענה ע� ויד�ו"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "סירוב"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "�ישור"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "×”×–× ×”"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "התקבלה הודעה"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "הודעה נשלחה"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "שיחה חדשה"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "�יש הקשר מתחבר"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "�יש קשר מתנתק"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "חשבון מחובר"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "חשבון נותק"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "שפה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "יוליה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "רומי�ו"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "הו רומי�ו, רומי�ו, מן �ין שבת רומי�ו?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:648
 msgid "Deny thy father and refuse thy name;"
 msgstr "התכחש ל�ביך וסרב לשמו;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:651
 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:660
+#: ../src/empathy-preferences.c:654
 msgid "And I'll no longer be a Capulet."
 msgstr "ול� �היה עוד בת קפולט."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:657
 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:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "יוליה התנתקה"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -4033,8 +3308,7 @@ msgstr "הצגת קבוצות"
 msgid "Show account balances"
 msgstr "הצגת מ�זני החשבונות"
 
-#: ../src/empathy-preferences.ui.h:4
-#: ../src/empathy-roster-window.c:2236
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "רשימת �נשי קשר"
 
@@ -4088,7 +3362,7 @@ msgstr "ביטול התרעות בזמן מצב _מרוחק �ו עסוק"
 
 #: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
-msgstr "�יפשור התרעות כ�שר חלון ה_שיחה �ינו ממוקד"
+msgstr "ל�פשר התרעות כ�שר חלון ה_צ׳�ט �ינו ממוקד"
 
 #: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
@@ -4123,16 +3397,28 @@ msgid "Use _echo cancellation to improve call quality"
 msgstr "שימוש ב_ביטול הד כדי לשפר �ת �יכות השיחה"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "ביטול ההד הופך �ת השיחות הקוליות שלך לצלולות יותר עבור הצד השני �ך עלולות לגרו� לתקלות במספר מחשבי�. �� בצד שלך �ו בצד השני נשמעי� רעשי� מוזרי� �ו קטיעות במהלך השיחה כד�י לנסות לכבות �ת ביטול ההד ולהתחיל בשיחה מחדש."
+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:30
 msgid "_Publish location to my contacts"
 msgstr "_פרסו� המיקו� שלי ל�נשי הקשר שלי"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "הפחתת רמת הדיוק של המיקו� �ומרת שהמידע המדויק ביותר שיפורס� הו� העיר, המדינה וה�רץ שלך. הדיוק של נקודות ציון מ־GPS יהיו ע� מספר עשרוני 1."
+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:33
@@ -4160,7 +3446,9 @@ msgid "Location sources:"
 msgstr "מקורות המיקומי�:"
 
 #: ../src/empathy-preferences.ui.h:40
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "ברשימת השפות מוצגות שפות שעבורן מותקני� �צלך מילוני�."
 
 #: ../src/empathy-preferences.ui.h:41
@@ -4173,7 +3461,7 @@ msgstr "בדיקת �יות"
 
 #: ../src/empathy-preferences.ui.h:43
 msgid "Chat Th_eme:"
-msgstr "ער_כת עיצוב לשיחה:"
+msgstr "ער_כת עיצוב לצ׳�ט:"
 
 #: ../src/empathy-preferences.ui.h:44
 msgid "Variant:"
@@ -4183,16 +3471,16 @@ msgstr "הגוון:"
 msgid "Themes"
 msgstr "ערכות נוש�"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "הזנת ססמה"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "ניתוק"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "עליך להגדיר חשבון כדי שיופיעו כ�ן �נשי קשר."
 
 #: ../src/empathy-roster-window.c:569
@@ -4200,88 +3488,94 @@ msgstr "עליך להגדיר חשבון כדי שיופיעו ×›×�ן ×�נשי ×
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "ל� ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
 
-#: ../src/empathy-roster-window.c:669
+#: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:688
+#: ../src/empathy-roster-window.c:689
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "חשבון ה־%s דורש �ימות"
 
-#: ../src/empathy-roster-window.c:699
+#: ../src/empathy-roster-window.c:700
 msgid "Online Accounts"
 msgstr "חשבונות מקווני�"
 
-#: ../src/empathy-roster-window.c:746
-msgid "Update software..."
-msgstr "עדכון התכנה..."
+#: ../src/empathy-roster-window.c:747
+msgid "Update software…"
+msgstr "התכנה מתעדכנת…"
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "התחברות מחדש"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "סגירה"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
 msgstr "חשבון Top up"
 
-#: ../src/empathy-roster-window.c:1585
+#: ../src/empathy-roster-window.c:1590
 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:1593
+#: ../src/empathy-roster-window.c:1598
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "עליך להפעיל �ת %s כדי שיופיעו כ�ן �נשי קשר."
 
-#: ../src/empathy-roster-window.c:1671
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
 msgstr "שינוי הנוכחות שלך כדי לצפות ב�נשי קשר להלן"
 
-#: ../src/empathy-roster-window.c:1680
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
 msgstr "ל� נמצ�ה הת�מה"
 
-#: ../src/empathy-roster-window.c:1687
+#: ../src/empathy-roster-window.c:1692
 msgid "You haven't added any contact yet"
 msgstr "ל� הוספת �נשי קשר עדיין"
 
-#: ../src/empathy-roster-window.c:1690
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
 msgstr "�ין �נשי קשר מחוברי�"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_שיחה חדשה..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_שיחה חדשה…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "שיחה _חדשה..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "_שיחה חדשה…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "�נשי קשר"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "הוספת _�נשי קשר..."
+msgid "_Add Contacts…"
+msgstr "הוספת _�נשי קשר…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_חיפוש �חר �נשי קשר…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4293,8 +3587,8 @@ msgid "_Rooms"
 msgstr "_חדרי�"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_הצטרף..."
+msgid "_Join…"
+msgstr "ה_צטרפות…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4341,28 +3635,16 @@ msgstr "הת_חברות"
 msgid "Show _Offline Contacts"
 msgstr "הצגת �נשי קשר ש�ינ� מחוברי�"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "הוספת _�יש קשר..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_שיחה חדשה…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "_שיחה חדשה…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "מצב"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "בוצע"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "נ� להזין �ת פרטי החשבון שלך"
 
@@ -4375,6 +3657,593 @@ msgstr "עריכת �פשרויות חשבון ה־%s"
 msgid "Integrate your IM accounts"
 msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "ע_ריכת הגדרות החיבור..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_שיחה חדשה..."
+
+#~ msgid "New _Call..."
+#~ msgstr "שיחה _חדשה..."
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "הוספת _�נשי קשר..."
+
+#~ msgid "_Join..."
+#~ msgstr "_הצטרף..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "הוספת _�יש קשר..."
+
+#~ msgid "Password not found"
+#~ msgstr "הססמה ל� נמצ�ה"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "ססמת חשבון המסרי� המידיי� עבור %s� (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "הססמה עבור החדר '%s' דרך החשבון %s �(%s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "לפני שנייה"
+#~ msgstr[1] "לפני %d שניות"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "לפני דקה"
+#~ msgstr[1] "לפני %d דקות"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "לפני שעה"
+#~ msgstr[1] "לפני %d שעות"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "לפני יו�"
+#~ msgstr[1] "לפני %d ימי�"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "לפני שבוע"
+#~ msgstr[1] "לפני %d שבועות"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "לפני חודש"
+#~ msgstr[1] "לפני %d חודשי�"
+
+#~ msgid "in the future"
+#~ msgstr "בעתיד"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "�Yahoo! יפן"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "צ׳�ט Facebook"
+
+#~ msgid "Pass_word"
+#~ msgstr "_ססמה"
+
+#~ msgid "Screen _Name"
+#~ msgstr "ש� ת_צוגה"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> MyScreenName</span>"
+
+#~ msgid "_Port"
+#~ msgstr "_פתחה"
+
+#~ msgid "_Server"
+#~ msgstr "_שרת"
+
+#~ msgid "Advanced"
+#~ msgstr "מתקד�"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "ש� התצוגה שלך �צל AIM?"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "מהי הססמה שלך �צל AIM?"
+
+#~ msgid "Remember Password"
+#~ msgstr "שמירת הססמה"
+
+#~ msgid "Password"
+#~ msgstr "ססמה"
+
+#~ msgid "Server"
+#~ msgstr "שרת"
+
+#~ msgid "Port"
+#~ msgstr "פתחה"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s:"
+
+#~ msgid "Username:"
+#~ msgstr "ש_� משתמש:"
+
+#~ msgid "A_pply"
+#~ msgstr "ה_חלה"
+
+#~ msgid "L_og in"
+#~ msgstr "_כניסה"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "חשבון זה כבר קיי� על השרת"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "יצירת חשבון חדש על השרת"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "�%1$s על גבי %2$s"
+
+#~ msgid "%s Account"
+#~ msgstr "חשבון %s"
+
+#~ msgid "New account"
+#~ msgstr "חשבון חדש"
+
+#~ msgid "Login I_D"
+#~ msgstr "מזהה _כניסה"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> username</span>"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "מזהה משתמש ה־GroupWise שלך?"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "ססמת ה־GroupWise שלך?"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "מספר מ_נוי ICQ"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> 123456789</span>"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "_ערכת תווי�"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "מספר מנוי ה־ICQ שלך?"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "ססמת ה־ICQ שלך?"
+
+#~ msgid "Network"
+#~ msgstr "רשת"
+
+#~ msgid "Character set"
+#~ msgstr "ערכת תווי�"
+
+#~ msgid "Up"
+#~ msgstr "למעלה"
+
+#~ msgid "Down"
+#~ msgstr "למטה"
+
+#~ msgid "Servers"
+#~ msgstr "שרתי�"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr "רוב שרתי ה־IRC �ינ� דורשי� ססמה, לכן במידה של ספק, �ין להזין ססמה."
+
+#~ msgid "Nickname"
+#~ msgstr "כינוי"
+
+#~ msgid "Quit message"
+#~ msgstr "הודעת יצי�ה"
+
+#~ msgid "Real name"
+#~ msgstr "ש� �מתי"
+
+#~ msgid "Username"
+#~ msgstr "ש� משתמש"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "�יזו רשת IRC?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "מהו הכינוי שלך ב־IRC?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "מהו ש� המשתמש שלך בפייסבוק?"
+
+#~ 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 ""
+#~ "זהו ש� המשתמש שלך, ל� פרטי החיבור הרגילי� שלך לפייסבוק.\n"
+#~ "�� הנך facebook.com/<b>badger</b>, יש להזין <b>badger</b>.\n"
+#~ "יש להשתמש ב<a href=\"http://www.facebook.com/username/\">עמוד זה</a> כדי "
+#~ "לבחור ש� משתמש בפייסבוק �� עוד �ין לך �חד כזה."
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "מהי ססמת חשבון הפייסבוק שלך?"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "מהו מזהה משתמש שלך ב־Google?"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> user@gmail.com</span>"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "מהי ססמת ה־Google שלך?"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> user@jabber.org</span>"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "ה_תעלמות משגי�ות בתעודות SSL"
+
+#~ msgid "Priori_ty"
+#~ msgstr "עדי_פות"
+
+#~ msgid "Reso_urce"
+#~ msgstr "מ_ש�ב"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "_נדרשת הצפנה (TLS/SSL)"
+
+#~ msgid "Override server settings"
+#~ msgstr "מעקף הגדרת השרת"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "שימוש ב־SS_L ישן"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "מהו מזהה משתמש ה־Jabber שלך?"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "מהי כתובת ה־Jabber המועדפת עליך?"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "מהי ססמת ה־Jabber שלך?"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "מהי ססמת ה־Jabber המועדפת עליך?"
+
+#~ msgid "Nic_kname"
+#~ msgstr "_כינוי"
+
+#~ msgid "_Last Name"
+#~ msgstr "ש� מ_שפחה"
+
+#~ msgid "_First Name"
+#~ msgstr "ש� _פרטי"
+
+#~ msgid "_Published Name"
+#~ msgstr "ש� _ציבורי"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "מ_זהה Jabber"
+
+#~ msgid "E-_mail address"
+#~ msgstr "כתובת _דו�״ל"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> user@hotmail.com</span>"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "מהו ש� המשתמש שלך ב־Windows Live?"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "מהי ססמתך ב־Windows Live?"
+
+#~ msgid "Auto"
+#~ msgstr "�וטומטי"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "הרשמה"
+
+#~ msgid "Options"
+#~ msgstr "�פשרויות"
+
+#~ msgid "None"
+#~ msgstr "לל�"
+
+#~ msgid "_Username"
+#~ msgstr "ש_� משתמש"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<span size=\"small\"><b>דוגמה:</b> user@my.sip.server</span>"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr "יש להשתמש בחשבון זה על מנת להתקשר לטלפוני� ניי_חי� וניידי�"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "�פשרויות מעקף NAT"
+
+#~ msgid "Proxy Options"
+#~ msgstr "�פשרויות מתווך"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "�פשרויות �חרות"
+
+#~ msgid "STUN Server"
+#~ msgstr "שרת STUN"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "גילוי שרת ה־STUN �וטומטית"
+
+#~ msgid "Discover Binding"
+#~ msgstr "גילוי קישור"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "�פשרויות Keep-Alive"
+
+#~ msgid "Mechanism"
+#~ msgstr "מנגנון"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "תדירות (שניות)"
+
+#~ msgid "Authentication username"
+#~ msgstr "�ימות ש� משתמש"
+
+#~ msgid "Transport"
+#~ msgstr "תעבורה"
+
+#~ msgid "Loose Routing"
+#~ msgstr "Loose Routing"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "התעלמות משגי�ות TLS"
+
+#~ msgid "Local IP Address"
+#~ msgstr "כתובת IP מקומית"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "מהו מזהה ההתחברות של חשבון ה־SIP שלך?"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "מהי ססמת חשבון ה־SIP שלך?"
+
+#~ msgid "Pass_word:"
+#~ msgstr "ססמ_ה:"
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "מז_הה Yahoo!:"
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "ה_תעלמות מהזמנות לשיחות ועידה ולחדרי צ׳�ט"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "שפת רשימת ה_חדרי�:"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "_ערכת תווי�:"
+
+#~ msgid "_Port:"
+#~ msgstr "_פתחה:"
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "מהו המזהה בחשבון ה־Yahoo! שלך?"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "מהי ססמת חשבון ה־Yahoo! שלך?"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "ל� ניתן להמיר תמונה"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "�ף �חד מסוגי התמונות המקובלי� �ינ� נתמכי� על ידי המערכת שלך"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "ל� ניתן לשמור �ת התמונה לקובץ"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "נ� לבחור �ת התמונה ה�ישית שלך"
+
+#~ msgid "Take a picture..."
+#~ msgstr "צילו� תמונה..."
+
+#~ msgid "No Image"
+#~ msgstr "לל� תמונה"
+
+#~ msgid "Images"
+#~ msgstr "תמונות"
+
+#~ msgid "All Files"
+#~ msgstr "כל הקבצי�"
+
+#~ msgid "Select..."
+#~ msgstr "בחירה..."
+
+#~ msgid "_Select"
+#~ msgstr "_בחירה"
+
+#~ msgid "Full name"
+#~ msgstr "ש� מל�"
+
+#~ msgid "Phone number"
+#~ msgstr "מספר טלפון"
+
+#~ msgid "E-mail address"
+#~ msgstr "כתובת דו�״ל"
+
+#~ msgid "Website"
+#~ msgstr "�תר �ינטרנט"
+
+#~ msgid "Birthday"
+#~ msgstr "יו� הולדת"
+
+#~ msgid "Last seen:"
+#~ msgstr "פעילות �חרונה:"
+
+#~ msgid "Server:"
+#~ msgstr "שרת:"
+
+#~ msgid "Connected from:"
+#~ msgstr "החיבור דרך:"
+
+#~ msgid "Away message:"
+#~ msgstr "הודעת התרחקות:"
+
+#~ msgid "work"
+#~ msgstr "עבודה"
+
+#~ msgid "home"
+#~ msgstr "בית"
+
+#~ msgid "mobile"
+#~ msgstr "סלולרי"
+
+#~ msgid "voice"
+#~ msgstr "קול"
+
+#~ msgid "preferred"
+#~ msgstr "מועדף"
+
+#~ msgid "postal"
+#~ msgstr "מיקוד"
+
+#~ msgid "parcel"
+#~ msgstr "כתובת למשלוחי�"
+
+#~ msgid "New Network"
+#~ msgstr "רשת חדשה"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "בחירת רשת IRC"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "_�יפוס רשימת הרשתות"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "בחירה"
+
+#~ msgid "new server"
+#~ msgstr "שרת חדש"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "חשבון %s חדש"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "עליך להתחבר כדי לערוך �ת הפרטי� ה�ישיי� שלך."
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>פרטי� �ישיי�</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "מיקו� ושפה נוכחיי�"
+
+#~ msgid "Arabic"
+#~ msgstr "ערבית"
+
+#~ msgid "Armenian"
+#~ msgstr "�רמנית"
+
+#~ msgid "Baltic"
+#~ msgstr "בלטית"
+
+#~ msgid "Celtic"
+#~ msgstr "קלטית"
+
+#~ msgid "Central European"
+#~ msgstr "מרכז �ירופ�י"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "סינית מפושטת"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "סינית מסורתית"
+
+#~ msgid "Croatian"
+#~ msgstr "קרו�טית"
+
+#~ msgid "Cyrillic"
+#~ msgstr "קירילית"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "קירילית/רוסית"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "קירילית/�וקר�ינית"
+
+#~ msgid "Georgian"
+#~ msgstr "ג�ורגית"
+
+#~ msgid "Greek"
+#~ msgstr "יוונית"
+
+#~ msgid "Gujarati"
+#~ msgstr "גוג׳ר�טית"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "גורמוחית"
+
+#~ msgid "Hebrew"
+#~ msgstr "עברית"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "עברית ויזו�לית"
+
+#~ msgid "Hindi"
+#~ msgstr "הינדית"
+
+#~ msgid "Icelandic"
+#~ msgstr "�יסלנדית"
+
+#~ msgid "Japanese"
+#~ msgstr "יפנית"
+
+#~ msgid "Korean"
+#~ msgstr "קורי�נית"
+
+#~ msgid "Nordic"
+#~ msgstr "נורדית"
+
+#~ msgid "Persian"
+#~ msgstr "פרסית"
+
+#~ msgid "Romanian"
+#~ msgstr "רומנית"
+
+#~ msgid "South European"
+#~ msgstr "דרו� �ירופ�ית"
+
+#~ msgid "Thai"
+#~ msgstr "ת�ילנדית"
+
+#~ msgid "Turkish"
+#~ msgstr "טורקית"
+
+#~ msgid "Unicode"
+#~ msgstr "יוניקוד"
+
+#~ msgid "Western"
+#~ msgstr "מערבית"
+
+#~ msgid "Vietnamese"
+#~ msgstr "וייטנ�מית"
+
+#~ msgid "i"
+#~ msgstr "i"
+
 #~ msgid "Manage Messaging and VoIP accounts"
 #~ msgstr "ניהול חשבונות התכתבות ו־VoIP"
 
@@ -4490,8 +4359,8 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
 #~ msgid "Details"
 #~ msgstr "פרטי�"
-#~ msgctxt "codec"
 
+#~ msgctxt "codec"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
 
@@ -4531,9 +4400,6 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 #~ msgid "_Compact Size"
 #~ msgstr "גודל _קומפקטי"
 
-#~ msgid "_Join…"
-#~ msgstr "ה_צטרפות…"
-
 #~ msgid "_Offline Contacts"
 #~ msgstr "�נשי קשר _ל� מחוברי�"
 
@@ -4599,15 +4465,15 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
 #~ msgid "Contacts selected in the list on the left will be linked together."
 #~ msgstr "�נשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
-#~ msgctxt "Link individual (contextual menu)"
 
+#~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link Contacts…"
 #~ msgstr "_קישור �נשי קשר…"
 
 #~ msgid "Link Contacts"
 #~ msgstr "קישור בין �נשי קשר"
-#~ msgctxt "Unlink individual (button)"
 
+#~ msgctxt "Unlink individual (button)"
 #~ msgid "_Unlink…"
 #~ msgstr "ה_פרדה…"
 
@@ -4627,8 +4493,8 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 #~ msgstr ""
 #~ "ה�� ב�מת ברצונך לפרק �יש קשר מקושר זה? פעולה זו תפריד �ת הקשר המקושר הזה "
 #~ "ל�נשי הקשר �ותו הו� מכיל."
-#~ msgctxt "Unlink individual (button)"
 
+#~ msgctxt "Unlink individual (button)"
 #~ msgid "_Unlink"
 #~ msgstr "_ניתוק"
 
@@ -4754,8 +4620,8 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
 #~ msgid "Ca_ncel"
 #~ msgstr "_ביטול"
-#~ msgctxt "Edit contact (contextual menu)"
 
+#~ msgctxt "Edit contact (contextual menu)"
 #~ msgid "_Edit"
 #~ msgstr "ע_ריכה"
 
@@ -4810,20 +4676,20 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
 #~ msgid "The selected contact is offline."
 #~ msgstr "�יש קשר הנבחר מנותק."
-#~ msgctxt "encoding video codec"
 
+#~ msgctxt "encoding video codec"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
-#~ msgctxt "encoding audio codec"
 
+#~ msgctxt "encoding audio codec"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
-#~ msgctxt "decoding video codec"
 
+#~ msgctxt "decoding video codec"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
-#~ msgctxt "decoding audio codec"
 
+#~ msgctxt "decoding audio codec"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
 
@@ -4897,8 +4763,8 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "שימוש ב־_Yahoo יפן"
-#~ msgctxt "Link individual (contextual menu)"
 
+#~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link…"
 #~ msgstr "_קישור…"
 
@@ -5076,137 +4942,200 @@ msgstr "שילוב חשבונות המסרי� המידיי� שלך"
 #~| msgid "Account"
 #~ msgid "Add Account"
 #~ msgstr "הוסף חשבון"
+
 #~| msgid "Email:"
 #~ msgid "Gmail"
 #~ msgstr "Gmail"
+
 #~ msgid "Import Accounts..."
 #~ msgstr "ייבו� חשבונות..."
+
 #~ msgid "Type:"
 #~ msgstr "סוג:"
+
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
+
 #~ msgid "<b>Network</b>"
 #~ msgstr "<b>רשת</b>"
+
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>שרתי�</b>"
+
 #~ msgid "<b>Contact</b>"
 #~ msgstr "<b>�יש קשר</b>"
+
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>קבוצות</b>"
+
 #~ msgid "Adium"
 #~ msgstr "Adium"
+
 #~ msgid "- Empathy Instant Messenger"
 #~ msgstr "- Empathy Instant Messenger"
+
 #~ msgid "<b>Add Account</b>"
 #~ msgstr "<b>הוסף חשבון</b>"
+
 #~ msgid "New message from %s"
 #~ msgstr "הודעה חדשת מ־%s"
+
 #~ msgid "File transfers"
 #~ msgstr "העברות קבצי�"
+
 #~ msgid "<b>Contact List</b>"
 #~ msgstr "<b>רשימת �נשי קשר</b>"
+
 #~ msgid "Show _avatars"
 #~ msgstr "הצג _תמנות �ישיות"
+
 #~ msgid "Show co_mpact contact list"
 #~ msgstr "הצג רשימת �נשי קשר מ_צומצמת"
+
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "Enable popup when contact is available"
+
 #~ msgid "Whether or not to show a popup when a contact becomes available."
 #~ msgstr "Whether or not to show a popup when a contact becomes available."
+
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "ערוך רשת IRC מסומנת"
+
 #~ msgid "Remove the selected IRC network"
 #~ msgstr "הסר רשת IRC מסומנת"
+
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "ב_דוק �יות..."
+
 #~ msgid "Contact Information"
 #~ msgstr "מידע �יש קשר"
+
 #~ msgid "I would like to add you to my contact list."
 #~ msgstr "הייתי רוצה להוסיף �ותך לרשימת �נשי הקשר שלי."
+
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "מצטער, �ני יותר ל� רוצה �ותך ברשימת �נשי הקשר שלי."
+
 #~ msgid "Word"
 #~ msgstr "מילה"
+
 #~ msgid "Suggestions for the word"
 #~ msgstr "הצעות עבור המילה"
+
 #~ msgid "Spell Checker"
 #~ msgstr "בודק �יות"
+
 #~ msgid "Suggestions for the word:"
 #~ msgstr "הצעות עבור המילה:"
+
 #~ msgid "End this call?"
 #~ msgstr "לסיי� �ת השיחה?"
+
 #~ msgid "Ringing"
 #~ msgstr "מצלצל"
+
 #~ msgid "#"
 #~ msgstr "#"
+
 #~ msgid "*"
 #~ msgstr "*"
+
 #~ msgid "0"
 #~ msgstr "0"
+
 #~ msgid "1"
 #~ msgstr "1"
+
 #~ msgid "2"
 #~ msgstr "2"
+
 #~ msgid "3"
 #~ msgstr "3"
+
 #~ msgid "4"
 #~ msgstr "4"
+
 #~ msgid "5"
 #~ msgstr "5"
+
 #~ msgid "6"
 #~ msgstr "6"
+
 #~ msgid "7"
 #~ msgstr "7"
+
 #~ msgid "8"
 #~ msgstr "8"
+
 #~ msgid "9"
 #~ msgstr "9"
+
 #~ msgid "<b>Keypad</b>"
 #~ msgstr "<b>לוח מקשי�</b>"
+
 #~ msgid "Invitation _message:"
 #~ msgstr "הודעת הזמ_נה:"
+
 #~ msgid "Edit Favorite Room"
 #~ msgstr "ערוך חדר מועדף"
+
 #~ msgid "N_ame:"
 #~ msgstr "ש_�:"
+
 #~ msgid "S_erver:"
 #~ msgstr "ש_רת:"
+
 #~| msgid "unknown"
 #~ msgctxt "file size"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
+
 #~| msgid "unknown"
 #~ msgctxt "remaining time"
 #~ msgid "Unknown"
 #~ msgstr "ל� ידוע"
+
 #~| msgid "_Send File..."
 #~ msgid "Save file as..."
 #~ msgstr "_שלח קובץ..."
+
 #~| msgid "unknown"
 #~ msgid "unknown size"
 #~ msgstr "גודל ל� ידוע"
+
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
+
 #~ msgid "Browse:"
 #~ msgstr "עיין:"
+
 #~ msgid "Re_fresh"
 #~ msgstr "רע_נן"
+
 #~ msgid "Enable sound when busy"
 #~ msgstr "Enable sound when busy"
+
 #~ msgid "Configure Telepathy account settings"
 #~ msgstr "הגדרות חשבון Telepathy"
+
 #~ msgid "<b>No Accounts Configured</b>"
 #~ msgstr "<b>ל� הוגדרו חשבונות</b>"
+
 #~ msgid "Invitation Error"
 #~ msgstr "שגי�ת הזמנה"
+
 #~ msgid "<b>Audio</b>"
 #~ msgstr "<b>צליל</b>"
+
 #~ msgid "<b>Visual</b>"
 #~ msgstr "<b>חזותי</b>"
+
 #~ msgid "J_apan server:"
 #~ msgstr "שרת _יפן:"
+
 #~ msgid "Invalid account"
 #~ msgstr "חשבון ל� תקין"
+
 #, fuzzy
 #~ msgid "Presence failure"
 #~ msgstr "Presence"
diff --git a/po/hu.po b/po/hu.po
index 20c5985d9..eb3f81427 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9,17 +9,16 @@
 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: 2013-02-09 00:37+0000\n"
-"PO-Revision-Date: 2013-03-09 05:24+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-08-07 19:30+0200\n"
+"PO-Revision-Date: 2013-08-07 16:49+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+"Language-Team: Hungarian <openscope at googlegroups dot com>\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -41,8 +40,8 @@ msgstr "Csevegés Google Talk, Facebook, MSN és sok más szolgáltatáson"
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
 msgstr ""
-"chat;talk;im;irc;voip;gtalk;facebook;jabber;cset;csevegés;társalgás;üzenet;azo"
-"nnali;"
+"chat;talk;im;irc;voip;gtalk;facebook;jabber;cset;csevegés;társalgás;üzenet;"
+"azonnali;"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
@@ -491,260 +490,260 @@ 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."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Nincs megadva ok"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "�llapotváltozás kérve"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Megszakította a fájlátvitelt"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "A partner megszakította a fájlátvitelt"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Hiba a fájl átvitelekor"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:294
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 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:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 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:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 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:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "A kiválasztott fájl üres"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184
 msgid "Password not found"
 msgstr "A jelszó nem található"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Azonnaliüzenő fiók jelszava ehhez: %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, c-format
 msgid "Password for chatroom '%s' on account %s (%s)"
 msgstr "„%s� csevegőszoba jelszava ezen fiókhoz: %s (%s)"
 
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nem fogadott hívás ettől: %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Felhívva: %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Hívás tőle: %s"
 
-#: ../libempathy/empathy-time.c:90
+#: ../libempathy/empathy-time.c:86
 #, 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:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d perce"
 msgstr[1] "%d perce"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, 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:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d napja"
 msgstr[1] "%d napja"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d hete"
 msgstr[1] "%d hete"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
 #, 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:142
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "a jövőben"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:214
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:216
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:219
 msgid "Away"
 msgstr "Távol"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:221
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:223
 msgid "Offline"
 msgstr "Kilépett"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:226
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:266
 msgid "No reason specified"
 msgstr "Nincs megadva ok"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:324
 msgid "Status is set to offline"
 msgstr "Az állapot beállítva kilépettre"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
 msgid "Authentication failed"
 msgstr "A hitelesítés meghiúsult"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:274 ../libempathy/empathy-utils.c:308
 msgid "Encryption error"
 msgstr "Titkosítási hiba"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:276
 msgid "Name in use"
 msgstr "A név használatban"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
 msgid "Certificate not provided"
 msgstr "Nincs megadva tanúsítvány"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
 msgid "Certificate untrusted"
 msgstr "A tanúsítvány nem megbízható"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
 msgid "Certificate expired"
 msgstr "A tanúsítvány lejárt"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
 msgid "Certificate not activated"
 msgstr "A tanúsítvány nincs aktiválva"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
 msgid "Certificate hostname mismatch"
 msgstr "A tanúsítvány gépneve eltér"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
 msgid "Certificate fingerprint mismatch"
 msgstr "A tanúsítvány ujjlenyomata eltér"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate self-signed"
 msgstr "A tanúsítvány önaláírt"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:292
 msgid "Certificate error"
 msgstr "Tanúsítványhiba"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:326
 msgid "Encryption is not available"
 msgstr "A titkosítás nem érhető el"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:328
 msgid "Certificate is invalid"
 msgstr "A tanúsítvány érvénytelen"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:330
 msgid "Connection has been refused"
 msgstr "A kapcsolat visszautasítva"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:332
 msgid "Connection can't be established"
 msgstr "A kapcsolat nem hozható létre"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:334
 msgid "Connection has been lost"
 msgstr "A kapcsolat elveszett"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:336
 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:350
+#: ../libempathy/empathy-utils.c:338
 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:353
+#: ../libempathy/empathy-utils.c:341
 msgid "The account already exists on the server"
 msgstr "A fiók már létezik a kiszolgálón"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:343
 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:357
+#: ../libempathy/empathy-utils.c:345
 msgid "Certificate has been revoked"
 msgstr "A tanúsítvány visszavonva"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:347
 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:362
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -752,32 +751,32 @@ 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:366
+#: ../libempathy/empathy-utils.c:354
 msgid "Your software is too old"
 msgstr "A szoftver túl régi"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:356
 msgid "Internal error"
 msgstr "Belső hiba"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:468
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Közeli emberek"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:473
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:509 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:510
 msgid "Facebook Chat"
 msgstr "Facebook csevegés"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Minden fiók"
 
@@ -856,56 +855,56 @@ msgstr "Mi az Ön AIM jelszava?"
 msgid "Remember Password"
 msgstr "Jelszó megjegyzése"
 
-#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-account-widget.c:668
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
+#: ../src/empathy-import-widget.c:316
 msgid "Account"
 msgstr "Fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget.c:669
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget.c:670
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:498
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget.c:671
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:519
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:762
+#: ../libempathy-gtk/empathy-account-widget.c:755
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Alkalmazás"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "Bejele_ntkezés"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 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:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Új fiók létrehozása a kiszolgálón"
 
@@ -914,19 +913,19 @@ msgstr "Új fiók létrehozása a kiszolgáló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:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, 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:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "%s fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Új fiók"
 
@@ -1150,32 +1149,32 @@ msgstr "Mi az Ön Windows Live azonosítója?"
 msgid "What is your Windows Live password?"
 msgstr "Mi az Ön Windows Live jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Auto"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
 msgid "TLS"
 msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Nincs"
 
@@ -1287,55 +1286,55 @@ msgstr "Mi az Ön Yahoo! azonosítója?"
 msgid "What is your Yahoo! password?"
 msgstr "Mi az Ön Yahoo! jelszava?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "A kép nem alakítható át"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
+#: ../libempathy-gtk/empathy-avatar-chooser.c:540
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Az elfogadott képformátumok egyikét sem támogatja a rendszere"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "A kép nem menthető fájlba"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Válassza ki az avatarját"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Kép készítése…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Nincs kép"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Képek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Minden fájl"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 msgid "Click to enlarge"
 msgstr "Kattintson ide a nagyításhoz"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "A hitelesítés meghiúsult a(z) <b>%s</b> fiókhoz"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3844
 msgid "Retry"
 msgstr "Újra"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
+#: ../libempathy-gtk/empathy-password-dialog.c:132
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -1344,72 +1343,72 @@ msgstr ""
 "�rja be a jelszavát ehhez a fiókhoz:\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Válasszon…"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Válasszon"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 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:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 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:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "A kiválasztott partner kilépett"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "A kiválasztott partner nem érvényes"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "A vészhívások nem támogatottak ezzel a protokollal"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:740
+#: ../libempathy-gtk/empathy-chat.c:731
 msgid "Failed to open private chat"
 msgstr "Nem sikerült privát csevegést nyitni"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:789
 msgid "Topic not supported on this conversation"
 msgstr "A téma nem támogatott ebben a csevegésben"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:795
 msgid "You are not allowed to change the topic"
 msgstr "A téma megváltoztatása nem engedélyezett"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:971
 msgid "Invalid contact ID"
 msgstr "Érvénytelen partnerazonosító"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1070
+#: ../libempathy-gtk/empathy-chat.c:1061
 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:1073
+#: ../libempathy-gtk/empathy-chat.c:1064
 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:1076
+#: ../libempathy-gtk/empathy-chat.c:1067
 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:1080
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1417,23 +1416,23 @@ msgstr ""
 "/part [<csevegőszoba-azonosító>] [<ok>]: csevegőszoba elhagyása, "
 "alapértelmezés a jelenlegi"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1075
 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:1087
+#: ../libempathy-gtk/empathy-chat.c:1078
 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:1090
+#: ../libempathy-gtk/empathy-chat.c:1081
 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:1093
+#: ../libempathy-gtk/empathy-chat.c:1084
 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:1096
+#: ../libempathy-gtk/empathy-chat.c:1087
 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 "
@@ -1443,11 +1442,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:1101
+#: ../libempathy-gtk/empathy-chat.c:1092
 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:1104
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1455,127 +1454,127 @@ 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:1123
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Használat: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ismeretlen parancs, lásd a /help kimenetét az elérhető parancsokért"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1542
 msgid "insufficient balance to send message"
 msgstr "Az egyenleg nem elég az üzenet elküldéséhez"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "hiba a(z) „%s� üzenet elküldésekor: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1554
 #, c-format
 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:1603
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "not capable"
 msgstr "nem lehetséges"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "kilépett"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "érvénytelen partner"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "túl hosszú üzenet"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "nincs megvalósítva"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma beállítva: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1706
 msgid "No topic defined"
 msgstr "Nincs megadva témakör"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Nincs javaslat)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2290
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2327
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "„%s� hozzáadása a(z) %s szótárhoz"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2397
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Helyesírási javaslatok"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../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:2835
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s kilépett"
@@ -1583,12 +1582,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2833
 #, 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:2845
+#: ../libempathy-gtk/empathy-chat.c:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kirúgva"
@@ -1596,17 +1595,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2844
 #, 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:2856
+#: ../libempathy-gtk/empathy-chat.c:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s kitiltva"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s elhagyta a szobát"
@@ -1616,17 +1615,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:2869
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s belépett a szobába"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
@@ -1634,82 +1633,82 @@ 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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2644
+#: ../src/empathy-call-window.c:2951 ../src/empathy-event-manager.c:1158
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "Szeretné tárolni ezt a jelszót?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Most nem"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3848
 msgid "Wrong password; please try again:"
 msgstr "Hibás jelszó, próbálja újra:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3972
 msgid "This room is protected by a password:"
 msgstr "Ezt a szobát jelszó védi:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:3999
+#: ../src/empathy-new-chatroom-dialog.c:785
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4246
 msgid "Conversation"
 msgstr "Társalgás"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4251
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261
 msgid "Unknown or invalid identifier"
 msgstr "Ismeretlen vagy érvénytelen azonosító"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "A partnerblokkolás ideiglenesen nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "A partnerblokkolás nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "A partner nem blokkolható"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 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:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1719,120 +1718,124 @@ msgstr "Felhasználói fiók:"
 msgid "Blocked Contacts"
 msgstr "Blokkolt partnerek"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Teljes név"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Telefonszám"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "E-mail cím"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Weboldal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Utoljára látszott:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Kiszolgáló:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Távol üzenet:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "munkahelyi"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "otthoni"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "mobil"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "hang"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "előnyben részesített"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "postai "
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "postafiók"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Partnerek keresése"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Keresés: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "Partner _felvétele"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nem található partner"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "A fiók nem támogatja a partnerek keresését"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "A bemutatkozó üzenete:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 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-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 msgid "Save Avatar"
 msgstr "Avatar mentése"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Az avatar nem menthető"
 
 #. Identifier to connect to Instant Messaging network
 #. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
+#: ../libempathy-gtk/empathy-user-info.c:455
 msgid "Identifier"
 msgstr "Azonosító"
 
 #. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
+#: ../libempathy-gtk/empathy-user-info.c:460
 msgid "Alias"
 msgstr "�lnév"
 
@@ -1866,11 +1869,11 @@ msgstr "Verzió"
 msgid "Client"
 msgstr "Kliens"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Csoportok"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:329
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1878,121 +1881,126 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
 msgid "_Add Group"
 msgstr "Csoport _hozzáadása"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:383
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Kijelölés"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgid "Group"
 msgstr "Csoport"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Új partner"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkolja Å‘t: %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 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:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokkolás"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 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-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Partnerinformációk szerkesztése"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Összekapcsolt partnerek"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "A gnome-contacts nincs telepítve"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "A partneradatok eléréséhez telepítse a gnome-contacts alkalmazást."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:170
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:346
 msgid "Select account to use to place the call"
 msgstr "Válassza ki a fiókot a hívás indításához"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:350
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Hívás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:419
 msgid "HOME"
 msgstr "OTTHONI"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:662
 msgid "_Block Contact"
 msgstr "Partner _blokkolása"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Eltávolítás ezen _csoportból: „%s�"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:738
 msgid "Delete and _Block"
 msgstr "_Törlés és blokkolás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:826
 #, 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-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:835
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2001,218 +2009,218 @@ 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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:846
 msgid "Removing contact"
 msgstr "Partner eltávolítása"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:922
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1317
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Csevegés"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1352
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1385
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Hanghívás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1418
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohívás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1459
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "K_orábbi társalgások"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1488
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1518
 msgid "Share My Desktop"
 msgstr "Az asztalom megosztása"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1544
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Kedvenc"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1573
 msgid "Infor_mation"
 msgstr "_Információk"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1622
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1738
+#: ../src/empathy-chat-window.c:1272
 msgid "Inviting you to this room"
 msgstr "Meghívás ebbe a szobába"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1784
 msgid "_Invite to Chat Room"
 msgstr "Meg_hívás csevegőszobába"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1980
 msgid "_Add Contact…"
 msgstr "Partner _felvétele…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2360
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Csoport eltávolítása"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "�t_nevezés"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Csatornák:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "Ország ISO kódja:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Ország:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "�llapot:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Város:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Terület:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Irányítószám:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Utca:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Épület:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Emelet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Szoba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Szöveg:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Accuracy Level:"
 msgstr "Pontossági szint:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Hiba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Függőleges hiba (méter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Vízszintes hiba (méter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Irány:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Emelkedési sebesség:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Utolsó frissítés:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Hosszúság:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Szélesség:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Magasság:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Hely"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y. %B %e, %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Alias:"
 msgstr "�lnév:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
 msgid "Identifier:"
 msgstr "Azonosító:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1640
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2227,32 +2235,32 @@ msgstr "<b>Hely</b> az időpontban"
 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:335
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Új hálózat"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Válasszon IRC-hálózatot"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "_Hálózatok listájának visszaállítása"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Kijelölés"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "új kiszolgáló"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:534
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80
 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 "
@@ -2262,11 +2270,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100
 msgid "People nearby"
 msgstr "Közeli emberek"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2274,43 +2282,43 @@ 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."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:627
 msgid "History"
 msgstr "Előzmények"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:682
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:704
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1155
 #, c-format
 msgid "Chat in %s"
 msgstr "Csevegés itt: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1157
 #, c-format
 msgid "Chat with %s"
 msgstr "Csevegés vele: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1207
 #: ../libempathy-gtk/empathy-log-window.c:1351
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1294
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
@@ -2411,7 +2419,7 @@ msgid "_File"
 msgstr "_Fájl"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
@@ -2424,7 +2432,7 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1488 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Csevegés"
 
@@ -2446,75 +2454,75 @@ msgid "What kind of chat account do you have?"
 msgstr "Milyen típusú csevegőfiókja van?"
 
 #: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+msgid "Add new account"
 msgstr "Új fiók hozzáadása"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Adjon meg egy partnerazonosítót vagy telefonszámot:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Videohívás"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Hanghívás"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Új hívás"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "A partner kilépett"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 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:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 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:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 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:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Kitiltották erről a csatornáról"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "A csatorna tele van"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 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:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Ez nem folytatható, amíg kilépett állapotban van"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Hiba történt a társalgás indításakor"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Új társalgás"
 
@@ -2524,26 +2532,26 @@ msgstr "Új társalgás"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:157
+#: ../libempathy-gtk/empathy-presence-chooser.c:193
 msgid "Custom Message…"
 msgstr "Egyéni üzenet…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:210
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Edit Custom Messages…"
 msgstr "Egyéni üzenetek szerkesztése…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 msgid "Click to remove this status as a favorite"
 msgstr "Kattintson ezen kedvenc állapot eltávolításához"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:343
 msgid "Click to make this status a favorite"
 msgstr "Kattintson ezen állapot kedvenccé tételéhez"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2553,12 +2561,12 @@ msgstr ""
 "<small><i>Nyomja meg az Entert az új üzenet beállításához, vagy az Esc-et a "
 "kilépéshez.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:386
 msgid "Set status"
 msgstr "�llapot beállítása"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Egyéni üzenetek…"
 
@@ -2566,12 +2574,12 @@ 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:608
+#: ../libempathy-gtk/empathy-protocol-chooser.c:603
 #, c-format
 msgid "New %s account"
 msgstr "Új %s fiók"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "Kis- és _nagybetű"
 
@@ -2595,167 +2603,167 @@ msgstr "Kis- és _nagybetűk"
 msgid "Phrase not found"
 msgstr "A kifejezés nem található"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Azonnali üzenet érkezett"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Azonnali üzenet elküldve"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Bejövő csevegéskérés"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "A partner kapcsolódott"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "A partner kilépett"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Kapcsolódva a kiszolgálóhoz"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Kapcsolat bontva a kiszolgálóval"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Bejövő hanghívás"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Kimenő hanghívás"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "A hanghívás befejeződött"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 msgid "Edit Custom Messages"
 msgstr "Egyéni üzenetek szerkesztése"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Feliratkozási kérés"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1096
 #, 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"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:721
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Elfogadás"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1211
 #, c-format
 msgid "Message edited at %s"
 msgstr "Ãœzenet szerkesztve ekkor: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1913
 msgid "Normal"
 msgstr "Normál"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "A csevegőkiszolgáló által küldött személyazonosság nem ellenőrizhető."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "A tanúsítványt nem írta alá hitelesítésszolgáltató."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "A tanúsítvány lejárt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "A tanúsítvány még nincs aktiválva."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "A tanúsítvány nem rendelkezik a várt ujjlenyomattal."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 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."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "A tanúsítvány önaláírt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 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
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "A tanúsítvány titkosításilag gyenge."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "A tanúsítvány hossza túllépi az ellenőrizhető határokat."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "A tanúsítvány rosszul formázott."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "A várt gépnév: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "A tanúsítvány gépneve: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Folytatás"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nem megbízható kapcsolat"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Emlékezzen a válaszra a jövőbeli kapcsolatokhoz"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Tanúsítvány részletei"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:1078
 msgid "Unable to open URI"
 msgstr "Az URI nem nyitható meg"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
 msgid "Select a file"
 msgstr "Válasszon ki egy fájlt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2764,16 +2772,16 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Bejövő fájl %s partnertől"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 msgid "Go online to edit your personal information."
 msgstr "Személyes információnak szerkesztése online."
 
-#: ../libempathy-gtk/empathy-user-info.c:464
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "Személyes adatok"
 
@@ -2792,197 +2800,197 @@ msgstr "_Hivatkozás megnyitása"
 msgid "Inspect HTML"
 msgstr "HTML ellenőrzése"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 msgid "Current Locale"
 msgstr "Jelenlegi területi beállítás"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:160
+#: ../libempathy-gtk/totem-subtitle-encoding.c:162
+#: ../libempathy-gtk/totem-subtitle-encoding.c:164
+#: ../libempathy-gtk/totem-subtitle-encoding.c:166
 msgid "Arabic"
 msgstr "Arab"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 msgid "Armenian"
 msgstr "Örmény"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Balti"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 msgid "Celtic"
 msgstr "Kelta"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:182
+#: ../libempathy-gtk/totem-subtitle-encoding.c:184
+#: ../libempathy-gtk/totem-subtitle-encoding.c:186
+#: ../libempathy-gtk/totem-subtitle-encoding.c:188
 msgid "Central European"
 msgstr "Közép-európai"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:191
+#: ../libempathy-gtk/totem-subtitle-encoding.c:193
+#: ../libempathy-gtk/totem-subtitle-encoding.c:195
+#: ../libempathy-gtk/totem-subtitle-encoding.c:197
 msgid "Chinese Simplified"
 msgstr "Egyszerűsített kínai"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+#: ../libempathy-gtk/totem-subtitle-encoding.c:200
+#: ../libempathy-gtk/totem-subtitle-encoding.c:202
+#: ../libempathy-gtk/totem-subtitle-encoding.c:204
 msgid "Chinese Traditional"
 msgstr "Hagyományos kínai"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 msgid "Croatian"
 msgstr "Horvát"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:210
+#: ../libempathy-gtk/totem-subtitle-encoding.c:212
+#: ../libempathy-gtk/totem-subtitle-encoding.c:214
+#: ../libempathy-gtk/totem-subtitle-encoding.c:216
+#: ../libempathy-gtk/totem-subtitle-encoding.c:218
+#: ../libempathy-gtk/totem-subtitle-encoding.c:220
 msgid "Cyrillic"
 msgstr "Cirill"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Cirill/orosz"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+#: ../libempathy-gtk/totem-subtitle-encoding.c:226
+#: ../libempathy-gtk/totem-subtitle-encoding.c:228
 msgid "Cyrillic/Ukrainian"
 msgstr "Cirill/ukrán"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 msgid "Georgian"
 msgstr "Grúz"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Görög"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:247
+#: ../libempathy-gtk/totem-subtitle-encoding.c:249
+#: ../libempathy-gtk/totem-subtitle-encoding.c:251
+#: ../libempathy-gtk/totem-subtitle-encoding.c:253
 msgid "Hebrew"
 msgstr "Héber"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Héber (vizuális)"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 msgid "Icelandic"
 msgstr "Izlandi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 msgid "Japanese"
 msgstr "Japán"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:272
+#: ../libempathy-gtk/totem-subtitle-encoding.c:274
+#: ../libempathy-gtk/totem-subtitle-encoding.c:276
+#: ../libempathy-gtk/totem-subtitle-encoding.c:278
 msgid "Korean"
 msgstr "Koreai"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Északi"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Perzsa"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+#: ../libempathy-gtk/totem-subtitle-encoding.c:287
+#: ../libempathy-gtk/totem-subtitle-encoding.c:289
 msgid "Romanian"
 msgstr "Román"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Dél-európai"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:298
+#: ../libempathy-gtk/totem-subtitle-encoding.c:300
+#: ../libempathy-gtk/totem-subtitle-encoding.c:302
+#: ../libempathy-gtk/totem-subtitle-encoding.c:304
 msgid "Turkish"
 msgstr "Török"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:307
+#: ../libempathy-gtk/totem-subtitle-encoding.c:309
+#: ../libempathy-gtk/totem-subtitle-encoding.c:311
+#: ../libempathy-gtk/totem-subtitle-encoding.c:313
+#: ../libempathy-gtk/totem-subtitle-encoding.c:315
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:318
+#: ../libempathy-gtk/totem-subtitle-encoding.c:320
+#: ../libempathy-gtk/totem-subtitle-encoding.c:322
+#: ../libempathy-gtk/totem-subtitle-encoding.c:324
+#: ../libempathy-gtk/totem-subtitle-encoding.c:326
 msgid "Western"
 msgstr "Nyugati"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#: ../libempathy-gtk/totem-subtitle-encoding.c:329
+#: ../libempathy-gtk/totem-subtitle-encoding.c:331
+#: ../libempathy-gtk/totem-subtitle-encoding.c:333
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Fontos partnerek"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Csoportosítatlan"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:201
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "A kiszolgáló nem találta meg az alábbi partnert: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Nincs hibaüzenet"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Azonnali üzenet (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2993,7 +3001,7 @@ msgstr ""
 "Software Foundation által kiadott GNU General Public License második (vagy "
 "bármely későbbi) változatában foglaltak alapján."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3005,7 +3013,7 @@ msgstr ""
 "alkalmas-e a KÖZREAD�SRA vagy EGY BIZONYOS FELADAT ELVÉGZÉSÉRE. További "
 "részletekért tanulmányozza a GNU GPL licencet."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3015,82 +3023,82 @@ 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:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "A GNOME üzenetküldő-kliense"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Kelemen Gábor <kelemeng at gnome dot hu>\n"
 "Meskó Balázs <meskobalazs at gmail dot com>\n"
 "Lukács Bence <lukacs.bence1 at gmail dot com>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 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)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<fiókazonosító>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "– Empathy fiókkezelő"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy fiókkezelő"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:52
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Az Ön %s fiókjának módosításai nincsenek elmentve."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Az Ön %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:56
 msgid "Your new account has not been saved yet."
 msgstr "Új fiókja még nincs elmentve."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Kapcsolódás…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Kilépett – %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Kapcsolat bontva – %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Kilépett – Nincs hálózati kapcsolat"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:476
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3100,28 +3108,28 @@ msgstr ""
 "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:502
+#: ../src/empathy-accounts-dialog.c:486
 msgid "Offline — Account Disabled"
 msgstr "Kilépett – Fiók letiltva"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Kapcsolatparaméterek szerkesztése"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Kapcsolatparaméterek szerkesztése…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1252
 #, 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?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Valóban el kívánja távolítani a(z) %.50s fiókot a számítógépről?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1477
+#: ../src/empathy-accounts-dialog.c:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3130,24 +3138,24 @@ msgstr ""
 "Biztosan folytatni akarja?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1652
 msgid "_Enabled"
 msgstr "_Engedélyezve"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "�tnevezés"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Kihagyás"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "Kapcs_olódás"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2274
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3156,7 +3164,7 @@ msgstr ""
 "Biztosan folytatni akarja?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2418
 msgid "Messaging and VoIP Accounts"
 msgstr "Üzenetküldő- és VoIP-fiókok"
 
@@ -3180,31 +3188,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Nincsenek telepítve protokoll-háttérprogramok"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " – Empathy hitelesítési kliens"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy hitelesítési kliens"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:407
 msgid "Don't connect on startup"
 msgstr "Ne kapcsolódjon indításkor"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:447
+#: ../src/empathy.c:440
 msgid "- Empathy IM Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Hiba a fiókkezelő elérésekor"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3217,105 +3225,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Hívásban"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:223
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy hang/videó kliens"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:247
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy hang/videó kliens"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Bejövő videohívás %s partnertől"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Bejövő hívás %s partnertől"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1543
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1544
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Válasz"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1913
 #, c-format
 msgid "Call with %s"
 msgstr "%s hívása"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 msgid "The IP address as seen by the machine"
 msgstr "A gép által látott IP-cím"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2167
 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-call-window.c:2190
+#: ../src/empathy-call-window.c:2169
 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-call-window.c:2192
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address of a relay server"
 msgstr "Közvetítő kiszolgáló IP-címe"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address of the multicast group"
 msgstr "Üzenetszórási csoport IP-címe"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2949
 msgid "On hold"
 msgstr "Várakoztatás"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2953
 msgid "Mute"
 msgstr "Némítás"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2955
 msgid "Duration"
 msgstr "Időtartam"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2958
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d.%02dp"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3054
 msgid "Technical Details"
 msgstr "Technikai részletek"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3093
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3324,7 +3332,7 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "hangformátumot sem"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3098
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3333,7 +3341,7 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "videoformátumot sem"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3104
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3342,22 +3350,22 @@ 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-call-window.c:3127
+#: ../src/empathy-call-window.c:3110
 msgid "There was a failure on the network"
 msgstr "Hálózati hiba történt"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3114
 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-call-window.c:3134
+#: ../src/empathy-call-window.c:3117
 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-call-window.c:3146
+#: ../src/empathy-call-window.c:3129
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3368,32 +3376,32 @@ msgstr ""
 "a hibát</a>, és csatolja a Súgó menü „Hibakeresés� ablakából elérhető "
 "naplókat."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3138
 msgid "There was a failure in the call engine"
 msgstr "Hiba történt a hívási alrendszerben"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3141
 msgid "The end of the stream was reached"
 msgstr "A folyam vége elérve"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3181
 msgid "Can't establish audio stream"
 msgstr "Nem hozható létre a hangfolyam"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3191
 msgid "Can't establish video stream"
 msgstr "Nem hozható létre a videofolyam"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3228
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Jelenlegi egyenlege: %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3232
 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:3251
+#: ../src/empathy-call-window.c:3234
 msgid "Top Up"
 msgstr "Feltöltés"
 
@@ -3417,11 +3425,11 @@ msgstr "_Beállítások"
 msgid "_View"
 msgstr "_Nézet"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Súgó"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Tartalom"
 
@@ -3509,19 +3517,19 @@ msgstr "Helyi jelölt:"
 msgid "Audio"
 msgstr "Hang"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:243
 msgid "Name"
 msgstr "Név"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Szoba"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Automatikus kapcsolódás"
 
@@ -3529,11 +3537,11 @@ msgstr "Automatikus kapcsolódás"
 msgid "Manage Favorite Rooms"
 msgstr "Kedvenc szobák kezelése"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:277
 msgid "Close this window?"
 msgstr "Bezárja ezt az ablakot?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:283
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3542,7 +3550,7 @@ msgstr ""
 "Az ablak bezárásával elhagyja ezt: %s. Az újracsatlakozásig nem fog további "
 "üzeneteket kapni."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:296
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3557,12 +3565,12 @@ 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:317
+#: ../src/empathy-chat-window.c:307
 #, c-format
 msgid "Leave %s?"
 msgstr "Elhagyja ezt: %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:309
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3570,54 +3578,54 @@ msgstr ""
 "Az újracsatlakozásig nem fog további üzeneteket kapni ebből a "
 "csevegőszobából."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:328
 msgid "Close window"
 msgstr "Ablak bezárása"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:328
 msgid "Leave room"
 msgstr "Szoba elhagyása"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d olvasatlan)"
 msgstr[1] "%s (%d olvasatlan)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:682
 #, 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:708
+#: ../src/empathy-chat-window.c:698
 #, 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:717
+#: ../src/empathy-chat-window.c:707
 #, 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:954
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:952
 #, 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:982
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "Üzenet írása."
 
@@ -3650,106 +3658,114 @@ msgid "Invite _Participant…"
 msgstr "_Résztvevő meghívása…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Csatlakozás csevegéshez"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Csevegés _elhagyása"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Partner"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Lapok"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Előző lap"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Következő lap"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Lapbezárás _visszavonása"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Lap _balra"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Lap j_obbra"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Lap leválasztása"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Adott szolgáltatás megjelenítése"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "– Empathy hibakereső"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy hibakereső"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1589
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1649
 msgid "Pastebin link"
 msgstr "Pastebin hivatkozás"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1658
 msgid "Pastebin response"
 msgstr "Pastebin válasz"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1665
 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:1857
+#: ../src/empathy-debug-window.c:1847
 msgid "Debug Window"
 msgstr "Hibakeresési ablak"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1907
 msgid "Send to pastebin"
 msgstr "Küldés pastebinbe"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1951
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1963
 msgid "Level "
 msgstr "Szint "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1982
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1987
 msgid "Info"
 msgstr "Információ"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067
 msgid "Message"
 msgstr "Ãœzenet"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1997
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2002
 msgid "Critical"
 msgstr "Kritikus"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2007
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2020
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3767,23 +3783,23 @@ msgstr ""
 "látható. Ezt a haladó beállításokban teheti meg a <a href=\"https://bugzilla."
 "gnome.org/enter_bug.cgi?product=empathy\">hibajelentőben</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2052
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2055
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2058
 msgid "Category"
 msgstr "Kategória"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2061
 msgid "Level"
 msgstr "Szint"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2090
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3791,70 +3807,70 @@ msgstr ""
 "A kiválasztott kapcsolatkezelő nem támogatja a távoli hibakeresési "
 "kiterjesztést."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:500
 msgid "Incoming video call"
 msgstr "Bejövő videohívás"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:504
 #, 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:513
+#: ../src/empathy-event-manager.c:505
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549
 msgid "_Answer"
 msgstr "_Válasz"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Válasz videóval"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Szobameghívás"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Meghívás a csatlakozásra ehhez: %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:713
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kéri, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s megkérte, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:758
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Megkérték, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:937
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Bejövő fájlátvitel %s partnertől"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3864,105 +3880,105 @@ msgstr ""
 "Ãœzenet: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:93
 #, 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:102
+#: ../src/empathy-ft-manager.c:96
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:172
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, összesen %s; %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:268
 #, 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:305
+#: ../src/empathy-ft-manager.c:299
 #, 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:308
+#: ../src/empathy-ft-manager.c:302
 #, 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:338
+#: ../src/empathy-ft-manager.c:332
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Hiba „%s� fogadásakor %s partnertől"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:335
 msgid "Error receiving a file"
 msgstr "Hiba a fájl fogadásakor"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Hiba „%s� küldésekor %s partnernek"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:343
 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:488
+#: ../src/empathy-ft-manager.c:482
 #, 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:493
+#: ../src/empathy-ft-manager.c:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s� elküldve %s partnernek"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 msgid "File transfer completed"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773
 msgid "Waiting for the other participant's response"
 msgstr "Várakozás a partner válaszára"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "„%s� integritásának ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "„%s� ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1019
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1031
 msgid "File"
 msgstr "Fájl"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Hátralévő"
 
@@ -3975,11 +3991,11 @@ 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"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importálás"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3987,49 +4003,49 @@ 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:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Fiókok importálása"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:296
 msgid "Import"
 msgstr "Importálás"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 msgid "Source"
 msgstr "Forrás"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Résztvevő meghívása"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 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:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:184
 msgid "Chat Room"
 msgstr "Csevegőszoba"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Tagok"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Nem sikerült lekérdezni a szobák listáját"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:435
 #, c-format
 msgid ""
 "%s\n"
@@ -4042,17 +4058,17 @@ msgstr ""
 "Jelszó szükséges: %s\n"
 "Tagok: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "Yes"
 msgstr "Igen"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "No"
 msgstr "Nem"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:789
 msgid "Join Room"
 msgstr "Csatlakozás a szobához"
 
@@ -4095,105 +4111,105 @@ msgstr "Nem tölthető be a szobalista"
 msgid "Room List"
 msgstr "Szobalista"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Válasz"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Válasz videóval"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Visszalépés"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Megadás"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:134
 msgid "Message received"
 msgstr "Üzenet érkezett"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Új társalgás"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Partner belép"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Partner kilép"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Fiók kapcsolódott"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Fiók kapcsolata bontva"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Nyelv"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Júlia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:635
 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:650
+#: ../src/empathy-preferences.c:641
 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:654
+#: ../src/empathy-preferences.c:645
 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:657
+#: ../src/empathy-preferences.c:648
 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:660
+#: ../src/empathy-preferences.c:651
 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:663
+#: ../src/empathy-preferences.c:654
 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:666
+#: ../src/empathy-preferences.c:657
 msgid "Juliet has disconnected"
 msgstr "Júlia kilépett"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Beállítások"
 
@@ -4205,7 +4221,7 @@ msgstr "Partnercsoportok megjelenítése"
 msgid "Show account balances"
 msgstr "Egyenleg megjelenítése"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2238
 msgid "Contact List"
 msgstr "Partnerlista"
 
@@ -4372,85 +4388,85 @@ msgstr "Változat:"
 msgid "Themes"
 msgstr "Témák"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Adja meg a jelszót"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Leválasztás"
 
-#: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+#: ../src/empathy-roster-window.c:478
+msgid "You need to set up an account to see contacts here."
 msgstr "Be kell állítani egy fiókot, hogy itt partnereket láthasson."
 
-#: ../src/empathy-roster-window.c:569
+#: ../src/empathy-roster-window.c:554
 #, 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:670
+#: ../src/empathy-roster-window.c:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:674
+#: ../src/empathy-roster-window.c:659
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:689
+#: ../src/empathy-roster-window.c:674
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "A %s fiók felhatalmazást igényel."
 
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Online fiókok"
 
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Szoftver frissítése…"
 
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Újracsatlakozás"
 
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Fiók szerkesztése"
 
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Bezárás"
 
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Egyenleg feltöltése"
 
-#: ../src/empathy-roster-window.c:1590
+#: ../src/empathy-roster-window.c:1575
 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:1598
+#: ../src/empathy-roster-window.c:1583
 #, 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:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Módosítsa állapotát, hogy itt partnereket láthasson"
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Nincs találat"
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Még nem adott hozzá egyetlen partnert sem"
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Nincs elérhető partner"
 
@@ -4547,12 +4563,12 @@ msgstr "Új _hívás…"
 msgid "Status"
 msgstr "�llapot"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Kész"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Adja meg fiókjának adatait"
 
diff --git a/po/id.po b/po/id.po
index 755941d8f..45c822e6a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2013-03-03 16:35+0000\n"
-"PO-Revision-Date: 2013-03-12 11:56+0700\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-08 18:53+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: GNOME Indonesian Translation Team <gnome@i15n.org>\n"
 "Language: id\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -468,35 +468,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Apakah Empathy dapat mempublikasikan lokasi pengguna ke kontak mereka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy dapat menggunakan jaringan untuk menebak lokasi"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Apakah Empathy dapat menggunakan jaringan untuk menebak lokasi."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy dapat menggunakan jaringan selular untuk menebak lokasi"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Apakah Empathy dapat menggunakan jaringan selular untuk menebak lokasi."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy dapat menggunakan GPS untuk menebak lokasi"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Apakah Empathy dapat menggunakan GPS untuk menebak lokasi."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy harus mengurangi akurasi lokasi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Apakah Empathy harus mengurangi akurasi lokasi untuk alasan privasi."
@@ -525,7 +500,7 @@ msgstr "Kesalahan ketika mencoba untuk mentransfer berkas"
 msgid "The other participant is unable to transfer the file"
 msgstr "Peserta lainnya tidak dapat mentransfer berkas"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Alasan yang tidak diketahui"
 
@@ -545,215 +520,161 @@ msgstr "Berkas yang dipilih bukan merupakan berkas biasa"
 msgid "The selected file is empty"
 msgstr "Berkas yang dipilih kosong"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Sandi tak ditemukan"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Sandi akun IM bagi %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Sandi bagi ruang obrolan '%s' pada akun %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Panggilan tak terjawab dari %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Memanggil %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Panggilan dari %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d detik yang lalu"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d menit yang lalu"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d jam yang lalu "
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d hari yang lalu"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d minggu yang lalu"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d bulan yang lalu"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "di masa mendatang"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Tersedia"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Sibuk"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Pergi"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Tak kelihatan"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Luring"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tak dikenal"
 
 # msgid "Unknown"
 # msgstr "Tidak Diketahui"
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Tidak ada alasan tertentu"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Status diatur ke luring"
 
 # Kesalahan jaringan?
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Kesalahan jaringan"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Otentikasi gagal"
 
 # Kesalahan penyandian?
 # Saya tetap memakai enkripsi sebagai lawan dari dekripsi (decryption) dengan acuan dari KBBI
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Kesalahan enkripsi"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nama sedang dipakai"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Sertifikat tidak disediakan"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Sertifikat tidak dipercaya"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Sertifikat kadaluarsa"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Sertifikat tidak diaktifkan"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Nama host sertifikat tidak cocok"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Sidik jari sertifikat tidak cocok"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Sertifikat ditandatangani sendiri"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Sertifikat salah"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Enkripsi tidak tersedia"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Sertifikat tak valid"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Koneksi telah ditolak"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Koneksi tak dapat dijalin"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Koneksi telah terputus"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Akun ini sudah tersambung ke server"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Koneksi telah digantikan oleh koneksi baru memakai sumberdaya yang sama"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Akun ini sudah ada di server"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server kini terlalu sibuk untuk menangani koneksi"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Sertifikat telah dicabut"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat memakai algorima cipher yang tak aman atau lemah secara "
 "kriptografi"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -761,591 +682,33 @@ msgstr ""
 "Panjang sertifikat server, atau kedalaman rantai sertifikat server, "
 "melampaui batas yang diberlakukan oleh pustaka kriptografi"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Perangkat lunak Anda terlalu tua"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Galat internal"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Orang-orang Berada di Sekitar"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Jepang"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Obrolan Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Semua akun"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Sandi"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "_Nama Layar"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Contoh:</b> NamaLayarSaya"
-
-#. 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 "Ingat sandi"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Porta"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Tingkat Lanjut"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Apa nama layar AIM Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Apa sandi AIM Anda?"
-
-#: ../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:25
-msgid "Remember Password"
-msgstr "Ingat Sandi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Akun"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Sandi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Porta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nama pengguna:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "Tera_pkan"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Masuk"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Akun ini sudah ada di server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Buat akun baru pada 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:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s pada %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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Akun %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Akun baru"
-
-#: ../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 Masuk"
-
-#: ../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>Contoh:</b> namapengguna"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Apa ID Pengguna GroupWise Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Apa sandi GroupWise Anda?"
-
-#: ../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>Contoh:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Set k_arakter"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Apa UIN ICQ Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Apa sandi ICQ Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Jaringan"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Set karakter"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Tambah…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Buang"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Naik"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Turun"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Kebanyakan server IRC tak memerlukan sandi, maka jika Anda tak yakin, jangan "
-"masukkan sandi."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Panggilan"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Pesan keluar"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nama asli"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nama pengguna"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Jaringan IRC yang mana?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Apa nama panggilan IRC Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Apakah nama pengguna Facebook Anda?"
-
-#. 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 ""
-"Ini adalah nama pengguna Anda, bukan akun masuk Facebook Anda secara "
-"normal.\n"
-"Jika Anda facebook.com/<b>badger</b>, masukkan <b>badger</b>.\n"
-"Gunakan <a href=\"http://www.facebook.com/username/\">halaman ini</a> untuk "
-"memilih nama pengguna Facebook jika Anda belum memiliki."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Apakah sandi Facebook Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Apa ID Google Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Contoh:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Apa sandi Google Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Contoh:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "Abaikan _galat pada sertifikat SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Priori_tas"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "S_umber daya"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Enkripsi diperlukan (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Timpa pengaturan server"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Gunakan SS_L lama"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Apa ID Jabber Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Apa ID Jabber yang Anda inginkan?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Apa sandi Jabber Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Apa sandi Jabber yang Anda inginkan?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Nama pan_ggilan"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "Nama Be_lakang"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "Nama _Depan"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "Nama _Publik"
-
-#: ../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 "E-_mail address"
-msgstr "Ala_mat surel"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Contoh:</b> user@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Apakah ID Windows Live Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Apa sandi Windows Live Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Otomatis"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Pilihan"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Tidak ada"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "Nama pengg_una"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Contoh:</b> user@my.sip.server"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Gunakan akun ini untuk memanggi_l telepon tetap dan seluler"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Pilihan Traversal NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Pilihan Proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Pilihan Lain-lain"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Server STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Temukan server STUN secara otomatis"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Temukan Ikatan"
-
-# keep alive = jaga tetap hidup
-# barangkali ada yang lebih pendek?
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Pilihan Jaga-Tetap-Hidup"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mekanisme"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Interval (detik)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Nama pengguna otentikasi"
-
-#: ../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 "Routing Santai"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Abaikan Galat TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Alamat IP Lokal"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Apa ID masuk SIP Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Apa sandi akun SIP Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Sandi:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "I_D Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "I_gnore conference and chat room invitations"
-msgstr "Aba_ikan undangan konferensi dan ruang mengobrol"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Daftar _Ruang lokal:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Set k_arakter:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Porta:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Apakah ID Yahoo! Anda?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Apa sandi Yahoo! Anda?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Tidak dapat mengubah gambar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Tidak ada dari format gambar yang diterima, didukung pada sistem Anda"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Tak bisa menyimpan gambar ke berkas"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Pilih Gambar Avatar Anda"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Ambil gambar..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Tidak Ada Gambar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Gambar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Semua File"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Klik untuk memperbesar"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Otentikasi gagal bagi akun <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Mencoba kembali"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1355,72 +718,69 @@ msgstr ""
 "Ketikkan sandi untuk akun\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Pilih..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Pilih"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Ingat sandi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Ada galat saat memulai panggilan"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Kontak yang dinyatakan tak mendukung panggilan"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Kontak yang dinyatakan sedang luring"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Kontak yang dinyatakan tak valid"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Panggilan darurat tak didukung protokol ini"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Anda tak punya cukup pulsa untuk melakukan panggilan ini"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Gagal membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Topik tidak didukung pada percakapan ini"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Anda tidak diperbolehkan untuk mengubah topik"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "ID kontak tak valid"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: menghapus semua pesan dari percakapan aktif saat ini"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topik> : Mengatur topik percakapan aktif saat itu"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID ruang mengobrol>: Bergabung dengan ruang mengbrol baru"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID ruang mengobrol>: Bergabung dengan ruang mengobrol baru"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1428,24 +788,24 @@ msgstr ""
 "/part [<ID ruang obrolan>][<alasan>]: meninggalkan ruang obrolan, secara "
 "baku yang sedang aktif"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID kontak> [<pesan>]: Membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID kontak><pesan>: Membuka obrolan pribadi"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 "/nick <nama panggilan>: Mengubah nama panggilan Anda pada server saat ini"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <pesan>: Mengirim pesan TINDAKAN untuk percakapan aktif saat itu"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../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 "
@@ -1455,11 +815,11 @@ msgstr ""
 "untuk mengirim pesan yang dimulai dengan sebuah '/'. Sebagai contoh: \"/say /"
 "join digunakan untuk bergabung dalam ruang mengobrol baru\""
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID kontak>: menampilkan informasi tentang kontak"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1467,126 +827,126 @@ msgstr ""
 "/help [<perintah>]: Menampilkan semua perintah yang didukung. Jika "
 "<perintah> didefinisikan, menunjukkan cara penggunaannya."
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Penggunaan: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Perintah tidak dikenal"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Perintah tak dikenal; lihat /help untuk perintah yang tersedia"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "tak cukup kredit untuk mengirim pesan"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Kesalahan pengiriman pesan '%s':%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Galat saat mengirim pesan: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "tak cukup pulsa untuk mengirim pesan. <a href='%s'>Isi ulang</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "tak mampu"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "luring"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "kontak tidak valid"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "ijin ditolak"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "pesan terlalu panjang"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "tidak dilaksanakan"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Topik:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topik diatur ke: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Topik diatur oleh %s menjadi: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Tidak ada topik didefinisikan"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Tidak Ada Saran)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tambahkan '%s' ke Kamus"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tambahkan '%s' ke Kamus %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Sisipkan Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Kirim"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Saran Ejaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Gagal mengambil catatan terbaru"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s telah terputus"
@@ -1594,12 +954,12 @@ msgstr "%s telah terputus"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ditendang oleh %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ditendang"
@@ -1607,17 +967,17 @@ msgstr "%s ditendang"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s dilarang oleh %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s dilarang"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s telah meninggalkan ruangan"
@@ -1627,17 +987,17 @@ msgstr "%s telah meninggalkan ruangan"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s telah bergabung dengan ruangan"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s sekarang dikenal sebagai %s"
@@ -1645,50 +1005,50 @@ msgstr "%s sekarang dikenal sebagai %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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Terputus"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Apakah Anda ingin menyimpan sandi ini?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Ingat"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Jangan sekarang"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Sandi salah, coba lagi:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Ruangan ini dilindungi oleh sandi:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Gabung"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Terhubung"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Percakapan"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1719,8 +1079,8 @@ msgstr "Sunting Kontak Yang Diblokir"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1730,120 +1090,63 @@ msgstr "Akun:"
 msgid "Blocked Contacts"
 msgstr "Kontak Yang Diblokir"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nama lengkap"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Nomor telepon"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Alamat surel"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Situs web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Tanggal lahir"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Terakhir terlihat:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Server:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Tersambung dari:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Pesan pergi:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "kantor"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "rumah"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "seluler"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "suara"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "preferensi"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "pos"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "parsel"
+#: ../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 "Buang"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Cari kontak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Cari: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "T_ambah Kontak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Kontak tak ditemukan"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Pencarian kontak tidak didukung pada akun ini"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Pesan perkenalan diri Anda:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Mohon ijinkan saya melihat ketika Anda daring. Terima kasih!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Simpan Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Tidak dapat menyimpan avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Akun"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifair"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alias"
 
@@ -1879,11 +1182,11 @@ msgstr "Versi"
 msgid "Client"
 msgstr "Klien"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Group"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1891,118 +1194,123 @@ msgstr ""
 "Pilih grup dimaana Anda menginginkan kontak ini muncul. Perhatikan bahwa "
 "Anda dapat memilih lebih dari satu grup atau tidak sama sekali."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "T_ambah Grup"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Pilih"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grup"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Kontak Baru"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Blok %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Anda yakin ingin memblokir '%s' agar tak bisa menghubungi Anda lagi?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Identitas berikut akan diblokir:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Identitas berikut tak dapat diblokir:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blok"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Lapo_rkan kontak ini sebagai abusif?"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Edit Informasi Kontak"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Kontak Terkait"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts tidak dipasang"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Silakan pasang gnome-contacts untuk mengakses rincian kontak."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Pilih akun yang dipakai untuk memanggil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Panggilan"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Seluler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Kantor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "RUMAH"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blok Kontak"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Hapus dari _Grup '%s'"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Hapus dan _Blokir"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Apakah Anda benar-benar ingin menghapus kontak '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2011,222 +1319,223 @@ msgstr ""
 "Anda yakin ingin menghapus kontak terkait '%s'? Hal ini akan menghapus semua "
 "kontak yang menyusun kontak terkait ini."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Menghapus kontak"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Hapus"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Obrolan"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Panggilan Suar_a"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Panggilan _Video"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Percakapan Sebelumnya"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Kirim Berkas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Berbagi Desktop Saya"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_masi"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Sunting"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Mengundang Anda ke ruangan ini"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Undang ke Ruang Mengobrol"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "T_ambah Kontak…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Apakah Anda benar-benar ingin menghapus grup '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Menghapus grup"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Ubah _nama"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanal:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Kode ISO Negara:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Negara:"
 
 # pada konteks ini, rasanya state = negara bagian
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Negara Bagian:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Kota:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Kode Pos:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Jalan:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Gedung:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Lantai:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Kamar:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Teks:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Keterangan:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Tingkat Keakuratan:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Kesalahan:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Kesalahan Vertikal(meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Kesalahan Horisontal (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Kecepatan:"
 
 # bearing = arah?
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Arah:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Kecepatan Mendaki:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Terakhir Diperbarui:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Bujur:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Lintang:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Ketinggian:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Lokasi"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
 # man strftime
 # %B %e, %Y = nama_bulan tanggal, tahun
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y pada %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifair:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2242,32 +1551,7 @@ msgstr "<b>Lokasi</b> pada (date)"
 msgid "Online from a phone or mobile device"
 msgstr "Daring dari telepon atau perangkat mobil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Jaringan Baru"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Pilih jaringan IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Reset Daftar Jaringa_n"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Pilih"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "server baru"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2277,11 +1561,11 @@ msgstr ""
 "terhubung pada jaringan yang sama dengan Anda. Jika Anda ingin menggunakan "
 "fitur ini, silakan periksa rincian di bawah ini adalah benar."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Orang-orang terdekat"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2289,135 +1573,135 @@ msgstr ""
 "Anda dapat mengubah rincian ini nanti atau mematikan fitur ini dengan "
 "memilih <span style=\"italic\">Sunting → Akun</span> di Daftar Kontak."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Riwayat"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Tampilkan"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Pencarian"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Obrolan di %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Obrolan dengan %s"
 
 # %A %d %B %Y?
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s detik"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s menit"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Panggilan selama %s, berakhir pada %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Kemarin"
 
 # %A %d %B %Y?
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Kapanpun"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Siapapun"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Siapa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kapan"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Apapun"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Obrolan teks"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Panggilan"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Panggilan masuk"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Panggilan keluar"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Panggilan tak terjawab"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Apa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Anda yakin ingin menghapus semua log dari percakapan sebelumnya?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Hapus Semua"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Hapus dari:"
 
@@ -2426,20 +1710,20 @@ msgid "_File"
 msgstr "_Berkas"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Sunting"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Hapus Semua Riwayat..."
+msgid "Delete All History…"
+msgstr "Hapus Semua Riwayat…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Obrolan"
 
@@ -2453,112 +1737,116 @@ msgid "page 2"
 msgstr "halaman 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Memuat...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Memuat…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Akun obrolan apa yang Anda miliki?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Menambah akun baru"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Tambah akun baru"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Masukkan suatu identifier kontak atau nomor telepon:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Panggilan _Video"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Panggilan Suar_a"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Panggilan Baru"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontak sedang luring"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Kontak yang dinyatakan tak valid atau tak dikenal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontak tak mendukung jenis percakapan ini"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Fungsionalitas yang diminta tak diimplementasikan bagi protokol ini"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Tak bisa memulai percakapan dengan kontak yang diberikan"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Anda di-ban dari kanal ini"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Kanal ini penuh"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Anda harus diundang untuk bergabung pada kanal ini"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Tak bisa melanjutkan ketika terputus"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Ijin ditolak"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Ada galat saat memulai percakapan"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Percakapan baru"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Memerlukan Sandi"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Pesan Gubahan…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Sunting Pesan Gubahan…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Klik untuk menghapus status ini sebagai favorit"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Klik untuk membuat status favorit"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2568,25 +1856,16 @@ msgstr ""
 "<small><i>Tekan Enter untuk mengatur pesan baru atau Esc untuk membatalkan.</"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Mengatur status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Pesan gubahan…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Akun %s baru"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "Cocok _huruf besar kecil"
 
@@ -2610,167 +1889,167 @@ msgstr "_Cocokkan huruf"
 msgid "Phrase not found"
 msgstr "Frasa tidak ditemukan"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Menerima pesan instan"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Mengirim pesan instan"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Masuk permintaan obrolan"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontak terhubung"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontak terputus"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Terhubung ke server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Terputus dari server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Masuk panggilan suara"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Panggilan suara keluar"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Suara panggilan berakhir"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Sunting Pesan Gubahan"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Permintaan Berlangganan"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ingin dapat melihat ketika Anda daring"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Tolak"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "Terim_a"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Pesan disunting pada %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identitas yang diberikan oleh server obrolan tak dapat diverifikasi."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Sertifikat tak ditandatangani oleh Certificate Authority."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Sertifikat kedaluwarsa."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Sertifikat belum diaktifkan."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Sertifikat tak memiliki sidik jari yang diharapkan."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Nama host yang diperiksa oleh sertifikat tak cocok dengan nama server."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Sertifikat ditandatangani sendiri."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 "Sertifikat telah dicabut oleh Certificate Authority yang menerbitkannya."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Sertifikat lemah secara kriptografi."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Panjang sertifikat melampaui batas yang dapat diperiksa."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Sertifikat salah bentuk."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nama host yang diharapkan: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nama host sertifikat: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Lanjutkan"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Koneksi tak terpercaya"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Koneksi ini tak terpercaya. Anda masih mau melanjutkan?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Ingat pilihan ini bagi koneksi di masa depan"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Rincian Sertifikat"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Tidak dapat membuka URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Pilih berkas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Tak cukup ruang untuk menyimpan berkas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2779,225 +2058,54 @@ msgstr ""
 "Diperlukan ruang kosong %s untuk menyimpan berkas ini, tapi hanya tersedia "
 "%s. Silakan pilih lokasi lain."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Berkas masuk dari %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Pergilah daring untuk menyunting informasi pribadi Anda."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Rincian Pribadi</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "Salin Alamat _Tautan"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Buka Tautan"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Periksa HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Lokal Saat Ini"
-
-#: ../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 "Arab"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armenia"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltik"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Seltik"
-
-#: ../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 "Eropa Tengah"
-
-#: ../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 "Cina Sederhana"
-
-#: ../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 "Cina Tradisional"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Kroasia"
-
-#: ../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 "Sirilik"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Sirilik/Rusia"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Sirilik/Ukraina"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Georgia"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Yunani"
-
-#: ../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 "Ibrani"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Ibrani Visual"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandia"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Jepang"
-
-#: ../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 "Korea"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nordik"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persia"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumania"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Eropa Selatan"
-
-#: ../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 "Turki"
-
-#: ../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 "Barat"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnam"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Kontak Top"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Orang-orang Berada di Sekitar"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Grup dilebur"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Server tak bisa temukan kontak: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Tidak ada pesan kesalahan"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Pesan Instan (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3009,7 +2117,7 @@ msgstr ""
 "oleh Free Software Foundation; baik versi 2 dari Lisensi, atau (dengan "
 "pilihan Anda) versi lain."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3021,7 +2129,7 @@ msgstr ""
 "KECOCOKAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik Umum GNU untuk lebih "
 "jelasnya."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3031,83 +2139,83 @@ msgstr ""
 "Empathy, jika tidak, tulis ke Free Software Foundation, Inc, 51 Franklin "
 "Street, Fifth Floor, Boston, MA USA 02.110-130.159"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Klien Perpesanan Instan untuk GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Taufiq Wirahman <taufiq.wirahman@gmail.com>, 2010.\n"
 "Dirgita <dirgitadevina@yahoo.co.id>, 2011.\n"
 "Andika Triwidada <andika@gmail.com>, 2011, 2012, 2013."
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Jangan tampilkan dialog apapun; lakukan pekerjaan apapun (misalnya, impor) "
 "dan keluar"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Jangan tampilkan dialog apapun kecuali hanya ada akun \"Orang Sekitar\""
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Pertama pilih akun yang diberikan (misalnya, gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<id-akun>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Akun Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Akun Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Ada perubahan yang belum disimpan ke akun %s Anda."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Ada perubahan yang belum disimpan ke akun %s.50s Anda."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Akun baru Anda belum tersimpan."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Menyambung…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Luring — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Terputus — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Luring — Tidak Ada Koneksi Jaringan"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Status Tidak Diketahui"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3117,28 +2225,28 @@ msgstr ""
 "didukung. Harap pasang telepathy-haze dan start ulang sesi Anda untuk "
 "memigrasi akun."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Luring — Akun Tidak Diaktifkan"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Sunting Parameter Koneksi"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "Sunting Parameter Kon_eksi..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "Sunting Param_eter Koneksi…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Apakah Anda ingin menghapus %s dari komputer Anda?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Apakah Anda ingin menghapus %.50s dari komputer Anda?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Ini tidak akan menghapus akun Anda di server."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3147,24 +2255,24 @@ msgstr ""
 "Anda yakin ingin melanjutkan?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Aktifkan"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Lewati"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Sambung"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3173,10 +2281,14 @@ msgstr ""
 "yakin ingin melanjutkan?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Akun Perpesanan dan VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Tambah…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Impor…"
@@ -3197,31 +2309,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Tak ada protokol backend yang terpasang"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - Klien otentikasi Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Klien otentikasi Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Jangan menyambung saat memulai"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Jangan menampilkan daftar kontak atau dialog lainnya pada startup"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Klien IM Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Galat saat menghubungi Manajer Akun"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3233,8 +2345,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
-#| msgid "Incoming call"
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Sedang memanggil"
 
@@ -3246,94 +2357,94 @@ msgstr "- Klien Audio/Video Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Klien Audio/Video Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "%s baru saja mencoba memanggil, tapi Anda sedang menerima panggilan lain."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Panggilan masuk"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Panggilan video masuk dari %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Panggilan masuk dari %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Tolak"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Jawab"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Panggil dengan %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Alamat IP sebagaimana dilihat oleh mesin"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Alamat IP sebagaimana dilihat oleh server di Internet"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Alamat IP dari peer sebagaimana dilihat oleh sisi lain"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Alamat IP dari server relay"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Alamat IP dari grup multicast"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Tidak Diketahui"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Ditahan"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Bisu"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Durasi"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Rincian Teknis"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3342,7 +2453,7 @@ msgstr ""
 "Perangkat lunak %s tidak memahami format audio apapun yang didukung oleh "
 "komputer Anda"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3351,7 +2462,7 @@ msgstr ""
 "Perangkat lunak %s tidak memahami format video apapun yang didukung oleh "
 "komputer Anda"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3360,25 +2471,25 @@ msgstr ""
 "Tidak dapat membuat sambungan ke %s. Salah satu dari Anda mungkin berada "
 "pada jaringan yang tidak mengizinkan koneksi langsung."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Ada kegagalan pada jaringan"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Format audio yang diperlukan untuk panggilan ini tidak diinstal pada "
 "komputer Anda"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Format video yang diperlukan untuk panggilan ini tidak diinstal pada "
 "komputer Anda"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3389,32 +2500,32 @@ msgstr ""
 "\"%s\">laporkan bug ini</a> dan melampirkan log yang dikumpulkan dari "
 "jendela 'Debug' dalam menu Bantuan."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Ada kegagalan dalam mesin panggilan"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Akhir stream tercapai"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Tidak dapat membangun aliran audio"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Tidak bisa membangun aliran video"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Pulsa Anda kini %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Maaf, Anda tak punya cukup pulsa untuk panggilan itu."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Isi Ulang"
 
@@ -3438,11 +2549,11 @@ msgstr "_Pengaturan"
 msgid "_View"
 msgstr "_Lihat"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Bantuan"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Isi"
 
@@ -3530,19 +2641,19 @@ msgstr "Kandidat Lokal:"
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Klien Obrolan Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nama"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Ruang"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Tersambung-Otomatis"
 
@@ -3550,11 +2661,11 @@ msgstr "Tersambung-Otomatis"
 msgid "Manage Favorite Rooms"
 msgstr "Mengelola Ruang Favorit"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Tutup jendela ini?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3563,7 +2674,7 @@ msgstr ""
 "Menutup jendela ini akan meninggalkan %s. Anda tak akan menerima pesan lebih "
 "lanjut sampai Anda bergabung ulang."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3575,12 +2686,12 @@ msgstr[0] ""
 "Menutup jendela ini akan meninggalkan %u ruang obrolan. Anda tak akan "
 "menerima pesan lebih lanjut sampai Anda bergabung ulang."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Tinggalkan %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3588,49 +2699,49 @@ msgstr ""
 "Anda tak akan menerima pesan lebih lanjut dari ruang obrolan ini sampai Anda "
 "bergabung ulang."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Tutup jendela"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Tinggalkan ruangan"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d belum dibaca)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (dan %u lainnya)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d belum dibaca dari lainnya)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d belum dibaca dari semua)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sedang mengirim %d pesan"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Ketik pesan."
 
@@ -3663,117 +2774,116 @@ msgid "Invite _Participant…"
 msgstr "Undang _Peserta…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Gabung Obrolan"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Tinggalkan _Obrolan"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "K_ontak"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Tab"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Ta_b Sebelumnya"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Tab Selanjut_nya"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Batalkan T_utup Tab"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Pindahkan Tab Ke Ki_ri"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Pindahkan Tab Ke _Kanan"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Lepaskan Tab"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Tampilkan layanan tertentu"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Pengawakutu Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Pengawakutu Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Simpan"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Taut pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Respon pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Data terlalu besar untuk suatu penempelan tunggal. Silakan simpan log ke "
 "berkas."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Jendela Debug"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Kirim ke pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Berhenti sebentar"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Tingkat "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Pesan"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kritis"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Kesalahan"
 
-#: ../src/empathy-debug-window.c:2030
-#| msgid ""
-#| "Even if they don't display passwords, logs can contain sensible "
-#| "information such as your list of contacts or the messages you recently "
-#| "sent or received.\n"
-#| "If you don't want to see such information available in a public bug "
-#| "report, you can choose to limit the visibility of your bug to Empathy "
-#| "developers when reporting it by displaying the advanced fields in the <a "
-#| "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug "
-#| "report</a>."
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3791,93 +2901,93 @@ msgstr ""
 "lanjut dalam <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy\">laporan kutu</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Waktu"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domain"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Tingkat"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Manajer koneksi yang dipilih tidak mendukung ekstensi pengawakutuan jauh."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Panggilan video masuk"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s memanggil Anda lewat video. Apakah Anda ingin menjawab?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s memanggil Anda. Apakah Anda ingin menjawab?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Tolak"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Jawab"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "J_awab dengan video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Undangan ruang"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Undangan untuk bergabung di %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Gabung"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s mengundang Anda untuk bergabung dengan %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Anda diundang untuk bergabung di %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Kedatangan transfer berkas dari %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Memerlukan sandi"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3887,105 +2997,105 @@ msgstr ""
 "Pesan: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s dari %s di %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s dari %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Menerima \"%s\" dari %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Mengirim \"%s\" ke %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Kesalahan menerima \"%s\" dari %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Kesalahan menerima berkas"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Gagal mengirim \"%s\" ke %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Gagal mengirim berkas"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" diterima dari %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" dikirim ke %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Transfer berkas selesai"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Menunggu tanggapan peserta lain"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Memeriksa integritas \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Berkas"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Tersisa"
 
@@ -3997,11 +3107,11 @@ msgstr "Transfer Berkas"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Hapus transfer berkas yang selesai, batal dan gagal dari daftar"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Impor"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4009,49 +3119,49 @@ msgstr ""
 "Tidak ada akun yang akan diimpor dapat ditemukan. Empathy saat ini hanya "
 "mendukung pengimporan akun dari Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Impor Akun"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Impor"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Sumber"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Undang Peserta"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Pilih kontak untuk diundang ke percakapan:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Undang"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Ruang Mengobrol"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Anggota"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Gagal membuat daftar ruang"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4064,17 +3174,17 @@ msgstr ""
 "Sandi diperlukan: %s\n"
 "Anggota: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Ya"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Tidak"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Gabung Ruang"
 
@@ -4117,104 +3227,104 @@ msgstr "Tidak dapat mengambil daftar ruang"
 msgid "Room List"
 msgstr "Daftar Ruang"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Tanggapan"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Jawab dengan video"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Tolak"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Terima"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Sediakan"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Pesan diterima"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Pesan terkirim"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Percakapan baru"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontak menjadi daring"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontak pergi luring"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Akun terhubung"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Akun terputus"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Bahasa"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 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:654
+#: ../src/empathy-preferences.c:642
 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:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 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:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Juliet telah terputus"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Preferensi"
 
@@ -4226,7 +3336,7 @@ msgstr "Tampilkan grup"
 msgid "Show account balances"
 msgstr "Tampilkan sisa pulsa"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Daftar Kontak"
 
@@ -4349,23 +3459,7 @@ msgstr "Ku_rangi akurasi lokasi"
 msgid "Privacy"
 msgstr "Pribadi"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "Telepon _seluler"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "Jaringa_n (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Sumber lokasi:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4373,36 +3467,36 @@ msgstr ""
 "Daftar bahasa yang ada hanya mencerminkan bahasa yang telah memiliki kamus "
 "yang terinstal."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Aktifkan pemeriksaan ejaan untuk bahasa:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Pemeriksaan Ejaan"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "T_ema Obrolan:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Varian:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Tema"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Sediakan Sandi"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Putus"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Anda perlu menyiapkan suatu akun untuk melihat kontak disini."
 
 #: ../src/empathy-roster-window.c:569
@@ -4415,6 +3509,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4430,8 +3528,8 @@ msgid "Online Accounts"
 msgstr "Akun Daring"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Mutakhirkan perangkat lunak..."
+msgid "Update software…"
+msgstr "Mutakhirkan perangkat lunak…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4477,24 +3575,26 @@ msgid "No online contacts"
 msgstr "Tak ada kontak daring"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "Percakapa_n Baru..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Percakapa_n Baru…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "_Panggilan Baru..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "_Panggilan Baru…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Kontak"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "T_ambah Kontak..."
+msgid "_Add Contacts…"
+msgstr "T_ambah Kontak…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Cari Kontak..."
+msgid "_Search for Contacts…"
+msgstr "_Cari Kontak…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4505,8 +3605,8 @@ msgid "_Rooms"
 msgstr "_Ruang"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Gabung..."
+msgid "_Join…"
+msgstr "_Gabung…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4550,33 +3650,19 @@ msgid "Go _Online"
 msgstr "Jadi _Daring"
 
 #: ../src/empathy-roster-window.ui.h:3
-#| msgid "Show offline contacts"
 msgid "Show _Offline Contacts"
 msgstr "Tampilkan K_ontak Luring"
 
-#: ../src/empathy-roster-window.ui.h:4
-#| msgid "_Add Contacts..."
-msgid "_Add Contact..."
-msgstr "T_ambah Kontak…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "Percakapa_n Baru…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "_Panggilan Baru…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Selesai"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Silakan masukkan rincian akun Anda"
 
@@ -4588,4 +3674,3 @@ msgstr "Sunting opsi akun %s"
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 msgid "Integrate your IM accounts"
 msgstr "Integrasikan akun IM Anda"
-
diff --git a/po/it.po b/po/it.po
index e82aa6581..900c3ee44 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,8 +1,8 @@
 # Italian translation for Empaty
-# Copyright (C) 2003-2010, 2011, 2012 The Free Software Foundation, Inc.
+# Copyright (C) 2003-2010, 2011, 2012, 2013 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 
+# Fabio Bonelli <fabiobonelli@libero.it>, 2003
+# Michele Baldessari <michele@pupazzo.org>, 2003
 # Luca Ferretti <lferrett@gnome.org>, 2011.
 # Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012, 2013.
 #
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-12 18:43+0100\n"
-"PO-Revision-Date: 2013-03-12 18:46+0100\n"
+"POT-Creation-Date: 2013-09-03 18:17+0200\n"
+"PO-Revision-Date: 2013-09-03 18:16+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -19,6 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -105,7 +106,7 @@ msgstr ""
 #: ../data/org.gnome.Empathy.gschema.xml.h:12
 #: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
-msgstr "Mostra contatti fuori rete"
+msgstr "Mostrare contatti fuori rete"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
@@ -490,47 +491,11 @@ msgstr ""
 "agli altri contatti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-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.h:93
-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.h:94
-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.h:95
-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.h:96
-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.h:97
-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.h:98
 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.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -561,7 +526,7 @@ msgstr "Errore nel tentativo di trasferire il file"
 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:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -581,218 +546,158 @@ msgstr "Il file selezionato non è un file regolare"
 msgid "The selected file is empty"
 msgstr "Il file selezionato è vuoto"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Password non trovata"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Password account messaggistica per %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Password per la stanza «%s» sull'account %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chiamata persa da %s"
 
 # (ndt) quello che c'è dopo è il nome del contatto
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "%s ha chiamato"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Chiamata da %s"
 
-#: ../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: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: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: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: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: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:142
-msgid "in the future"
-msgstr "nel futuro"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Non disponibile"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Assente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Fuori rete"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Lo stato è impostato a «Fuori rete»"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Errore di rete"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Autenticazione non riuscita"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Errore di cifratura"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nome in uso"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Certificato non fornito"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Certificato non fidato"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Certificato scaduto"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certificato non attivato"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Corrispondenza errata nel nome host del certificato"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Corrispondenza errata nell'impronta del certificato"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certificato auto-firmato"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Errore nel certificato"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "La cifratura non è disponibile"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Il certificato non è valido"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "La connessione è stata rifiutata"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "La connessione non può essere stabilita"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "La connessione è stata persa"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Questo account è già collegato al server"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "L'account esiste già sul server"
 
 # (ndt) rivedere too busy
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Il server è troppo carico per gestire la connessione"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -800,605 +705,33 @@ 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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Il software in uso è troppo datato"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Persone nelle vicinanze"
-
-# (ndt) opzione
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Giappone"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Chat di Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Tutti gli 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
-msgid "Pass_word"
-msgstr "Pass_word"
-
-# (ndt) come in pidgin ;)
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "_Nominativo pubblico"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Esempio:</b> IlMioNominativo"
-
-#. 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 "Ricordare la 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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Porta:"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Server"
-
-# (ndt) messo al femminile, è presente dove ci sono le 'impostazioni'
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Qual è il nominativo pubblico AIM?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Qual è la password di 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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Ricordare la password"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Account"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Password"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Porta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "A_pplica"
-
-# (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Acce_di"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Questo account esiste già sul server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Creare un nuovo account sul 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:2270
-#, c-format
-msgid "%1$s on %2$s"
-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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Account %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nuovo account"
-
-#: ../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 accesso"
-
-#: ../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>Esempio:</b> nomeutente"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Qual è l'identificativo GroupWise?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Qual è la password di GroupWise?"
-
-#: ../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>Esempio:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Co_difica caratteri"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Qual è il numero ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Qual è la password di ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Rete"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Codifica caratteri"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Aggiungi..."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Rimuovi"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Su"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Giù"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"La maggior parte dei server IRC non necessita di una password. Se in dubbio, "
-"non inserirne alcuna."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Soprannome"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Messaggio di uscita"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nome reale"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nome utente"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Quale rete IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Qual è il soprannome IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Qual è il nome utente di Facebook?"
-
-# (ndt) sarebbe da segnalare di non usare cose come "questa pagina" dove "questa pagina" è un link...
-#. 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 ""
-"Il proprio nome utente, non quello usato per eseguire l'accesso a Facebook.\n"
-"Se il proprio nome utente è facebook.com/<b>mario</b>, inserire <b>mario</"
-"b>.\n"
-"Se non si dispone di un nome utente, utilizzare <a href=\"http://www."
-"facebook.com/username/\">questa pagina</a> per sceglierne uno."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Qual è la password di Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Qual è l'identificativo di Google?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Esempio:</b> utente@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Qual è la password di Google?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Esempio:</b> utente@jabber.org"
-
-# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorare errori certificati SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Pri_orità"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "_Risorsa"
-
-# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Richi_esta cifratura (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Scavalcare impostazioni server"
-
-# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "_Usare vecchio SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Qual è l'identificativo di Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Che identificativo Jabber utilizzare?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Qual è la password di Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Che password utilizzare?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "So_prannome"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "C_ognome"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Nome"
-
-# (ndt) dovrebbe essere il nome visualizzato con l'account
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "Nome _visibile"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID"
-msgstr "I_D Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "Indirizzo _email"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Esempio:</b> utente@hotmail.it"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Qual è l'identificativo di Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Qual è la password di Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Automatico"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Opzioni"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Nessuno"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Nome utente"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Esempio:</b> utente@il.server.sip"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "_Usare questo account per chiamate a telefoni fissi e cellulari"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Opzioni attraversamento NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opzioni proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Opzioni varie"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Server STUN"
-
-# (ndt) opzione
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Rilevare automaticamente il server STUN"
-
-# (ndt) è un po' oscura e anche sbagliata la capitaliazzazione essendo opzione. Si riferisce ai binding sul NAT
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Rilevare le associazioni"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Opzioni Keep-Alive"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Meccanismo"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervallo (secondi)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Nome utente di autenticazione"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Trasporto"
-
-# (ndt) Routing libero mi suona troppo da sagra...
-# usare "slegato" non so se chi ci capisce qualche cosa possa cogliere...
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Routing \"loose\""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorare errori TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Indirizzo IP locale"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Qual è l'identificativo di accesso SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Qual è la password dell'account SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "Pass_word:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "I_D Yahoo:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "I_gnore conference and chat room invitations"
-msgstr "I_gnorare inviti per conferenze e stanze di conversazione"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "_Locale elenco stanze:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Co_difica caratteri:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Porta:"
-
-# (ndt) metto Yahoo!?
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Qual è l'identificativo Yahoo?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Qual è la password di Yahoo?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Impossibile convertire l'immagine"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Nessuno dei formati di immagine accettati è supportato dal sistema"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Impossibile salvare l'immagine su file"
-
-# (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Selezione immagine"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Scatta foto..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Nessuna immagine"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Immagini"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Tutti i file"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Clic per ingrandire"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Autenticazione non riuscita per l'account <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Riprova"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1408,73 +741,69 @@ msgstr ""
 "Inserire la password per l'account\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Seleziona..."
-
-# (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Seleziona"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Ricordare la password"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Si è verificato un errore nell'iniziare la chiamata"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Il contatto specificato non supporta le chiamate"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Il contatto specificato è fuori rete"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Il contatto specificato non è valido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Le chiamate di emergenza non sono supportate su questo protocollo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Apertura della conversazione privata non riuscita"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Argomento non supportato in questa conversazione"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Non si è autorizzati a modificare l'argomento"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "ID contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 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:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1482,23 +811,23 @@ msgstr ""
 "/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito "
 "quella attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 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:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1096
+#: ../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 "
@@ -1508,11 +837,11 @@ msgstr ""
 "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato "
 "per entrare in una nuova stanza\""
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID contatto>: visualizza informazioni riguardo un contatto"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1520,127 +849,127 @@ msgstr ""
 "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è "
 "definito, ne mostra l'uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando sconosciuto. Provare /help per i comandi disponibili."
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "saldo non sufficiente per inviare messaggi"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Errore nell'inviare il messaggio «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "non possibile"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "fuori rete"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "messaggio troppo lungo"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "non implementato"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Argomento impostato a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Nessun argomento definito"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Nessun suggerimento)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aggiungi «%s» al dizionario %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Inserisci faccina"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Invia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Suggerimenti ortografici"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Recupero dei registri recenti non riuscito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "L'utente %s si è disconnesso"
@@ -1648,13 +977,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, 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:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "L'utente %s è stato espulso"
@@ -1662,19 +991,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, 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:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "L'utente %s è stato bandito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "L'utente %s ha lasciato la stanza"
@@ -1684,19 +1013,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:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, 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:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "L'utente %s è ora conosciuto come %s"
@@ -1705,53 +1034,53 @@ 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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Salvare questa password?"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Ricorda"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Password errata. Provare nuovamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Questa stanza è protetta da una password:"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Entra"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Connessi"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Conversazione"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1782,8 +1111,8 @@ msgstr "Modifica contatti bloccati"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1793,122 +1122,63 @@ msgstr "Account:"
 msgid "Blocked Contacts"
 msgstr "Contatti bloccati"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nome completo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Numero di telefono"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Indirizzo email"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Sito web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Ultima attività:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Server:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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:117
-msgid "Away message:"
-msgstr "Messaggio di assenza:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "lavoro"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "casa"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "cellulare"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "voce"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "preferito"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "postale"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "parcel"
+#: ../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 "Rimuovi"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Cerca contatti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "La ricerca dei contatti non è supportata con questo account"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Un messaggio di presentazione:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vorrei poter vedere quando sei online! Grazie!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Salva immagine"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Impossibile salvare l'immagine"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Account"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identificatore"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Pseudonimo"
 
@@ -1944,11 +1214,11 @@ msgstr "Versione"
 msgid "Client"
 msgstr "Client"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1957,125 +1227,130 @@ msgstr ""
 "selezionarne più di uno oppure nessuno."
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "A_ggiungi gruppo"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selezione"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Bloccare veramente «%s»? "
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 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:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Segnalare abuso da questo contatto"
 msgstr[1] "_Segnalare abuso da questi contatti"
 
 # (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 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:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Contatti uniti"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "Il software «gnome-contacts» non è installato"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Installare «gnome-contacts» per accedere ai dettagli dei contatti."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # (ndt) è un titolo...
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Selezione account per la chiamata"
 
 # (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Chiamata"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blocca contatto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Rimuovi dal _gruppo «%s»"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Elimina e _blocca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Rimuovere veramente il contatto «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2084,225 +1359,226 @@ msgstr ""
 "Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà "
 "tutti i contatti di cui è composto."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Rimozione contatto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Rimuovi"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Conversazione"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Chiamata _audio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Chiamata _video"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Conversazioni _precedenti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Invia file"
 
 # (ndt) voce di menù
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Condividi desktop"
 
 # (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Preferito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Informa_zioni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifica"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Invito per questa stanza"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Invita nella stanza"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Rimuovere veramente il gruppo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Rimozione gruppo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "_Rinomina"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Codice ISO del paese:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Stato:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Città:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Via:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Edificio:"
 
 # (ndt) questo è prima di una casella di testo
 # in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Piano:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Testo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Livello di precisione:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Errore verticale (metri):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Errore orizzontale (metri):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Orientamento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Velocità di salita:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Longitudine:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Latitudine:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Altitudine:"
 
 # (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Posizione geografica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%-d %B %Y alle %H.%M UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Pseudonimo:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identificatore:"
 
 # (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2318,33 +1594,7 @@ 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:335
-msgid "New Network"
-msgstr "Nuova rete"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
-msgid "Choose an IRC network"
-msgstr "Scegliere una rete IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
-msgid "Reset _Networks List"
-msgstr "Ripristina ele_nco reti"
-
-#
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Seleziona"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nuovo server"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2354,11 +1604,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Persone nelle vicinanze"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2367,139 +1617,139 @@ msgstr ""
 "è possibile disabilitare questa funzionalità scegliendo <span style=\"italic"
 "\">Modifica → Account</span> dall'elenco dei contatti."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Cronologia"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Mostra"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversazione in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversazione con %s"
 
 # (ndt) domenica 01 ottobre 2007
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s secondo"
 msgstr[1] "%s secondi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minuti"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Durata della chiamata: %s. Terminata alle: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Oggi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 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:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%d %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Qualsiasi ora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Chi"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Qualsiasi cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Testo conversazioni"
 
 # (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Chiamate"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Chiamate in arrivo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Chiamate in uscita"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Chiamate perse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Elimina tutto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Elimina da:"
 
@@ -2508,12 +1758,12 @@ 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-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Modifica"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Elimina cronologia..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2521,7 +1771,7 @@ msgid "Profile"
 msgstr "Profilo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Conversazione"
 
@@ -2535,115 +1785,119 @@ msgid "page 2"
 msgstr "page 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Caricamento...</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Che tipo di account è disponibile?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
 msgstr "Aggiunta nuovo account"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Inserire un identificatore di contatto o un numero di telefono:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Chiamata _video"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Chiamata _audio"
 
 # (ndt) è il titolo del dialogo
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nuova chiamata"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Il contatto è fuori rete"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 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:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 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:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 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:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Impossibile accedere a questo canale (ban)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Questo canale è pieno"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 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:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Impossibile continuare quando fuori rete"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Si è verificato un errore nell'iniziare la conversazione"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nuova conversazione"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Password richiesta"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Messaggio personalizzato..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Modifica messaggio personalizzato..."
 
 # (ndt) sono dei suggerimenti, ma indicano l'azione da compiere
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Fare clic per rimuovere questo stato dai preferiti"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Fare clic per aggiungere questo stato tra i preferiti"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2653,25 +1907,16 @@ msgstr ""
 "<small><i>Premere Invio per impostare il nuovo messaggio o Esc per annullare."
 "</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Imposta lo stato"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Messaggi personalizzati..."
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nuovo account %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Maiuscole/minuscole"
 
@@ -2696,174 +1941,174 @@ msgid "Phrase not found"
 msgstr "Stringa non trovata"
 
 # (ndt) dovrebbero essere gli eventi sonori
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Messaggio istantaneo ricevuto"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Messaggio istantaneo inviato"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Richiesta di conversazione in arrivo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Contatto connesso"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Connessi al server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Disconnessi dal server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Chiamata vocale in arrivo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Chiamata vocale in uscita"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Chiamata vocale terminata"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Modifica messaggi personalizzati"
 
 # (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Richiesta di approvazione"
 
 # (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale...
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vorrebbe poter visualizzare la tua presenza in rete"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Rifiuta"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "Acce_tta"
 
 # (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile...
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Messaggio modificato alle %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normale"
 
 # (ndt) o solo server?
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 "L'identità fornita dal server di conversazione non può essere verificata."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Il certificato non è firmato da un'Autorità di Certificazione"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Il certificato è scaduto."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Il certificato non è ancora stato attivato."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Il certificato non contiene l'impronta digitale attesa."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Il nome host verificato dal certificato non corrisponde al nome del server."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Il certificato è auto-firmato."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Il certificato è stato revocato dall'Autorità di Certificazione."
 
 # (ndt) crittograficamente non mi piace...
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Il certificato è cifrato con una chiave debole."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "La lunghezza del certificato supera i limiti verificabili."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Il certificato non è corretto."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nome host atteso: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nome host del certificato: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "C_ontinua"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Connessione non sicura"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Ricordare per le successive connessioni"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Dettagli certificato"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Impossibile aprire l'URI"
 
 # (ndt) titolo
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Spazio insufficiente per salvare il file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2872,226 +2117,54 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "File in arrivo da parte di %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Andare in rete per modificare le informazioni personali."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Dettagli personali</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Copia indirizzo collegamento"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "Apri c_ollegamento"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Ispeziona HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Localizzazione corrente"
-
-#: ../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 "Arabo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armeno"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Celtico"
-
-#: ../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 "Europeo centrale"
-
-#: ../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 "Cinese semplificato"
-
-#: ../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 "Cinese tradizionale"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Croato"
-
-#: ../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 "Cirillico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cirillico/Russo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cirillico/Ucraino"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Georgiano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Greco"
-
-#: ../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 "Ebraico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Ebraico visuale"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandese"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: ../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 "Coreano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nordico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persiano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumeno"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Sud europeo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Tailandese"
-
-#: ../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 "Turco"
-
-#: ../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 "Occidentale"
-
-# (ndt) suggerimento 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Contatti principali"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Persone nelle vicinanze"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Non raggruppati"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Impossibile trovare il contatto: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Nessun messaggio di errore"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Messaggio istantaneo (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3103,7 +2176,7 @@ msgstr ""
 "Free Software Foundation; versione 2 della licenza, o (a scelta) una "
 "versione più recente."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3115,7 +2188,7 @@ msgstr ""
 "APPLICABILITÀ PER UNO SCOPO PARTICOLARE. Per maggiori dettagli consultare la "
 "GNU General Public License."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3125,24 +2198,24 @@ 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:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client di messaggistica istantanea per GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Milo Casagrande <milo@ubuntu.com>\n"
 "Michele Baldessari\n"
 "Fabio Bonelli"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
@@ -3150,60 +2223,60 @@ msgstr ""
 "vicinanze\""
 
 # (ndt) spero che una cosa così non si veda mai...
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Account Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Account Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Sono presenti delle modifiche non salvate per l'account %s."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Sono presenti delle modifiche non salvate per l'account %.50s."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Il nuovo account non è ancora stato salvato."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Connessione..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Fuori rete — %s"
 
 # (ndt) plurale per comprendere uomini e donne
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnessi — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Fuori rete — Nessuna connessione di rete"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3213,29 +2286,29 @@ msgstr ""
 "supportato. Installare «telepathy-haze» e riavviare la sessione o migrare "
 "l'account."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Fuori rete — Account disabilitato"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Modifica parametri connessione"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr "_Modifica parametri connessione..."
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Rimuovere «%s» dal computer?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Rimuovere %.50s dal computer?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 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:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3244,25 +2317,25 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Abilitato"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Salta"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Connetti"
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3271,10 +2344,14 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Account di messaggistica e VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Aggiungi..."
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importa..."
@@ -3296,33 +2373,33 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Nessun protocollo installato"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - Client autenticazione Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Client autenticazione Empathy"
 
 # (ndt) opzione
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Non connettere all'avvio"
 
 # (ndt) opzione
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Messaggistica istantanea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Errore nel contattare il gestore di account"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3334,7 +2411,7 @@ msgstr ""
 "account Telepathy:\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Chiamata in corso"
 
@@ -3346,95 +2423,95 @@ msgstr "- Client audio/video Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Client audio/video Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Chiamata video in arrivo da %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Chiamata in arrivo da %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Rispondi"
 
 # (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-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Chiamata con %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "L'indirizzo IP visto dal computer"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 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-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "L'indirizzo IP di un relay server"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "L'indirizzo IP del gruppo multicast"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "In attesa"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Muto"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Durata"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d.%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Dettagli tecnici"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3443,7 +2520,7 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati audio "
 "supportati da questo computer"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3452,7 +2529,7 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati video "
 "supportati da questo computer"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3461,23 +2538,23 @@ msgstr ""
 "Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
 "una rete che non supporta connessioni dirette."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Si è verificato un problema sulla rete"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3488,32 +2565,32 @@ msgstr ""
 "\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
 "attraverso l'azione «Debug» presente nel menù «Aiuto»."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Si è verificato un problema nel motore delle chiamate"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Raggiunta la fine del flusso"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Impossibile stabilire il flusso audio"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Impossibile stabilire il flusso video"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Il saldo attuale è di %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Saldo non sufficiente per effettuare la chiamata."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Ricarica"
 
@@ -3538,11 +2615,11 @@ msgstr "Imposta_zioni"
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "A_iuto"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Sommario"
 
@@ -3634,20 +2711,20 @@ msgstr "Candidato locale:"
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Client chat Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Stanza"
 
 # (ndt) dovrebbe essere il nome di una colonna
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Connessione automatica"
 
@@ -3656,11 +2733,11 @@ msgstr "Connessione automatica"
 msgid "Manage Favorite Rooms"
 msgstr "Gestione stanze preferite"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Chiudere la finestra?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3669,7 +2746,7 @@ msgstr ""
 "Chiudendo questa finestra, il canale %s verrà abbandonato. Per ricevere "
 "nuovi messaggi, entrare nuovamente nel canale."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3684,65 +2761,65 @@ msgstr[1] ""
 "Chiudendo questa finestra verranno abbandonate %u stanze di conversazione. "
 "Per ricevere nuovi messaggi, entrare nuovamente nelle stanze."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Uscire da %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Chiudi finestra"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Lascia stanza"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, 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:692
+#: ../src/empathy-chat-window.c:684
 #, 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:708
+#: ../src/empathy-chat-window.c:700
 #, 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:717
+#: ../src/empathy-chat-window.c:709
 #, 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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, 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:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Scrittura messaggio."
 
@@ -3775,107 +2852,116 @@ msgstr "Mo_stra elenco contatti"
 msgid "Invite _Participant…"
 msgstr "Invita _partecipante..."
 
+# (ndt) pulsante
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Unisciti alla conversazione"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Esci dalla conversazione"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "C_ontatto"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "Sc_hede"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Scheda _precedente"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Scheda _successiva"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Riapri _scheda chiusa"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Sposta scheda a s_inistra"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Sposta scheda a _destra"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "Dist_acca scheda"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Mostra un servizio particolare"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Debugger Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Debugger Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Collegamento Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Risposta Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Invia a Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Livello "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informazioni"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3894,23 +2980,23 @@ msgstr ""
 "\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">segnalazione</"
 "a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Orario"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Livello"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3918,71 +3004,71 @@ msgstr ""
 "Il gestore di connessione selezionato non sembra supportare l'estensione per "
 "il debug remoto."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Chiamata video in arrivo"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s sta video-chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s sta chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "Ri_fiuta"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Rispondi"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "Rispondi con _video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Invito in una stanza"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s sta inviando un invito per entrare in %s"
 
 # (ndt) pulsante
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, 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:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "C'è un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Trasferimento file in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Password richiesta"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3992,105 +3078,105 @@ msgstr ""
 "Messaggio: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s di %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errore nel ricevere il file «%s» da %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Errore nel ricevere un file"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errore nell'inviare il file «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 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:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "File «%s» inviato a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Attesa della risposta dell'altro utente"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verifica dell'integrità del file «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Calcolo codice di controllo di «%s»"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Restante"
 
@@ -4106,11 +3192,11 @@ msgstr ""
 "riusciti"
 
 # (ndt) nome di una colonna
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importa"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4119,53 +3205,53 @@ msgstr ""
 "importare gli account solamente da Pidgin."
 
 # (ndt) titolo
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 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:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Sorgente"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Invita partecipante"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Scegliere un contatto da invitare nella conversazione:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Invita"
 
 # (ndt) pare il titolo di una colonna
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Stanza"
 
 # (ndt) titolo scheda
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Membri"
 
 # (ndt) un po' libera
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Recupero elenco delle stanze non riuscito"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4178,17 +3264,17 @@ msgstr ""
 "Password richiesta: %s\n"
 "Membri: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Sì"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Entra nella stanza"
 
@@ -4231,106 +3317,106 @@ msgstr "Impossibile caricare l'elenco delle stanze"
 msgid "Room List"
 msgstr "Elenco stanze"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Rispondi con video"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Fornisce"
 
 # (ndt) quelli che seguono sono
 # messaggi di eventi a cui associare un suono
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nuova conversazione"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Il contatto entra in rete"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Il contatto va fuori rete"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Account connesso"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Account disconnesso"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Lingua"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Giulietta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 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:654
+#: ../src/empathy-preferences.c:642
 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:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 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:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "L'utente Giulietta si è disconnesso"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -4344,7 +3430,7 @@ msgstr "Mostrare i gruppi"
 msgid "Show account balances"
 msgstr "Mostrare i bilanci dell'account"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Elenco contatti"
 
@@ -4451,10 +3537,9 @@ msgid ""
 "off and restarting the call."
 msgstr ""
 "La soppressione dell'eco consente di rendere la propria voce più chiara, ma "
-"potrebbe causare alcuni problemi. Se vengono uditi strani suoni o rumori "
-"statici localmente o anche dall'altra persona con cui si ha una "
-"conversazione, provare a disabilitare la soppressione dell'eco e riavviare "
-"la chiamata."
+"potrebbe causare alcuni problemi. Se vengono uditi strani suoni o disturbi "
+"localmente o anche dall'altra persona con cui si ha una conversazione, "
+"provare a disabilitare la soppressione dell'eco e riavviare la chiamata."
 
 # (ndt) opzione
 #: ../src/empathy-preferences.ui.h:30
@@ -4480,24 +3565,7 @@ msgstr "_Ridurre la precisione della posizione geografica"
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "C_ellulare"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rete (IP, WiFi)"
-
-# (ndt) nome di una sezione
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Sorgenti per la posizione:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4505,40 +3573,40 @@ msgstr ""
 "L'elenco dei dizionari mostra solo le lingue di cui si ha un dizionario "
 "installato."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Abilitare il controllo ortografico per le lingue:"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "T_ema delle conversazioni:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variante:"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temi"
 
 # (ndt) pare tooltip... mah...
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Fornisce password"
 
 # (ndt) tooltip
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Disconnette"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "È necessario configurare un account per poter visualizzare i contatti."
 
 #: ../src/empathy-roster-window.c:569
@@ -4552,6 +3620,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4568,7 +3640,7 @@ msgid "Online Accounts"
 msgstr "Account online"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "Aggiorna software..."
 
 # (ndt) suggerimento
@@ -4617,24 +3689,25 @@ msgid "No online contacts"
 msgstr "Nessun contatto collegato"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "Nu_ova conversazione..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nuova conversazione..."
 
-# (ndt) è il titolo del dialogo
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "N_uova chiamata..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nuova c_hiamata..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Contatti"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
+msgid "_Add Contacts…"
 msgstr "A_ggiungi contatti..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Cerca contatti..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4648,7 +3721,7 @@ msgstr "St_anze"
 
 # (ndt) pulsante
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+msgid "_Join…"
 msgstr "_Entra..."
 
 # (ndt) voce di menù, stanze
@@ -4698,28 +3771,16 @@ msgstr "C_ollegati"
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _fuori rete"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "A_ggiungi contatto..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nuova conversazione..."
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nuova c_hiamata..."
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stato"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Fatto"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Inserire i dettagli dell'account"
 
diff --git a/po/lt.po b/po/lt.po
index 79a938e63..70fd05b3d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,20 +6,24 @@
 # Saulius <saulius.shopaga@gmail.com>, 2008, 2009.
 # Žygimantas Beru�ka <zygis@gnome.org>, 2004-2010, 2010, 2011, 2012.
 # Algimantas Margevi�ius <margevicius.algimantas@gmail.com>, 2011.
+# Aurimas ÄŒernius <aurisc4@gmail.com>, 2013.
+#
 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: 2012-12-26 10:30+0000\n"
-"PO-Revision-Date: 2013-01-01 18:31+0300\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-04 00:14+0300\n"
 "Last-Translator: Aurimas ÄŒernius <aurisc4@gmail.com>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\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%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -36,7 +40,9 @@ msgstr "Tikralaikių pokalbių programa Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Plepėkite naudodamiesi „Google Talk“, „Facebook“, „MSN“ ir kitomis pokalbių paslaugomis"
+msgstr ""
+"Plepėkite naudodamiesi „Google Talk“, „Facebook“, „MSN“ ir kitomis pokalbių "
+"paslaugomis"
 
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
@@ -47,8 +53,12 @@ msgid "Connection managers should be used"
 msgstr "Turėtų būti naudojamos ryšių valdyklės"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Ar turėtų būti naudojamos ryšių valdyklės automatiniam atsijungimui / prisijungimui iš naujo."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Ar turėtų būti naudojamos ryšių valdyklės automatiniam atsijungimui / "
+"prisijungimui iš naujo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
@@ -63,8 +73,11 @@ msgid "Empathy should auto-away when idle"
 msgstr "Nenaudojant Empathy, turėtų būti nustatoma nebuvimo būsena"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ar Empathy turėtų automatiškai nustatyti nebuvimo būseną, jeigu naudotojas nesinaudoja kompiuteriu."
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr ""
+"Ar Empathy turėtų automatiškai nustatyti nebuvimo būseną, jeigu naudotojas "
+"nesinaudoja kompiuteriu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
@@ -77,11 +90,17 @@ msgstr "Numatytasis aplankas, kuriame įrašomi atsiųsti failai."
 #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
 #: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "Magiškas numeris, naudojamas patikrinti, ar reikai vykdyti būklės patikrinimo darbus"
+msgstr ""
+"Magiškas numeris, naudojamas patikrinti, ar reikai vykdyti būklės "
+"patikrinimo darbus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
-msgstr "empathy-sanity-cleaning.c naudoja šį numerį patikrinimui, ar išvalymo darbai turi būti vykdomi. Naudotojai neturėtų rankomis keisti šio rakto."
+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 naudoja šį numerį patikrinimui, ar išvalymo darbai "
+"turi būti vykdomi. Naudotojai neturėtų rankomis keisti šio rakto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:12
 #: ../src/empathy-preferences.ui.h:1
@@ -110,7 +129,8 @@ msgstr "Paslėpti pagrindinį langą."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
-msgstr "Numatytasis aplankas, iš kurio pasirinktinas pseudoportreto paveikslėlis"
+msgstr ""
+"Numatytasis aplankas, iš kurio pasirinktinas pseudoportreto paveikslėlis"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
@@ -129,8 +149,12 @@ msgid "Display incoming events in the status area"
 msgstr "Rodyti gaunamus įvykius būsenos srityje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Rodyti gaunamus įvykius būsenos srityje. Jei reikšmė neigiama, pateikti juos naudotojui nedelsiant."
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Rodyti gaunamus įvykius būsenos srityje. Jei reikšmė neigiama, pateikti juos "
+"naudotojui nedelsiant."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
@@ -201,7 +225,8 @@ msgid "Play a sound when a contact logs out"
 msgstr "Atsijungus kontaktui sugroti garsÄ…"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Ar sugroti garsÄ… kontaktams atsijungiant nuo tinklo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:42
@@ -241,8 +266,12 @@ msgid "Pop up notifications if the chat isn't focused"
 msgstr "Rodyti iškylan�ius pranešimus, jei pokalbio langas nesuaktyvintas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ar rodyti iškylantį pranešimo langą, kai gaunama nauja žinutė, net jei pokalbio langas yra jau atvertas, ta�iau nesuaktyvintas."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ar rodyti iškylantį pranešimo langą, kai gaunama nauja žinutė, net jei "
+"pokalbio langas yra jau atvertas, ta�iau nesuaktyvintas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
@@ -289,7 +318,8 @@ msgid "Chat window theme variant"
 msgstr "Pokalbio lango temos variantas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid "The theme variant 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 "Temos variantas, naudojamas pokalbio rodymui pokalbių languose."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:64
@@ -297,24 +327,34 @@ msgid "Path of the Adium theme to use"
 msgstr "Naudotinos „Adium“ temos kelias"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
-msgstr "Naudotinos „Adium“ temos kelias, jei pokalbiui naudojama tema yra „Adium“. Nebenaudojama."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Naudotinos „Adium“ temos kelias, jei pokalbiui naudojama tema yra „Adium“. "
+"Nebenaudojama."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Įjungti WebKit programuotojų įrankius"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Ar turėtų būti įjungti WebKit programuotojų įrankiai, pvz., Web Inspector."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Ar turėtų būti įjungti WebKit programuotojų įrankiai, pvz., Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "Pranešti kitiems naudotojams, kad jūs rašote jiems"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
-msgstr "Ar siųsti pokalbio būsenas „rašo“ arba „sustapdyta“. Šiuo metu nepaveikia „atsitraukęs“ būsenos."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Ar siųsti pokalbio būsenas „rašo“ arba „sustapdyta“. Šiuo metu nepaveikia "
+"„atsitraukęs“ būsenos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
@@ -329,31 +369,42 @@ msgid "Spell checking languages"
 msgstr "Kalbos, kurių rašyba tikrinama"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Kableliu atskirtų kalbų, kurių rašyba tikrinama, sąrašas (pvz., „lt, en, fr“)."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Kableliu atskirtų kalbų, kurių rašyba tikrinama, sąrašas (pvz., „lt, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "Įjungti rašybos tikrinimą"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Ar tikrinti įvedamų žodžių rašybą pasirenkant jūsų pageidaujamas kalbas."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Ar tikrinti įvedamų žodžių rašybą pasirenkant jūsų pageidaujamas kalbas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "Slapyvardžio užbaigimo simbolis"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Po slapyvardžio pridėtinas simbolis, naudojant slapyvardžio užbaigimą (tab) grupės pokalbiuose."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Po slapyvardžio pridėtinas simbolis, naudojant slapyvardžio užbaigimą (tab) "
+"grupÄ—s pokalbiuose."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy turėtų naudoti kontakto pseudoportretą pokalbio lango piktogramai"
+msgstr ""
+"Empathy turėtų naudoti kontakto pseudoportretą pokalbio lango piktogramai"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid "Whether 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."
 msgstr "Ar naudoti kontakto pseudoportretÄ… kaip pokalbio lango piktogramÄ…."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:80
@@ -362,7 +413,9 @@ msgstr "PaskutinÄ— paskyra, pasirinkta prisijungimo prie kambario dialoge"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
-msgstr "PaskutinÄ—s paskyros, pasirinktos prijungti prie kambario, D-Bus objekto kelias."
+msgstr ""
+"PaskutinÄ—s paskyros, pasirinktos prijungti prie kambario, D-Bus objekto "
+"kelias."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
@@ -370,7 +423,9 @@ msgstr "Kameros įrenginys"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Numatytasis kameros įrenginys, naudojamas vaizdiniams skambu�iams, pvz., /dev/video0."
+msgstr ""
+"Numatytasis kameros įrenginys, naudojamas vaizdiniams skambu�iams, pvz., /"
+"dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
@@ -393,8 +448,12 @@ msgid "Show hint about closing the main window"
 msgstr "Perspėti apie pagrindinio lango užvėrimą"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ar rodyti pranešimo apie pagrindinio lango uždarymą dialogą su mygtuku „x“ antraštės juostoje."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Ar rodyti pranešimo apie pagrindinio lango uždarymą dialogą su mygtuku „x“ "
+"antraštės juostoje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
@@ -405,36 +464,14 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Ar Empathy gali rodyti naudotojo vietovÄ™ jo kontaktams."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy gali naudoti tinklÄ…, siekiant atspÄ—ti vietovÄ™"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ar Empathy gali naudoti tinklÄ… vietovÄ—s spÄ—jimui."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy naudoti mobiliojo ryšio tinklą, siekiant atspėti vietovę"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Ar Empathy gali naudoti mobiliojo ryšio tinklą vietovės spėjimui."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy gali naudoti GPS, siekiant atspÄ—ti vietovÄ™"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ar Empathy gali naudoti GPS vietovÄ—s spÄ—jimui."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy turėtų sumažinti vietovės tikslumą"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ar Empathy turėtų sumažinti vietovės rodymo tikslumą privatumo sumetimais."
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ar Empathy turėtų sumažinti vietovės rodymo tikslumą privatumo sumetimais."
 
 #: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
@@ -460,8 +497,7 @@ msgstr "Klaida bandant persiųsti failą"
 msgid "The other participant is unable to transfer the file"
 msgstr "Kitas dalyvis negali persiųsti failo"
 
-#: ../libempathy/empathy-ft-handler.c:751
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Nežinoma priežastis"
 
@@ -481,810 +517,189 @@ msgstr "Pasirinktas failas nÄ—ra normalus failas"
 msgid "The selected file is empty"
 msgstr "Pasirinktas failas yra tuš�ias"
 
-#: ../libempathy/empathy-keyring.c:85
-#: ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Slaptažodis nerastas"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Pranešimų paskyros %s slaptažodis (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Pokalbių kambario „%s“ slaptažodis paskyrai %s (%s)"
-
-#: ../libempathy/empathy-message.c:403
-#: ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Praleistas skambutis nuo %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Skambinta %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Skambino %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "prieš %d sekundę"
-msgstr[1] "prieš %d sekundes"
-msgstr[2] "prieš %d sekundžių"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "prieš %d minutę"
-msgstr[1] "prieš %d minutes"
-msgstr[2] "prieš %d minu�ių"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "prieš %d valandą"
-msgstr[1] "prieš %d valandas"
-msgstr[2] "prieš %d valandų"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "prieš %d dieną"
-msgstr[1] "prieš %d dienas"
-msgstr[2] "prieš %d dienų"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "prieš %d savaitę"
-msgstr[1] "prieš %d savaites"
-msgstr[2] "prieš %d savai�ių"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "prieš %d mėnesį"
-msgstr[1] "prieš %d mėnesius"
-msgstr[2] "prieš %d mėnesių"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "ateityje"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Esu"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Užsiėmęs (-usi)"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Pasitraukęs (-usi)"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Nematomas (-a)"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Atsijungęs (-usi)"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nenurodyta priežastis"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Būsena nustatyta į „atsijungta“"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Tinklo klaida"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Nepavyko nustatyti tapatybÄ—s"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Å ifravimo klaida"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Vardas jau naudojamas"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Nepateiktas liudijimas"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Liudijimas nepatikimas"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Nebegaliojantis liudijimas"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Liudijimas neaktyvuotas"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Neatitinka liudijimo kompiuterio vardas"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Neatitinka liudijimo kontrolinis kodas"
 
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Paties pasirašytas liudijimas"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Liudijimo klaida"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Å ifravimas neprieinamas"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Liudijimas netinkamas"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Ryšys atmestas"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Nepavyko užmegzti ryšio"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Ryšys nutrūko"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Å i paskyra jau prisijungta prie serverio"
 
-#: ../libempathy/empathy-utils.c:350
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:303
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
 msgstr "Ryšį pakeitė naujas ryšys, naudojantis tą patį išteklių"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Å i paskyra jau yra serveryje"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris šiuo metu per daug užimtas, kad galėtų apdoroti šį ryšį"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Liudijimas atšauktas"
 
-#: ../libempathy/empathy-utils.c:359
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "Liudijimas naudoja nesaugų šifravimo algoritmą arba yra kriptografiškai silpnas"
+#: ../libempathy/empathy-utils.c:312
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+"Liudijimas naudoja nesaugų šifravimo algoritmą arba yra kriptografiškai "
+"silpnas"
 
-#: ../libempathy/empathy-utils.c:362
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "Serverio liudijimo ilgis, arba serverio liudijimų sekos gylis, viršija kriptografijos bibliotekos numatytas ribas"
+#: ../libempathy/empathy-utils.c:315
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+"Serverio liudijimo ilgis, arba serverio liudijimų sekos gylis, viršija "
+"kriptografijos bibliotekos numatytas ribas"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Jūsų programinė įranga per sena"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "VidinÄ— klaida"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Žmonės netoliese"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-#: ../libempathy/empathy-utils.c:538
-#: ../src/empathy-roster-window.c:642
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook pokalbis"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Visos paskyros"
 
-#: ../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
-msgid "Pass_word"
-msgstr "S_laptažodis"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "_Rodomas vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Pavyzdys:</b> ManoRodomasVardas"
-
-#. 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 "Įsiminti slaptažodį"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Prievadas"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Serveris"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Papildomi"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Koks jūsų AIM rodomas vardas?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Koks jūsų AIM slaptažodis?"
-
-#: ../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:25
-msgid "Remember Password"
-msgstr "Įsiminti slaptažodį"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Paskyra"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Slaptažodis"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Serveris"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Prievadas"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Naudotojo vardas:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Pritaikyti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Prisijungti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Å i paskyra jau yra serveryje"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Sukurti naujÄ… paskyrÄ… serveryje"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%1$s serveryje %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:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s paskyra"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nauja paskyra"
-
-#: ../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 "Prisijungimo 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>Pavyzdys:</b> naudotojo vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Koks jūsų GroupWise naudotojo ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Koks jūsų GroupWise slaptažodis?"
-
-#: ../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>Pavyzdys:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "_Simbolių koduotė"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Koks jūsų ICQ UIN?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Koks jūsų ICQ slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Tinklas"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Simbolių koduotė"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Pridėti…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Pašalinti"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Aukštyn"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Žemyn"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Serveriai"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Daugumai IRC serverių nereikia slaptažodžio, todėl jei nesate tikras, neįveskite slaptažodžio."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Slapyvardis"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Išėjimo žinutė"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Tikrasis vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Naudotojo vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Koks IRC tinklas?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Koks jūsų IRC slapyvardis?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Koks jūsų „Facebook“ naudotojo vardas?"
-
-#. 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 ""
-"Tai jūsų naudotojo vardas, o ne jūsų „Facebook“ prisijungimo vardas.\n"
-"Jeigu jis yra facebook.com/<b>barsukas</b>, įveskite <b>barsukas</b>.\n"
-"Jeigu neturite „Facebook“ naudotojo vardo, pasirinkite pasinaudodami šiuo <a href=\"http://www.facebook.com/username/\">šiuo</a> puslapiu."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Koks jūsų „Facebook“ slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Koks jūsų „Google“ ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Pavyzdys:</b> naudotojas@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Koks jūsų „Google“ slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Pavyzdys:</b> naudotojas@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "_Nepaisyti SSL liudijimo klaidų"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Pir_menybÄ—"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "IÅ¡tekli_us"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Reikalingas Å¡ifravimas (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Nepaisyti serverio parametrų"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Naudoti senąjį SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Koks jūsų Jabber ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Koks jūsų pageidaujamas Jabber ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Koks jūsų Jabber slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Koks jūsų pageidaujamas Jabber slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Slapy_vardis"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_PavardÄ—"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "_Prisistatymo vardas"
-
-#: ../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 "E-_mail address"
-msgstr "El. pašto adresas"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Pavyzdys:</b> naudotojas@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Koks jūsų „Windows Live“ ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Koks jūsų „Windows Live“ slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Automatiška"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Registruoti"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Parinktys"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "NÄ—ra"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Naudotojo vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Pavyzdys:</b> naudotojas@mano.sip.serveris"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Naudoti šią paskyrą skambinti į _laidinius ir mobiliuosius telefonus"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "NAT perÄ—jimo parinktys"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Įgaliotojo serverio parinktys"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Įvairios parinktys"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN serveris"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Aptikti STUN serverį automatiškai"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Aptikti susiejimÄ…"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "„Keep-Alive“ parinktys"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mechanizmas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervalas (sekundÄ—mis)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "TapatybÄ—s nustatymo naudotojo vardas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Transportas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Laisvas maršruto parinkimas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Nepaisyti TLS klaidų"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Vietinis IP adresas"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Koks jūsų SIP prisijungimo ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Koks jūsų SIP paskyros slaptažodis?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "S_laptažodis:"
-
-#: ../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 "_Nepaisyti konferencijų ir pokalbių kambarių kvietimų"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "_Kambarių sąrašo lokalė:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_Simbolių koduotė:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Prievadas:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Koks jūsų „Yahoo!“ ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Koks jūsų „Yahoo!“ slaptažodis?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Nepavyko konvertuoti paveikslÄ—lio"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Jūsų sistemoje nepalaikomi jokie priimti paveikslėlių formatai"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Nepavyko įrašyti paveikslėlio į failą"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Pasirinkite savo pseudoportretÄ…"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Fotografuoti..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "PaveikslÄ—lio nÄ—ra"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "PaveikslÄ—liai"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Visi failai"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "NorÄ—dami padidinti, spustelÄ—kite"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Nepavyko nustatyti paskyros <b>%s</b> tapatybÄ—s"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Bandyti dar kartÄ…"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1294,226 +709,235 @@ msgstr ""
 "Įveskite savo paskyros slaptažodį\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Pasirinkti..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "Pa_sirinkti"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Įsiminti slaptažodį"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Kilo klaida pradedant skambutį"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Nurodytas kontaktas nepalaiko skambu�ių"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Nurodytas kontaktas yra atsijungęs"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Nurodytas kontaktas yra neteisingas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Kritiniai skambu�iai šiuo protokolu nepalaikomi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Nepakanka kreditų pradėti šiam pokalbiui"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Nepavyko atverti privataus pokalbio"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Å iame pokalbyje tema yra nepalaikoma"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Jums neleidžiama pakeisti temos"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Netinkamas kontakto ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ištrinti visus dabartinio pokalbio pranešimus"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: nustatyti dabartinio pokalbio temÄ…"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <pokalbių kambario ID>: prisijungti prie naujo pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <pokalbių kambario ID>: prisijungti prie naujo pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
-msgstr "/part [<pokalbių kambario ID>] [<priežastis>]: išeiti iš pokalbių kambario; dabartinio, jei nenurodyta kitaip"
+#: ../libempathy-gtk/empathy-chat.c:1073
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr ""
+"/part [<pokalbių kambario ID>] [<priežastis>]: išeiti iš pokalbių kambario; "
+"dabartinio, jei nenurodyta kitaip"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakto ID> [<žinutė>]: atverti privatų pokalbį"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakto ID> <žinutė>: atverti privatų pokalbį"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <slapyvardis>: keisti savo slapyvardį dabartiniame serveryje"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <žinutė>: siųsti dabartiniam pokalbiui žinutę ACTION"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
-msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
-msgstr "/say <žinutė>: siųsti dabartiniam pokalbiui <žinutę>. Tai naudojama norint siųsti žinutę, prasidedan�ia simboliu „/“. Pavyzdžiui: „/say /join naudojama norint prisijungti prie naujo pokalbių kambario“"
+#: ../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 <žinutė>: siųsti dabartiniam pokalbiui <žinutę>. Tai naudojama norint "
+"siųsti žinutę, prasidedan�ia simboliu „/“. Pavyzdžiui: „/say /join naudojama "
+"norint prisijungti prie naujo pokalbių kambario“"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakto ID>: parodo informacijÄ… apie kontaktÄ…"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
-msgstr "/help [<komanda>]: rodyti visas palaikomas komandas. Jei <komanda> apibrėžta, rodyti, kaip ją naudoti."
+#: ../libempathy-gtk/empathy-chat.c:1097
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<komanda>]: rodyti visas palaikomas komandas. Jei <komanda> "
+"apibrėžta, rodyti, kaip ją naudoti."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Naudojimas: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Nežinoma komanda"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
-msgstr "Nežinoma komanda. Galimas komandas galite pamatyti įvykdę komandą /help"
+msgstr ""
+"Nežinoma komanda. Galimas komandas galite pamatyti įvykdę komandą /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "nepakankamas balansas žinutės siuntimui"
 
-#: ../libempathy-gtk/empathy-chat.c:1542
-#: ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Klaida siun�iant žinutę „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544
-#: ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Klaida siun�iant žinutę: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "nepakankamas balansas žinutės siuntimui. <a href='%s'>Pakelti</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "nepalaiko"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "atsijungęs"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "netinkamas kontaktas"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "prieiga uždrausta"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "per ilga žinutė"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "Å¡i funkcija dar nerealizuota"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "nežinoma"
 
-#: ../libempathy-gtk/empathy-chat.c:1680
-#: ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema nustatyta į: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Tema %s nustatyta į: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Nenurodyta jokia tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Nėra pasiūlymų)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Įtraukti „%s“ į žodyną"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Įtraukti „%s“ į %s žodyną"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Įterpti šypsenėlę"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Siųsti"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Rašybos pasiūlymai"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Nepavyko gauti naujausių žurnalų"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s atsijungÄ—"
@@ -1521,12 +945,12 @@ msgstr "%s atsijungÄ—"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s išspyrė naudotoją %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s buvo išspirtas"
@@ -1534,17 +958,17 @@ msgstr "%s buvo išspirtas"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s užblokavo naudotoją %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s buvo užblokuotas"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s paliko pokalbių kambarį"
@@ -1554,17 +978,17 @@ msgstr "%s paliko pokalbių kambarį"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s prisijungė prie pokalbių kambario"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s dabar žinomas (-a) kaip %s"
@@ -1572,54 +996,50 @@ msgstr "%s dabar žinomas (-a) kaip %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:2989
-#: ../src/empathy-call-window.c:1532
-#: ../src/empathy-call-window.c:1582
-#: ../src/empathy-call-window.c:2655
-#: ../src/empathy-call-window.c:2961
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Atsijungęs (-usi)"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Ar norėtumėte įrašyti šį slaptažodį?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Įrašyti"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Ne dabar"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Neteisingas slaptažodis, bandykite dar kartą:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Šis kambarys yra apsaugotas slaptažodžiu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Prisijungti"
 
-#: ../libempathy-gtk/empathy-chat.c:4077
-#: ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Prisijungęs (-usi)"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Pokalbis"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1650,8 +1070,8 @@ msgstr "Taisyti blokuotus kontaktus"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1661,120 +1081,63 @@ msgstr "Paskyra:"
 msgid "Blocked Contacts"
 msgstr "Užblokuoti kontaktai"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Pilnas vardas"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefono numeris"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "El. pašto adresas"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Tinklalapis"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Gimtadienis"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Paskutiniai:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Serveris:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Susisiekta iš:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Išėjimo žinutė:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "darbo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "namų"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobilusis"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "balso"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "pageidaujamas"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "pašto"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "siuntinys"
+#: ../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 "Pašalinti"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Ieškoti kontaktų"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Ieškoti:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_PridÄ—ti kontaktÄ…"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nerasta jokių kontaktų"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Su šia paskyra kontaktų paieška nepalaikoma"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Jūsų pranešimas, apibūdinantis jus:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Leiskite man matyti, kai jūs esate prisijungęs. A�iū!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "IÅ¡saugoti pseudoportretÄ…"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Nepavyko išsaugoti pseudoportreto"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Paskyra"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifikatorius"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alternatyvusis vardas"
 
@@ -1808,348 +1171,362 @@ msgstr "Versija"
 msgid "Client"
 msgstr "Klientas"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "GrupÄ—s"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
-msgstr "Pasirinkite grupes, į kurias norite įtraukti šį kontaktą. Galite pasirinkti daugiau nei vieną grupę arba nepasirinkti nei vienos grupės."
+#: ../libempathy-gtk/empathy-groups-widget.c:330
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Pasirinkite grupes, į kurias norite įtraukti šį kontaktą. Galite pasirinkti "
+"daugiau nei vienÄ… grupÄ™ arba nepasirinkti nei vienos grupÄ—s."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_PridÄ—ti grupÄ™"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Pasirinkti"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "GrupÄ—"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Naujas kontaktas"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Užblokuoti %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Ar tikrai norite „%s“ nebeleisti jūsų matyti?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Ši tapatybė bus užblokuota:"
 msgstr[1] "Šios tapatybės bus užblokuotos:"
 msgstr[2] "Šios tapatybės bus užblokuotos:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Šios tapatybės nepavyko užblokuoti:"
 msgstr[1] "Šių tapatybių nepavyko užblokuoti:"
 msgstr[2] "Šių tapatybių nepavyko užblokuoti:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokuoti"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Pranešti apie šio kontakto piktnaudžiavimą"
 msgstr[1] "_Pranešti apie šių kontaktų piktnaudžiavimą"
 msgstr[2] "_Pranešti apie šių kontaktų piktnaudžiavimą"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Taisyti kontakto informacijÄ…"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Susieti kontaktai"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts neįdiegta"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Įdiekite gnome-contacts prieigai prie kontaktų duomenų."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Pasirinkite naudotiną paskyrą skambu�io vykdymui"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Skambutis"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobilusis"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Darbas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "NAMAI"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blokuoti kontaktÄ…"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Pašalinti iš _grupės „%s“"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "IÅ¡trinti ir _blokuoti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ar tikrai norite pašalinti kontaktą „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, 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 "Ar tikrai norite pašalinti susietąjį kontaktą „%s“? Atminkite, jog bus pašalinti visi kontaktai, sudarantys šį susietąjį kontaktą."
+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 ""
+"Ar tikrai norite pašalinti susietąjį kontaktą „%s“? Atminkite, jog bus "
+"pašalinti visi kontaktai, sudarantys šį susietąjį kontaktą."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Å alinamas kontaktas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Pašalinti"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Pokalbis"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Garsinis skambutis"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Vaizdinis skambutis"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Ankstesni pokalbiai"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Siųsti failą"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Dalintis mano darbastaliu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "MÄ—giamas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_macija"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Taisyti"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Jus kvie�ia į šį kambarį"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Pakviesti į pokalbių kambarį"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Pridėti kontaktą…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ar tikrai norite pašalinti grupę „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Å alinama grupÄ—"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Per_vadinti"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanalai:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Å alies ISO kodas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Å alis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "BÅ«sena:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Miestas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Sritis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Pašto kodas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "GatvÄ—:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Pastatas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Aukštas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Tekstas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Aprašymas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Tikslumo lygis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Paklaida:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Vertikali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Horizontali paklaida (metrais):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Azimutas:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Kilimo greitis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Paskutinį kartą atnaujinta:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Ilguma:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Platuma:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Aukštuma:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "VietovÄ—"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y m. %B %e d., %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alternatyvusis vardas:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifikatorius:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2165,85 +1542,70 @@ msgstr "<b>VietovÄ—</b> (data)"
 msgid "Online from a phone or mobile device"
 msgstr "Prisijungta naudojant telefoną ar kitą mobiliojo ryšio įrenginį"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Naujas tinklas"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr "Pasirinkite IRC tinklÄ…"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr "Atstatyti _tinklų sąrašą"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Pasirinkti"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "naujas serveris"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
-msgstr "Empathy gali automatiškai atrasti žmones, esan�ius tame pa�iame tinkle kaip ir jūs, ir leisti su jais kalbėtis. Jeigu norite pasinaudoti šia funkcija, pažiūrėkite, ar žemiau esantys duomenys yra teisingi."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
+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 gali automatiškai atrasti žmones, esan�ius tame pa�iame tinkle kaip "
+"ir jūs, ir leisti su jais kalbėtis. Jeigu norite pasinaudoti šia funkcija, "
+"pažiūrėkite, ar žemiau esantys duomenys yra teisingi."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Žmonės netoliese"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr "Jūs galite pakeisti šiuos duomenis vėliau arba išjungti šią savybę pasirinkite <span style=\"italic\">Taisyti → Paskyros</span> kontaktų sąraše."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
+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 galite pakeisti šiuos duomenis vėliau arba išjungti šią savybę "
+"pasirinkite <span style=\"italic\">Taisyti → Paskyros</span> kontaktų sąraše."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Retrospektyva"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Rodyti"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "KalbÄ—ti kanale %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "KalbÄ—ti su %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %Y m. %B %e d., %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, 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:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2251,7 +1613,7 @@ msgstr[0] "%s sekundÄ—"
 msgstr[1] "%s sekundÄ—s"
 msgstr[2] "%s sekundžių"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2259,80 +1621,80 @@ msgstr[0] "%s minutÄ—"
 msgstr[1] "%s minutÄ—s"
 msgstr[2] "%s minu�ių"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Pokalbis truko %s, baigÄ—si %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Å iandien"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Vakar"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%Y m. %B %e d."
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Bet kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Bet kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Bet kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Tekstiniai pokalbiai"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Įeinantys skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Išeinantys skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Praleisti skambu�iai"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ar tikrai norite ištrinti visų ankstesnių pokalbių žurnalus?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "IÅ¡valyti visus"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Trinti nuo:"
 
@@ -2341,22 +1703,21 @@ msgid "_File"
 msgstr "_Failas"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Taisyti"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "IÅ¡trinti visÄ… retrospektyvÄ…..."
+#| msgid "Delete All History..."
+msgid "Delete All History…"
+msgstr "Ištrinti visą retrospektyvą…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profilis"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Pokalbis"
 
@@ -2370,139 +1731,136 @@ msgid "page 2"
 msgstr "2 puslapis"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Įkeliama...</span>"
+#| msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Įkeliama…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Kokio tipo pokalbių paskyrą turite?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Pridedama nauja paskyra"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "PridÄ—ti naujÄ… paskyrÄ…"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Įveskite kontakto atpažinimo žymą arba telefono numerį:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Vaizdinis skambutis"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Garsinis skambutis"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Naujas skambutis"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Nurodytas kontaktas yra atsijungęs"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Nurodytas kontaktas yra neteisingas arba nežinomas"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Å iame pokalbyje tokia tema yra nepalaikoma"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Šiam protokolui reikalaujamas funkcionalumas dar neįdiegtas"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Su pasirinktu kontaktu užmegzti pokalbio nepavyko"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Jūs šiame kanale užblokuotas"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Å is kanalas pilnas"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Jūs turite būti pakviestas, jei norite prisijungti prie šio kanalo"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Negalima tęsti, kol atsijungta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Prieiga uždrausta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Kilo klaida pradedant skambutį"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Naujas pokalbis"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Reikalingas slaptažodis"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Pasirinktinė žinutė…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Taisyti pasirinktinę žinutę…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Spustelėkite, jei norite pašalinti šią būseną iš mėgiamų"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Spustelėkite, jei norite padaryti šią būsena mėgiama"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
 "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
 msgstr ""
 "<b>Dabartinė žinutė: %s</b>\n"
-"<small><i>Norėdami nustatyti naują žinutę, spauskite „Enter“, norėdami atšaukti – „Esc“.</i></small>"
+"<small><i>Norėdami nustatyti naują žinutę, spauskite „Enter“, norėdami "
+"atšaukti – „Esc“.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Nustatyti būseną"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Pasirinktinės žinutės…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nauja %s paskyra"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "Skirti raidžių _registrą"
 
@@ -2526,496 +1884,365 @@ msgstr "Skirti raidžių _registrą"
 msgid "Phrase not found"
 msgstr "FrazÄ— nerasta"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Gauta žinutė"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Išsiųsta žinutė"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Gautas kvietimas pokalbiui"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontaktas prisijungęs"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Konataktas atsijungęs"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "PrisijungÄ—te prie serverio"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "AtsijungÄ—te nuo serverio"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Gaunamas garsinis skambutis"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Atliekamas garsinis skambutis"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Baigtas garsinis skambutis"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Taisykite pasirinktinę žinutę"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Prenumeratos prašymas"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s pageidauja leidimo matyti, kada esate prisijungÄ™"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Atmesti"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Priimti"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1101
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Žinutė redaguota %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1801
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normalus"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Nepavyko patikrinti pokalbių serverio nurodytos tapatybės."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Liudijimo nepasirašiusi jokia liudijimo įstaiga."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Liudijimas nebegalioja."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Liudijimas dar neaktyvuotas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Liudijime nÄ—ra laukto kontrolinio kodo."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu."
+msgstr ""
+"Liudijimo patvirtinamas kompiuterio vardas nesutampa su serverio vardu."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Savo pa�ių pasirašytas liudijimas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "Liudijimą atšaukė liudijimus išduodanti įstaiga."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Liudijimas yra kriptografiškai silpnas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Liudijimo ilgis viršija patikrinamas ribas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Liudijimas yra netinkamai suformuotas."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Laukta kompiuterio vardo: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Liudijimo kompiuterio vardas: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Tęsti"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nepatikimas ryšys"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Šis ryšys nepatikimas. Ar vis tiek pageidaujate tęsti?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Atsiminti šį pasirinkimą ateityje"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Liudijimo informacija"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Nepavyko atverti URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Pasirinkite failÄ…"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Nepakanka laisvos vietos failui įrašyti"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
-msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
-msgstr "Šiam failui įrašyti reikia %s laisvos vietos, ta�iau prieinama tik %s. Pasirinkite kitą vietą."
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"Šiam failui įrašyti reikia %s laisvos vietos, ta�iau prieinama tik %s. "
+"Pasirinkite kitÄ… vietÄ…."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Failas jums nuo %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Prisijunkite prie interneto asmeniniams duomenims taisyti."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Asmeniniai duomenys</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Kopijuoti nuorodos adresÄ…"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Atverti nuorodÄ…"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "NagrinÄ—ti HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "DabartinÄ— lokalÄ—"
-
-#: ../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 "Arabų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armėnų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Keltų"
-
-#: ../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 "CentrinÄ—s Europos"
-
-#: ../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 "Kinų supaprastinta"
-
-#: ../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 "Kinų tradicinė"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Kroatų"
-
-#: ../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 "Kirilica"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Kirilica/rusų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Kirilica/ukrainie�ių"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Gruzinų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Graikų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Gudžaratų"
-
-#: ../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 "Hebrajų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hebrajų vizualioji"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japonų"
-
-#: ../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 "Korėjie�ių"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Å iaurÄ—s Europos"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumunų"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Pietų Europos"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Tajų"
-
-#: ../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 "Turkų"
-
-#: ../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 "Unikodas"
-
-#: ../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 "Vakarietiškoji"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamie�ių"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Populiariausi kontaktai"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Žmonės netoliese"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Negrupuoti"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:219
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Serveris negali rasti kontakto: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Nėra klaidų pranešimų"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Tikralaikė žinutė (Empathy)"
 
+#: ../src/empathy-about-dialog.c:77
+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“ yra laisvoji programinė įranga. Galite ją platinti ir / arba "
+"modifikuoti pagal GNU Bendrosios viešosios licencijos sąlygas, paskelbtas "
+"Laisvosios programinės įrangos fondo; 2-osios arba (savo nuožiūra) bet "
+"kurios vÄ—lesnÄ—s licencijos versijos sÄ…lygas."
+
 #: ../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“ yra laisvoji programinė įranga. Galite ją platinti ir / arba modifikuoti pagal GNU Bendrosios viešosios licencijos sąlygas, paskelbtas Laisvosios programinės įrangos fondo; 2-osios arba (savo nuožiūra) bet kurios vėlesnės licencijos versijos sąlygas."
+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“ yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ "
+"GARANTIJŲ, netgi be numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI "
+"garantijų. Išsamesnės informacijos ieškokite GNU Bendrojoje viešojoje "
+"licencijoje."
 
 #: ../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“ yra platinama tikintis, kad ji bus naudinga, bet BE JOKIŲ GARANTIJŲ, netgi be numanomų PARDAVIMO arba TINKAMUMO TAM TIKRAM TIKSLUI garantijų. Išsamesnės informacijos ieškokite GNU Bendrojoje viešojoje licencijoje."
-
-#: ../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 "Jūs turėjote gauti GNU Bendrosios viešosios licencijos kopiją kartu su „Empathy“ programa. Jei negavote, rašykite adresu: Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 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 ""
+"Jūs turėjote gauti GNU Bendrosios viešosios licencijos kopiją kartu su "
+"„Empathy“ programa. Jei negavote, rašykite adresu: Free Software Foundation, "
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Tikralaikių pokalbių klientas, skirtas GNOME aplinkai"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Žygimantas Beru�ka\n"
 "Justina KlingaitÄ—\n"
 "Saulius Å opaga"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Nerodyti jokių dialogų, atlikti pageidaujamas užduotis (pvz., importuoti) ir baigti darbą"
+msgstr ""
+"Nerodyti jokių dialogų, atlikti pageidaujamas užduotis (pvz., importuoti) ir "
+"baigti darbÄ…"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Nerodyti jokių dialogų, nebent yra tik „Žmonės netoliese“ tipo paskyros"
+#: ../src/empathy-accounts.c:175
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Nerodyti jokių dialogų, nebent yra tik „Žmonės netoliese“ tipo paskyros"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Iš pradžių pasirinkti duotąją paskyrą (pvz., gabble/jabber/foo_40pavyzdys_2eorg0)"
+msgstr ""
+"Iš pradžių pasirinkti duotąją paskyrą (pvz., gabble/jabber/"
+"foo_40pavyzdys_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<paskyros-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "– Empathy paskyros"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy paskyros"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Jūsų %s paskyroje yra neįrašytų pakeitimų."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Jūsų %.50s paskyroje yra neįrašytų pakeitimų."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Jūsų naujoji paskyra dar neįrašyta."
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-call-window.c:1274
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Jungiamasi…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Neprisijungta – %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Atsijungta – %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Neprisijungta – Nėra tinklo ryšio"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Nežinoma būsena"
 
-#: ../src/empathy-accounts-dialog.c:492
-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 "Ši paskyra buvo išjungta, nes ji naudoja seną, nepalaikomą realizaciją. Įdiekite telepathy-haze ir iš naujo paleiskite savo seansą paskyros migravimui."
+#: ../src/empathy-accounts-dialog.c:473
+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 ""
+"Ši paskyra buvo išjungta, nes ji naudoja seną, nepalaikomą realizaciją. "
+"Įdiekite telepathy-haze ir iš naujo paleiskite savo seansą paskyros "
+"migravimui."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Neprisijungta – Paskyra išjungta"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Taisyti ryšio parametrus"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Taisyti ryšio parametrus..."
+#: ../src/empathy-accounts-dialog.c:716
+#| msgid "Edit Connection Parameters"
+msgid "_Edit Connection Parameters…"
+msgstr "_Taisyti ryšio parametrus…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Ar tikrai norite pašalinti %s iš savo kompiuterio?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Ar tikrai norite pašalinti %.50s iš savo kompiuterio?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Jūsų paskyros serveryje nebus pašalintos."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3024,24 +2251,24 @@ msgstr ""
 "Ar tikrai norite tęsti?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "Įj_ungta"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "P_raleisti"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Prisijungti"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3050,10 +2277,14 @@ msgstr ""
 "Ar tikrai norite tęsti?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Pokalbių ir VoIP paskyros"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Pridėti…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importuoti…"
@@ -3063,50 +2294,55 @@ msgid "Loading account information"
 msgstr "Įkeliama paskyros informacija"
 
 #: ../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 "Norint sukurti naują paskyrą, pirma reikia įdiegti kiekvieno pageidaujamo naudoti protokolo posistemę."
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"Norint sukurti naują paskyrą, pirma reikia įdiegti kiekvieno pageidaujamo "
+"naudoti protokolo posistemÄ™."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
 msgstr "Neįdiegta jokių protokolų realizacijų"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " – Empathy tapatybės nustatymo klientas"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy tapatybÄ—s nustatymo klientas"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Paleidimo metu neprisijungti"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Paleidus nerodyti kontaktų sąrašo ar kitų dialogų"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "– Tikralaikių pokalbių klientas Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Klaida susisiekiant su paskyrų tvarkykle"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
 "\n"
 "%s"
 msgstr ""
-"Įvyko klaida bandant susisiekti su Telepathy paskyrų tvarkykle. Klaida buvo:\n"
+"Įvyko klaida bandant susisiekti su Telepathy paskyrų tvarkykle. Klaida "
+"buvo:\n"
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
-#| msgid "Incoming call"
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Pokalbyje"
 
@@ -3118,162 +2354,172 @@ msgstr "– Empathy garso/vaizdo transliavimo klientas"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy garso/vaizdo transliavimo klientas"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ką tik jums skambino, bet tuo metu kalbėjote su kažkuo kitu."
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1131
-#: ../src/empathy-call-window.c:1147
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1549
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Skambutis jums"
 
-#: ../src/empathy-call-window.c:1555
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Gaunamas vaizdinis skambutis iš %s"
 
-#: ../src/empathy-call-window.c:1555
-#: ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Skambutis jums nuo %s"
 
-#: ../src/empathy-call-window.c:1559
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Atmesti"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Atsiliepti"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Skambinti su %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Kompiuterio matomas IP adresas"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Interneto serverio matomas IP adresas"
 
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Kitos pusÄ—s matomas lygiarangio IP adresas"
 
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Perdavimo serverio IP adresas"
 
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Daugiaadresio perdavimo grupÄ—s IP adresas"
 
-#: ../src/empathy-call-window.c:2598
-#: ../src/empathy-call-window.c:2599
-#: ../src/empathy-call-window.c:2600
-#: ../src/empathy-call-window.c:2601
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Laukia"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Nutildyti"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "TrukmÄ—"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "TechninÄ— informacija"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3102
 #, c-format
-msgid "%s's software does not understand any of the audio formats supported by your computer"
-msgstr "Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų formatų"
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
+"formatų"
 
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3107
 #, c-format
-msgid "%s's software does not understand any of the video formats supported by your computer"
-msgstr "Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų vaizdo įrašų formatų"
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"Kontakto %s programinė įranga nepalaiko jokių jūsų kompiuterio palaikomų "
+"vaizdo įrašų formatų"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3113
 #, 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 "Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, nepriiman�iame tiesioginių prisijungimų."
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Nepavyko užmegzti ryšio su %s. Gali būti, kad vienas iš jūsų yra tinkle, "
+"nepriiman�iame tiesioginių prisijungimų."
 
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Tinkle yra triktis"
 
-#: ../src/empathy-call-window.c:3124
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "Jūsų kompiuteryje neįdiegti garso įrašų formatai, reikalingi šiam skambu�iui"
+#: ../src/empathy-call-window.c:3123
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"Jūsų kompiuteryje neįdiegti garso įrašų formatai, reikalingi šiam skambu�iui"
 
-#: ../src/empathy-call-window.c:3127
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "Jūsų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi šiam skambu�iui"
+#: ../src/empathy-call-window.c:3126
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"Jūsų kompiuteryje neįdiegti vaizdo įrašų formatai, reikalingi šiam skambu�iui"
 
-#: ../src/empathy-call-window.c:3139
+#: ../src/empathy-call-window.c:3138
 #, 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 komponente atsitiko kažkas nenumatyta. <a href=\"%s\">Praneškite apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba „Derinimo“ lange."
+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 komponente atsitiko kažkas nenumatyta. <a href=\"%s\">Praneškite "
+"apie šią klaidą</a> ir pridėkite žurnalus, kuriuos surinkote meniu Pagalba "
+"„Derinimo“ lange."
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Skambinimo posistemÄ—je yra triktis"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Pasiekta srauto pabaiga"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Nepavyko sukurti garso srauto"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Nepavyko sukurti vaizdo srauto"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Jūsų balansas yra %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Deja, jūs neturite pakankamai kreditų, kad galėtumėte paskambinti."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Pakelti"
 
@@ -3297,13 +2543,11 @@ msgstr "_Nustatymai"
 msgid "_View"
 msgstr "_Rodymas"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Žinynas"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Turinys"
 
@@ -3387,24 +2631,23 @@ msgstr "Nuotolinis kandidatas:"
 msgid "Local Candidate:"
 msgstr "Vietos kandidatas:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "Garsas"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "– Tikralaikių pokalbių klientas Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Vardas"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Kambarys"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Automatiškai prisijungti"
 
@@ -3412,42 +2655,59 @@ msgstr "Automatiškai prisijungti"
 msgid "Manage Favorite Rooms"
 msgstr "Tvarkyti mÄ—giamus kambarius"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Užverti šį langą?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
-msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
-msgstr "Užvėrę šį langą, išeisite iš %s. Nebegausite jokių pranešimų, kol vėl prie jo neprisijungsite."
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Užvėrę šį langą, išeisite iš %s. Nebegausite jokių pranešimų, kol vėl prie "
+"jo neprisijungsite."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, 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žvėrę šį langą, išeisite iš %u pokalbių kambario. Nebegausite jokių pranešimų, kol vėl prie jo neprisijungsite."
-msgstr[1] "Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių pranešimų, kol vėl prie jų neprisijungsite."
-msgstr[2] "Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių pranešimų, kol vėl prie jų neprisijungsite."
-
-#: ../src/empathy-chat-window.c:317
+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žvėrę šį langą, išeisite iš %u pokalbių kambario. Nebegausite jokių "
+"pranešimų, kol vėl prie jo neprisijungsite."
+msgstr[1] ""
+"Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių "
+"pranešimų, kol vėl prie jų neprisijungsite."
+msgstr[2] ""
+"Užvėrę šį langą, išeisite iš %u pokalbių kambarių. Nebegausite jokių "
+"pranešimų, kol vėl prie jų neprisijungsite."
+
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Išeiti iš %s?"
 
-#: ../src/empathy-chat-window.c:319
-msgid "You will not receive any further messages from this chat room until you rejoin it."
-msgstr "Negausite jokių tolesnių pranešimų iš šio pokalbių kambario, kol vėl prie jo neprisijungsite."
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Negausite jokių tolesnių pranešimų iš šio pokalbių kambario, kol vėl prie jo "
+"neprisijungsite."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Užverti langą"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Išeiti iš kambario"
 
-#: ../src/empathy-chat-window.c:677
-#: ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3455,7 +2715,7 @@ msgstr[0] "%s (%d neskaitytas)"
 msgstr[1] "%s (%d neskaityti)"
 msgstr[2] "%s (%d neskaitytų)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3463,7 +2723,7 @@ msgstr[0] "%s (ir %u kitas)"
 msgstr[1] "%s (ir %u kiti)"
 msgstr[2] "%s (ir %u kitų)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3471,7 +2731,7 @@ msgstr[0] "%s (%d neskaitytas iš kitų)"
 msgstr[1] "%s (%d neskaityti iš kitų)"
 msgstr[2] "%s (%d neskaitytų iš kitų)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3479,11 +2739,11 @@ msgstr[0] "%s (%d neskaitytas iš visų)"
 msgstr[1] "%s (%d neskaityti iš visų)"
 msgstr[2] "%s (%d neskaityta iš visų)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3491,7 +2751,7 @@ msgstr[0] "Siun�iama %d žinutė"
 msgstr[1] "Siun�iamos %d žinutės"
 msgstr[2] "Siun�iama %d žinu�ių"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Rašoma žinutė."
 
@@ -3515,8 +2775,7 @@ msgstr "_Mėgstamiausias pokalbių kambarys"
 msgid "Notify for All Messages"
 msgstr "Įspėti apie visus pranešimus"
 
-#: ../src/empathy-chat-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
 msgstr "_Rodyti kontaktų sąrašą"
 
@@ -3525,200 +2784,216 @@ msgid "Invite _Participant…"
 msgstr "Pakviesti _dalyvį…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Prisijungti prie pokalbio"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Palikti pokalbį"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "A_dresatas"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_KortelÄ—s"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_AnkstesnÄ— kortelÄ—"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Kita kortelÄ—"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Atšaukti kortelės užvėrimą"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Perkelti kortelÄ™ _kairÄ—n"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Perkelti kortelę _dešinėn"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Atkabinti kortelÄ™"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Rodyti tam tikrÄ… tarnybÄ…"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "– Empathy derintuvė"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy derintuvÄ—"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Įrašyti"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "„Pastebin“ saitas"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "„Pastebin“ atsakas"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "Per daug duomenų įkelti vienu kartu. Įrašykite žurnalus į failą."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Derinimo langas"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Siūsti į „pastebin“"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "PauzÄ—"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Lygis "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Derinimas"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informacija"
 
-#: ../src/empathy-debug-window.c:2002
-#: ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Pranešimas"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "PerspÄ—jimas"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "KritinÄ—"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Klaida"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
-"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
-"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
 msgstr ""
-"Net jei nerodo slaptažodžių, žurnalai turi jautrios informacijos, tokios kaip jūsų kontaktų ar neseniai siųstų bei gautų žinu�ių sąrašai.\n"
-"Jei nenorite tokios informacijos matyti viešumoje pranešime apie klaidą, galite apriboti pranešomos klaidos matomumą tik Empathy kūrėjams parodydami sudėtingesnius laukus <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">pranešime apie klaidą</a>."
-
-#: ../src/empathy-debug-window.c:2062
+"Net jei nerodo slaptažodžių, žurnalai turi jautrios informacijos, tokios "
+"kaip jūsų kontaktų ar neseniai siųstų bei gautų žinu�ių sąrašai.\n"
+"Jei nenorite tokios informacijos matyti viešumoje pranešime apie klaidą, "
+"galite apriboti pranešomos klaidos matomumą tik Empathy kūrėjams parodydami "
+"sudÄ—tingesnius laukus <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy\">pranešime apie klaidą</a>."
+
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Laikas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Sritis"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Lygis"
 
-#: ../src/empathy-debug-window.c:2100
-msgid "The selected connection manager does not support the remote debugging extension."
+#: ../src/empathy-debug-window.c:2091
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 msgstr "Pasirinktoji ryšių valdyklė nepalaiko nuotolinio derinimo plėtinio."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Gaunamas vaizdinis skambutis"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s jums skambina su vaizdiniu ryšiu, ar atsiliepsite?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s jums skambina, ar atsiliepsite?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "A_tmesti"
 
-#: ../src/empathy-event-manager.c:549
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Atsiliepti"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Atsakyti vaizdo įrašu"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Kvietimas į pokalbių kambarį"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kvietimas prisijungti prie %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kvie�ia jus prisijungti prie %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Prisijungti"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s pakvietÄ— jus prisijungti %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Jūs kvie�iami prisijungti prie %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Failo atsiuntimas iš %s"
 
-#: ../src/empathy-event-manager.c:973
-#: ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Reikalingas slaptažodis"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3728,108 +3003,105 @@ msgstr ""
 "Žinutė: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s iš %s %s/s sparta"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s iš %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Priimama „%s“ iš %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Siun�iama „%s“ kontaktui %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Klaida priimant „%s“ iš %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Klaida priimant failÄ…"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Klaida siun�iant „%s“ kontaktui %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Klaida siun�iant failą"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ gautas iš %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ išsiųstas gavėjui %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Atsiųsta"
 
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Laukiama kito dalyvio atsakymo"
 
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tikrinamas „%s“ vientisumas"
 
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Kuriama „%s“ maiša"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Failas"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Liko"
 
@@ -3841,57 +3113,61 @@ msgstr "Failų siuntimai"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Pašalinti baigtus, atšauktus ir nepavykusius failų siuntimus iš sąrašo"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importuoti"
 
-#: ../src/empathy-import-dialog.c:88
-msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
-msgstr "Nerasta importuotinų paskyrų. Kol kas Empathy gali importuoti paskyras tik iš Pidgin programos."
+#: ../src/empathy-import-dialog.c:82
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"Nerasta importuotinų paskyrų. Kol kas Empathy gali importuoti paskyras tik "
+"iš Pidgin programos."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importuoti paskyras"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importuoti"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Å altinis"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Pakviesti dalyvį"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Pasirinkite į pokalbį pakviestiną kontaktą:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Pakviesti"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Pokalbių kambarys"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Nariai"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Nepavyko gauti kambarių sąrašo"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3904,35 +3180,46 @@ msgstr ""
 "Reikia slaptažodžio: %s\n"
 "Nariai: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Taip"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Prisijungti prie kambario"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Įveskite kambario, į kurį norite įeiti, pavadinimą arba spustelėkite vieną ar daugiau kambarių sąraše."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Įveskite kambario, į kurį norite įeiti, pavadinimą arba spustelėkite vieną "
+"ar daugiau kambarių sąraše."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "_Kambarys:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
-msgstr "Nurodykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"Nurodykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite "
+"nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
 
 #: ../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 "Įrašykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Įrašykite serverio vardą, kuriame yra pokalbių kambarys, arba neįrašykite "
+"nieko, jei pokalbių kambarys yra dabartinės paskyros serveryje."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "_Server:"
@@ -3946,104 +3233,104 @@ msgstr "Nepavyko įkelti kambarių sąrašo"
 msgid "Room List"
 msgstr "Kambarių sąrašas"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Atsakyti"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Atsakyti vaizdu"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Atsisakyti"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Priimti"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Teikia"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Gauta žinutė"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Žinutė išsiųsta"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Naujas pokalbis"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontaktas prisijungÄ—"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontaktas atsijungÄ—"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Paskyra prijungta"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Paskyra atjungta"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Kalba"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Džiuljeta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, todÄ—l esi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Atsisakyk savo tÄ—vo ir atsisakyk savo vardo;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "O jei ne, pasilik, bet prisiek man meilÄ™"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "Ir aš nebebūsių Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Ar turiu išgirsti daugiau, ar turiu kalbėti apie tai?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Džiuljeta  atsijungė"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Nustatymai"
 
@@ -4055,8 +3342,7 @@ msgstr "Rodyti grupes"
 msgid "Show account balances"
 msgstr "Rodyti paskyrų sąskaitas"
 
-#: ../src/empathy-preferences.ui.h:4
-#: ../src/empathy-roster-window.c:2202
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Kontaktų sąrašas"
 
@@ -4145,16 +3431,29 @@ msgid "Use _echo cancellation to improve call quality"
 msgstr "Naudoti _aido šalinimą, skambu�io kokybei pagerinti"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Aido panaikinimas padeda padaryti jūsų balsą aiškesnį kitam asmeniui, bet gali sukelti problemų kai kuriuose kompiuteriuose. Jei jūs arba kitas asmuo girdi keistus triukšmus ar nesklandumus skambu�io metu, bandykite išjungti aido panaikinimą ir skambinti iš naujo."
+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 ""
+"Aido panaikinimas padeda padaryti jūsų balsą aiškesnį kitam asmeniui, bet "
+"gali sukelti problemų kai kuriuose kompiuteriuose. Jei jūs arba kitas asmuo "
+"girdi keistus triukšmus ar nesklandumus skambu�io metu, bandykite išjungti "
+"aido panaikinimą ir skambinti iš naujo."
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "_Rodyti vietovÄ™ mano kontaktams"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Sumažinus vietovės rodymo tikslumą, bus rodomas tik jūsų miestas, sritis ir šalis. GPS koordinatės bus rodomos vieno skai�iaus po kablelio tikslumu."
+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 ""
+"Sumažinus vietovės rodymo tikslumą, bus rodomas tik jūsų miestas, sritis ir "
+"šalis. GPS koordinatės bus rodomos vieno skai�iaus po kablelio tikslumu."
 
 #. 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:33
@@ -4165,135 +3464,129 @@ msgstr "_Sumažinti vietovės nustatymo tikslumą"
 msgid "Privacy"
 msgstr "Privatumas"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Mobilusis telefonas"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Tinklas (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "VietovÄ—s Å¡altiniai:"
-
-#: ../src/empathy-preferences.ui.h:40
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "Šiame kalbų sąraše yra tik tos kalbos, kurių žodynus turite įdiegę."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Įjungti šių kalbų rašybos tikrinimą:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Rašybos tikrinimas"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Pokalbio t_ema:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variantas:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temos"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Nurodykite slaptažodį"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Atsijungti"
 
-#: ../src/empathy-roster-window.c:464
-msgid "You need to setup an account to see contacts here."
-msgstr "Jums reikia nustatyti paskyrÄ…, kad ten matytumÄ—te kontaktus."
+#: ../src/empathy-roster-window.c:493
+msgid "You need to set up an account to see contacts here."
+msgstr "Jums reikia nustatyti paskyrą, kad �ia matytumėte kontaktus."
 
-#: ../src/empathy-roster-window.c:540
+#: ../src/empathy-roster-window.c:569
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "Deja, paskyra %s negali būti naudojama, kol nebus atnaujinta programinė įranga %s."
+msgstr ""
+"Deja, paskyra %s negali būti naudojama, kol nebus atnaujinta programinė "
+"įranga %s."
 
-#: ../src/empathy-roster-window.c:640
+#: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:644
-#| msgid "Facebook Chat"
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:659
+#: ../src/empathy-roster-window.c:689
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "%s paskyrai reikia patvirtinti tapatybÄ™"
 
-#: ../src/empathy-roster-window.c:670
-#| msgid "Edit Account"
+#: ../src/empathy-roster-window.c:700
 msgid "Online Accounts"
 msgstr "InternetinÄ—s paskyros"
 
-#: ../src/empathy-roster-window.c:717
-msgid "Update software..."
-msgstr "Atnaujinti programinę įrangą..."
+#: ../src/empathy-roster-window.c:747
+#| msgid "Update software..."
+msgid "Update software…"
+msgstr "Atnaujinti programinę įrangą…"
 
-#: ../src/empathy-roster-window.c:723
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "Prisijungti iš naujo"
 
-#: ../src/empathy-roster-window.c:727
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "Taisyti paskyrÄ…"
 
-#: ../src/empathy-roster-window.c:732
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "Užverti"
 
-#: ../src/empathy-roster-window.c:869
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
 msgstr "Papildyti paskyros kreditÄ…"
 
-#: ../src/empathy-roster-window.c:1551
+#: ../src/empathy-roster-window.c:1590
 msgid "You need to enable one of your accounts to see contacts here."
-msgstr "Jums reikia įjungti vieną iš jūsų paskyrų, kad ten matytumėte kontaktus."
+msgstr ""
+"Jums reikia įjungti vieną iš jūsų paskyrų, kad ten matytumėte kontaktus."
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1559
+#: ../src/empathy-roster-window.c:1598
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "Jums reikia įjungti %s, kad ten matytumėte kontaktus."
 
-#: ../src/empathy-roster-window.c:1637
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
 msgstr "Keisti jūsų būvimo būseną, kad ten matytumėte kontaktus"
 
-#: ../src/empathy-roster-window.c:1646
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
 msgstr "Nerasta atitikmenų"
 
-#: ../src/empathy-roster-window.c:1653
+#: ../src/empathy-roster-window.c:1692
 msgid "You haven't added any contact yet"
 msgstr "Dar nepridėjote jokių kontaktų"
 
-#: ../src/empathy-roster-window.c:1656
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
 msgstr "Nėra kontaktų internete"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Naujas pokalbis…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "Naujas _skambutis…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4301,11 +3594,13 @@ msgid "Contacts"
 msgstr "Kontaktai"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Pridėti kontaktų…"
+#| msgid "_Add Contact…"
+msgid "_Add Contacts…"
+msgstr "_Pridėti kontaktus…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+#| msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Ieškoti kontaktų…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4317,7 +3612,8 @@ msgid "_Rooms"
 msgstr "_Kambariai"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+#| msgid "_Join"
+msgid "_Join…"
 msgstr "_Prisijungti…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
@@ -4362,33 +3658,19 @@ msgid "Go _Online"
 msgstr "_Prisijungti prie tinklo"
 
 #: ../src/empathy-roster-window.ui.h:3
-#| msgid "Show offline contacts"
 msgid "Show _Offline Contacts"
 msgstr "Rodyti atsijungusius k_ontaktus"
 
-#: ../src/empathy-roster-window.ui.h:4
-#| msgid "_Add Contacts..."
-msgid "_Add Contact..."
-msgstr "_Pridėti kontaktą…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Naujas pokalbis…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Naujas _skambutis…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "BÅ«sena"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Atlikta"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Įveskite savo paskyros duomenis"
 
diff --git a/po/nb.po b/po/nb.po
index 4130c9d0f..1fc478d80 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 3.7.x\n"
+"Project-Id-Version: empathy 3.9.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-07 11:29+0100\n"
-"PO-Revision-Date: 2013-01-07 11:30+0100\n"
+"POT-Creation-Date: 2013-09-08 19:24+0200\n"
+"PO-Revision-Date: 2013-09-08 19:25+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
@@ -446,34 +446,10 @@ 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.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan bruke nettverket til å gjette plassering"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-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.h:94
-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.h:95
-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.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan bruke GPS til å gjette plassering"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-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.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -503,7 +479,7 @@ msgstr "Feil under overføring av filen"
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
@@ -523,215 +499,155 @@ msgstr "Valgt fil er ikke en vanlig fil"
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Passordet ble ikke funnet"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Passord for lynmeldingskonto for %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Passord for praterom «%s» på konto %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Tapt anrop fra %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Samtale med %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../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: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: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: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: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: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:142
-msgid "in the future"
-msgstr "i fremtiden"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Denne kontoen er allerede koblet til tjeneren"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -739,588 +655,33 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Personer i nærheten"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook-prat"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Alle kontoer"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Passord"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "Skjerm_navn"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Eksempel:</b> MittSkjermNavn       "
-
-#. 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 "Husk passord"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Tjener"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Avansert"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Hva er ditt skjermnavn for AIM?"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "HVa er ditt AIM-passord?"
-
-#: ../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:25
-msgid "Remember Password"
-msgstr "Husk passord"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Konto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Passord"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Tjener"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Port"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Brukernavn:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Bruk"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "L_ogg inn"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Denne kontoen eksisterer allerede på tjeneren"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Lag en ny konto på tjeneren"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s-konto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Ny konto"
-
-#: ../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 "Innloggings-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>Eksempel:</b> brukernavn"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Hva er din bruker-ID for GroupWise?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Hva er ditt passord for GroupWise?"
-
-#: ../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>Eksempel:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Tegn_sett"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Hva er din UIN for ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Hva er ditt passord for ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Nettverk"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Tegnsett"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Legg til …"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Fjern"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Opp"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Ned"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Tjenere"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"De fleste IRC-tjenere krever ikke et passord, så ikke oppgi et passord hvis "
-"du ikke er sikker."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Kallenavn"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Melding når programmet avsluttes"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Virkelig navn"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Brukernavn"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Hvilket IRC-nettverk?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Hva er ditt kallenavn på IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Hva er ditt brukernavn for 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 ""
-"Dette er brukernavnet ditt, ikke din vanlige pålogging for Facebook.\n"
-"Hvis du er facebook.com/<b>badger</b>, oppgi <b>badger</b>.\n"
-"Bruk <a href=\"http://www.facebook.com/username/\">denne siden</a> for å "
-"velge et brukernavn på Facebook hvis du ikke har et."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Hva er ditt passord for Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Hva er din Google-ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Eksempel:</b> bruker@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Hva er ditt passord for Google?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Eksempel:</b> bruker@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorer feil med SSL-sertifikater"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "Priori_tet"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "Ress_urs"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Kr_yptering kreves (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Overstyr innstillinger for tjener"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Bruk gammel SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Hva er din Jabber-ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Hvilken Jabber-ID ønsker du?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Hva er ditt passord for Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Hvilket passord ønsker du for Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_Kallenavn"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_Etternavn"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Fornavn"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "_Publisert navn"
-
-#: ../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 "E-_mail address"
-msgstr "E-_postadresse"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Eksempel:</b> bruker@hotmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Hva er din ID på Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Hva er ditt passord for Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Alternativer"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Ingen"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "Br_ukernavn"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Eksempel:</b> bruker@min.sip.server"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Bruk denne kontoen til å ringe opp fasttelefoner og mobiltelefoner"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Alternativer for NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Alternativer for proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Forskjellige alternativer"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN-tjener"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Søk opp STUN-tjener automatisk"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Oppdag binding"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Alternativer for Keep-Alive"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mekanisme"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervall (sekunder)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Brukernavn for autentisering"
-
-#: ../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 "Løs ruting"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Overse TLS-feil"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Lokal IP-adresse"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Hva er din påloggings-ID for SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Hva er passordet for din SIP-konto?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Passord:"
-
-#: ../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_gnorer invitasjoner til konferanser og praterom"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Locale for _romliste:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Tegn_sett:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Hva er din Yahoo!-ID?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Hva er ditt passord for Yahoo!?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Kunne ikke konvertere bilde"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Ingen av de godkjente bildeformatene støttes av ditt system"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Kunne ikke lagre bilde til fil"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Velg personbilde"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Ta et bilde …"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Ingen bilde"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Bilder"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Alle filer"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Klikk for å forstørre"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Autentisering feilet for konto <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1330,72 +691,69 @@ msgstr ""
 "Oppgi ditt passord for konto\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Velg …"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Velg"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Husk passord"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Valgt kontakt støtter ikke oppringing"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Valgt kontakt er koblet fra"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Valgt kontakt er ugyldig"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 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:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Ugyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 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:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 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:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1403,23 +761,23 @@ msgstr ""
 "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1083
+#: ../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 "
@@ -1429,11 +787,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:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,126 +799,126 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:974
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1568,12 +926,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1581,17 +939,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1601,17 +959,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:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1619,50 +977,50 @@ 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:2989 ../src/empathy-call-window.c:1532
-#: ../src/empathy-call-window.c:1582 ../src/empathy-call-window.c:2657
-#: ../src/empathy-call-window.c:2963 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1693,8 +1051,8 @@ msgstr "Rediger blokkerte kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1704,120 +1062,63 @@ msgstr "Konto:"
 msgid "Blocked Contacts"
 msgstr "Blokkerte kontakter"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Fullt navn"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "E-postadresse"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Nettsted"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Sist sett:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Tjener:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Tilkoblet fra:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Bortemelding:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "arbeid"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "hjemme"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobil"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "tale"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "foretrukket"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "post"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "pakke"
+#: ../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 "Fjern"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Søk i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Søk: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Legg til kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Ingen kontakter funnet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Kontaktsøk er ikke støttet for denne kontoen"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Melding der du introduserer deg selv:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vennligst la meg så når du er tilkoblet. Takk!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Lagre personbilder"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Konto"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifikator"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alias"
 
@@ -1851,11 +1152,11 @@ msgstr "Versjon"
 msgid "Client"
 msgstr "Klient"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1863,121 +1164,126 @@ msgstr ""
 "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere "
 "eller ingen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil bli blokkert:"
 msgstr[1] "Følgende identiteter vil bli blokkert:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokkeres:"
 msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Rapporter denne kontakten"
 msgstr[1] "_Rapporter disse kontaktene"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Lenkede kontakter"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts er ikke installert"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Fjern fra _gruppe «%s»"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1986,218 +1292,219 @@ 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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "Fje_rn"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Prat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1277
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Endre _navn"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ISO-kode for land:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Postkode:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Etasje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Nøyaktighetsnivå:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Vertikal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Horisontal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Retning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Klatrehastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Sist oppdatert:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Lengdegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Høyde:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sted"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y, %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2212,32 +1519,7 @@ msgstr "<b>Plassering</b> (dato)"
 msgid "Online from a phone or mobile device"
 msgstr "Tilkoblet fra en telefon eller mobil enhet"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Nytt nettverk"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr "Velg et IRC-nettverk"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr "Nullstill _nettverksliste"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Velg"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "ny tjener"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2247,11 +1529,11 @@ msgstr ""
 "deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
 "under er riktige."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2259,135 +1541,135 @@ msgstr ""
 "Du kan endre disse detaljene senere eller slå av denne funksjonen ved å "
 "velge <span style=\"italic\">Rediger → Kontoer</span> i kontaktlisten."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, 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:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minutt"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "NÃ¥r som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "NÃ¥r"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3759
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2396,12 +1678,12 @@ msgid "_File"
 msgstr "_Fil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Rediger"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Slett all historikk …"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2409,7 +1691,7 @@ msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1493 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Prat"
 
@@ -2423,112 +1705,116 @@ msgid "page 2"
 msgstr "side 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Laster …</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Hvilken type konto har du?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Legger til ny konto"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Legg til ny konto"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Oppgi en kontaktidentifikator eller telefonnummer:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Ny samtale"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontakten er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Valgt kontakt er ugyldig eller ukjent"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakten støtter ikke denne type samtale"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Forespurt funksjonalitet er ikke implementert for denne protokollen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Kunne ikke starte en samtale med oppgitt kontakt"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Du er bannlyst fra denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Kanalen er full"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Du må bli invitert til å bli med i denne kanalen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Kan ikke fortsette da du er koblet fra"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Det oppsto en feil ved start av samtalen"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Ny samtale"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Passord kreves"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Egendefinert melding …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Rediger egendefinerte meldinger …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Klikk for å fjerne denne statusen som favoritt"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Klikk for å gjøre denne statusen til en favoritt"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2538,25 +1824,16 @@ msgstr ""
 "<small><i>Trykk linjeskift for å sette ny melding eller Esc for å avbryte.</"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Sett status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Egendefinerte meldinger …"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Ny %s-konto"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
@@ -2580,168 +1857,168 @@ msgstr "_Skill mellom små/store bokstaver"
 msgid "Phrase not found"
 msgstr "Teksten ble ikke funnet"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Mottok en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Send en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Innkommende samtaleforespørsel"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontakt koblet til"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontakt koblet fra"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Koblet til tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Koblet fra tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Innkommende samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Utgående samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Samtale avsluttet"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Abonnementsforespørsel"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "Godt_a"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identiteten som ble oppgitt av pratetjeneren kan ikke verifiseres."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Sertifikatet er ikke signert av en sertifikatmyndighet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Sertifikatet er utløpt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Sertifikatet er ikke aktivert ennå."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Sertifikatet har ikke forventet fingeravtrykk."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Vertsnavn verifisert av sertifikatet er ikke det samme som navn på tjener."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Sertifikatet er selvsignert."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 "Sertifikatet har blitt trukket tilbake av utstedende sertifikatmyndighet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Sertifikatet er kryptografisk svakt."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Sertifikatets lengde overstiger verifiserbare grenser."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Sertifikatet ikke feilutformet."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Forventet vertsnavn: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Vertsnavn i sertifikat: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "F_ortsett"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Tilkobling uten tillit"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valget for fremtidige tilkoblinger"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Sertifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2750,225 +2027,54 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Rediger din personlige informasjon på nettet."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Personlige detaljer</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Kopier lenkens adresse"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Ã…pne lenke"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Inspiser HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Aktivt 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 "Arabisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armensk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Keltisk"
-
-#: ../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 "Sentraleuropeisk"
-
-#: ../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 "Forenklet kinesisk"
-
-#: ../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 "Tradisjonell kinesisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: ../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 "Kyrillisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Kyrillisk/Russisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Kyrillisk/Ukrainsk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Georgisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Gresk"
-
-#: ../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 "Hebraisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Visuell hebraisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandsk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japansk"
-
-#: ../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 "Koreansk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nordisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persisk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumensk"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Sør-Europeisk"
-
-#: ../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 "Tyrkisk"
-
-#: ../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 "Vestlig"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamesisk"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Mest populære kontakter"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Personer i nærheten"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Ikke gruppert"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Tjener finner ikke kontakt: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Ingen feilmelding"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2980,7 +2086,7 @@ msgstr ""
 "Software Foundation; enten versjon 2 av lisensen, eller (hvis du ønsker det) "
 "enhver senere versjon."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2991,7 +2097,7 @@ msgstr ""
 "GARANTI, ikke engang implisitt garanti om at det er SALGBART eller PASSER ET "
 "BESTEMT FORMÃ…L. Se GNU General Public License for detaljer."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3001,11 +2107,11 @@ msgstr ""
 "Hvis ikke så skriv til Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-1301159, USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "En meldingsklient for GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Kjartan Maraas\n"
@@ -3013,70 +2119,70 @@ msgstr ""
 "Espen Stefansen\n"
 "Torstein Adolf Winterseth <kvikende@fsfe.org>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Det finnes ikke-lagrede endringer for din %.50s-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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1274
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3086,28 +2192,28 @@ msgstr ""
 "som ikke støttes. Vennligst installer telepathy-haze og start økten på nytt "
 "for å migrere kontoen."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "R_ediger parametere for tilkoblingen …"
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "R_ediger parametere for tilkobling …"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Vil du fjerne %s fra din datamaskin?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Vil du fjerne %.50s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3116,24 +2222,24 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "Slått _på"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Endre navn"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Koble til"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3142,10 +2248,14 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Meldings- og VoIP-kontoer"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Legg til …"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importer …"
@@ -3166,31 +2276,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Ingen protokollmotor installert"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentiseringsklient"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3203,7 +2313,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "I en samtale"
 
@@ -3215,99 +2325,93 @@ msgstr "- Empathy lyd-/bildeklient"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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:1131 ../src/empathy-call-window.c:1147
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1549 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Innkommende videosamtale fra %s"
 
-#: ../src/empathy-call-window.c:1555 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Innkommende samtale fra %s"
 
-#: ../src/empathy-call-window.c:1559
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Svar"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1929
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2187
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
-#: ../src/empathy-call-window.c:2189
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
-#: ../src/empathy-call-window.c:2600 ../src/empathy-call-window.c:2601
-#: ../src/empathy-call-window.c:2602 ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "PÃ¥ vent"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2967
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3316,7 +2420,7 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3325,7 +2429,7 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-call-window.c:3116
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3334,25 +2438,25 @@ msgstr ""
 "Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
 "ikke tillater direkte tilkoblinger."
 
-#: ../src/empathy-call-window.c:3122
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
-#: ../src/empathy-call-window.c:3126
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3129
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3141
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3363,32 +2467,32 @@ msgstr ""
 "\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
-#: ../src/empathy-call-window.c:3150
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
-#: ../src/empathy-call-window.c:3153
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
-#: ../src/empathy-call-window.c:3193
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
-#: ../src/empathy-call-window.c:3203
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
-#: ../src/empathy-call-window.c:3240
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3241
 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:3246
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Fyll opp"
 
@@ -3412,11 +2516,11 @@ msgstr "Inn_stillinger"
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Innhold"
 
@@ -3504,19 +2608,19 @@ msgstr "Lokal kandidat:"
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Rom"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Koble til automatisk"
 
@@ -3524,11 +2628,11 @@ msgstr "Koble til automatisk"
 msgid "Manage Favorite Rooms"
 msgstr "HÃ¥ndter favorittrom"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Lukk dette vinduet?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3537,7 +2641,7 @@ 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3552,12 +2656,12 @@ 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:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Forlat %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3565,54 +2669,54 @@ msgstr ""
 "Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
 "igjen."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Forlat rom"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:672 ../src/empathy-chat-window.c:695
 #, 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:692
+#: ../src/empathy-chat-window.c:687
 #, 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:708
+#: ../src/empathy-chat-window.c:703
 #, 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:717
+#: ../src/empathy-chat-window.c:712
 #, 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:954
+#: ../src/empathy-chat-window.c:949
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:957
 #, 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:982
+#: ../src/empathy-chat-window.c:977
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3645,108 +2749,116 @@ msgid "Invite _Participant…"
 msgstr "Inviter _deltaker …"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Bli med i samtale"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Forl_at samtale"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "K_ontakt"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Faner"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Forrige samtaler"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Neste fane"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "Angre l_ukk fane"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Flytt fane til _venstre"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Flytt fane til høy_re"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "Riv _løs fane"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Vis en spesiell tjeneste"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Empathy feilsøking"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy feilsøking"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Lenke til Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Svar fra Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Send til Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3764,93 +2876,93 @@ msgstr ""
 "rapporterer den ved å vise avanserte felt i <a href=\"https://bugzilla.gnome."
 "org/enter_bug.cgi?product=empathy>feilrapporten</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 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-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, 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:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "Av_vis"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "Sv_ar"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitasjon til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterte deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, 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:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3860,105 +2972,105 @@ msgstr ""
 "Melding: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s av %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, c-format
 msgid "%s of %s"
 msgstr "%s av %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Mottar «%s» fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Feil ved mottak av «%s» fra %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Feil ved mottak av en fil"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Feil ved sending av «%s» til %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Feil ved sending av en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» mottatt fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» sendt til %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Filoverføring fullført"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Venter på svar fra motparten"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sjekker integriteten for «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher «%s»"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Gjenstår"
 
@@ -3970,59 +3082,59 @@ 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:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 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:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Samtalerom"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Klarte ikke å vise rom"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4035,17 +3147,17 @@ msgstr ""
 "Passord kreves: %s\n"
 "Medlemmer: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Nei"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Bli med i rom"
 
@@ -4088,104 +3200,104 @@ msgstr "Kunne ikke laste romliste"
 msgid "Room List"
 msgstr "Romliste"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Svar med video"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Oppgi"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Melding mottatt"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontakt kobler fra"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Konto koblet til"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Konto koblet fra"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 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:654
+#: ../src/empathy-preferences.c:642
 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:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 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:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4197,7 +3309,7 @@ msgstr "Vis grupper"
 msgid "Show account balances"
 msgstr "Vis saldo for konto"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2240
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4319,59 +3431,43 @@ msgstr "_Reduser nøyaktighet for plassering"
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Mobiltelefon"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Nettverk (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Kilder for steder:"
-
-#: ../src/empathy-preferences.ui.h:40
 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:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Slå på stavekontroll for språk:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Samtale_tema:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Koble fra"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Du må sette opp en konto for å se kontakter her."
 
 #: ../src/empathy-roster-window.c:569
@@ -4379,76 +3475,82 @@ msgstr "Du må sette opp en konto for å se kontakter her."
 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:669
+#: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
 
 #. translators: %s is an account name like 'Facebook' or 'Google Talk'
-#: ../src/empathy-roster-window.c:688
+#: ../src/empathy-roster-window.c:689
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "%s-konto krever autorisering"
 
-#: ../src/empathy-roster-window.c:699
+#: ../src/empathy-roster-window.c:700
 msgid "Online Accounts"
 msgstr "Kontoer på nettet"
 
-#: ../src/empathy-roster-window.c:746
-msgid "Update software..."
+#: ../src/empathy-roster-window.c:747
+msgid "Update software…"
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:757
 msgid "Edit Account"
 msgstr "Rediger konto"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:762
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:904
 msgid "Top up account"
 msgstr "Fyll opp konto"
 
-#: ../src/empathy-roster-window.c:1589
+#: ../src/empathy-roster-window.c:1590
 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:1597
+#: ../src/empathy-roster-window.c:1598
 #, 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:1675
+#: ../src/empathy-roster-window.c:1676
 msgid "Change your presence to see contacts here"
 msgstr "Endre din tilstedeværelse for å se kontakter her"
 
-#: ../src/empathy-roster-window.c:1684
+#: ../src/empathy-roster-window.c:1685
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:1691
+#: ../src/empathy-roster-window.c:1692
 msgid "You haven't added any contact yet"
 msgstr "Du har ikke lagt til kontakter ennå"
 
-#: ../src/empathy-roster-window.c:1694
+#: ../src/empathy-roster-window.c:1695
 msgid "No online contacts"
 msgstr "Ingen kontakter tilkoblet"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Ny samtale …"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "Ny _samtale …"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4456,11 +3558,11 @@ msgid "Contacts"
 msgstr "Kontakter"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
+msgid "_Add Contacts…"
 msgstr "_Legg til kontakter …"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "_Søk etter kontakter …"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4472,7 +3574,7 @@ msgid "_Rooms"
 msgstr "_Rom"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+msgid "_Join…"
 msgstr "_Bli med …"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
@@ -4520,28 +3622,16 @@ msgstr "K_oble til"
 msgid "Show _Offline Contacts"
 msgstr "Vis frak_oblede kontakter"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Legg til kontakt …"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Ny samtale …"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Ny _samtale …"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Ferdig"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Vennligst oppgi detaljer om din konto"
 
diff --git a/po/pl.po b/po/pl.po
index 2563d9491..918766231 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-17 14:41+0100\n"
-"PO-Revision-Date: 2013-02-17 14:42+0100\n"
+"POT-Creation-Date: 2013-09-04 02:20+0200\n"
+"PO-Revision-Date: 2013-09-04 02:21+0200\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -477,34 +477,10 @@ 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.h:92
-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.h:93
-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.h:94
-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.h:95
-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.h:96
-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.h:97
-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.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Zmniejszenie dokładności położenia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -534,7 +510,7 @@ msgstr "Błąd podczas próby przesłania pliku"
 msgid "The other participant is unable to transfer the file"
 msgstr "Druga strona nie może odebrać pliku"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Nieznany powód"
 
@@ -554,222 +530,156 @@ msgstr "Wybrany plik nie jest zwykłym plikiem"
 msgid "The selected file is empty"
 msgstr "Wybrany plik jest pusty"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Nie odnaleziono hasła"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Hasło konta komunikatora dla %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Hasło dla pokoju rozmowy \"%s\" na koncie %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nieodebrana rozmowa głosowa od użytkownika %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Rozmowa głosowa z użytkownikiem %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Rozmowa głosowa od użytkownika %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d sekundÄ™ temu"
-msgstr[1] "%d sekundy temu"
-msgstr[2] "%d sekund temu"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d minutÄ™ temu"
-msgstr[1] "%d minuty temu"
-msgstr[2] "%d minut temu"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d godzinÄ™ temu"
-msgstr[1] "%d godziny temu"
-msgstr[2] "%d godzin temu"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d dzień temu"
-msgstr[1] "%d dni temu"
-msgstr[2] "%d dni temu"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d tydzień temu"
-msgstr[1] "%d tygodnie temu"
-msgstr[2] "%d tygodni temu"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d miesiÄ…c temu"
-msgstr[1] "%d miesiÄ…ce temu"
-msgstr[2] "%d miesięcy emu"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "w przyszłości"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Nieobecny"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nie podano powodu"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Stan został zmieniony na offline"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "BÅ‚Ä…d sieci"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Uwierzytelnienie się nie powiodło"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "BÅ‚Ä…d szyfrowania"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Pseudonim jest już używany"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Nie dostarczono certyfikatu"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Niezaufany certyfikat"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Certyfikat wygasł"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certyfikat nieaktywny"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Nazwa komputera w certyfikacie nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Odcisk palca certyfikatu nie zgadza siÄ™"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certyfikat został samodzielnie podpisany"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "BÅ‚Ä…d certyfikatu"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Szyfrowanie nie jest dostępne"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Certyfikat jest nieprawidłowy"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Połączenie zostało odrzucone"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Nie można ustanowić połączenia"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Połączenie zostało utracone"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "To konto jest już połączone z serwerem"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Konto już istnieje na serwerze"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 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:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -777,590 +687,33 @@ msgstr ""
 "Długość certyfikatu serwera lub głębokość łańcucha certyfikatu serwera "
 "przekracza ograniczenie wymuszane przez bibliotekÄ™ kryptograficznÄ…"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Oprogramowanie jest za stare"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Wewnętrzny błąd"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Osoby w pobliżu"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japonia"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook Chat"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Wszystkie konta"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Hasło"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Zapamiętywanie hasła"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Serwer"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Zapamiętaj hasło"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Konto"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Hasło"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Serwer"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Port"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nazwa użytkownika:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "Za_stosuj"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Zal_oguj"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "To konto już istnieje na serwerze"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Utworzenie nowego konta na serwerze"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Konto serwisu %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nowe konto"
-
-#: ../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: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:9
-msgid "What is your GroupWise password?"
-msgstr "Hasło GroupWise:"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "Zest_aw znaków"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "Hasło ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Sieć"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Zestaw znaków"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Dodaj…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Usuń"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "W górę"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "W dół"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Serwery"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"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:11
-msgid "Nickname"
-msgstr "Pseudonim"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Komunikat podczas zakończenia"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "ImiÄ™ i nazwisko"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Sieć IRC:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Pseudonim IRC:"
-
-#: ../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: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 ""
-"To jest nazwa użytkownika, a nie login serwisu Facebook.\n"
-"Jeśli używane jest facebook.com/<b>badger</b>, należy wpisać <b>badger</b>.\n"
-"Należy użyć <a href=\"http://www.facebook.com/username/\">tej strony</a>, "
-"aby wybrać nazwę użytkownika serwisu Facebook, jeśli jeszcze jej nie "
-"ustawiono."
-
-#: ../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:8
-msgid "What is your Google ID?"
-msgstr "Identyfikator Google:"
-
-#: ../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 "Override server settings"
-msgstr "Zastępuje ustawienia serwera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Stare szyfrowanie SS_L"
-
-#: ../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:25
-msgid "What is your desired Jabber ID?"
-msgstr "Żądany identyfikator Jabbera:"
-
-#: ../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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Pseu_donim"
-
-#: ../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 "E-_mail address"
-msgstr "Adres _e-mail"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "Identyfikator Windows Live:"
-
-#: ../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-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Automatycznie"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Rejestrator"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Opcje"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Brak"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "Nazwa _użytkownika"
-
-#: ../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:5
-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 "NAT Traversal Options"
-msgstr "Opcje przechodzenia NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opcje pośrednika"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Różne opcje"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Serwer STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Automatyczne wykrywanie serwera STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Wykrywanie dowiÄ…zywania"
-
-#: ../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 "Mechanism"
-msgstr "Mechanizm"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-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 "Loose Routing"
-msgstr "Swobodne trasowanie"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorowanie błędów TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Lokalny adres IP"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Hasło konta SIP:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Hasło:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "_Ustawienia językowe listy pokoi:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Zest_aw znaków:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../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:11
-msgid "What is your Yahoo! password?"
-msgstr "Hasło Yahoo!:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Nie można przekonwertować obrazu"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Żaden z akceptowanych formatów obrazu nie jest obsługiwany przez ten system"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Nie można zapisać obrazu do pliku"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Wybór obrazu awatara"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Zrób zdjęcie..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Brak obrazu"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Obrazy"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Wszystkie pliki"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Kliknięcie powiększy"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Uwierzytelnienie konta <b>%s</b> się nie powiodło"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Ponów"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1370,72 +723,69 @@ msgstr ""
 "Proszę wprowadzić hasło\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Wybierz..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Wybierz"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Zapamiętywanie hasła"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Wystąpił błąd podczas rozpoczynania rozmowy głosowej"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Podany kontakt nie obsługuje rozmów głosowych"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Wybrany kontakt jest w trybie offline"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Wybrany kontakt nie jest prawidłowy"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Rozmowy alarmowe nie są obsługiwane przez ten protokół"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Brak uprawnienia do zmiany tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Nieprawidłowy identyfikator kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 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:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 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:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1443,24 +793,24 @@ msgstr ""
 "/part [<identyfikator pokoju rozmów>] [<przyczyna>]: opuszcza pokój rozmów, "
 "domyślnie bieżący"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1096
+#: ../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 "
@@ -1470,11 +820,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:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <identyfikator kontaktu>: wyświetla informacje o kontakcie"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1482,127 +832,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:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Użycie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "niewystarczające saldo, aby wysłać wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "brak możliwości"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "nieprawidłowy kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "za długa wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "niezaimplementowane"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Temat:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temat ustawiony na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Temat nie został określony"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(brak podpowiedzi)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj \"%s\" do słownika %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonÄ™"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Wyślij"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Podpowiedzi pi_sowni"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Pobranie ostatnich dzienników się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "Użytkownik %s został rozłączony"
@@ -1610,12 +960,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, 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:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "Użytkownik %s został wyrzucony"
@@ -1623,17 +973,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, 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:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "Użytkownik %s został zablokowany"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "Użytkownik %s opuścił pokój"
@@ -1643,17 +993,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:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "Użytkownik %s dołączył do pokoju"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
@@ -1661,50 +1011,50 @@ 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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Zachować hasło?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Nie teraz"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Błędne hasło. Proszę spróbować ponownie:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Ten pokój jest chroniony hasłem:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Dołącz"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Rozmowa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1735,8 +1085,8 @@ msgstr "Modyfikacja zablokowanych kontaktów"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1746,120 +1096,63 @@ msgstr "Konto:"
 msgid "Blocked Contacts"
 msgstr "Zablokowane kontakty"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "ImiÄ™ i nazwisko"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Numer telefonu"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Adres e-mail"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Witryna WWW"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Ostatnio widziany:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Serwer:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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:117
-msgid "Away message:"
-msgstr "Wiadomość podczas nieobecności:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "praca"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "dom"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "komórka"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "głosowa"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "preferowane"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "pocztowy"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "paczka"
+#: ../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 "Usuń"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Wyszukiwanie kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Wyszukiwanie: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Dodaj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nie odnaleziono kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Wyszukiwanie kontaktów nie jest obsługiwane na tym koncie"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Wiadomość z powitaniem:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Daj znać, jak pojawisz się w sieci. Dzięki."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Zapisanie awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Nie można zapisać awatara"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Konto"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identyfikator"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Alias"
 
@@ -1893,11 +1186,11 @@ msgstr "Wersja"
 msgid "Client"
 msgstr "Klient"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1905,77 +1198,77 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Dodaj grupÄ™"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Wybór"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Zablokować użytkownika %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 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-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "Za_blokuj"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "Zgł_oś ten kontakt jako obraźliwy"
 msgstr[1] "Zgł_oś te kontakty jako obraźliwe"
 msgstr[2] "Zgł_oś te kontakty jako obraźliwe"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 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:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Połączone kontakty"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "Pakiet gnome-contacts nie jest zainstalowany"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Proszę zainstalować pakiet gnome-contacts, aby uzyskać dostęp do szczegółów "
@@ -1984,47 +1277,52 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Wybór konta do umieszczenia tej rozmowy głosowej"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Komórka"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Praca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Dom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "Za_blokuj kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Usuń z g_rupy \"%s\""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Usuń i za_blokuj"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Na pewno usunąć kontakt \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2033,220 +1331,221 @@ msgstr ""
 "Na pewno usunąć metakontakt \"%s\"? Wszystkie kontakty tworzące metakontakt "
 "zostaną usunięte."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Usuwanie kontaktu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Usuń"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Rozmowa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Rozmow_a głosowa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Wideorozmowa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Poprzednie rozmowy"
 
 # to jest w menu
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Wyślij plik"
 
 # to jest w menu
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Współdziel pulpit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Ulubione"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_macje"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Zapraszanie do tego pokoju"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_ZaproÅ› do pokoju rozmowy"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Dodaj kontakt…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Na pewno usunąć grupę \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Usuwanie grupy"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Zmień _nazwę"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanały:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Kod ISO kraju:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Stan/województwo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Obszar:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Budynek:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Piętro:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "Adres URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Poziom dokładności:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "BÅ‚Ä…d:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "BÅ‚Ä…d w pionie (metry):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "BÅ‚Ä…d w poziomie (metry):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Prędkość:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Kierunek:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Prędkość wznoszenia:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Długość geograficzna:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Szerokość geograficzna:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Wysokość n.p.m.:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Położenie"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
-msgstr "%e %B %Y o %R UTC"
+msgstr "%e %B %Y o %H∶%M UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identyfikator:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2262,32 +1561,7 @@ msgstr "<b>Położenie</b> w (dniu)"
 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:335
-msgid "New Network"
-msgstr "Nowa sieć"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Wybór sieci IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Przywróć listę _sieci"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Wybierz"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nowy serwer"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2297,11 +1571,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Osoby w pobliżu"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2309,48 +1583,48 @@ 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."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Wyświetlenie"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Rozmowa w %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Rozmowa z użytkownikiem %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2358,7 +1632,7 @@ msgstr[0] "%s sekunda"
 msgstr[1] "%s sekundy"
 msgstr[2] "%s sekund"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2366,80 +1640,80 @@ msgstr[0] "%s minuta"
 msgstr[1] "%s minuty"
 msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, 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:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Zawsze"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Wszyscy"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Kto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kiedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Rozmowy tekstowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Przychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Wychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Nieodebrane rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Wyczyść wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Usunięcie od:"
 
@@ -2448,20 +1722,20 @@ msgid "_File"
 msgstr "_Plik"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Edycja"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Usuń całą historię..."
+msgid "Delete All History…"
+msgstr "Usuń całą historię…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Rozmowa"
 
@@ -2475,112 +1749,116 @@ msgid "page 2"
 msgstr "strona 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Wczytywanie...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Wczytywanie…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Rodzaj posiadanego konta rozmów:"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Dodawanie nowego konta"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Dodanie nowego konta"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Proszę wpisać identyfikator lub numer telefonu kontaktu:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Wideorozmowa"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "Rozmow_a głosowa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nowa rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontakt jest w trybie offline"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Wybrany kontakt jest nieprawidłowy lub nieznany"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 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:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 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:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Użytkownik został zablokowany na tym kanale"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Ten kanał jest pełny"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 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:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Nie można kontynuować podczas rozłączenia"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Odmowa dostępu"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Wystąpił błąd podczas rozpoczynania rozmowy"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nowa rozmowa"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Wymagane jest hasło"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Własna wiadomość…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Modyfikuj własne wiadomości…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknięcie usunie ten stan z ulubionych"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Kliknięcie doda ten stan do ulubionych"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2590,25 +1868,16 @@ msgstr ""
 "<small><i>Naciśnięcie klawisza Enter ustawi nową wiadomość, a naciśnięcie "
 "klawisza Esc anuluje.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Ustaw stan"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Własne wiadomości…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nowe konto serwisu %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Rozróżnianie wielkości liter"
 
@@ -2632,168 +1901,168 @@ msgstr "_Rozróżnianie wielkości liter"
 msgid "Phrase not found"
 msgstr "Nie odnaleziono napisu"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Otrzymano wiadomość tekstową"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Wysyłano wiadomość tekstową"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Przychodzące żądanie rozmowy"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontakt połączony"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontakt rozłączony"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Połączony z serwerem"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Rozłączony z serwera"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Przychodząca rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Wychodząca rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Rozmowa głosowa zakończona"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Modyfikowanie własnej wiadomości"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Prośba o upoważnienie"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, 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"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Odmów"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "Z_aakceptuj"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Zmodyfikowano wiadomość o %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Zwykły"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Nie można zweryfikować tożsamości dostarczanej przez serwer rozmów."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Certyfikat nie został podpisany przez ośrodek certyfikacji."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Certyfikat wygasł."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Certyfikat nie jest jeszcze aktywny."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Certyfikat nie zawiera oczekiwanego odcisku palca."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Nazwa komputera zweryfikowana przez certyfikat nie zgadza siÄ™ z nazwÄ… "
 "serwera."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Certyfikat został podpisany przez wystawcę."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Certyfikat został cofnięty przez odpowiedni ośrodek certyfikacji."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Certyfikat jest kryptograficznie słaby."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Długość certyfikatu przekracza weryfikowalne ograniczenia."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Nieprawidłowy format certyfikatu."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Oczekiwana nazwa komputera: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Nazwa komputera w certyfikacie: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "K_ontynuuj"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Niezaufane połączenie"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Zapamiętanie tego wyboru dla przyszłych połączeń"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Szczegóły certyfikatu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Nie można otworzyć adresu URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Brak wolnego miejsca, aby zapisać plik"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,225 +2071,54 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Plik przychodzący od użytkownika %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Proszę przejść do trybu online, aby modyfikować informacje osobiste."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Szczegóły osobiste</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "S_kopiuj adres odnośnika"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Zbadaj kod HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Bieżące ustawienia językowe"
-
-#: ../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 "arabskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "armeńskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "bałtyckie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "celtyckie"
-
-#: ../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 "środkowoeuropejskie"
-
-#: ../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 "chińskie uproszczone"
-
-#: ../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 "chińskie tradycyjne"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "chorwackie"
-
-#: ../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 "cyrylica"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "cyrylica/rosyjskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "cyrylica/ukraińskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "gruzińskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "greckie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "gudżarackie"
-
-#: ../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 "hebrajskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "hebrajskie wizualne"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "hinduskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "islandzkie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "japońskie"
-
-#: ../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 "koreańskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "nordyckie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "perskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "rumuńskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "południowoeuropejskie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "tajskie"
-
-#: ../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 "tureckie"
-
-#: ../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 "Unikod"
-
-#: ../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 "zachodnie"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "wietnamskie"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Najczęściej używane kontakty"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Osoby w pobliżu"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Kontakty bez grup"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Serwer nie może odnaleźć kontaktu: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Brak komunikatu błędu"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Wiadomość (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3032,7 +2130,7 @@ msgstr ""
 "przez Fundację Wolnego Oprogramowania (Free Software Foundation) - według "
 "wersji drugiej tej Licencji lub którejś z późniejszych wersji."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3044,7 +2142,7 @@ msgstr ""
 "HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
 "bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3055,11 +2153,11 @@ msgstr ""
 "- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-130159 USA."
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Komunikator dla środowiska GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Artur Flinta <aflinta@at.kernel.pl>, 2003\n"
@@ -3069,71 +2167,71 @@ msgstr ""
 "Asia SÅ‚owik <asiaslowik@gmail.com>, 2011\n"
 "Aviary.pl <gnomepl@aviary.pl>, 2007-2013"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<identyfikator-konta>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- konta programu Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Konta programu Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Modyfikacje konta %s nie zostały zapisane."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Modyfikacje konta %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Nowe konto nie zostało jeszcze zapisane."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "�ączenie…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Rozłączony — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Offline — brak połączenia z siecią"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Nieznany stan"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3143,28 +2241,28 @@ msgstr ""
 "mechanizmu. Proszę zainstalować pakiet telepathy-haze i ponownie uruchomić "
 "sesję, aby migrować konto."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Offline — konto jest wyłączone"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Modyfikacja parametrów połączenia"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Modyfikuj parametry połączenia..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "_Modyfikuj parametry połączenia…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Na pewno usunąć \"%s\" z komputera?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Na pewno usunąć %.50s z komputera?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Nie usunie to konta na serwerze."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3173,24 +2271,24 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_WÅ‚Ä…czone"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Pomiń"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "P_ołącz"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3199,10 +2297,14 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Konta komunikatora i VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Dodaj…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Zaimportuj…"
@@ -3223,31 +2325,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Brak zainstalowanych mechanizmów protokołów"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Bez Å‚Ä…czenia podczas uruchamiania"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- komunikator Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Błąd podczas nawiązywania połączenia z menedżerem kont"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3260,7 +2362,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "W czasie rozmowy"
 
@@ -3272,95 +2374,95 @@ msgstr "- klient dźwięku/wideo komunikatora Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
 "Użytkownik %s próbował się dodzwonić, ale w tym czasie prowadzono inną "
 "rozmowÄ™."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Przychodząca rozmowa głosowa"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Wideorozmowa przychodząca od użytkownika %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Odbierz"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Rozmowa głosowa z użytkownikiem %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Adres IP widziany przez komputer"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adres IP widziany przez serwer w Internecie"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adres IP elementu widziany przez drugÄ… stronÄ™"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Adres IP serwera odpowiedzi"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Adres IP grupy multikastowej"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Odłożone"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Wycisz"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Czas trwania"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
-msgstr "%s — %d:%02dm"
+msgstr "%s — %d∶%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Szczegóły techniczne"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3369,7 +2471,7 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
 "używanego przez ten komputer"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3378,7 +2480,7 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
 "przez ten komputer"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3387,23 +2489,23 @@ 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-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Wystąpił błąd sieci"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3414,32 +2516,32 @@ msgstr ""
 "\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
 "w menu Pomoc."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Wystąpił błąd mechanizmu rozmowy"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Osiągnięto koniec strumienia"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Nie można utworzyć strumienia dźwięku"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Nie można utworzyć strumienia obrazu"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Obecnie saldo wynosi %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 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:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Doładuj"
 
@@ -3463,11 +2565,11 @@ msgstr "_Ustawienia"
 msgid "_View"
 msgstr "_Widok"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Spis treści"
 
@@ -3555,19 +2657,19 @@ msgstr "Lokalny kandydat:"
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- komunikator Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Pokój"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Automatyczne Å‚Ä…czenie"
 
@@ -3575,11 +2677,11 @@ msgstr "Automatyczne Å‚Ä…czenie"
 msgid "Manage Favorite Rooms"
 msgstr "ZarzÄ…dzanie ulubionymi pokojami"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Zamknąć to okno?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3588,7 +2690,7 @@ 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3606,12 +2708,12 @@ 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:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Opuścić %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3619,15 +2721,15 @@ msgstr ""
 "Wiadomości z tego pokoju rozmów nie będą odbierane aż do ponownego "
 "dołączenia."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Zamknij okno"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Opuść pokój"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3635,7 +2737,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
 msgstr[1] "%s (%d nieprzeczytane)"
 msgstr[2] "%s (%d nieprzeczytanych)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3643,7 +2745,7 @@ msgstr[0] "%s (i %u inna)"
 msgstr[1] "%s (i %u inne)"
 msgstr[2] "%s (i %u innych)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3651,7 +2753,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:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3659,11 +2761,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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3671,7 +2773,7 @@ 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:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Pisze wiadomość."
 
@@ -3704,106 +2806,114 @@ msgid "Invite _Participant…"
 msgstr "Zaproś _uczestnika…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Dołącz do rozmowy"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Opuść _rozmowę"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "K_ontakt"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Karty"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Poprzednia karta"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Następna karta"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Cofnij zamknięcie karty"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "PrzenieÅ› kartÄ™ w l_ewo"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "PrzenieÅ› kartÄ™ w p_rawo"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Odłącz kartę"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Wyświetla konkretną usługę"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- debuger programu Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Debuger programu Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Odnośnik serwisu Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Odpowiedź serwisu Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Okno debugowania"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Wyślij do serwisu Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Poziom "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informacje"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3820,93 +2930,93 @@ msgstr ""
 "za pomocą zaawansowanych pól w <a href=\"https://bugzilla.gnome.org/"
 "enter_bug.cgi?product=empathy\">zgłoszeniu błędu</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Poziom"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 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-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "PrzychodzÄ…ca rozmowa wideo"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, 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:513
+#: ../src/empathy-event-manager.c:507
 #, 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:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Odrzuć"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Odbierz"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Odbierz z obrazem wideo"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Zaproszenie do pokoju"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Zaproszenie do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, 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:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s zaprosił użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Zaproszono użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Plik przychodzący od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Hasło wymagane"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3916,105 +3026,105 @@ msgstr ""
 "Wiadomość: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s o prędkości %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Błąd podczas odbierania pliku \"%s\" od użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "BÅ‚Ä…d podczas odbierania pliku"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, 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:349
+#: ../src/empathy-ft-manager.c:344
 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:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Wysłano \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Ukończono przesyłanie pliku"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Oczekiwanie na odpowiedź drugiej strony"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sprawdzanie spójności pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obliczanie sumy kontrolnej pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Plik"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Pozostało"
 
@@ -4026,11 +3136,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:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Zaimportuj"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4038,49 +3148,49 @@ msgstr ""
 "Nie odnaleziono kont do zaimportowania. Program Empathy obecnie obsługuje "
 "importowanie kont tylko z programu Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importowanie kont"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Źródło"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Zaproszenie uczestnika"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Proszę wybrać kontakt do zaproszenia do rozmowy:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "ZaproÅ›"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Pokój rozmowy"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Członkowie"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Wyświetlenie listy pokoi się nie powiodło"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4093,17 +3203,17 @@ msgstr ""
 "Wymagane hasło: %s\n"
 "Członkowie: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Tak"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Nie"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Dołączenie do pokoju"
 
@@ -4146,104 +3256,104 @@ msgstr "Nie można wczytać listy pokoi"
 msgid "Room List"
 msgstr "Listy pokoi"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Odpowiedz"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Odbierz z obrazem wideo"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Odmów"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Wprowadź"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Otrzymano wiadomość"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nowa rozmowa"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontakt przeszedł do trybu online"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontakt przeszedł do trybu offline"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Połączono konto"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Rozłączono konto"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Język"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 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:654
+#: ../src/empathy-preferences.c:642
 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:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 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:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Użytkownik Julia został rozłączony"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Preferencje"
 
@@ -4255,7 +3365,7 @@ msgstr "Wyświetlanie grup"
 msgid "Show account balances"
 msgstr "Wyświetlanie salda konta"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Lista kontaktów"
 
@@ -4378,58 +3488,42 @@ msgstr "_Zmniejszenie dokładności położenia"
 msgid "Privacy"
 msgstr "Prywatność"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Telefon komórkowy"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Sieć (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Źródła położenia:"
-
-#: ../src/empathy-preferences.ui.h:40
 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:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Sprawdzanie pisowni dla języków:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Sprawdzanie pisowni"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Motyw _rozmowy:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Wariant:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Motywy"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Wprowadź hasło"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Rozłącz"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Należy ustawić konto, aby wyświetlić kontakty."
 
 #: ../src/empathy-roster-window.c:569
@@ -4443,6 +3537,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4458,8 +3556,8 @@ msgid "Online Accounts"
 msgstr "Konta online"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Zaktualizuj oprogramowanie..."
+msgid "Update software…"
+msgstr "Zaktualizuj oprogramowanie…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4504,24 +3602,26 @@ msgid "No online contacts"
 msgstr "Brak kontaktów w trybie online"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_Nowa rozmowa..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nowa rozmowa…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "Nowa _rozmowa głosowa..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nowa _rozmowa głosowa…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Kontakty"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Dodaj kontakty..."
+msgid "_Add Contacts…"
+msgstr "_Dodaj kontakty…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Wyszukaj kontakty..."
+msgid "_Search for Contacts…"
+msgstr "_Wyszukaj kontakty…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4532,8 +3632,8 @@ msgid "_Rooms"
 msgstr "_Pokoje"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Dołącz..."
+msgid "_Join…"
+msgstr "_Dołącz…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4580,28 +3680,16 @@ msgstr "Przejdź do trybu _online"
 msgid "Show _Offline Contacts"
 msgstr "Wyświetl kontakty w trybie _offline"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Dodaj kontakt..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nowa rozmowa…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nowa _rozmowa głosowa…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stan"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Gotowe"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Proszę podać informacje o koncie"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 194c259fd..b451a4714 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,6 @@
 # Brazilian Portuguese translation of Empathy.
 # Copyright (C) 2013 Free Software Foundation, Inc.
 # This file is distributed under the same license as the empathy package.
-#
 # 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.
@@ -19,14 +18,15 @@
 # Antonio Fernandes C. Neto <fernandesn@gnome.org>, 2011, 2012.
 # Jonh Wendell <jwendell@gnome.org>, 2009, 2010, 2012.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
+# Enrico Nicoletto <liverig@gmail.com>, 2013.
 #
 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: 2013-03-04 16:36+0000\n"
-"PO-Revision-Date: 2013-03-05 10:28-0300\n"
+"POT-Creation-Date: 2013-09-02 15:57+0000\n"
+"PO-Revision-Date: 2013-09-02 08:49-0300\n"
 "Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -530,7 +530,7 @@ msgstr "Erro ao tentar transferir o arquivo"
 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:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Motivo desconhecido"
 
@@ -550,217 +550,157 @@ msgstr "O arquivo selecionado não é um arquivo regular"
 msgid "The selected file is empty"
 msgstr "O arquivo selecionado é vazio"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Senha não encontrada"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "A senha da conta de MI para %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "A senha para a conferência \"%s\" na conta %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Chamou %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../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: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: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: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: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: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:142
-msgid "in the future"
-msgstr "no futuro"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "O status está definido como desconectado"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Falha de autenticação"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Erro de criptografia"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Nome já em uso"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Certificado não fornecido"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Certificado não confiável"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Certificado expirado"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certificado não ativado"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Certificado com nome de máquina incorreto"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificado com impressão digital incorreto"
 
 # self-signed  - Deixei como próprio
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certificado próprio"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Criptografia não disponível"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Certificado inválido"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "A conexão foi recusada"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Não é possível estabelecer conexão"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "A conexão foi perdida"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Esta conta já está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "A conta já existe no servidor"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 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:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 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:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -769,594 +709,33 @@ msgstr ""
 "certificado do servidor excede os limites impostos pela biblioteca de "
 "criptografia"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Seu software é muito antigo"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Pessoas por perto"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! japonês"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Bate-papo Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Todas as contas"
 
-#: ../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
-msgid "Pass_word"
-msgstr "Se_nha"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Lembrar senha"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Porta"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Servidor"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Lembrar senha"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Conta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Senha"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Servidor"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Porta"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Nome de usuário:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "A_plicar"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "C_onectar"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Esta conta já existe no servidor"
-
-# Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Criar uma nova conta no servidor"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Conta no %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nova conta"
-
-#: ../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: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:9
-msgid "What is your GroupWise password?"
-msgstr "Qual é a sua senha do GroupWise?"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "C_odificação de caracteres"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "Qual é a sua senha do ICQ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Rede"
-
-# Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Codificação de caracteres"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Adicionar…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Remover"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Para cima"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Para baixo"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Servidores"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"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:11
-msgid "Nickname"
-msgstr "Apelido"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Mensagem de saída"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Nome verdadeiro"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Nome de usuário"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Qual rede IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Qual é o seu apelido do IRC?"
-
-#: ../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: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 ""
-"Este é o seu nome de usuário, não o seu nome normal do login do Facebook.\n"
-"Se você for um facebook.com/<b>badger</b> insira o <b>badger</b>.\n"
-"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:6
-msgid "What is your Facebook password?"
-msgstr "Qual é a sua senha do Facebook?"
-
-#: ../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: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 "Priori_dade"
-
-#: ../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 "Override server settings"
-msgstr "Sobrescrever configurações do servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Usar criptografia SS_L"
-
-#: ../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:25
-msgid "What is your desired Jabber ID?"
-msgstr "Qual é o seu ID do Jabber desejado?"
-
-#: ../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-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: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 "E-_mail address"
-msgstr "Endereço de e-_mail"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "Qual é seu ID do Windows Live?"
-
-#: ../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-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Auto"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Registrar"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Opções"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Nenhum"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Nome de usuário"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar essa conta para chamar te_lefones e celulares"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Opções transversais de NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opções de proxy"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Opções de miscelânea"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Servidor STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Descobrir o servidor STUN automaticamente"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Descobrir Binding"
-
-#: ../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 "Mechanism"
-msgstr "Mecanismo"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Autenticação do nome de 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 "Loose Routing"
-msgstr "Roteamento frouxo"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorar erros TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Endereço IP local"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Qual é a senha da sua conta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "Se_nha:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "Local da l_ista da sala:"
-
-# Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "C_odificação de caracteres:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Porta:"
-
-#: ../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:11
-msgid "What is your Yahoo! password?"
-msgstr "Qual é a sua senha do Yahoo! ?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Não foi possível converter a imagem"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-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:906
-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:1030
-msgid "Select Your Avatar Image"
-msgstr "Selecione sua imagem de avatar"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Tirar uma foto..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Nenhuma imagem"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Imagens"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Todos os arquivos"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Clique para ampliar"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "A autenticação falhou para a conta <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Repetir"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1366,72 +745,69 @@ msgstr ""
 "Insira a sua senha para a conta\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Selecionar..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Selecionar"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Lembrar senha"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Ocorreu um erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "O contato especificado não suporta chamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "O contato especificado está desconectado"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "O contato especificado é inválido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 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-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Falhou ao abrir bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Tópico sem suporte nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 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:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "ID de contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpa todas as mensagens da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 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:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 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:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 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:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1439,23 +815,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:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 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:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 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:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 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:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1096
+#: ../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 "
@@ -1465,11 +841,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:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 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:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1477,126 +853,126 @@ msgstr ""
 "/help [<comando>]: mostra todos os comandos suportados. Se <comando> estiver "
 "definido, será exibido instruções de uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilização: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconhecido; veja /help para os comandos disponíveis"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "Créditos insuficientes para enviar mensagens"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Erro ao enviar a mensagem \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "incapaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "mensagem muito longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Sem sugestões)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Inserir carinha"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Sugestões de ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Falha ao receber os registros recentes"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1604,12 +980,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulso por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulso"
@@ -1617,17 +993,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi banido por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi banido"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s saiu da sala"
@@ -1637,17 +1013,17 @@ 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:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entrou na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora chama-se %s"
@@ -1655,50 +1031,50 @@ 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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Deseja armazenar esta senha?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Senha errada; por favor, tente novamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Esta sala é protegida por uma senha:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Entrar"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1729,8 +1105,8 @@ msgstr "Editar contatos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1740,120 +1116,63 @@ msgstr "Conta:"
 msgid "Blocked Contacts"
 msgstr "Contatos bloqueados"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Nome completo"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefone"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Endereço de e-mail"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Site da web"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Última atividade:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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:117
-msgid "Away message:"
-msgstr "Mensagem de ausência:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "trabalho"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "casa"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "móvel"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "voz"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "principal"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "recado"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "temporário"
+#: ../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 "Remover"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Pesquisar contatos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Pesquisar: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
-msgstr "_Adicionar Contato"
+msgstr "_Adicionar contato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nenhum contato encontrado"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Pesquisa por contatos sem suporte nesta conversa"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Sua mensagem introduzindo-se:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 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-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Salvar avatares"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Não foi possível salvar o avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Conta"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identificador"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Apelido"
 
@@ -1887,11 +1206,11 @@ msgstr "Versão"
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1899,76 +1218,76 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Adicionar grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 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:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 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-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Editar informações do contato"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Contatos agrupados"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts não está instalado"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Por favor, instale o pacote gnome-contacts para ter acesso aos detalhes do "
@@ -1977,47 +1296,52 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Selecionar a conta que será usada para fazer a chamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "CASA"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Bloquear contato"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Remover do _grupo \"%s\""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Apagar e _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Você realmente deseja remover o contato \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2026,219 +1350,220 @@ 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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Removendo contato"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Remover"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Bate-papo"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Chamada de áudio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Conversas anteriores"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Compartilhar minha área de trabalho"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Favoritos"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Infor_mações"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Convidando você para esta sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar para sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Adicionar Contato..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Removendo grupo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Canais:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Código ISO do país:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�rea:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "CEP:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Endereço:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Construção:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Andar:"
 
 # Evitar colisão com _Salvar
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Nível de eficácia:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Erro na vertical (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Erro na horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Direção:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Taxa de subida:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Atualizado pela última vez em:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Localização"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y em %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Apelido:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identificação:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2253,32 +1578,7 @@ msgstr "<b>Localização</b> em (data)"
 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:335
-msgid "New Network"
-msgstr "Nova rede"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Escolha uma rede de IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Reiniciar a lista de _redes"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Selecionar"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "novo servidor"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2288,11 +1588,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Pessoas por perto"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2300,136 +1600,136 @@ 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."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversa em %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa com %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Chamada durou %s, encerrada às %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Hoje"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Qualquer hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Quem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Qualquer coisa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Chamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Chamadas recebidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Chamadas realizadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Chamadas não atendidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "O que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Limpar tudo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Excluir de:"
 
@@ -2438,20 +1738,20 @@ msgid "_File"
 msgstr "Arquivo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Deletar todo o histórico..."
+msgid "Delete All History…"
+msgstr "Excluir todo o histórico…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Bate-papo"
 
@@ -2465,112 +1765,116 @@ msgid "page 2"
 msgstr "página 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Carregando...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Carregando…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 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:151
-msgid "Adding new account"
-msgstr "Adicionando uma nova conta"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Adicionar nova conta"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Digite um contato ou um número de telefone:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Chamada de áudio"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nova chamada"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "O contato está desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "O contato especificado é inválido ou desconhecido"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 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:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 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:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Você foi banido deste canal"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Este canal está cheio"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 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:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Não é possível prosseguir enquanto estiver desconectado"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Permissão negada"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Ocorreu um erro ao iniciar a conversa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nova conversa"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "É necessário senha"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Mensagens personalizadas..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Editar mensagens personalizadas..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Clique para remover este estado como favorito"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Clique para fazer deste estado um favorito"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2580,25 +1884,16 @@ msgstr ""
 "<small><i>Pressione Enter para definir a nova messagem ou Esc para cancelar."
 "</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Definir estado"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Mensagens personalizadas..."
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nova conta %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "Diferenciar _maiúsculas/minúsculas"
 
@@ -2622,171 +1917,171 @@ msgstr "Diferenciar _maiúsculas de minúsculas"
 msgid "Phrase not found"
 msgstr "Frase não encontrada"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Uma mensagem instantânea foi recebida"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Uma mensagem instantânea foi enviada"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Recebendo chamada para bate-papo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Contato conectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Contato desconectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Conectado no servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Recebendo chamada de voz"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Chamada de voz realizada"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Editar mensagens personalizadas"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Requisição de inscrição"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, 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"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Aceitar"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensagem editada às %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr ""
 "A identidade disponibilizada pelo servidor de bate-papo não pode ser "
 "verificada."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "O certificado não é assinado por uma Autoridade Certificadora."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "O certificado expirou."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "O certificado ainda não foi ativado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "O certificado não tem a impressão digital esperada."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "A máquina verificada pelo certificado não corresponde ao nome do servidor."
 
 # self-signed  - Deixei como próprio
 # Seguindo o comentário anterior. ZehRique
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "O certificado é auto-assinado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "O certificado foi revogado pela Autoridade Certificadora emitente."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "O certificado é criptograficamente fraco."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "O tamanho do certificado excede os limites verificáveis."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "O certificado é mal formado."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Nome de máquina esperado: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Certificado da máquina: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Continuar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Conexão não confiável"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta escolha para conexões futuras"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Detalhes do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Não foi possível abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Espaço livre insuficiente para salvar o arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2795,225 +2090,54 @@ 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Recebendo arquivo de %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Conecte-se para editar sua informação pessoal."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Detalhes pessoais</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Copiar endereço do link"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "Abrir _link"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Inspecionar HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Localidade atual"
-
-#: ../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 "�rabe"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Armênio"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Báltico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Celta"
-
-#: ../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 "Europeu Central"
-
-#: ../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 "Chinês Simplificado"
-
-#: ../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 "Chinês Tradicional"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Croata"
-
-#: ../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 "Cirílico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cirílico/Russo"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cirílico/Ucraniano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Georgiano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Grego"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Guzerate"
-
-#: ../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 "Hebraico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hebraico Visual"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandês"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japonês"
-
-#: ../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 "Coreano"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Nórdico"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Persa"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Romeno"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Europeu do Sul"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Tailandês"
-
-#: ../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 "Turco"
-
-#: ../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 "Ocidental"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamita"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Contatos favoritos"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Pessoas por perto"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Sem grupo"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "O servidor não conseguiu localizar contato: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Nenhuma mensagem de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Mensageiro Instantâneo (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3025,7 +2149,7 @@ msgstr ""
 "do Software Livre (FSF); na versão 2 da Licença, ou (na sua opinião) "
 "qualquer versão."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3036,7 +2160,7 @@ msgstr ""
 "GARANTIA; sem mesmo a garantia implícita de COMERCIABILIDADE ou ADEQUAÇÃO A "
 "PROPÓSITOS ESPEC�FICOS. Veja a Licença Pública Geral GNU para mais detalhes."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3046,11 +2170,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:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Um cliente de mensagens instantâneas para o GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Luiz Guaraldo <software.livre@terra.com.br>\n"
@@ -3069,71 +2193,71 @@ msgstr ""
 "Antonio Fernandes C. Neto <fernandesn@gnome.org>\n"
 "Rafael Ferreira <rafael.f.f1@gmail.com>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<id da conta>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Contas do Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Contas do Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, 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."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Existem modificações da sua conta %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Sua nova conta ainda não foi salva."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Conectando..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Nenhuma conexão de rede"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Status desconhecido"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3143,28 +2267,28 @@ msgstr ""
 "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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desabilitada"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Editar os parâmetros de conexão"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Editar os parâmetros de conexão..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "_Editar parâmetros de conexão…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Você deseja remover %s do seu computador?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Você deseja remover %.50s do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Isso não removerá sua conta no servidor."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3173,24 +2297,24 @@ msgstr ""
 "suas modificações. Você tem certeza que deseja prosseguir?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Habilitado"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Pular"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3199,10 +2323,14 @@ msgstr ""
 "suas modificações. Tem certeza que deseja prosseguir?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Contas de Mensagem e VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Adicionar…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Importar…"
@@ -3223,31 +2351,31 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Nenhum protocolo instalado"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticação do Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Não conectar ao iniciar"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Erro ao contatar o gerenciador de conta"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3260,7 +2388,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Em uma chamada"
 
@@ -3272,93 +2400,93 @@ msgstr "- Cliente de áudio/vídeo do Empathy"
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Recebendo chamada"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Recebendo chamada de vídeo de %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Recebendo chamada de %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Responder"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada de %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "O endereço IP como visto pela máquina"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 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-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "O endereço IP de um servidor de retransmissão"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "O endereço IP do grupo de multicast"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Em espera"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Mudo"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Duração"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Detalhes técnicos"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3367,7 +2495,7 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de áudio com suporte em "
 "seu computador"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3376,7 +2504,7 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de vídeo com suporte em "
 "seu computador"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3385,25 +2513,25 @@ 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-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Ocorreu uma falha de rede"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3414,32 +2542,32 @@ msgstr ""
 "\"%s\">reporte este erro</a> e anexe os registros gerados na janela "
 "\"Depuração\" no menu Ajuda."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu uma falha no mecanismo de chamada"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Alcançado o fim do fluxo"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Não foi possível realizar uma transmissão de áudio"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Não foi possível realizar uma transmissão de vídeo"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Seu saldo atual é %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 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:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Voltar"
 
@@ -3463,11 +2591,11 @@ msgstr "_Configuraçõess"
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Aj_uda"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Sumário"
 
@@ -3555,19 +2683,19 @@ msgstr "Apresentação local:"
 msgid "Audio"
 msgstr "�udio"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
@@ -3575,11 +2703,11 @@ msgstr "Conectar automaticamente"
 msgid "Manage Favorite Rooms"
 msgstr "Gerenciar salas favoritas"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Fechar esta janela?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3588,7 +2716,7 @@ 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3603,66 +2731,66 @@ 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:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Sair de %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Fechar a janela"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Sair da sala"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, 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:692
+#: ../src/empathy-chat-window.c:684
 #, 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:708
+#: ../src/empathy-chat-window.c:700
 #, 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:717
+#: ../src/empathy-chat-window.c:709
 #, 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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, 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:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Digitando uma mensagem."
 
@@ -3695,106 +2823,114 @@ msgid "Invite _Participant…"
 msgstr "Convidar _participante..."
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "E_ntrar no bate-papo"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Abandonar o _bate-papo"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "C_ontato"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Abas"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Aba _anterior"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Próxima aba"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Desfazer fechar aba"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Mover aba para a _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Mover aba para a _direita"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Destacar aba"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Mostrar um determinado serviço"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Depurador Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Depurador do Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Link do pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Resposta do pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Enviar para o pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informações"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3813,23 +2949,23 @@ msgstr ""
 "href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">relatório "
 "de erro</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3837,70 +2973,70 @@ msgstr ""
 "O gerenciador de conexões selecionado não suporta a extensão de depuração "
 "remota."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Recebendo chamada de vídeo"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s está chamando você via vídeo. Você deseja atender?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s está chamando você. Você deseja atender?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "R_esponder"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Responder com vídeo"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Convite de sala"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para entrar em %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidando você para entrar em %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "E_ntrar"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s o convidou para entrar em %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Você foi convidado para entrar em %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Recebendo transferência de arquivo de %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Senha requerida"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3911,106 +3047,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:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s em %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erro recebendo \"%s\" de %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Erro recebendo arquivo"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erro enviando \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 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:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" enviado para %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Transferência de arquivo concluída"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Aguardando a resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verificando integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Fazendo hash de \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Restando"
 
@@ -4022,11 +3158,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:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importar"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4034,49 +3170,49 @@ 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:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Origem"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Escolha um contato para convidar para a conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Sala de bate-papo"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Membros"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Falha ao listar as salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4089,17 +3225,17 @@ msgstr ""
 "Senha requerida: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Não"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Entrar na sala"
 
@@ -4146,104 +3282,104 @@ msgstr "Não foi possível carregar lista de salas"
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Responder com vídeo"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nova conversa"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Um contato se conecta"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Um contato se desconecta"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Uma conta se conecta"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Uma conta se desconecta"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "Romeu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 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:654
+#: ../src/empathy-preferences.c:648
 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:657
+#: ../src/empathy-preferences.c:651
 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:660
+#: ../src/empathy-preferences.c:654
 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:663
+#: ../src/empathy-preferences.c:657
 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:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "Julieta desconectou"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "Preferências"
 
@@ -4255,7 +3391,7 @@ msgstr "Mostra grupos"
 msgid "Show account balances"
 msgstr "Mostra o balanço da conta"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Lista de contatos"
 
@@ -4422,16 +3558,16 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Forneça a senha"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Desconectar"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Você precisa adicionar uma conta para ver seus contatos aqui."
 
 #: ../src/empathy-roster-window.c:569
@@ -4445,6 +3581,10 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4460,8 +3600,8 @@ msgid "Online Accounts"
 msgstr "Contas disponíveis"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Atualizar software..."
+msgid "Update software…"
+msgstr "Atualizar software…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4507,11 +3647,13 @@ msgid "No online contacts"
 msgstr "Nenhum contato está online"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Nova conversa..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "Nova _chamada..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4519,12 +3661,12 @@ msgid "Contacts"
 msgstr "Contatos"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Adicionar contatos..."
+msgid "_Add Contacts…"
+msgstr "_Adicionar Contatos…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Pesquisar por contatos..."
+msgid "_Search for Contacts…"
+msgstr "_Pesquisar por contatos…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4535,8 +3677,8 @@ msgid "_Rooms"
 msgstr "_Salas"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Entrar..."
+msgid "_Join…"
+msgstr "E_ntrar..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4583,28 +3725,16 @@ msgstr "Entrar _online"
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatos desc_onectados"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Adicionar contato..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nova conversa..."
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nova _chamada..."
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Finalizado"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Por favor, entre com os detalhes da sua conta"
 
@@ -4617,369 +3747,122 @@ msgstr "Editar opções da conta %s"
 msgid "Integrate your IM accounts"
 msgstr "Integra suas contas de mensagens instantâneas"
 
-#~ msgid "i"
-#~ msgstr "i"
-
-#~ msgid "Manage Messaging and VoIP accounts"
-#~ msgstr "Gerencia contas de mensagem e VoIP"
-
-#~ msgid "Show avatars"
-#~ msgstr "Mostra avatares"
-
-#~ 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 "Show protocols"
-#~ msgstr "Exibir protocolos"
-
-#~ msgid "Whether to show protocols for contacts in the contact list."
-#~ msgstr "Mostra os protocolos para contatos na lista de contatos."
-
-#~ msgid "Compact contact list"
-#~ msgstr "Lista de contatos compacta"
-
-#~ msgid "Whether to show the contact list in compact mode."
-#~ msgstr "Mostra a lista de contatos no modo compacto."
-
-#~ msgid "Contact list sort criterion"
-#~ msgstr "Critério de ordenação da lista de contatos"
-
-#~ 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."
-
-#~ msgid "Network:"
-#~ msgstr "Rede:"
-
-#~ msgid "Password:"
-#~ msgstr "Senha:"
-
-#~ msgid "Port:"
-#~ msgstr "Porta:"
-
-#~ msgid "“%s� is not a valid contact ID"
-#~ msgstr "\"%s\" não é um identificador de contato válido"
-
-#~ msgid "%A %B %d %Y"
-#~ msgstr "%A, %d de %B de %Y"
-
-#~ msgid "_Block User"
-#~ msgstr "_Bloquear usuário"
-
-#~ msgid "Decide _Later"
-#~ msgstr "Decidir _depois"
-
-#~ msgid "Classic"
-#~ msgstr "Clássico"
-
-#~ msgid "Simple"
-#~ msgstr "Simples"
-
-#~ msgid "Clean"
-#~ msgstr "Limpo"
-
-#~ msgid "Blue"
-#~ msgstr "Azul"
-
-#~ msgid "Failed to retrieve your personal information from the server."
-#~ msgstr "Falha ao recuperar sua informação pessoal do servidor."
-
-#~ msgid "_Disable"
-#~ msgstr "_Desabilitar"
-
-#~ msgid "Contrast"
-#~ msgstr "Contraste"
-
-#~ msgid "Brightness"
-#~ msgstr "Brilho"
-
-#~ msgid "Gamma"
-#~ msgstr "Gama"
-
-#~ msgid "Volume"
-#~ msgstr "Volume"
-
-#~ msgid "_Sidebar"
-#~ msgstr "_Painel lateral"
-
-#~ msgid "Audio input"
-#~ msgstr "Entrada de áudio"
-
-#~ msgid "Video input"
-#~ msgstr "Entrada de vídeo"
-
-#~ msgid "Dialpad"
-#~ msgstr "Teclado"
-
-#~ msgid "Details"
-#~ msgstr "Detalhes"
-
-#~ msgctxt "codec"
-#~ msgid "Unknown"
-#~ msgstr "Desconhecido"
-
-#~ msgid "Connected — %d:%02dm"
-#~ msgstr "Conectado — %d:%02dm"
-
-#~ msgid "Send Video"
-#~ msgstr "Enviar _vídeo"
-
-#~ msgid "Send Audio"
-#~ msgstr "Enviar áudio"
-
-#~ msgid "Top up %s (%s)..."
-#~ msgstr "Recarregar %s (%s)..."
-
-#~ msgid "Top Up..."
-#~ msgstr "Recarregar..."
-
-#~ msgid "_Offline Contacts"
-#~ msgstr "Contatos _desconectados"
-
-#~ msgid "Show P_rotocols"
-#~ msgstr "Exibir p_rotocolos"
-
-#~ msgid "Credit Balance"
-#~ msgstr "Créditos"
-
-#~ msgid "Contacts on a _Map"
-#~ msgstr "Contatos no _mapa"
-
-#~ msgid "Find in Contact _List"
-#~ msgstr "Procurar na _lista de contatos"
-
-#~ msgid "Sort by _Name"
-#~ msgstr "Ordenar por _nome"
-
-#~ msgid "Sort by _Status"
-#~ msgstr "Ordenar por _status"
-
-#~ msgid "Normal Size With _Avatars"
-#~ msgstr "Tamanho normal com _avatares"
-
-#~ msgid "N_ormal Size"
-#~ msgstr "Tamanho no_rmal"
-
-#~ msgid "_Compact Size"
-#~ msgstr "Tamanho _compacto"
-
-#~ msgid "_Join…"
-#~ msgstr "E_ntrar..."
-
-#~ msgid "Could not start room listing"
-#~ msgstr "Não é possível iniciar a listagem de salas"
-
-#~ msgid "Could not stop room listing"
-#~ msgstr "Não foi possível parar a listagem de salas"
-
-#~ msgid "Appearance"
-#~ msgstr "Aparência"
-
-#~ msgid "Redial"
-#~ msgstr "Rediscar"
-
-#~ msgid "V_ideo"
-#~ msgstr "V_ídeo"
-
-#~ msgid "Video Off"
-#~ msgstr "Vídeo desligado"
-
-#~ msgid "Video Preview"
-#~ msgstr "Visualização de vídeo"
-
-#~ msgid "Video On"
-#~ msgstr "Vídeo ligado"
-
-#~ msgid "Call the contact again"
-#~ msgstr "Chamar o contato novamente"
-
-#~ msgid "Camera Off"
-#~ msgstr "Câmera desligada"
-
-#~ msgid "Disable camera and stop sending video"
-#~ msgstr "Desabilitar a câmera e parar o envio de vídeo"
-
-#~ msgid "Preview"
-#~ msgstr "Pré-visualizar"
-
-#~ msgid "Enable camera but don't send video"
-#~ msgstr "Habilitar a câmera, mas não enviar vídeo"
-
-#~ msgid "Camera On"
-#~ msgstr "Câmera ligada"
-
-#~ msgid "Enable camera and send video"
-#~ msgstr "Habilitar a câmera e enviar vídeo"
-
-#~ msgid "Contact Map View"
-#~ msgstr "Visualização do mapa 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 "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 "_Edit Connection Parameters..."
+#~ msgstr "_Editar os parâmetros de conexão..."
 
-#~ msgid "Favorite People"
-#~ msgstr "Amigos prediletos"
+#~ msgid "_New Conversation..."
+#~ msgstr "_Nova conversa..."
 
-#~ msgctxt "Edit contact (contextual menu)"
-#~ msgid "_Edit"
-#~ msgstr "_Editar"
+#~ msgid "New _Call..."
+#~ msgstr "Nova _chamada..."
 
-#~ msgid "Select contacts to link"
-#~ msgstr "Selecionar contato para agrupar"
+#~ msgid "_Add Contacts..."
+#~ msgstr "_Adicionar contatos..."
 
-#~ msgid "New contact preview"
-#~ msgstr "Visualização de novo contato"
+#~ msgid "_Join..."
+#~ msgstr "_Entrar..."
 
-#~ 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."
+#~ msgid "_Add Contact..."
+#~ msgstr "_Adicionar contato..."
 
-#~ msgctxt "Link individual (contextual menu)"
-#~ msgid "_Link Contacts…"
-#~ msgstr "Agr_upar contatos…"
+#~ msgid "Password not found"
+#~ msgstr "Senha não encontrada"
 
-#~ msgid "Link Contacts"
-#~ msgstr "Contatos agrupados"
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "A senha da conta de MI para %s (%s)"
 
-#~ msgctxt "Unlink individual (button)"
-#~ msgid "_Unlink…"
-#~ msgstr "_Desagrupar..."
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "A senha para a conferência \"%s\" na conta %s (%s)"
 
-#~ 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 "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "%d segundo atrás"
+#~ msgstr[1] "%d segundos atrás"
 
-#~ msgid "_Link"
-#~ msgstr "_Agrupar"
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d minuto atrás"
+#~ msgstr[1] "%d minutos atrás"
 
-#~ msgid "Unlink linked contacts '%s'?"
-#~ msgstr "Desagrupar meta-contato \"%s\"?"
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d hora atrás"
+#~ msgstr[1] "%d horas atrá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."
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d dia atrás"
+#~ msgstr[1] "%d dias atrás"
 
-#~ msgctxt "Unlink individual (button)"
-#~ msgid "_Unlink"
-#~ msgstr "_Desconectar"
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d semana atrás"
+#~ msgstr[1] "%d semanas atrás"
 
-#~ msgid "Contact ID:"
-#~ msgstr "ID do contato:"
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "%d mês atrás"
+#~ msgstr[1] "%d meses atrás"
 
-#~ msgid "C_hat"
-#~ msgstr "Ba_te-papo"
+#~ msgid "in the future"
+#~ msgstr "no futuro"
 
-#~ msgid "Send _Video"
-#~ msgstr "Enviar _vídeo"
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! japonês"
 
-#~ msgid "C_all"
-#~ msgstr "Ch_amar"
+#~ msgid "Facebook Chat"
+#~ msgstr "Bate-papo Facebook"
 
-#~ msgid "Set your presence and current status"
-#~ msgstr "Define sua presença e estado atual"
+#~ msgid "Pass_word"
+#~ msgstr "Se_nha"
 
-#~ msgid "The selected contact cannot receive files."
-#~ msgstr "O contato selecionado não pode receber arquivos."
+#~ msgid "Screen _Name"
+#~ msgstr "_Nome exibido"
 
-#~ msgid "The selected contact is offline."
-#~ msgstr "O contato selecionado está desconectado."
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>Exemplo:</b> MeuNomeExibido"
 
-#~ msgid "There was an error while importing the accounts."
-#~ msgstr "Ocorreu um erro ao importar as contas."
+#~ msgid "_Port"
+#~ msgstr "_Porta"
 
-#~ msgid "There was an error while parsing the account details."
-#~ msgstr "Ocorreu um erro ao analisar os detalhes da conta."
+#~ msgid "_Server"
+#~ msgstr "_Servidor"
 
-#~ msgid "There was an error while creating the account."
-#~ msgstr "Ocorreu um erro ao criar a conta."
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
 
-#~ msgid "There was an error."
-#~ msgstr "Ocorreu um erro."
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "Qual é o seu apelido do AIM?"
 
-#~ msgid "The error message was: %s"
-#~ msgstr "A mensagem de erro foi: %s"
+#~ msgid "What is your AIM password?"
+#~ msgstr "Qual é a sua senha do AIM?"
 
-#~ 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 "Remember Password"
+#~ msgstr "Lembrar senha"
 
-#~ msgid "An error occurred"
-#~ msgstr "Houve um erro"
+#~ msgid "Password"
+#~ msgstr "Senha"
 
-#~ msgid "Do you have any other chat accounts you want to set up?"
-#~ msgstr "Você possui alguma outra conta que deseja configurar?"
+#~ msgid "Server"
+#~ msgstr "Servidor"
 
-#~ msgid "What kind of chat account do you want to create?"
-#~ msgstr "Qual tipo de conta de bate-papo você deseja criar?"
+#~ msgid "Port"
+#~ msgstr "Porta"
 
-#~ msgid "Do you want to create other chat accounts?"
-#~ msgstr "Você deseja criar outras contas de bate-papo?"
+#~ msgid "%s"
+#~ msgstr "%s"
 
-#~ msgid "Enter the details for the new account"
-#~ msgstr "Digite os detalhes para a nova conta"
+#~ msgid "%s:"
+#~ msgstr "%s:"
 
-#~ 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 "Username:"
+#~ msgstr "Nome de usuário:"
 
-#~ 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 "A_pply"
+#~ msgstr "A_plicar"
 
-#~ msgid "Yes, import my account details from "
-#~ msgstr "Sim, importe os detalhes da minha conta de "
+#~ msgid "L_og in"
+#~ msgstr "C_onectar"
 
-#~ msgid "Yes, I'll enter my account details now"
-#~ msgstr "Sim, eu digitarei os detalhes da minha conta agora"
+#~ msgid "This account already exists on the server"
+#~ msgstr "Esta conta já existe no servidor"
diff --git a/po/ru.po b/po/ru.po
index 47e280bb5..fa13abf5b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,19 +13,17 @@
 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: 2013-03-16 15:57+0000\n"
-"PO-Revision-Date: 2013-03-22 16:35+0400\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-09-05 13:09+0000\n"
+"PO-Revision-Date: 2013-09-09 16:14+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: ру��кий <gnome-cyr@gnome.org>\n"
 "Language: ru_RU\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"
-"X-Generator: Gtranslator 2.91.6\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: Poedit 1.5.7\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -45,20 +43,15 @@ msgstr "Общайте�ь в Google Talk, Facebook, MSN и во многих д
 
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
-msgstr ""
-"чат;бе�еда;�ообщение;chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr "чат;бе�еда;�ообщение;chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "И�пользуемые ди�петчеры �оединений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или "
-"переподключени�."
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "И�пользовать ли менеджеры �в�зно�ти дл� автоматиче�кого отключени� или переподключени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
@@ -66,19 +59,15 @@ msgstr "При�оедин�ть�� при запу�ке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
+msgstr "Должен ли Empathy автоматиче�ки входить в ваши учётные запи�и при запу�ке."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "У�танавливать �тату� «от�ут�твует» при бездей�твии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:6
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при "
-"бездей�твии пользовател�."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматиче�ки у�танавливать �тату� «от�ут�твует» при бездей�твии пользовател�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
@@ -91,18 +80,11 @@ msgstr "Каталог по умолчанию длÑ� Ñ�охранениÑ� прÐ
 #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
 #: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr ""
-"Магиче�кое чи�ло, и�пользуемое дл� проверки того, нужно ли запу�тить задачи "
-"по очи�тке"
+msgstr "Магиче�кое чи�ло, и�пользуемое дл� проверки того, нужно ли запу�тить задачи по очи�тке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid ""
-"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
-"should be executed or not. Users should not change this key manually."
-msgstr ""
-"empathy-sanity-cleaning.c и�пользует �то чи�ло дл� проверки, нужно ли "
-"запу�тить задачи по очи�тке. Пользователи не должны измен�ть вручную "
-"значение �того ключа."
+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.h:12
 #: ../src/empathy-preferences.ui.h:1
@@ -150,12 +132,8 @@ msgid "Display incoming events in the status area"
 msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, "
-"показывать их непо�ред�твенно пользователю."
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать на�тупающие �обыти� в обла�ти �о�то�ни�. Е�ли ключ не у�тановлен, показывать их непо�ред�твенно пользователю."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
@@ -187,9 +165,7 @@ msgstr "Выключить звуки в �о�то�нии «от�ут�тву
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не "
-"бе�покоить»."
+msgstr "Во�производить ли звуковые уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
@@ -228,8 +204,7 @@ msgid "Play a sound when a contact logs out"
 msgstr "Во�производить ли звук при выходе контакта из �ети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Во�производить ли звук дл� уведомлени� о выходе �обе�едников из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:42
@@ -262,21 +237,15 @@ msgstr "Выключить в�плывающие уведомлени� в �о
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не "
-"бе�покоить»."
+msgstr "Показывать ли в�плывающие уведомлени� в �о�то�ни�х «от�ут�твует» или «не бе�покоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Показывать в�плывающие уведомлени�, е�ли бе�еда находит�� не в фоку�е"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:51
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Показывать ли в�плывающее уведомление о получении нового �ообщени�, когда "
-"бе�еда уже ведёт��, но не находит�� в фоку�е."
+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.h:52
 msgid "Pop up notifications when a contact logs in"
@@ -284,8 +253,7 @@ msgstr "Показывать в�плывающие уведомлени�, ко
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит в �еть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
@@ -293,8 +261,7 @@ msgstr "Показывать в�плывающие уведомлени�, ко
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
+msgstr "Показывать ли в�плывающее уведомление, когда �обе�едник выходит из �ети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
@@ -302,9 +269,7 @@ msgstr "И�пользовать графиче�кие улыбки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие "
-"изображени�."
+msgstr "Преобразовывать ли тек�товые улыбки (�майлы) в бе�едах в графиче�кие изображени�."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
@@ -327,8 +292,7 @@ msgid "Chat window theme variant"
 msgstr "Вариант тема дл� окна бе�еды"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "Вариант темы, и�пользуемый дл� отображени� бе�ед."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:64
@@ -336,35 +300,24 @@ msgid "Path of the Adium theme to use"
 msgstr "Путь к и�пользуемой теме Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid ""
-"Path of the Adium theme to use if the theme used for chat is Adium. "
-"Deprecated."
-msgstr ""
-"Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium. "
-"У�тарело."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
+msgstr "Путь к и�пользуемой теме Adium, е�ли тема, и�пользуема� дл� бе�еды — Adium. У�тарело."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Включить ин�трументы разработчика WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Должны ли быть включены ин�трументы разработчика WebKit, например Web "
-"Inspector."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Должны ли быть включены ин�трументы разработчика WebKit, например Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "Уведомл�ть пользователей о наборе �ообщений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid ""
-"Whether to send the 'composing' or 'paused' chat states. Does not currently "
-"affect the 'gone' state."
-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.h:70
 msgid "Use theme for chat rooms"
@@ -379,19 +332,15 @@ msgid "Spell checking languages"
 msgstr "Языки дл� проверки орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:73
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Спи�ок �зыков, и�пользуемых при проверке орфографии, разделённых зап�тыми "
-"(например «en, fr, ru»)."
+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.h:74
 msgid "Enable spell checker"
 msgstr "Включить проверку орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Провер�ть ли введённые �лова из �пи�ка �зыков дл� проверки орфографии."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:76
@@ -399,20 +348,15 @@ msgid "Nick completed character"
 msgstr "Символ автодополнени� п�евдонима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:77
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� "
-"автодополнение п�евдонимов по клавише Tab."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ дл� добавлени� по�ле п�евдонима, е�ли в бе�еде и�пользует�� автодополнение п�евдонимов по клавише Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy должен и�пользовать аватар контакта как значок окна � бе�едой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:79
-msgid ""
-"Whether 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."
 msgstr "И�пользовать ли аватар �обе�едника в каче�тве значка окна бе�еды."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:80
@@ -421,9 +365,7 @@ msgstr "По�ледн�� учётна� запи�ь, выбранна� в д
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к "
-"комнате."
+msgstr "Путь к объекту D-Bus по�ледней учётной запи�и, выбранной дл� при�оединени� к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
@@ -439,9 +381,7 @@ msgstr "Положение камеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
-msgstr ""
-"Предварительный про�мотр положени� камеры должен выполн�ть�� в течение "
-"вызова."
+msgstr "Предварительный про�мотр положени� камеры должен выполн�ть�� в течение вызова."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
@@ -456,12 +396,8 @@ msgid "Show hint about closing the main window"
 msgstr "Показывать под�казку о закрытии главного окна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Показывать ли диалоговое окно при закрытии главного окна � помощью кнопки "
-"«x» в �троке заголовка."
+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.h:90
 msgid "Empathy can publish the user's location"
@@ -469,45 +405,15 @@ msgstr "Empathy может публиковать меÑ�тоположение Ð
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Может ли Empathy публиковать ме�тоположение пользовател� дл� его "
-"�обе�едников."
+msgstr "Может ли Empathy публиковать ме�тоположение пользовател� дл� его �обе�едников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy может и�пользовать �еть дл� определени� ме�тоположени�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Может ли Empathy и�пользовать �еть дл� определени� ме�тоположени�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy может и�пользовать �отовую �еть дл� определени� ме�тоположени�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Может ли Empathy и�пользовать �отовую �еть дл� определени� ме�тоположени�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy может и�пользовать GPS дл� определени� ме�тоположени�"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Может ли Empathy и�пользовать GPS дл� определени� ме�тоположени�."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy должен �нижать точно�ть ме�тоположени�"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам "
-"приватно�ти."
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точно�ть определени� ме�тоположени� по причинам приватно�ти."
 
 #: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
@@ -533,7 +439,8 @@ msgstr "Во времÑ� передачи файла возникла ошибкÐ
 msgid "The other participant is unable to transfer the file"
 msgstr "Собе�едник не может передавать файлы"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "�еизве�тна� причина"
 
@@ -553,812 +460,193 @@ msgstr "Выбранный файл не Ñ�влÑ�етÑ�Ñ� обычным файÐ
 msgid "The selected file is empty"
 msgstr "Выбранный файл пу�т"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Пароль не найден"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Пароль к учётной запи�и МС дл� %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Пароль дл� комнаты общени� «%s» у учётной запи�и %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402
+#: ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущенный вызов от %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Разговор � %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Вызов от %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d �екунду назад"
-msgstr[1] "%d �екунды назад"
-msgstr[2] "%d �екунд назад"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d минуту назад"
-msgstr[1] "%d минуты назад"
-msgstr[2] "%d минут назад"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d ча� назад"
-msgstr[1] "%d ча�а назад"
-msgstr[2] "%d ча�ов назад"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d день назад"
-msgstr[1] "%d дн� назад"
-msgstr[2] "%d дней назад"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d неделю назад"
-msgstr[1] "%d недели назад"
-msgstr[2] "%d недель назад"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ме��ц назад"
-msgstr[1] "%d ме��ца назад"
-msgstr[2] "%d ме��цев назад"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "в будущем"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "В �ети"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "�е бе�покоить"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "От�ут�твует"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "�евидимо�ть"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "�е в �ети"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "У�тановлен �тату� «не в �ети»"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Ошибка �ети"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "�утентификаци� не удала�ь"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Ошибка шифровани�"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Им� уже зан�то"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Сертификат недо�тупен"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Сертификат не �вл�ет�� доверенным"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Сертификат у�тарел"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249
+#: ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Имена узлов �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечатки �ертификатов не �овпадают"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Сертификат подпи�ан �амо�то�тельно"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Ошибка �ертификата"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Шифрование недо�тупно"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "�еверный �ертификат"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Запро� на подключение отклонён"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "�е удало�ь у�тановить �оединение"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Соединение разорвано"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Эта учётна� запи�ь уже подключена к �ерверу"
 
-#: ../libempathy/empathy-utils.c:350
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:303
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Подключение было замещено новым подключение � �тим же ре�ур�ом"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Учётна� запи�ь уже �уще�твует на �ервере"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
-msgstr ""
-"В на�то�щий момент �ервер �лишком загружен, чтобы обработать подключение."
+msgstr "В на�то�щий момент �ервер �лишком загружен, чтобы обработать подключение."
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../libempathy/empathy-utils.c:359
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"Сертификат и�пользует небезопа�ный алгоритм шифра или криптографиче�ки �лаб"
+#: ../libempathy/empathy-utils.c:312
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "Сертификат и�пользует небезопа�ный алгоритм шифра или криптографиче�ки �лаб"
 
-#: ../libempathy/empathy-utils.c:362
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Длина �ертификата �ервера или глубина цепочки �ертификатов �ервера превышает "
-"предел, у�тановленный криптографиче�кой библиотекой"
+#: ../libempathy/empathy-utils.c:315
+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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Слишком �тара� вер�и� приложени�"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Люди поблизо�ти"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Япони�"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Бе�еда Facebook"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "В�е учётные запи�и"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "_Пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Запомнить пароль"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "П_орт"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Сервер"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Запомнить пароль"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Учётна� запи�ь"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Пароль"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Сервер"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Порт"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Им� пользовател�:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "П_рименить"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Войти"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Эта учётна� запи�ь уже �уще�твует на �ервере"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Создать новую учётную запи�ь на �ервере"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Учётна� запи�ь %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "�ова� учётна� запи�ь"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "_Идентификатор"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "Какой у ва� пароль GroupWise?"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "_Кодировка"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "Какой у ва� пароль ICQ?"
-
-#: ../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 "Кодировка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Добавить…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Удалить"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Вверх"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Вниз"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Серверы"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Большин�тво �ерверов IRC не требует парол�, е�ли вы не уверены, то не "
-"вводите пароль."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "П�евдоним"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Сообщение при выходе"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "�а�то�щее им�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Им� пользовател�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Кака� �еть IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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.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 ID?"
-
-#: ../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 "Override server settings"
-msgstr "Замещать на�тройки �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "И�пользовать �тарое _шифрование (SSL)"
-
-#: ../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: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 вы хотите?"
-
-#: ../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 "_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 "E-_mail address"
-msgstr "�_дре� �л. почты"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Пример:</b> user@hotmail.com"
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr "Какой у ва� пароль Windows Live?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "�втоматиче�кий"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Options"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "От�ут�твует"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Им� пользовател�"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"И�пользовать �ту учётную запи�ь дл� звонков на _обычные и мобильные телефоны"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Параметры NAT Traversal"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Параметры прок�и"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Различные параметры"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Сервер STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "�втоматиче�кий пои�к �ервера STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-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 "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 "Transport"
-msgstr "Тран�порт"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Свободна� маршрутизаци�"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Игнорировать ошибки TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Локальный IP-адре�"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Какой у ва� пароль учётной запи�и SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Пароль:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "_Локаль �пи�ка бе�ед:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "_Кодировка:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-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:11
-msgid "What is your Yahoo! password?"
-msgstr "Какой у ва� пароль Yahoo! ?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "�е удало�ь преобразовать изображение"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"�и один из разрешённых форматов изображений не поддерживает�� в вашей �и�теме"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "�е удало�ь �охранить изображение в файл"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Выберите изображение дл� аватара"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Сделать �нимок…"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "�ет изображени�"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Изображени�"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "В�е файлы"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Щёлкните дл� увеличени�"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Сбой проверки подлинно�ти учётной запи�и <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Повторить"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1368,237 +656,223 @@ msgstr ""
 "Введите пароль дл� учётной запи�и\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Выбрать…"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "В_ыбрать"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Во врем� вызова произошла ошибка"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Указанный контакт не поддерживает звонки"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Указанный �обе�едник не находит�� в �ети"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Указанный �обе�едник не �вл�ет�� допу�тимым"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Срочные телефонные звонки не поддерживают�� �тим протоколом"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "�едо�таточно �ред�тв, чтобы �делать �тот звонок"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "�е удало�ь открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "В �той бе�еде темы не поддерживают��"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Вы не можете мен�ть тему"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "�еверный ID �обе�едника"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очи�тить в�е �ообщени� в текущей бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: у�тановить тему текущей бе�еды"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
-msgstr ""
-"/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
+#: ../libempathy-gtk/empathy-chat.c:1073
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
+msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID контакта> [<�ообщение>]: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID контакта> <�ообщение>: открыть личную бе�еду"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <п�евдоним>: изменить п�евдоним на текущем �ервере"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <�ообщение>: отправить �ообщение о ДЕЙСТВИИ"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
-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: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 <�ообщение>: отправить <�ообщение> в текущей бе�еде. И�пользует�� дл� отправки �ообщени�, начинающего�� � «/». �апример: «/say /join и�пользует�� дл� входа в новую комнату»"
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID контакта>: показать информацию о контакте"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<команда>]: показать в�е поддерживаемые команды. Е�ли <команда> "
-"определена, показать её и�пользование."
+#: ../libempathy-gtk/empathy-chat.c:1097
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<команда>]: показать в�е поддерживаемые команды. Е�ли <команда> определена, показать её и�пользование."
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "И�пользование: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "�еизве�тна� команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "�еизве�тна� команда; дл� в�ех до�тупных команд �м. /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "недо�таточно �ред�тв дл� отправки �ообщени�"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548
+#: ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Ошибка при отправке �ообщени� «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr ""
-"недо�таточно �ред�тв дл� отправки �ообщени�. <a href='%s'>Пополнить</a>."
+msgstr "недо�таточно �ред�тв дл� отправки �ообщени�. <a href='%s'>Пополнить</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "не поддерживает��"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "не в �ети"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "неверный �обе�едник"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "отказано"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "�лишком длинное �ообщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "�та возможно�ть не �анкционирована"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686
+#: ../src/empathy-chat-window.c:974
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Тема не у�тановлена"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(�ет предположений)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавить «%s» в �ловарь «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "В�тавить улыбку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "От_править"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Варианты правопи�ани�"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "�е удало�ь получить по�ледние журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s отключил��"
@@ -1606,12 +880,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s выгнал %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s выгнали"
@@ -1619,17 +893,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s забанил %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s забанили"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинул бе�еду"
@@ -1639,17 +913,17 @@ msgstr "%s покинул бе�еду"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s при�оединил�� к бе�еде"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь изве�тен как %s"
@@ -1657,50 +931,54 @@ msgstr "%s теперь изве�тен как %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099
+#: ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574
+#: ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960
+#: ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "От�оединён"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Хотите запомнить �тот пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "�е �ейча�"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "�еправильный пароль. Попробуйте �нова:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Эта комната защищена паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Войти"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193
+#: ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Соединён"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Бе�еда"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1731,8 +1009,8 @@ msgstr "Изменить заблокированных �обе�едников
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1742,120 +1020,63 @@ msgstr "Учётна� запи�ь:"
 msgid "Blocked Contacts"
 msgstr "Заблокированные �обе�едники"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Полное им�:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "�омер телефона:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "�дре� �л. почты:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Веб-�айт:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "По�ледний раз в �ети:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Подключено �:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Сообщение об от�ут�твии:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "рабочий"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "домашний"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "мобильный"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "голо�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "предпочтительный"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "почтовый"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "Удалить"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Пои�к �обе�едников"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Пои�к:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Добавить �обе�едника"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Собе�едники не найдены"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Пои�к контактов не поддерживает�� дл� �той учётной запи�и"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Ваше �ообщение, не�колько �лов о �ебе:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Разрешите мне видеть, когда вы находите�ь в �ети. Спа�ибо!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Сохранить аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "�е удало�ь �охранить аватар"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Учётна� запи�ь"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Идентификатор"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "П�евдоним"
 
@@ -1889,357 +1110,354 @@ msgstr "Вер�и�"
 msgid "Client"
 msgstr "Программа-клиент"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Группы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Выберите группы, в которых должен по�вить�� �обе�едник. Можно выбрать больше "
-"одной группы или не выбирать вообще."
+#: ../libempathy-gtk/empathy-groups-widget.c:330
+msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
+msgstr "Выберите группы, в которых должен по�вить�� �обе�едник. Можно выбрать больше одной группы или не выбирать вообще."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Добавить группу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Группа"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "�овый �обе�едник"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокировать %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "Уверены, что хотите заблокировать «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следующего �обе�едника нельз� заблокировать:"
 msgstr[1] "Следующих �обе�едников нельз� заблокировать:"
 msgstr[2] "Следующих �обе�едников нельз� заблокировать:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Заблокировать"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Пожаловать�� на �того �обе�едника"
 msgstr[1] "_Пожаловать�� на �тих �обе�едников"
 msgstr[2] "_Пожаловать�� на �тих �обе�едников"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Редактировать информацию о �обе�еднике"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Объединённые контакты"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts не у�тановлен"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
-msgstr ""
-"Чтобы получить до�туп к �ведени�м о пользовател�х, у�тановите gnome-contacts"
+msgstr "Чтобы получить до�туп к �ведени�м о пользовател�х, у�тановите gnome-contacts"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Выберите учётную запи�ь дл� вызова"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Вызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "ДОМ�Ш�ИЙ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Заблокировать �обе�едника"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Удалить из _группы «%s»"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Удалить и _заблокировать"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Дей�твительно хотите удалить �обе�едника «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"Дей�твительно удалить �в�занный контакт «%s»? Это приведёт к удалению в�ех "
-"контактов, которые �вл�ют�� ча�тью �того �в�занного контакта."
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr "Дей�твительно удалить �в�занный контакт «%s»? Это приведёт к удалению в�ех контактов, которые �вл�ют�� ча�тью �того �в�занного контакта."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Удаление �обе�едника"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Удалить"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Разговор"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удиовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Предыдущие _бе�еды"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Предо�тавить до�туп к моему рабочему �толу"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Избранный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "Информ_аци�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Правка"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1277
 msgid "Inviting you to this room"
 msgstr "Приглашение в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Пригла�ить в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Добавить �обе�едника…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вы хотите удалить группу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Удаление группы"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Пере_именовать"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Каналы:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "Код ISO �траны:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Страна:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Штат:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Город:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Обла�ть:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Почтовый индек�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Здание:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Этаж:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Опи�ание:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Точно�ть:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Ошибка по вертикали (в метрах):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Ошибка по горизонтали (в метрах):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Скоро�ть:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "�зимут:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Скоро�ть набора вы�оты:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "По�леднее обновление:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Долгота:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Широта:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Вы�ота:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�тоположение"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %b %Y в %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "П�евдоним:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2255,95 +1473,60 @@ msgstr "<b>Ме�тоположение</b> от (дата)"
 msgid "Online from a phone or mobile device"
 msgstr "В �ети � помощью телефона или мобильного у�трой�тва"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "�ова� �еть"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
-msgid "Choose an IRC network"
-msgstr "Выберите �еть IRC"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
-msgid "Reset _Networks List"
-msgstr "_Сбро�ить �пи�ок �етей"
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
+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-irc-network-chooser-dialog.c:625
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Выбрать"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "новый �ервер"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "Шифрование SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct."
-msgstr ""
-"Empathy может автоматиче�ки найти людей, подключённых к той же �ети, что и "
-"вы. Е�ли вы хотите и�пользовать �ту возможно�ть, отметьте, что информаци�, "
-"пред�тавленна� ниже �вл�ет�� корректной."
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Люди поблизо�ти"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr ""
-"Вы можете отключить �ту возможно�ть или изменить информацию о �ебе, выбрав в "
-"�пи�ке �обе�едников <span style=\"italic\">Правка → Учётные запи�и</span>."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
+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>."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "И�тори�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Показывать"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Пои�к"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор � %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2351,7 +1534,7 @@ msgstr[0] "%s �екунда"
 msgstr[1] "%s �екунды"
 msgstr[2] "%s �екунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2359,80 +1542,80 @@ msgstr[0] "%s минута"
 msgstr[1] "%s минуты"
 msgstr[2] "%s минут"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Вызов продолжал�� %s, закончил�� %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Сегодн�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "За в�ё врем�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "В�е"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Кто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Когда"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "В�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Тек�товые чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Вход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "И�ход�щие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Пропущенные вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Что"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Дей�твительно хотите удалить в�е журналы предыдущих бе�ед?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Очи�тить в�ё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Удалить из:"
 
@@ -2441,12 +1624,13 @@ msgid "_File"
 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-call-window.ui.h:2
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Правка"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "Удалить в�ю и�торию…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2454,7 +1638,8 @@ msgid "Profile"
 msgstr "Профиль"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1493
+#: ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Разговор"
 
@@ -2468,140 +1653,134 @@ msgid "page 2"
 msgstr "�траница 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Загрузка…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Какой у ва� тип учётной запи�и?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Добавление учётной запи�и"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Создать новую учётную запи�ь"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Введите идентификатор �обе�едника или номер телефона:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_�удиовызов"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "�овый вызов"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Указанный �обе�едник не находит�� в �ети"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Собе�едник указан неверно или он неизве�тен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "В �той бе�еде не поддерживает�� данный вид �в�зи"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Запрошенна� функци� не реализована дл� данного протокола"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "�е удало�ь начать разговор � данным �обе�едником"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Вам запретили до�туп к �тому каналу"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Этот канал переполнен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Чтобы при�оединить�� к данному каналу, необходимо приглашение"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Продолжение невозможно, так как от�ут�твует подключение"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Отказано в до�тупе"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Во врем� вызова произошла ошибка"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "�ова� бе�еда"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Требует�� пароль"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Другое �ообщение…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Изменить на�траиваемые �ообщени�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Щёлкните, чтобы удалить �тот �тату� из избранных"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Щёлкните, чтобы �делать �тот �тату� избранным"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
 "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
 msgstr ""
 "<b>Текущее �ообщение: %s</b>\n"
-"<small><i>Чтобы у�тановить �ообщение, нажмите Enter или Esc, чтобы отменить."
-"</i></small>"
+"<small><i>Чтобы у�тановить �ообщение, нажмите Enter или Esc, чтобы отменить.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "У�тановить �тату�"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Другие �ообщени�…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Создать учётную запи�ь %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Учитывать реги�тр"
 
@@ -2625,432 +1804,233 @@ msgstr "У_читывать реги�тр"
 msgid "Phrase not found"
 msgstr "Фраза не найдена"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Получено �ообщение"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Отправлено �ообщение"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Предложение о бе�еде"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Контакт вошёл в �еть"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Контакт вышел из �ети"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Соединён � �ервером"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "От�оединён от �ервера"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Вход�щий вызов"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "И�ход�щий вызов"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Вызов завершён"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Изменить на�траиваемые �ообщени�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Запро� на подпи�ку"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "Пользователь %s хотел бы видеть, когда вы находите�ь в �ети"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Прин�ть"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Сообщение изменено %s "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Обычна�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Идентично�ть, предо�тавленна� чат-�ервером, не может быть проверена."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Сертификат не подпи�ан центром �ертификации."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Сертификат у�тарел."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Сертификат ещё не активирован."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Сертификат не �одержит ожидаемого отпечатка."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Им� узла, подтверждённое �ертификатом, не �овпадает � именем �ервера."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 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."
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Сертификат отозван центром �ертификации."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Сертификат криптографиче�ки �лаб."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Длина �ертификата выходит за контролируемые рамки."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "�еверный �ертификат."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Ожидаемое им� узла: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Им� узла �ертификата: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Продолжить"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "�едоверенное �оединение"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Данное �оединение не �вл�ет�� доверенным. В�ё равно продолжить?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Запомнить выбор дл� по�ледующих �оединений"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Подробно�ти о �ертификате"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "�евозможно открыть URL"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Выберите файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "�едо�таточно �вободного ме�та дл� �охранени� файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, 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. Выберите другое ме�тоположение."
+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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вход�щий файл от %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Выйдите в онлайн, чтобы изменить личные данные."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Информаци� о пользователе</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Копировать адре� ��ылки"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Открыть ��ылку"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Про�мотреть HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Текуща� локаль"
-
-#: ../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 "�раб�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "�рм�н�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Прибалтий�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Кельт�кий"
-
-#: ../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 "Центрально-европей�кий"
-
-#: ../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 "Китай�кий упрощённый"
-
-#: ../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 "Китай�кий традиционный"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Хорват�кий"
-
-#: ../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 "Кириллица"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Ру��кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Украин�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Грузин�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Грече�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Гуджарати"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "Гурмукхи"
-
-#: ../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 "Иврит"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Иврит Visual"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Хинди"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "И�ланд�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Япон�кий"
-
-#: ../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 "Корей�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Скандинав�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Пер�ид�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Румын�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Южно Европей�кий"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Тай�кий"
-
-#: ../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 "Турецкий"
-
-#: ../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 "Юникод"
-
-#: ../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 "Западный"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Вьетнам�кий"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "О�новные �обе�едники"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Люди поблизо�ти"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Без группы"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Сервер не может найти контакт: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Сообщение об ошибке от�ут�твует"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Мгновенное �ообщение (Empathy)"
 
+#: ../src/empathy-about-dialog.c:77
+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 — �вободна� программа, вы можете ра�про�тран�ть и/или модифицировать её на у�лови�х, указанных в GNU General Public License опубликованой Free Software Foundation; либо в вер�ии 2 или (по вашему выбору) любой более поздней вер�ии."
+
 #: ../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 — �вободна� программа, вы можете ра�про�тран�ть и/или модифицировать "
-"её на у�лови�х, указанных в GNU General Public License опубликованой Free "
-"Software Foundation; либо в вер�ии 2 или (по вашему выбору) любой более "
-"поздней вер�ии."
+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 ра�про�тран�ет�� в ра�чёте на то, что будет полезной, однако БЕЗ К�КИХ ЛИБО Г�Р��ТИЙ в том чи�ле подразумеваемых гарантий ПОЛЕЗ�ОСТИ или ПРИГОД�ОСТИ ДЛЯ К�КИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public License."
 
 #: ../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 ра�про�тран�ет�� в ра�чёте на то, что будет полезной, "
-"однако БЕЗ К�КИХ ЛИБО Г�Р��ТИЙ в том чи�ле подразумеваемых гарантий "
-"ПОЛЕЗ�ОСТИ или ПРИГОД�ОСТИ ДЛЯ К�КИХ_ЛИБО ЦЕЛЕЙ. Смотрите GNU General Public "
-"License."
-
-#: ../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 ""
-"Вы должны были получить копию GNU General Public License вме�те � программой "
-"Empathy. Е�ли �того не произошло, напишите в Фонд Свободного Программного "
-"Обе�печени�: Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-130159 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 "Вы должны были получить копию GNU General Public License вме�те � программой Empathy. Е�ли �того не произошло, напишите в Фонд Свободного Программного Обе�печени�: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Приложение бы�трого обмена �ообщени�ми дл� GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Grigory Bakunov\n"
@@ -3058,104 +2038,92 @@ msgstr ""
 "Mikhail Zabaluev\n"
 "Валёк Филиппов"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"�е показывать диалоговые окна; выполнить работу (напр., импортирование) и "
-"выйти"
+msgstr "�е показывать диалоговые окна; выполнить работу (напр., импортирование) и выйти"
 
-#: ../src/empathy-accounts.c:186
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
-"�е показывать диалоговые окна до тех пор, пока и�пользуют�� только уч. "
-"запи�и «Люди поблизо�ти»"
+#: ../src/empathy-accounts.c:175
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "�е показывать диалоговые окна до тех пор, пока и�пользуют�� только уч. запи�и «Люди поблизо�ти»"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "— Учётные запи�и Empathy"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Учётные запи�и Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "В учётной запи�и %s имеют�� не�охранённые изменени�."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "В учётной запи�и %.50s имеют�� не�охранённые изменени�."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Ваша нова� учётна� запи�ь ещё не была �охранена."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385
+#: ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Соединение…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "�е в �ети — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "От�оединён — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "�е в �ети — подключение к �ети от�ут�твует"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "�еизве�тный �тату�"
 
-#: ../src/empathy-accounts-dialog.c:492
-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:473
+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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "�е в �ети — учётна� запи�ь отключена"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Изменить параметры �оединени�"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr "_Изменить параметры �оединени�…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Хотите удалить %s �о �воего компьютера?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Хотите удалить %.50s �о �воего компьютера?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Это не приведёт к удалению вашей учётной запи�и � �ервера."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3164,24 +2132,24 @@ msgstr ""
 "к отмене �деланных изменений. Хотите продолжить?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Включено"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Пропу�тить"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Подключить��"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3190,10 +2158,14 @@ msgstr ""
 "�деланных изменений. Хотите продолжить?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Учётные запи�и обмена �ообщени�ми и VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Добавить…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Импорт..."
@@ -3203,55 +2175,49 @@ 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 ""
-"Чтобы добавить новую учётную запи�ь у�тановите поддержку каждого "
-"необходимого протокола."
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Чтобы добавить новую учётную запи�ь у�тановите поддержку каждого необходимого протокола."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
 msgstr "�ет у�тановленных драйверов протоколов"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " — клиент аутентификации Empathy"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Клиент аутентификации Empathy"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "�е �оедин�ть�� при запу�ке"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�е показывать �пи�ок �обе�едников и диалоговые окна при запу�ке"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr " — клиент обмена мгновенными �ообщени�ми Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Ошибка �в�зи � ди�петчером учётных запи�ей"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
 "\n"
 "%s"
 msgstr ""
-"Во врем� попытки �в�зать�� � ди�петчером учётных запи�ей Telepathy произошла "
-"ошибка:\n"
+"Во врем� попытки �в�зать�� � ди�петчером учётных запи�ей Telepathy произошла ошибка:\n"
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Имеет�� активный вызов"
 
@@ -3263,175 +2229,155 @@ msgstr " — клиент Empathy дл� аудио и видео"
 msgid "Empathy Audio/Video Client"
 msgstr "Клиент Empathy дл� аудио и видео"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"Собе�едник %s попытал�� до ва� дозвонить��, но вы принимали другой вызов."
+msgstr "Собе�едник %s попытал�� до ва� дозвонить��, но вы принимали другой вызов."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Вход�щий вызов"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Вход�щий видеовызов от %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547
+#: ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Вход�щий вызов от %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Отказать"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Ответить"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор � %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "IP-адре�, определённый машиной"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адре�, определённый �ервером в Интернете"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адре� точки, определённый � другой �тороны"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "IP-адре� ретран�лирующего �ервера"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Широковещательный IP-адре� группы"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596
+#: ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598
+#: ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "�еизве�тно"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Удержание"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Приглушить"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Длительно�ть"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Информаци� о �обе�еднике"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"Программное обе�печение %s не понимает аудиоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
+msgstr "Программное обе�печение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"Программное обе�печение %s не понимает видеоформаты, поддерживаемые вашим "
-"компьютером"
+msgid "%s's software does not understand any of the video formats supported by your computer"
+msgstr "Программное обе�печение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, 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. Один из ва� может находить�� в �ети, "
-"котора� не поддерживает пр�мые подключени�."
+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:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Сбой �ети"
 
-#: ../src/empathy-call-window.c:3131
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"�удиоформаты, необходимые дл� �того вызова, не у�тановлены на вашем "
-"компьютере"
+#: ../src/empathy-call-window.c:3123
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "�удиоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
-#: ../src/empathy-call-window.c:3134
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"Видеоформаты, необходимые дл� �того вызова, не у�тановлены на вашем "
-"компьютере"
+#: ../src/empathy-call-window.c:3126
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "Видеоформаты, необходимые дл� �того вызова, не у�тановлены на вашем компьютере"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, 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> и прикрепите журналы, �обранные из окна "
-"отладки в меню «Справка»."
+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:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Сбой в движке вызова"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "До�тигнут конец потока"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "�е удало�ь у�тановить аудиопоток"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "�е удало�ь у�тановить видеопоток"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Текущий балан�: %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "�едо�таточно �ред�тв дл� �овершени� звонка."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Пополнить"
 
@@ -3455,11 +2401,13 @@ msgstr "_Параметры"
 msgid "_View"
 msgstr "_Вид"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Справка"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Содержание"
 
@@ -3543,23 +2491,24 @@ msgstr "Удалённый кандидат:"
 msgid "Local Candidate:"
 msgstr "Локальный кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "�удио"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr " — клиент обмена мгновенными �ообщени�ми Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Им�"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Комната"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "�втоматиче�кое �оединение"
 
@@ -3567,59 +2516,42 @@ msgstr "�втоматиче�кое �оединение"
 msgid "Manage Favorite Rooms"
 msgstr "Управление избранными комнатами"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Закрыть �то окно?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
-msgid ""
-"Closing this window will leave %s. You will not receive any further messages "
-"until you rejoin it."
-msgstr ""
-"Е�ли вы закроете окно, то выйдете из комнаты %s. Вы не будете получать "
-"�ообщени�, пока не войдёте в комнату. "
+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:306
+#: ../src/empathy-chat-window.c:298
 #, 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:317
+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:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Уйти из %s?"
 
-#: ../src/empathy-chat-window.c:319
-msgid ""
-"You will not receive any further messages from this chat room until you "
-"rejoin it."
-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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Закрыть окно"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Уйти из комнаты"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:672
+#: ../src/empathy-chat-window.c:695
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3627,7 +2559,7 @@ msgstr[0] "%s (%d непрочитанное)"
 msgstr[1] "%s (%d непрочитанных)"
 msgstr[2] "%s (%d непрочитанных)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:687
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3635,7 +2567,7 @@ msgstr[0] "%s (и ещё %u �обе�едник)"
 msgstr[1] "%s (и ещё %u �обе�едника)"
 msgstr[2] "%s (и ещё %u �обе�едников)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:703
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3643,7 +2575,7 @@ msgstr[0] "%s (%d непрочитанное от других)"
 msgstr[1] "%s (%d непрочитанных от других)"
 msgstr[2] "%s (%d непрочитанных от других)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:712
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3651,11 +2583,11 @@ msgstr[0] "%s (%d непрочитанное ото в�ех)"
 msgstr[1] "%s (%d непрочитанных ото в�ех)"
 msgstr[2] "%s (%d непрочитанных ото в�ех)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:949
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:957
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3663,7 +2595,7 @@ msgstr[0] "Отправка %d �ообщени�"
 msgstr[1] "Отправка %d �ообщений"
 msgstr[2] "Отправка %d �ообщений"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:977
 msgid "Typing a message."
 msgstr "�абирает �ообщение."
 
@@ -3687,7 +2619,8 @@ msgstr "_Избранна� комната"
 msgid "Notify for All Messages"
 msgstr "Уведомл�ть обо в�ех �ообщени�х"
 
-#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
 msgstr "_Показывать �пи�ок �обе�едников"
 
@@ -3696,209 +2629,208 @@ msgid "Invite _Participant…"
 msgstr "Пригла�ить _уча�тника…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Войти в чат"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "В_ыйти из чата"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "Со_бе�едник"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "В_кладки"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "�а пред_ыдущую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "�а �лед_ующую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Во��тановить закрытую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Передвинуть вкладку в_лево"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Передвинуть вкладку в_право"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_От�оединить вкладку"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Показать определённую �лужбу"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "— Отладчик Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Отладчик Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "С�ылка pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Ответ pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "Слишком много данных дл� в�тавки. Сохраните журналы в файл."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Отправить в pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Отладка"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Информаци�"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993
+#: ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Критиче�ка� ошибка"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
-"Even if they don't display passwords, logs can contain sensitive information "
-"such as your list of contacts or the messages you recently sent or "
-"received.\n"
-"If you don't want to see such information available in a public bug report, "
-"you can choose to limit the visibility of your bug to Empathy developers "
-"when reporting it by displaying the advanced fields in the <a href=\"https://"
-"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
+"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
 msgstr ""
-"Даже е�ли они не показывают пароли, журналы могут �одержать такую "
-"информацию, как �пи�ок контактов или отправленные или полученные �ообщени�.\n"
-"Е�ли вы не хотите, чтобы данна� информаци� была до�тупна в публичных отчётах "
-"об ошибках, вы можете ограничить к ней до�туп, заполнив дополнительные пол� "
-"в <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy"
-"\">отчёте об ошибке</a>."
+"Даже е�ли они не показывают пароли, журналы могут �одержать такую информацию, как �пи�ок контактов или отправленные или полученные �ообщени�.\n"
+"Е�ли вы не хотите, чтобы данна� информаци� была до�тупна в публичных отчётах об ошибках, вы можете ограничить к ней до�туп, заполнив дополнительные пол� в <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">отчёте об ошибке</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Врем�"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Категори�"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:2100
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr ""
-"Выбранный менеджер �оединений не поддерживает ра�ширение удалённой отладки."
+#: ../src/empathy-debug-window.c:2091
+msgid "The selected connection manager does not support the remote debugging extension."
+msgstr "Выбранный менеджер �оединений не поддерживает ра�ширение удалённой отладки."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Вход�щий видеовызов"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s делает видеовызов. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s вызывает ва�. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Отказать"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Ответить"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "Ответить � _видео"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Приглашение к бе�еде"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Предложение при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s предлагает при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Войти"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s предложил при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Вам предложили при�оединить�� к %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вход�щий файл от %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978
+#: ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Требует�� пароль"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3908,105 +2840,108 @@ msgstr ""
 "Сообщение: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�еизве�тен"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s из %s, %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Ошибка получени� «%s» от %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Ошибка получени� файла"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Ошибка отправки «%s» %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Ошибка отправки файла"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» отправлен %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Передача файла завершена"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610
+#: ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Ожидание ответа от других уча�тников"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636
+#: ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверка цело�тно�ти «%s»"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639
+#: ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Х�ширование «%s»"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "О�тало�ь"
 
@@ -4016,64 +2951,59 @@ 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:76
+#: ../src/empathy-import-dialog.c:70
 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:82
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "�е найдено учётных запи�ей дл� импортировани�. �а данный момент возможно импортировать учётные запи�и только из Pidgin."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Импортировать учётные запи�и"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Импорт"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "И�точник"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Пригла�ить уча�тника"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Выберите �обе�едника дл� приглашени� к бе�еде:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Пригла�ить"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Комната"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Уча�тники"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "�е удало�ь получить �пи�ок комнат"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4086,46 +3016,35 @@ msgstr ""
 "Требует�� пароль: %s\n"
 "Уча�тники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Да"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "�ет"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Войти в комнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Введите им� бе�еды, к которой хотите при�оединить��, или выберите одну (или "
-"более) в �пи�ке."
+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:2
 msgid "_Room:"
 msgstr "_Комната:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account&apos;s server"
-msgstr ""
-"Введите �ервер, на котором ра�полагает�� комната, или о�тавьте пу�тым, е�ли "
-"комната находит�� на �ервере текущей учётной запи�и"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
+msgstr "Введите �ервер, на котором ра�полагает�� комната, или о�тавьте пу�тым, е�ли комната находит�� на �ервере текущей учётной запи�и"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Введите �ервер комнаты, или о�тавьте пу�тым, е�ли комната находит�� на "
-"�ервере текущей учётной запи�и"
+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 "_Server:"
@@ -4139,104 +3058,104 @@ msgstr "�е удало�ь загрузить �пи�ок комнат"
 msgid "Room List"
 msgstr "Спи�ок комнат"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Ответить"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Ответить � видео"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Прин�ть"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Предо�тавить"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Сообщение получено"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "�ова� бе�еда"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Собе�едник вошёл в �еть"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Собе�едник вышел из �ети"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Учётна� запи�ь зареги�трирована"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Учётна� запи�ь отключена"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Язык"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Джульета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео, о зачем же ты Ромео!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Покинь отца и отреки�ь навеки"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "Так покл�ни�ь, что любишь ты мен�, —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Джульета отключила�ь"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Параметры"
 
@@ -4248,7 +3167,8 @@ msgstr "Показывать группы"
 msgid "Show account balances"
 msgstr "Показывать балан� учётных запи�ей"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Спи�ок �обе�едников"
 
@@ -4337,30 +3257,16 @@ msgid "Use _echo cancellation to improve call quality"
 msgstr "И�пользовать подавление _�ха дл� улучшени� каче�тва �в�зи"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Подавление �ха позвол�ет �делать передачу вашего голо�а чище, но �то может "
-"вызывать проблемы на некоторых компьютерах. Е�ли вы или ваш �обе�едник "
-"�лышите �транные шумы или �бои во врем� разговора, попробуйте выключить "
-"подавление �ха и повторить вызов �обе�едника."
+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:30
 msgid "_Publish location to my contacts"
 msgstr "Пу_бликовать ме�тоположение дл� �обе�едников"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Примерное определение ме�тоположени� означает, что публикует�� только ваш "
-"город, регион и �трана. Координаты GPS будут отображать�� � точно�тью до 1 "
-"знака по�ле зап�той."
+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:33
@@ -4371,72 +3277,55 @@ msgstr "_Снижать точно�ть определени� ме�топол
 msgid "Privacy"
 msgstr "Приватно�ть"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-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 "_Network (IP, Wi-Fi)"
-msgstr "С_еть (IP, Wi-Fi)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "И�точники ме�тоположений:"
-
-#: ../src/empathy-preferences.ui.h:40
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"В �том �пи�ке показаны только те �зыки, дл� которых у�тановлены �ловари."
-
-#: ../src/empathy-preferences.ui.h:41
 msgid "Enable spell checking for languages:"
 msgstr "Включить проверку орфографии дл� �зыков:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Проверка орфографии"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "_Тема оформлени� бе�еды:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Вариант:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Темы"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Указать пароль"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Разъединить"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
-msgstr "Чтобы увидеть �обе�едников, необходимо на�троить учётную запи�ь."
+msgid "You need to set up an account to see contacts here."
+msgstr "Чтобы увидеть контакты, необходимо на�троить учётную запи�ь."
 
 #: ../src/empathy-roster-window.c:569
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr ""
-"Учётные запи�и %s нельз� и�пользовать до тех пор, пока не будет обновлено "
-"приложение %s."
+msgstr "Учётные запи�и %s нельз� и�пользовать до тех пор, пока не будет обновлено приложение %s."
 
 #: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4452,7 +3341,7 @@ msgid "Online Accounts"
 msgstr "Сетевые учётные запи�и"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "Обновить приложение…"
 
 #: ../src/empathy-roster-window.c:753
@@ -4473,9 +3362,7 @@ msgstr "Пополнить �чёт"
 
 #: ../src/empathy-roster-window.c:1590
 msgid "You need to enable one of your accounts to see contacts here."
-msgstr ""
-"Чтобы увидеть �обе�едников, необходимо включить одну из ваших учётных "
-"запи�ей."
+msgstr "Чтобы увидеть �обе�едников, необходимо включить одну из ваших учётных запи�ей."
 
 #. translators: argument is an account name
 #: ../src/empathy-roster-window.c:1598
@@ -4500,11 +3387,13 @@ msgid "No online contacts"
 msgstr "�ет �обе�едников в �ети"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "�ова� _бе�еда…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
 msgstr "�овый _вызов…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
@@ -4512,12 +3401,12 @@ msgid "Contacts"
 msgstr "Собе�едники"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Добавить �обе�едника…"
+msgid "_Add Contacts…"
+msgstr "_Добавить контакты…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Пои�к �обе�едников…"
+msgid "_Search for Contacts…"
+msgstr "_Пои�к контактов…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4528,7 +3417,7 @@ msgid "_Rooms"
 msgstr "_Комнаты"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
+msgid "_Join…"
 msgstr "_Войти…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
@@ -4576,28 +3465,16 @@ msgstr "Выйти в _онлайн"
 msgid "Show _Offline Contacts"
 msgstr "Показывать _�обе�едников не в �ети"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Добавить �обе�едника…"
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "�ова� _бе�еда…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "�овый _вызов…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Со�то�ние"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Готово"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Введите информацию о вашей учётной запи�и"
 
@@ -4609,6 +3486,3 @@ msgstr "Изменить параметры учётной запи�и %s"
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 msgid "Integrate your IM accounts"
 msgstr "Интегрируйте учётные запи�и �и�тем обмена мгновенными �ообщени�ми"
-
-#~ msgid "i"
-#~ msgstr "Инфо"
diff --git a/po/sk.po b/po/sk.po
index 364444e5a..76db1a6bd 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2013-03-19 19:47+0000\n"
-"PO-Revision-Date: 2013-03-20 10:18+0000\n"
+"POT-Creation-Date: 2013-08-23 15:10+0000\n"
+"PO-Revision-Date: 2013-08-22 09:58+0100\n"
 "Last-Translator: Pavol Kla�anský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -41,12 +41,11 @@ msgstr ""
 "Umožňuje komunikovať pomocou služieb Google Talk, Facebook, MSN a mnohých "
 "�alších"
 
-# PM: rozmýšľam �i nepridať aj videohovor;telefonovanie;
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
 msgstr ""
 "chat;im;irc;voip;gtalk;facebook;jabber;komunikovať;komunikácia;rozhovor;"
-"hovor;"
+"hovor;videohovor;telefonovanie"
 
 # gsettings summary
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
@@ -622,7 +621,7 @@ msgstr "Chyba po�as pokusu o prenos súboru"
 msgid "The other participant is unable to transfer the file"
 msgstr "Druhý ú�astník nie je schopný preniesť súbor"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
@@ -643,253 +642,187 @@ msgstr "Vybraný súbor nie je oby�ajný súbor"
 msgid "The selected file is empty"
 msgstr "Vybraný súbor je prázdny"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Heslo sa nenašlo"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Heslo pre ú�et internetovej komunikácie %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Heslo pre diskusnú miestnosť „%s“ na ú�te %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zmeškaný hovor od %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Hovor s kontaktom %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Hovor od %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "pred %d sekundami"
-msgstr[1] "pred %d sekundou"
-msgstr[2] "pred %d sekundami"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "pred %d minútami"
-msgstr[1] "pred %d minútou"
-msgstr[2] "pred %d minútami"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "pred %d hodinami"
-msgstr[1] "pred %d hodinou"
-msgstr[2] "pred %d hodinami"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "pred %d dňami"
-msgstr[1] "pred %d dňom"
-msgstr[2] "pred %d dňami"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "pred %d týždňami"
-msgstr[1] "pred %d týždňom"
-msgstr[2] "pred %d týždňami"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "pred %d mesiacmi"
-msgstr[1] "pred %d mesiacom"
-msgstr[2] "pred %d mesiacmi"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "v budúcnosti"
-
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Prítomný"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Pre�"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Neviditeľný"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Odhlásený"
 
 # stav prítomnosti
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámy"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nebol uvedený žiadny dôvod"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Stav je nastavený na odhlásený"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Chyba siete"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Overenie totožnosti zlyhalo"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Chyba Å¡ifrovania"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Meno sa používa"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Certifikát nebol poskytnutý"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Nedôveryhodný certifikát"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Certifikát vypršal"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Certifikát nie je aktivovaný"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Názov hostiteľa certifikátu nesúhlasí"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Odtla�ok certifikátu sa nezhoduje"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Certifikát podpísaný sám sebou"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
 # error
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Šifrovanie nie je dostupné"
 
 # error
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
 # error
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Spojenie bolo zamietnuté"
 
 # error
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Spojenie sa nedá vytvoriť"
 
 # error
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Spojenie bolo prerušené"
 
 # error
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Tento ú�et už je pripojený k serveru"
 
 # error
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Pôvodné spojenie bolo nahradené novým použitím rovnakého zdroja"
 
 # error
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Ú�et už na serveri existuje"
 
 # error
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Server je teraz príliš zaneprázdnený, a preto nemôže obslúžiť pripojenie"
 
 # error
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Certifikát mal zrušenú platnosť"
 
 # error
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikát používa nedostato�ne bezpe�ný šifrovací algoritmus alebo je slabý"
 
 # error
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -898,716 +831,37 @@ msgstr ""
 "hranice vynútené kryptografickou knižnicou"
 
 # error
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Váš softvér je príliš zastaralý"
 
 # error
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-# protocol name
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Ľudia v okolí"
-
-# protocol name
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-# service name
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-# service name
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook Chat"
-
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Všetky ú�ty"
 
-# GtkLabel
-#: ../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
-msgid "Pass_word"
-msgstr "_Heslo"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name"
-msgstr "Pr_ezývka"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Príklad:</b> MojaPrezvýka"
-
-# GtkCheckButton
-#. 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 "Zapamätať heslo"
-
-# GtkLabel
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Port"
-
-# GtkLabel
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Server"
-
-# GtkLabel
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-msgstr "Pokro�ilé"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-msgid "What is your AIM screen name?"
-msgstr "Aká je vaša prezývka pre AIM?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "Aké je vaše heslo pre AIM?"
-
-# GtkCheckButton
-#: ../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:25
-msgid "Remember Password"
-msgstr "Zapamätať heslo"
-
-# hash table
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Ú�et"
-
-# hash table
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Heslo"
-
-# hash table
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Server"
-
-# hash table
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Port"
-
-# * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-# * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-# gtk_label
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Používateľské meno:"
-
-# gtk_button
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "Po_užiť"
-
-# gtk_button
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Prihlásiť sa"
-
-# gtk_radio_button
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Tento ú�et už na serveri existuje"
-
-# gtk_radio_button
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Vytvoriť na serveri nový ú�et"
-
-# PM: to je fajn že to tak pekne popísali ale zišlo by sa vedieť kde je to vlastne použité
-# PK: je to v nastaveniach uctov, tam hore ako nazov uctu, v takom obdlzniku
-# PK: tiez to je v bocnom paneli kde je zoznam uctov, necham to takto, lebo aby to nebolo dlhe
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "Ú�et %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nový ú�et"
-
-# GtkLabel
-#: ../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 "Prihlasovací i_dentifikátor"
-
-# GtkLabel
-#: ../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>Príklad:</b> používateľské meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Aký je váš používateľský identifikátor pre GroupWise?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Aké je vaše heslo pre GroupWise?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN"
-msgstr "_Identifika�né �íslo ICQ"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Príklad:</b> 123456789"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Zn_aková sada"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Aké je vaše identifika�né �íslo pre ICQ?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Aké je vaše heslo pre ICQ?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Sieť"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Znaková sada"
-
-# GtkToolButton tooltip
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Pridať…"
-
-# GtkToolButton tooltip
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Odstrániť"
-
-# GtkToolButton tooltip
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Hore"
-
-# GtkToolButton tooltip
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Dolu"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Servery"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Vä�šina serverov IRC nevyžaduje heslo, takže ak si nie ste istý, nezadávajte "
-"žiadne."
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Prezývka"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Správa pri odchode"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Skuto�né meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Používateľské meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Ktorú sieť IRC?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Aká je vaša prezývka pre IRC?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "Aké je vaše používateľské meno pre Facebook?"
-
-# GtkLabel
-#. 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 ""
-"Toto je vaše používateľské meno, nie vaše prihlasovacie meno pre Facebook.\n"
-"Ak ste facebook.com/<b>otrava</b>, zadajte <b>otrava</b>.\n"
-"Ak ešte používateľské meno pre Facebook nemáte, na jeho vytvorenie použite "
-"<a href=\"http://www.facebook.com/username/\">túto stránku</a>."
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Aké je vaše heslo pre Facebook?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Aký je váš identifikátor pre Google?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Príklad:</b> pouzivatel@gmail.com"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google password?"
-msgstr "Aké je vaše heslo pre Google?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Príklad:</b> používateľ@jabber.org"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorovať chyby SSL certifikátu"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "_Priorita"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "_Zdroj"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "V_yžadovať šifrovanie (TLS/SSL)"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Override server settings"
-msgstr "Potla�iť nastavenia servera"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Použiť staré _SSL"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "Aký je váš identifikátor pre Jabber?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-msgid "What is your desired Jabber ID?"
-msgstr "Aký je váš požadovaný identifikátor pre Jabber?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-msgid "What is your Jabber password?"
-msgstr "Aké je vaše heslo pre Jabber?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
-msgid "What is your desired Jabber password?"
-msgstr "Aké je vaše požadované heslo pre Jabber?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Prezýv_ka"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name"
-msgstr "_Priezvisko"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name"
-msgstr "_Krstné meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name"
-msgstr "_Zverejnené meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID"
-msgstr "Identifikátor pre _Jabber"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "E_mailová adresa"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>Príklad:</b> používateľ@hotmail.com"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live ID?"
-msgstr "Aký je váš identifikátor pre Windows Live?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Aké je vaše heslo pre Windows Live?"
-
-#  PM: jedno je pre 'transport' combo box; a druhe pre 'keep-alive mechanism' combo box
-#  PM: V tom prvom iprípade je to OK v tom druhom nechápem súvislosť medzi auto, register, options a none
-# * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-# gtk_list_store 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Automaticky"
-
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-# PK: v zdrojaku je ze by sa to nemalo prekladat
-# * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Register"
-
-# PK: v zdrojaku je ze by sa to nemalo prekladat
-# * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Options"
-
-# gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Žiadne"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Používateľské meno"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Príklad:</b> používateľ@môj.sip.server"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Použiť tento ú�et na volanie na _pevné linky alebo mobilné telefóny"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Voľby pre NAT Traversal"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Voľby pre proxy"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Ďalšie voľby"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Server STUN"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Automaticky objaviť server STUN"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Objaviť prepojenia"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Voľby udržovania pripojenia"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Mechanizmus"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Interval (v sekundách)"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Používateľské meno na overenie totožnosti"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Prenos"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Voľné smerovanie"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Ignorovať chyby TLS"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Miestna adresa IP"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "Aký je váš prihlasovací identifikátor pre SIP?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "What is your SIP account password?"
-msgstr "Aké je vaše heslo k ú�tu pre SIP?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Heslo:"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "I_dentifikátor pre Yahoo!:"
-
-# GtkCheckButton
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "I_gnore conference and chat room invitations"
-msgstr "I_gnorovať pozvánky do konferencií a diskusných miestností"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "Miestne nastavenia _zoznamu miestností"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Zn_aková sada:"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "Aký je váš identifikátor pre Yahoo!?"
-
-# GtkLabel
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "Aké je vaše heslo pre Yahoo!?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Nepodarilo sa previesť obrázok"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Žiadny z prípustných formátov obrázkov nie je podporovaný vo vašom systéme"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Nepodarilo sa uložiť obrázok do súboru"
-
-# filechoser dialog title
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Výber obrázka podobizne"
-
-# button
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Odfotografovať…"
-
-# button
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Bez obrázka"
-
-# file filter name
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Obrázky"
-
-# file filter name
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Všetky súbory"
-
 # tooltip
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Kliknutím zvä�šíte"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Overenie totožnosti zlyhalo pre ú�et <b>%s</b>"
 
 # button
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Opakovať"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1617,86 +871,82 @@ msgstr ""
 "Zadajte vaše heslo pre ú�et\n"
 "<b>%s</b>"
 
-# button
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Vybrať…"
-
-# button
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Vybrať"
+# GtkCheckButton
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Zapamätať heslo"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Po�as vytvárania hovoru nastala chyba"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Zvolený kontakt nepodporuje hovory"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Zvolený kontakt je odhlásený"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Zvolený kontakt nie je platný"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Tiesňové volania nie sú podporované týmto protokolom"
 
 # error message
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "Nemáte dostatok kreditu na uskuto�nenie tohto hovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Zlyhalo otvorenie súkromného rozhovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Téma nie je pri tejto konverzácii podporovaná"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Nie je vám dovolené meniť tému"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Neplatný identifikátor kontaktu"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: vymaže všetky správy z aktuálnej konverzácie"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: nastaví tému aktuálnej konverzácie"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <identifikátor diskusnej miestnosti>: vstúpi do novej diskusnej miestnosti"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1705,27 +955,27 @@ msgstr ""
 "miestnosť, predvolene aktuálnu"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <identifikátor kontaktu> [<správa>]: otvorí súkromný rozhovor"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identifikátor kontaktu> <správa>: otvorí súkromný rozhovor"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <prezývka>: zmení vašu prezývku na aktuálnom serveri"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <správa>: pošle ACTION správu do aktuálnej konverzácie"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../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 "
@@ -1736,12 +986,12 @@ msgstr ""
 "vstúpenie do novej diskusnej miestnosti“"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <identifikátor kontaktu>: zobrazí informácie o kontakte"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1750,107 +1000,107 @@ msgstr ""
 "zadaný aj <príkaz>, zobrazí sa jeho použitie."
 
 # %s item->help
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Použitie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznámy príkaz; použite /help na zobrazenie dostupných príkazov"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "nedostato�ný kredit na poslanie správy"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Chyba pri posielaní správy „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Chyba pri posielaní správy: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "nedostato�ný kredit na poslanie správy. <a href='%s'>Dobiť</a>."
 
 # chat_send_error TP_ERROR_STR_NOT_CAPABLE
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "neschopný"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "odpojený"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "prístup zamietnutý"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "príliš dlhá správa"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "nie je implementované"
 
 # Error sending message : %s
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "neznáma"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Téma:"
 
 # %s priv->subject
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma nastavená na: %s"
 
 # %s actor, priv->subject
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, c-format
 msgid "Topic set by %s to: %s"
 msgstr "Téma nastavená používateľom %s na: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Nebola nastavená žiadna téma"
 
 # gtk_menu_item
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Žiadne návrhy)"
 
 # gtk_image_menu_item
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Pridať „%s“ do slovníka"
@@ -1859,35 +1109,35 @@ msgstr "Pridať „%s“ do slovníka"
 #  gtk_image_menu_item
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Pridať „%s“ do slovníka pre jazyk %s"
 
 #  http://live.gnome.org/SlovakTranslation/Others/JULS
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Vložiť smejka"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Poslať"
 
 # gtk_image_menu_item
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "_Návrhy kontroly pravopisu"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Zlyhalo získavanie nedávnych záznamov"
 
 # chat_members_changed
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "Ú�astník %s sa odpojil"
@@ -1896,13 +1146,13 @@ msgstr "Ú�astník %s sa odpojil"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Ú�astník %1$s bol vykopnutý ú�astníkom %2$s"
 
 # chat_members_changed
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "Ú�astník %s bol vykopnutý"
@@ -1911,19 +1161,19 @@ msgstr "Ú�astník %s bol vykopnutý"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Ú�astník %1$s dostal zákaz od ú�astníka %2$s"
 
 # chat_members_changed
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "Ú�astník %s dostal zákaz"
 
 # chat_members_changed
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "Ú�astník %s opustil miestnosť"
@@ -1933,17 +1183,17 @@ msgstr "Ú�astník %s opustil miestnosť"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "Ú�astník %s vstúpil do miestnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ú�astník %s je teraz známy ako %s"
@@ -1951,57 +1201,57 @@ msgstr "Ú�astník %s je teraz známy ako %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:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Odpojený"
 
 # label
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Želáte si uložiť toto heslo?"
 
 # button
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Zapamätať"
 
 # button
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Teraz nie"
 
 # label
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Nesprávne heslo; prosím, skúste to znova:"
 
 # label
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Miestnosť je chránená heslom:"
 
 # button
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Vstúpiť"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Pripojený"
 
 # empathy_chat_dup_name 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Konverzácia"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -2039,8 +1289,8 @@ msgstr "Úprava blokovaných kontaktov"
 # GtkLabel
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -2051,144 +1301,73 @@ msgstr "Ú�et:"
 msgid "Blocked Contacts"
 msgstr "Zablokované kontakty"
 
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Celé meno"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefónne �íslo"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Emailová adresa"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Webová stránka"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Narodeniny"
-
-# info_field_data
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Naposledy videný:"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Server:"
-
-# info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Pripojený z:"
-
-# info_field_data
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Správa pri odchode:"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "pracovný"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "domov"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobilný"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "hlasový"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "prednostný"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "poštový"
-
-# info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "doru�ovací"
+# GtkToolButton tooltip
+#: ../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 "Odstrániť"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Hľadanie kontaktov"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Hľadať: "
 
 # button
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Pridať kontakt"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nenašiel sa žiadny kontakt"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Hľadanie kontaktov nie je na tomto ú�te podporované"
+
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Správa, ktorá vás predstaví:"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Prosím, dovoľte mi vidieť, že ste prihlásený. Ďakujem!"
 
 # filechooser title
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Uloženie podobizne"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Podobizeň sa nedá uložiť"
 
+# hash table
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Ú�et"
+
 # GtkLabel
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifikátor"
 
 # GtkLabel
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Prezývka"
 
@@ -2230,12 +1409,12 @@ msgid "Client"
 msgstr "Klient"
 
 # label
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Skupiny"
 
 # label
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2244,47 +1423,47 @@ msgstr ""
 "jednu skupinu alebo nevybrať žiadnu skupinu."
 
 # button
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Pridať skupinu"
 
 #  treeviewcolumn
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vybrať"
 
 #  treeviewcolumn
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Skupina"
 
 # window title
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nový kontakt"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Zablokovať kontakt %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Naozaj chcete zablokovať kontakt „%s“, aby vás už nemohol znovu kontaktovať?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Nasledujúce identity budú zablokované:"
 msgstr[1] "Nasledujúca identita bude zablokovaná:"
 msgstr[2] "Nasledujúce identity budú zablokované:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Nasledujúce identity sa nedajú zablokovať:"
@@ -2292,15 +1471,15 @@ msgstr[1] "Nasledujúca identita sa nedá zablokovať:"
 msgstr[2] "Nasledujúce identity sa nedajú zablokovať:"
 
 # button
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "Za_blokovať"
 
 # checkbutton
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Nahlásiť tieto kontakty ako obťažujúce"
@@ -2308,22 +1487,22 @@ msgstr[1] "_Nahlásiť tento kontakt ako obťažujúci"
 msgstr[2] "_Nahlásiť tieto kontakty ako obťažujúce"
 
 # window title
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Úprava informácií o kontakte"
 
 # label
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Prepojené kontakty"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "balík gnome-contacts nie je nainštalovaný"
 
 # PM: znie to neprirodzene dal by som Aby sa mohli zobrazovať... prosím, nainštalujte...
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 "Prosím, nainštalujte balík gnome-contacts pre zobrazenie podrobností o "
@@ -2333,7 +1512,7 @@ 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -2341,12 +1520,12 @@ msgstr "%s (%s)"
 # MČ: stratil som sa. Vyberám si tam svoj ú�et pomocou ktorého sa vykoná volanie, alebo, ktorému sa zavolá?
 #  PK: preklad by mal byt spravny, nepodarilo sa mi to ale overit v programe
 # window title
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Výber ú�tu, s ktorým sa uskuto�ní hovor"
 
 # button
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
@@ -2354,38 +1533,44 @@ msgstr "Hovor"
 
 # Call %s (%s); second %s
 # phone type
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobil"
 
 # Call %s (%s); second %s
 # phone type
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Práca"
 
 # Call %s (%s); second %s
 # phone type
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Domov"
 
 # gtk_check_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "Za_blokovať kontakt"
 
 # button
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Odstrániť zo _skupiny „%s“"
+
+# button
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Odstrániť a za_blokovať"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Naozaj chcete odstrániť kontakt „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2395,69 +1580,69 @@ msgstr ""
 "odstráni všetky kontakty, ktoré tvoria tento prepojený kontakt."
 
 # dialog title
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "odstránenie kontaktu"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "O_dstrániť"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Rozhovor"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
 # PŠ: navrhujem Hlasový
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvukový hovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohovor"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "P_redchádzajúce konverzácie"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Poslať súbor"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
-msgstr "Poskytnúť plochu"
+msgstr "Sprístupniť moju plochu"
 
 #  vťahuje sa ku slovu kontakt
 # gtk_check_menu_item; gtk_check_button
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Obľúbený"
 
 # gtk_check_menu_item;
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Informácie"
 
 # gtk_check_menu_item;
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upraviť"
@@ -2465,190 +1650,190 @@ msgstr "_Upraviť"
 # PM: Ako sa táto správa zobrazí? kde je meno toho �o pozýva? Nie je to pokra�ovanie dajakej vety? jeto dosť �udné.
 # PK: kontakt
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Vás pozýva do tejto miestnosti"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Pozvať do diskusnej miestnosti"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
 msgid "_Add Contact…"
 msgstr "_Pridať kontakt…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Naozaj chcete odstrániť skupinu „%s“?"
 
 # dialog title
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Odstránenie skupiny"
 
 # gtk_menu_item
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "P_remenovať"
 
 # label
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanály:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ISO kód krajiny:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Krajina:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Štát:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Mesto:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Oblasť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "PSČ:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Ulica:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Budova:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Poschodie:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Miestnosť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Text:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Popis:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Stupeň presnosti:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Chyba:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Vertikálna chyba (v metroch):"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Horizontálna chyba (v metroch):"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Rýchlosť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Azimut:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Rýchlosť stúpania:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Posledná aktualizácia:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Zemepisná dĺžka:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Zemepisná šírka:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Nadmorská výška:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Poloha"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s dňa %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%d. %B %Y, %R UTC"
 
 # label
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Prezývka:"
 
 # label
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2666,38 +1851,8 @@ msgstr "<b>Poloha</b> dňa (dátum)"
 msgid "Online from a phone or mobile device"
 msgstr "Prihlásený z telefónu alebo mobilného zariadenia"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Nová sieť"
-
-# window title
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
-msgid "Choose an IRC network"
-msgstr "Výber siete IRC"
-
-# button
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
-msgid "Reset _Networks List"
-msgstr "Obnoviť zoznam _sietí"
-
-# button
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Vybrať"
-
-# niekde v nejakej tabuľke
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nový server"
-
-# niekde v nejakej tabuľke
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
 # label
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2707,12 +1862,12 @@ msgstr ""
 "rovnakej sieti, ako ste vy. Ak chcete túto funkciu používať, skontrolujte, "
 "prosím, správnosť údajov uvedených nižšie."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Ľudia v okolí"
 
 # label
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2721,32 +1876,32 @@ msgstr ""
 "<span style=\"italic\">Upraviť → Ú�ty</span> v zozname kontaktov."
 
 # window title
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "História"
 
 # label
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Zobraziť"
 
 # label
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Rozhovor v miestnosti %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Rozhovor s kontaktom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e. %B %Y"
@@ -2754,19 +1909,19 @@ msgstr "%A, %e. %B %Y"
 # PM: Bude to tu dobre takto vyzerať? Daj sem prosím niekoľko príkladov ako to bude vyzerať v sloven�ine.
 # PK: netusim, pozeral som log viewer ale nikde som to nenasiel
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2774,7 +1929,7 @@ msgstr[0] "%s sekúnd"
 msgstr[1] "%s sekunda"
 msgstr[2] "%s sekundy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2782,83 +1937,83 @@ msgstr[0] "%s minút"
 msgstr[1] "%s minúta"
 msgstr[2] "%s minúty"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hovor trval %s, skon�il o %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "V�era"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Hocikedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "VÅ¡etci"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Kto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "VÅ¡etko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Textové rozhovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Prichádzajúce hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Odchádzajúce hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "ÄŒo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Naozaj chcete odstrániť všetky záznamy predchádzajúcich konverzácií?"
 
 # button
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Vymazať všetko"
 
 # label
 # nazov uctu alebo vsetky ucty
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Odstrániť z:"
 
@@ -2869,7 +2024,7 @@ msgstr "_Súbor"
 
 # GtkMenuItem
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -2885,7 +2040,7 @@ msgstr "Profil"
 
 #  GtkToolButton label
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Rozhovor"
 
@@ -2906,97 +2061,101 @@ msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">Na�ítava sa…</span>"
 
 # label
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Aký typ ú�tu máte?"
 
 # window title
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
 msgstr "Pridanie nového ú�tu"
 
 # label
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Zadajte identifikátor kontaktu alebo telefónne �íslo:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Videohovor"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Hlasový hovor"
 
 # window title
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nový hovor"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontakt je odhlásený"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Zvolený kontakt je bu� neplatný alebo neznámy"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Kontakt nie je podporovaný pri tomto type konverzácie"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Požadovaná funkcia nie je zahrnutá v tomto protokole"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "Nepodarilo sa za�ať konverzáciu s daným kontaktom"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Ste zablokovaný v tomto kanáli"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Tento kanál je plný"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Boli ste pozvaný na vstup do tohto kanálu"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Pre pokra�ovanie sa musíte pripojiť"
 
 # error message
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Prístup zamietnutý"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Po�as vytvárania konverzácie nastala chyba."
 
 # window title
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nová konverzácia"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Vyžaduje sa heslo"
+
 # PM: tieto kometáre zrejme nepatria k tejto položke
 # PK: nie, nejak to zblbo, to su komentare k predchadzajucemu list store
 #. COL_STATUS_TEXT
@@ -3005,29 +2164,29 @@ msgstr "Nová konverzácia"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Vlastná správa…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Upraviť vlastné správy…"
 
 # tooltip
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknutím odstránite tento stav z obľúbených"
 
 # tooltip
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Kliknutím nastavíte tento stav ako obľúbený"
 
 # tooltip
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -3038,27 +2197,18 @@ msgstr ""
 "Esc.</i></small>"
 
 # tooltip
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Nastavte stav"
 
 # gtk_image_menu_item
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Vlastné správy…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nový ú�et %s"
-
 # gtk_check_menu_item
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Rozlišovať veľkosť"
 
@@ -3089,197 +2239,197 @@ msgid "Phrase not found"
 msgstr "Fráza sa nenašla"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Prijatá okamžitá správa"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Odoslaná okamžitá správa"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Prichádzajúca žiadosť o rozhovor"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Kontakt sa pripojil"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Kontakt sa odpojil"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Pripojenie k serveru"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Odpojenie od servera"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Prichádzajúci hovor"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Odchádzajúci hovor"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Hlasový hovor bol ukon�ený"
 
 # window title
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Úprava vlastných správ"
 
 # window title
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Žiadosť o zapísanie"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "Kontakt %s by rád videl, kedy ste prihlásený"
 
 # button
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Odmietnuť"
 
 # button
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Prijať"
 
 # %s je cas vo formate "%H:%M:%S"
 # tooltip
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1214
 #, c-format
 msgid "Message edited at %s"
 msgstr "Správa upravená o %s"
 
 # Variant:
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1916
 msgid "Normal"
 msgstr "Normálny"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identita poskytnutá serverom pre rozhovory sa nedá overiť."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Certifikát nie je podpísaný certifika�nou autoritou."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Certifikátu vypršala platnosť."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Certifikát nie je aktivovaný."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Certifikát nemá o�akávaný odtla�ok."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Názov hostiteľa overený certifikátom sa nezhoduje s názvom servera."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Certifikát je podpísaný sám sebou."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Certifikát bol odvolaný certifika�nou autoritou."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Certifikát je kryptograficky slabý."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Dĺžka certifikátu presahuje hranicu overiteľnosti."
 
 # reason
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Certifikát je poškodený."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "O�akávaný názov hostiteľa: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Názov hostiteľa certifikátu: %s"
 
 # button
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "P_okra�ovať"
 
 # dialog title
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nedôveryhodné spojenie"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Toto spojenie je nedôveryhodné. Želáte si napriek tomu pokra�ovať?"
 
 # checkbox
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Zapamätať si túto voľbu pre budúce spojenia"
 
 # expander
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Podrobnosti certifikátu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Nie je možné otvoriť URI"
 
 # filechooser dialog title
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Výber súboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Nedostatok voľného miesta na uloženie súboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3288,229 +2438,55 @@ msgstr ""
 "Na uloženie tohto súboru je vyžadované %s voľného miesta, ale dostupných je "
 "len %s. Prosím, zvoľte iné umiestnenie."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prichádzajúci súbor od kontaktu %s"
 
-# label
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Aby ste mohli upraviť vaše osobné údaje musíte byť prihlásený."
-
-# label
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Osobné údaje</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "_Kopírovať adresu odkazu"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Otvoriť odkaz"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Preskúmať HTML"
 
-# PM: podľa dohody v ML treba zmeniť
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Aktuálne miestne nastavenia"
-
-# prebraté z modulu totem
-#: ../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 "Arabské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "Arménske"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "Baltské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "Keltské"
-
-#: ../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 "Stredoeurópske"
-
-#: ../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 "Čínske - zjednodušené"
-
-#: ../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 "Čínske - tradi�né"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "Chorvátske"
-
-#: ../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 "Cyrilika"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "Cyrilika/Ruské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "Cyrilika/Ukrajinské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "Gruzínske"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "Grécke"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "Gudžarátske"
-
-#: ../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 "Hebrejské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "Hebrejské vizuálne"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "Hindské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "Islandské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "Japonské"
-
-#: ../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 "Kórejské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "Škandinávske"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "Perzské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "Rumunské"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "Juhoeurópske"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "Thajské"
-
-#: ../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 "Turecké"
-
-#: ../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 "Západné"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "Vietnamské"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Obľúbené kontakty"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+# protocol name
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Ľudia v okolí"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Bez skupiny"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Server nemôže nájsť kontakt: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Žiadna chybová správa"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Okamžitá správa (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3523,7 +2499,7 @@ msgstr ""
 "verzie tejto licencie, alebo (podľa vášho uváženia) ktorejkoľvek neskoršej "
 "verzie."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3535,7 +2511,7 @@ msgstr ""
 "alebo VHODNOSTI NA URČIT� ÚČEL. Ďalšie podrobnosti hľadajte v vlicencii "
 "General Public License."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3545,93 +2521,93 @@ msgstr ""
 "Totem. Ak sa tak nestalo, napíšte na adresu Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Klient na odosielanie okamžitých správ pre GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Miroslav Biňas <mirek@host.sk>\n"
 "Pavol Kla�anský <pavol@klacansky.com>"
 
 # cmd desc
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Nezobrazí žiadne dialógové okná; urobí nejakú �innosť (napr. importovanie) a "
 "skon�í"
 
 # cmd desc
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Zobrazí dialógové okná v prípade ak sú dostupné iba ú�ty typu „Ľudia v okolí“"
 
 # cmd desc
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Po�iato�ne vyberie zadaný ú�et (napr. gabble/jabber/foo_40example_2eorg0)"
 
 # cmd desc
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<identifikátor-ú�tu>"
 
 # g_option_context
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- ú�ty pre Empathy"
 
 # application_name
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Ú�ty pre Empathy"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Vo vašom ú�te %s máte neuložené zmeny."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Vo vašom ú�te %.50s máte neuložené zmeny."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Váš nový ú�et ešte nebol uložený."
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Pripája sa…"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Odhlásený — %s"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojený — %s"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Odhlásený — Bez sieťového pripojenia"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Neznámy stav"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3642,30 +2618,30 @@ msgstr ""
 "reláciu aby sa ú�et premigroval."
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Odhlásený — Zablokovaný ú�et"
 
 # window title
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Úprava parametrov pripojenia"
 
 # button
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:716
 msgid "_Edit Connection Parameters..."
 msgstr "_Upraviť parametre pripojenia…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Naozaj chcete odstrániť ú�et %s z vášho po�íta�a?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Naozaj chcete odstrániť ú�et %.50s z vášho po�íta�a?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Toto neodstráni váš ú�et na serveri."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3674,26 +2650,26 @@ msgstr ""
 "Naozaj chcete pokra�ovať?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Povolený"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Premenovať"
 
 # button
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Presko�iť"
 
 # button
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "P_ripojiť"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3703,10 +2679,15 @@ msgstr ""
 
 # window title
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Rozhovory a ú�ty VoIP"
 
+# GtkToolButton tooltip
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Pridať…"
+
 # GtkButton
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
@@ -3732,36 +2713,36 @@ msgid "No protocol backends installed"
 msgstr "Žiadny obslužný program protokolu nie je nainštalovaný"
 
 # g_option_context
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - Klient Empathy pre overenie totožnosti"
 
 # application_name
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy - klient overenia totožnosti"
 
 # cmd desc
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Nepripojí sa po spustení"
 
 # cmd desc
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Nezobrazí zoznam kontaktov alebo akékoľvek iné dialógové okno pri spustení"
 
 # g_option_context
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Klient Empathy pre rýchle správy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Chyba pri spájaní sa so Správcom ú�tov"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3775,7 +2756,7 @@ msgstr ""
 "%s"
 
 # Správa pre dbus potla�enie spánku
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Prebieha hovor"
 
@@ -3789,105 +2770,105 @@ msgstr "- Klient Empathy pre zvukový hovor a videohovor"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy - klient pre zvukový hovor a videohovor"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "Kontakt %s sa vám pokúšal dovolať, ale mali ste iný hovor."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Prichádzajúci hovor"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Prichádzajúci videohovor od kontaktu %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Prichádzajúci hovor od kontaktu %s"
 
 # button
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Odmietnuť"
 
 # button
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Prijať"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s kontaktom %s"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Adresa IP v tvare v akom ju vidí stroj"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adresa IP v tvare v akom ju vidí server na internete"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adresa IP v tvare v akom ju vidí partner na druhej strane"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Adresa IP prenosového serveru"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Adresa IP skupiny multicast"
 
 # kodek
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Neznámy"
 
 # status
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Podržaný"
 
 # status   
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Stlmený"
 
 # status
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Trvanie"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d min %02d s"
 
 # expander
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3896,7 +2877,7 @@ msgstr ""
 "Softvér kontaktu %s nepodporuje žiaden z audio formátov podporovaných vo "
 "vašom po�íta�i"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3905,7 +2886,7 @@ msgstr ""
 "Softvér kontaktu %s nepodporuje žiaden z video formátov podporovaných vo "
 "vašom po�íta�i"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3914,23 +2895,23 @@ msgstr ""
 "Spojenie s kontaktom %s sa nedá nadviazať. Jeden z vás môže byť v sieti, "
 "ktorá neumožňuje priame pripojenie."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Došlo k výpadku v sieti"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Audio formáty potrebné pre tento hovor nie sú nainštalované vo vašom po�íta�i"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formáty potrebné pre tento hovor nie sú nainštalované vo vašom po�íta�i"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3941,32 +2922,32 @@ msgstr ""
 "prosím, túto chybu</a> a pripojte k nej záznamy získané z okna 'Ladenie' z "
 "ponuky Pomocník."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Došlo k výpadku sú�asti pre volanie"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Bol dosiahnutý koniec streamu"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Audio spojenie sa nedá nadviazať"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Video spojenie sa nedá nadviazať"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Váš aktuálny kredit je %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Prepá�te, nemáte dostatok kreditu na tento hovor."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Dobiť"
 
@@ -3996,12 +2977,12 @@ msgid "_View"
 msgstr "_Zobraziť"
 
 # GtkAction
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "_Pomocník"
 
 # GtkAction
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "Ob_sah"
 
@@ -4111,22 +3092,22 @@ msgid "Audio"
 msgstr "Zvuk"
 
 # g_option_context
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Klient Empathy pre rozhovor"
 
 # gtk_tree_view_column
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Názov"
 
 # gtk_tree_view_column
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Miestnosť"
 
 # gtk_tree_view_column
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Pripojiť sa automaticky"
 
@@ -4135,11 +3116,11 @@ msgstr "Pripojiť sa automaticky"
 msgid "Manage Favorite Rooms"
 msgstr "Správa obľúbených miestností"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Zavrieť toto okno?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -4148,7 +3129,7 @@ msgstr ""
 "Zatvorením tohto okna opustíte diskusnú miestnosť %s. Nebudete dostávať "
 "žiadne �alšie správy pokým do nej znovu nevstúpite."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -4166,12 +3147,12 @@ msgstr[2] ""
 "Zatvorením tohto okna opustíte %u diskusné miestnosti. Nebudete dostávať "
 "žiadne �alšie správy pokým do nich znovu nevstúpite."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Opustiť diskusnú miestnosť %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -4180,16 +3161,16 @@ msgstr ""
 "nej znovu nevstúpite."
 
 # button
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Zavrieť okno"
 
 # button
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Opustiť miestnosť"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -4198,7 +3179,7 @@ msgstr[1] "%s (%d nepre�ítaná)"
 msgstr[2] "%s (%d nepre�ítané)"
 
 # PM: %u je po�et otvorených kariet nie sú to ľudia
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -4207,7 +3188,7 @@ msgstr[1] "%s (a %u �alšia)"
 msgstr[2] "%s (a %u �alšie)"
 
 # PM: myslia sa karty takže "na" alebo "v" nie "od"
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -4215,7 +3196,7 @@ msgstr[0] "%s (%d nepre�ítaných na �alších)"
 msgstr[1] "%s (%d nepre�ítaná na �alších)"
 msgstr[2] "%s (%d nepre�ítané na �alších)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -4224,12 +3205,12 @@ msgstr[1] "%s (%d nepre�ítaná na všetkých)"
 msgstr[2] "%s (%d nepre�ítané na všetkých)"
 
 # tooltip
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
 # tooltip
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -4238,7 +3219,7 @@ msgstr[1] "Posiela sa %d správa"
 msgstr[2] "Posielajú sa %d správy"
 
 # tooltip
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Píše správu."
 
@@ -4278,130 +3259,139 @@ msgstr "_Zobraziť zoznam kontaktov"
 msgid "Invite _Participant…"
 msgstr "_Pozvať ú�astníka…"
 
-# GtkAction
+# button
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Vstúpiť do rozhovoru"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "Opustiť _rozhovor"
+
+# GtkAction
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Kontakt"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Karty"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Predchádzajúca karta"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Ďalšia _karta"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Vrátiť spať zatvorenú kartu"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Presunúť kartu _vľavo"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Presunúť kartu vp_ravo"
 
 # GtkAction
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Oddeliť kartu"
 
 # cmd desc
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Zobrazí ur�itú službu"
 
 # g_option_context
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Odla�ova� Empathy"
 
 # application_name
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Odla�ova� Empathy"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Odkaz na pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Odpove� z pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr ""
 "Údaje sú príliš veľké, aby boli poslané naraz. Prosím, uložte záznamy do "
 "súboru."
 
 # window title
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Okno ladenia"
 
 # gtk_tool_button
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Poslať na pastebin"
 
 # gtk_tool_button
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pozastaviť"
 
 # label
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Úroveň"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Ladenie"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Informácie"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Správa"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Upozornenie"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kritická"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -4419,100 +3409,100 @@ msgstr ""
 "cgi?product=empathy\">hlásenia o chybe</a>."
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "ÄŒas"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Doména"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategória"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Zvolený správca pripojenia nepodporuje rozšírenie pre vzdialené ladenie."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Prichádzajúci videohovor"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vám volá. Chcete prijať videohovor?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vám volá. Chcete prijať hovor?"
 
 # button
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Odmietnuť"
 
 # button
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Prijať"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Prijať a zapnúť video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Pozvanie do miestnosti"
 
 # window title
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozvánka na vstup do miestnosti %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Ú�astník %s vás pozýva, aby ste vstúpili do miestnosti %s"
 
 # button
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Vstúpiť"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "Ú�astník %s vás pozval do miestnosti %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Boli ste pozvaný do miestnosti %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prichádzajúci prenos súboru od kontaktu %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Vyžaduje sa heslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -4522,108 +3512,108 @@ msgstr ""
 "Správa: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "0:%02u:%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Prijíma sa súbor „%s“ od kontaktu %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Odosiela sa súbor „%s“ pre kontakt %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Chyba pri prijímaní súboru „%s“ od kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Chyba pri prijímaní súboru"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Chyba pri odosielaní súboru „%s“ pre kontakt %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Chyba pri odosielaní súboru"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "Súbor „%s“ bol prijatý od kontaktu %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Súbor „%s“ bol odoslaný pre kontakt %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Prenos súboru bol dokon�ený"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Čaká sa na odpove� od druhého ú�astníka"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrola integrity súboru „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Vytvára sa kontrolný sú�et súboru „%s“"
 
 # gtk_tree_view
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
 # gtk_tree_view
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Súbor"
 
 # gtk_tree_view
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Zostáva"
 
@@ -4638,11 +3628,11 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Odstráni dokon�ené, zrušené a chybné prenosy súborov zo zoznamu"
 
 # button
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Importovať"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4651,61 +3641,61 @@ msgstr ""
 "import ú�tov iba z programu Pidgin."
 
 # window title
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Import ú�tov"
 
 # column name; contents are checkboxes
 # gtk_tree_view
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Importovať"
 
 # column name
 # gtk_tree_view
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokol"
 
 # column name
 # gtk_tree_view
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Zdroj"
 
 # window title
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Pozvanie ú�astníka"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vyberte kontakt, ktorý chcete pozvať do konverzácie:"
 
 # button
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Pozvať"
 
 # gtk_tree_view
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Diskusná miestnosť"
 
 # gtk_tree_view
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Ú�astníci"
 
 # label
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Zlyhalo vypísanie miestností"
 
 # tooltip
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4718,18 +3708,18 @@ msgstr ""
 "Vyžaduje sa heslo: %s\n"
 "Ú�astníkov: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "�no"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Nie"
 
 # window title
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Vstup do miestnosti"
 
@@ -4780,116 +3770,116 @@ msgid "Room List"
 msgstr "Zoznam miestností"
 
 # notification action
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Odpovedať"
 
 # notification action
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Prijať a zapnúť video"
 
 # notification action
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Odmietnuť"
 
 # notification action
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Prijať"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Poskytnúť"
 
 # sound_entries
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Prijatá správa"
 
 # sound_entries
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Odoslaná správa"
 
 # sound_entries
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nová konverzácia"
 
 # sound_entries
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Kontakt sa prihlásil"
 
 # sound_entries
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Kontakt sa odpojil"
 
 # sound_entries
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Ú�et pripojený"
 
 # sound_entries
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Ú�et odpojený"
 
 # gtk_tree_view
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "Jazyk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "Júlia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "Rómeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Rómeo, Rómeo, pre�o si ty Rómeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:648
 msgid "Deny thy father and refuse thy name;"
 msgstr "Zapri otca, odriekni sa mena;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:651
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "A �i, ak nechceš, prisahaj mi lásku"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:654
 msgid "And I'll no longer be a Capulet."
 msgstr "A ja prestanem byť Capulettová."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:657
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Mám po�úvať, a �i hne� odvetiť?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "Kontakt Júlia sa odpojil"
 
 # window title
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -4904,7 +3894,7 @@ msgid "Show account balances"
 msgstr "Zobraziť množstvo kreditu na ú�toch"
 
 # GtkLabel
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
@@ -5110,17 +4100,17 @@ msgstr "Témy"
 # PK: to je ked mas nespravne heslo a zobrazi sa ti tam hore v zozname upozornenie
 # PK: tu mi sedi skor otvori okno na poskytnutie hesla
 # tooltip
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Otvorí okno na poskytnutie hesla"
 
 #  tooltip
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Odpojí"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Aby ste tu videli kontakty, musíte nastaviť ú�et."
 
 #: ../src/empathy-roster-window.c:569
@@ -5135,6 +4125,11 @@ msgid "Windows Live"
 msgstr "Windows Live"
 
 # service name
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
+# service name
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -5318,12 +4313,12 @@ msgid "Status"
 msgstr "Stav"
 
 # button
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Dokon�iť"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Zadajte, prosím, podrobnosti o vašom ú�te"
 
@@ -5336,6 +4331,3 @@ msgstr "Upraviť voľby ú�tu %s"
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
 msgid "Integrate your IM accounts"
 msgstr "Integruje vaše ú�ty pre internetovú komunikáciu"
-
-#~ msgid "i"
-#~ msgstr "i"
diff --git a/po/sl.po b/po/sl.po
index 5ed53f8b8..59e271ca6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,21 +4,23 @@
 #
 # Bernard Banko <bernard.banko afna t-2.net>, 2009.
 # Andrej Žnidarši� <andrej.znidarsic@gmail.com>, 2010.
-# Matej Urban�i� <mateju@svn.gnome.org>, 2006 - 2013.
+# Matej Urban�i� <mateju@svn.gnome.org>, 2006-2013.
 #
 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: 2013-01-11 12:18+0000\n"
-"PO-Revision-Date: 2013-03-23 08:41+0100\n"
-"Last-Translator: Andrej Žnidarši� <andrej.znidarsic@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: 2013-09-02 16:04+0000\n"
+"PO-Revision-Date: 2013-09-02 22:44+0100\n"
+"Last-Translator: Matej Urban�i� <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenš�ina <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
@@ -36,7 +38,9 @@ msgstr "Empathy hipno sporo�anje"
 
 #: ../data/empathy.desktop.in.in.h:4
 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."
+msgstr ""
+"Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih "
+"storitvah."
 
 #: ../data/empathy.desktop.in.in.h:5
 msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
@@ -47,7 +51,9 @@ msgid "Connection managers should be used"
 msgstr "Uporabljen naj bo upravljalnik omrežja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:2
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+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.h:3
@@ -63,8 +69,11 @@ msgid "Empathy should auto-away when idle"
 msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:6
-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 ""
+"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.h:7
 msgid "Empathy default download folder"
@@ -77,11 +86,17 @@ msgstr "Privzeta mapa za shranjevanje prejetih datotek."
 #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
 #: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
-msgstr "Magi�no število, uporabljeno za preverjanje ali naj se naloge �iš�enja izvedejo"
+msgstr ""
+"Magi�no število, uporabljeno za preverjanje ali naj se naloge �iš�enja "
+"izvedejo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:11
-msgid "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks should be executed or not. Users should not change this key manually."
-msgstr "Število empathy-sanity-cleaning.c preverja ali naj se naloge �iš�enja izvedejo ali ne. Tega klju�a ni priporo�ljivo spreminjati ro�no."
+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.h:12
 #: ../src/empathy-preferences.ui.h:1
@@ -129,8 +144,12 @@ msgid "Display incoming events in the status area"
 msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:23
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Prikaz prihajajo�ih dogodkov v vrstici stanja. V primeru da možnost ni izbrana, bodo prikazani takoj."
+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 prikazani takoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
@@ -201,7 +220,8 @@ msgid "Play a sound when a contact logs out"
 msgstr "Predvajaj zvok ob odjavi stika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:41
-msgid "Whether to play a sound to notify of contacts logging out of the network."
+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.h:42
@@ -234,15 +254,20 @@ msgstr "Onemogo�i pojavna obvestila ob odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
-msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
+msgstr ""
+"Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:50
 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.h:51
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporo�ila tudi, kadar je klepetalno okno že odprto, vendar ni v žariš�u."
+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.h:52
 msgid "Pop up notifications when a contact logs in"
@@ -289,32 +314,45 @@ msgid "Chat window theme variant"
 msgstr "Razli�ica teme klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:63
-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 ""
+"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.h:64
 msgid "Path of the Adium theme to use"
 msgstr "Pot do želene teme Adium "
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:65
-msgid "Path of the Adium theme to use if the theme used for chat is Adium. Deprecated."
-msgstr "Pot do želene teme Adium, kadar je ta dolo�ena za klepet. Možnost je opuš�ena."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"Pot do želene teme Adium, kadar je ta dolo�ena za klepet. Možnost je "
+"opuš�ena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "Omogo�i razvojna orodja WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:67
-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 ""
+"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.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "Obvesti druge uporabnike, da jim tipkate besedilo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:69
-msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
-msgstr "Ali naj se pošilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. Trenutno ne vpliva na stanje 'odsoten'."
+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.h:70
 msgid "Use theme for chat rooms"
@@ -329,15 +367,18 @@ msgid "Spell checking languages"
 msgstr "Jeziki za �rkovanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:73
-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 ""
+"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.h:74
 msgid "Enable spell checker"
 msgstr "Omogo�i �rkovalnik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:75
-msgid "Whether to check words typed against the languages you want to check with."
+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.h:76
@@ -345,16 +386,22 @@ msgid "Nick completed character"
 msgstr "Znak na koncu vzdevka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:77
-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 ""
+"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.h:78
 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.h:79
-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 ""
+"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.h:80
 msgid "Last account selected in Join Room dialog"
@@ -362,7 +409,9 @@ msgstr "Zadnji izbran ra�un v pogovornem oknu pridruženja klepetalnici"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:81
 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."
+msgstr ""
+"Pot predmeta vodila D-Bus zadnjega izbranega ra�una pri pridruženju "
+"klepetalnici."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
@@ -370,7 +419,8 @@ msgstr "Naprava kamere"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:83
 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."
+msgstr ""
+"Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
@@ -393,8 +443,12 @@ msgid "Show hint about closing the main window"
 msgstr "Pokaži namig ob zapiranju glavnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:89
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ali naj bo pogovorno okno sporo�ila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
+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.h:90
 msgid "Empathy can publish the user's location"
@@ -402,7 +456,8 @@ msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
+msgstr ""
+"Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
@@ -414,11 +469,14 @@ msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
+msgstr ""
+"Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:95
 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."
+msgstr ""
+"Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega "
+"omrežja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
@@ -433,8 +491,10 @@ 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.h:99
-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 ""
+"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:733
 msgid "No reason was specified"
@@ -460,8 +520,7 @@ msgstr "Prišlo je do napake med prenosom datoteke"
 msgid "The other participant is unable to transfer the file"
 msgstr "Drug uporabnik ne more prenesti datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:751
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Neznan vzrok"
 
@@ -481,816 +540,188 @@ msgstr "Izbrana datoteka ni obi�ajna datoteka"
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
-#: ../libempathy/empathy-keyring.c:85
-#: ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Gesla ni mogo�e najti"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Geslo ra�una hipnega sporo�anja za %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Geslo za klepetalnico '%s' na ra�unu %s (%s)"
-
-#: ../libempathy/empathy-message.c:403
-#: ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zgrešen klic od %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Klicanje uporabnika %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "Klic uporabnika %s"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "Pred %d sekundami"
-msgstr[1] "Pred %d sekundo"
-msgstr[2] "Pred %d sekundama"
-msgstr[3] "Pred %d sekundami"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Pred %d minutami"
-msgstr[1] "Pred %d minuto"
-msgstr[2] "Pred %d minutama"
-msgstr[3] "Pred %d minutami"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Pred %d urami"
-msgstr[1] "Pred %d uro"
-msgstr[2] "Pred %d urama"
-msgstr[3] "Pred %d urami"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pred %d dnevi"
-msgstr[1] "Pred %d dnevom"
-msgstr[2] "Pred %d dnevoma"
-msgstr[3] "Pred %d dnevi"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Pred %d tedni"
-msgstr[1] "Pred %d tednom"
-msgstr[2] "Pred %d tednoma"
-msgstr[3] "Pred %d tedni"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "Pred %d meseci"
-msgstr[1] "Pred %d mesecem"
-msgstr[2] "Pred %d mesecema"
-msgstr[3] "Pred %d meseci"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "v prihodnosti"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Ni dolo�enega razloga"
 
-#: ../libempathy/empathy-utils.c:280
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Stanje je nastavljeno na brez povezave"
 
-#: ../libempathy/empathy-utils.c:282
-#: ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Napaka Å¡ifriranja"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../libempathy/empathy-utils.c:290
-#: ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../libempathy/empathy-utils.c:296
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Potrdilo ni potrjeno"
 
-#: ../libempathy/empathy-utils.c:298
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Neustrezno potrdilo gostitelja"
 
-#: ../libempathy/empathy-utils.c:300
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Neustrezen prstni odtis potrdila"
 
-#: ../libempathy/empathy-utils.c:302
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Å ifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Povezave ni mogo�e vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Ra�un je s strežnikom že povezan"
 
-#: ../libempathy/empathy-utils.c:350
-msgid "Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:303
+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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Ra�un na strežniku že obstaja"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 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:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"
 
-#: ../libempathy/empathy-utils.c:359
-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:312
+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:362
-msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
-msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je dolo�ena s šifrirno knjižnico."
+#: ../libempathy/empathy-utils.c:315
+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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Programska oprema je prestara"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Uporabniki v bližini"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! Japan"
-
-#: ../libempathy/empathy-utils.c:538
-#: ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook klepetanje"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Vsi ra�uni"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Geslo"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Zapomni si geslo"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Vrata"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Strežnik"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Zapomni si geslo"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Ra�un"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Geslo"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Strežnik"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Vrata"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Uporabniško ime:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Uveljavi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "_Prijava"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Ta ra�un na strežniku že obstaja"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Ustvari nov ra�un na strežniku"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s ra�un"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Nov ra�un"
-
-#: ../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 prijave"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "Kakšno je vaše geslo GroupWise?"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "N_abor znakov"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "Kakšno je vaše geslo ICQ?"
-
-#: ../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 "Nabor znakov"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Dodaj ..."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Odstrani"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Navzgor"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Navzdol"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Strežniki"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Ve�ina strežnikov IRC ne zahteva gesla, zato ga, �e niste prepri�ani, ne uporabite."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Vzdevek"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Sporo�ilo kon�anja"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Pravo ime"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Uporabniško ime"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Katero IRC omrežje?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Kakšen je vaš IRC vzdevek?"
-
-#: ../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: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 ""
-"To je vaše uporabniško ime in ne obi�ajna Facebook prijava.\n"
-"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:6
-msgid "What is your Facebook password?"
-msgstr "Kakšno je vaše geslo Facebook?"
-
-#: ../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: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 "Override server settings"
-msgstr "Prepiši nastavitve strežnika"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Uporabi stari SS_L"
-
-#: ../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: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: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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "_Vzdevek"
-
-#: ../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 "E-_mail address"
-msgstr "_Elektronski naslov"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "Kakšen je vaš ID Windows Live?"
-
-#: ../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-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Samodejno"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Vpiši se"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Možnosti"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Brez"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Uporabniško ime"
-
-#: ../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:5
-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 "NAT Traversal Options"
-msgstr "Možnosti pre�kanja NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Možnosti posredniškega strežnika"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Razli�ne možnosti"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "Strežnik STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Samodejno odkrij strežnik STUN"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Odkrij povezave"
-
-#: ../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 "Mechanism"
-msgstr "Mehanizem"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-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 "Loose Routing"
-msgstr "Ohlapno usmerjanje"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Prezri napake TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Krajevni naslov IP"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Kakšno je vaše geslo SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Geslo:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "_Jezikovne nastavitve seznama klepetalnic:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "N_abor znakov:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Vrata:"
-
-#: ../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:11
-msgid "What is your Yahoo! password?"
-msgstr "Kakšno je vaše geslo Yahoo!?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Ni bilo mogo�e pretvoriti slike"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Ni mogo�e shraniti slike v datoteko"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Izberite sliko za svojo podobo"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Zajem slike ..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Brez slike"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Slike"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Vse datoteke"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Kliknite za pove�avo"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Overitev za ra�un <b>%s</b> je spodletela."
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1300,226 +731,234 @@ msgstr ""
 "Treba je vnesti geslo za ra�un\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Izberi ..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Izberi"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Zapomni si geslo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Prišlo je do napake med za�enjanjem klica"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Dolo�en stik ne podpira klicev."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Izbrani stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Izbrani stik ni veljaven"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Klic v sili ni podprt s tem protokolom"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Tema ni podprta pri tem pogovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Neveljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: po�isti vsa sporo�ila trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: dolo�i temo trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-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:1073
+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:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID stika> [<sporo�ilo>]: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID stika> <sporo�ilo>: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 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:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1083
-msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
-msgstr "/say <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: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 <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:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID stika>: pokaže podrobnosti stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
-msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+#: ../libempathy-gtk/empathy-chat.c:1097
+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:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznan ukaz, za ve� si vpišite /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "nezadostno stanje na ra�unu za pošiljanje sporo�il"
 
-#: ../libempathy-gtk/empathy-chat.c:1542
-#: ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Napaka med pošiljanjem sporo�ila '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544
-#: ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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>."
+msgstr ""
+"Nezadostno stanje na ra�uni za pošiljanje sporo�ila. <a href='%s'>Povišaj</"
+"a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "ni mogo�e"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "predolgo sporo�ilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1680
-#: ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je dolo�ena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Ni dolo�ene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj '%s' v slovar %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Vstavi smeška"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Predlogi �r_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1527,12 +966,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izgnal %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1540,17 +979,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je izob�il %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izob�en"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1560,17 +999,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:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
@@ -1578,54 +1017,50 @@ 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:2989
-#: ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587
-#: ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Napa�no geslo; poskusite znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Klepetalnica je zaš�itena z geslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../libempathy-gtk/empathy-chat.c:4077
-#: ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Pogovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1656,8 +1091,8 @@ msgstr "Uredi blokirane stike"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1667,120 +1102,63 @@ msgstr "Ra�un:"
 msgid "Blocked Contacts"
 msgstr "Blokirani stiki"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Polno Ime"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Telefonska Å¡tevilka"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Elektronski naslov"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Spletiš�e"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "Birthday"
-msgstr "Rojstni dan"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
-msgid "Last seen:"
-msgstr "Zadnji� viden:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Strežnik:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Povezan od:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Sporo�ilo odsotnosti:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "delovno"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "doma�e"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "prenosni telefon"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "glasovno"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "prednostno"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "poštno"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "paketno"
+#: ../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 "Odstrani"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Iskanje stikov"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Poiš�i:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "_Dodaj stik"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Ni najdenih stikov."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "Iskanje stikov na tej vrsti ra�una ni podprto"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Predstavitveno sporo�ilo:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Želel bi videti, kdaj ste prisotni v klepetu. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Shrani podobo"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Ni mogo�e shraniti podobe"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Ra�un"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Dolo�ilo"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Vzdevek"
 
@@ -1814,44 +1192,50 @@ msgstr "Razli�ica"
 msgid "Client"
 msgstr "Odjemalec:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Skupine"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
-msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
-msgstr "Izbor skupin, ki jim stik pripada. Izbrati je mogo�e eno ali ve� skupin, lahko pa tudi nobene."
+#: ../libempathy-gtk/empathy-groups-widget.c:330
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Izbor skupin, ki jim stik pripada. Izbrati je mogo�e eno ali ve� skupin, "
+"lahko pa tudi nobene."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "_Dodaj skupino"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izbor"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Skupina"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Nov stik"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Ali želite blokirati %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "Ali ste prepri�ani, da želite blokirati ponovno vzpostavitev stika med '%s' in vami?"
+msgstr ""
+"Ali ste prepri�ani, da želite blokirati ponovno vzpostavitev stika med '%s' "
+"in vami?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Naslednje identitete bodo blokirane:"
@@ -1859,7 +1243,7 @@ msgstr[1] "Naslednja identiteta bo blokirana:"
 msgstr[2] "Naslednji identiteti bosta blokirani:"
 msgstr[3] "Naslednje identitete bodo blokirane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Naslednjih identitet ni mogo�e blokirati:"
@@ -1867,14 +1251,14 @@ msgstr[1] "Naslednje identitete ni mogo�e blokirati:"
 msgstr[2] "Naslednjih identitet ni mogo�e blokirati:"
 msgstr[3] "Naslednjih identitet ni mogo�e blokirati:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Poro�aj te stike kot žaljive"
@@ -1882,283 +1266,294 @@ msgstr[1] "_Poro�aj ta stik kot žaljiv"
 msgstr[2] "_Poro�aj ta stika kot žaljiva"
 msgstr[3] "_Poro�aj te stike kot žaljive"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 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:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Povezani stiki"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "Paket gnome-contacts ni nameš�en"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
-msgstr "Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
+msgstr ""
+"Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Izbor ra�una za klicanje"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Kli�i"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Delo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "Doma�a mapa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blokiraj stik"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Odstrani iz _skupine '%s'"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ali zares želite odstraniti stik '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, 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."
+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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Odstranjevanje stika"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Odstrani"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "_Klepet"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "Predhodni po_govori"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Souporaba namizja"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Priljubljeno"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Vabila v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "_Povabi v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "_Dodaj stik ..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "P_reimenuj"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ISO oznaka države:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Okraj:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Podro�je:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Poštna številka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Stavba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Nadstropje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Klepetalnica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Besedilo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Raven natan�nosti:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Napaka navpi�no (v metrih):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Napaka vodoravno (v metrih):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Smer:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Hitrost dviganja:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Zadnji� posodobljeno:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Zemljepisna dolžina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Zemljepisna Å¡irina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Nadmorska višina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "Mesto"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%B %Y ob %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Vzdevek:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Dolo�ilo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2175,85 +1570,70 @@ msgstr "<b>Mesto</b> na (datum)"
 msgid "Online from a phone or mobile device"
 msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "Novo omrežje"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Izbor IRC omrežja"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Ponastavi seznam _omrežij"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Izbor"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "nov strežnik"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct."
-msgstr "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:82
+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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
-msgid "You can change these details later or disable this feature by choosing <span style=\"italic\">Edit → Accounts</span> in the Contact List."
-msgstr "Te podrobnosti je mogo�e spreminjati in onemogo�iti tudi kasneje preko menija <span style=\"italic\">Uredi → Ra�uni</span> v seznamu stikov."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
+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."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Poiš�i"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Klepet s stikom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2262,7 +1642,7 @@ msgstr[1] "%s sekunda"
 msgstr[2] "%s sekundi"
 msgstr[3] "%s sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2271,80 +1651,82 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuti"
 msgstr[3] "%s minute"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Klic za�et %s, kon�an %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "V�eraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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?"
+msgstr ""
+"Ali ste prepri�ani, da želite izbrisati vse podatke beležanja predhodnih "
+"pogovorov?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Po�isti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
@@ -2353,22 +1735,20 @@ msgid "_File"
 msgstr "_Datoteka"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "_Uredi"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Izbriši celotno zgodovino ..."
+msgid "Delete All History…"
+msgstr "Izbriši vso zgodovino ..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Klepet"
 
@@ -2382,139 +1762,135 @@ msgid "page 2"
 msgstr "stran 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">Nalaganje ...</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Kakšno vrsto klepetalnega ra�una imate?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Dodajanje novega ra�una"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "Dodaj nov ra�un"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Vnesite dolo�ilo stika ali pa telefonsko številko:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Video klic"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Zvo�ni klic"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Nov klic"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Izbrani stik ni veljaven ali pa ni znan"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Stik ne podpira te vrste pogovora."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Zahtevana zmožnost ni podprta s tem protokolom"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "S podanim stikom ni mogo�e za�eti pogovora"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "S tega kanala ste izob�eni"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Kanal je polno zaseden."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Sodelovanje na kanalu je mogo�e le s povabilom."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Brez povezave ni mogo�e nadaljevati."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Dovoljenje je zavrnjeno"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Prišlo je do napake med za�enjanjem pogovora"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Nov pogovor"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "Zahtevano je geslo"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Sporo�ilo po meri ..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Uredi sporo�ilo po meri ..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "S klikom odstranite stanje kot priljubljeno"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "S klikom naredite to stanje priljubljeno"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
 "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
 msgstr ""
 "<b>Trenutno sporo�ilo: %s</b>\n"
-"<small><i>Pritisnite vnosno tipko za nastavitev novega sporo�ila, ali pa pritisnite tipko Esc za preklic dejanja.</i></small>"
+"<small><i>Pritisnite vnosno tipko za nastavitev novega sporo�ila, ali pa "
+"pritisnite tipko Esc za preklic dejanja.</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Nastavi stanje"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Sporo�ila po meri ..."
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Nov ra�un %s"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Upoštevaj velikost �rk"
 
@@ -2538,493 +1914,359 @@ msgstr "Upoštevaj _velikost �rk"
 msgid "Phrase not found"
 msgstr "Rekla ni mogo�e najti"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Prejeto je bilo hipno sporo�ilo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Poslano je bilo hipno sporo�ilo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Prejeta je bila zahteva za klepet"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Povezava s stikom je bila vzpostavljena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Povezava s stikom je bila prekinjena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Povezano s strežnikom"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Povezava s strežnikom je bila prekinjena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Dohodni klic"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Odhodni klic"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Klic je kon�an"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Urejanje sporo�ila po meri"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Zahteva po naro�ilu"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Sprejmi"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Sporo�ilo je bilo nazadnje spremenjeno ob %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Obi�ajno"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Istovetnosti strežnika klepetalnice ni mogo�e preveriti."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Potrdilo je brez ustreznega podpisa overitelja potrdil."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Potrdilo je poteklo."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Potrdilo še ni omogo�eno."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Potrdilo nima pri�akovanega prstnega odtisa."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "Ime overjenega strežnika gostitelja ni skladno z imenom strežnika."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Potrdilo je samo-podpisano."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "Potrdilo je preklicano s strani izdajatelja in overitelja potrdila."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Potrdilo uporablja Å¡ibko Å¡ifriranje."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Dolžina potrdila presega preverljivo obmo�je."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Potrdilo je nepravilno oblikovano."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Pri�akovan gostitelj: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Gostitelj potrdila: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Nadaljuj"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nepreverjena povezava"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Zapomni si izbor za prihodnje povezave"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Podrobnosti potrdila"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Ni mogo�e odpreti naslova URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Izbor datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Ni dovolj prostora za shranjevanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, 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."
+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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prihajajo�a datoteka od %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Prijava v omrežje za urejanje osebnih podrobnosti."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Osebni podatki</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "Kopiraj _naslov povezave"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "_Odpri povezavo"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Pregled HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Trenutne jezikovne nastavitve"
-
-#: ../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 "arabska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "armenska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "baltska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "keltska"
-
-#: ../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 "srednjeevropska"
-
-#: ../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 "kitajska poenostavljena"
-
-#: ../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 "kitajska tradicionalna"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "hrvaška"
-
-#: ../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 "cirilica"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "cirilica / ruska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "cirilica / ukrajinska "
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "gruzijska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "grška"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "gudžarati"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "gurmuki"
-
-#: ../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 "hebrejska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "hebrejska predo�ena"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "hindujska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "islandska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "japonska"
-
-#: ../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 "korejska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "nordijska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "perzijska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "romunska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "južnoevropska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "tajska"
-
-#: ../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 "turška"
-
-#: ../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 "zahodnoevropska"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "vietnamska"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Najpogostejši stiki"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Uporabniki v bližini"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Brez skupine"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Stika ni mogo�e najti: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Ni sporo�il o napakah"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Hipno sporo�anje (Empathy)"
 
+#: ../src/empathy-about-dialog.c:77
+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 je prosta programska oprema; program lahko razširjate oz. "
+"spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General Public "
+"License), objavljenega pri Free Software Foundation; bodisi razli�ice 2 ali "
+"(po svoji izbiri) katerekoli poznejše razli�ice."
+
 #: ../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 je prosta programska oprema; program lahko razširjate oz. spreminjate pod pogoji Splošnega dovoljenja GNU (GNU General Public License), objavljenega pri Free Software Foundation; bodisi razli�ice 2 ali (po svoji izbiri) katerekoli poznejše razli�ice."
+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 se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA "
+"JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA "
+"DOLOÄŒEN NAMEN.  Za podrobnosti glejte besedilo GNU General Public License."
 
 #: ../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 se razširja v upanju, da bo uporaben, vendar BREZ VSAKRŠNEGA JAMSTVA; tudi brez posredne zagotovitve CENOVNE VREDNOSTI ali PRIMERNOSTI ZA DOLOČEN NAMEN.  Za podrobnosti glejte besedilo GNU General Public License."
-
-#: ../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 "Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja GNU (GNU General Public License); v nasprotnem  primeru pišite na: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"Skupaj s tem programom bi morali prejeti izvod Splošnega javnega dovoljenja "
+"GNU (GNU General Public License); v nasprotnem  primeru pišite na: Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Odjemalec hipnega sporo�anja za namizje GNOME"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr "Matej Urban�i� <mateju@svn.gnome.org>"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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"
+msgstr ""
+"Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in kon�aj"
 
-#: ../src/empathy-accounts.c:186
-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:175
+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:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "Predhodno izberite ra�un (na primer: gabble/jabber/foo_40primer_2eorg0)"
+msgstr ""
+"Predhodno izberite ra�un (na primer: gabble/jabber/foo_40primer_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<id-ra�una>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy ra�uni"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy ra�uni"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Obstajajo neshranjene spremembe vašega %s ra�una."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Obstajajo neshranjene spremembe vašega %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Novi ra�un še ni bil shranjen."
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Brez povezave - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Prekinjena povezava - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Brez povezave - ni omrežne povezave"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Neznano stanje"
 
-#: ../src/empathy-accounts-dialog.c:492
-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:473
+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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Brez povezave - ra�un je onemogo�en"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Uredi parametre povezave"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
 msgstr "_Uredi parametre povezave ..."
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Ali želite odstraniti %s iz ra�unalnika?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Ali želite odstraniti %.50s iz ra�unalnika?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 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:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3033,24 +2275,24 @@ msgstr ""
 "Ali ste prepri�ani, da želite nadaljevati?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Omogo�i"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "Pre_sko�i"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Poveži"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3059,10 +2301,14 @@ msgstr ""
 "Ali ste prepri�ani, da želite nadaljevati?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Sporo�anje in ra�uni VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Dodaj ..."
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Uvozi ..."
@@ -3072,48 +2318,54 @@ msgid "Loading account information"
 msgstr "Nalaganje podrobnosti ra�una"
 
 #: ../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."
+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 je treba najprej namestiti zaledje za vsak "
+"protokol, ki naj bo uporabljen."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
 msgstr "Ni nameš�enega ozadnjega protokola"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Empathy odjemalec overitve"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy odjemalec overitve"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporo�ilnik"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika ra�unov"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
 "\n"
 "%s"
 msgstr ""
-"Prišlo je do napake med povezovanjem z upravljalnikom ra�unov Telepathy. Javljena je napaka:\n"
+"Prišlo je do napake med povezovanjem z upravljalnikom ra�unov Telepathy. "
+"Javljena je napaka:\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "V pogovoru"
 
@@ -3125,155 +2377,166 @@ msgstr "- Empathy odjemalec zvoka in slike"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy odjemalec zvoka in slike"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je klical med drugim pogovorom."
 
-#: ../src/empathy-call-window.c:1554
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dohodni video klic od %s"
 
-#: ../src/empathy-call-window.c:1560
-#: ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dohodni klic od %s"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Zavrni"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Odgovori"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Klic z %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "Naslov IP kot ga zazna strojna oprema"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 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-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "Naslov IP posredovalnega strežnika"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "Naslov IP skupine za ve�smerno oddajanje"
 
-#: ../src/empathy-call-window.c:2605
-#: ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Zadržano"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Tehni�ne podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, 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 "Program stika %s ne prepozna zvo�nih zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, 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 "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, 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."
+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-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Prišlo je do napake na omrežju"
 
-#: ../src/empathy-call-window.c:3131
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3123
+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-call-window.c:3134
-msgid "The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-call-window.c:3126
+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-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, 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."
+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-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Prišlo je do napake v klicnem programniku"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Dosežen je konec pretoka"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Ni mogo�e vzpostaviti zvo�nega pretoka"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Ni mogo�e vzpostaviti video pretoka"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Trenutno stanje je %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 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:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Povišaj"
 
@@ -3297,13 +2560,11 @@ msgstr "_Nastavitve"
 msgid "_View"
 msgstr "_Pogled"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Pomo_�"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Vsebina"
 
@@ -3387,24 +2648,23 @@ msgstr "Oddaljeni odjemalec:"
 msgid "Local Candidate:"
 msgstr "Krajevni odjemalec:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "Zvok"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- sporo�ilnik Empathy"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Klepetalnica"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Samodejno povezovanje"
 
@@ -3412,43 +2672,61 @@ msgstr "Samodejno povezovanje"
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Ali naj se okno zapre?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, 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."
+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:306
+#: ../src/empathy-chat-window.c:298
 #, 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:317
+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:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Ali naj se prekine povezava s klepetalnico %s?"
 
-#: ../src/empathy-chat-window.c:319
-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:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Nadaljnja sporo�ila s te klepetalnice ne bodo prikazana do ponovne povezave."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Zapri okno"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Zapusti klepetalnico"
 
-#: ../src/empathy-chat-window.c:677
-#: ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3457,7 +2735,7 @@ msgstr[1] "%s (%d neprebrano)"
 msgstr[2] "%s (%d neprebrani)"
 msgstr[3] "%s (%d neprebrana)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3466,7 +2744,7 @@ msgstr[1] "%s (in %u drug)"
 msgstr[2] "%s (in %u druga)"
 msgstr[3] "%s (in %u drugi)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3475,7 +2753,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:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3484,11 +2762,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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3497,7 +2775,7 @@ msgstr[1] "Pošiljanje %d sporo�ila"
 msgstr[2] "Pošiljanje %d sporo�il"
 msgstr[3] "Pošiljanje %d sporo�il"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Pisanje sporo�ila."
 
@@ -3521,8 +2799,7 @@ msgstr "_Priljubljena klepetalnica"
 msgid "Notify for All Messages"
 msgstr "Obvesti o vseh novih sporo�ilih"
 
-#: ../src/empathy-chat-window.ui.h:6
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
 msgstr "_Pokaži seznam stikov"
 
@@ -3531,200 +2808,220 @@ msgid "Invite _Participant…"
 msgstr "Povabi _udeleženca ..."
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "_Pridruži se klepetalnici"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "_Zapusti klepetalnico"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "S_tik"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Zavihki"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "_Predhodni zavihek"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Razveljavi zapiranje zavihka"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Premakni zavihek _levo"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Premakni zavihek _desno"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Odpni zavihek"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Pokaži posebno storitev"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- razhroš�evalnik Empathy"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy razhroš�evalnik"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Povezava odložiš�a Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Odziv odložiš�a Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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."
+msgstr ""
+"Preve� je podatkov za enkratno lepljenje. Beleženje dnevnika je "
+"priporo�ljivo shraniti v datoteko."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Razhroš�evalno okno"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Pošlji na odložiš�e Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Razhroš�evanje"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Podrobnosti"
 
-#: ../src/empathy-debug-window.c:2002
-#: ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Sporo�ilo"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kriti�no"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
-"Even if they don't display passwords, logs can contain sensitive information such as your list of contacts or the messages you recently sent or received.\n"
-"If you don't want to see such information available in a public bug report, you can choose to limit the visibility of your bug to Empathy developers when reporting it by displaying the advanced fields in the <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
 msgstr ""
-"Čeprav dnevniki ne vklju�ujejo gesel, lahko vsebujejo ob�utljive podatke, kot so seznam stikov ter prejeta in poslana sporo�ila elektronske pošte.\n"
-"V kolikor teh podrobnosti ne želite videti v javnem poro�ilu o hroš�u, je vidnost teh mogo�e omejiti le za razvijalce programa Empathy. To storite preko izbir na spletiš�u za <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">objavo poro�ila</a>."
-
-#: ../src/empathy-debug-window.c:2062
+"Čeprav dnevniki ne vklju�ujejo gesel, lahko vsebujejo ob�utljive podatke, "
+"kot so seznam stikov ter prejeta in poslana sporo�ila elektronske pošte.\n"
+"V kolikor teh podrobnosti ne želite videti v javnem poro�ilu o hroš�u, je "
+"vidnost teh mogo�e omejiti le za razvijalce programa Empathy. To storite "
+"preko izbir na spletiš�u za <a href=\"https://bugzilla.gnome.org/enter_bug."
+"cgi?product=empathy\">objavo poro�ila</a>."
+
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "ÄŒas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:2100
-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-debug-window.c:2091
+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-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, 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:513
+#: ../src/empathy-event-manager.c:507
 #, 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:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../src/empathy-event-manager.c:549
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Odgovori"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, 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:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas je povabil v %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Povabljeni ste v %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prihajajo� prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:973
-#: ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3734,108 +3031,105 @@ msgstr ""
 "Sporo�ilo: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Prejemanje\"%s\" od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:303
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Pošiljanje \"%s\" za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Napaka med prejemanjem \"%s\" od %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Napaka med prejemanjem datoteke"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Napaka med pošiljanjem \"%s\" k %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Napaka med pošiljanjem datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" prejeto od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" poslano %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Prenos datoteke je kon�an"
 
-#: ../src/empathy-ft-manager.c:615
-#: ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Čakanje na odziv drugega udeleženca"
 
-#: ../src/empathy-ft-manager.c:641
-#: ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Preverjanje celovitosti \"%s\""
 
-#: ../src/empathy-ft-manager.c:644
-#: ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Ustvarjanje razpršila \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -3847,57 +3141,61 @@ 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:76
+#: ../src/empathy-import-dialog.c:70
 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:82
+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:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Uvozi ra�une"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Uvozi"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Vir"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Povabi udeležence"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izbor stika za povabilo v pogovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Klepetelnica"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "ÄŒlani"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Izpis seznama klepetalnic je spodletel"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3910,35 +3208,46 @@ msgstr ""
 "Zahtevano geslo: %s\n"
 "ÄŒlani: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Pridruži se klepetalnici"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali ve� klepetalnic s seznama."
+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:2
 msgid "_Room:"
 msgstr "_Klepetalnica:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account&apos;s server"
-msgstr "Vnesite gostujo�i strežnik klepetalnice ali pa pustite polje prazno, �e se klepetalnica nahaja na strežniku ra�una"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;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:4
-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"
+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 "_Server:"
@@ -3952,104 +3261,104 @@ msgstr "Seznama klepetalnic ni bilo mogo�e naložiti"
 msgid "Room List"
 msgstr "Seznam klepetalnic"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Odgovori z videom"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Odkloni"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Zagotovi"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Sporo�ilo je bilo prejeto"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Sporo�ilo je bilo poslano"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Nov pogovor"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Stik se je povezal"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Stik se je odjavil"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Povezava z ra�unom je vzpostavljena"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Povezava z ra�unom je prekinjena"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:380
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:631
 msgid "Juliet"
 msgstr "Julija"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:638
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:644
 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:654
+#: ../src/empathy-preferences.c:648
 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:657
+#: ../src/empathy-preferences.c:651
 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:660
+#: ../src/empathy-preferences.c:654
 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:663
+#: ../src/empathy-preferences.c:657
 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:666
+#: ../src/empathy-preferences.c:660
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1026
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -4061,8 +3370,7 @@ msgstr "Pokaži skupine"
 msgid "Show account balances"
 msgstr "Pokaži stanje ra�una"
 
-#: ../src/empathy-preferences.ui.h:4
-#: ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Seznam stikov"
 
@@ -4151,16 +3459,30 @@ msgid "Use _echo cancellation to improve call quality"
 msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Echo cancellation helps to make your voice sound clearer to the other person, but may cause problems on some computers. If you or the other person hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "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 ""
+"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:30
 msgid "_Publish location to my contacts"
 msgstr "O_bjavi mesto mojim stikom"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "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 ""
+"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:33
@@ -4188,7 +3510,9 @@ msgid "Location sources:"
 msgstr "Mesta virov:"
 
 #: ../src/empathy-preferences.ui.h:40
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+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:41
@@ -4211,27 +3535,33 @@ msgstr "Razli�ica:"
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Vpis gesla"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
-msgstr "Za prikaz stikov morate nastaviti ra�un."
+msgid "You need to set up an account to see contacts here."
+msgstr "Za prikaz stikov je treba nastaviti ra�un."
 
 #: ../src/empathy-roster-window.c:569
 #, 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."
+msgstr ""
+"Ra�unov %s ni mogo�e uporabljati, dokler ni posodobljena programska oprema "
+"%s."
 
 #: ../src/empathy-roster-window.c:670
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4247,8 +3577,8 @@ msgid "Online Accounts"
 msgstr "Spletni ra�uni"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Posodobitev programske opreme ..."
+msgid "Update software…"
+msgstr "Posodobi programsko opremo ..."
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4293,24 +3623,26 @@ msgid "No online contacts"
 msgstr "Ni prijavljenih stikov"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
 msgstr "_Nov pogovor ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "_Nov klic ..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nov k_lic ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Stiki"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "_Dodajanje stikov ..."
+msgid "_Add Contacts…"
+msgstr "_Dodaj stike ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_iskanje stikov ..."
+msgid "_Search for Contacts…"
+msgstr "Iskanje _stikov ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4321,8 +3653,8 @@ msgid "_Rooms"
 msgstr "_Klepetalnice"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Pridruži se ..."
+msgid "_Join…"
+msgstr "_Pridruži se"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4369,28 +3701,16 @@ msgstr "Brez _povezave"
 msgid "Show _Offline Contacts"
 msgstr "Pokaži _nepovezane stike"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "_Dodaj stik ..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Nov pogovor ..."
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Nov k_lic ..."
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Kon�ano"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Vnesite podrobnosti ra�una"
 
@@ -4403,6 +3723,605 @@ msgstr "Uredi možnosti ra�una %s"
 msgid "Integrate your IM accounts"
 msgstr "Podpora razli�nim ra�unom IM"
 
+#~ msgid "Password not found"
+#~ msgstr "Gesla ni mogo�e najti"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "Geslo ra�una hipnega sporo�anja za %s (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "Geslo za klepetalnico '%s' na ra�unu %s (%s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "Pred %d sekundami"
+#~ msgstr[1] "Pred %d sekundo"
+#~ msgstr[2] "Pred %d sekundama"
+#~ msgstr[3] "Pred %d sekundami"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "Pred %d minutami"
+#~ msgstr[1] "Pred %d minuto"
+#~ msgstr[2] "Pred %d minutama"
+#~ msgstr[3] "Pred %d minutami"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "Pred %d urami"
+#~ msgstr[1] "Pred %d uro"
+#~ msgstr[2] "Pred %d urama"
+#~ msgstr[3] "Pred %d urami"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "Pred %d dnevi"
+#~ msgstr[1] "Pred %d dnevom"
+#~ msgstr[2] "Pred %d dnevoma"
+#~ msgstr[3] "Pred %d dnevi"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "Pred %d tedni"
+#~ msgstr[1] "Pred %d tednom"
+#~ msgstr[2] "Pred %d tednoma"
+#~ msgstr[3] "Pred %d tedni"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "Pred %d meseci"
+#~ msgstr[1] "Pred %d mesecem"
+#~ msgstr[2] "Pred %d mesecema"
+#~ msgstr[3] "Pred %d meseci"
+
+#~ msgid "in the future"
+#~ msgstr "v prihodnosti"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! Japan"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Facebook klepetanje"
+
+#~ msgid "Pass_word"
+#~ msgstr "_Geslo"
+
+#~ msgid "Screen _Name"
+#~ msgstr "Zaslonsko _ime"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>Primer:</b> Ime Zaslona"
+
+#~ msgid "_Port"
+#~ msgstr "_Vrata"
+
+#~ msgid "_Server"
+#~ msgstr "_Strežnik"
+
+#~ msgid "Advanced"
+#~ msgstr "Napredno"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "Kakšno je vaše zaslonsko ime AIM?"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "Kakšno je vaše geslo AIM?"
+
+#~ msgid "Remember Password"
+#~ msgstr "Zapomni si geslo"
+
+#~ msgid "Password"
+#~ msgstr "Geslo"
+
+#~ msgid "Server"
+#~ msgstr "Strežnik"
+
+#~ msgid "Port"
+#~ msgstr "Vrata"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s:"
+
+#~ msgid "Username:"
+#~ msgstr "Uporabniško ime:"
+
+#~ msgid "A_pply"
+#~ msgstr "_Uveljavi"
+
+#~ msgid "L_og in"
+#~ msgstr "_Prijava"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "Ta ra�un na strežniku že obstaja"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "Ustvari nov ra�un na strežniku"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%1$s na %2$s"
+
+#~ msgid "%s Account"
+#~ msgstr "%s ra�un"
+
+#~ msgid "New account"
+#~ msgstr "Nov ra�un"
+
+#~ msgid "Login I_D"
+#~ msgstr "ID prijave"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>Primer:</b> uporabniško ime"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "Kakšen je vaš uporabniški ID GroupWise?"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "Kakšno je vaše geslo GroupWise?"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "ICQ _UIN"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>Primer:</b> 123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "N_abor znakov"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "Kakšen je vaš UIN ICQ?"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "Kakšno je vaše geslo ICQ?"
+
+#~ msgid "Network"
+#~ msgstr "Omrežje"
+
+#~ msgid "Character set"
+#~ msgstr "Nabor znakov"
+
+#~ msgid "Up"
+#~ msgstr "Navzgor"
+
+#~ msgid "Down"
+#~ msgstr "Navzdol"
+
+#~ msgid "Servers"
+#~ msgstr "Strežniki"
+
+#~ 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 "Nickname"
+#~ msgstr "Vzdevek"
+
+#~ msgid "Quit message"
+#~ msgstr "Sporo�ilo kon�anja"
+
+#~ msgid "Real name"
+#~ msgstr "Pravo ime"
+
+#~ msgid "Username"
+#~ msgstr "Uporabniško ime"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "Katero IRC omrežje?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "Kakšen je vaš IRC vzdevek?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "kakšno je vaše uporabniško ime Facebook?"
+
+#~ 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 ""
+#~ "To je vaše uporabniško ime in ne obi�ajna Facebook prijava.\n"
+#~ "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."
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "Kakšno je vaše geslo Facebook?"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "Kakšen je vaš uporabniški ID Google?"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>Primer:</b> uporabnik@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "Kakšno je vaše geslo Google?"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>Primer:</b> uporabnik@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "_Prezri napake potrdila SSL"
+
+#~ msgid "Priori_ty"
+#~ msgstr "Prednos_t"
+
+#~ msgid "Reso_urce"
+#~ msgstr "_Vir"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "_Zahtevano je Å¡ifriranje (TLS/SSL)"
+
+#~ msgid "Override server settings"
+#~ msgstr "Prepiši nastavitve strežnika"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "Uporabi stari SS_L"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "Kakšen je vaš uporabniški ID Jabber?"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "Kakšen je vaš želeni uporabniški ID Jabber?"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "Kakšno je vaše geslo Jabber?"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "Kakšno je vaše želeno geslo Jabber?"
+
+#~ msgid "Nic_kname"
+#~ msgstr "_Vzdevek"
+
+#~ msgid "_Last Name"
+#~ msgstr "_Priimek"
+
+#~ msgid "_First Name"
+#~ msgstr "_Ime"
+
+#~ msgid "_Published Name"
+#~ msgstr "_Objavljeno ime"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_ID Jabber"
+
+#~ msgid "E-_mail address"
+#~ msgstr "_Elektronski naslov"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>Primer:</b> uporabnik@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "Kakšen je vaš ID Windows Live?"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "Kakšno je vaše geslo Windows Live?"
+
+#~ msgid "Auto"
+#~ msgstr "Samodejno"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "Vpiši se"
+
+#~ msgid "Options"
+#~ msgstr "Možnosti"
+
+#~ msgid "None"
+#~ msgstr "Brez"
+
+#~ msgid "_Username"
+#~ msgstr "_Uporabniško ime"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>Primer:</b> uporabnik@moj.sip.strežnik"
+
+#~ 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 "NAT Traversal Options"
+#~ msgstr "Možnosti pre�kanja NAT"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Možnosti posredniškega strežnika"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "Razli�ne možnosti"
+
+#~ msgid "STUN Server"
+#~ msgstr "Strežnik STUN"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "Samodejno odkrij strežnik STUN"
+
+#~ msgid "Discover Binding"
+#~ msgstr "Odkrij povezave"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "Možnosti ohranjanja povezave"
+
+#~ msgid "Mechanism"
+#~ msgstr "Mehanizem"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "Razmik (v sekundah)"
+
+#~ msgid "Authentication username"
+#~ msgstr "Uporabniško ime za overitev"
+
+#~ msgid "Transport"
+#~ msgstr "Prenos"
+
+#~ msgid "Loose Routing"
+#~ msgstr "Ohlapno usmerjanje"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "Prezri napake TLS"
+
+#~ msgid "Local IP Address"
+#~ msgstr "Krajevni naslov IP"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "Kakšen je prijavni ID vaše SIP?"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "Kakšno je vaše geslo SIP?"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Geslo:"
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "Yahoo! I_D:"
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "_Prezri vabila na konference in v klepetalnice"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "_Jezikovne nastavitve seznama klepetalnic:"
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "N_abor znakov:"
+
+#~ msgid "_Port:"
+#~ msgstr "_Vrata:"
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "Kakšno je vaše geslo Yahoo!?"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "Ni bilo mogo�e pretvoriti slike"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "Ni mogo�e shraniti slike v datoteko"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "Izberite sliko za svojo podobo"
+
+#~ msgid "Take a picture..."
+#~ msgstr "Zajem slike ..."
+
+#~ msgid "No Image"
+#~ msgstr "Brez slike"
+
+#~ msgid "Images"
+#~ msgstr "Slike"
+
+#~ msgid "All Files"
+#~ msgstr "Vse datoteke"
+
+#~ msgid "Select..."
+#~ msgstr "Izberi ..."
+
+#~ msgid "_Select"
+#~ msgstr "_Izberi"
+
+#~ msgid "Full name"
+#~ msgstr "Polno Ime"
+
+#~ msgid "Phone number"
+#~ msgstr "Telefonska Å¡tevilka"
+
+#~ msgid "E-mail address"
+#~ msgstr "Elektronski naslov"
+
+#~ msgid "Website"
+#~ msgstr "Spletiš�e"
+
+#~ msgid "Birthday"
+#~ msgstr "Rojstni dan"
+
+#~ msgid "Last seen:"
+#~ msgstr "Zadnji� viden:"
+
+#~ msgid "Server:"
+#~ msgstr "Strežnik:"
+
+#~ msgid "Connected from:"
+#~ msgstr "Povezan od:"
+
+#~ msgid "Away message:"
+#~ msgstr "Sporo�ilo odsotnosti:"
+
+#~ msgid "work"
+#~ msgstr "delovno"
+
+#~ msgid "home"
+#~ msgstr "doma�e"
+
+#~ msgid "mobile"
+#~ msgstr "prenosni telefon"
+
+#~ msgid "voice"
+#~ msgstr "glasovno"
+
+#~ msgid "preferred"
+#~ msgstr "prednostno"
+
+#~ msgid "postal"
+#~ msgstr "poštno"
+
+#~ msgid "parcel"
+#~ msgstr "paketno"
+
+#~ msgid "New Network"
+#~ msgstr "Novo omrežje"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "Izbor IRC omrežja"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "Ponastavi seznam _omrežij"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "Izbor"
+
+#~ msgid "new server"
+#~ msgstr "nov strežnik"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "Nov ra�un %s"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "Prijava v omrežje za urejanje osebnih podrobnosti."
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>Osebni podatki</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "Trenutne jezikovne nastavitve"
+
+#~ msgid "Arabic"
+#~ msgstr "arabska"
+
+#~ msgid "Armenian"
+#~ msgstr "armenska"
+
+#~ msgid "Baltic"
+#~ msgstr "baltska"
+
+#~ msgid "Celtic"
+#~ msgstr "keltska"
+
+#~ msgid "Central European"
+#~ msgstr "srednjeevropska"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "kitajska poenostavljena"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "kitajska tradicionalna"
+
+#~ msgid "Croatian"
+#~ msgstr "hrvaška"
+
+#~ msgid "Cyrillic"
+#~ msgstr "cirilica"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "cirilica / ruska"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "cirilica / ukrajinska "
+
+#~ msgid "Georgian"
+#~ msgstr "gruzijska"
+
+#~ msgid "Greek"
+#~ msgstr "grška"
+
+#~ msgid "Gujarati"
+#~ msgstr "gudžarati"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "gurmuki"
+
+#~ msgid "Hebrew"
+#~ msgstr "hebrejska"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "hebrejska predo�ena"
+
+#~ msgid "Hindi"
+#~ msgstr "hindujska"
+
+#~ msgid "Icelandic"
+#~ msgstr "islandska"
+
+#~ msgid "Japanese"
+#~ msgstr "japonska"
+
+#~ msgid "Korean"
+#~ msgstr "korejska"
+
+#~ msgid "Nordic"
+#~ msgstr "nordijska"
+
+#~ msgid "Persian"
+#~ msgstr "perzijska"
+
+#~ msgid "Romanian"
+#~ msgstr "romunska"
+
+#~ msgid "South European"
+#~ msgstr "južnoevropska"
+
+#~ msgid "Thai"
+#~ msgstr "tajska"
+
+#~ msgid "Turkish"
+#~ msgstr "turška"
+
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
+
+#~ msgid "Western"
+#~ msgstr "zahodnoevropska"
+
+#~ msgid "Vietnamese"
+#~ msgstr "vietnamska"
+
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "_Uredi parametre povezave ..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "_Nov pogovor ..."
+
+#~ msgid "New _Call..."
+#~ msgstr "_Nov klic ..."
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "_Dodajanje stikov ..."
+
+#~ msgid "_Join..."
+#~ msgstr "_Pridruži se ..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Dodaj stik ..."
+
 #~ msgid "i"
 #~ msgstr "i"
 
@@ -4505,8 +4424,8 @@ msgstr "Podpora razli�nim ra�unom IM"
 
 #~ msgid "Details"
 #~ msgstr "Podrobnosti"
-#~ msgctxt "codec"
 
+#~ msgctxt "codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
 
@@ -4555,9 +4474,6 @@ msgstr "Podpora razli�nim ra�unom IM"
 #~ msgid "_Compact Size"
 #~ msgstr "S_kr�en pogled"
 
-#~ msgid "_Join…"
-#~ msgstr "_Pridruži se"
-
 #~ msgid "Could not start room listing"
 #~ msgstr "Seznama klepetalnic ni bilo mogo�e za�eti"
 
@@ -4620,15 +4536,15 @@ msgstr "Podpora razli�nim ra�unom IM"
 
 #~ 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)"
 
+#~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link Contacts…"
 #~ msgstr "_Poveži stike ..."
 
 #~ msgid "Link Contacts"
 #~ msgstr "Poveži stike"
-#~ msgctxt "Unlink individual (button)"
 
+#~ msgctxt "Unlink individual (button)"
 #~ msgid "_Unlink…"
 #~ msgstr "_Odstrani povezavo ..."
 
@@ -4648,8 +4564,8 @@ msgstr "Podpora razli�nim ra�unom IM"
 #~ msgstr ""
 #~ "Ali ste prepri�ani, da želite odstraniti povezane stike? S tem se bodo "
 #~ "stiki razdelil na posamezne stike."
-#~ msgctxt "Unlink individual (button)"
 
+#~ msgctxt "Unlink individual (button)"
 #~ msgid "_Unlink"
 #~ msgstr "_Odstrani povezavo"
 
@@ -4773,8 +4689,8 @@ msgstr "Podpora razli�nim ra�unom IM"
 
 #~ msgid "Personal Information"
 #~ msgstr "Osebni podatki"
-#~ msgctxt "Edit contact (contextual menu)"
 
+#~ msgctxt "Edit contact (contextual menu)"
 #~ msgid "_Edit"
 #~ msgstr "_Uredi"
 
@@ -4829,20 +4745,20 @@ msgstr "Podpora razli�nim ra�unom IM"
 
 #~ msgid "The selected contact is offline."
 #~ msgstr "Izbrani stik ni povezan v omrežje."
-#~ msgctxt "encoding video codec"
 
+#~ msgctxt "encoding video codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
-#~ msgctxt "encoding audio codec"
 
+#~ msgctxt "encoding audio codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
-#~ msgctxt "decoding video codec"
 
+#~ msgctxt "decoding video codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
-#~ msgctxt "decoding audio codec"
 
+#~ msgctxt "decoding audio codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
 
@@ -4917,8 +4833,8 @@ msgstr "Podpora razli�nim ra�unom IM"
 
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "Uporabi _Yahoo! Japan"
-#~ msgctxt "Link individual (contextual menu)"
 
+#~ msgctxt "Link individual (contextual menu)"
 #~ msgid "_Link…"
 #~ msgstr "_Poveži ..."
 
diff --git a/po/sr.po b/po/sr.po
index d08be9003..42373c02f 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,19 +6,16 @@
 # Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
 # Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
 # Nikola Kotur <kotnik@ns-linux.org>, 2006.
-# Милош Поповић <gpopac@gmail.com>, 2007, 2008.
-# Maintainer: Бранко Кокановић <branko.kokanovic@gmail.com>, 2010.
-# Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
-# Милош Поповић <gpopac@gmail.com>, 2010.
-# Бранко Кокановић <branko.kokanovic@gmail.com>, 2011.
+# Милош Поповић <gpopac@gmail.com>, 2007, 2008, 2009, 2010.
+# Бранко Кокановић <branko.kokanovic@gmail.com>, 2010, 2011.
 # Миро�лав �иколић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
 "y&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2013-01-09 14:05+0000\n"
-"PO-Revision-Date: 2013-01-18 10:24+0200\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-07 05:12+0200\n"
 "Last-Translator: Миро�лав �иколић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -427,8 +424,8 @@ msgstr "Уређај камерице"
 #: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. "
-"„/dev/video0“."
+"О�новна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
@@ -467,34 +464,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Да ли Пи�моноша да објављује локацију кори�ника његовим пријатељима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мрежу да погоди локацију."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти мобилну мрежу да погоди локацију."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Да ли Пи�моноша �ме да кори�ти ГПС да погоди локацију."
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Да ли Пи�моноша да умањи прецизно�т локације"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -524,7 +497,7 @@ msgstr "Грешка приликом прено�а датотеке"
 msgid "The other participant is unable to transfer the file"
 msgstr "Друга �трана није у могућно�ти да прене�е датотеку"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "�епознат разлог"
 
@@ -544,226 +517,154 @@ msgstr "Изабрана датотека није обична датотека
 msgid "The selected file is empty"
 msgstr "Изабрана датотека је празна"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Лозинка није пронађена"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Лозинка ТП налога за %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Лозинка за причаоницу „%s“ на налогу %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропуштен позив од %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Позив кори�ника %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "%s ва� зове"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "Пре %d �екунд"
-msgstr[1] "Пре %d �екунде"
-msgstr[2] "Пре %d �екунди"
-msgstr[3] "Пре једне �екунде"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Пре %d минут"
-msgstr[1] "Пре %d минута"
-msgstr[2] "Пре %d минута"
-msgstr[3] "Пре једног минута"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Пре %d �ата"
-msgstr[1] "Пре %d �ата"
-msgstr[2] "Пре %d �ати"
-msgstr[3] "Пре једног �ата"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Пре %d дана"
-msgstr[1] "Пре %d дана"
-msgstr[2] "Пре %d дана"
-msgstr[3] "Пре једног дана"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Пре %d недеље"
-msgstr[1] "Пре %d недеље"
-msgstr[2] "Пре %d недеља"
-msgstr[3] "Пре једне недеље"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "Пре %d ме�еца"
-msgstr[1] "Пре %d ме�еца"
-msgstr[2] "Пре %d ме�еци"
-msgstr[3] "Пре једног ме�еца"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "у будућно�ти"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "До�тупан"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Од�утан"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "�евидљив"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "�еповезан"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "�ије наведен разлог"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Стање је по�тављено на „неповезан“"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Грешка мреже"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Потврђивање идентитета није у�пело"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Грешка шифровања"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Име је у употреби"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Уверење није про�леђено"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Уверење није поверљиво"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Уверење је и�текло"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Уверење није активирано"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "�азив домаћина уверења �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Оти�ак уверења �е не поклапа"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Уверење је �амопотпи�ано"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Грешка у уверењеу"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Шифровање није до�тупно"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Уверење није и�правно"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Веза је одбијена"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Веза не може бити у�по�тављена"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Веза је изгубљена"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Овај налог је већ повезан �а �ервером"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Веза је замењена новом везом кори�тећи и�ти ре�ур�"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Овај налог већ по�тоји на �ерверу"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер је тренутно превише заузет да би руковао везом"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Уверење је опозвано"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Уверење кори�ти не�игуран алгоритам шифровања или је криптограф�ки �лабо"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -771,588 +672,33 @@ msgstr ""
 "Дужина уверења �ервера, или дубина ланца уверења �ервера, премашује границе "
 "које је задала библиотека шифровања"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Ваш �офтвер је превише �тар"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Унутрашња грешка"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Људи у околини"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Јаху! Јапан"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Гугл разговор"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Феј�бук ћа�кање"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Сви налози"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "_Лозинка"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Запамти лозинку"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "_Порт"
-
-#: ../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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "_Сервер"
-
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Упамти лозинку"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "�алог"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Лозинка"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Сервер"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Прикључник"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Кори�ничко име:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Примени"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Пријави _ме"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Овај налог већ по�тоји на �ерверу"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "�аправи нови налог на �ерверу"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s налог"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "�ови налог"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "_Кори�ничко име"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> кори�ничко-име"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "Који је ваш Гроуп Вајз кори�нички ИБ?"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "Која је ваша Гроуп Вајз лозинка?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN"
-msgstr "ИЦКу _БКС"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>Пример:</b> 123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-msgid "Ch_aracter set"
-msgstr "Кодни р_а�поред"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Који је ваш ИЦКу БКС?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-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 "Кодни ра�поред"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Додај…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Уклони"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Горе"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Доле"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Сервери"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Већина ИРЦ �ервера не тражи лозинку, зато ако ни�те �игурни, немојте је "
-"уно�ити."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "�адимак"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Порука за крај"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Стварно име"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Кори�ничко име"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Која ИРЦ мрежа?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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: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 ""
-"Ово је ваше кори�ничко име, а не обична Феј�бук пријава.\n"
-"�ко вам је адре�а facebook.com/<b>пера</b>, уне�ите <b>пера</b>.\n"
-"Уколико немате кори�ничко име за Феј�бук, идите на <a href=\"http://www."
-"facebook.com/username/\">ову �трану</a> да га изаберете."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "What is your Facebook password?"
-msgstr "Која је ваша Феј�бук лозинка?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "Који је ваш Гугл ИБ?"
-
-#: ../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 "Override server settings"
-msgstr "Превазиђи по�тавке �ервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-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:25
-msgid "What is your desired Jabber ID?"
-msgstr "Који је ваш жељени �абер ИБ?"
-
-#: ../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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "�а_димак"
-
-#: ../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 "E-_mail address"
-msgstr "�дре�а _ел. поште"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "Који је ваш ИБ Виндоуза уживо?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Која је ваша лозинка Виндоуза уживо?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Само�тално"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "УДП"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "ТЦП"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "ТЛС"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Отвори налог"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Могућно�ти"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "�ишта"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Кори�ничко име"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Кори�ти овај налог за позиве _линиј�ких и мобилних телефона"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "Опције прола�ка кроз ��Т"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Опције по�редника"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Разне опције"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "СТУ� �ервер"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "�утомат�ки откриј СТУ� �ервер"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Откриј повезивања"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Опције за одржавање �талне везе"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "Механизам"
-
-#: ../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 "Transport"
-msgstr "Прено�"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Слабо рутирање"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Занемари ТЛС грешке"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-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 "What is your SIP account password?"
-msgstr "Која је лозинка за ваш СИП налог?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Лозинка:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "Лок_ални �пи�ак �оба:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Кодни р_а�поред:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-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:11
-msgid "What is your Yahoo! password?"
-msgstr "Која је ваша Јаху! лозинка?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "�е могу да претворим �лику"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "�иједан од прихваћених формата �лика није подржан на вашем �и�тему"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "�е могу да �ачувам �лику у датотеку"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Изаберите вашу �лику"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Изаберите �лику..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Без �лике"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Слике"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Све датотеке"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Кликните да увећате"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "�ије у�пело потврђивање идентитета за налог <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Покушај поново"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1362,95 +708,92 @@ msgstr ""
 "Уне�ите нову лозинку за налог\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Изабери..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Изабери"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Дошло је до грешке приликом позивања"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "�аведени контакт не подржава позиве"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "�аведени контакт није на вези"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "�аведени контакт није и�праван"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Овај протокол не подржава хитне позиве"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "�емате довољно кредита да би�те могли да обавите овај позив"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "�и�ам у�пео да отворим приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Теме ни�у подржане у овом разговору"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "�ије вам дозвољено да промените тему"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "�еи�праван ИБ контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: чи�ти �ве поруке из овог разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: по�тавља тему тренутног разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ИБ �обе>: прикључује �е новој �оби за ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<ИБ �обе>] [<разлог>]: напушта �обу за ћа�кање, подразумевано тренутну"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћа�кање"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <надимак>: мења ваш надимак на тренутном �ерверу"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <порука>: шаље поруку Р�ДЊ� на тренутни разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../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 "
@@ -1460,11 +803,11 @@ msgstr ""
 "порука које почињу �а „/“. �а пример: „/say /join �е кори�ти за прикључивање "
 "у нову �обу за ћа�кање“"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ИБ контакта>: приказује податке о контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1472,126 +815,126 @@ msgstr ""
 "/help [<наредбa>]: приказује �ве подржане наредбе. �ко �е да и конкретна "
 "<наредба>, приказује њено упут�тво за употребу."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Коришћење: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "�епозната наредба"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "�епозната наредба; погледајте /help за до�тупне наредбе"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "нема довољно готовине за �лање поруке"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при �лању поруке „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "нема довољно готовине за �лање поруке. <a href='%s'>Допуните</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "не�по�обан"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "неповезан"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "неи�праван пријатељ"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "при�туп је забрањен"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "порука је предуга"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "није подржано"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема је по�тављена на: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Тема није по�тављена"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(нема предлога)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додај „%s“ у речник за %s језик"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Убаци �мешак"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Предлози правопи_�а"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "�и�ам у�пео да преузмем �корашње дневнике"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s је отишао �а везе"
@@ -1599,12 +942,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s је избацио кори�ника %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s је избачен"
@@ -1612,17 +955,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s је забранио при�туп кори�нику %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "Кори�нику %s је забрањен при�туп"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s је напу�тио(ла) причаоницу"
@@ -1632,17 +975,17 @@ msgstr "%s је напу�тио(ла) причаоницу"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s је при�тупио(ла) причаоници"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је �ада познат као %s"
@@ -1650,50 +993,50 @@ msgstr "%s је �ада познат као %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Да ли желите да запамтите ову лозинку?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "�е �ада"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Погрешна лозинка, покушајте поново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Ова �оба је заштићена лозинком:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Прикључи �е"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (СМС)"
@@ -1724,8 +1067,8 @@ msgstr "Измени блокиране пријатеље"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1735,120 +1078,64 @@ msgstr "�алог:"
 msgid "Blocked Contacts"
 msgstr "Блокирани пријатељи"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Име и презиме"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Број телефона"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "�дре�а ел. поште"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Веб �траница"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Виђен пре:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "Повезан �а:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "Порука за од�утно�т:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "по�ао"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "кућа"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "мобилни"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "гла�овни"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "првен�твени"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "поштан�ки"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "Уклони"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Претражи контакте"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Претрага: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "Дод_ај пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "�ије пронађен ниједан пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+#| msgid "Topic not supported on this conversation"
+msgid "Contact search is not supported on this account"
+msgstr "Претрага контакта није подржана у овом налогу"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Порука која ва� пред�тавља:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Молим ва� обаве�тите ме када �те на мрежи. Хвала!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Сачувај �лику"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "�е могу да �ачувам �лику"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "�алог"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Идентификатор"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "П�еудоним"
 
@@ -1882,11 +1169,11 @@ msgstr "Издање"
 msgid "Client"
 msgstr "Програм"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Групе"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1894,37 +1181,37 @@ msgstr ""
 "Изаберите групе у којима желите да �е пријатељ налази.  Приметите да можете "
 "да одаберете и више група као и ниједну."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "Додај _групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Изабери"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "�ови пријатељ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирати %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr ""
 "Да ли �те �игурни да желите да блокирате да ва� „%s“ више не контактира?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следећи идентитет ће бити блокиран:"
@@ -1932,7 +1219,7 @@ msgstr[1] "Следећи идентитети ће бити блокирани:
 msgstr[2] "Следећи идентитети ће бити блокирани:"
 msgstr[3] "Следећи идентитет ће бити блокиран:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следећи идентитет не може бити блокиран:"
@@ -1940,14 +1227,14 @@ msgstr[1] "Следећи идентитети не могу бити блоки
 msgstr[2] "Следећи идентитети не могу бити блокирани:"
 msgstr[3] "Следећи идентитет не може бити блокиран:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "П_ријави овај контакт за злоупотребу"
@@ -1955,67 +1242,72 @@ msgstr[1] "П_ријави ове контакте за злоупотребу"
 msgstr[2] "П_ријави ове контакте за злоупотребу"
 msgstr[3] "П_ријави овај контакт за злоупотребу"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Измени податке контакта"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Повезани пријатељи"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "програм гномови контакти није ин�талиран"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Ин�талирајте „gnome-contacts“ да при�тупите подацима контаката."
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Изаберите налог који ће бити коришћен за позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "По�ао"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "КУЋ�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Блокирај контакт"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Уклони из _групе „%s“"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Избриши и _блокирај"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Да ли �те �игурни да желите да уклоните пријатеља „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2024,218 +1316,219 @@ msgstr ""
 "Да ли �тварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и �ве "
 "контакте који �у везани за овај контакт."
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Уклањам пријатеља"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Уклони"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "Ћа_�кање"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_СМС"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_�удио позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видео позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Претходни разговори"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Пошаљи датотеку"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Подели моју радну површ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Омиљени"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Подаци"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Уреди"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Позивам ва� у ову �обу"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "Позов_и у �обу за ћа�кање"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "Дод_ај пријатеља…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Да ли �те �игурни да желите да уклоните групу „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Уклањам групу"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Пре_именуј"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ИСО код државе:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Држава:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Република:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Обла�т:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Поштан�ки код:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Зграда:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Спрат:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Тек�т:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Опи�:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "�дре�а:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "�иво тачно�ти:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "У�правна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Водоравна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Правац:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Брзина пењања:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "По�ледњи пут ажурирано:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Географ�ка дужина:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Географ�ка ширина:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Ви�ина:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ме�то"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y у %R КУВ"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "�адимак:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2252,32 +1545,7 @@ msgstr "<b>Локација</b> у (датум)"
 msgid "Online from a phone or mobile device"
 msgstr "�а вези преко телефона или мобилног уређаја"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "�ова мрежа"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Одаберите ИРЦ мрежу"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Ре�етуј _мрежни �пи�ак"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Изабери"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "нови �ервер"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "ССЛ"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2287,11 +1555,11 @@ msgstr ""
 "и�ту мрежу као и ви. �ко желите да кори�тите ову могућно�т, проверите да ли "
 "�у детаљи и�под тачни."
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Људи у околини"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2300,48 +1568,48 @@ msgstr ""
 "ћете изабрати <span style=\"italic\">Уреди → �алози</span> �а �пи�ка "
 "контаката."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "И�торијат"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Прикажи"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Потражи"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Ћа�кање у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Ћа�кање �а %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2350,7 +1618,7 @@ msgstr[1] "%s �екунде"
 msgstr[2] "%s �екунди"
 msgstr[3] "једне �екунде"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2359,81 +1627,81 @@ msgstr[1] "%s минута"
 msgstr[2] "%s минута"
 msgstr[3] "једног минута"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Позив је започет %s, а завршен је %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Дана�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Било кад"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Било ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Када"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Било шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Пи�ана ћа�кања"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Долазни позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Одлазећи позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Пропуштени позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Да ли �те �игурни да желите да обришете �ве дневнике претходних разговора?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "Очи�ти �ве"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Обриши од:"
 
@@ -2442,20 +1710,21 @@ msgid "_File"
 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-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "Изм_ени"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Обриши �ав и�торијат..."
+#| msgid "Delete All History..."
+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-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Ћа�кање"
 
@@ -2469,112 +1738,119 @@ 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>"
+#| msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">Учитавам…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Који тип налога за ћа�кање имате?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Додајем нови налог"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+#| msgid "Adding new account"
+msgid "Add new account"
+msgstr "Додајте нови налог"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Уне�ите одредник контакта или телефон�ки број:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Видео позив"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_�удио позив"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "�ови позив"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Контакт није на вези"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "�аведени контакт или је неи�праван или непознат"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "Контакт не подржава ову вр�ту разговора"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Захтевана функционално�т није примењена за овај протокол"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "�е могу да започнем разговор �а датим контактом"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Избачени �те �а овог канала"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Овај канал је пун"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "Морате бити позвани да �е придружите овом каналу"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "�е могу да на�тавим док је веза прекинута"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "При�туп је одбијен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Дошло је до грешке приликом започињања разговора"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "�ови разговор"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+#| msgid "Password required"
+msgid "Password Required"
+msgstr "Потребна је лозинка"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Произвољна порука…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Уреди произвољне поруке…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Кликните да уклоните ову поруку �тања из омиљених"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Кликните да по�тавите ову поруку �тања као омиљену"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2584,25 +1860,16 @@ msgstr ""
 "<small><i>Прити�ните „Уне�и“ да поде�ите нову поруку или „Изађи“ да откажете."
 "</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "По�тави �тање"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Произвољне поруке…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "�ови %s налог"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Упореди величину �лова"
 
@@ -2626,167 +1893,167 @@ msgstr "_Упореди величину �лова"
 msgid "Phrase not found"
 msgstr "Израз није пронађен"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Примљена је брза порука"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "По�лата је брза порука"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Долазни захтев за ћа�кање"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Пријатељ је на вези"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Пријатељ је отишао �а везе"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Повезан �а �ервером"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Откачени �те �а �ервера"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Долазни позив за разговор"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Одлазни позив за разговор"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Позив за разговор је завршен"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Уреди произвољне поруке"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Захтев за претплату"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s тражи одобрење да види када �те на вези"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Прихвати"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Порука је уређена %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "�ормално"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Идентитет �ервера за ћа�кање не може бити проверен."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Уверење није потпи�ао Издавач уверења."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Уверење је и�текло."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Уверење још увек није активирано."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Уверење нема очекивани оти�ак."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Име домаћина које је проверено у уверењеу �е не �лаже �а именом �ервера."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Уверење је �амопотпи�ано."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Уверење је повукао Издавач уверења који га је и издао."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Уверење је криптограф�ки �лабо."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Дужина уверења премашује границе које �е могу проверити."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Уверење није и�правано."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "Очекивано име домаћина: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Име домаћина уверења: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_�а�тави"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "�еповерљива веза"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ова веза није од поверења. Желите ли ипак да на�тавите?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Запамти овај избор за наредне везе"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Детаљи уверења"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "�е могу да отворим адре�у"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "�ема довољно �лободног ме�та за чување датотеке"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2795,225 +2062,54 @@ msgstr ""
 "Потребно је %s за �нимање ове датотеке, али је до�тупно �амо %s. Одаберите "
 "друго ме�то за �нимање."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Долазећа датотека од %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "У�по�тавите везу да уредите ваше личне податке."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Лични подаци</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "Умножи _адре�у везе"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "Отвори _везу"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "И�питај ХТМЛ"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Текући локалитет"
-
-#: ../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 "арап�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "армениј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "балтички"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "келт�ки"
-
-#: ../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 "централни европ�ки"
-
-#: ../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 "кине�ки једно�тавни"
-
-#: ../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 "кине�ки традиционални"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "хрват�ки"
-
-#: ../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 "ћирилични"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "ћирилични/ру�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "ћирилични/украјин�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "грузиј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "грчки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "гујарати"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "гурмуки"
-
-#: ../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 "хебреј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "хебреј�ки визуелни"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "хинду"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "и�ланд�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "јапан�ки"
-
-#: ../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 "кореј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "нордиј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "пер�иј�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "румун�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "јужноевроп�ки"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "тајланд�ки (таи)"
-
-#: ../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 "тур�ки"
-
-#: ../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 "уникод"
-
-#: ../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 "западни"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "вијетнам�ки"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "�ајбољи пријатељи"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Људи у околини"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "�егрупи�ано"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Сервер не може да нађе контакт: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "�ема порука о грешкама"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Брза порука (Пи�моноша)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3025,7 +2121,7 @@ msgstr ""
 "�лободног �офтвера; било издања 2 те Лиценце, или (према вашем нахођењу) "
 "било којег новијег издања."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3037,7 +2133,7 @@ msgstr ""
 "ПРИЛ�ГОЂЕ�ОСТИ ОДРЕЂЕ�ОЈ ��МЕ�И.  Видите Гнуову општу јавну лиценцу за више "
 "детаља."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3048,11 +2144,11 @@ msgstr ""
 "„Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA“"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Гномов програм за брзе поруке"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <dsegan@gmx.net>\n"
@@ -3065,70 +2161,71 @@ msgstr ""
 "\n"
 "Превод.орг — превод на �рп�ки језик."
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "�е приказуј ниједно прозорче; уради по�ао који имаш (нпр. увожење) и изађи"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "�е приказуј ниједно прозорче о�им ако не по�тоје �амо налози „Људи у близини“"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Почетно изабирање датог налога (нпр. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<идентификација налога>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "— �алози Пи�моноше"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "�алози Пи�моноше"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "По�тоје не�ачуване измене на вашем налогу %s."
+#| msgid "There are unsaved modifications to your %s account."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "По�тоје не�ачуване измене на вашем налогу %.50s."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Ваш нови налог још није �ачуван."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Повезујем �е…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "�еповезан — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Веза је прекинута — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "�еповезан — �ема мрежне везе"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "�епознато �тање"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3138,28 +2235,30 @@ msgstr ""
 "Ин�талирајте „telepathy-haze“ и поново покрените вашу �е�ију да преме�тите "
 "налог."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "�еповезан — �алог је онемогућен"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Уредите параметре повезивања"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Уреди параметре повезивања..."
+#: ../src/empathy-accounts-dialog.c:716
+#| msgid "Edit Connection Parameters"
+msgid "_Edit Connection Parameters…"
+msgstr "_Уреди параметре повезивања…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "Да ли �те �игурни да желите да уклоните „%s“ �а вашег рачунара?"
+#| msgid "Do you want to remove %s from your computer?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Да ли желите да уклоните „%.50s“ �а вашег рачунара?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Ово неће уклонити ваш налог на �ерверу."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3168,24 +2267,24 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Укључен"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Преименуј"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Пре�кочи"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Повежи �е"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3194,10 +2293,14 @@ msgstr ""
 "Да ли �игурно желите да на�тавите?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "�алози за допи�ивање и VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Додај…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Увези…"
@@ -3218,32 +2321,32 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "�и�у ин�талирани позадинци протокола"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " — Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Интернет пи�моноша клијент пријаве"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "�е повезуј �е по покретању"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "�е приказуј �пи�ак пријатеља нити било које друго прозорче по покретању"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "— Интернет пи�моноша за брзе поруке"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при комуникацији �а Управником налога"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3256,8 +2359,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
-#| msgid "Incoming call"
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Долазни позив"
 
@@ -3269,107 +2371,107 @@ msgstr "— Интернет пи�моноша �удио/Видео клије
 msgid "Empathy Audio/Video Client"
 msgstr "Интернет пи�моноша �удио/Видео клијент"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s је покушао да ва� зове, али �те ви били на другој вези."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Долазни видео позив од %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Позива ва� „%s“"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Одбаци"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Јави �е"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Позив �а кори�ником %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "ИП адре�а како је види овај рачунар"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ИП адре�а како је види �ервер на интернету"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ИП адре�а вршњака како је види друга �трана"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "ИП адре�а релејног �ервера"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "ИП адре�а групе за више�труко емитовање"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "�а чекању"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Утишај"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Трајање"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Технички детаљи"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, 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:3115
+#: ../src/empathy-call-window.c:3107
 #, 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:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3378,23 +2480,23 @@ msgstr ""
 "�е могу да у�по�тавим везу �а %s. Можда је неко од ва� двоје на мрежи која "
 "не дозвољава директне везе."
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Дошло је до грешке у мрежи"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Звучни формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Видео формати потребни за овај позив ни�у ин�талирани на вашем рачунару"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3405,32 +2507,32 @@ msgstr ""
 "„%s“>ову грешку</a> и прикачите дневнике покупљене из прозора „Отклањање "
 "грешака“ у изборнику „Помоћ“."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Дошло је до грешке у мотору за позиве"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "До�тигнут је крај тока"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "�е могу да у�по�тавим звучни ток"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "�е могу да у�по�тавим видео ток"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ваше тренутно �тање је %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Извините, али немате довољно кредита за овај позив."
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Допуни"
 
@@ -3454,11 +2556,11 @@ msgstr "_Подешавања"
 msgid "_View"
 msgstr "Пре_глед"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "По_моћ"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Садржај"
 
@@ -3546,19 +2648,19 @@ msgstr "Локални кандидат:"
 msgid "Audio"
 msgstr "Звук"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "— Пи�моноша програм за ћа�кање"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Име"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Соба"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "�утомат�ко повезивање"
 
@@ -3566,11 +2668,11 @@ msgstr "�утомат�ко повезивање"
 msgid "Manage Favorite Rooms"
 msgstr "Уреди омиљене �обе"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Да затворим овај прозор?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3579,7 +2681,7 @@ msgstr ""
 "Затварањем овог прозора биће напуштено %s. �ећете примати никакве будуће "
 "поруке �ве док �е поново не придружите."
 
-#: ../src/empathy-chat-window.c:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3600,12 +2702,12 @@ msgstr[3] ""
 "Затварањем овог прозора биће напуштена једна �оба за ћа�кање. �ећете примати "
 "никакве будуће поруке �ве док �е поново не придружите."
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Да напу�тим %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3613,15 +2715,15 @@ msgstr ""
 "�ећете примати никакве будуће поруке из ове �обе за ћа�кање �ве док јој �е "
 "поново не придружите."
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Затвори прозор"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "�апу�ти �обу"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3630,7 +2732,7 @@ msgstr[1] "%s (%d непрочитане)"
 msgstr[2] "%s (%d непрочитаних)"
 msgstr[3] "%s (једна непрочитана)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3639,7 +2741,7 @@ msgstr[1] "%s (и %u друге)"
 msgstr[2] "%s (и %u других)"
 msgstr[3] "%s (и једна друга)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3648,7 +2750,7 @@ msgstr[1] "%s (%d непрочитане од о�талих)"
 msgstr[2] "%s (%d непрочитаних од о�талих)"
 msgstr[3] "%s (једна непрочитана од о�талих)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3657,11 +2759,11 @@ msgstr[1] "%s (%d непрочитане од �вих)"
 msgstr[2] "%s (%d непрочитаних од �вих)"
 msgstr[3] "%s (једна непрочитана од �вих)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "СМС:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3670,7 +2772,7 @@ msgstr[1] "Шаљем %d поруке"
 msgstr[2] "Шаљем %d порука"
 msgstr[3] "Шаљем једну поруку"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Пише поруку."
 
@@ -3703,106 +2805,116 @@ msgid "Invite _Participant…"
 msgstr "Позови _уче�нике…"
 
 #: ../src/empathy-chat-window.ui.h:8
+#| msgid "_Join"
+msgid "_Join Chat"
+msgstr "_При�тупи ћа�кању"
+
+#: ../src/empathy-chat-window.ui.h:9
+#| msgid "_Chat"
+msgid "Le_ave Chat"
+msgstr "_�апу�ти ћа�кање"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Пријатељ"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Језичци"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Пре_тходни језичак"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Сле_дећи језичак"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Опозови затварање језичка"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Преме�ти језичак _лево"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Преме�ти језичак _де�но"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Откачи језичак"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Прикажи по�ебну у�лугу"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "— Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Отклањање грешака Пи�моноше"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Веза канте одлагања"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Одговор канте одлагања"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "Подаци �у превелики за једно одлагање. Сачувајте запи�нике у датотеку."
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Прозор за отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Пошаљи у канту одлагања"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "�иво "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Уклањање грешака"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Подаци"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Критичан"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3818,97 +2930,96 @@ msgstr ""
 "�ко не желите да видите такве податке до�тупне у јавном извештају о "
 "грешкама, можете да изаберете да ограничите видљиво�т ваших грешака "
 "програмерима Интернет пи�моноше када извештавате о њима приказујући напредна "
-"поља у <a "
-"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">извештају о "
-"грешци</a>."
+"поља у <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy"
+"\">извештају о грешци</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Категорија"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "�иво"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Изабрани управник везе не подржава проширење за удаљено отклањање грешака."
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Долазни видео позив"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ва� зове видео позивом. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ва� зове. Желите ли да �е јавите?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Одбаци"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Јави �е"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "Одговори �а _видеом"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Позивнице за �обу"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Позивница да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Прикључи �е"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ва� позива да �е придружите %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Позвани �те да �е придружите у %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Долазни прено� датотеке од %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Потребна је лозинка"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3918,105 +3029,105 @@ msgstr ""
 "Порука: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�епознато"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s од %s при %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при примању „%s“ од %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Грешка при примању датотеке"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при �лању „%s“ за %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "Грешка при �лању датотеке"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ је по�лат за %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Прено� датотеке је завршен"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "Чекам на одговор друге �тране"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверавам интегритет датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Тражим хеш датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Прео�тало"
 
@@ -4028,11 +3139,11 @@ msgstr "Прено�и датотека"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Уклони завршене, отказане и неу�пешне прено�е датотека �а �пи�ка"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Увези"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4040,49 +3151,49 @@ msgstr ""
 "�и�ам пронашао ниједан налог за увоз. Интернет пи�моноша тренутно подржава "
 "�амо увожење налога из Пиџина."
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Увезите налоге"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Увези"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Извор"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Позови уче�нике"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Изаберите пријатеља за позивање у овај разговор:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Позови"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Соба за ћа�кање"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "Чланови"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "�и�ам у�пео да и�пишем �обе"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4095,17 +3206,17 @@ msgstr ""
 "Потребна лозинка: %s\n"
 "Чланови: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Да"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "�е"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Придружи �е �оби"
 
@@ -4147,104 +3258,104 @@ msgstr "�е могу да учитам �пи�ак �оба"
 msgid "Room List"
 msgstr "Спи�ак �оба"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Одговори"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Одговори �а видеом"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "Прихвати"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Обезбеди"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Порука је примљена"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Порука је по�лата"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "�ови разговор"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Пријатељ �е пријавио"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Пријатељ �е одјавио"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "�алог је на вези"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "�алог није на вези"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Језик"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Паја"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Јаре"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Јао, куме, готов �ам!! Ја �ам бивши човек!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "Пајо, шта је било, Пајооо??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "Шта �у ти украли, Пајо?? Штаааа??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Сав очајан, Паја је прекинуо везу."
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "По�тавке"
 
@@ -4256,7 +3367,7 @@ msgstr "Приказује групе"
 msgid "Show account balances"
 msgstr "Приказује помоћника налога"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Спи�ак пријатеља"
 
@@ -4378,23 +3489,7 @@ msgstr "Умањи _тачно�т локације"
 msgid "Privacy"
 msgstr "Приватно�т"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_ГПС"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Мобилни телефон"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (ИП, бежична)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Извори локација:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4402,36 +3497,37 @@ msgstr ""
 "Овај �пи�ак језика пред�тавља �амо оне језике за које имате ин�талиране "
 "речнике."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Омогући проверу правопи�а за �ледеће језике:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Провера пи�ања"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "_Тема ћа�кања:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Варијанта:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Теме"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Уне�ите лозинку"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Прекини везу"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+#| msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Морате да поде�ите налог да би�те овде видели контакте."
 
 #: ../src/empathy-roster-window.c:569
@@ -4445,8 +3541,11 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Виндоуз уживо"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Гугл разговор"
+
 #: ../src/empathy-roster-window.c:674
-#| msgid "Facebook Chat"
 msgid "Facebook"
 msgstr "Феј�бук"
 
@@ -4457,13 +3556,13 @@ msgid "%s account requires authorisation"
 msgstr "%s налог захтева овлашћење"
 
 #: ../src/empathy-roster-window.c:700
-#| msgid "Edit Account"
 msgid "Online Accounts"
 msgstr "�алози на мрежи"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "�журирај �офтвер..."
+#| msgid "Update software..."
+msgid "Update software…"
+msgstr "�журирај �офтвер…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4509,24 +3608,28 @@ msgid "No online contacts"
 msgstr "�ема конаката на мрежи"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_�ови разговор..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_�ови разговор…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "�ови _позив..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "�ови _позив…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Пријатељи"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "Дод_ај пријатеља..."
+#| msgid "_Add Contact…"
+msgid "_Add Contacts…"
+msgstr "_Додај пријатеља…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Тражи пријатеље..."
+#| msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
+msgstr "_Тражи пријатеље…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4537,8 +3640,9 @@ msgid "_Rooms"
 msgstr "_Собе"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Прикључи �е..."
+#| msgid "_Join"
+msgid "_Join…"
+msgstr "_При�тупи…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4582,33 +3686,19 @@ msgid "Go _Online"
 msgstr "Иди _на мрежу"
 
 #: ../src/empathy-roster-window.ui.h:3
-#| msgid "Show offline contacts"
 msgid "Show _Offline Contacts"
 msgstr "Прикажи _контакте ван мреже"
 
-#: ../src/empathy-roster-window.ui.h:4
-#| msgid "_Add Contacts..."
-msgid "_Add Contact..."
-msgstr "_Додај контакт..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_�ови разговор…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "�ови _позив…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стање"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Обављено"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Уне�ите поједино�ти вашег налога"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 9080ae33a..079e42ecc 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -6,19 +6,16 @@
 # Aleksandar Urosevic <urke@users.sourceforge.net>, 2003, 2004.
 # Filip Miletic <f.miletic@ewi.tudelft.nl>, 2004.
 # Nikola Kotur <kotnik@ns-linux.org>, 2006.
-# Miloš Popović <gpopac@gmail.com>, 2007, 2008.
-# Maintainer: Branko Kokanović <branko.kokanovic@gmail.com>, 2010.
-# Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
-# Miloš Popović <gpopac@gmail.com>, 2010.
-# Branko Kokanović <branko.kokanovic@gmail.com>, 2011.
+# Miloš Popović <gpopac@gmail.com>, 2007, 2008, 2009, 2010.
+# Branko Kokanović <branko.kokanovic@gmail.com>, 2010, 2011.
 # Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
 "y&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2013-01-09 14:05+0000\n"
-"PO-Revision-Date: 2013-01-18 10:24+0200\n"
+"POT-Creation-Date: 2013-09-03 10:12+0000\n"
+"PO-Revision-Date: 2013-09-07 05:12+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -427,8 +424,8 @@ msgstr "Uređaj kamerice"
 #: ../data/org.gnome.Empathy.gschema.xml.h:83
 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“."
+"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
@@ -467,34 +464,10 @@ 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.h:92
-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.h:93
-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.h:94
-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.h:95
-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.h:96
-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.h:97
-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.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Da li Pismonoša da umanji preciznost lokacije"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
@@ -524,7 +497,7 @@ msgstr "Greška prilikom prenosa datoteke"
 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:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
@@ -544,226 +517,154 @@ msgstr "Izabrana datoteka nije obi�na datoteka"
 msgid "The selected file is empty"
 msgstr "Izabrana datoteka je prazna"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "Lozinka nije pronađena"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "Lozinka TP naloga za %s (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "Lozinka za pri�aonicu „%s“ na nalogu %s (%s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "Propušten poziv od %s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "Poziv korisnika %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "%s vas zove"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "Pre %d sekund"
-msgstr[1] "Pre %d sekunde"
-msgstr[2] "Pre %d sekundi"
-msgstr[3] "Pre jedne sekunde"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "Pre %d minut"
-msgstr[1] "Pre %d minuta"
-msgstr[2] "Pre %d minuta"
-msgstr[3] "Pre jednog minuta"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "Pre %d sata"
-msgstr[1] "Pre %d sata"
-msgstr[2] "Pre %d sati"
-msgstr[3] "Pre jednog sata"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "Pre %d dana"
-msgstr[1] "Pre %d dana"
-msgstr[2] "Pre %d dana"
-msgstr[3] "Pre jednog dana"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "Pre %d nedelje"
-msgstr[1] "Pre %d nedelje"
-msgstr[2] "Pre %d nedelja"
-msgstr[3] "Pre jedne nedelje"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "Pre %d meseca"
-msgstr[1] "Pre %d meseca"
-msgstr[2] "Pre %d meseci"
-msgstr[3] "Pre jednog meseca"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "u budućnosti"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "Greška mreže"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "Potvrđivanje identiteta nije uspelo"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "Greška šifrovanja"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "Ime je u upotrebi"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "Uverenje nije prosleđeno"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "Uverenje nije poverljivo"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "Uverenje je isteklo"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "Uverenje nije aktivirano"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "Naziv domaćina uverenja se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak uverenja se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "Uverenje je samopotpisano"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "Greška u uverenjeu"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "Å ifrovanje nije dostupno"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "Uverenje nije ispravno"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "Veza ne može biti uspostavljena"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "Ovaj nalog je već povezan sa serverom"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 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:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previše zauzet da bi rukovao vezom"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "Uverenje je opozvano"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Uverenje koristi nesiguran algoritam Å¡ifrovanja ili je kriptografski slabo"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -771,588 +672,33 @@ msgstr ""
 "Dužina uverenja servera, ili dubina lanca uverenja servera, premašuje granice "
 "koje je zadala biblioteka Å¡ifrovanja"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "Vaš softver je previše star"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "Ljudi u okolini"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Jahu! Japan"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Gugl razgovor"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Fejsbuk ćaskanje"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "Svi nalozi"
 
-#: ../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
-msgid "Pass_word"
-msgstr "_Lozinka"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "Zapamti lozinku"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-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:20
-#: ../libempathy-gtk/empathy-account-widget-msn.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:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "Upamti lozinku"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "Nalog"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "Lozinka"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "Server"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "Priklju�nik"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "Korisni�ko ime:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "_Primeni"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "Prijavi _me"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "Ovaj nalog već postoji na serveru"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "Napravi novi nalog na serveru"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%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:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s nalog"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "Novi nalog"
-
-#: ../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: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:9
-msgid "What is your GroupWise password?"
-msgstr "Koja je vaša Group Vajz lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN"
-msgstr "ICKu _BKS"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "Kodni r_aspored"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-msgid "What is your ICQ UIN?"
-msgstr "Koji je vaš ICKu BKS?"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-msgid "What is your ICQ password?"
-msgstr "Koja je vaša ICKu lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Network"
-msgstr "Mreža"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set"
-msgstr "Kodni raspored"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "Dodaj…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Ukloni"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "Gore"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "Dole"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "Serveri"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Većina IRC servera ne traži lozinku, zato ako niste sigurni, nemojte je "
-"unositi."
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "Nadimak"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "Poruka za kraj"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "Stvarno ime"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "Korisni�ko ime"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "Koja IRC mreža?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-msgstr "Koji je vaš IRC nadimak?"
-
-#: ../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: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 ""
-"Ovo je vaše korisni�ko ime, a ne obi�na Fejsbuk prijava.\n"
-"Ako vam je adresa facebook.com/<b>pera</b>, unesite <b>pera</b>.\n"
-"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:6
-msgid "What is your Facebook password?"
-msgstr "Koja je vaša Fejsbuk lozinka?"
-
-#: ../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: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 uverenja"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty"
-msgstr "_Važnost"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce"
-msgstr "_Izvori"
-
-#: ../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 "Override server settings"
-msgstr "Prevaziđi postavke servera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "Koristi stari SS_L"
-
-#: ../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:25
-msgid "What is your desired Jabber ID?"
-msgstr "Koji je vaš željeni Džaber IB?"
-
-#: ../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-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "Na_dimak"
-
-#: ../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 IB"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address"
-msgstr "Adresa _el. pošte"
-
-#: ../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:8
-msgid "What is your Windows Live ID?"
-msgstr "Koji je vaš IB Vindouza uživo?"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-msgid "What is your Windows Live password?"
-msgstr "Koja je vaša lozinka Vindouza uživo?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "Samostalno"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "Otvori nalog"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "Mogućnosti"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "Ništa"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "_Korisni�ko ime"
-
-#: ../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:5
-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 "NAT Traversal Options"
-msgstr "Opcije prolaska kroz NAT"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Opcije posrednika"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "Razne opcije"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN server"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrij STUN server"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "Otkrij povezivanja"
-
-#: ../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 "Mechanism"
-msgstr "Mehanizam"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Interval (seconds)"
-msgstr "Period (u sekundama)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Authentication username"
-msgstr "Korisni�ko ime potvrđivanja identiteta"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport"
-msgstr "Prenos"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "Slabo rutiranje"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "Zanemari TLS greške"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "Mesna adresa IP-a"
-
-#: ../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 "What is your SIP account password?"
-msgstr "Koja je lozinka za vaš SIP nalog?"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "_Lozinka:"
-
-#: ../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:6
-msgid "_Room List locale:"
-msgstr "Lok_alni spisak soba:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "Kodni r_aspored:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../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:11
-msgid "What is your Yahoo! password?"
-msgstr "Koja je vaša Jahu! lozinka?"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "Ne mogu da pretvorim sliku"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "Nijedan od prihvaćenih formata slika nije podržan na vašem sistemu"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "Ne mogu da sa�uvam sliku u datoteku"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "Izaberite vašu sliku"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "Izaberite sliku..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "Bez slike"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "Slike"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "Sve datoteke"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "Kliknite da uvećate"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "Nije uspelo potvrđivanje identiteta za nalog <b>%s</b>"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1362,95 +708,92 @@ msgstr ""
 "Unesite novu lozinku za nalog\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "Izaberi..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "_Izaberi"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "Došlo je do greške prilikom pozivanja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "Navedeni kontakt ne podržava pozive"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "Navedeni kontakt nije na vezi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "Navedeni kontakt nije ispravan"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Ovaj protokol ne podržava hitne pozive"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 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:727
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "Nisam uspeo da otvorim privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "Teme nisu podržane u ovom razgovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "Nije vam dozvoljeno da promenite temu"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "Neispravan IB kontakta"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: �isti sve poruke iz ovog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
 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:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
 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:1067
+#: ../libempathy-gtk/empathy-chat.c:1073
 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:1071
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
 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:1083
+#: ../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 "
@@ -1460,11 +803,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:1088
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <IB kontakta>: prikazuje podatke o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1472,126 +815,126 @@ msgstr ""
 "/help [<naredba>]: prikazuje sve podržane naredbe. Ako se da i konkretna "
 "<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "Korišćenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "nema dovoljno gotovine za slanje poruke"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Greška pri slanju poruke „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, 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:1590
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "nesposoban"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj „%s“ u re�nik za %s jezik"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "_Pošalji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "Nisam uspeo da preuzmem skorašnje dnevnike"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otišao sa veze"
@@ -1599,12 +942,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izbacio korisnika %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izba�en"
@@ -1612,17 +955,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je zabranio pristup korisniku %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pri�aonicu"
@@ -1632,17 +975,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:2752
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je pristupio(la) pri�aonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
@@ -1650,50 +993,50 @@ 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:2989 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "Da li želite da zapamtite ovu lozinku?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "Pogrešna lozinka, pokušajte ponovo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "Ova soba je zaštićena lozinkom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "Priklju�i se"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "Razgovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1724,8 +1067,8 @@ msgstr "Izmeni blokirane prijatelje"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1735,120 +1078,64 @@ msgstr "Nalog:"
 msgid "Blocked Contacts"
 msgstr "Blokirani prijatelji"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "Ime i prezime"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "Broj telefona"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "Adresa el. pošte"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "Veb stranica"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "Viđen pre:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "Server:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-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:117
-msgid "Away message:"
-msgstr "Poruka za odsutnost:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "posao"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "kuća"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "mobilni"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "glasovni"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "prvenstveni"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "poštanski"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-msgstr "pošiljka"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Ukloni"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "Pretraži kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "Pretraga: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "Nije pronađen nijedan prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+#| msgid "Topic not supported on this conversation"
+msgid "Contact search is not supported on this account"
+msgstr "Pretraga kontakta nije podržana u ovom nalogu"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "Poruka koja vas predstavlja:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Molim vas obavestite me kada ste na mreži. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "Sa�uvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "Ne mogu da sa�uvam sliku"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "Nalog"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "Identifikator"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "Pseudonim"
 
@@ -1882,11 +1169,11 @@ msgstr "Izdanje"
 msgid "Client"
 msgstr "Program"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1894,37 +1181,37 @@ 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:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "Dodaj _grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "Blokirati %s?"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, 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-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sledeći identitet će biti blokiran:"
@@ -1932,7 +1219,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:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 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:"
@@ -1940,14 +1227,14 @@ 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:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
@@ -1955,67 +1242,72 @@ msgstr[1] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "Izmeni podatke kontakta"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "Povezani prijatelji"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "program gnomovi kontakti nije instaliran"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata."
 
 #. 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:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "Izaberite nalog koji će biti korišćen za poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "Poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "Posao"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "KUĆA"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "_Blokiraj kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "Ukloni iz _grupe „%s“"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "Izbriši i _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, 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-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2024,218 +1316,219 @@ 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-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "Uklanjam prijatelja"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "_Ukloni"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "Ća_skanje"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audio poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "_Prethodni razgovori"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "Pošalji datoteku"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "Podeli moju radnu površ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "Omiljeni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "_Podaci"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "Pozivam vas u ovu sobu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "Pozov_i u sobu za ćaskanje"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "Dod_aj prijatelja…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, 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:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "Uklanjam grupu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "Pre_imenuj"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "ISO kod države:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "Poštanski kod:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "Nivo ta�nosti:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "Uspravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "Vodoravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "Poslednji put ažurirano:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "Geografska dužina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "Geografska Å¡irina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Mesto"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R KUV"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "Nadimak:"
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2252,32 +1545,7 @@ msgstr "<b>Lokacija</b> u (datum)"
 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:335
-msgid "New Network"
-msgstr "Nova mreža"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "Odaberite IRC mrežu"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "Resetuj _mrežni spisak"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "Izaberi"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "novi server"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2287,11 +1555,11 @@ msgstr ""
 "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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2300,48 +1568,48 @@ msgstr ""
 "ćete izabrati <span style=\"italic\">Uredi → Nalozi</span> sa spiska "
 "kontakata."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "Istorijat"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "Prikaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "Potraži"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "Ćaskanje u %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "Ćaskanje sa %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2350,7 +1618,7 @@ msgstr[1] "%s sekunde"
 msgstr[2] "%s sekundi"
 msgstr[3] "jedne sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2359,81 +1627,81 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuta"
 msgstr[3] "jednog minuta"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, 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:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "Danas"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "Ju�e"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "Bilo kad"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "Ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "Bilo Å¡ta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "Pisana ćaskanja"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "Dolazni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "Odlazeći pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "Propušteni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "Å ta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 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:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "O�isti sve"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "Obriši od:"
 
@@ -2442,20 +1710,21 @@ msgid "_File"
 msgstr "_Datoteka"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "Izm_eni"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "Obriši sav istorijat..."
+#| msgid "Delete All History..."
+msgid "Delete All History…"
+msgstr "Obriši sav istorijat…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Ćaskanje"
 
@@ -2469,112 +1738,119 @@ msgid "page 2"
 msgstr "strana 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">U�itavam...</span>"
+#| msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">U�itavam…</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "Koji tip naloga za ćaskanje imate?"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
-msgstr "Dodajem novi nalog"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+#| msgid "Adding new account"
+msgid "Add new account"
+msgstr "Dodajte novi nalog"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "Unesite odrednik kontakta ili telefonski broj:"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "_Video poziv"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "_Audio poziv"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "Novi poziv"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "Kontakt nije na vezi"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "Navedeni kontakt ili je neispravan ili nepoznat"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 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:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 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:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 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:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "Izba�eni ste sa ovog kanala"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "Ovaj kanal je pun"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 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:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "Ne mogu da nastavim dok je veza prekinuta"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "Pristup je odbijen"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "Došlo je do greške prilikom zapo�injanja razgovora"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+#| msgid "Password required"
+msgid "Password Required"
+msgstr "Potrebna je lozinka"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "Proizvoljna poruka…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "Uredi proizvoljne poruke…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "Kliknite da uklonite ovu poruku stanja iz omiljenih"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2584,25 +1860,16 @@ msgstr ""
 "<small><i>Pritisnite „Unesi“ da podesite novu poruku ili „Izađi“ da otkažete."
 "</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "Postavi stanje"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "Proizvoljne poruke…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "Novi %s nalog"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "_Uporedi veli�inu slova"
 
@@ -2626,167 +1893,167 @@ msgstr "_Uporedi veli�inu slova"
 msgid "Phrase not found"
 msgstr "Izraz nije pronađen"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "Primljena je brza poruka"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "Poslata je brza poruka"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "Dolazni zahtev za ćaskanje"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "Prijatelj je na vezi"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "Prijatelj je otišao sa veze"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "Povezan sa serverom"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "Otka�eni ste sa servera"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "Dolazni poziv za razgovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "Odlazni poziv za razgovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "Poziv za razgovor je završen"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traži odobrenje da vidi kada ste na vezi"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "_Prihvati"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1124
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "Poruka je uređena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "Identitet servera za ćaskanje ne može biti proveren."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "Uverenje nije potpisao Izdava� uverenja."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "Uverenje je isteklo."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "Uverenje još uvek nije aktivirano."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "Uverenje nema o�ekivani otisak."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr ""
 "Ime domaćina koje je provereno u uverenjeu se ne slaže sa imenom servera."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "Uverenje je samopotpisano."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "Uverenje je povukao Izdava� uverenja koji ga je i izdao."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "Uverenje je kriptografski slabo."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "Dužina uverenja premašuje granice koje se mogu proveriti."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "Uverenje nije ispravano."
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "O�ekivano ime domaćina: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "Ime domaćina uverenja: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "_Nastavi"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "Nepoverljiva veza"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 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:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "Zapamti ovaj izbor za naredne veze"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "Detalji uverenja"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "Ne mogu da otvorim adresu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "Nema dovoljno slobodnog mesta za �uvanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2795,225 +2062,54 @@ msgstr ""
 "Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite "
 "drugo mesto za snimanje."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Dolazeća datoteka od %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "Uspostavite vezu da uredite vaše li�ne podatke."
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>Li�ni podaci</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "Umnoži _adresu veze"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "Otvori _vezu"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "Ispitaj HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "Tekući lokalitet"
-
-#: ../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 "arapski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "armenijski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "balti�ki"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "keltski"
-
-#: ../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 "centralni evropski"
-
-#: ../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 "kineski jednostavni"
-
-#: ../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 "kineski tradicionalni"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "hrvatski"
-
-#: ../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 "ćirili�ni"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "ćirili�ni/ruski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "ćirili�ni/ukrajinski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "gruzijski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "gr�ki"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "gujarati"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "gurmuki"
-
-#: ../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 "hebrejski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "hebrejski vizuelni"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "hindu"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "islandski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "japanski"
-
-#: ../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 "korejski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "nordijski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "persijski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "rumunski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "južnoevropski"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "tajlandski (tai)"
-
-#: ../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 "turski"
-
-#: ../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 "unikod"
-
-#: ../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 "zapadni"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "vijetnamski"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "Najbolji prijatelji"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "Ljudi u okolini"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "Negrupisano"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "Server ne može da nađe kontakt: %s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "Nema poruka o greškama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "Brza poruka (Pismonoša)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -3025,7 +2121,7 @@ msgstr ""
 "slobodnog softvera; bilo izdanja 2 te Licence, ili (prema vašem nahođenju) "
 "bilo kojeg novijeg izdanja."
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -3037,7 +2133,7 @@ msgstr ""
 "PRILAGO�ENOSTI ODRE�ENOJ NAMENI.  Vidite Gnuovu opštu javnu licencu za više "
 "detalja."
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -3048,11 +2144,11 @@ msgstr ""
 "„Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA“"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Danilo Å egan <dsegan@gmx.net>\n"
@@ -3065,70 +2161,71 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 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:186
+#: ../src/empathy-accounts.c:175
 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:190
+#: ../src/empathy-accounts.c:179
 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:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<identifikacija naloga>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "— Nalozi Pismonoše"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Nalozi Pismonoše"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "Postoje nesa�uvane izmene na vašem nalogu %s."
+#| msgid "There are unsaved modifications to your %s account."
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "Postoje nesa�uvane izmene na vašem nalogu %.50s."
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "Vaš novi nalog još nije sa�uvan."
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "Nepovezan — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Veza je prekinuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "Nepovezan — Nema mrežne veze"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3138,28 +2235,30 @@ msgstr ""
 "Instalirajte „telepathy-haze“ i ponovo pokrenite vašu sesiju da premestite "
 "nalog."
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "Nepovezan — Nalog je onemogućen"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "Uredite parametre povezivanja"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "_Uredi parametre povezivanja..."
+#: ../src/empathy-accounts-dialog.c:716
+#| msgid "Edit Connection Parameters"
+msgid "_Edit Connection Parameters…"
+msgstr "_Uredi parametre povezivanja…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, 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?"
+#| msgid "Do you want to remove %s from your computer?"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "Da li želite da uklonite „%.50s“ sa vašeg ra�unara?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "Ovo neće ukloniti vaš nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3168,24 +2267,24 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "_Uklju�en"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "_Presko�i"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "_Poveži se"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3194,10 +2293,14 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "Nalozi za dopisivanje i VoIP"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Dodaj…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "_Uvezi…"
@@ -3218,32 +2321,32 @@ msgstr ""
 msgid "No protocol backends installed"
 msgstr "Nisu instalirani pozadinci protokola"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " — Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Internet pismonoša klijent prijave"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 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:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "— Internet pismonoša za brze poruke"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "Greška pri komunikaciji sa Upravnikom naloga"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3256,8 +2359,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
-#| msgid "Incoming call"
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "Dolazni poziv"
 
@@ -3269,107 +2371,107 @@ msgstr "— Internet pismonoša Audio/Video klijent"
 msgid "Empathy Audio/Video Client"
 msgstr "Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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."
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dolazni video poziv od %s"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Poziva vas „%s“"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "Odbaci"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "Javi se"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "Poziv sa korisnikom %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "IP adresa kako je vidi ovaj ra�unar"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adresa kako je vidi server na internetu"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 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-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "IP adresa relejnog servera"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "IP adresa grupe za višestruko emitovanje"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "Na �ekanju"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "Tehni�ki detalji"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, 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-call-window.c:3115
+#: ../src/empathy-call-window.c:3107
 #, 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-call-window.c:3121
+#: ../src/empathy-call-window.c:3113
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3378,23 +2480,23 @@ 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-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "Došlo je do greške u mreži"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 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-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 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-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3405,32 +2507,32 @@ msgstr ""
 "„%s“>ovu grešku</a> i prika�ite dnevnike pokupljene iz prozora „Otklanjanje "
 "grešaka“ u izborniku „Pomoć“."
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "Došlo je do greške u motoru za pozive"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "Dostignut je kraj toka"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "Ne mogu da uspostavim zvu�ni tok"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "Ne mogu da uspostavim video tok"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Vaše trenutno stanje je %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 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:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "Dopuni"
 
@@ -3454,11 +2556,11 @@ msgstr "_Podešavanja"
 msgid "_View"
 msgstr "Pre_gled"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "Po_moć"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "_Sadržaj"
 
@@ -3546,19 +2648,19 @@ msgstr "Lokalni kandidat:"
 msgid "Audio"
 msgstr "Zvuk"
 
-#: ../src/empathy-chat.c:102
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "— Pismonoša program za ćaskanje"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "Soba"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
@@ -3566,11 +2668,11 @@ msgstr "Automatsko povezivanje"
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "Da zatvorim ovaj prozor?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3579,7 +2681,7 @@ 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3600,12 +2702,12 @@ 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:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "Da napustim %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:311
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3613,15 +2715,15 @@ 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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "Zatvori prozor"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "Napusti sobu"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3630,7 +2732,7 @@ msgstr[1] "%s (%d nepro�itane)"
 msgstr[2] "%s (%d nepro�itanih)"
 msgstr[3] "%s (jedna nepro�itana)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3639,7 +2741,7 @@ msgstr[1] "%s (i %u druge)"
 msgstr[2] "%s (i %u drugih)"
 msgstr[3] "%s (i jedna druga)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3648,7 +2750,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:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3657,11 +2759,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:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3670,7 +2772,7 @@ msgstr[1] "Å aljem %d poruke"
 msgstr[2] "Å aljem %d poruka"
 msgstr[3] "Å aljem jednu poruku"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "Piše poruku."
 
@@ -3703,106 +2805,116 @@ msgid "Invite _Participant…"
 msgstr "Pozovi _u�esnike…"
 
 #: ../src/empathy-chat-window.ui.h:8
+#| msgid "_Join"
+msgid "_Join Chat"
+msgstr "_Pristupi ćaskanju"
+
+#: ../src/empathy-chat-window.ui.h:9
+#| msgid "_Chat"
+msgid "Le_ave Chat"
+msgstr "_Napusti ćaskanje"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "_Prijatelj"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "_Jezi�ci"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "Pre_thodni jezi�ak"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "Sle_deći jezi�ak"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "_Opozovi zatvaranje jezi�ka"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "Premesti jezi�ak _levo"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "Premesti jezi�ak _desno"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "_Otka�i jezi�ak"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "Prikaži posebnu uslugu"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "— Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "Sa�uvaj"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Veza kante odlaganja"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Odgovor kante odlaganja"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 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:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "Prozor za otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "Pošalji u kantu odlaganja"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "Nivo "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "Uklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "Podaci"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "Kriti�an"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3818,97 +2930,96 @@ msgstr ""
 "Ako ne želite da vidite takve podatke dostupne u javnom izveštaju o "
 "greškama, možete da izaberete da ograni�ite vidljivost vaših grešaka "
 "programerima Internet pismonoše kada izveštavate o njima prikazujući napredna "
-"polja u <a "
-"href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">izveštaju o "
-"grešci</a>."
+"polja u <a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy"
+"\">izveštaju o grešci</a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "Domen"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "Nivo"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 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-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "Dolazni video poziv"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, 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:513
+#: ../src/empathy-event-manager.c:507
 #, 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:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "Odgovori sa _videom"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozivnica da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "_Priklju�i se"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Pozvani ste da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "Potrebna je lozinka"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3918,105 +3029,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Greška pri primanju „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "Greška pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 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:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "Prenos datoteke je završen"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "ÄŒekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -4028,11 +3139,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:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "_Uvezi"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4040,49 +3151,49 @@ 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:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "Pozovi u�esnike"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "Pozovi"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "Soba za ćaskanje"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "ÄŒlanovi"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "Nisam uspeo da ispišem sobe"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -4095,17 +3206,17 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "ÄŒlanovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "Pridruži se sobi"
 
@@ -4147,104 +3258,104 @@ msgstr "Ne mogu da u�itam spisak soba"
 msgid "Room List"
 msgstr "Spisak soba"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "Odgovori sa videom"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 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:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "Obezbedi"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "Paja"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "Jare"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 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:654
+#: ../src/empathy-preferences.c:642
 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:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 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:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "Sav o�ajan, Paja je prekinuo vezu."
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "Postavke"
 
@@ -4256,7 +3367,7 @@ msgstr "Prikazuje grupe"
 msgid "Show account balances"
 msgstr "Prikazuje pomoćnika naloga"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
@@ -4378,23 +3489,7 @@ msgstr "Umanji _ta�nost lokacije"
 msgid "Privacy"
 msgstr "Privatnost"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "_Mobilni telefon"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Mreža (IP, beži�na)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "Izvori lokacija:"
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4402,36 +3497,37 @@ msgstr ""
 "Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
 "re�nike."
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Omogući proveru pravopisa za sledeće jezike:"
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Provera pisanja"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "_Tema ćaskanja:"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Varijanta:"
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "Prekini vezu"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+#| msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "Morate da podesite nalog da biste ovde videli kontakte."
 
 #: ../src/empathy-roster-window.c:569
@@ -4445,8 +3541,11 @@ msgstr ""
 msgid "Windows Live"
 msgstr "Vindouz uživo"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Gugl razgovor"
+
 #: ../src/empathy-roster-window.c:674
-#| msgid "Facebook Chat"
 msgid "Facebook"
 msgstr "Fejsbuk"
 
@@ -4457,13 +3556,13 @@ msgid "%s account requires authorisation"
 msgstr "%s nalog zahteva ovlašćenje"
 
 #: ../src/empathy-roster-window.c:700
-#| msgid "Edit Account"
 msgid "Online Accounts"
 msgstr "Nalozi na mreži"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
-msgstr "Ažuriraj softver..."
+#| msgid "Update software..."
+msgid "Update software…"
+msgstr "Ažuriraj softver…"
 
 #: ../src/empathy-roster-window.c:753
 msgid "Reconnect"
@@ -4509,24 +3608,28 @@ msgid "No online contacts"
 msgstr "Nema konakata na mreži"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "_Novi razgovor..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "Novi _poziv..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Novi _poziv…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "Prijatelji"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "Dod_aj prijatelja..."
+#| msgid "_Add Contact…"
+msgid "_Add Contacts…"
+msgstr "_Dodaj prijatelja…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
-msgstr "_Traži prijatelje..."
+#| msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
+msgstr "_Traži prijatelje…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "_Blocked Contacts"
@@ -4537,8 +3640,9 @@ msgid "_Rooms"
 msgstr "_Sobe"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "_Priklju�i se..."
+#| msgid "_Join"
+msgid "_Join…"
+msgstr "_Pristupi…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4582,33 +3686,19 @@ msgid "Go _Online"
 msgstr "Idi _na mrežu"
 
 #: ../src/empathy-roster-window.ui.h:3
-#| msgid "Show offline contacts"
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _kontakte van mreže"
 
-#: ../src/empathy-roster-window.ui.h:4
-#| msgid "_Add Contacts..."
-msgid "_Add Contact..."
-msgstr "_Dodaj kontakt..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "_Novi razgovor…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "Novi _poziv…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "Obavljeno"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "Unesite pojedinosti vašeg naloga"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca4ea0695..1cd7eb9e2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@
 # Tao Wang <dancefire@gmail.com>, 2010.
 # Dean Lee <xslidian@gmail.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2013.
 # zhen liu  <liuzhen1191@gmail.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2011
 # Mike Manilone <crtmike@gmail.com>, 2012
@@ -28,9 +28,9 @@ 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-09-20 08:28+0000\n"
+"POT-Creation-Date: 2013-07-09 15:43+0000\n"
 "PO-Revision-Date: 2012-08-31 16:21+0800\n"
-"Last-Translator: Cheng Lu <chenglu1990@gmail.com>\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -54,6 +54,12 @@ msgstr "Empathy �时通讯程�"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "使用 Google Talk�Facebook�MSN 以�许多其它�天�务"
 
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;talk;im;message;irc;voip;gtalk;facebook;jabber;�天;消�;�时通讯;通�;"
+"视频"
+
 #: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "应该使用连接管�器"
@@ -476,283 +482,284 @@ msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是�出于��原因�低 Empathy �置信�的准确度。"
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "需�状�改�信�"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "您�消了文件传输"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "�外的�与者�消了文件的传输"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "当传输这个文件的时候�生错误"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant is unable to transfer the file"
 msgstr "�外的�与者无法传输这个文件"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完�，但该文件已��"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输�支�远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "所选文件是�正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184
 msgid "Password not found"
 msgstr "未找到密�"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "IM �� %s (%s) 的密�"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, c-format
 msgid "Password for chatroom '%s' on account %s (%s)"
 msgstr "�� %2$s (%3$s) 的�天室 %1$s 密�"
 
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接�电：%s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "与 %s 通�"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "�电：%s"
 
-#: ../libempathy/empathy-time.c:90
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟�"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟�"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d �时�"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天�"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期�"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月�"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "将�"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "�身"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325
 msgid "Status is set to offline"
 msgstr "状�已设置为离线"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "验�失败"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "用户�已被�用"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311
 msgid "Certificate not provided"
 msgstr "未�供�书"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "�书�被信任"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "�书已过期"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317
 msgid "Certificate not activated"
 msgstr "�书尚未激活"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319
 msgid "Certificate hostname mismatch"
 msgstr "�书主机��匹�"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321
 msgid "Certificate fingerprint mismatch"
 msgstr "�书指纹�匹�"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323
 msgid "Certificate self-signed"
 msgstr "�书是自签属的"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "�书错误"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "加密��用"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "�书无效"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "连接被拒�"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 msgid "This account is already connected to the server"
 msgstr "该��已连接到�务器"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:339
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相�资�的新连接�代"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:342
 msgid "The account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
 msgid "Server is currently too busy to handle the connection"
 msgstr "�务器太忙，无法处�当�连接"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate has been revoked"
 msgstr "�书已被�销"
 
 # lainme：�书使用�安全的加密算法或是弱加密的
 # xslidian：�书使用的加密算法�安全或者易被破解
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "�书使用�安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:351
 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:366
+#: ../libempathy/empathy-utils.c:355
 msgid "Your software is too old"
 msgstr "你的软件版本太旧了"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "内部错误"
 
-#: ../libempathy/empathy-utils.c:497
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Facebook �天"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "全部��"
 
@@ -831,56 +838,56 @@ msgstr "您的 AIM 密�是什么？"
 msgid "Remember Password"
 msgstr "记�密�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-account-widget.c:668
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
+#: ../src/empathy-import-widget.c:316
 msgid "Account"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget.c:669
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Password"
 msgstr "密�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget.c:670
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:498
 msgid "Server"
 msgstr "�务器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget.c:671
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:519
 msgid "Port"
 msgstr "端�"
 
-#: ../libempathy-gtk/empathy-account-widget.c:762
+#: ../libempathy-gtk/empathy-account-widget.c:755
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
 msgid "Username:"
 msgstr "用户�："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "�务器上已存在该��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "在�务器上创建新的��"
 
@@ -889,19 +896,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:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "%s ��"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "新建��"
 
@@ -1122,32 +1129,32 @@ msgstr "您的 Windows Live ��是什么？"
 msgid "What is your Windows Live password?"
 msgstr "您的 Windows Live 密�是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "自动"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
 msgid "TLS"
 msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
 msgid "Register"
 msgstr "注册"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "选项"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "æ— "
 
@@ -1259,55 +1266,55 @@ msgstr "您的 Yahoo! ID 是什么？"
 msgid "What is your Yahoo! password?"
 msgstr "您的 Yahoo! 密�是什么？"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "无法转�图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
+#: ../libempathy-gtk/empathy-avatar-chooser.c:540
 msgid "None of the accepted image formats are supported on your system"
 msgstr "没有任何接�的图片格�能被您的系统支�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "无法将图片�存为文件"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "选择您的头�图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "照相..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "无图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "图�"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 msgid "Click to enlarge"
 msgstr "�击以放大"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "�� <b>%s</b> 验�失败"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3844
 msgid "Retry"
 msgstr "�试"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
+#: ../libempathy-gtk/empathy-password-dialog.c:132
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -1316,94 +1323,94 @@ msgstr ""
 "输入您的��密�\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "选择..."
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "选择(_S)"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "�起呼�时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "选择的�系人�支�呼�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "选择的�系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "选择的�系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "�支�在此会�上进行紧急呼�"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用�余��足以支付此次通�"
 
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:731
 msgid "Failed to open private chat"
 msgstr "建立�人对�失败"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 msgid "Topic not supported on this conversation"
 msgstr "�支�在此会�上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:795
 msgid "You are not allowed to change the topic"
 msgstr "您�能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:971
 msgid "Invalid contact ID"
 msgstr "无效的�系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当�会�的所有消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当�对�的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1067
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室�>：加入一个新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<�天室ID>] [<原因>]：当�默认离开�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消�>]：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消�>：打开一个�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当��务器上改�您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消�>：�当�对�中��一个动作消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1087
 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 "
@@ -1412,137 +1419,137 @@ msgstr ""
 "/say <消�>：�� <消�> 到当�对�。这是用���一个“/�开始的信�。例如：“/"
 "say /join 是用�加入一个新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�系人 ID>：显示一个�系人的信�"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支�的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅�用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1542
 msgid "insufficient balance to send message"
 msgstr "余��足，无法��消�"
 
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "��消�“%s�出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1550
+#: ../libempathy-gtk/empathy-chat.c:1554
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "余��足，无法��消�。 <a href='%s'>充值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "not capable"
 msgstr "��到"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "无效�系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "消�太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "�题："
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "�题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, 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:1702
+#: ../libempathy-gtk/empathy-chat.c:1706
 msgid "No topic defined"
 msgstr "未设置�题"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2290
 #, 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:2323
+#: ../libempathy-gtk/empathy-chat.c:2327
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s�到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2397
 msgid "Insert Smiley"
 msgstr "�入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "��(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "获�最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1550,12 +1557,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2833
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1563,17 +1570,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2844
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s �止"
 
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被�止"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了�天室"
@@ -1583,17 +1590,17 @@ msgstr "%s 离开了�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在�� %s"
@@ -1601,82 +1608,82 @@ 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:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641
+#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "是��存密�?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "�是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 msgid "Wrong password; please try again:"
 msgstr "密�错误，请�试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3972
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密��护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:3999
+#: ../src/empathy-new-chatroom-dialog.c:785
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 msgid "Conversation"
 msgstr "对�"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4251
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261
 msgid "Unknown or invalid identifier"
 msgstr "未知或无效的标识符"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "�系人�蔽暂时��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "�系人�蔽��用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "���足"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "无法�蔽�系人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../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:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1686,120 +1693,126 @@ msgstr "��："
 msgid "Blocked Contacts"
 msgstr "已�蔽的�系人"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "全�"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "电���"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "电�邮件地�"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "网站"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "最近上线："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "�务器："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 msgid "Connected from:"
 msgstr "连接��："
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "离开消�："
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "主页"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "音频"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "首选"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "邮政"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "邮件"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "�索�系人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "添加�系人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "未找到�系人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+#, fuzzy
+#| msgid "Topic not supported on this conversation"
+msgid "Contact search is not supported on this account"
+msgstr "�支�在此会�上设置主题"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "您的自我介�信�："
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "你在线时请让我知�，谢谢�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 msgid "Save Avatar"
 msgstr "�存头�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "无法�存头�"
 
 #. Identifier to connect to Instant Messaging network
 #. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
+#: ../libempathy-gtk/empathy-user-info.c:455
 msgid "Identifier"
 msgstr "标识符"
 
 #. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
+#: ../libempathy-gtk/empathy-user-info.c:460
 msgid "Alias"
 msgstr "别�"
 
@@ -1833,128 +1846,128 @@ msgstr "版本"
 msgid "Client"
 msgstr "客户端"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "组"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:329
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该�系人加入的群组。注�您�以选择多个群组，也�以�选择。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:383
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "新建�系人"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "�蔽 %s？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "确定��蔽 %s 以阻止他�次�系您�？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被�蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "以下用户无法被�蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "举报�系人滥用"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "编辑�系人信�"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "已绑定的�系人"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts 未安装"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "请安装 gnome-contacts �访问�系人详情。"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "选择�用于拨打电�的��"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "家庭"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "�蔽�系人"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "删除并�蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想�删除�系人“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1962,218 +1975,218 @@ msgid ""
 msgstr ""
 "您是�真正地想�删除已绑定的�系人'%s' ？ 注�这将删除所有�系已绑定的�系人"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:798
 msgid "Removing contact"
 msgstr "删除�系人"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:864
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 msgid "_Remove"
 msgstr "删除(_R)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1225
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1260
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "音频呼�(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "视频呼�(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "最近会�(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1396
 msgid "Send File"
 msgstr "��文件"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgid "Share My Desktop"
 msgstr "共享我的桌�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "收�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "信�(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
+#: ../libempathy-gtk/empathy-individual-menu.c:1646
 #: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "邀请到此�天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
 msgid "_Invite to Chat Room"
 msgstr "邀请到�天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "添加�系人(_A)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2360
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的�删除群组“%s��？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "删除群组"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "�命�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "频�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "邮政编�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "街�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "方���："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "�度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 msgid "Alias:"
 msgstr "别�："
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
 msgid "Identifier:"
 msgstr "标识符："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1640
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2187,32 +2200,32 @@ msgstr "<b>�置</b> 于 (日期)"
 msgid "Online from a phone or mobile device"
 msgstr "通过电�或移动设备上网"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "选择一个 IRC 网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "�置_Networks列表"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "新建�务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:534
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80
 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 "
@@ -2221,11 +2234,11 @@ msgstr ""
 "Empathy �以自动�现和您连接到�一个网络中的人们，并且�以和他们�天。如果您"
 "想使用这个功能，请仔细查看下列信�是�正确。"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2233,133 +2246,133 @@ msgstr ""
 "您�以在以�修改这些详细信�或通过在�系人列表中选择<span style=\"italic\">编"
 "辑 → ��</span>��用这一功能。"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:627
 msgid "History"
 msgstr "历�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:682
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:704
 msgid "Search"
 msgstr "�索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1155
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1157
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s �天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1207
+#: ../libempathy-gtk/empathy-log-window.c:1351
 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:1289
+#: ../libempathy-gtk/empathy-log-window.c:1294
 #, 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
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, 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:1375
 #, 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:1382
 #, 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:1390
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通�时长：%s，结�于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
 msgid "Anytime"
 msgstr "�时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "è°�"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Text chats"
 msgstr "文本�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "呼出的语音通�"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "未接�电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定�删除以�的全部对�日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
 msgid "Delete from:"
 msgstr "从以下�置删除："
 
@@ -2381,12 +2394,12 @@ msgid "Profile"
 msgstr "个人信�"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "�天"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
 msgid "Video"
 msgstr "视频"
 
@@ -2403,75 +2416,77 @@ msgid "What kind of chat account do you have?"
 msgstr "您已�拥有哪个类型的��？"
 
 #: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#, fuzzy
+#| msgid "Adding new account"
+msgid "Add new account"
 msgstr "添加新��"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "输入一个�系人标识或电���："
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "视频呼�(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "音频呼�(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "新建通�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "�系人为离线"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的�系人无效或信�未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "选择的�系人�支�在该类型会�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "所�求的功能与此�议�兼容"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "无法与选择的�系人�起对�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "您已被此频��蔽"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "频�已满"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "您必须被邀请�能加入此频�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "拒�访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "�起对�时出错"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "新建对�"
 
@@ -2481,26 +2496,26 @@ msgstr "新建对�"
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:157
+#: ../libempathy-gtk/empathy-presence-chooser.c:193
 msgid "Custom Message…"
 msgstr "自定义消�..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:210
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Edit Custom Messages…"
 msgstr "编辑自定义消�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 msgid "Click to remove this status as a favorite"
 msgstr "点击移除常用自定义状�"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:343
 msgid "Click to make this status a favorite"
 msgstr "点击设置常用自定义状�"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2509,12 +2524,12 @@ msgstr ""
 "<b>当�信�: %s</b>\n"
 "<small><i>按下 Enter 设置新信�或按下 Esc �消。</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:386
 msgid "Set status"
 msgstr "设置状�"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "自定义消�..."
 
@@ -2522,12 +2537,12 @@ msgstr "自定义消�..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
+#: ../libempathy-gtk/empathy-protocol-chooser.c:603
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s ��"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "区分大�写(_M)"
 
@@ -2551,371 +2566,391 @@ msgstr "区分大�写(_C)"
 msgid "Phrase not found"
 msgstr "未找到短语"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:49
 msgid "Received an instant message"
 msgstr "收到了�时消�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "���时消�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "收到的�天请求"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "�系人已连接"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "�系人已断开"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "已连接到�务器"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "已从�务器断开连接"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "呼入的语音通�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "呼出的语音通�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "语音通�结�"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 msgid "Edit Custom Messages"
 msgstr "编辑自定义消�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1096
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 当您在线的时候��"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:721
 msgid "_Decline"
 msgstr "拒�(_D)"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "接�(_A)"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1211
 #, c-format
 msgid "Message edited at %s"
 msgstr "消�于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1913
 msgid "Normal"
 msgstr "普通"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "�天�务器所�供的身份无法验�。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "�书并�由 CA 签�。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "�书已过期。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "�书尚未被激活。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "�书缺少应有的指纹。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "�书所验�的主机�与�务器��匹�。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "�书是自签署的。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "�书被�书签�机构�销。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "�书是弱加密的。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "�书长度超出�验��制。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "�书��。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "预期主机�: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "�书主机�: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "继续(_O)"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "��信任的连接"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "连接��信任。是���继续?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "为将�的连接记�本次选择"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "�书详情"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:1078
 msgid "Unable to open URI"
 msgstr "无法打开 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
 msgid "Select a file"
 msgstr "选择文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 msgid "Insufficient free space to save file"
 msgstr "空间�足，无法�存文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:1284
 #, 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "从 %s 传�的文件"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 msgid "Go online to edit your personal information."
 msgstr "请上线以编辑您的个人信�。"
 
-#: ../libempathy-gtk/empathy-user-info.c:464
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "<b>个人详情</b>"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Copy Link Address"
 msgstr "�制链接地�(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "审查 HTML"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 msgid "Current Locale"
 msgstr "当�语言环境"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:160
+#: ../libempathy-gtk/totem-subtitle-encoding.c:162
+#: ../libempathy-gtk/totem-subtitle-encoding.c:164
+#: ../libempathy-gtk/totem-subtitle-encoding.c:166
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "波罗的语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 msgid "Celtic"
 msgstr "凯尔特语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:182
+#: ../libempathy-gtk/totem-subtitle-encoding.c:184
+#: ../libempathy-gtk/totem-subtitle-encoding.c:186
+#: ../libempathy-gtk/totem-subtitle-encoding.c:188
 msgid "Central European"
 msgstr "中欧"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:191
+#: ../libempathy-gtk/totem-subtitle-encoding.c:193
+#: ../libempathy-gtk/totem-subtitle-encoding.c:195
+#: ../libempathy-gtk/totem-subtitle-encoding.c:197
 msgid "Chinese Simplified"
 msgstr "简体中文"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+#: ../libempathy-gtk/totem-subtitle-encoding.c:200
+#: ../libempathy-gtk/totem-subtitle-encoding.c:202
+#: ../libempathy-gtk/totem-subtitle-encoding.c:204
 msgid "Chinese Traditional"
 msgstr "�体中文"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 msgid "Croatian"
 msgstr "克罗地亚语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:210
+#: ../libempathy-gtk/totem-subtitle-encoding.c:212
+#: ../libempathy-gtk/totem-subtitle-encoding.c:214
+#: ../libempathy-gtk/totem-subtitle-encoding.c:216
+#: ../libempathy-gtk/totem-subtitle-encoding.c:218
+#: ../libempathy-gtk/totem-subtitle-encoding.c:220
 msgid "Cyrillic"
 msgstr "斯拉夫语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "斯拉夫语系/俄语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+#: ../libempathy-gtk/totem-subtitle-encoding.c:226
+#: ../libempathy-gtk/totem-subtitle-encoding.c:228
 msgid "Cyrillic/Ukrainian"
 msgstr "斯拉夫语系/乌克兰语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 msgid "Georgian"
 msgstr "格��亚语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "��拉特语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 msgid "Gurmukhi"
 msgstr "��普语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:247
+#: ../libempathy-gtk/totem-subtitle-encoding.c:249
+#: ../libempathy-gtk/totem-subtitle-encoding.c:251
+#: ../libempathy-gtk/totem-subtitle-encoding.c:253
 msgid "Hebrew"
 msgstr "希伯�语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "希伯�语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "北�度语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 msgid "Icelandic"
 msgstr "冰岛语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 msgid "Japanese"
 msgstr "日本语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:272
+#: ../libempathy-gtk/totem-subtitle-encoding.c:274
+#: ../libempathy-gtk/totem-subtitle-encoding.c:276
+#: ../libempathy-gtk/totem-subtitle-encoding.c:278
 msgid "Korean"
 msgstr "韩语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "北欧语系"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "波斯语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+#: ../libempathy-gtk/totem-subtitle-encoding.c:287
+#: ../libempathy-gtk/totem-subtitle-encoding.c:289
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "�欧语系"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 msgid "Thai"
 msgstr "泰国语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:298
+#: ../libempathy-gtk/totem-subtitle-encoding.c:300
+#: ../libempathy-gtk/totem-subtitle-encoding.c:302
+#: ../libempathy-gtk/totem-subtitle-encoding.c:304
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:307
+#: ../libempathy-gtk/totem-subtitle-encoding.c:309
+#: ../libempathy-gtk/totem-subtitle-encoding.c:311
+#: ../libempathy-gtk/totem-subtitle-encoding.c:313
+#: ../libempathy-gtk/totem-subtitle-encoding.c:315
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:318
+#: ../libempathy-gtk/totem-subtitle-encoding.c:320
+#: ../libempathy-gtk/totem-subtitle-encoding.c:322
+#: ../libempathy-gtk/totem-subtitle-encoding.c:324
+#: ../libempathy-gtk/totem-subtitle-encoding.c:326
 msgid "Western"
 msgstr "西方语言"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#: ../libempathy-gtk/totem-subtitle-encoding.c:329
+#: ../libempathy-gtk/totem-subtitle-encoding.c:331
+#: ../libempathy-gtk/totem-subtitle-encoding.c:333
 msgid "Vietnamese"
 msgstr "越�语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../libempathy-gtk/empathy-roster-model.h:27
+msgid "Top Contacts"
+msgstr "常用�系人"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
+msgid "Ungrouped"
+msgstr "未分组"
+
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:201
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "�务器找�到�系人：%s"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "无错误信�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "�时消�(Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2925,7 +2960,7 @@ msgstr ""
 "Empathy 是自由软件；您�以在自由软件基金会�布的 GNU 通用公共许��下�新�布"
 "或修改它；许���使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2935,7 +2970,7 @@ msgstr ""
 "Empathy �布的目的是希望它对您有用，但是没有任何担�；�使是对商业应用以�其"
 "它特定目的。查阅 GNU 通用公共许��以获�更多细节。"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -2945,11 +2980,11 @@ msgstr ""
 "给自由软件基金会写信。地�是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME �时消�客户端"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -2975,68 +3010,69 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "�显示任何对�框；完�所有工作（如导入）然�退出"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "�有“附近的人���的时候�显示任何对�框"
 
 # lainme：�次选择给定的��(比如 gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "首先选择给定��(如 gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<�� ID>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy ��"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy ��"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
-#, c-format
-msgid "There are unsaved modifications to your %s account."
+#: ../src/empathy-accounts-dialog.c:52
+#, fuzzy, c-format
+#| msgid "There are unsaved modifications to your %s account."
+msgid "There are unsaved modifications to your %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:56
 msgid "Your new account has not been saved yet."
 msgstr "您的新��还没有�存。"
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无�用网络"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "未知状�"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:476
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3045,59 +3081,60 @@ msgstr ""
 "因为此账户�赖一个旧���支�的�端，所以此账户已被�用。请安装 telepathy-"
 "haze 并�新�动您的会���移您的账户。"
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:486
 msgid "Offline — Account Disabled"
 msgstr "离线 - ��被�用"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "编辑连接�数"
 
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "编辑连接�数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1266
-#, c-format
-msgid "Do you want to remove %s from your computer?"
+#: ../src/empathy-accounts-dialog.c:1252
+#, fuzzy, c-format
+#| msgid "Do you want to remove %s from your computer?"
+msgid "Do you want to remove %.50s from your computer?"
 msgstr "您�从电脑中移除 %s �？"
 
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1256
 msgid "This will not remove your account on the server."
 msgstr "这�会删除�务器上的��。"
 
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将�选择�一个��，所�的修改将作废。您确定�继续�？"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1652
 msgid "_Enabled"
 msgstr "已�用(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "�命�"
 
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "跳过(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "连接(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2274
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将�关闭此窗�，所�的修改将作废。您确定�继续�？"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2418
 msgid "Messaging and VoIP Accounts"
 msgstr "消�和 VoIP ��"
 
@@ -3119,31 +3156,31 @@ msgstr "�添加一个新��，您首先需�为您想�使用的�个�
 msgid "No protocol backends installed"
 msgstr "未安装�议�端"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - Empathy 认�客户端"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy 认�客户端"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:407
 msgid "Don't connect on startup"
 msgstr "�动时�自动连接"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "�动时�显示�系人列表"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:440
 msgid "- Empathy IM Client"
 msgstr " - Empathy �时通讯客户端"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "�系��管�器出错"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3155,142 +3192,140 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:115
+msgid "In a call"
+msgstr "正在通�"
+
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:239
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, 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:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "�电"
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s 的视频呼�"
 
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的�电"
 
-#: ../src/empathy-call-window.c:1494
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1543
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "拒�"
 
-#: ../src/empathy-call-window.c:1495
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1544
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "接�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1861
+#: ../src/empathy-call-window.c:1913
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通�"
 
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2165
 msgid "The IP address as seen by the machine"
 msgstr "机器所�的 IP 地�"
 
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2167
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上�务器所�的 IP 地�"
 
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2169
 msgid "The IP address of the peer as seen by the other side"
 msgstr "�一方所�的 IP 地�"
 
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address of a relay server"
 msgstr "中转�务器 IP 地�"
 
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地�"
 
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
+#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2876
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2977
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-call-window.c:3090
 #, 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:3021
+#: ../src/empathy-call-window.c:3095
 #, 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:3027
+#: ../src/empathy-call-window.c:3101
 #, 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:3033
+#: ../src/empathy-call-window.c:3107
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-call-window.c:3037
+#: ../src/empathy-call-window.c:3111
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的音频格�还没有在您的电脑上安装"
 
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-call-window.c:3114
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼�所需�的视频格�还没有在您的电脑上安装"
 
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3300,32 +3335,32 @@ msgstr ""
 "Telepathy 组件出现了一些�外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助�"
 "�里“调试�窗�收集到的日志。"
 
-#: ../src/empathy-call-window.c:3061
+#: ../src/empathy-call-window.c:3135
 msgid "There was a failure in the call engine"
 msgstr "呼�引擎里出现了一个故障"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3138
 msgid "The end of the stream was reached"
 msgstr "已到达�的末尾"
 
-#: ../src/empathy-call-window.c:3104
+#: ../src/empathy-call-window.c:3178
 msgid "Can't establish audio stream"
 msgstr "�能建立音频�"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3188
 msgid "Can't establish video stream"
 msgstr "�能建立视频�"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3225
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您当�的余�为 %s。"
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3229
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "对�起，您信用�余��足以支付此次通�。"
 
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3231
 msgid "Top Up"
 msgstr "充值"
 
@@ -3362,90 +3397,98 @@ msgid "_Debug"
 msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
 msgid "Swap camera"
 msgstr "交�相机"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
 msgid "Minimise me"
 msgstr "最�化我"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
 msgid "Maximise me"
 msgstr "最大化我"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
 msgid "Disable camera"
 msgstr "�用相机"
 
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
 msgid "Hang up"
 msgstr "挂断"
 
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
 msgid "Hang up current call"
 msgstr "挂断当�呼�"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
 msgid "Video call"
 msgstr "视频呼�"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start a video call"
 msgstr "开始视频通�"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Start an audio call"
 msgstr "开始音频通�"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Show dialpad"
 msgstr "显示拨�盘"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Display the dialpad"
 msgstr "显示拨�盘"
 
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
 msgid "Toggle video transmission"
 msgstr "切�视频传输"
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
 msgid "Toggle audio transmission"
 msgstr "切�音频传输"
 
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
 msgid "Encoding Codec:"
 msgstr "编�器："
 
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
 msgid "Decoding Codec:"
 msgstr "解�器："
 
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
 msgid "Remote Candidate:"
 msgstr "远程候选："
 
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
 msgid "Local Candidate:"
 msgstr "本地候选："
 
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:243
 msgid "Name"
 msgstr "�称"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "�天室"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "自动连接"
 
@@ -3453,18 +3496,18 @@ msgstr "自动连接"
 msgid "Manage Favorite Rooms"
 msgstr "管��天室收�"
 
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "关闭此窗�？"
 
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:281
 #, 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:299
+#: ../src/empathy-chat-window.c:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3475,22 +3518,22 @@ msgid_plural ""
 msgstr[0] ""
 "关闭此窗�将离开 %u 间�天室。您将�会�收到任何消�，除��新加入。"
 
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:305
 #, c-format
 msgid "Leave %s?"
 msgstr "离开 %s？"
 
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:307
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "您将�会�收到�自此�天室的任何消�，除��新加入。"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:326
 msgid "Close window"
 msgstr "关闭窗�"
 
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "离开�天室"
 
@@ -3592,160 +3635,176 @@ msgstr "�移标签(_R)"
 msgid "_Detach Tab"
 msgstr "漂移标签(_D)"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "显示特定的�务"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Empathy 调试器"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1589
 msgid "Save"
 msgstr "�存"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1649
 msgid "Pastebin link"
 msgstr "Pastebin 链接"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1658
 msgid "Pastebin response"
 msgstr "Pastebin �应"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1665
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "一次粘贴的数�太多。请把日志�存到文件。"
 
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1847
 msgid "Debug Window"
 msgstr "调试窗�"
 
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1907
 msgid "Send to pastebin"
 msgstr "��到 pastebin"
 
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1951
 msgid "Pause"
 msgstr "暂�"
 
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1963
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1982
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1987
 msgid "Info"
 msgstr "信�"
 
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067
 msgid "Message"
 msgstr "消�"
 
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:1997
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2002
 msgid "Critical"
 msgstr "�急"
 
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2007
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2020
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"�使�显示密�，日志中�然�能包�一些�感信�，如您的�系人列表或最近收�的"
+"消�。\n"
+"如果�想让这些信�出现在公共的 BUG 报告中，您�以通过在 <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug 报告</a> 中显示高级字"
+"段�控制在��报告时哪些内容能被 Empathy 开�者看到。"
+
+#: ../src/empathy-debug-window.c:2052
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2055
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2058
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2061
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2090
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "已选定的连接管��支�远程调试扩展"
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:500
 msgid "Incoming video call"
 msgstr "呼入的视频通�"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:504
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频�电。您想�接��？"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:505
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �电，您想�接��？"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "拒�(_R)"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "使用视频接�(_A)"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "�天室邀请"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:713
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:758
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:937
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "需�密�"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3755,105 +3814,105 @@ msgstr ""
 "消�：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:93
 #, 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:102
+#: ../src/empathy-ft-manager.c:96
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:172
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:268
 #, 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:305
+#: ../src/empathy-ft-manager.c:299
 #, 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:308
+#: ../src/empathy-ft-manager.c:302
 #, 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:338
+#: ../src/empathy-ft-manager.c:332
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:335
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "� %2$s �� \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:343
 msgid "Error sending a file"
 msgstr "��文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:482
 #, 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:493
+#: ../src/empathy-ft-manager.c:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已�� %2$s 完��� \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 msgid "File transfer completed"
 msgstr "文件传�完�"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他�与者的回应"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1019
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1031
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "剩余"
 
@@ -3865,59 +3924,59 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完��已�消�已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "导入(_I)"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "未找到�导入的��。Empathy 目��能支�从 Pidgin 导入��。"
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "导入��"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:296
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "�议"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 msgid "Source"
 msgstr "�"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "邀请�与者"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个�系人以加入该会�："
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "邀请"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:184
 msgid "Chat Room"
 msgstr "�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "�员"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "无法列出�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:435
 #, c-format
 msgid ""
 "%s\n"
@@ -3930,17 +3989,17 @@ msgstr ""
 "需�密�: %s\n"
 "�员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
 msgid "No"
 msgstr "�"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:789
 msgid "Join Room"
 msgstr "加入�天室"
 
@@ -3977,104 +4036,104 @@ msgstr "无法载入�天室列表"
 msgid "Room List"
 msgstr "�天室列表"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "�应"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "以视频应答"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "拒�"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:134
 msgid "Message received"
 msgstr "收到了消�"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "�出了消�"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "新对�"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "�系人上线了"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "�系人离线了"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "��已连接"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "��已断开"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "朱立�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:635
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:641
 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:654
+#: ../src/empathy-preferences.c:645
 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:657
+#: ../src/empathy-preferences.c:648
 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:660
+#: ../src/empathy-preferences.c:651
 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:663
+#: ../src/empathy-preferences.c:654
 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:666
+#: ../src/empathy-preferences.c:657
 msgid "Juliet has disconnected"
 msgstr "朱立�已断开连接"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "首选项"
 
@@ -4086,7 +4145,7 @@ msgstr "显示分组"
 msgid "Show account balances"
 msgstr "显示��余�"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236
 msgid "Contact List"
 msgstr "�系人列表"
 
@@ -4248,64 +4307,84 @@ msgstr "版本："
 msgid "Themes"
 msgstr "主题"
 
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "�供密�"
 
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "已断开连接"
 
-#: ../src/empathy-roster-window.c:442
-msgid "You need to setup an account to see contacts here."
+#: ../src/empathy-roster-window.c:478
+msgid "You need to set up an account to see contacts here."
 msgstr "您需�设置一个���能查看这里的�系人。"
 
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:554
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，在软件 %2$s 更新�，您�能使用 %1$s ��。"
 
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:655
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:659
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:674
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s ��需�身份认�"
+
+#: ../src/empathy-roster-window.c:685
+msgid "Online Accounts"
+msgstr "在线��"
+
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "�级软件"
 
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "�新连接"
 
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "编辑��"
 
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "��充值"
 
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1575
 msgid "You need to enable one of your accounts to see contacts here."
 msgstr "您需��用一个���能查看这里的�系人。"
 
 #. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1583
 #, c-format
 msgid "You need to enable %s to see contacts here."
 msgstr "您需��用 %s �查看这里的�系人。"
 
-#: ../src/empathy-roster-window.c:1556
-#, fuzzy
-#| msgid "You need to enable %s to see contacts here."
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
-msgstr "您需��用 %s �查看这里的�系人。"
+msgstr "更改您的在线状��查看这里的�系人"
 
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "没有找到匹�项"
 
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1677
+msgid "You haven't added any contact yet"
+msgstr "您尚未添加任何�系人"
+
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "无在线�系人"
 
@@ -4380,7 +4459,15 @@ msgstr "��设置"
 
 #: ../src/empathy-roster-window.ui.h:2
 msgid "Go _Online"
-msgstr ""
+msgstr "上线(_O)"
+
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "显示离线�系人(_O)"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "添加�系人(_A)..."
 
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4394,12 +4481,12 @@ msgstr "新建呼�(_C)..."
 msgid "Status"
 msgstr "状�"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "完�"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "输入您的��详情"
 
@@ -4409,10 +4496,11 @@ msgid "Edit %s account options"
 msgstr "编辑 %s ��选项"
 
 #: ../ubuntu-online-accounts/empathy.application.in.h:1
-#, fuzzy
-#| msgid "Import your existing accounts"
 msgid "Integrate your IM accounts"
-msgstr "导入现有��"
+msgstr "集�您的�时通讯��"
+
+#~ msgid "i"
+#~ msgstr "i"
 
 #~ msgid "Manage Messaging and VoIP accounts"
 #~ msgstr "管�消�和 VoIP ��"
@@ -4718,9 +4806,6 @@ msgstr "导入现有��"
 #~ msgid "Socket type not supported"
 #~ msgstr "�支� Socket 类型"
 
-#~ msgid "My Web Accounts"
-#~ msgstr "我的网络��"
-
 #~ msgid "The account %s is edited via %s."
 #~ msgstr "%s ��通过 %s 进行了编辑。"
 
@@ -4813,15 +4898,9 @@ msgstr "导入现有��"
 #~ msgid "Whether Empathy has migrated butterfly logs."
 #~ msgstr "Empathy 是�已��移至 telepathy-butterfly 日志。"
 
-#~ msgid "Ungrouped"
-#~ msgstr "未分组"
-
 #~ msgid "Favorite People"
 #~ msgstr "收�夹"
 
-#~ msgid "Select a contact"
-#~ msgstr "选择一个�系"
-
 #~ msgid "Contact ID:"
 #~ msgstr "�系人 ID："
 
@@ -5242,9 +5321,6 @@ msgstr "导入现有��"
 #~ msgid "Join _New..."
 #~ msgstr "加入新�天室(_N)..."
 
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "显示离线�系人(_O)"
-
 #~ msgid "Chat Rooms"
 #~ msgstr "�天室"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d78a6c292..4679c4d0f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,15 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-28 09:51+0800\n"
-"PO-Revision-Date: 2013-01-28 09:51+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"POT-Creation-Date: 2013-09-04 14:47+0800\n"
+"PO-Revision-Date: 2013-09-04 14:48+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -425,34 +426,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的�絡人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy �以利用網絡來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy 是�使用網絡來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy �以利用�動電話網絡基地臺來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy 是�使用�動電話網絡來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy �以利用 GPS 來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy 是�使用 GPS 來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應�低�置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於�隱的�由減低�置的準確度。"
@@ -481,7 +458,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -501,791 +478,185 @@ msgstr "��的檔案�是正�的檔案"
 msgid "The selected file is empty"
 msgstr "��的檔案是空白的"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "找�到密碼"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "%s 的�時通帳號密碼 (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "%2$s 帳號下「%1$s��天室的密碼 (%3$s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "�接 %s 的來電"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "已撥打 %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d 秒�"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d 分�以�"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d �時以�"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天以�"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d 週�"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d 個月以�"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "未來"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "沒有�供證書"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "證書�被信任"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "證書主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "這個帳號已連接至伺�器"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "你的軟件�舊"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! 日本"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook �天"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "密碼(_W)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "記�密碼"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "連接埠(_P)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "伺�器(_S)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "記�密碼"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "密碼"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "連接埠"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "使用者�稱："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "套用(_A)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "登入(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "此帳號已經存在這個伺�器上"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "在這個伺�器上建立新的帳號"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s 上的 %1$s"
-
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s 帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "新增帳號"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "登入 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>範例：</b>username"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "你的 GroupWise 密碼是？"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "字集(_A)"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "你的 ICQ 密碼是？"
-
-#: ../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 "字集"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "加入…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "移除"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "往上"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "往下"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr "大多數的 IRC �務�需�密碼，所以若你�確定的話，請��輸入密碼。"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "網�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "離開訊�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "真實姓�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "使用者�稱"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "哪個 IRC 網絡？"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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.com/<b>badger</b> 的話，請輸入 <b>badger</b>。\n"
-"如果你還沒有 Facebook 使用者�稱，請使用 <a href=\"http://www.facebook.com/username/\">此網�</a> 來�用一個。"
-
-#: ../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 ID 是？"
-
-#: ../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 "Override server settings"
-msgstr "覆蓋伺�器設定值"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "使用舊版 SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "你的 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 密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "網�(_K)"
-
-#: ../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 "E-_mail address"
-msgstr "電�信箱��(_M)"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>範例：</b>user@hotmail.com"
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr "你的 Windows Live 密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "自動"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "註冊"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "ç„¡"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "使用者�稱(_U)"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "使用這個帳號來撥打市話與�動電話(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "NAT 傳輸�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Proxy �項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "雜項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN 伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "自動探索 STUN 伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "探索�定"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "���斷線�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "機制"
-
-#: ../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 "Transport"
-msgstr "傳輸"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "寬鬆路由"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "忽略 TLS 錯誤"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "�域 IP ��"
-
-#: ../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 "What is your SIP account password?"
-msgstr "你的 SIP 帳號密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "密碼(_W)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "Yahoo 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:6
-msgid "_Room List locale:"
-msgstr "�天室清單地�資訊(_R)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "字集(_A)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "連接埠(_P)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "你的 Yahoo! ID 是？"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "你的 Yahoo! 密碼是？"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "無法轉�圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "你的系統上沒有支�已接�的圖片格�"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "無法將圖片儲存至檔案"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "�擇你的大頭貼圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "挑�圖片..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "沒有圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "所有檔案"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "請按這�放大"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "<b>%s</b> 帳號驗證失敗"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1295,230 +666,227 @@ msgstr ""
 "輸入你帳號的密碼\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "��..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "��(_S)"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "記�密碼"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "指定的�絡人�支�通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "指定的�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "指定的�絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "你的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "你�被�許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "無效的�絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網�>：更改在目�伺�器上的你的網�"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../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 <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "無效的�絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1526,12 +894,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1539,17 +907,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1559,17 +927,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1577,50 +945,50 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "你想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1651,8 +1019,8 @@ msgstr "編輯�鎖的�絡人"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1662,120 +1030,63 @@ msgstr "帳號："
 msgid "Blocked Contacts"
 msgstr "被�鎖的�絡人"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "全�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "電話號碼"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "電�信箱��"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "網站"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "上次看見："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "伺�器："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "已連接從："
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "離開訊�："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "工作"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "�家"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "行動"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "�音"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "�好"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "郵�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "移除"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "�尋�絡人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "�尋："
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "加入�絡人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "找�到�絡人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "這個帳號�支��絡人�尋"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "你的訊�"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當你上線時請讓我知�。感��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "帳號"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "識別身分"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "別�"
 
@@ -1809,346 +1120,352 @@ msgstr "版本"
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "請�擇這個�絡人�顯�在哪個羣組。注�你�以�擇一個以上的羣組或��擇羣組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "加入羣組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "新增�絡人"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "你確定想��鎖「%s�讓他無法�與你�絡嗎？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "下列識別身分將被�鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "下列識別身分無法被�鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "回報這些�絡人濫用帳號(_R)"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "編輯�絡人資訊"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "連��絡羣"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts 尚未安�"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "請安� gnome-contacts 來存��絡人細節。"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "���用來放置通話的帳號"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "�動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "�家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "�鎖�絡人(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "從羣組「%s�移除(_G)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除�絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr "你真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡羣的�絡人。"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "正在移除�絡人"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視�通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "傳�檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "分享我的桌�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "邀請你到這個�天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除羣組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "正在移除羣組"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "�新命�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "頻�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "�/州："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�域："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "郵��號："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "樓："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (米)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (米)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "方�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ–¼ %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "別�："
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "識別身分："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2162,175 +1479,150 @@ msgstr "<b>�置</b> 於 (日期)"
 msgid "Online from a phone or mobile device"
 msgstr "從手機或�動通訊器�上線"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "新增網絡"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "�擇 IRC 網絡"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "�設網絡清單(_N)"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "��"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "新增伺�器"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 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> �用這個功能。"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "撥出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "你確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2339,12 +1631,12 @@ msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "刪除所有歷�..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2352,7 +1644,7 @@ msgid "Profile"
 msgstr "個人檔案"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "�天"
 
@@ -2366,112 +1658,116 @@ msgid "page 2"
 msgstr "�� 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">正在載入...</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "你的�天帳號是哪一種？"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
 msgstr "新增帳號"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入�絡人辨識身份或電話號碼："
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "視�通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "新增通話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的�絡人無效或未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "該�絡人�支�這類談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "請求的功能尚未在此�定中實作"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "無法啟動與給定�絡人的談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "你被此頻���"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "此頻�已滿"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "你必須被邀請�能�加此頻�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "斷線時無法處�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "許�被拒絕"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "新增談話"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "需�密碼"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "自�訊�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "編輯自�訊�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "按這�將這個狀態從喜好中移除"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "按這�將這個狀態設為喜好"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2480,25 +1776,16 @@ msgstr ""
 "<b>目�訊�：%s</b>\n"
 "<small><i>按下 Enter 設定新訊�，或按下 Esc �消。</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "設定狀態"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "自�訊�…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "新增 %s 帳號"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "比�大�寫(_M)"
 
@@ -2522,391 +1809,220 @@ msgstr "比�大�寫(_C)"
 msgid "Phrase not found"
 msgstr "找�到詞彙"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "收到�時訊�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "傳��時訊�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "收到�天�求"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "�絡人已連線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "�絡人已斷線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "連接到伺�器"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "與伺�器斷線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "收到語音通話"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "撥出語音通話"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "語音通話��"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "編輯自�訊�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "訂閱�求"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想�得到查看你是�上線的許�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "接�(_A)"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "一般"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "�天伺�器所�供的識別身分無法通�驗證。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "該證書並�由證書授權中心所簽署。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "證書已逾期。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "證書尚未啟用。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "證書並未�有�期的指紋。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "證書所驗證的主機�稱與伺�器�稱�符。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "證書為自我簽署。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "證書已被原本發出的證書授權機構撤銷。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "證書於密碼防護上較弱。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "證書長度超出�驗證的範�。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "證書格��良。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "�期的證書主機�稱：%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "證書主機�稱：%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "繼續(_O)"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "未�信任的連線"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未�信任。你無論如何都�繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "請記�此�擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "證書詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "上線以編輯你的個人資料。"
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>個人詳細資料</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "複製連���(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "開啟連�(_O)"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "審閱 HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "目�的地�資訊"
-
-#: ../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 "阿拉伯文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "阿美尼亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "波羅的海語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "塞爾特語系"
-
-#: ../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 "中�語系"
-
-#: ../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 "簡體中文"
-
-#: ../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 "�體中文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "克羅地亞文"
-
-#: ../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 "斯拉夫語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "斯拉夫語系/俄文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫文/�克蘭語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "格魯�亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "希臘文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "��拉特文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "�魯穆奇文字"
-
-#: ../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 "希伯來文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "希伯來文(左至�)"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "北�度文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "冰島語"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "日文"
-
-#: ../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 "韓文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "北�語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "波斯文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "羅馬尼亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "��語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "æ³°æ–‡"
-
-#: ../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 "土耳其文"
-
-#: ../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 "�國碼"
-
-#: ../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 "西�語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "越�文"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "常用�絡人"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "未羣組"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "伺�器找�到�絡人：%s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "沒有錯誤訊�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2914,7 +2030,7 @@ msgid ""
 "version."
 msgstr "Empathy 是自由軟件，你�以�照自由軟件基金會 (Free Software Foundation) 出版的 GNU 通用公共許�證�款 (GNU General Public License) 第二版來修改和�新發布這一程�，或者自由�擇使用任何更新的版本。"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2922,18 +2038,18 @@ msgid ""
 "details."
 msgstr "發布 Empathy 的目的是希望它有用，但沒有任何擔�。甚至沒有��特定目的而隱�的擔�。更詳細的情�請�閱 GNU 通用公共許�證。"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的�時訊�用戶端程�"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "如�翻譯有任何�見，請�一�電�郵件給\n"
@@ -2945,95 +2061,95 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "��顯示任何�話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "��顯示任何�話窗，除��有「附近的人�帳號"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "�始��所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "有與你的 %.50s 帳號相關的修改尚未儲存。"
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存你的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網絡連線"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 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:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "編輯連線�數(_E)..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "編輯連線�數(_E)…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "是�想�從你的電腦上移除羣組 %s？"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "是�想�從你的電腦上移除 %.50s？"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的你的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3042,24 +2158,24 @@ msgstr ""
 "你所�的更改。確定�繼續？"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "已啟用(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "�新命�"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "略�(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "連接(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3068,10 +2184,14 @@ msgstr ""
 "你所�的更改。確定�繼續？"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "訊�與 VoIP 帳號"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "加入…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "匯入(_I)…"
@@ -3090,31 +2210,31 @@ msgstr "�加入新的帳號，你必須先安��個會用到的通訊�定
 msgid "No protocol backends installed"
 msgstr "尚未安�通訊�定後端程�"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Empathy �證用戶端"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy �證用戶端"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示�絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3126,7 +2246,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "通話中"
 
@@ -3138,128 +2258,128 @@ msgstr "- Empathy 音訊視�用戶端"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視�用戶端"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛撥打給你，但你正與他人通話。"
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視�通話"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "接�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "互�網上的伺�器看見的 IP ��"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "多點廣播羣組的 IP ��"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, 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:3115
+#: ../src/empathy-call-window.c:3107
 #, 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:3121
+#: ../src/empathy-call-window.c:3113
 #, 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:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "這個網絡上有錯誤發生"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在你的電腦上安�"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視�格�尚未在你的電腦上安�"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3267,32 +2387,32 @@ msgid ""
 "the Help menu."
 msgstr "在 Telepathy 元件中發生未�期的狀�。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助�單內的「除錯�視窗中所收集的紀錄。"
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "無法建立視�串�"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "你目�的餘�為 %s。"
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，你的存��足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "加值"
 
@@ -3316,11 +2436,11 @@ msgstr "設定值(_S)"
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -3408,19 +2528,19 @@ msgstr "本機候�："
 msgid "Audio"
 msgstr "音訊"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Empathy �天用戶端"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "�稱"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "�天室"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "自動連線"
 
@@ -3428,18 +2548,18 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管�喜好的�天室"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "�關閉這個視窗？"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3449,60 +2569,60 @@ msgid_plural ""
 "further messages until you rejoin them."
 msgstr[0] "關閉此視窗會離開 %u 個�天室。你將無法接收到之後的訊�，除�你�次�與。"
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "離開 %s？"
 
-#: ../src/empathy-chat-window.c:319
+#: ../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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "關閉視窗"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "離開�天室"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與其他 %u 個)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3535,106 +2655,114 @@ msgid "Invite _Participant…"
 msgstr "邀請�與(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "�加�天(_J)"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "離開�天(_A)"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "�絡人(_O)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "分�(_T)"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "上個分�(_P)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "下個分�(_N)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "復原關閉的分�(_U)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "將分�左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "將分��移(_R)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "分離分�(_D)"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "顯示特定�務"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Empathy 除錯器"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程�"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Pastebin 連�"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Pastebin 回應"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "�於單一貼上來說資料��大。請儲存紀錄至檔案。"
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "�錯視窗"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "傳�至 pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "暫�"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "�錯"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "訊�"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "嚴�"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3647,92 +2775,92 @@ msgstr ""
 "�使它們沒有顯示密碼，記錄也�能包��感資訊，�是你的�絡人清單，或是你最近傳�或接收的訊�等。\n"
 "如果你�想看見這樣的資訊公開在錯誤回報記錄中，你�以在<a href=\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">匯報錯誤</a>時點開「Show Advanced Fields�，並�擇將你的錯誤報告僅�給 Empathy 開發者觀看。"
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "��的連線管�程��支��端�錯擴充功能。"
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "傳入的視�通話"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �與你進行視�通話。你是��接�？"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與你進行通話。你是��接�？"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "以視�接�(_A)"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "�天室邀請"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請你�加 %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請你�加 %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "你被邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "需�密碼"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3742,105 +2870,105 @@ msgstr ""
 "訊�：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ–¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "從 %2$s 接收「%1$s�時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "接收檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "傳�「%s�給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "傳�檔案時發生錯誤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s�傳�給 %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他�與者的回應"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "正在檢查檔案「%s�的完整性"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s�雜湊值"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -3852,59 +2980,59 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完��已�消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "匯入(_I)"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找�到�匯入的帳號。Empathy 目��支�從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "邀請�與"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "�擇想�邀請進入談話的�絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "�員"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "無法列出�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3917,17 +3045,17 @@ msgstr ""
 "需�密碼：%s\n"
 "�員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "�"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "�加�天室"
 
@@ -3964,104 +3092,104 @@ msgstr "無法載入�天室清單"
 msgid "Room List"
 msgstr "�天室清單"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "以視�接�"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "訊�已收到"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "訊�已�出"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "�絡人上線"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "�絡人離線"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4073,7 +3201,7 @@ msgstr "顯示羣組"
 msgid "Show account balances"
 msgstr "顯示帳號餘�"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "�絡人清單"
 
@@ -4189,58 +3317,42 @@ msgstr "�低�置準確度(_R)"
 msgid "Privacy"
 msgstr "�隱"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "手機(_C)"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "網絡 (IP, Wi-Fi)(_N)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "�置來�："
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這�的語言清單��映出你已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "為語言啟用拼字檢查："
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "�天佈景主題(_E):"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "你需�設置一個帳號�能在這�查看�絡人。"
 
 #: ../src/empathy-roster-window.c:569
@@ -4252,6 +3364,10 @@ msgstr "很抱歉，%s 帳號無法使用，除�你的 %s 軟件已更新。"
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4267,7 +3383,7 @@ msgid "Online Accounts"
 msgstr "網上帳號"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "更新軟件..."
 
 #: ../src/empathy-roster-window.c:753
@@ -4313,23 +3429,25 @@ msgid "No online contacts"
 msgstr "無上線�絡人"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "新增談話(_N)..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新增談話(_N)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "新增通話(_C)..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新增通話(_C)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "�絡人"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "加入�絡人(_A)..."
+msgid "_Add Contacts…"
+msgstr "加入�絡人(_A)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4341,8 +3459,8 @@ msgid "_Rooms"
 msgstr "�天室(_R)"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "�加(_J)..."
+msgid "_Join…"
+msgstr "�加(_J)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4389,28 +3507,16 @@ msgstr "上線(_O)"
 msgid "Show _Offline Contacts"
 msgstr "顯示離線�絡人(_O)"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "加入�絡人(_A)..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "新增談話(_N)…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "新增通話(_C)…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "狀態"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "完�"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "請輸入你的帳號詳細資料"
 
@@ -4423,6 +3529,614 @@ msgstr "編輯 %s 帳號�項"
 msgid "Integrate your IM accounts"
 msgstr "整�你的�時通帳號"
 
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy �以利用網路來推測�置"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "Empathy 是�使用網路來推測�置。"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "Empathy �以利用行動電話網路基地臺來推測�置"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "Empathy 是�使用行動電話網路來推測�置。"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy �以利用 GPS 來推測�置"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "Empathy 是�使用 GPS 來推測�置。"
+
+#~ msgid "Password not found"
+#~ msgstr "找�到密碼"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "%s 的�時通帳號密碼 (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "%2$s 帳號下「%1$s��天室的密碼 (%3$s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "%d 秒�"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d 分�以�"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d �時以�"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天以�"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d 週�"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "%d 個月以�"
+
+#~ msgid "in the future"
+#~ msgstr "未來"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! 日本"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Facebook �天"
+
+#~ msgid "Pass_word"
+#~ msgstr "密碼(_W)"
+
+#~ msgid "Screen _Name"
+#~ msgstr "螢幕�稱(_N)"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>範例：</b>MyScreenName"
+
+#~ msgid "_Port"
+#~ msgstr "連接埠(_P)"
+
+#~ msgid "_Server"
+#~ msgstr "伺�器(_S)"
+
+#~ msgid "Advanced"
+#~ msgstr "進階"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "您的 AIM 螢幕�稱是？"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "您的 AIM 密碼是？"
+
+#~ msgid "Remember Password"
+#~ msgstr "記�密碼"
+
+#~ msgid "Password"
+#~ msgstr "密碼"
+
+#~ msgid "Server"
+#~ msgstr "伺�器"
+
+#~ msgid "Port"
+#~ msgstr "連接埠"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s："
+
+#~ msgid "Username:"
+#~ msgstr "使用者�稱："
+
+#~ msgid "A_pply"
+#~ msgstr "套用(_A)"
+
+#~ msgid "L_og in"
+#~ msgstr "登入(_O)"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "此帳號已經存在這個伺�器上"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "在這個伺�器上建立新的帳號"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%2$s 上的 %1$s"
+
+#~ msgid "%s Account"
+#~ msgstr "%s 帳號"
+
+#~ msgid "New account"
+#~ msgstr "新增帳號"
+
+#~ msgid "Login I_D"
+#~ msgstr "登入 I_D"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>範例：</b>username"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "您的 GroupWise 使用者 ID 是？"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "您的 GroupWise 密碼是？"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "ICQ _UIN"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>範例：</b>123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "字集(_A)"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "您的 ICQ UIN 是？"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "您的 ICQ 密碼是？"
+
+#~ msgid "Network"
+#~ msgstr "網路"
+
+#~ msgid "Character set"
+#~ msgstr "字集"
+
+#~ msgid "Up"
+#~ msgstr "往上"
+
+#~ msgid "Down"
+#~ msgstr "往下"
+
+#~ msgid "Servers"
+#~ msgstr "伺�器"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr "大多數的 IRC �務�需�密碼，所以若您�確定的話，請��輸入密碼。"
+
+#~ msgid "Nickname"
+#~ msgstr "暱稱"
+
+#~ msgid "Quit message"
+#~ msgstr "離開訊�"
+
+#~ msgid "Real name"
+#~ msgstr "真實姓�"
+
+#~ msgid "Username"
+#~ msgstr "使用者�稱"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "哪個 IRC 網路？"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "您的 IRC 暱稱是？"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "您的 Facebook 使用者�稱是？"
+
+#~ 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.com/<b>badger</b> 的話，請輸入 <b>badger</b>。\n"
+#~ "如果您還沒有 Facebook 使用者�稱，請使用 <a href=\"http://www.facebook."
+#~ "com/username/\">此網�</a> 來�用一個。"
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "您的 Facebook 密碼是？"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "您的 Google ID 是？"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>範例：</b>user@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "您的 Google 密碼是？"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>範例：</b>user@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "忽略 SSL 憑證錯誤(_G)"
+
+#~ msgid "Priori_ty"
+#~ msgstr "優先權(_T)"
+
+#~ msgid "Reso_urce"
+#~ msgstr "資�(_U)"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "�求加密 (TLS/SSL)(_Y)"
+
+#~ msgid "Override server settings"
+#~ msgstr "覆蓋伺�器設定值"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "使用舊版 SS_L"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "您的 Jabber ID 是？"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "您想�的 Jabber ID 是？"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "您的 Jabber 密碼是？"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "您想�的 Jabber 密碼是？"
+
+#~ msgid "Nic_kname"
+#~ msgstr "暱稱(_K)"
+
+#~ msgid "_Last Name"
+#~ msgstr "姓(_L)"
+
+#~ msgid "_First Name"
+#~ msgstr "�(_F)"
+
+#~ msgid "_Published Name"
+#~ msgstr "發布的�稱(_P)"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID"
+
+#~ msgid "E-_mail address"
+#~ msgstr "電�信箱��(_M)"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>範例：</b>user@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "您的 Windows Live ID 是？"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "您的 Windows Live 密碼是？"
+
+#~ msgid "Auto"
+#~ msgstr "自動"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "註冊"
+
+#~ msgid "Options"
+#~ msgstr "�項"
+
+#~ msgid "None"
+#~ msgstr "ç„¡"
+
+#~ msgid "_Username"
+#~ msgstr "使用者�稱(_U)"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>範例：</b>user@my.sip.server"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr "使用這個帳號來撥打市話與行動電話(_L)"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "NAT 傳輸�項"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy �項"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "雜項"
+
+#~ msgid "STUN Server"
+#~ msgstr "STUN 伺�器"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "自動探索 STUN 伺�器"
+
+#~ msgid "Discover Binding"
+#~ msgstr "探索�定"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "���斷線�項"
+
+#~ msgid "Mechanism"
+#~ msgstr "機制"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "間隔 (秒)"
+
+#~ msgid "Authentication username"
+#~ msgstr "�證使用者�稱"
+
+#~ msgid "Transport"
+#~ msgstr "傳輸"
+
+#~ msgid "Loose Routing"
+#~ msgstr "寬鬆路由"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "忽略 TLS 錯誤"
+
+#~ msgid "Local IP Address"
+#~ msgstr "�域 IP ��"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "您想�的 SIP 登入 ID 是？"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "您的 SIP 帳號密碼是？"
+
+#~ msgid "Pass_word:"
+#~ msgstr "密碼(_W)："
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "Yahoo I_D："
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "忽略會議與�天室邀請(_G)"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "�天室清單地�資訊(_R)："
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "字集(_A)："
+
+#~ msgid "_Port:"
+#~ msgstr "連接埠(_P)："
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "您的 Yahoo! ID 是？"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "您的 Yahoo! 密碼是？"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "無法轉�圖片"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "您的系統上沒有支�已接�的圖片格�"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "無法將圖片儲存至檔案"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "�擇您的大頭貼圖片"
+
+#~ msgid "Take a picture..."
+#~ msgstr "挑�圖片..."
+
+#~ msgid "No Image"
+#~ msgstr "沒有圖片"
+
+#~ msgid "Images"
+#~ msgstr "圖片"
+
+#~ msgid "All Files"
+#~ msgstr "所有檔案"
+
+#~ msgid "Select..."
+#~ msgstr "��..."
+
+#~ msgid "_Select"
+#~ msgstr "��(_S)"
+
+#~ msgid "Full name"
+#~ msgstr "全�"
+
+#~ msgid "Phone number"
+#~ msgstr "電話號碼"
+
+#~ msgid "E-mail address"
+#~ msgstr "電�信箱��"
+
+#~ msgid "Website"
+#~ msgstr "網站"
+
+#~ msgid "Birthday"
+#~ msgstr "生日"
+
+#~ msgid "Last seen:"
+#~ msgstr "上次看見："
+
+#~ msgid "Server:"
+#~ msgstr "伺�器："
+
+#~ msgid "Connected from:"
+#~ msgstr "已連接從："
+
+#~ msgid "Away message:"
+#~ msgstr "離開訊�："
+
+#~ msgid "work"
+#~ msgstr "工作"
+
+#~ msgid "home"
+#~ msgstr "�家"
+
+#~ msgid "mobile"
+#~ msgstr "行動"
+
+#~ msgid "voice"
+#~ msgstr "�音"
+
+#~ msgid "preferred"
+#~ msgstr "�好"
+
+#~ msgid "postal"
+#~ msgstr "郵�"
+
+#~ msgid "parcel"
+#~ msgstr "包裹"
+
+#~ msgid "New Network"
+#~ msgstr "新增網路"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "�擇 IRC 網路"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "�設網路清單(_N)"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "��"
+
+#~ msgid "new server"
+#~ msgstr "新增伺�器"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "新增 %s 帳號"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "上線以編輯您的個人資訊。"
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>個人詳細資料</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "目�的地�資訊"
+
+#~ msgid "Arabic"
+#~ msgstr "阿拉伯文"
+
+#~ msgid "Armenian"
+#~ msgstr "阿美尼亞文"
+
+#~ msgid "Baltic"
+#~ msgstr "波羅的海語系"
+
+#~ msgid "Celtic"
+#~ msgstr "塞爾特語系"
+
+#~ msgid "Central European"
+#~ msgstr "中�語系"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "簡體中文"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "正體中文"
+
+#~ msgid "Croatian"
+#~ msgstr "克羅埃西亞文"
+
+#~ msgid "Cyrillic"
+#~ msgstr "斯拉夫語系"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "斯拉夫語系/俄文"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "斯拉夫文/�克蘭語系"
+
+#~ msgid "Georgian"
+#~ msgstr "喬治亞文"
+
+#~ msgid "Greek"
+#~ msgstr "希臘文"
+
+#~ msgid "Gujarati"
+#~ msgstr "��拉特文"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "�魯穆奇文字"
+
+#~ msgid "Hebrew"
+#~ msgstr "希伯來文"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "希伯來文(左至�)"
+
+#~ msgid "Hindi"
+#~ msgstr "北�度文"
+
+#~ msgid "Icelandic"
+#~ msgstr "冰島語"
+
+#~ msgid "Japanese"
+#~ msgstr "日文"
+
+#~ msgid "Korean"
+#~ msgstr "韓文"
+
+#~ msgid "Nordic"
+#~ msgstr "北�語系"
+
+#~ msgid "Persian"
+#~ msgstr "波斯文"
+
+#~ msgid "Romanian"
+#~ msgstr "羅馬尼亞文"
+
+#~ msgid "South European"
+#~ msgstr "��語系"
+
+#~ msgid "Thai"
+#~ msgstr "æ³°æ–‡"
+
+#~ msgid "Turkish"
+#~ msgstr "土耳其文"
+
+#~ msgid "Unicode"
+#~ msgstr "�國碼"
+
+#~ msgid "Western"
+#~ msgstr "西�語系"
+
+#~ msgid "Vietnamese"
+#~ msgstr "越�文"
+
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "編輯連線�數(_E)..."
+
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
+
+#~ msgid "_Cellphone"
+#~ msgstr "手機(_C)"
+
+#~ msgid "_Network (IP, Wi-Fi)"
+#~ msgstr "網路 (IP, Wi-Fi)(_N)"
+
+#~ msgid "Location sources:"
+#~ msgstr "�置來�："
+
+#~ msgid "_New Conversation..."
+#~ msgstr "新增談話(_N)..."
+
+#~ msgid "New _Call..."
+#~ msgstr "新增通話(_C)..."
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "加入�絡人(_A)..."
+
+#~ msgid "_Join..."
+#~ msgstr "�加(_J)..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "加入�絡人(_A)..."
+
 #~ msgid "i"
 #~ msgstr "訊"
 
@@ -4586,9 +4300,6 @@ msgstr "整�你的�時通帳號"
 #~ msgid "_Compact Size"
 #~ msgstr "精簡大�(_C)"
 
-#~ msgid "_Join…"
-#~ msgstr "�加(_J)…"
-
 #~ msgid "_Offline Contacts"
 #~ msgstr "離線連絡人(_O)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 50355dd3a..619be9ffe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,15 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.92\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-28 09:51+0800\n"
-"PO-Revision-Date: 2013-01-28 00:27+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"POT-Creation-Date: 2013-09-04 14:47+0800\n"
+"PO-Revision-Date: 2013-09-04 14:14+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -430,34 +431,10 @@ msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是��將使用者的�置發布給他的連絡人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.h:92
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy �以利用網路來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:93
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy 是�使用網路來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:94
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy �以利用行動電話網路基地臺來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:95
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy 是�使用行動電話網路來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:96
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy �以利用 GPS 來推測�置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:97
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy 是�使用 GPS 來推測�置。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應�低�置的準確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是�基於隱�的�由減低�置的準確度。"
@@ -486,7 +463,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的�與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:259
 msgid "Unknown reason"
 msgstr "�明原因"
 
@@ -506,792 +483,185 @@ msgstr "��的檔案�是正�的檔案"
 msgid "The selected file is empty"
 msgstr "��的檔案是空白的"
 
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
-msgid "Password not found"
-msgstr "找�到密碼"
-
-#: ../libempathy/empathy-keyring.c:594
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "%s 的�時通帳號密碼 (%s)"
-
-#: ../libempathy/empathy-keyring.c:631
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "%2$s 帳號下「%1$s��天室的密碼 (%3$s)"
-
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
 #, c-format
 msgid "Missed call from %s"
 msgstr "�接 %s 的來電"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
 #, c-format
 msgid "Called %s"
 msgstr "已撥打 %s"
 
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
 #, c-format
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-time.c:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d 秒�"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d 分�以�"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d �時以�"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天以�"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d 週�"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d 個月以�"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "未來"
-
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:179
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:181
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:184
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:186
 msgid "Invisible"
 msgstr "隱�"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:188
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:191
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:231
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:233 ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:235 ../libempathy/empathy-utils.c:269
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:237 ../libempathy/empathy-utils.c:271
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:239 ../libempathy/empathy-utils.c:273
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:241
 msgid "Name in use"
 msgstr "使用中的�稱"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:243 ../libempathy/empathy-utils.c:275
 msgid "Certificate not provided"
 msgstr "沒有�供憑證"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:245 ../libempathy/empathy-utils.c:277
 msgid "Certificate untrusted"
 msgstr "憑證�被信任"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:247 ../libempathy/empathy-utils.c:279
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:249 ../libempathy/empathy-utils.c:281
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:251 ../libempathy/empathy-utils.c:283
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機�稱�符"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:253 ../libempathy/empathy-utils.c:285
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔�符"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:255 ../libempathy/empathy-utils.c:287
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:257
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:291
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:295
 msgid "Connection has been refused"
 msgstr "連線�拒"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:297
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:299
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:301
 msgid "This account is already connected to the server"
 msgstr "這個帳號已連接至伺�器"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:303
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相�資�的新連線�代"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:306
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺�器上"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:308
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺�器目��於忙碌以致於無法處�該連線"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:312
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用�安全的密碼演算法，或是密碼處�上較弱"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:315
 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:366
+#: ../libempathy/empathy-utils.c:319
 msgid "Your software is too old"
 msgstr "您的軟體�舊"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:321
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
-msgid "People Nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-utils.c:502
-msgid "Yahoo! Japan"
-msgstr "Yahoo! 日本"
-
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Facebook Chat"
-msgstr "Facebook �天"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 msgid "All accounts"
 msgstr "所有帳號"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "Pass_word"
-msgstr "密碼(_W)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-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: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 "記�密碼"
-
-#: ../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:21
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "_Port"
-msgstr "連接埠(_P)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "_Server"
-msgstr "伺�器(_S)"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Advanced"
-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
-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:7
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
-msgid "Remember Password"
-msgstr "記�密碼"
-
-#: ../libempathy-gtk/empathy-account-widget.c:675
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
-msgid "Account"
-msgstr "帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:676
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Password"
-msgstr "密碼"
-
-#: ../libempathy-gtk/empathy-account-widget.c:677
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget.c:678
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:532
-msgid "Port"
-msgstr "連接埠"
-
-#: ../libempathy-gtk/empathy-account-widget.c:762
-#, c-format
-msgid "%s"
-msgstr "%s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:817
-#, c-format
-msgid "%s:"
-msgstr "%s："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1429
-msgid "Username:"
-msgstr "使用者�稱："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1746
-msgid "A_pply"
-msgstr "套用(_A)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1775
-msgid "L_og in"
-msgstr "登入(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1845
-msgid "This account already exists on the server"
-msgstr "此帳號已經存在這個伺�器上"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1849
-msgid "Create a new account on the server"
-msgstr "在這個伺�器上建立新的帳號"
-
-#. To translators: The first parameter is the login id and the
-#. * second one is the network. The resulting string will be something
-#. * like: "MyUserName on freenode".
-#. * You should reverse the order of these arguments if the
-#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s 上的 %1$s"
-
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2296
-#, c-format
-msgid "%s Account"
-msgstr "%s 帳號"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2300
-msgid "New account"
-msgstr "新增帳號"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D"
-msgstr "登入 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>範例：</b>username"
-
-#: ../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:9
-msgid "What is your GroupWise password?"
-msgstr "您的 GroupWise 密碼是？"
-
-#: ../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:5
-msgid "Ch_aracter set"
-msgstr "字集(_A)"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "您的 ICQ 密碼是？"
-
-#: ../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 "字集"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Add…"
-msgstr "加入…"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:2
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "移除"
-
-#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
-msgid "Up"
-msgstr "往上"
-
-#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Down"
-msgstr "往下"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Servers"
-msgstr "伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr "大多數的 IRC �務�需�密碼，所以若您�確定的話，請��輸入密碼。"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Nickname"
-msgstr "暱稱"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Quit message"
-msgstr "離開訊�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Real name"
-msgstr "真實姓�"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Username"
-msgstr "使用者�稱"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
-msgid "Which IRC network?"
-msgstr "哪個 IRC 網路？"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
-msgid "What is your IRC nickname?"
-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.com/<b>badger</b> 的話，請輸入 <b>badger</b>。\n"
-"如果您還沒有 Facebook 使用者�稱，請使用 <a href=\"http://www.facebook.com/"
-"username/\">此網�</a> 來�用一個。"
-
-#: ../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 ID 是？"
-
-#: ../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 "Override server settings"
-msgstr "覆蓋伺�器設定值"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "Use old SS_L"
-msgstr "使用舊版 SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your Jabber ID?"
-msgstr "您的 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 密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname"
-msgstr "暱稱(_K)"
-
-#: ../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 "E-_mail address"
-msgstr "電�信箱��(_M)"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-msgid "<b>Example:</b> user@hotmail.com"
-msgstr "<b>範例：</b>user@hotmail.com"
-
-#: ../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:9
-msgid "What is your Windows Live password?"
-msgstr "您的 Windows Live 密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "自動"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "註冊"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-msgid "None"
-msgstr "ç„¡"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username"
-msgstr "使用者�稱(_U)"
-
-#: ../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:5
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "使用這個帳號來撥打市話與行動電話(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "NAT Traversal Options"
-msgstr "NAT 傳輸�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "Proxy �項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "雜項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server"
-msgstr "STUN 伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "自動探索 STUN 伺�器"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "探索�定"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "���斷線�項"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism"
-msgstr "機制"
-
-#: ../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 "Transport"
-msgstr "傳輸"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Loose Routing"
-msgstr "寬鬆路由"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Ignore TLS Errors"
-msgstr "忽略 TLS 錯誤"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address"
-msgstr "�域 IP ��"
-
-#: ../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 "What is your SIP account password?"
-msgstr "您的 SIP 帳號密碼是？"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Pass_word:"
-msgstr "密碼(_W)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Yahoo! I_D:"
-msgstr "Yahoo 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:6
-msgid "_Room List locale:"
-msgstr "�天室清單地�資訊(_R)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "字集(_A)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "連接埠(_P)："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "What is your Yahoo! ID?"
-msgstr "您的 Yahoo! ID 是？"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "What is your Yahoo! password?"
-msgstr "您的 Yahoo! 密碼是？"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
-msgid "Couldn't convert image"
-msgstr "無法轉�圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
-msgid "None of the accepted image formats are supported on your system"
-msgstr "您的系統上沒有支�已接�的圖片格�"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
-msgid "Couldn't save picture to file"
-msgstr "無法將圖片儲存至檔案"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
-msgid "Select Your Avatar Image"
-msgstr "�擇您的大頭貼圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
-msgid "Take a picture..."
-msgstr "挑�圖片..."
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
-msgid "No Image"
-msgstr "沒有圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
-msgid "Images"
-msgstr "圖片"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
-msgid "All Files"
-msgstr "所有檔案"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:320
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
 msgid "Authentication failed for account <b>%s</b>"
 msgstr "<b>%s</b> 帳號驗證失敗"
 
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3853
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
 msgid "Retry"
 msgstr "�試"
 
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
 #: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
@@ -1301,94 +671,91 @@ msgstr ""
 "輸入您帳號的密碼\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "��..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "��(_S)"
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
+msgid "Remember password"
+msgstr "記�密碼"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
 msgid "The specified contact doesn't support calls"
 msgstr "指定的�絡人�支�通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
 msgid "The specified contact is offline"
 msgstr "指定的�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
 msgid "The specified contact is not valid"
 msgstr "指定的�絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此�定�支�緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "You don't have enough credit in order to place this call"
 msgstr "您的存��足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:740
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "開啟�人�天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題�被支�"
 
-#: ../libempathy-gtk/empathy-chat.c:804
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "您�被�許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:980
+#: ../libempathy-gtk/empathy-chat.c:973
 msgid "Invalid contact ID"
 msgstr "無效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目�談話的所有訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目�談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <�天室 ID>：�加新的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<�天室 ID>] [<原因>]：離開�天室，�設為目�的�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <�絡人 ID> [<訊�>]：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <�絡人 ID> <訊�>：開啟�人�天"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目�伺�器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊�>：�出一個 ACTION 訊�到目�的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../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 "
@@ -1397,11 +764,11 @@ msgstr ""
 "/say <訊�>：�出 <訊�> 到目�的談話中。這用於傳�以「/�開頭的訊�。舉例來"
 "說：「/say /join 是用來�加新的�天室�"
 
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <�絡人 ID>：顯示�絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1409,126 +776,126 @@ msgstr ""
 "/help [<命令>]：顯示所有支�的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請�見 /help 以�得�用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1551
+#: ../libempathy-gtk/empathy-chat.c:1544
 msgid "insufficient balance to send message"
 msgstr "餘��足以傳�訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1555 ../libempathy-gtk/empathy-chat.c:1569
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1625
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳�訊�「%s�時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1557 ../libempathy-gtk/empathy-chat.c:1574
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1550 ../libempathy-gtk/empathy-chat.c:1567
+#: ../libempathy-gtk/empathy-chat.c:1629
 #, 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:1563
+#: ../libempathy-gtk/empathy-chat.c:1556
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘��足以傳�訊�。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1596
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "permission denied"
 msgstr "權�被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "too long message"
 msgstr "太長的訊�"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1615
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1619
 msgid "unknown"
 msgstr "�明"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1686 ../src/empathy-chat-window.c:971
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1703
 #, 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:1715
+#: ../libempathy-gtk/empathy-chat.c:1708
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2299
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2336
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s�至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2406
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "�入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2424
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:815
 msgid "_Send"
 msgstr "傳�(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "無法�得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2835
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1536,12 +903,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:2842
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2845
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1549,17 +916,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:2853
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2856
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑�單"
 
-#: ../libempathy-gtk/empathy-chat.c:2860
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此�天室"
@@ -1569,17 +936,17 @@ msgstr "%s 已經離開此�天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2869
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經�加此�天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �在被稱為 %s"
@@ -1587,50 +954,50 @@ msgstr "%s �在被稱為 %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:3106 ../src/empathy-call-window.c:1537
-#: ../src/empathy-call-window.c:1587 ../src/empathy-call-window.c:2662
-#: ../src/empathy-call-window.c:2968 ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1524
+#: ../src/empathy-call-window.c:1574 ../src/empathy-call-window.c:2653
+#: ../src/empathy-call-window.c:2960 ../src/empathy-event-manager.c:1171
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "您想�儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "記�"
 
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "�在��"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請�試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "此�天室已被密碼�護："
 
-#: ../libempathy-gtk/empathy-chat.c:4014
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "�加"
 
-#: ../libempathy-gtk/empathy-chat.c:4206 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1192
 msgid "Connected"
 msgstr "�功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4266
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1661,8 +1028,8 @@ msgstr "編輯�鎖的�絡人"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1539
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1672,120 +1039,63 @@ msgstr "帳號："
 msgid "Blocked Contacts"
 msgstr "被�鎖的�絡人"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
-msgid "Full name"
-msgstr "全�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
-msgid "Phone number"
-msgstr "電話號碼"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "E-mail address"
-msgstr "電�信箱��"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Website"
-msgstr "網站"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-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:111
-msgid "Last seen:"
-msgstr "上次看見："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
-msgid "Server:"
-msgstr "伺�器："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-msgid "Connected from:"
-msgstr "已連接從："
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
-msgid "Away message:"
-msgstr "離開訊�："
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
-msgid "work"
-msgstr "工作"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
-msgid "home"
-msgstr "�家"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-msgid "mobile"
-msgstr "行動"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-msgid "voice"
-msgstr "�音"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-msgid "preferred"
-msgstr "�好"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-msgid "postal"
-msgstr "郵�"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-msgid "parcel"
-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 "移除"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "�尋連絡人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "�尋："
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "加入�絡人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "找�到�絡人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "這個帳號�支�連絡人�尋"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "您的訊�"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "當您上線時請讓我知�。感��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:954
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:956
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1012
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:318
+msgid "Account"
+msgstr "帳號"
+
 #. Identifier to connect to Instant Messaging network
-#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
 msgid "Identifier"
 msgstr "識別身分"
 
-#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
 msgid "Alias"
 msgstr "別�"
 
@@ -1819,129 +1129,134 @@ msgstr "版本"
 msgid "Client"
 msgstr "用戶端"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:318
 msgid "Groups"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "請�擇這個連絡人�顯�在哪個群組。注�您�以�擇一個以上的群組或��擇群組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
 #, c-format
 msgid "Block %s?"
 msgstr "�鎖 %s？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
 msgstr "您確定想��鎖「%s�讓他無法�與您�絡嗎？"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "下列識別身分將被�鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "下列識別身分無法被�鎖："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
 msgid "_Block"
 msgstr "�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "回報這些�絡人濫用帳號(_R)"
 
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
 msgid "Linked Contacts"
 msgstr "連��絡群"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
 msgid "gnome-contacts not installed"
 msgstr "gnome-contacts 尚未安�"
 
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
 msgid "Please install gnome-contacts to access contacts details."
 msgstr "請安� gnome-contacts 來存��絡人細節。"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:177
+#: ../libempathy-gtk/empathy-individual-menu.c:178
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:356
 msgid "Select account to use to place the call"
 msgstr "���用來放置通話的帳號"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:360
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:425
 msgid "Mobile"
 msgstr "行動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:427
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:429
 msgid "HOME"
 msgstr "�家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:672
 msgid "_Block Contact"
 msgstr "�鎖�絡人(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "從群組「%s�移除(_G)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:748
 msgid "Delete and _Block"
 msgstr "刪除並�鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:836
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是�想�移除連絡人「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:796
+#: ../libempathy-gtk/empathy-individual-menu.c:845
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1950,218 +1265,219 @@ msgstr ""
 "您真的想�移除連��絡人「%s�嗎？請注�這會移除所有構�此連��絡群的�絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:807
+#: ../libempathy-gtk/empathy-individual-menu.c:856
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:932
+#: ../libempathy-gtk/empathy-individual-view.c:2442
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1234
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1351
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "�天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1269
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1390
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1302
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1464
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1506
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "�往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1405
+#: ../libempathy-gtk/empathy-individual-menu.c:1538
 msgid "Send File"
 msgstr "傳�檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1572
 msgid "Share My Desktop"
 msgstr "分享我的桌�"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1461
-#: ../libempathy-gtk/empathy-individual-widget.c:1366
+#: ../libempathy-gtk/empathy-individual-menu.c:1599
+#: ../libempathy-gtk/empathy-individual-widget.c:1422
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1628
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1677
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1655
-#: ../src/empathy-chat-window.c:1245
+#: ../libempathy-gtk/empathy-individual-menu.c:1793
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "邀請您到這個�天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1839
 msgid "_Invite to Chat Room"
 msgstr "邀請到�天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:2035
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "加入�絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是�想�移除群組「%s�？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "正在移除群組"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Re_name"
 msgstr "�新命�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:360
 msgid "Channels:"
 msgstr "頻�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "State:"
 msgstr "�/州："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Area:"
 msgstr "�域："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Postal Code:"
 msgstr "郵��號："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Floor:"
 msgstr "樓："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Description:"
 msgstr "�述："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:535
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:537
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:539
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:541
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:543
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:545
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:547
 msgid "Bearing:"
 msgstr "方�："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:549
 msgid "Climb Speed:"
 msgstr "爬�速度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:551
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:553
 msgid "Longitude:"
 msgstr "經度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:555
 msgid "Latitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:557
 msgid "Altitude:"
 msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:39
+#: ../libempathy-gtk/empathy-individual-widget.c:649
+#: ../libempathy-gtk/empathy-individual-widget.c:664
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "�置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:666
 #, c-format
 msgid "%s, %s"
 msgstr "%s，%s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:715
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y %B %e æ–¼ %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
 msgid "Alias:"
 msgstr "別�："
 
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 msgid "Identifier:"
 msgstr "識別身分："
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#: ../libempathy-gtk/empathy-individual-widget.c:1706
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2175,32 +1491,7 @@ msgstr "<b>�置</b> 於 (日期)"
 msgid "Online from a phone or mobile device"
 msgstr "從手機或行動�置上線"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "新增網路"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
-msgid "Choose an IRC network"
-msgstr "�擇 IRC 網路"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
-msgid "Reset _Networks List"
-msgstr "�設網路清單(_N)"
-
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:635
-msgctxt "verb displayed on a button to select an IRC network"
-msgid "Select"
-msgstr "��"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "新增伺�器"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
-msgid "SSL"
-msgstr "SSL"
-
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:82
 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 "
@@ -2209,11 +1500,11 @@ msgstr ""
 "Empathy �以自動探索與您一�連線到相�網路上的人們，並且和他們�天。如果您想"
 "使用此功能，請檢查下列詳細資料是�正確。"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:102
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
 msgid ""
 "You can change these details later or disable this feature by choosing <span "
 "style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2221,133 +1512,133 @@ msgstr ""
 "您�以�候變更這些細節，或藉由�擇「�絡人清單�中的 <span style=\"italic\">"
 "編輯 → 帳號</span> �用這個功能。"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:630
 msgid "History"
 msgstr "歷�"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:685
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Search"
 msgstr "�尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1158
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1160
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s �天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1351
+#: ../libempathy-gtk/empathy-log-window.c:1210
+#: ../libempathy-gtk/empathy-log-window.c:1354
 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:1292
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, 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:1298
+#: ../libempathy-gtk/empathy-log-window.c:1303
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1375
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分�"
 
-#: ../libempathy-gtk/empathy-log-window.c:1390
+#: ../libempathy-gtk/empathy-log-window.c:1393
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，��於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1728
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1740
+#: ../libempathy-gtk/empathy-log-window.c:1743
 msgid "%e %B %Y"
 msgstr "%Yå¹´%B%eæ—¥"
 
-#: ../libempathy-gtk/empathy-log-window.c:1844
-#: ../libempathy-gtk/empathy-log-window.c:3467
+#: ../libempathy-gtk/empathy-log-window.c:1847
+#: ../libempathy-gtk/empathy-log-window.c:3470
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1946
+#: ../libempathy-gtk/empathy-log-window.c:2405
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2718
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2927
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Text chats"
 msgstr "文字�天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3048
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3052
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3053
 msgid "Outgoing calls"
 msgstr "撥出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3054
 msgid "Missed calls"
 msgstr "�接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3074
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3763
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "您確定�刪除�往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3764
+#: ../libempathy-gtk/empathy-log-window.c:3767
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3774
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2356,12 +1647,12 @@ msgid "_File"
 msgstr "檔案(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
+msgid "Delete All History…"
 msgstr "刪除所有歷�..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
@@ -2369,7 +1660,7 @@ msgid "Profile"
 msgstr "個人檔案"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "�天"
 
@@ -2383,112 +1674,116 @@ msgid "page 2"
 msgstr "�� 2"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "<span size=\"x-large\">Loading...</span>"
+msgid "<span size=\"x-large\">Loading…</span>"
 msgstr "<span size=\"x-large\">正在載入...</span>"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
 msgid "What kind of chat account do you have?"
 msgstr "您的�天帳號是哪一種？"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
 msgstr "新增帳號"
 
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入�絡人辨識身份或電話號碼："
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
 msgid "New Call"
 msgstr "新增通話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "�絡人已經離線"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的�絡人無效或未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "該�絡人�支�這類談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "請求的功能尚未在此�定中實作"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "無法啟動與給定�絡人的談話"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "您被此頻���"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "此頻�已滿"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "您必須被邀請�能�加此頻�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "斷線時無法處�"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "許�被拒絕"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 msgid "New Conversation"
 msgstr "新增談話"
 
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "需�密碼"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "自訂訊�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "編輯自訂訊�…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "按這裡將這個狀態從喜好中移除"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "按這裡將這個狀態設為喜好"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2497,25 +1792,16 @@ msgstr ""
 "<b>目�訊�：%s</b>\n"
 "<small><i>按下 Enter 設定新訊�，或按下 Esc �消。</i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "設定狀態"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 msgid "Custom messages…"
 msgstr "自訂訊�…"
 
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
-#, c-format
-msgid "New %s account"
-msgstr "新增 %s 帳號"
-
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:239
 msgid "_Match case"
 msgstr "比�大�寫(_M)"
 
@@ -2539,391 +1825,220 @@ msgstr "比�大�寫(_C)"
 msgid "Phrase not found"
 msgstr "找�到詞彙"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "收到�時訊�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "傳��時訊�"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "收到�天�求"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "連絡人已連線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "連絡人已斷線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "連接到伺�器"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "與伺�器斷線"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "收到語音通話"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "撥出語音通話"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "語音通話��"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
 msgid "Subscription Request"
 msgstr "訂閱�求"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1109
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想�得到查看您是�上線的許�"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:723
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
 msgid "_Accept"
 msgstr "接�(_A)"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1219
+#: ../libempathy-gtk/empathy-theme-adium.c:1217
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊�編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1921
+#: ../libempathy-gtk/empathy-theme-adium.c:1919
 msgid "Normal"
 msgstr "一般"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "�天伺�器所�供的識別身分無法通�驗證。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "該憑證並�由憑證授權中心所簽署。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "憑證已逾期。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "憑證尚未啟用。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "憑證並未�有�期的指紋。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "憑證所驗證的主機�稱與伺�器�稱�符。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "憑證為自我簽署。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "憑證已被原本發出的憑證授權機構撤銷。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "憑證於密碼防護上較弱。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "憑證長度超出�驗證的範�。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "憑證格��良。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "�期的憑證主機�稱：%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "憑證主機�稱：%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "繼續(_O)"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "未�信任的連線"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未�信任。您無論如何都�繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "請記�此�擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "憑證詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:685
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "Select a file"
 msgstr "�擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:883
 msgid "Insufficient free space to save file"
 msgstr "空間�足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:891
 #, 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:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:937
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
-msgid "Go online to edit your personal information."
-msgstr "上線以編輯您的個人資訊。"
-
-#: ../libempathy-gtk/empathy-user-info.c:464
-msgid "<b>Personal Details</b>"
-msgstr "<b>個人詳細資料</b>"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
 msgid "_Copy Link Address"
 msgstr "複製連���(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:291
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
 msgid "_Open Link"
 msgstr "開啟連�(_O)"
 
 #. Inspector
-#: ../libempathy-gtk/empathy-webkit-utils.c:305
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
 msgid "Inspect HTML"
 msgstr "審閱 HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "目�的地�資訊"
-
-#: ../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 "阿拉伯文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "阿美尼亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "波羅的海語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "塞爾特語系"
-
-#: ../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 "中�語系"
-
-#: ../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 "簡體中文"
-
-#: ../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 "正體中文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "克羅埃西亞文"
-
-#: ../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 "斯拉夫語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "斯拉夫語系/俄文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫文/�克蘭語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "喬治亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "希臘文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "��拉特文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "�魯穆奇文字"
-
-#: ../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 "希伯來文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "希伯來文(左至�)"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "北�度文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "冰島語"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "日文"
-
-#: ../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 "韓文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "北�語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "波斯文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "羅馬尼亞文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "��語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "æ³°æ–‡"
-
-#: ../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 "土耳其文"
-
-#: ../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 "�國碼"
-
-#: ../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 "西�語系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "越�文"
-
-#: ../libempathy-gtk/empathy-roster-model.h:29
+#: ../libempathy-gtk/empathy-roster-model.h:27
 msgid "Top Contacts"
 msgstr "常用連絡人"
 
-#: ../libempathy-gtk/empathy-roster-model.h:31
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
 msgid "Ungrouped"
 msgstr "未群組"
 
 #. Add a prefix explaining that something goes wrong when trying to
 #. * fetch contact's presence.
-#: ../libempathy-gtk/empathy-roster-contact.c:205
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, c-format
 msgid "Server cannot find contact: %s"
 msgstr "伺�器找�到�絡人：%s"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
 msgid "No error message"
 msgstr "沒有錯誤訊�"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
 msgid "Instant Message (Empathy)"
 msgstr "�時通訊 (Empathy)"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2934,7 +2049,7 @@ msgstr ""
 "的 GNU 通用公共許�證�款 (GNU General Public License) 第二版來修改和�新發布"
 "這一程�，或者自由�擇使用任何更新的版本。"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2944,7 +2059,7 @@ msgstr ""
 "發布 Empathy 的目的是希望它有用，但沒有任何擔�。甚至沒有��特定目的而隱�的"
 "擔�。更詳細的情�請�閱 GNU 通用公共許�證。"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -2954,11 +2069,11 @@ msgstr ""
 "給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME 的�時訊�用戶端程�"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "如�翻譯有任何�見，請�一�電�郵件給\n"
@@ -2970,67 +2085,67 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "��顯示任何�話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "��顯示任何�話窗，除��有「附近的人�帳號"
 
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "�始��所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "有與您的 %.50s 帳號相關的修改尚未儲存。"
 
 #. 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:72
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1279
+#: ../src/empathy-accounts-dialog.c:385 ../src/empathy-call-window.c:1266
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:426
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:438
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:449
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:456
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:473
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3039,28 +2154,28 @@ msgstr ""
 "這個帳已經�用，因為它需��舊����支�的後端程�。請安� telepathy-haze "
 "並�新啟動您的作業階段來�移帳號資料。"
 
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:483
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已�用"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:589
 msgid "Edit Connection Parameters"
 msgstr "編輯連線�數"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "_Edit Connection Parameters..."
-msgstr "編輯連線�數(_E)..."
+#: ../src/empathy-accounts-dialog.c:716
+msgid "_Edit Connection Parameters…"
+msgstr "編輯連線�數(_E)…"
 
-#: ../src/empathy-accounts-dialog.c:1268
+#: ../src/empathy-accounts-dialog.c:1246
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "是�想�從您的電腦上移除群組 %s？"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "是�想�從您的電腦上移除 %.50s？"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1250
 msgid "This will not remove your account on the server."
 msgstr "這�會移除伺�器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1477
+#: ../src/empathy-accounts-dialog.c:1455
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3069,24 +2184,24 @@ msgstr ""
 "您所�的變更。確定�繼續？"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1646
 msgid "_Enabled"
 msgstr "已啟用(_E)"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1669
 msgid "Rename"
 msgstr "�新命�"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2071
 msgid "_Skip"
 msgstr "略�(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2075
 msgid "_Connect"
 msgstr "連接(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2290
+#: ../src/empathy-accounts-dialog.c:2254
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3095,10 +2210,14 @@ msgstr ""
 "您所�的變更。確定�繼續？"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2398
 msgid "Messaging and VoIP Accounts"
 msgstr "訊�與 VoIP 帳號"
 
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "加入…"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Import…"
 msgstr "匯入(_I)…"
@@ -3117,31 +2236,31 @@ msgstr "�加入新的帳號，您必須先安��個會用到的通訊�定
 msgid "No protocol backends installed"
 msgstr "尚未安�通訊�定後端程�"
 
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr "- Empathy �證用戶端"
 
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy �證用戶端"
 
-#: ../src/empathy.c:427
+#: ../src/empathy.c:408
 msgid "Don't connect on startup"
 msgstr "啟動時��自動連線"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:412
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時�顯示連絡人清單或任何其他�話窗"
 
-#: ../src/empathy.c:447
+#: ../src/empathy.c:441
 msgid "- Empathy IM Client"
 msgstr "- Empathy �時通用戶端"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:627
 msgid "Error contacting the Account Manager"
 msgstr "�絡帳號管�程�時發生錯誤"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:629
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3153,7 +2272,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:116
 msgid "In a call"
 msgstr "通話中"
 
@@ -3165,128 +2284,128 @@ msgstr "- Empathy 音訊視訊用戶端"
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視訊用戶端"
 
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛撥打給您，但您正與他人通話。"
 
-#: ../src/empathy-call-window.c:1554 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1541 ../src/empathy-event-manager.c:502
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視訊通話"
 
-#: ../src/empathy-call-window.c:1560 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1547 ../src/empathy-event-manager.c:510
+#: ../src/empathy-event-manager.c:907
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-call-window.c:1564
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-notifications-approver.c:191
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-call-window.c:1565
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer"
 msgstr "接�"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1922
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2174
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP ��"
 
-#: ../src/empathy-call-window.c:2188
+#: ../src/empathy-call-window.c:2176
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網際網路上的伺�器看見的 IP ��"
 
-#: ../src/empathy-call-window.c:2190
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP ��"
 
-#: ../src/empathy-call-window.c:2192
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address of a relay server"
 msgstr "中繼伺�器的 IP ��"
 
-#: ../src/empathy-call-window.c:2194
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the multicast group"
 msgstr "多點廣播群組的 IP ��"
 
-#: ../src/empathy-call-window.c:2605 ../src/empathy-call-window.c:2606
-#: ../src/empathy-call-window.c:2607 ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2596 ../src/empathy-call-window.c:2597
+#: ../src/empathy-call-window.c:2598 ../src/empathy-call-window.c:2599
 #: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2958
 msgid "On hold"
 msgstr "�留"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2962
 msgid "Mute"
 msgstr "�音"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2964
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2967
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3063
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3102
 #, 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:3115
+#: ../src/empathy-call-window.c:3107
 #, 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:3121
+#: ../src/empathy-call-window.c:3113
 #, 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:3127
+#: ../src/empathy-call-window.c:3119
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
-#: ../src/empathy-call-window.c:3131
+#: ../src/empathy-call-window.c:3123
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的音訊格�尚未在您的電腦上安�"
 
-#: ../src/empathy-call-window.c:3134
+#: ../src/empathy-call-window.c:3126
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必�的視訊格�尚未在您的電腦上安�"
 
-#: ../src/empathy-call-window.c:3146
+#: ../src/empathy-call-window.c:3138
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3296,32 +2415,32 @@ msgstr ""
 "在 Telepathy 元件中發生未�期的狀�。請<a href=\"%s\">回報這個錯誤</a>並附上"
 "從求助�單內的「除錯�視窗中所收集的紀錄。"
 
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3147
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-call-window.c:3158
+#: ../src/empathy-call-window.c:3150
 msgid "The end of the stream was reached"
 msgstr "已�串�末端"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3190
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串�"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3200
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串�"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3237
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您目�的餘�為 %s。"
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3241
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，您的存��足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3251
+#: ../src/empathy-call-window.c:3243
 msgid "Top Up"
 msgstr "加值"
 
@@ -3345,11 +2464,11 @@ msgstr "設定值(_S)"
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "內容(_C)"
 
@@ -3437,19 +2556,19 @@ msgstr "本機候�："
 msgid "Audio"
 msgstr "音訊"
 
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
 msgid "- Empathy Chat Client"
 msgstr "- Empathy �天用戶端"
 
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:244
 msgid "Name"
 msgstr "�稱"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:262
 msgid "Room"
 msgstr "�天室"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:270
 msgid "Auto-Connect"
 msgstr "自動連線"
 
@@ -3457,18 +2576,18 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管�喜好的�天室"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:279
 msgid "Close this window?"
 msgstr "�關閉這個視窗？"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:285
 #, 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:306
+#: ../src/empathy-chat-window.c:298
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3479,60 +2598,60 @@ msgid_plural ""
 msgstr[0] ""
 "關閉此視窗會離開 %u 個�天室。您將無法接收到之後的訊�，除�您�次�與。"
 
-#: ../src/empathy-chat-window.c:317
+#: ../src/empathy-chat-window.c:309
 #, c-format
 msgid "Leave %s?"
 msgstr "離開 %s？"
 
-#: ../src/empathy-chat-window.c:319
+#: ../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:338
+#: ../src/empathy-chat-window.c:330
 msgid "Close window"
 msgstr "關閉視窗"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:330
 msgid "Leave room"
 msgstr "離開�天室"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:669 ../src/empathy-chat-window.c:692
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:692
+#: ../src/empathy-chat-window.c:684
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與其他 %u 個)"
 
-#: ../src/empathy-chat-window.c:708
+#: ../src/empathy-chat-window.c:700
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:717
+#: ../src/empathy-chat-window.c:709
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:954
+#: ../src/empathy-chat-window.c:946
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:954
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳� %d 個訊�"
 
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:974
 msgid "Typing a message."
 msgstr "正在輸入訊�。"
 
@@ -3565,106 +2684,114 @@ msgid "Invite _Participant…"
 msgstr "邀請�與(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "�加�天(_J)"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "離開�天(_A)"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "連絡人(_O)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "分�(_T)"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "上個分�(_P)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "下個分�(_N)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "復原關閉的分�(_U)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "將分�左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "將分��移(_R)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "分離分�(_D)"
 
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
 msgid "Show a particular service"
 msgstr "顯示特定�務"
 
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
 msgid "- Empathy Debugger"
 msgstr "- Empathy 除錯器"
 
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程�"
 
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1590
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1650
 msgid "Pastebin link"
 msgstr "Pastebin 連�"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1659
 msgid "Pastebin response"
 msgstr "Pastebin 回應"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1666
 msgid "Data too large for a single paste. Please save logs to file."
 msgstr "�於單一貼上來說資料��大。請儲存紀錄至檔案。"
 
-#: ../src/empathy-debug-window.c:1857
+#: ../src/empathy-debug-window.c:1848
 msgid "Debug Window"
 msgstr "�錯視窗"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1908
 msgid "Send to pastebin"
 msgstr "傳�至 pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1952
 msgid "Pause"
 msgstr "暫�"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1964
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1983
 msgid "Debug"
 msgstr "�錯"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1988
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1993 ../src/empathy-debug-window.c:2068
 msgid "Message"
 msgstr "訊�"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1998
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2003
 msgid "Critical"
 msgstr "嚴�"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2008
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2021
 msgid ""
 "Even if they don't display passwords, logs can contain sensitive information "
 "such as your list of contacts or the messages you recently sent or "
@@ -3680,92 +2807,92 @@ msgstr ""
 "bugzilla.gnome.org/enter_bug.cgi?product=empathy\">回報臭蟲</a>時點開「Show "
 "Advanced Fields�，並�擇將您的臭蟲報告僅�給 Empathy 開發者觀看。"
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2053
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2056
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2059
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2062
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2091
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "��的連線管�程��支��端�錯擴充功能。"
 
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:502
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:506
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s �與您進行視訊通話。您是��接�？"
 
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s �與您進行通話。您是��接�？"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:535
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:543 ../src/empathy-event-manager.c:551
 msgid "_Answer"
 msgstr "接�(_A)"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:551
 msgid "_Answer with video"
 msgstr "以視訊接�(_A)"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "�天室邀請"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您�加 %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "�加(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您�加 %s"
 
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀請�加 %s"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:950
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:227
+#: ../src/empathy-event-manager.c:978 ../src/empathy-roster-window.c:213
 msgid "Password required"
 msgstr "需�密碼"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1115
 #, c-format
 msgid ""
 "\n"
@@ -3775,105 +2902,105 @@ msgstr ""
 "訊�：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "�明"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ–¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "從 %2$s 接收「%1$s�時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "接收檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "傳�「%s�給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "傳�檔案時發生錯誤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s�傳�給 %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他�與者的回應"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "正在檢查檔案「%s�的完整性"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s�雜湊值"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -3885,59 +3012,59 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完��已�消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "匯入(_I)"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找�到�匯入的帳號。Empathy 目��支�從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:298
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:307
 msgid "Protocol"
 msgstr "通訊�定"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:331
 msgid "Source"
 msgstr "來�"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite Participant"
 msgstr "邀請�與"
 
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
 msgid "Choose a contact to invite into the conversation:"
 msgstr "�擇想�邀請進入談話的�絡人："
 
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:186
 msgid "Chat Room"
 msgstr "�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:201
 msgid "Members"
 msgstr "�員"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:402
 msgid "Failed to list rooms"
 msgstr "無法列出�天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3950,17 +3077,17 @@ msgstr ""
 "需�密碼：%s\n"
 "�員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "No"
 msgstr "�"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "�加�天室"
 
@@ -3999,104 +3126,104 @@ msgstr "無法載入�天室清單"
 msgid "Room List"
 msgstr "�天室清單"
 
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
 msgid "Answer with video"
 msgstr "以視訊接�"
 
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
 msgid "Accept"
 msgstr "接�"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
 msgid "Provide"
 msgstr "�供"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:137
 msgid "Message received"
 msgstr "訊�已收到"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:138
 msgid "Message sent"
 msgstr "訊�已�出"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:139
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:140
 msgid "Contact comes online"
 msgstr "連絡人上線"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes offline"
 msgstr "連絡人離線"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:142
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:143
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:374
 msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:625
 msgid "Juliet"
 msgstr "�英�"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:632
 msgid "Romeo"
 msgstr "�山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:638
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與��墜，為何�能夫妻�？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:642
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是�媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:645
 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:660
+#: ../src/empathy-preferences.c:648
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，�難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:651
 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:666
+#: ../src/empathy-preferences.c:654
 msgid "Juliet has disconnected"
 msgstr "�英�已斷線"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1020
 msgid "Preferences"
 msgstr "�好設定"
 
@@ -4108,7 +3235,7 @@ msgstr "顯示群組"
 msgid "Show account balances"
 msgstr "顯示帳號餘�"
 
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2241
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2264
 msgid "Contact List"
 msgstr "連絡人清單"
 
@@ -4229,58 +3356,42 @@ msgstr "�低�置準確度(_R)"
 msgid "Privacy"
 msgstr "隱�"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
-
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Cellphone"
-msgstr "手機(_C)"
-
-#: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "網路 (IP, Wi-Fi)(_N)"
-
-#: ../src/empathy-preferences.ui.h:38
-msgid "Location sources:"
-msgstr "�置來�："
-
-#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單��映出您已經安�字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "為語言啟用拼字檢查："
 
-#: ../src/empathy-preferences.ui.h:42
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:43
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "�天佈景主題(_E):"
 
-#: ../src/empathy-preferences.ui.h:44
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "樣�："
 
-#: ../src/empathy-preferences.ui.h:45
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:230
 msgid "Provide Password"
 msgstr "�供密碼"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:236
 msgid "Disconnect"
 msgstr "æ–·ç·š"
 
 #: ../src/empathy-roster-window.c:493
-msgid "You need to setup an account to see contacts here."
+msgid "You need to set up an account to see contacts here."
 msgstr "您需�設置一個帳號�能在這裡查看�絡人。"
 
 #: ../src/empathy-roster-window.c:569
@@ -4292,6 +3403,10 @@ msgstr "很抱歉，%s 帳號無法使用，除�您的 %s 軟體已更新。"
 msgid "Windows Live"
 msgstr "Windows Live"
 
+#: ../src/empathy-roster-window.c:672
+msgid "Google Talk"
+msgstr "Google Talk"
+
 #: ../src/empathy-roster-window.c:674
 msgid "Facebook"
 msgstr "Facebook"
@@ -4307,7 +3422,7 @@ msgid "Online Accounts"
 msgstr "線上帳號"
 
 #: ../src/empathy-roster-window.c:747
-msgid "Update software..."
+msgid "Update software…"
 msgstr "更新軟體..."
 
 #: ../src/empathy-roster-window.c:753
@@ -4353,23 +3468,25 @@ msgid "No online contacts"
 msgstr "無上線連絡人"
 
 #: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "_New Conversation..."
-msgstr "新增談話(_N)..."
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新增談話(_N)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "New _Call..."
-msgstr "新增通話(_C)..."
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新增通話(_C)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Contacts"
 msgstr "連絡人"
 
 #: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "_Add Contacts..."
-msgstr "加入�絡人(_A)..."
+msgid "_Add Contacts…"
+msgstr "加入�絡人(_A)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "_Search for Contacts..."
+msgid "_Search for Contacts…"
 msgstr "�尋�絡人(_S)..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
@@ -4381,8 +3498,8 @@ msgid "_Rooms"
 msgstr "�天室(_R)"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "_Join..."
-msgstr "�加(_J)..."
+msgid "_Join…"
+msgstr "�加(_J)…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Join _Favorites"
@@ -4429,28 +3546,16 @@ msgstr "上線(_O)"
 msgid "Show _Offline Contacts"
 msgstr "顯示離線連絡人(_O)"
 
-#: ../src/empathy-roster-window.ui.h:4
-msgid "_Add Contact..."
-msgstr "加入�絡人(_A)..."
-
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "新增談話(_N)…"
-
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "新增通話(_C)…"
-
 #: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "狀態"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:177
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
 #: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
 msgid "Done"
 msgstr "完�"
 
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:208
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
 msgid "Please enter your account details"
 msgstr "請輸入您的帳號詳細資料"
 
@@ -4463,6 +3568,614 @@ msgstr "編輯 %s 帳號�項"
 msgid "Integrate your IM accounts"
 msgstr "整�您的�時通帳號"
 
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy �以利用網路來推測�置"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "Empathy 是�使用網路來推測�置。"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "Empathy �以利用行動電話網路基地臺來推測�置"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "Empathy 是�使用行動電話網路來推測�置。"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy �以利用 GPS 來推測�置"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "Empathy 是�使用 GPS 來推測�置。"
+
+#~ msgid "Password not found"
+#~ msgstr "找�到密碼"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "%s 的�時通帳號密碼 (%s)"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "%2$s 帳號下「%1$s��天室的密碼 (%3$s)"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "%d 秒�"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d 分�以�"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d �時以�"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天以�"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d 週�"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "%d 個月以�"
+
+#~ msgid "in the future"
+#~ msgstr "未來"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! 日本"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Facebook �天"
+
+#~ msgid "Pass_word"
+#~ msgstr "密碼(_W)"
+
+#~ msgid "Screen _Name"
+#~ msgstr "螢幕�稱(_N)"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>範例：</b>MyScreenName"
+
+#~ msgid "_Port"
+#~ msgstr "連接埠(_P)"
+
+#~ msgid "_Server"
+#~ msgstr "伺�器(_S)"
+
+#~ msgid "Advanced"
+#~ msgstr "進階"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "您的 AIM 螢幕�稱是？"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "您的 AIM 密碼是？"
+
+#~ msgid "Remember Password"
+#~ msgstr "記�密碼"
+
+#~ msgid "Password"
+#~ msgstr "密碼"
+
+#~ msgid "Server"
+#~ msgstr "伺�器"
+
+#~ msgid "Port"
+#~ msgstr "連接埠"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s："
+
+#~ msgid "Username:"
+#~ msgstr "使用者�稱："
+
+#~ msgid "A_pply"
+#~ msgstr "套用(_A)"
+
+#~ msgid "L_og in"
+#~ msgstr "登入(_O)"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "此帳號已經存在這個伺�器上"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "在這個伺�器上建立新的帳號"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%2$s 上的 %1$s"
+
+#~ msgid "%s Account"
+#~ msgstr "%s 帳號"
+
+#~ msgid "New account"
+#~ msgstr "新增帳號"
+
+#~ msgid "Login I_D"
+#~ msgstr "登入 I_D"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>範例：</b>username"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "您的 GroupWise 使用者 ID 是？"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "您的 GroupWise 密碼是？"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "ICQ _UIN"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>範例：</b>123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "字集(_A)"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "您的 ICQ UIN 是？"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "您的 ICQ 密碼是？"
+
+#~ msgid "Network"
+#~ msgstr "網路"
+
+#~ msgid "Character set"
+#~ msgstr "字集"
+
+#~ msgid "Up"
+#~ msgstr "往上"
+
+#~ msgid "Down"
+#~ msgstr "往下"
+
+#~ msgid "Servers"
+#~ msgstr "伺�器"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr "大多數的 IRC �務�需�密碼，所以若您�確定的話，請��輸入密碼。"
+
+#~ msgid "Nickname"
+#~ msgstr "暱稱"
+
+#~ msgid "Quit message"
+#~ msgstr "離開訊�"
+
+#~ msgid "Real name"
+#~ msgstr "真實姓�"
+
+#~ msgid "Username"
+#~ msgstr "使用者�稱"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "哪個 IRC 網路？"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "您的 IRC 暱稱是？"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "您的 Facebook 使用者�稱是？"
+
+#~ 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.com/<b>badger</b> 的話，請輸入 <b>badger</b>。\n"
+#~ "如果您還沒有 Facebook 使用者�稱，請使用 <a href=\"http://www.facebook."
+#~ "com/username/\">此網�</a> 來�用一個。"
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "您的 Facebook 密碼是？"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "您的 Google ID 是？"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>範例：</b>user@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "您的 Google 密碼是？"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>範例：</b>user@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "忽略 SSL 憑證錯誤(_G)"
+
+#~ msgid "Priori_ty"
+#~ msgstr "優先權(_T)"
+
+#~ msgid "Reso_urce"
+#~ msgstr "資�(_U)"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "�求加密 (TLS/SSL)(_Y)"
+
+#~ msgid "Override server settings"
+#~ msgstr "覆蓋伺�器設定值"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "使用舊版 SS_L"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "您的 Jabber ID 是？"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "您想�的 Jabber ID 是？"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "您的 Jabber 密碼是？"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "您想�的 Jabber 密碼是？"
+
+#~ msgid "Nic_kname"
+#~ msgstr "暱稱(_K)"
+
+#~ msgid "_Last Name"
+#~ msgstr "姓(_L)"
+
+#~ msgid "_First Name"
+#~ msgstr "�(_F)"
+
+#~ msgid "_Published Name"
+#~ msgstr "發布的�稱(_P)"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID"
+
+#~ msgid "E-_mail address"
+#~ msgstr "電�信箱��(_M)"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>範例：</b>user@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "您的 Windows Live ID 是？"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "您的 Windows Live 密碼是？"
+
+#~ msgid "Auto"
+#~ msgstr "自動"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "註冊"
+
+#~ msgid "Options"
+#~ msgstr "�項"
+
+#~ msgid "None"
+#~ msgstr "ç„¡"
+
+#~ msgid "_Username"
+#~ msgstr "使用者�稱(_U)"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>範例：</b>user@my.sip.server"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr "使用這個帳號來撥打市話與行動電話(_L)"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "NAT 傳輸�項"
+
+#~ msgid "Proxy Options"
+#~ msgstr "Proxy �項"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "雜項"
+
+#~ msgid "STUN Server"
+#~ msgstr "STUN 伺�器"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "自動探索 STUN 伺�器"
+
+#~ msgid "Discover Binding"
+#~ msgstr "探索�定"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "���斷線�項"
+
+#~ msgid "Mechanism"
+#~ msgstr "機制"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "間隔 (秒)"
+
+#~ msgid "Authentication username"
+#~ msgstr "�證使用者�稱"
+
+#~ msgid "Transport"
+#~ msgstr "傳輸"
+
+#~ msgid "Loose Routing"
+#~ msgstr "寬鬆路由"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "忽略 TLS 錯誤"
+
+#~ msgid "Local IP Address"
+#~ msgstr "�域 IP ��"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "您想�的 SIP 登入 ID 是？"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "您的 SIP 帳號密碼是？"
+
+#~ msgid "Pass_word:"
+#~ msgstr "密碼(_W)："
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "Yahoo I_D："
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "忽略會議與�天室邀請(_G)"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "�天室清單地�資訊(_R)："
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "字集(_A)："
+
+#~ msgid "_Port:"
+#~ msgstr "連接埠(_P)："
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "您的 Yahoo! ID 是？"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "您的 Yahoo! 密碼是？"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "無法轉�圖片"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "您的系統上沒有支�已接�的圖片格�"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "無法將圖片儲存至檔案"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "�擇您的大頭貼圖片"
+
+#~ msgid "Take a picture..."
+#~ msgstr "挑�圖片..."
+
+#~ msgid "No Image"
+#~ msgstr "沒有圖片"
+
+#~ msgid "Images"
+#~ msgstr "圖片"
+
+#~ msgid "All Files"
+#~ msgstr "所有檔案"
+
+#~ msgid "Select..."
+#~ msgstr "��..."
+
+#~ msgid "_Select"
+#~ msgstr "��(_S)"
+
+#~ msgid "Full name"
+#~ msgstr "全�"
+
+#~ msgid "Phone number"
+#~ msgstr "電話號碼"
+
+#~ msgid "E-mail address"
+#~ msgstr "電�信箱��"
+
+#~ msgid "Website"
+#~ msgstr "網站"
+
+#~ msgid "Birthday"
+#~ msgstr "生日"
+
+#~ msgid "Last seen:"
+#~ msgstr "上次看見："
+
+#~ msgid "Server:"
+#~ msgstr "伺�器："
+
+#~ msgid "Connected from:"
+#~ msgstr "已連接從："
+
+#~ msgid "Away message:"
+#~ msgstr "離開訊�："
+
+#~ msgid "work"
+#~ msgstr "工作"
+
+#~ msgid "home"
+#~ msgstr "�家"
+
+#~ msgid "mobile"
+#~ msgstr "行動"
+
+#~ msgid "voice"
+#~ msgstr "�音"
+
+#~ msgid "preferred"
+#~ msgstr "�好"
+
+#~ msgid "postal"
+#~ msgstr "郵�"
+
+#~ msgid "parcel"
+#~ msgstr "包裹"
+
+#~ msgid "New Network"
+#~ msgstr "新增網路"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "�擇 IRC 網路"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "�設網路清單(_N)"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "��"
+
+#~ msgid "new server"
+#~ msgstr "新增伺�器"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "新增 %s 帳號"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "上線以編輯您的個人資訊。"
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>個人詳細資料</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "目�的地�資訊"
+
+#~ msgid "Arabic"
+#~ msgstr "阿拉伯文"
+
+#~ msgid "Armenian"
+#~ msgstr "阿美尼亞文"
+
+#~ msgid "Baltic"
+#~ msgstr "波羅的海語系"
+
+#~ msgid "Celtic"
+#~ msgstr "塞爾特語系"
+
+#~ msgid "Central European"
+#~ msgstr "中�語系"
+
+#~ msgid "Chinese Simplified"
+#~ msgstr "簡體中文"
+
+#~ msgid "Chinese Traditional"
+#~ msgstr "正體中文"
+
+#~ msgid "Croatian"
+#~ msgstr "克羅埃西亞文"
+
+#~ msgid "Cyrillic"
+#~ msgstr "斯拉夫語系"
+
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "斯拉夫語系/俄文"
+
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "斯拉夫文/�克蘭語系"
+
+#~ msgid "Georgian"
+#~ msgstr "喬治亞文"
+
+#~ msgid "Greek"
+#~ msgstr "希臘文"
+
+#~ msgid "Gujarati"
+#~ msgstr "��拉特文"
+
+#~ msgid "Gurmukhi"
+#~ msgstr "�魯穆奇文字"
+
+#~ msgid "Hebrew"
+#~ msgstr "希伯來文"
+
+#~ msgid "Hebrew Visual"
+#~ msgstr "希伯來文(左至�)"
+
+#~ msgid "Hindi"
+#~ msgstr "北�度文"
+
+#~ msgid "Icelandic"
+#~ msgstr "冰島語"
+
+#~ msgid "Japanese"
+#~ msgstr "日文"
+
+#~ msgid "Korean"
+#~ msgstr "韓文"
+
+#~ msgid "Nordic"
+#~ msgstr "北�語系"
+
+#~ msgid "Persian"
+#~ msgstr "波斯文"
+
+#~ msgid "Romanian"
+#~ msgstr "羅馬尼亞文"
+
+#~ msgid "South European"
+#~ msgstr "��語系"
+
+#~ msgid "Thai"
+#~ msgstr "æ³°æ–‡"
+
+#~ msgid "Turkish"
+#~ msgstr "土耳其文"
+
+#~ msgid "Unicode"
+#~ msgstr "�國碼"
+
+#~ msgid "Western"
+#~ msgstr "西�語系"
+
+#~ msgid "Vietnamese"
+#~ msgstr "越�文"
+
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "編輯連線�數(_E)..."
+
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
+
+#~ msgid "_Cellphone"
+#~ msgstr "手機(_C)"
+
+#~ msgid "_Network (IP, Wi-Fi)"
+#~ msgstr "網路 (IP, Wi-Fi)(_N)"
+
+#~ msgid "Location sources:"
+#~ msgstr "�置來�："
+
+#~ msgid "_New Conversation..."
+#~ msgstr "新增談話(_N)..."
+
+#~ msgid "New _Call..."
+#~ msgstr "新增通話(_C)..."
+
+#~ msgid "_Add Contacts..."
+#~ msgstr "加入�絡人(_A)..."
+
+#~ msgid "_Join..."
+#~ msgstr "�加(_J)..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "加入�絡人(_A)..."
+
 #~ msgid "i"
 #~ msgstr "訊"
 
@@ -4626,9 +4339,6 @@ msgstr "整�您的�時通帳號"
 #~ msgid "_Compact Size"
 #~ msgstr "精簡大�(_C)"
 
-#~ msgid "_Join…"
-#~ msgstr "�加(_J)…"
-
 #~ msgid "_Offline Contacts"
 #~ msgstr "離線連絡人(_O)"
 
diff --git a/release.py b/release.py
index 1ef6da9b8..160650ed1 100755
--- a/release.py
+++ b/release.py
@@ -9,7 +9,7 @@ import time
 from string import Template
 from optparse import OptionParser
 
-last_tag_pattern = 'EMPATHY_3_8*'
+last_tag_pattern = 'EMPATHY_3_9*'
 upload_server = 'master.gnome.org'
 template = '''\
 $name $version is now available for download from:
diff --git a/src/Makefile.am b/src/Makefile.am
index b52e9ad8f..e7644774e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,13 @@ include $(top_srcdir)/tools/flymake.mk
 
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy-gtk			\
+	-I$(top_srcdir)/libempathy			\
+	-I$(top_srcdir)/extensions			\
+	-I$(top_builddir)/libempathy-gtk		\
+	-I$(top_builddir)/libempathy			\
 	-DG_LOG_DOMAIN=\"empathy\"			\
 	-DBIN_DIR=\"$(bindir)\"                         \
 	$(DISABLE_DEPRECATED)				\
@@ -23,6 +28,7 @@ LDADD =								\
 	$(top_builddir)/extensions/libemp-extensions.la		\
 	$(GCR_LIBS) 						\
 	$(EMPATHY_LIBS)						\
+	$(TPAW_LIBS)						\
 	$(LIBCHAMPLAIN_LIBS)					\
 	$(UOA_LIBS)						\
 	$(NULL)
@@ -203,14 +209,10 @@ BUILT_SOURCES = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
-		--sourcedir=$(srcdir) \
-		--generate-source \
-		$<
-
-empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml)
-	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \
-		--sourcedir=$(srcdir) \
-		--generate-header \
-		$<
+chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml)
+
+empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c
index 2480d7569..bd6b2f866 100644
--- a/src/empathy-about-dialog.c
+++ b/src/empathy-about-dialog.c
@@ -23,11 +23,10 @@
  */
 
 #include "config.h"
+#include "empathy-about-dialog.h"
 
 #include <glib/gi18n.h>
 
-#include "empathy-about-dialog.h"
-
 #define WEB_SITE "http://live.gnome.org/Empathy"
 
 static const char *authors[] = {
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 537b43e3d..772e6868e 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -25,14 +25,12 @@
  */
 
 #include "config.h"
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-accounts-common.h"
+
 #include "empathy-accounts-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 gboolean
 empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index 39d094d22..1cb24d7dd 100644
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -22,6 +22,10 @@
 #ifndef __EMPATHY_ACCOUNTS_COMMON_H__
 #define __EMPATHY_ACCOUNTS_COMMON_H__
 
+#include <telepathy-glib/telepathy-glib.h>
+
+G_BEGIN_DECLS
+
 gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager);
 
 gboolean empathy_accounts_has_accounts (TpAccountManager *manager);
@@ -30,4 +34,6 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager,
     TpAccount *account,
     GApplication *app);
 
+G_END_DECLS
+
 #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index abb4e0ca8..83f1334cb 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -25,25 +25,26 @@
  */
 
 #include "config.h"
+#include "empathy-accounts-dialog.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-pkg-kit.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-account-widget-sip.h>
-#include <libempathy-gtk/empathy-user-info.h>
-#include <libempathy-gtk/empathy-local-xmpp-assistant-widget.h>
-#include <libempathy-gtk/empathy-new-account-dialog.h>
+#include <tp-account-widgets/tpaw-account-widget.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-user-info.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
 #include "empathy-import-dialog.h"
 #include "empathy-import-utils.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
@@ -51,7 +52,7 @@
 /* The primary text of the dialog shown to the user when he is about to lose
  * unsaved changes */
 #define PENDING_CHANGES_QUESTION_PRIMARY_TEXT \
-  _("There are unsaved modifications to your %s account.")
+  _("There are unsaved modifications to your %.50s account.")
 /* The primary text of the dialog shown to the user when he is about to lose
  * an unsaved new account */
 #define UNSAVED_NEW_ACCOUNT_QUESTION_PRIMARY_TEXT \
@@ -95,28 +96,28 @@ typedef struct {
   GtkWidget *spinner;
   gboolean loading;
 
-  /* We have to keep a weak reference on the actual EmpathyAccountWidget, not
+  /* We have to keep a weak reference on the actual TpawAccountWidget, not
    * just its GtkWidget. It is the only reliable source we can query to know if
    * there are any unsaved changes to the currently selected account. We can't
    * look at the account settings because it does not contain everything that
-   * can be changed using the EmpathyAccountWidget. For instance, it does not
+   * can be changed using the TpawAccountWidget. For instance, it does not
    * contain the state of the "Enabled" checkbox.
    *
    * Even if we create it ourself, we just get a weak ref and not a strong one
-   * as EmpathyAccountWidget unrefs itself when the GtkWidget is destroyed.
+   * as TpawAccountWidget unrefs itself when the GtkWidget is destroyed.
    * That's kinda ugly; cf bgo #640417.
    *
    * */
-  EmpathyAccountWidget *setting_widget;
+  TpawAccountWidget *setting_widget;
 
   gboolean  connecting_show;
   guint connecting_id;
 
   gulong  settings_ready_id;
-  EmpathyAccountSettings *settings_ready;
+  TpawAccountSettings *settings_ready;
 
   TpAccountManager *account_manager;
-  EmpathyConnectionManagers *cms;
+  TpawConnectionManagers *cms;
   GNetworkMonitor *connectivity;
 
   GtkWindow *parent_window;
@@ -145,13 +146,13 @@ enum {
   PROP_PARENT = 1
 };
 
-static EmpathyAccountSettings * accounts_dialog_model_get_selected_settings (
+static TpawAccountSettings * accounts_dialog_model_get_selected_settings (
     EmpathyAccountsDialog *dialog);
 
 static void accounts_dialog_model_select_first (EmpathyAccountsDialog *dialog);
 
 static void accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings);
+    TpawAccountSettings *settings);
 
 static void accounts_dialog_model_set_selected (EmpathyAccountsDialog *dialog,
     TpAccount *account);
@@ -178,19 +179,6 @@ static gboolean accounts_dialog_has_pending_change (
     EmpathyAccountsDialog *dialog, TpAccount **account);
 
 static void
-accounts_dialog_update_name_label (EmpathyAccountsDialog *dialog,
-    const gchar *display_name)
-{
-  gchar *text;
-  EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-
-  text = g_markup_printf_escaped ("<b>%s</b>", display_name);
-  gtk_label_set_markup (GTK_LABEL (priv->label_name), text);
-
-  g_free (text);
-}
-
-static void
 accounts_dialog_status_infobar_set_message (EmpathyAccountsDialog *dialog,
     const gchar *message)
 {
@@ -227,7 +215,7 @@ accounts_dialog_enable_account_cb (GObject *object,
     {
       am = tp_account_manager_dup ();
 
-      empathy_connect_new_account (account, am);
+      tpaw_connect_new_account (account, am);
       g_object_unref (am);
     }
 }
@@ -245,7 +233,7 @@ accounts_dialog_enable_switch_active_cb (GtkSwitch *sw,
     GParamSpec *spec,
     EmpathyAccountsDialog *dialog)
 {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   TpAccount *account;
   gboolean enable;
 
@@ -253,7 +241,7 @@ accounts_dialog_enable_switch_active_cb (GtkSwitch *sw,
   if (settings == NULL)
     return;
 
-  account = empathy_account_settings_get_account (settings);
+  account = tpaw_account_settings_get_account (settings);
   if (account == NULL)
     return;
 
@@ -339,6 +327,8 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
 
   if (account != NULL)
     {
+      gchar *text;
+
       status = tp_account_get_connection_status (account, &reason);
       presence = tp_account_get_current_presence (account, NULL, &status_message);
       account_enabled = tp_account_is_enabled (account);
@@ -358,6 +348,11 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
         presence = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
 
       display_switch = account_can_be_enabled (account);
+
+      text = g_markup_printf_escaped ("<b>%.50s</b>",
+          tp_account_get_display_name (account));
+      gtk_label_set_markup (GTK_LABEL (priv->label_name), text);
+      g_free (text);
     }
   else
     {
@@ -512,7 +507,7 @@ empathy_account_dialog_cancel (EmpathyAccountsDialog *dialog)
   GtkTreeModel *model;
   GtkTreeSelection *selection;
   GtkTreeIter iter;
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   TpAccount *account;
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
@@ -526,7 +521,7 @@ empathy_account_dialog_cancel (EmpathyAccountsDialog *dialog)
       COL_ACCOUNT_SETTINGS, &settings,
       COL_ACCOUNT, &account, -1);
 
-  empathy_account_widget_discard_pending_changes (priv->setting_widget);
+  tpaw_account_widget_discard_pending_changes (priv->setting_widget);
 
   if (account == NULL)
     {
@@ -552,7 +547,7 @@ empathy_account_dialog_cancel (EmpathyAccountsDialog *dialog)
 
 static void
 empathy_account_dialog_widget_cancelled_cb (
-    EmpathyAccountWidget *widget_object,
+    TpawAccountWidget *widget_object,
     EmpathyAccountsDialog *dialog)
 {
   empathy_account_dialog_cancel (dialog);
@@ -584,7 +579,7 @@ static void
 account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
 {
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   GtkWidget *subdialog, *content_area, *align;
 
   settings = accounts_dialog_model_get_selected_settings (dialog);
@@ -598,14 +593,14 @@ account_dialog_create_edit_params_dialog (EmpathyAccountsDialog *dialog)
 
   gtk_window_set_resizable (GTK_WINDOW (subdialog), FALSE);
 
-  priv->setting_widget = (EmpathyAccountWidget *)
-    empathy_account_widget_new_for_protocol (settings, FALSE);
+  priv->setting_widget = (TpawAccountWidget *)
+    tpaw_account_widget_new_for_protocol (settings, NULL, FALSE);
 
   g_object_add_weak_pointer (G_OBJECT (priv->setting_widget),
       (gpointer *) &priv->setting_widget);
 
   if (accounts_dialog_has_valid_accounts (dialog))
-    empathy_account_widget_set_other_accounts_exist (
+    tpaw_account_widget_set_other_accounts_exist (
         priv->setting_widget, TRUE);
 
   g_signal_connect (priv->setting_widget, "cancelled",
@@ -663,7 +658,7 @@ static void
 account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
     GtkButton *button)
 {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   TpAccount *account;
   TpStorageRestrictionFlags storage_restrictions;
 
@@ -671,7 +666,7 @@ account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
   if (settings == NULL)
     return;
 
-  account = empathy_account_settings_get_account (settings);
+  account = tpaw_account_settings_get_account (settings);
   g_return_if_fail (account != NULL);
 
   storage_restrictions = tp_account_get_storage_restrictions (account);
@@ -691,7 +686,7 @@ account_dialow_show_edit_params_dialog (EmpathyAccountsDialog *dialog,
 
 static void
 account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings)
+    TpawAccountSettings *settings)
 {
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
   const gchar *icon_name;
@@ -699,7 +694,7 @@ account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
   GtkWidget *bbox, *button;
   GtkWidget *alig;
 
-  account = empathy_account_settings_get_account (settings);
+  account = tpaw_account_settings_get_account (settings);
 
   priv->dialog_content = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (priv->alignment_settings),
@@ -707,7 +702,7 @@ account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
   gtk_widget_show (priv->dialog_content);
 
   alig = gtk_alignment_new (0.5, 0, 1, 1);
-  priv->user_info = empathy_user_info_new (account);
+  priv->user_info = tpaw_user_info_new (account);
   gtk_container_add (GTK_CONTAINER (alig), priv->user_info);
   gtk_box_pack_start (GTK_BOX (priv->dialog_content), alig, TRUE, TRUE, 0);
   gtk_widget_show (alig);
@@ -718,13 +713,13 @@ account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
   gtk_box_pack_end (GTK_BOX (priv->dialog_content), bbox, FALSE, TRUE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters..."));
+  button = gtk_button_new_with_mnemonic (_("_Edit Connection Parameters…"));
   gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, TRUE, 0);
   gtk_widget_show (button);
   g_signal_connect_swapped (button, "clicked",
       G_CALLBACK (account_dialow_show_edit_params_dialog), dialog);
 
-  icon_name = empathy_account_settings_get_icon_name (settings);
+  icon_name = tpaw_account_settings_get_icon_name (settings);
 
   if (!gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
           icon_name))
@@ -736,22 +731,19 @@ account_dialog_create_dialog_content (EmpathyAccountsDialog *dialog,
   gtk_image_set_from_icon_name (GTK_IMAGE (priv->image_type),
       icon_name, GTK_ICON_SIZE_DIALOG);
   gtk_widget_set_tooltip_text (priv->image_type,
-      empathy_protocol_name_to_display_name
-      (empathy_account_settings_get_protocol (settings)));
+      tpaw_protocol_name_to_display_name
+      (tpaw_account_settings_get_protocol (settings)));
   gtk_widget_show (priv->image_type);
 
-  accounts_dialog_update_name_label (dialog,
-      empathy_account_settings_get_display_name (settings));
-
   accounts_dialog_update_status_infobar (dialog, account);
 }
 
 static void
-account_dialog_settings_ready_cb (EmpathyAccountSettings *settings,
+account_dialog_settings_ready_cb (TpawAccountSettings *settings,
     GParamSpec *spec,
     EmpathyAccountsDialog *dialog)
 {
-  if (empathy_account_settings_is_ready (settings))
+  if (tpaw_account_settings_is_ready (settings))
     account_dialog_create_dialog_content (dialog, settings);
 }
 
@@ -794,7 +786,7 @@ accounts_dialog_has_pending_change (EmpathyAccountsDialog *dialog,
     gtk_tree_model_get (model, &iter, COL_ACCOUNT, account, -1);
 
   return priv->setting_widget != NULL
-      && empathy_account_widget_contains_pending_changes (
+      && tpaw_account_widget_contains_pending_changes (
           priv->setting_widget);
 }
 
@@ -868,7 +860,7 @@ accounts_dialog_button_add_clicked_cb (GtkWidget *button,
 
   if (response == GTK_RESPONSE_APPLY)
     {
-      EmpathyAccountSettings *settings;
+      TpawAccountSettings *settings;
       TpAccount *account;
 
       settings = empathy_new_account_dialog_get_settings (
@@ -877,7 +869,7 @@ accounts_dialog_button_add_clicked_cb (GtkWidget *button,
       /* 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);
+      account = tpaw_account_settings_get_account (settings);
       accounts_dialog_model_set_selected (self, account);
     }
 
@@ -886,7 +878,7 @@ accounts_dialog_button_add_clicked_cb (GtkWidget *button,
 
 static void
 accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
-    EmpathyAccountSettings *settings)
+    TpawAccountSettings *settings)
 {
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
@@ -934,7 +926,7 @@ accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
 
   if (priv->user_info != NULL)
     {
-      empathy_user_info_apply_async ((EmpathyUserInfo *) priv->user_info,
+      tpaw_user_info_apply_async ((TpawUserInfo *) priv->user_info,
           NULL, NULL);
       priv->user_info = NULL;
     }
@@ -944,7 +936,7 @@ accounts_dialog_update_settings (EmpathyAccountsDialog *dialog,
       priv->dialog_content = NULL;
     }
 
-  if (empathy_account_settings_is_ready (settings))
+  if (tpaw_account_settings_is_ready (settings))
     {
       account_dialog_create_dialog_content (dialog, settings);
     }
@@ -1032,7 +1024,7 @@ ensure_icon (EmpathyAccountsDialog *self,
   pixbuf = g_hash_table_lookup (priv->icons_cache, icon_name);
   if (pixbuf == NULL)
     {
-      pixbuf = empathy_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+      pixbuf = tpaw_pixbuf_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
 
       if (pixbuf == NULL)
         return NULL;
@@ -1078,7 +1070,7 @@ accounts_dialog_model_protocol_pixbuf_data_func (GtkTreeViewColumn *tree_column,
     GtkTreeIter *iter,
     EmpathyAccountsDialog *dialog)
 {
-  EmpathyAccountSettings  *settings;
+  TpawAccountSettings  *settings;
   gchar              *icon_name;
   GdkPixbuf          *pixbuf;
   TpConnectionStatus  status;
@@ -1088,7 +1080,7 @@ accounts_dialog_model_protocol_pixbuf_data_func (GtkTreeViewColumn *tree_column,
       COL_ACCOUNT_SETTINGS, &settings,
       -1);
 
-  icon_name = empathy_account_settings_get_icon_name (settings);
+  icon_name = tpaw_account_settings_get_icon_name (settings);
   pixbuf = ensure_icon (dialog, icon_name);
 
   g_object_set (cell,
@@ -1150,7 +1142,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText *renderer,
     gchar *new_text,
     EmpathyAccountsDialog *dialog)
 {
-  EmpathyAccountSettings    *settings;
+  TpawAccountSettings    *settings;
   GtkTreeModel *model;
   GtkTreePath  *treepath;
   GtkTreeIter   iter;
@@ -1177,7 +1169,7 @@ accounts_dialog_name_edited_cb (GtkCellRendererText *renderer,
       -1);
   gtk_tree_path_free (treepath);
 
-  empathy_account_settings_set_display_name_async (settings, new_text,
+  tpaw_account_settings_set_display_name_async (settings, new_text,
       NULL, NULL);
   g_object_set (settings, "display-name-overridden", TRUE, NULL);
   g_object_unref (settings);
@@ -1251,7 +1243,7 @@ accounts_dialog_remove_account_iter (EmpathyAccountsDialog *dialog,
     }
 
   question_dialog_primary_text = g_strdup_printf (
-      _("Do you want to remove %s from your computer?"),
+      _("Do you want to remove %.50s from your computer?"),
       tp_account_get_display_name (account));
 
   accounts_dialog_show_question_dialog (dialog, question_dialog_primary_text,
@@ -1335,14 +1327,14 @@ accounts_dialog_model_add_columns (EmpathyAccountsDialog *dialog)
   g_object_set (priv->name_renderer, "ypad", 4, NULL);
 }
 
-static EmpathyAccountSettings *
+static TpawAccountSettings *
 accounts_dialog_model_get_selected_settings (EmpathyAccountsDialog *dialog)
 {
   GtkTreeView      *view;
   GtkTreeModel     *model;
   GtkTreeSelection *selection;
   GtkTreeIter       iter;
-  EmpathyAccountSettings   *settings;
+  TpawAccountSettings   *settings;
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
   view = GTK_TREE_VIEW (priv->treeview);
@@ -1362,7 +1354,7 @@ accounts_dialog_model_selection_changed (GtkTreeSelection *selection,
     EmpathyAccountsDialog *dialog)
 {
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   GtkTreeModel *model;
   GtkTreeIter   iter;
   gboolean      is_selection;
@@ -1406,7 +1398,7 @@ accounts_dialog_selection_change_response_cb (GtkDialog *message_dialog,
         GtkTreeSelection *selection;
 
         priv->force_change_row = TRUE;
-        empathy_account_widget_discard_pending_changes (
+        tpaw_account_widget_discard_pending_changes (
             priv->setting_widget);
 
         path = gtk_tree_row_reference_get_path (priv->destination_row);
@@ -1492,7 +1484,7 @@ accounts_dialog_model_setup (EmpathyAccountsDialog *dialog)
       G_TYPE_STRING,         /* name */
       G_TYPE_UINT,           /* status */
       TP_TYPE_ACCOUNT,   /* account */
-      EMPATHY_TYPE_ACCOUNT_SETTINGS); /* settings */
+      TPAW_TYPE_ACCOUNT_SETTINGS); /* settings */
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (priv->treeview),
       GTK_TREE_MODEL (store));
@@ -1698,7 +1690,7 @@ finally:
 static void
 reload_account_widget (EmpathyAccountsDialog *self)
 {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
 
   settings = accounts_dialog_model_get_selected_settings (self);
   accounts_dialog_update_settings (self, settings);
@@ -1786,35 +1778,21 @@ accounts_dialog_presence_changed_cb (TpAccount *account,
 static void
 accounts_dialog_account_display_name_changed_cb (TpAccount *account,
   GParamSpec *pspec,
-  gpointer user_data)
+  EmpathyAccountsDialog *dialog)
 {
-  const gchar *display_name;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-  EmpathyAccountSettings *settings;
-  TpAccount *selected_account;
-  EmpathyAccountsDialog *dialog = EMPATHY_ACCOUNTS_DIALOG (user_data);
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
+  GtkTreeModel *model;
+  GtkTreeIter iter;
 
-  display_name = tp_account_get_display_name (account);
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->treeview));
-  settings = accounts_dialog_model_get_selected_settings (dialog);
-  if (settings == NULL)
-    return;
-
-  selected_account = empathy_account_settings_get_account (settings);
-
   if (accounts_dialog_get_account_iter (dialog, account, &iter))
     {
       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-          COL_NAME, display_name,
+          COL_NAME, tp_account_get_display_name (account),
           -1);
     }
 
-  if (selected_account == account)
-    accounts_dialog_update_name_label (dialog, display_name);
-
-  g_object_unref (settings);
+  accounts_dialog_update_status_infobar (dialog, account);
 }
 
 static void
@@ -1855,7 +1833,7 @@ static void
 accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
     TpAccount *account)
 {
-  EmpathyAccountSettings *settings;
+  TpawAccountSettings *settings;
   GtkTreeModel       *model;
   GtkTreeIter         iter;
   TpConnectionStatus  status;
@@ -1868,7 +1846,7 @@ accounts_dialog_add_account (EmpathyAccountsDialog *dialog,
   status = tp_account_get_connection_status (account, NULL);
   name = tp_account_get_display_name (account);
 
-  settings = empathy_account_settings_new_for_account (account);
+  settings = tpaw_account_settings_new_for_account (account);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
 
@@ -1947,7 +1925,7 @@ accounts_dialog_accounts_model_row_inserted_cb (GtkTreeModel *model,
   if (priv->setting_widget != NULL &&
       accounts_dialog_has_valid_accounts (dialog))
     {
-      empathy_account_widget_set_other_accounts_exist (
+      tpaw_account_widget_set_other_accounts_exist (
           priv->setting_widget, TRUE);
     }
 }
@@ -1962,7 +1940,7 @@ accounts_dialog_accounts_model_row_deleted_cb (GtkTreeModel *model,
   if (priv->setting_widget != NULL &&
       !accounts_dialog_has_valid_accounts (dialog))
     {
-      empathy_account_widget_set_other_accounts_exist (
+      tpaw_account_widget_set_other_accounts_exist (
           priv->setting_widget, FALSE);
     }
 }
@@ -2175,11 +2153,11 @@ accounts_dialog_cms_prepare_cb (GObject *source,
     GAsyncResult *result,
     gpointer user_data)
 {
-  EmpathyConnectionManagers *cms = EMPATHY_CONNECTION_MANAGERS (source);
+  TpawConnectionManagers *cms = TPAW_CONNECTION_MANAGERS (source);
   EmpathyAccountsDialog *dialog = user_data;
   EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
 
-  if (!empathy_connection_managers_prepare_finish (cms, result, NULL))
+  if (!tpaw_connection_managers_prepare_finish (cms, result, NULL))
     goto out;
 
   /* No need to update the settings if we are already preparing one */
@@ -2224,9 +2202,9 @@ accounts_dialog_accounts_setup (EmpathyAccountsDialog *dialog)
     }
   g_list_free_full (accounts, g_object_unref);
 
-  priv->cms = empathy_connection_managers_dup_singleton ();
+  priv->cms = tpaw_connection_managers_dup_singleton ();
 
-  empathy_connection_managers_prepare_async (priv->cms,
+  tpaw_connection_managers_prepare_async (priv->cms,
       accounts_dialog_cms_prepare_cb, dialog);
 
   accounts_dialog_model_select_first (dialog);
@@ -2307,7 +2285,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
 
   filename = empathy_file_lookup ("empathy-accounts-dialog.ui", "src");
 
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "accounts_dialog_hbox", &top_hbox,
       "vbox_details", &priv->vbox_details,
       "alignment_settings", &priv->alignment_settings,
@@ -2323,7 +2301,7 @@ accounts_dialog_build_ui (EmpathyAccountsDialog *dialog)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, dialog,
+  tpaw_builder_connect (gui, dialog,
       "button_add", "clicked", accounts_dialog_button_add_clicked_cb,
       "button_remove", "clicked", accounts_dialog_button_remove_clicked_cb,
       "button_import", "clicked", accounts_dialog_button_import_clicked_cb,
@@ -2454,7 +2432,7 @@ do_dispose (GObject *obj)
 
   if (priv->user_info != NULL)
     {
-      empathy_user_info_apply_async ((EmpathyUserInfo *) priv->user_info,
+      tpaw_user_info_apply_async ((TpawUserInfo *) priv->user_info,
           NULL, NULL);
       priv->user_info = NULL;
     }
@@ -2606,7 +2584,7 @@ empathy_accounts_dialog_show (GtkWindow *parent,
 
   if (selected_account)
     {
-      if (priv->cms != NULL && empathy_connection_managers_is_ready (priv->cms))
+      if (priv->cms != NULL && tpaw_connection_managers_is_ready (priv->cms))
         accounts_dialog_set_selected_account (dialog, selected_account);
       else
         /* save the selection to set it later when the cms
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index d436fed04..070cd02e9 100644
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -25,7 +25,6 @@
 #define __EMPATHY_ACCOUNTS_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 90d7947e9..88923681b 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "empathy-accounts.h"
 
 #include <glib/gi18n.h>
 
@@ -32,13 +33,12 @@
 #include <cheese-gtk.h>
 #endif
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-accounts-common.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
 
@@ -136,12 +136,12 @@ out:
   g_application_release (app);
 }
 
-static int
-app_command_line_cb (GApplication *app,
-    GApplicationCommandLine *cmdline)
+static void
+app_activate (GApplication *app)
 {
   TpAccountManager *account_manager;
 
+  empathy_gtk_init ();
   account_manager = tp_account_manager_dup ();
 
   /* Hold the application while preparing the AM */
@@ -151,8 +151,6 @@ app_command_line_cb (GApplication *app,
     account_manager_ready_for_accounts_cb, app);
 
   g_object_unref (account_manager);
-
-  return 0;
 }
 
 static gboolean
@@ -163,7 +161,7 @@ local_cmdline (GApplication *app,
   gint i;
   gchar **argv;
   gint argc = 0;
-  gboolean retval = FALSE;
+  gboolean retval = TRUE;
   GError *error = NULL;
 
   GOptionContext *optcontext;
@@ -186,7 +184,7 @@ local_cmdline (GApplication *app,
   };
 
   optcontext = g_option_context_new (N_("- Empathy Accounts"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
@@ -199,9 +197,22 @@ local_cmdline (GApplication *app,
       g_print ("%s\nRun '%s --help' to see a full list of available command line options.\n",
           error->message, argv[0]);
       g_warning ("Error in empathy init: %s", error->message);
+      g_clear_error (&error);
 
       *exit_status = EXIT_FAILURE;
-      retval = TRUE;
+    }
+  else
+    {
+      if (g_application_register (app, NULL, &error))
+        {
+          g_application_activate (app);
+        }
+      else
+        {
+          g_warning("Impossible to register empathy-application: %s", error->message);
+          g_clear_error (&error);
+          *exit_status = EXIT_FAILURE;
+        }
     }
 
   g_option_context_free (optcontext);
@@ -225,22 +236,16 @@ main (int argc, char *argv[])
 
   empathy_init ();
 
-  gtk_init (&argc, &argv);
-  empathy_gtk_init ();
-
   g_set_application_name (_("Empathy Accounts"));
 
   /* Make empathy and empathy-accounts appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
   gtk_window_set_default_icon_name ("empathy");
 
-  app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME,
-      G_APPLICATION_HANDLES_COMMAND_LINE);
+  app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
   app_class = G_OBJECT_GET_CLASS (app);
   G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline;
-
-  g_signal_connect (app, "command-line", G_CALLBACK (app_command_line_cb),
-      NULL);
+  G_APPLICATION_CLASS (app_class)->activate = app_activate;
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);
 
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 0c3693b6f..985a1fa36 100644
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-audio-sink.h"
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
@@ -27,10 +28,9 @@
 #endif
 
 #include "empathy-audio-utils.h"
-#include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
 
diff --git a/src/empathy-audio-sink.h b/src/empathy-audio-sink.h
index ceb0bbe36..85b576c42 100644
--- a/src/empathy-audio-sink.h
+++ b/src/empathy-audio-sink.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SINK_H__
 #define __EMPATHY_GST_AUDIO_SINK_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index fe62a6c4b..fcca6621d 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -19,6 +19,9 @@
  */
 
 #include "config.h"
+#include "empathy-audio-src.h"
+
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
@@ -26,14 +29,12 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
-#include <libempathy/empathy-utils.h>
 #include "empathy-audio-utils.h"
-
-#include "empathy-audio-src.h"
 #include "empathy-mic-monitor.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
 
@@ -624,7 +625,7 @@ empathy_audio_src_change_microphone_finish (EmpathyGstAudioSrc *src,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (src,
+  tpaw_implement_finish_void (src,
       empathy_audio_src_change_microphone_async);
 }
 
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index ef87c44c4..2d1a6960d 100644
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SRC_H__
 #define __EMPATHY_GST_AUDIO_SRC_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 #include <gio/gio.h>
 
diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c
index 323ef8edf..f7a00378f 100644
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -19,15 +19,14 @@
  */
 
 #include "config.h"
+#include "empathy-audio-utils.h"
 
 #include <pulse/pulseaudio.h>
 
-#include "empathy-audio-utils.h"
-
-#include <libempathy/empathy-gsettings.h>
+#include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 void
 empathy_audio_set_stream_properties (GstElement *element,
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index f1d42b74c..be5b13a0b 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -22,21 +22,19 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
+#include <gnutls/gnutls.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-auth-factory.h>
-#include <libempathy/empathy-server-tls-handler.h>
-#include <libempathy/empathy-tls-verifier.h>
-
-#include <libempathy-gtk/empathy-bad-password-dialog.h>
-#include <libempathy-gtk/empathy-password-dialog.h>
-#include <libempathy-gtk/empathy-tls-dialog.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "empathy-auth-factory.h"
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
 #include "empathy-sanity-cleaning.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-tls-verifier.h"
+#include "empathy-ui-utils.h"
 
-#include <gnutls/gnutls.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_TLS
+#include "empathy-debug.h"
 
 #define TIMEOUT 60
 
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index dbd5ecf77..71ec4d63c 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -19,15 +19,14 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-request-util.h>
+#include "empathy-client-factory.h"
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
+#include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 
@@ -133,7 +132,7 @@ empathy_call_factory_class_init (EmpathyCallFactoryClass *klass)
       NULL, NULL,
       g_cclosure_marshal_generic,
       G_TYPE_NONE,
-      2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
+      2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_UINT64);
 
   signals[INCOMING_CALL] =
     g_signal_new ("incoming-call",
@@ -216,7 +215,7 @@ handle_channels (TpBaseClient *client,
       handler = empathy_call_handler_new_for_channel (call, contact);
 
       g_signal_emit (self, signals[NEW_CALL_HANDLER], 0,
-          handler, FALSE);
+          handler, user_action_time);
 
       g_object_unref (handler);
       g_object_unref (contact);
diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index 174fbf4bd..b913d8e57 100644
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_CALL_FACTORY_H__
 #define __EMPATHY_CALL_FACTORY_H__
 
-#include <glib-object.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index b1d4f2977..1c4939af1 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -19,17 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-call-handler.h"
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-call-utils.h>
-
-#include "empathy-call-handler.h"
+#include "empathy-call-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
 
diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 36c6cfdc2..5050d801e 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -21,14 +21,10 @@
 #ifndef __EMPATHY_CALL_HANDLER_H__
 #define __EMPATHY_CALL_HANDLER_H__
 
-#include <glib-object.h>
-
-#include <gst/gst.h>
 #include <farstream/fs-conference.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index bf42b055a..733199cff 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -19,16 +19,15 @@
  */
 
 #include "config.h"
+#include "empathy-call-observer.h"
 
 #include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-images.h>
 
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
-
-#include "empathy-call-observer.h"
+#include "empathy-notify-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyCallObserverPriv {
   EmpathyNotifyManager *notify_mgr;
@@ -116,7 +115,7 @@ display_reject_notification (EmpathyCallObserver *self,
 
   emp_contact = empathy_contact_dup_from_tp_contact (contact);
   pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
-      self->priv->notify_mgr, emp_contact, EMPATHY_IMAGE_AVATAR_DEFAULT);
+      self->priv->notify_mgr, emp_contact, TPAW_IMAGE_AVATAR_DEFAULT);
 
   if (pixbuf != NULL)
     {
diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h
index 1d5a58b57..3fdb6b797 100644
--- a/src/empathy-call-observer.h
+++ b/src/empathy-call-observer.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_OBSERVER_H__
 #define __EMPATHY_CALL_OBSERVER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index ca2914724..5ecc123ad 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -22,10 +22,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "empathy-call-window-fullscreen.h"
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include <tp-account-widgets/tpaw-builder.h>
+
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
@@ -184,7 +187,7 @@ empathy_call_window_fullscreen_init (EmpathyCallWindowFullscreen *self)
   gchar *filename;
 
   filename = empathy_file_lookup ("empathy-call-window-fullscreen.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
     "leave_fullscreen_window", &priv->leave_fullscreen_popup,
     "leave_fullscreen_button", &self->leave_fullscreen_button,
     NULL);
diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h
index 7e9bd63e5..56ddf99b8 100644
--- a/src/empathy-call-window-fullscreen.h
+++ b/src/empathy-call-window-fullscreen.h
@@ -20,8 +20,6 @@
 #ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 #define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 
-#include <glib-object.h>
-#include <gtk/gtk.h>
 
 #include "empathy-call-window.h"
 
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 77722f1a6..7fe365f30 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -19,38 +19,39 @@
  */
 
 #include "config.h"
+#include "empathy-call-window.h"
 
 #include <glib/gi18n.h>
-
 #include <telepathy-farstream/telepathy-farstream.h>
-
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-dialpad-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#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>
-
-#include "empathy-call-window-fullscreen.h"
 #include "empathy-about-dialog.h"
 #include "empathy-audio-sink.h"
+#include "empathy-call-utils.h"
+#include "empathy-call-window-fullscreen.h"
+#include "empathy-camera-menu.h"
+#include "empathy-dialpad-widget.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
 #include "empathy-mic-menu.h"
 #include "empathy-preferences.h"
+#include "empathy-request-util.h"
 #include "empathy-rounded-actor.h"
 #include "empathy-rounded-rectangle.h"
 #include "empathy-rounded-texture.h"
-#include "empathy-camera-menu.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include "empathy-debug.h"
 
 #define CONTENT_HBOX_SPACING 3
 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0
@@ -124,7 +125,7 @@ struct _EmpathyCallWindowPriv
 
   EmpathyContact *contact;
 
-  EmpathyCameraMonitor *camera_monitor;
+  TpawCameraMonitor *camera_monitor;
 
   CallState call_state;
   gboolean outgoing;
@@ -564,17 +565,17 @@ empathy_call_window_swap_camera_cb (GtkAction *action,
 
   DEBUG ("Swapping the camera");
 
-  cameras = empathy_camera_monitor_get_cameras (self->priv->camera_monitor);
+  cameras = tpaw_camera_monitor_get_cameras (self->priv->camera_monitor);
   current_cam = empathy_video_src_dup_device (
       EMPATHY_GST_VIDEO_SRC (self->priv->video_input));
 
   for (l = cameras; l != NULL; l = l->next)
     {
-      EmpathyCamera *camera = l->data;
+      TpawCamera *camera = l->data;
 
       if (!tp_strdiff (camera->device, current_cam))
         {
-          EmpathyCamera *next;
+          TpawCamera *next;
 
           if (l->next != NULL)
             next = l->next->data;
@@ -595,25 +596,29 @@ empathy_call_window_swap_camera_cb (GtkAction *action,
 }
 
 static void
-empathy_call_window_camera_added_cb (EmpathyCameraMonitor *monitor,
-    EmpathyCamera *camera,
-    EmpathyCallWindow *self)
+empathy_call_window_update_swap_camera (EmpathyCallWindow *self)
 {
-  const GList *cameras = empathy_camera_monitor_get_cameras (monitor);
+  const GList *cameras = tpaw_camera_monitor_get_cameras (
+      self->priv->camera_monitor);
 
   gtk_action_set_visible (self->priv->menu_swap_camera,
       g_list_length ((GList *) cameras) >= 2);
 }
 
 static void
-empathy_call_window_camera_removed_cb (EmpathyCameraMonitor *monitor,
-    EmpathyCamera *camera,
+empathy_call_window_camera_added_cb (TpawCameraMonitor *monitor,
+    TpawCamera *camera,
     EmpathyCallWindow *self)
 {
-  const GList *cameras = empathy_camera_monitor_get_cameras (monitor);
+  empathy_call_window_update_swap_camera (self);
+}
 
-  gtk_action_set_visible (self->priv->menu_swap_camera,
-      g_list_length ((GList *) cameras) >= 2);
+static void
+empathy_call_window_camera_removed_cb (TpawCameraMonitor *monitor,
+    TpawCamera *camera,
+    EmpathyCallWindow *self)
+{
+  empathy_call_window_update_swap_camera (self);
 }
 
 static void
@@ -1625,7 +1630,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
   priv->timer = g_timer_new ();
 
   filename = empathy_file_lookup ("empathy-call-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
     "call_window_vbox", &top_vbox,
     "errors_vbox", &priv->errors_vbox,
     "pane", &priv->pane,
@@ -1662,7 +1667,7 @@ empathy_call_window_init (EmpathyCallWindow *self)
     NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
     "hangup", "clicked", empathy_call_window_hangup_cb,
     "audiocall", "clicked", empathy_call_window_audio_call_cb,
     "videocall", "clicked", empathy_call_window_video_call_cb,
@@ -1683,7 +1688,8 @@ empathy_call_window_init (EmpathyCallWindow *self)
   empathy_set_css_provider (GTK_WIDGET (self));
   gtk_action_set_sensitive (priv->menu_fullscreen, FALSE);
 
-  priv->camera_monitor = empathy_camera_monitor_dup_singleton ();
+  priv->camera_monitor = tpaw_camera_monitor_dup_singleton ();
+  empathy_call_window_update_swap_camera (self);
 
   g_object_bind_property (priv->camera_monitor, "available",
       priv->camera_button, "sensitive",
@@ -1893,8 +1899,8 @@ init_contact_avatar_with_size (EmpathyContact *contact,
 
   if (pixbuf_avatar == NULL)
     {
-      pixbuf_avatar = empathy_pixbuf_from_icon_name_sized (
-          EMPATHY_IMAGE_AVATAR_DEFAULT, size);
+      pixbuf_avatar = tpaw_pixbuf_from_icon_name_sized (
+          TPAW_IMAGE_AVATAR_DEFAULT, size);
     }
 
   gtk_image_set_from_pixbuf (GTK_IMAGE (image_widget), pixbuf_avatar);
@@ -2457,12 +2463,15 @@ empathy_call_window_new (EmpathyCallHandler *handler)
 }
 
 void
-empathy_call_window_present (EmpathyCallWindow *self,
-    EmpathyCallHandler *handler)
+empathy_call_window_new_handler (EmpathyCallWindow *self,
+    EmpathyCallHandler *handler,
+    gboolean present,
+    guint32 x11_time)
 {
   g_return_if_fail (EMPATHY_IS_CALL_HANDLER (handler));
 
-  empathy_window_present (GTK_WINDOW (self));
+  if (present)
+    tpaw_window_present_with_time (GTK_WINDOW (self), x11_time);
 
   if (self->priv->call_state == DISCONNECTED)
     {
@@ -3271,7 +3280,7 @@ empathy_call_window_state_changed_cb (EmpathyCallHandler *handler,
 
   can_send_video = priv->video_input != NULL &&
     empathy_contact_can_voip_video (priv->contact) &&
-    empathy_camera_monitor_get_available (priv->camera_monitor);
+    tpaw_camera_monitor_get_available (priv->camera_monitor);
 
   g_object_get (priv->handler, "call-channel", &call, NULL);
 
@@ -4018,7 +4027,7 @@ empathy_call_window_state_event_cb (GtkWidget *widget,
       show_controls (window, set_fullscreen);
       show_borders (window, set_fullscreen);
       gtk_action_set_stock_id (priv->menu_fullscreen,
-          (set_fullscreen ? "gtk-leave-fullscreen" : "gtk-fullscreen"));
+          (set_fullscreen ? "view-restore" : "view-fullscreen"));
       priv->is_fullscreen = set_fullscreen;
   }
 
diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index a5df2dac4..ad7b1f262 100644
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -21,11 +21,10 @@
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include "empathy-call-handler.h"
 #include "empathy-audio-src.h"
+#include "empathy-call-handler.h"
 #include "empathy-video-src.h"
 
 G_BEGIN_DECLS
@@ -63,8 +62,10 @@ GType empathy_call_window_get_type (void);
     EmpathyCallWindowClass))
 
 EmpathyCallWindow *empathy_call_window_new (EmpathyCallHandler *handler);
-void empathy_call_window_present (EmpathyCallWindow *window,
-  EmpathyCallHandler *handler);
+void empathy_call_window_new_handler (EmpathyCallWindow *window,
+  EmpathyCallHandler *handler,
+  gboolean present,
+  guint32 x11_time);
 void empathy_call_window_start_ringing (EmpathyCallWindow *self,
   TpCallChannel *channel,
   TpChannelDispatchOperation *dispatch_operation,
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index f26f33b49..133f4ca4f 100644
--- a/src/empathy-call-window.ui
+++ b/src/empathy-call-window.ui
@@ -39,7 +39,7 @@
         </child>
         <child>
           <object class="GtkAction" id="menusettings">
-            <property name="stock_id">gtk-preferences</property>
+            <property name="stock_id">preferences-desktop</property>
             <property name="name">menusettings</property>
             <property name="label" translatable="yes">_Settings</property>
           </object>
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 9d5ab8a83..3d3ae80cf 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -23,21 +23,20 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef CLUTTER_WINDOWING_X11
 #include <X11/Xlib.h>
 #endif
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-call-window.h"
 #include "empathy-call-factory.h"
+#include "empathy-call-window.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
@@ -129,11 +128,13 @@ call_window_inhibit_cb (EmpathyCallWindow *window,
 static void
 new_call_handler_cb (EmpathyCallFactory *factory,
     EmpathyCallHandler *handler,
-    gboolean outgoing,
+    gint64 user_action_time,
     gpointer user_data)
 {
   EmpathyCallWindow *window;
   EmpathyContact *contact;
+  guint32 x11_time;
+  gboolean present;
 
   DEBUG ("Show the call window");
 
@@ -141,9 +142,12 @@ new_call_handler_cb (EmpathyCallFactory *factory,
 
   window = g_hash_table_lookup (call_windows, contact);
 
+  present = tp_user_action_time_should_present (user_action_time,
+      &x11_time);
+
   if (window != NULL)
     {
-      empathy_call_window_present (window, handler);
+      empathy_call_window_new_handler (window, handler, present, x11_time);
     }
   else
     {
@@ -157,6 +161,9 @@ new_call_handler_cb (EmpathyCallFactory *factory,
           G_CALLBACK (call_window_inhibit_cb), NULL);
 
       gtk_widget_show (GTK_WIDGET (window));
+
+      if (present)
+        tpaw_window_present_with_time (GTK_WINDOW (window), x11_time);
     }
 }
 
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index a6f8d3d12..cf18340c4 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
+#include "empathy-camera-menu.h"
 
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
+#include <tp-account-widgets/tpaw-camera-monitor.h>
 
-#include "empathy-camera-menu.h"
+#include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyCameraMenuPrivate
 {
@@ -52,7 +52,7 @@ struct _EmpathyCameraMenuPrivate
   /* Queue of GtkRadioActions. */
   GQueue *cameras;
 
-  EmpathyCameraMonitor *camera_monitor;
+  TpawCameraMonitor *camera_monitor;
 
   GSettings *settings;
 };
@@ -201,7 +201,7 @@ empathy_camera_menu_update (EmpathyCameraMenu *self)
 
 static void
 empathy_camera_menu_add_camera (EmpathyCameraMenu *self,
-    EmpathyCamera *camera)
+    TpawCamera *camera)
 {
   GtkRadioAction *action;
   GSList *group;
@@ -220,8 +220,8 @@ empathy_camera_menu_add_camera (EmpathyCameraMenu *self,
 }
 
 static void
-empathy_camera_menu_camera_added_cb (EmpathyCameraMonitor *monitor,
-    EmpathyCamera *camera,
+empathy_camera_menu_camera_added_cb (TpawCameraMonitor *monitor,
+    TpawCamera *camera,
     EmpathyCameraMenu *self)
 {
   empathy_camera_menu_add_camera (self, camera);
@@ -229,8 +229,8 @@ empathy_camera_menu_camera_added_cb (EmpathyCameraMonitor *monitor,
 }
 
 static void
-empathy_camera_menu_camera_removed_cb (EmpathyCameraMonitor *monitor,
-    EmpathyCamera *camera,
+empathy_camera_menu_camera_removed_cb (TpawCameraMonitor *monitor,
+    TpawCamera *camera,
     EmpathyCameraMenu *self)
 {
   GList *l;
@@ -304,11 +304,11 @@ empathy_camera_menu_get_cameras (EmpathyCameraMenu *self)
 {
   const GList *cameras;
 
-  cameras = empathy_camera_monitor_get_cameras (self->priv->camera_monitor);
+  cameras = tpaw_camera_monitor_get_cameras (self->priv->camera_monitor);
 
   for (; cameras != NULL; cameras = g_list_next (cameras))
     {
-      EmpathyCamera *camera = cameras->data;
+      TpawCamera *camera = cameras->data;
 
       empathy_camera_menu_add_camera (self, camera);
     }
@@ -347,7 +347,7 @@ empathy_camera_menu_constructed (GObject *obj)
       self->priv->anchor_action);
   g_object_unref (self->priv->anchor_action);
 
-  self->priv->camera_monitor = empathy_camera_monitor_new ();
+  self->priv->camera_monitor = tpaw_camera_monitor_new ();
 
   tp_g_signal_connect_object (self->priv->camera_monitor, "added",
       G_CALLBACK (empathy_camera_menu_camera_added_cb), self, 0);
diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h
index 92760f67d..b55726bed 100644
--- a/src/empathy-camera-menu.h
+++ b/src/empathy-camera-menu.h
@@ -19,7 +19,6 @@
 #ifndef __EMPATHY_CAMERA_MENU_H__
 #define __EMPATHY_CAMERA_MENU_H__
 
-#include <glib-object.h>
 
 #include "empathy-call-window.h"
 
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 15a4e7a4f..02ed0d949 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -18,23 +18,18 @@
  */
 
 #include "config.h"
+#include "empathy-chat-manager.h"
 
 #include <telepathy-glib/proxy-subclass.h>
 
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "empathy-chatroom-manager.h"
 #include "empathy-chat-window.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-chat-manager.h"
-
-#include <extensions/extensions.h>
+#include "empathy-debug.h"
 
 enum {
   CLOSED_CHATS_CHANGED,
diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index 7dfd53480..b5516c33d 100644
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -20,9 +20,8 @@
 #ifndef __EMPATHY_CHAT_MANAGER_H__
 #define __EMPATHY_CHAT_MANAGER_H__
 
-#include <glib-object.h>
 
-#include <libempathy-gtk/empathy-chat.h>
+#include "empathy-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 292c1a9a7..f7c8707eb 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -26,31 +26,29 @@
  */
 
 #include "config.h"
+#include "empathy-chat-window.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-smiley-manager.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
-
-#include "empathy-chat-manager.h"
-#include "empathy-chat-window.h"
 #include "empathy-about-dialog.h"
+#include "empathy-chat-manager.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
 #include "empathy-invite-participant-dialog.h"
+#include "empathy-notify-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-smiley-manager.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Macro to compare guint32 X timestamps, while accounting for wrapping around
  */
@@ -86,6 +84,8 @@ struct _EmpathyChatWindowPriv
   GtkUIManager *ui_manager;
   GtkAction *menu_conv_insert_smiley;
   GtkAction *menu_conv_favorite;
+  GtkAction *menu_conv_join_chat;
+  GtkAction *menu_conv_leave_chat;
   GtkAction *menu_conv_always_urgent;
   GtkAction *menu_conv_toggle_contacts;
 
@@ -382,15 +382,17 @@ chat_tab_style_updated_cb (GtkWidget *hbox,
   GtkWidget *button;
   int char_width, h, w;
   PangoContext *context;
-  const PangoFontDescription *font_desc;
+  PangoFontDescription *font_desc;
   PangoFontMetrics *metrics;
 
   button = g_object_get_data (G_OBJECT (user_data),
     "chat-window-tab-close-button");
   context = gtk_widget_get_pango_context (hbox);
 
-  font_desc = gtk_style_context_get_font (gtk_widget_get_style_context (hbox),
-      GTK_STATE_FLAG_NORMAL);
+  gtk_style_context_get (gtk_widget_get_style_context (hbox),
+      GTK_STATE_FLAG_NORMAL,
+      "font", &font_desc,
+      NULL);
 
   metrics = pango_context_get_metrics (context, font_desc,
     pango_context_get_language (context));
@@ -406,6 +408,7 @@ chat_tab_style_updated_cb (GtkWidget *hbox,
     12 * PANGO_PIXELS (char_width) + 2 * w, -1);
 
   gtk_widget_set_size_request (button, w, h);
+  pango_font_description_free (font_desc);
 }
 
 static GtkWidget *
@@ -963,10 +966,10 @@ chat_window_update_chat_tab_full (EmpathyChat *chat,
       g_free (tmp);
     }
 
-  if (!EMP_STR_EMPTY (status))
+  if (!TPAW_STR_EMPTY (status))
     append_markup_printf (tooltip, "\n<i>%s</i>", status);
 
-  if (!EMP_STR_EMPTY (subject))
+  if (!TPAW_STR_EMPTY (subject))
     append_markup_printf (tooltip, "\n<b>%s</b> %s",
         _("Topic:"), subject);
 
@@ -1088,6 +1091,7 @@ chat_window_conv_activate_cb (GtkAction *action,
   gboolean is_room;
   gboolean active;
   EmpathyContact *remote_contact = NULL;
+  gboolean disconnected;
 
   /* Favorite room menu */
   is_room = empathy_chat_is_room (self->priv->current_chat);
@@ -1132,9 +1136,45 @@ chat_window_conv_activate_cb (GtkAction *action,
         GTK_TOGGLE_ACTION (self->priv->menu_conv_toggle_contacts), active);
     }
 
+  /* Menu-items to be visible for MUCs only */
   gtk_action_set_visible (self->priv->menu_conv_toggle_contacts,
       (remote_contact == NULL));
 
+  disconnected = (empathy_chat_get_tp_chat (self->priv->current_chat) == NULL);
+  if (disconnected)
+    {
+      gtk_action_set_visible (self->priv->menu_conv_join_chat, TRUE);
+      gtk_action_set_visible (self->priv->menu_conv_leave_chat, FALSE);
+    }
+  else
+    {
+      TpChannel *channel = NULL;
+      TpContact *self_contact = NULL;
+      TpHandle  self_handle = 0;
+
+      channel = (TpChannel *) (empathy_chat_get_tp_chat (
+          self->priv->current_chat));
+      self_contact = tp_channel_group_get_self_contact (channel);
+      if (self_contact == NULL)
+      {
+        /* The channel may not be a group */
+        gtk_action_set_visible (self->priv->menu_conv_leave_chat, FALSE);
+      }
+      else
+      {
+        self_handle = tp_contact_get_handle (self_contact);
+        /* There is sometimes a lag between the members-changed signal
+           emitted on tp-chat and invalidated signal being emitted on the channel.
+           Leave Chat menu-item should be sensitive only till our self-handle is
+           a part of channel-members */
+        gtk_action_set_visible (self->priv->menu_conv_leave_chat,
+            self_handle != 0);
+      }
+
+      /* Join Chat is insensitive for a connected chat */
+      gtk_action_set_visible (self->priv->menu_conv_join_chat, FALSE);
+    }
+
   if (remote_contact != NULL)
     g_object_unref (remote_contact);
 }
@@ -1244,6 +1284,29 @@ out:
 }
 
 static void
+chat_window_join_chat_activate_cb (GtkAction *action,
+    EmpathyChatWindow *self)
+{
+    g_return_if_fail (self->priv->current_chat != NULL);
+
+    empathy_chat_join_muc (self->priv->current_chat,
+        empathy_chat_get_id (self->priv->current_chat));
+}
+
+static void
+chat_window_leave_chat_activate_cb (GtkAction *action,
+    EmpathyChatWindow *self)
+{
+    EmpathyTpChat * tp_chat;
+
+    g_return_if_fail (self->priv->current_chat != NULL);
+
+    tp_chat = empathy_chat_get_tp_chat (self->priv->current_chat);
+    if (tp_chat != NULL)
+        empathy_tp_chat_leave (tp_chat, "");
+}
+
+static void
 chat_window_close_activate_cb (GtkAction *action,
     EmpathyChatWindow *self)
 {
@@ -2353,11 +2416,13 @@ empathy_chat_window_init (EmpathyChatWindow *self)
     EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv);
 
   filename = empathy_file_lookup ("empathy-chat-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "chat_vbox", &chat_vbox,
       "ui_manager", &self->priv->ui_manager,
       "menu_conv_insert_smiley", &self->priv->menu_conv_insert_smiley,
       "menu_conv_favorite", &self->priv->menu_conv_favorite,
+      "menu_conv_join_chat", &self->priv->menu_conv_join_chat,
+      "menu_conv_leave_chat", &self->priv->menu_conv_leave_chat,
       "menu_conv_always_urgent", &self->priv->menu_conv_always_urgent,
       "menu_conv_toggle_contacts", &self->priv->menu_conv_toggle_contacts,
       "menu_edit_cut", &self->priv->menu_edit_cut,
@@ -2373,13 +2438,15 @@ empathy_chat_window_init (EmpathyChatWindow *self)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "menu_conv", "activate", chat_window_conv_activate_cb,
       "menu_conv_clear", "activate", chat_window_clear_activate_cb,
       "menu_conv_favorite", "toggled", chat_window_favorite_toggled_cb,
       "menu_conv_always_urgent", "toggled", chat_window_always_urgent_toggled_cb,
       "menu_conv_toggle_contacts", "toggled", chat_window_contacts_toggled_cb,
       "menu_conv_invite_participant", "activate", chat_window_invite_participant_activate_cb,
+      "menu_conv_join_chat", "activate", chat_window_join_chat_activate_cb,
+      "menu_conv_leave_chat", "activate", chat_window_leave_chat_activate_cb,
       "menu_conv_close", "activate", chat_window_close_activate_cb,
       "menu_edit", "activate", chat_window_edit_activate_cb,
       "menu_edit_cut", "activate", chat_window_cut_activate_cb,
@@ -2720,7 +2787,7 @@ empathy_chat_window_find_chat (TpAccount *account,
 {
   GList *l;
 
-  g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL);
+  g_return_val_if_fail (!TPAW_STR_EMPTY (id), NULL);
 
   for (l = chat_windows; l; l = l->next)
     {
@@ -2791,7 +2858,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat,
 
   empathy_chat_window_switch_to_chat (self, chat);
 
-  /* Don't use empathy_window_present_with_time () which would move the window
+  /* Don't use tpaw_window_present_with_time () which would move the window
    * to our current desktop but move to the window's desktop instead. This is
    * more coherent with Shell's 'app is ready' notication which moves the view
    * to the app desktop rather than moving the app itself. */
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 2041634aa..ae986cc7f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -27,12 +27,11 @@
 #ifndef __EMPATHY_CHAT_WINDOW_H__
 #define __EMPATHY_CHAT_WINDOW_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
-#include <libempathy-gtk/empathy-chat.h>
+#include "empathy-chat.h"
+#include "empathy-individual-manager.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-chat-window.ui b/src/empathy-chat-window.ui
index d3f002668..4901978bb 100644
--- a/src/empathy-chat-window.ui
+++ b/src/empathy-chat-window.ui
@@ -52,6 +52,18 @@
           </object>
         </child>
         <child>
+          <object class="GtkAction" id="menu_conv_join_chat">
+            <property name="name">menu_conv_join_chat</property>
+            <property name="label" translatable="yes">_Join Chat</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkAction" id="menu_conv_leave_chat">
+            <property name="name">menu_conv_leave_chat</property>
+            <property name="label" translatable="yes">Le_ave Chat</property>
+          </object>
+        </child>
+        <child>
           <object class="GtkAction" id="menu_conv_close">
             <property name="stock_id">gtk-close</property>
             <property name="name">menu_conv_close</property>
@@ -170,6 +182,9 @@
     <ui>
       <menubar name="chats_menubar">
         <menu action="menu_conv">
+          <menuitem action="menu_conv_join_chat"/>
+          <menuitem action="menu_conv_leave_chat"/>
+          <separator/>
           <menuitem action="menu_conv_clear"/>
           <menuitem action="menu_conv_insert_smiley"/>
           <menuitem action="menu_conv_favorite"/>
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 0e70885d7..1c4c57d25 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -23,19 +23,17 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-
 #include <libnotify/notify.h>
 
-#include <libempathy/empathy-presence-manager.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
+#include "empathy-presence-manager.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
@@ -68,6 +66,7 @@ activate_cb (GApplication *application)
     return;
 
   activated = TRUE;
+  empathy_gtk_init ();
 
   if (!use_timer)
     {
@@ -100,7 +99,7 @@ main (int argc,
   gint retval;
 
   optcontext = g_option_context_new (N_("- Empathy Chat Client"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
@@ -115,7 +114,7 @@ main (int argc,
 
   g_option_context_free (optcontext);
 
-  empathy_gtk_init ();
+  empathy_init ();
 
   /* Make empathy and empathy-chat appear as the same app in gnome-shell */
   gdk_set_program_class ("Empathy");
diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index a18cccb1f..25c7814f6 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -24,16 +24,15 @@
  */
 
 #include "config.h"
+#include "empathy-chatrooms-window.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-chatrooms-window.h"
+#include "empathy-account-chooser.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 typedef struct {
 	EmpathyChatroomManager *manager;
@@ -102,16 +101,16 @@ empathy_chatrooms_window_show (GtkWindow *parent)
 	window = g_new0 (EmpathyChatroomsWindow, 1);
 
 	filename = empathy_file_lookup ("empathy-chatrooms-window.ui", "src");
-	gui = empathy_builder_get_file (filename,
-				       "chatrooms_window", &window->window,
-				       "hbox_account", &window->hbox_account,
-				       "label_account", &window->label_account,
-				       "sw_room_list", &sw,
-				       "treeview", &window->treeview,
-				       "toolbar_remove", &toolbar,
-				       "button_remove", &window->button_remove,
-				       "button_close", &window->button_close,
-				       NULL);
+	gui = tpaw_builder_get_file (filename,
+				     "chatrooms_window", &window->window,
+				     "hbox_account", &window->hbox_account,
+				     "label_account", &window->label_account,
+				     "sw_room_list", &sw,
+				     "treeview", &window->treeview,
+				     "toolbar_remove", &toolbar,
+				     "button_remove", &window->button_remove,
+				     "button_close", &window->button_close,
+				     NULL);
 	g_free (filename);
 
 	/* join the remove toolbar to the treeview */
@@ -120,7 +119,7 @@ empathy_chatrooms_window_show (GtkWindow *parent)
 	context = gtk_widget_get_style_context (toolbar);
 	gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
 
-	empathy_builder_connect (gui, window,
+	tpaw_builder_connect (gui, window,
 			      "chatrooms_window", "destroy", chatrooms_window_destroy_cb,
 			      "button_remove", "clicked", chatrooms_window_button_remove_clicked_cb,
 			      "button_close", "clicked", chatrooms_window_button_close_clicked_cb,
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index f5115aea5..e4f5e21d6 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -20,18 +20,18 @@
 */
 
 #include "config.h"
+#include "empathy-debug-window.h"
 
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include "empathy-debug-window.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
     GTK_TYPE_WINDOW)
@@ -1006,7 +1006,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
       return;
     }
 
-  if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2))
+  if (TPAW_STR_EMPTY (arg1) && !TPAW_STR_EMPTY (arg2))
     {
       GtkTreeIter *found_at_iter = NULL;
       gchar *display_name;
@@ -1086,7 +1086,7 @@ debug_window_name_owner_changed_cb (TpDBusDaemon *proxy,
 
       g_free (display_name);
     }
-  else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2))
+  else if (!TPAW_STR_EMPTY (arg1) && TPAW_STR_EMPTY (arg2))
     {
       /* A service died */
       GtkTreeIter *iter = NULL;
@@ -1298,7 +1298,7 @@ debug_window_menu_copy_activate_cb (GtkMenuItem *menu_item,
 
   message = tp_debug_message_get_message (msg);
 
-  if (EMP_STR_EMPTY (message))
+  if (TPAW_STR_EMPTY (message))
     {
       DEBUG ("Log message is empty");
       return;
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 42bb43ef7..c8944bf03 100644
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -21,11 +21,10 @@
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 
-G_BEGIN_DECLS
-
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 #define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ())
 #define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \
         ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow))
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 00dc98c8d..fb4ef1e4c 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,9 +21,8 @@
 
 #include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-
 #include "empathy-debug-window.h"
+#include "empathy-ui-utils.h"
 
 #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
 
@@ -31,7 +30,7 @@ static GtkWidget *window = NULL;
 static gchar *service = NULL;
 
 static void
-activate_cb (GApplication *app)
+app_activate (GApplication *app)
 {
   if (window == NULL)
     {
@@ -45,20 +44,31 @@ activate_cb (GApplication *app)
       gtk_window_present (GTK_WINDOW (window));
     }
 
-  if (service != NULL)
+  if (!tp_str_empty (service))
     empathy_debug_window_show (EMPATHY_DEBUG_WINDOW (window),
         service);
 }
 
-static gint
-command_line_cb (GApplication *application,
-    GApplicationCommandLine *command_line,
-    gpointer user_data)
+static void
+on_show_service_cb (GAction  *action,
+    GVariant *parameter,
+    gpointer  data)
+{
+  g_free (service);
+  service = g_variant_dup_string (parameter, NULL);
+}
+
+static gboolean
+local_cmdline (GApplication *app,
+    gchar ***arguments,
+    gint *exit_status)
 {
   GError *error = NULL;
+  GSimpleAction *action;
   gchar **argv;
   gint argc;
-  gint retval = 0;
+  gint i;
+  gboolean retval = TRUE;
 
   GOptionContext *optcontext;
   GOptionEntry options[] = {
@@ -70,10 +80,18 @@ command_line_cb (GApplication *application,
   };
 
   optcontext = g_option_context_new (N_("- Empathy Debugger"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
-  argv = g_application_command_line_get_arguments (command_line, &argc);
+
+  action = g_simple_action_new ("show-service", G_VARIANT_TYPE_STRING);
+  g_signal_connect (action, "activate", G_CALLBACK (on_show_service_cb), app);
+  g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action));
+  g_object_unref (action);
+
+  argv = *arguments;
+  for (i = 0; argv[i] != NULL; i++)
+    argc++;
 
   if (!g_option_context_parse (optcontext, &argc, &argv, &error))
     {
@@ -81,13 +99,27 @@ command_line_cb (GApplication *application,
           "line options.\n",
           error->message, argv[0]);
 
-      retval = 1;
+      g_clear_error (&error);
+      *exit_status = EXIT_FAILURE;
+    }
+  else
+    {
+      if (g_application_register (app, NULL, &error))
+        {
+          GVariant *parameter = g_variant_new_string (service ? service : "");
+          g_action_group_activate_action (G_ACTION_GROUP (app), "show-service", parameter);
+
+          g_application_activate (app);
+        }
+      else
+        {
+          g_warning("Impossible to register empathy-debugger: %s", error->message);
+          g_clear_error (&error);
+          *exit_status = EXIT_FAILURE;
+        }
     }
 
   g_option_context_free (optcontext);
-  g_strfreev (argv);
-
-  g_application_activate (application);
 
   return retval;
 }
@@ -97,16 +129,15 @@ main (int argc,
     char **argv)
 {
   GtkApplication *app;
+  GApplicationClass *app_class;
   gint retval;
 
-  gtk_init (&argc, &argv);
-  empathy_gtk_init ();
   textdomain (GETTEXT_PACKAGE);
 
-  app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME,
-      G_APPLICATION_HANDLES_COMMAND_LINE);
-  g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
-  g_signal_connect (app, "command-line", G_CALLBACK (command_line_cb), NULL);
+  app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+  app_class = G_APPLICATION_CLASS (G_OBJECT_GET_CLASS (app));
+  app_class->local_command_line = local_cmdline;
+  app_class->activate = app_activate;
 
   g_set_application_name (_("Empathy Debugger"));
 
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f652c2164..e973ef3be 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -20,26 +20,26 @@
  */
 
 #include "config.h"
+#include "empathy-event-manager.h"
 
 #include <glib/gi18n.h>
-
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-sasl-mechanisms.h>
-
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-#include <libempathy-gtk/empathy-subscription-dialog.h>
-
-#include "empathy-event-manager.h"
+#include <tp-account-widgets/tpaw-images.h>
+#include <tp-account-widgets/tpaw-utils.h>
+
+#include "empathy-call-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"
+#include "empathy-sound-manager.h"
+#include "empathy-subscription-dialog.h"
+#include "empathy-tp-chat.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 
@@ -917,8 +917,19 @@ approve_call_channel (EmpathyEventManager *self,
 
   priv->ringing++;
   if (priv->ringing == 1)
-    empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
-        EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
+    {
+      TpAccountManager *am = tp_account_manager_dup ();
+      TpConnectionPresenceType presence;
+
+      presence = tp_account_manager_get_most_available_presence (am,
+          NULL, NULL);
+
+      if (presence != TP_CONNECTION_PRESENCE_TYPE_BUSY)
+        empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
+            EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
+
+      g_object_unref (am);
+    }
 }
 
 static void
@@ -1100,7 +1111,7 @@ check_publish_state (EmpathyEventManager *self,
 
   message = tp_contact_get_publish_request (tp_contact);
 
-  if (!EMP_STR_EMPTY (message))
+  if (!TPAW_STR_EMPTY (message))
     event_msg = g_strdup_printf (_("\nMessage: %s"), message);
   else
     event_msg = NULL;
@@ -1125,10 +1136,10 @@ event_manager_publish_state_changed_cb (TpContact *contact,
 }
 
 static void
-event_manager_presence_changed_cb (EmpathyContact *contact,
+check_presence (EmpathyEventManager *manager,
+    EmpathyContact *contact,
     TpConnectionPresenceType current,
-    TpConnectionPresenceType previous,
-    EmpathyEventManager *manager)
+    TpConnectionPresenceType previous)
 {
   EmpathyEventManagerPriv *priv = GET_PRIV (manager);
   TpAccount *account;
@@ -1156,7 +1167,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
             {
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE,
-                  EMPATHY_IMAGE_AVATAR_DEFAULT,
+                  TPAW_IMAGE_AVATAR_DEFAULT,
                   empathy_contact_get_alias (contact), _("Disconnected"),
                   NULL, NULL, NULL);
             }
@@ -1177,7 +1188,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
             {
               event_manager_add (manager, NULL, contact,
                   EMPATHY_EVENT_TYPE_PRESENCE_ONLINE,
-                  EMPATHY_IMAGE_AVATAR_DEFAULT,
+                  TPAW_IMAGE_AVATAR_DEFAULT,
                   empathy_contact_get_alias (contact), _("Connected"),
                   NULL, NULL, NULL);
             }
@@ -1188,6 +1199,15 @@ out:
   g_object_unref (presence_mgr);
 }
 
+static void
+event_manager_presence_changed_cb (EmpathyContact *contact,
+    TpConnectionPresenceType current,
+    TpConnectionPresenceType previous,
+    EmpathyEventManager *manager)
+{
+  check_presence (manager, contact, current, previous);
+}
+
 static GObject *
 event_manager_constructor (GType type,
 			   guint n_props,
@@ -1290,6 +1310,10 @@ contact_list_changed_cb (EmpathyConnectionAggregator *aggregator,
       tp_g_signal_connect_object (contact, "presence-changed",
           G_CALLBACK (event_manager_presence_changed_cb), self, 0);
 
+      check_presence (self, contact,
+          empathy_contact_get_presence (contact),
+          TP_CONNECTION_PRESENCE_TYPE_OFFLINE);
+
       tp_g_signal_connect_object (tp_contact, "notify::publish-state",
           G_CALLBACK (event_manager_publish_state_changed_cb), self, 0);
 
@@ -1352,7 +1376,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
   g_ptr_array_unref (contacts);
   g_ptr_array_unref (empty);
 
-   am = tp_account_manager_dup ();
+  am = tp_account_manager_dup ();
 
   priv->approver = tp_simple_approver_new_with_am (am, "Empathy.EventManager",
       FALSE, approve_channels, manager, NULL);
diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 70af9a1c2..f2878c7ca 100644
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -22,10 +22,9 @@
 #ifndef __EMPATHY_EVENT_MANAGER_H__
 #define __EMPATHY_EVENT_MANAGER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 
-#include <libempathy/empathy-contact.h>
+#include "empathy-contact.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index f89004f32..4321969d6 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -28,17 +28,17 @@
 /* The original file transfer manager code was copied from Epiphany */
 
 #include "config.h"
+#include "empathy-ft-manager.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-geometry.h>
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include "empathy-ft-manager.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_FT
+#include "empathy-debug.h"
 
 enum
 {
@@ -971,7 +971,7 @@ ft_manager_build_ui (EmpathyFTManager *manager)
   EmpathyFTManagerPriv *priv = GET_PRIV (manager);
 
   filename = empathy_file_lookup ("empathy-ft-manager.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "ft_manager_dialog", &priv->window,
       "ft_list", &priv->treeview,
       "clear_button", &priv->clear_button,
@@ -980,14 +980,14 @@ ft_manager_build_ui (EmpathyFTManager *manager)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, manager,
+  tpaw_builder_connect (gui, manager,
       "ft_manager_dialog", "destroy", ft_manager_destroy_cb,
       "ft_manager_dialog", "response", ft_manager_response_cb,
       "ft_manager_dialog", "delete-event", ft_manager_delete_event_cb,
       "ft_manager_dialog", "key-press-event", ft_manager_key_press_event_cb,
       NULL);
 
-  empathy_builder_unref_and_keep_widget (gui, priv->window);
+  tpaw_builder_unref_and_keep_widget (gui, priv->window);
 
   /* Window geometry. */
   empathy_geometry_bind (GTK_WINDOW (priv->window), "ft-manager");
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 0ff820f06..be41730eb 100644
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -25,11 +25,9 @@
 #ifndef __EMPATHY_FT_MANAGER_H__
 #define __EMPATHY_FT_MANAGER_H__
 
-#include <gtk/gtk.h>
 #include <glib-object.h>
-#include <glib.h>
 
-#include <libempathy/empathy-ft-handler.h>
+#include "empathy-ft-handler.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index d4dd70d01..9d86dd1de 100644
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -21,15 +21,15 @@
  */
 
 #include "config.h"
+#include "empathy-import-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
 
 enum {
   PROP_PARENT = 1,
@@ -43,7 +43,7 @@ typedef struct {
   EmpathyImportWidget *iw;
 
   gboolean show_warning;
-  EmpathyConnectionManagers *cms;
+  TpawConnectionManagers *cms;
 } EmpathyImportDialogPriv;
 
 G_DEFINE_TYPE (EmpathyImportDialog, empathy_import_dialog, GTK_TYPE_DIALOG)
@@ -241,8 +241,8 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass)
   g_object_class_install_property (oclass, PROP_SHOW_WARNING, param_spec);
 
   param_spec = g_param_spec_object ("cms",
-      "EmpathyConnectionManagers", "EmpathyConnectionManager",
-      EMPATHY_TYPE_CONNECTION_MANAGERS,
+      "TpawConnectionManagers", "EmpathyConnectionManager",
+      TPAW_TYPE_CONNECTION_MANAGERS,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_CMS, param_spec);
 
@@ -252,9 +252,9 @@ empathy_import_dialog_class_init (EmpathyImportDialogClass *klass)
 GtkWidget *
 empathy_import_dialog_new (GtkWindow *parent,
     gboolean warning,
-    EmpathyConnectionManagers *cms)
+    TpawConnectionManagers *cms)
 {
-  g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL);
+  g_return_val_if_fail (TPAW_IS_CONNECTION_MANAGERS (cms), NULL);
 
   return g_object_new (EMPATHY_TYPE_IMPORT_DIALOG,
       "parent-window", parent,
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a412037d1..8fce49fcd 100644
--- a/src/empathy-import-dialog.h
+++ b/src/empathy-import-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
 
-#include <libempathy/empathy-connection-managers.h>
+#include <tp-account-widgets/tpaw-connection-managers.h>
 
 G_BEGIN_DECLS
 
@@ -59,7 +59,7 @@ GType empathy_import_dialog_get_type (void);
 
 GtkWidget* empathy_import_dialog_new (GtkWindow *parent_window,
     gboolean show_warning,
-    EmpathyConnectionManagers *cms);
+    TpawConnectionManagers *cms);
 
 G_END_DECLS
 
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 8fd7eaef4..bd05753c0 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -20,16 +20,17 @@
  * */
 
 #include "config.h"
+#include "empathy-import-pidgin.h"
 
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #include "empathy-import-utils.h"
-#include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-debug.h"
 
 /* Pidgin to CM map */
 typedef struct
@@ -356,7 +357,7 @@ empathy_import_pidgin_load (void)
            * http://bugzilla.gnome.org/show_bug.cgi?id=579992 */
           if (!tp_strdiff (data->protocol, "jabber"))
             {
-              if (EMP_STR_EMPTY (tp_asv_get_string (data->settings, "server")))
+              if (TPAW_STR_EMPTY (tp_asv_get_string (data->settings, "server")))
                 {
                   g_hash_table_remove (data->settings, "port");
                   g_hash_table_remove (data->settings, "server");
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 7007dee57..ab7847c3f 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,18 +19,21 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <libempathy/empathy-connection-managers.h>
-#include <libempathy/empathy-utils.h>
-
+#include "config.h"
 #include "empathy-import-utils.h"
+
+#include <tp-account-widgets/tpaw-connection-managers.h>
+#include <tp-account-widgets/tpaw-utils.h>
+
 #include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
 
 EmpathyImportAccountData *
 empathy_import_account_data_new (const gchar *source)
 {
   EmpathyImportAccountData *data;
 
-  g_return_val_if_fail (!EMP_STR_EMPTY (source), NULL);
+  g_return_val_if_fail (!TPAW_STR_EMPTY (source), NULL);
 
   data = g_slice_new0 (EmpathyImportAccountData);
   data->settings = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
@@ -79,13 +82,13 @@ gboolean
 empathy_import_protocol_is_supported (const gchar *protocol,
     TpConnectionManager **cm)
 {
-  EmpathyConnectionManagers *manager;
+  TpawConnectionManagers *manager;
   GList *cms;
   GList *l;
   gboolean proto_is_supported = FALSE;
 
-  manager = empathy_connection_managers_dup_singleton ();
-  cms = empathy_connection_managers_get_cms (manager);
+  manager = tpaw_connection_managers_dup_singleton ();
+  cms = tpaw_connection_managers_get_cms (manager);
 
   for (l = cms; l; l = l->next)
     {
diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 59e1cb4d4..d860c4ee8 100644
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_IMPORT_UTILS_H__
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 77048a4b7..42ffdd30b 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -23,17 +23,17 @@
 /* empathy-import-widget.c */
 
 #include "config.h"
-
-#include "empathy-import-dialog.h"
 #include "empathy-import-widget.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
-#include <glib/gi18n-lib.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT)
 
@@ -62,7 +62,7 @@ typedef struct {
   GList *accounts;
   EmpathyImportApplication app_id;
 
-  EmpathyConnectionManagers *cms;
+  TpawConnectionManagers *cms;
 
   gboolean dispose_run;
 } EmpathyImportWidgetPriv;
@@ -171,7 +171,7 @@ import_widget_create_account_cb (GObject *source,
   if (tp_account_is_enabled (account))
     {
       account_manager = tp_account_manager_dup ();
-      empathy_connect_new_account (account, account_manager);
+      tpaw_connect_new_account (account, account_manager);
       g_object_unref (account_manager);
     }
 
@@ -432,14 +432,14 @@ do_constructed (GObject *obj)
   gchar *filename;
 
   filename = empathy_file_lookup ("empathy-import-dialog.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "widget_vbox", &priv->vbox,
       "treeview", &priv->treeview,
       "scrolledwindow", &priv->scrolledwindow,
       NULL);
 
   g_free (filename);
-  empathy_builder_unref_and_keep_widget (gui, priv->vbox);
+  tpaw_builder_unref_and_keep_widget (gui, priv->vbox);
 
   g_signal_connect (priv->vbox, "destroy",
       G_CALLBACK (import_widget_destroy_cb), self);
@@ -466,8 +466,8 @@ empathy_import_widget_class_init (EmpathyImportWidgetClass *klass)
   g_object_class_install_property (oclass, PROP_APPLICATION_ID, param_spec);
 
   param_spec = g_param_spec_object ("cms",
-      "EmpathyConnectionManagers", "EmpathyConnectionManager",
-      EMPATHY_TYPE_CONNECTION_MANAGERS,
+      "TpawConnectionManagers", "TpawConnectionManagers",
+      TPAW_TYPE_CONNECTION_MANAGERS,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY);
   g_object_class_install_property (oclass, PROP_CMS, param_spec);
 
@@ -486,9 +486,9 @@ empathy_import_widget_init (EmpathyImportWidget *self)
 
 EmpathyImportWidget *
 empathy_import_widget_new (EmpathyImportApplication id,
-    EmpathyConnectionManagers *cms)
+    TpawConnectionManagers *cms)
 {
-  g_return_val_if_fail (EMPATHY_IS_CONNECTION_MANAGERS (cms), NULL);
+  g_return_val_if_fail (TPAW_IS_CONNECTION_MANAGERS (cms), NULL);
 
   return g_object_new (EMPATHY_TYPE_IMPORT_WIDGET,
       "application-id", id,
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 14a01d79d..221fa1439 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -25,9 +25,8 @@
 #ifndef __EMPATHY_IMPORT_WIDGET_H__
 #define __EMPATHY_IMPORT_WIDGET_H__
 
-#include <glib-object.h>
-
-#include <libempathy/empathy-connection-managers.h>
+#include <gtk/gtk.h>
+#include <tp-account-widgets/tpaw-connection-managers.h>
 
 #include "empathy-import-utils.h"
 
@@ -62,7 +61,7 @@ typedef struct {
 GType empathy_import_widget_get_type (void);
 
 EmpathyImportWidget* empathy_import_widget_new (EmpathyImportApplication id,
-    EmpathyConnectionManagers *cms);
+    TpawConnectionManagers *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 0b42ab4a7..e562dc564 100644
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -10,14 +10,12 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n.h>
-
 #include "empathy-invite-participant-dialog.h"
 
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-contact-chooser.h>
+#include "empathy-contact-chooser.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 7946fa001..daa3448d2 100644
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -13,10 +13,9 @@
 #define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index b86aec4be..612ff34be 100644
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -20,12 +20,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-mic-menu.h"
+
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyMicMenuPrivate
 {
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index c06e786ed..a97f70e0d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -18,16 +18,15 @@
  */
 
 #include "config.h"
+#include "empathy-mic-monitor.h"
 
-#include <gtk/gtk.h>
 #include <pulse/glib-mainloop.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-mic-monitor.h"
-
-#include <libempathy/empathy-utils.h>
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 enum
 {
@@ -477,7 +476,7 @@ empathy_mic_monitor_change_microphone_finish (EmpathyMicMonitor *self,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (self,
+  tpaw_implement_finish_void (self,
       empathy_mic_monitor_change_microphone_async);
 }
 
@@ -615,7 +614,7 @@ empathy_mic_monitor_get_default_finish (EmpathyMicMonitor *self,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_return_pointer (self,
+  tpaw_implement_finish_return_pointer (self,
       empathy_mic_monitor_get_default_async);
 }
 
@@ -679,6 +678,6 @@ empathy_mic_monitor_set_default_finish (EmpathyMicMonitor *self,
     GAsyncResult *result,
     GError **error)
 {
-  empathy_implement_finish_void (self,
+  tpaw_implement_finish_void (self,
       empathy_mic_monitor_set_default_async);
 }
diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h
index 4ad4a28fa..73771681a 100644
--- a/src/empathy-mic-monitor.h
+++ b/src/empathy-mic-monitor.h
@@ -19,8 +19,7 @@
 #ifndef __EMPATHY_MIC_MONITOR_H__
 #define __EMPATHY_MIC_MONITOR_H__
 
-#include <glib-object.h>
-
+#include <gio/gio.h>
 #include <pulse/pulseaudio.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index cb8f2a1fb..7f46cb4f1 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -22,20 +22,20 @@
  */
 
 #include "config.h"
+#include "empathy-new-chatroom-dialog.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
     GTK_TYPE_DIALOG)
@@ -115,7 +115,7 @@ new_chatroom_dialog_join (EmpathyNewChatroomDialog *self)
   account_chooser = EMPATHY_ACCOUNT_CHOOSER (self->priv->account_chooser);
   account = empathy_account_chooser_get_account (account_chooser);
 
-  if (!EMP_STR_EMPTY (server))
+  if (!TPAW_STR_EMPTY (server))
     room_name = g_strconcat (room, "@", server, NULL);
   else
     room_name = g_strdup (room);
@@ -290,7 +290,7 @@ update_join_button_sensitivity (EmpathyNewChatroomDialog *self)
 
   room = gtk_entry_get_text (GTK_ENTRY (self->priv->entry_room));
   protocol = tp_account_get_protocol_name (self->priv->account);
-  if (EMP_STR_EMPTY (room))
+  if (TPAW_STR_EMPTY (room))
     goto out;
 
   if (!tp_strdiff (protocol, "irc") &&
@@ -749,7 +749,7 @@ empathy_new_chatroom_dialog_init (EmpathyNewChatroomDialog *self)
       EMPATHY_TYPE_NEW_CHATROOM_DIALOG, EmpathyNewChatroomDialogPriv);
 
   filename = empathy_file_lookup ("empathy-new-chatroom-dialog.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "vbox_new_chatroom", &vbox,
       "table_grid", &self->priv->table_grid,
       "label_account", &self->priv->label_account,
@@ -765,7 +765,7 @@ empathy_new_chatroom_dialog_init (EmpathyNewChatroomDialog *self)
       NULL);
   g_free (filename);
 
-  empathy_builder_connect (gui, self,
+  tpaw_builder_connect (gui, self,
       "entry_server", "changed", new_chatroom_dialog_entry_changed_cb,
       "entry_server", "activate", new_chatroom_dialog_entry_server_activate_cb,
       "entry_server", "focus-out-event",
diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h
index 02bf3b2a0..31212cb56 100644
--- a/src/empathy-new-chatroom-dialog.h
+++ b/src/empathy-new-chatroom-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 
-#include <glib-object.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index c3c996bd6..fb36f2ac3 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -18,18 +18,16 @@
  */
 
 #include "config.h"
+#include "empathy-notifications-approver.h"
 
 #include <glib/gi18n.h>
 
-#include <libempathy-gtk/empathy-notify-manager.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-
+#include "empathy-call-utils.h"
 #include "empathy-event-manager.h"
+#include "empathy-notify-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-notifications-approver.h"
+#include "empathy-debug.h"
 
 struct _EmpathyNotificationsApproverPrivate
 {
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index bfeef61b6..c05058b8d 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -24,21 +24,20 @@
  */
 
 #include "config.h"
+#include "empathy-preferences.h"
 
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-spell.h>
-
-#include "empathy-preferences.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-spell.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
 
@@ -58,7 +57,9 @@ static const gchar * empathy_preferences_tabs[] =
 struct _EmpathyPreferencesPriv {
 	GtkWidget *notebook;
 
+	GtkWidget *label_general_behavior;
 	GtkWidget *checkbutton_events_notif_area;
+	GtkWidget *checkbutton_autoconnect;
 
 	GtkWidget *treeview_sounds;
 	GtkWidget *treeview_spell_checker;
@@ -189,12 +190,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences,
 
 	BIND_ACTIVE (loc, LOCATION_PUBLISH,
 		     "checkbutton_location_publish");
-	BIND_ACTIVE (loc, LOCATION_RESOURCE_NETWORK,
-		     "checkbutton_location_resource_network");
-	BIND_ACTIVE (loc, LOCATION_RESOURCE_CELL,
-		     "checkbutton_location_resource_cell");
-	BIND_ACTIVE (loc, LOCATION_RESOURCE_GPS,
-		     "checkbutton_location_resource_gps");
 	BIND_ACTIVE (loc, LOCATION_REDUCE_ACCURACY,
 		     "checkbutton_location_reduce_accuracy");
 
@@ -1026,19 +1021,21 @@ empathy_preferences_init (EmpathyPreferences *preferences)
 	gtk_window_set_role (GTK_WINDOW (preferences), "preferences");
 	gtk_window_set_position (GTK_WINDOW (preferences),
 				 GTK_WIN_POS_CENTER_ON_PARENT);
-	gtk_window_set_icon_name (GTK_WINDOW (preferences), "gtk-preferences");
+	gtk_window_set_icon_name (GTK_WINDOW (preferences), "preferences-desktop");
 
 	filename = empathy_file_lookup ("empathy-preferences.ui", "src");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 		"notebook", &priv->notebook,
 		"vbox_chat_theme", &priv->vbox_chat_theme,
 		"combobox_chat_theme", &priv->combobox_chat_theme,
 		"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_events_notif_area", &priv->checkbutton_events_notif_area,
 		"treeview_sounds", &priv->treeview_sounds,
 		"treeview_spell_checker", &priv->treeview_spell_checker,
+		"label_general_behavior", &priv->label_general_behavior,
+		"checkbutton_events_notif_area", &priv->checkbutton_events_notif_area,
+		"checkbutton_autoconnect", &priv->checkbutton_autoconnect,
 		NULL);
 	g_free (filename);
 
@@ -1129,12 +1126,19 @@ empathy_preferences_new (GtkWindow *parent,
 
 	/* when running in Gnome Shell we must hide these options since they
 	 * are meaningless in that context:
+	 * - General->Behavior label
 	 * - 'Display incoming events in the notification area' (General->Behavior)
+	 * - 'Automatically connect at startup' (General->Behavior)
 	 * - 'Notifications' tab
 	 */
 	priv = GET_PRIV (self);
 	if (shell_running) {
+		/* Behavior */
+		gtk_widget_hide (priv->label_general_behavior);
 		gtk_widget_hide (priv->checkbutton_events_notif_area);
+		gtk_widget_hide (priv->checkbutton_autoconnect);
+
+		/* Notifications tab */
 		notif_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook),
 		                                        EMPATHY_PREFERENCES_TAB_NOTIFICATIONS);
 		gtk_widget_hide (notif_page);
diff --git a/src/empathy-preferences.ui b/src/empathy-preferences.ui
index a54dcd22d..9aa204fe7 100644
--- a/src/empathy-preferences.ui
+++ b/src/empathy-preferences.ui
@@ -303,7 +303,7 @@
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label612">
+              <object class="GtkLabel" id="label_general_behavior">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Behavior</property>
@@ -833,94 +833,6 @@
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkFrame" id="frame5">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkBox" id="vbox5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_gps">
-                        <property name="label" translatable="yes">_GPS</property>
-                        <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>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_cell">
-                        <property name="label" translatable="yes">_Cellphone</property>
-                        <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="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_location_resource_network">
-                        <property name="label" translatable="yes">_Network (IP, Wi-Fi)</property>
-                        <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="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label5">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Location sources:</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="position">4</property>
diff --git a/src/empathy-roster-window-menubar.ui b/src/empathy-roster-window-menubar.ui
index 2d0b9abb0..44c67d07a 100644
--- a/src/empathy-roster-window-menubar.ui
+++ b/src/empathy-roster-window-menubar.ui
@@ -4,12 +4,12 @@
   <menu id="appmenu">
       <section>
         <item>
-          <attribute translatable="yes" name="label">_New Conversation...</attribute>
+          <attribute translatable="yes" name="label">_New Conversation…</attribute>
           <attribute name="action">win.chat_new_message</attribute>
           <attribute name="accel">&lt;Primary&gt;n</attribute>
         </item>
         <item>
-          <attribute translatable="yes" name="label">New _Call...</attribute>
+          <attribute translatable="yes" name="label">New _Call…</attribute>
           <attribute name="action">win.chat_new_call</attribute>
           <attribute name="accel">&lt;Primary&gt;m</attribute>
         </item>
@@ -18,11 +18,11 @@
         <attribute translatable="yes" name="label">Contacts</attribute>
         <section>
           <item>
-            <attribute translatable="yes" name="label">_Add Contacts...</attribute>
+            <attribute translatable="yes" name="label">_Add Contacts…</attribute>
             <attribute name="action">win.chat_add_contact</attribute>
           </item>
           <item>
-            <attribute translatable="yes" name="label">_Search for Contacts...</attribute>
+            <attribute translatable="yes" name="label">_Search for Contacts…</attribute>
             <attribute name="action">win.chat_search_contacts</attribute>
           </item>
         </section>
@@ -37,7 +37,7 @@
         <attribute translatable="yes" name="label">_Rooms</attribute>
         <section>
           <item>
-            <attribute translatable="yes" name="label">_Join...</attribute>
+            <attribute translatable="yes" name="label">_Join…</attribute>
             <attribute name="action">win.room_join_new</attribute>
             <attribute name="accel">&lt;Primary&gt;j</attribute>
           </item>
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 05d2a1fba..b79c5f89c 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -22,44 +22,43 @@
  */
 
 #include "config.h"
+#include "empathy-roster-window.h"
 
 #include <sys/stat.h>
 #include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-status-presets.h>
-#include <libempathy/empathy-presence-manager.h>
-
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
-#include <libempathy-gtk/empathy-contact-search-dialog.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-gtk-enum-types.h>
-#include <libempathy-gtk/empathy-individual-dialogs.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "empathy-about-dialog.h"
 #include "empathy-accounts-dialog.h"
 #include "empathy-call-observer.h"
 #include "empathy-chat-manager.h"
-#include "empathy-roster-window.h"
-#include "empathy-preferences.h"
-#include "empathy-about-dialog.h"
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-chatroom-manager.h"
 #include "empathy-chatrooms-window.h"
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-contact-search-dialog.h"
 #include "empathy-event-manager.h"
 #include "empathy-ft-manager.h"
+#include "empathy-geometry.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.h"
+#include "empathy-log-window.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-chatroom-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-preferences.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
@@ -332,6 +331,14 @@ roster_window_load_events_idle_cb (gpointer user_data)
 }
 
 static void
+hide_search_bar (EmpathyRosterWindow *roster_window)
+{
+  if (TPAW_IS_LIVE_SEARCH (roster_window->priv->search_bar) &&
+      gtk_widget_is_visible (roster_window->priv->search_bar))
+    gtk_widget_hide (roster_window->priv->search_bar);
+}
+
+static void
 individual_activated_cb (EmpathyRosterView *self,
     FolksIndividual *individual,
     gpointer user_data)
@@ -349,6 +356,9 @@ individual_activated_cb (EmpathyRosterView *self,
   empathy_chat_with_contact (contact, gtk_get_current_event_time ());
 
   g_object_unref (contact);
+
+  /* Hide the search-bar upon hitting "Enter" on an individual */
+  hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data));
 }
 
 static void
@@ -358,6 +368,9 @@ event_activated_cb (EmpathyRosterView *self,
     gpointer user_data)
 {
   empathy_event_activate (event);
+
+  /* Hide the search-bar upon an event activation */
+  hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data));
 }
 
 static void
@@ -477,7 +490,7 @@ static void
 display_page_no_account (EmpathyRosterWindow *self)
 {
   display_page_message (self,
-      _("You need to setup an account to see contacts here."),
+      _("You need to set up an account to see contacts here."),
       PAGE_MESSAGE_FLAG_ACCOUNTS);
 }
 
@@ -731,7 +744,7 @@ roster_window_error_display (EmpathyRosterWindow *self,
        tp_account_get_detailed_error (account, NULL)))
     {
       roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar),
-          GTK_STOCK_REFRESH, _("Update software..."),
+          GTK_STOCK_REFRESH, _("Update software…"),
           ERROR_RESPONSE_RETRY);
     }
   else
@@ -1748,6 +1761,14 @@ account_disabled_cb (TpAccountManager *manager,
 }
 
 static void
+account_removed_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)
@@ -1775,6 +1796,8 @@ 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-removed",
+      G_CALLBACK (account_removed_cb), self, 0);
   tp_g_signal_connect_object (manager, "account-disabled",
       G_CALLBACK (account_disabled_cb), self, 0);
   tp_g_signal_connect_object (manager, "account-enabled",
@@ -1940,7 +1963,17 @@ menu_deactivate_cb (GtkMenuShell *menushell,
 }
 
 static void
+menu_item_activated_cb (GtkMenuShell *menushell,
+    gpointer user_data)
+{
+    EmpathyRosterWindow *roster_window = EMPATHY_ROSTER_WINDOW (user_data);
+
+    hide_search_bar (roster_window);
+}
+
+static void
 popup_individual_menu_cb (EmpathyRosterView *view,
+    const gchar *active_group,
     FolksIndividual *individual,
     guint button,
     guint time,
@@ -1957,7 +1990,8 @@ popup_individual_menu_cb (EmpathyRosterView *view,
     EMPATHY_INDIVIDUAL_FEATURE_REMOVE |
     EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER;
 
-  menu = empathy_individual_menu_new (individual, features, NULL);
+  menu = empathy_individual_menu_new (individual, active_group,
+      features, NULL);
 
   /* menu is initially unowned but gtk_menu_attach_to_widget() takes its
    * floating ref. We can either wait for the view to release its ref
@@ -1967,6 +2001,8 @@ popup_individual_menu_cb (EmpathyRosterView *view,
    * during the whole lifetime of Empathy. */
   g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb),
       NULL);
+  g_signal_connect (menu, "menu-item-activated",
+      G_CALLBACK (menu_item_activated_cb), user_data);
 
   gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (view), NULL);
   gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time);
@@ -2101,22 +2137,22 @@ view_drag_motion_cb (GtkWidget *widget,
     {
       /* Check if contact supports FT */
       FolksIndividual *individual;
-      GtkWidget *child;
+      GtkListBoxRow *row;
 
       individual = empathy_roster_view_get_individual_at_y (self->priv->view,
-          y, &child);
+          y, &row);
       if (individual == NULL)
         goto no_hl;
 
       if (!individual_supports_ft (individual))
         goto no_hl;
 
-      egg_list_box_drag_highlight_widget (EGG_LIST_BOX (widget), child);
+      gtk_list_box_drag_highlight_row (GTK_LIST_BOX (widget), row);
       return FALSE;
     }
 
 no_hl:
-  egg_list_box_drag_unhighlight_widget (EGG_LIST_BOX (widget));
+  gtk_list_box_drag_unhighlight_row (GTK_LIST_BOX (widget));
   return FALSE;
 }
 
@@ -2235,7 +2271,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
 
   /* Set up interface */
   filename = empathy_file_lookup ("empathy-roster-window.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "main_vbox", &self->priv->main_vbox,
       "balance_vbox", &self->priv->balance_vbox,
       "errors_vbox", &self->priv->errors_vbox,
@@ -2280,7 +2316,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
   roster_window_setup_actions (self);
 
   filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src");
-  gui = empathy_builder_get_file (filename,
+  gui = tpaw_builder_get_file (filename,
       "appmenu", &self->priv->menumodel,
       "rooms", &self->priv->rooms_section,
       NULL);
@@ -2330,8 +2366,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
 
   gtk_widget_show (GTK_WIDGET (self->priv->view));
 
-  egg_list_box_add_to_scrolled (EGG_LIST_BOX (self->priv->view),
-      GTK_SCROLLED_WINDOW (sw));
+  gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (self->priv->view));
 
   g_signal_connect (self->priv->view, "individual-activated",
       G_CALLBACK (individual_activated_cb), self);
@@ -2361,10 +2396,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self)
   gtk_widget_set_has_tooltip (GTK_WIDGET (self->priv->view), TRUE);
 
   /* Set up search bar */
-  self->priv->search_bar = empathy_live_search_new (
+  self->priv->search_bar = tpaw_live_search_new (
       GTK_WIDGET (self->priv->view));
   empathy_roster_view_set_live_search (self->priv->view,
-      EMPATHY_LIVE_SEARCH (self->priv->search_bar));
+      TPAW_LIVE_SEARCH (self->priv->search_bar));
   gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar,
       FALSE, TRUE, 0);
 
diff --git a/src/empathy-roster-window.ui b/src/empathy-roster-window.ui
index 25156d5fc..937bae636 100644
--- a/src/empathy-roster-window.ui
+++ b/src/empathy-roster-window.ui
@@ -226,7 +226,7 @@
                 <property name="yscale">0</property>
                 <child>
                   <object class="GtkButton" id="button_add_contact">
-                    <property name="label" translatable="yes">_Add Contact...</property>
+                    <property name="label" translatable="yes">_Add Contact…</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 038cb4955..89e3144cc 100644
--- a/src/empathy-rounded-actor.c
+++ b/src/empathy-rounded-actor.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-rounded-actor.h"
 
 G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR)
diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
index 49fc03fd3..29a7797a6 100644
--- a/src/empathy-rounded-actor.h
+++ b/src/empathy-rounded-actor.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_ACTOR_H__
 #define __EMPATHY_ROUNDED_ACTOR_H__
 
-#include <glib-object.h>
 #include <clutter-gtk/clutter-gtk.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c
index 67c0e27c0..810fa0df7 100644
--- a/src/empathy-rounded-rectangle.c
+++ b/src/empathy-rounded-rectangle.c
@@ -19,11 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-rounded-rectangle.h"
 
 #include <math.h>
 
-#include "empathy-rounded-rectangle.h"
-
 G_DEFINE_TYPE (EmpathyRoundedRectangle,
     empathy_rounded_rectangle,
     CLUTTER_TYPE_CAIRO_TEXTURE)
diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h
index e4bf72c6e..b9988d53c 100644
--- a/src/empathy-rounded-rectangle.h
+++ b/src/empathy-rounded-rectangle.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_RECTANGLE_H__
 #define __EMPATHY_ROUNDED_RECTANGLE_H__
 
-#include <glib-object.h>
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c
index 7ac7d040d..46c0b2135 100644
--- a/src/empathy-rounded-texture.c
+++ b/src/empathy-rounded-texture.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "config.h"
 #include "empathy-rounded-texture.h"
 
 G_DEFINE_TYPE (EmpathyRoundedTexture,
diff --git a/src/empathy-rounded-texture.h b/src/empathy-rounded-texture.h
index ab75757dd..c5d870d03 100644
--- a/src/empathy-rounded-texture.h
+++ b/src/empathy-rounded-texture.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_TEXTURE_H__
 #define __EMPATHY_ROUNDED_TEXTURE_H__
 
-#include <glib-object.h>
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index f7ac7d996..e43c1554a 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -22,24 +22,23 @@
  */
 
 #include "config.h"
-
 #include "empathy-sanity-cleaning.h"
 
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-theme-manager.h>
-
 #ifdef HAVE_UOA
-#include <libempathy/empathy-pkg-kit.h>
-#include <libempathy/empathy-uoa-utils.h>
-
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
+#include <tp-account-widgets/tpaw-keyring.h>
+#include <tp-account-widgets/tpaw-uoa-utils.h>
+
+#include "empathy-pkg-kit.h"
 #endif
 
+#include "empathy-gsettings.h"
+#include "empathy-theme-manager.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /*
  * This number has to be increased each time a new task is added or modified.
@@ -319,7 +318,7 @@ uoa_set_account_password_cb (GObject *source,
   UoaMigrationData *data = user_data;
   GError *error = NULL;
 
-  if (!empathy_keyring_set_account_password_finish (data->new_account, result,
+  if (!tpaw_keyring_set_account_password_finish (data->new_account, result,
           &error))
     {
       DEBUG ("Error setting old account's password on the new one: %s\n",
@@ -339,7 +338,7 @@ uoa_get_account_password_cb (GObject *source,
   const gchar *password;
   GError *error = NULL;
 
-  password = empathy_keyring_get_account_password_finish (data->old_account,
+  password = tpaw_keyring_get_account_password_finish (data->old_account,
       result, &error);
   if (password == NULL)
     {
@@ -350,7 +349,7 @@ uoa_get_account_password_cb (GObject *source,
     }
   else
     {
-      empathy_keyring_set_account_password_async (data->new_account, password,
+      tpaw_keyring_set_account_password_async (data->new_account, password,
           TRUE, uoa_set_account_password_cb, data);
     }
 }
@@ -381,7 +380,7 @@ uoa_account_created_cb (GObject *source,
           tp_account_get_path_suffix (data->old_account));
 
       /* Migrate password as well */
-      empathy_keyring_get_account_password_async (data->old_account,
+      tpaw_keyring_get_account_password_async (data->old_account,
           uoa_get_account_password_cb, data);
     }
 }
@@ -502,7 +501,7 @@ uoa_plugin_installed (AgManager *manager,
   protocol = tp_account_get_protocol_name (account);
   ag_account = ag_manager_create_account (manager, protocol);
 
-  l = ag_account_list_services_by_type (ag_account, EMPATHY_UOA_SERVICE_TYPE);
+  l = ag_account_list_services_by_type (ag_account, TPAW_UOA_SERVICE_TYPE);
   if (l == NULL)
     {
       const gchar *packages[2];
diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h
index 32000163f..f72993257 100644
--- a/src/empathy-sanity-cleaning.h
+++ b/src/empathy-sanity-cleaning.h
@@ -24,10 +24,14 @@
 
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 void empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
     gpointer user_data);
 
 gboolean empathy_sanity_checking_run_finish (GAsyncResult *result,
     GError **error);
 
+G_END_DECLS
+
 #endif
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 54e49a30e..2f71fa13d 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -20,20 +20,21 @@
  */
 
 #include "config.h"
+#include "empathy-status-icon.h"
 
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-presence-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-new-call-dialog.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-status-icon.h"
 #include "empathy-event-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
@@ -82,7 +83,7 @@ status_icon_update_tooltip (EmpathyStatusIcon *icon)
 		type = tp_account_manager_get_most_available_presence (
 			priv->account_manager, NULL, &msg);
 
-		if (!EMP_STR_EMPTY (msg)) {
+		if (!TPAW_STR_EMPTY (msg)) {
 			gtk_status_icon_set_tooltip_text (priv->icon, msg);
 		}
 		else {
@@ -210,7 +211,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
 	if (!visible) {
 		gtk_widget_hide (priv->window);
 	} else {
-		empathy_window_present (GTK_WINDOW (priv->window));
+		tpaw_window_present (GTK_WINDOW (priv->window));
 	}
 }
 
@@ -353,7 +354,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 	gchar                 *filename;
 
 	filename = empathy_file_lookup ("empathy-status-icon.ui", "src");
-	gui = empathy_builder_get_file (filename,
+	gui = tpaw_builder_get_file (filename,
 					"ui_manager", &priv->ui_manager,
 					"menu", &priv->popup_menu,
 					"show_list", &priv->show_window_item,
@@ -362,7 +363,7 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 				       NULL);
 	g_free (filename);
 
-	empathy_builder_connect (gui, icon,
+	tpaw_builder_connect (gui, icon,
 			      "show_list", "toggled", status_icon_show_hide_window_cb,
 			      "new_message", "activate", status_icon_new_message_cb,
 			      "new_call", "activate", status_icon_new_call_cb,
diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h
index ca21af833..586e651e2 100644
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_STATUS_ICON_H__
 #define __EMPATHY_STATUS_ICON_H__
 
-#include <glib.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 12f8d6b47..9856efed9 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-video-src.h"
 
 #ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
@@ -27,9 +28,7 @@
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-video-src.h"
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN)
 
diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h
index e49c79a00..60127ba2d 100644
--- a/src/empathy-video-src.h
+++ b/src/empathy-video-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_VIDEO_SRC_H__
 #define __EMPATHY_GST_VIDEO_SRC_H__
 
-#include <glib-object.h>
 #include <gst/gst.h>
 
 G_BEGIN_DECLS
diff --git a/src/empathy.c b/src/empathy.c
index c36f2a2d7..4a36da61c 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -23,34 +23,32 @@
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
+#include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-utils.h>
 
 #ifdef HAVE_LIBCHAMPLAIN
 #include <clutter-gtk/clutter-gtk.h>
 #endif
 
-#include <libnotify/notify.h>
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-presence-manager.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-ft-factory.h>
-#include <libempathy/empathy-gsettings.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-location-manager.h>
-
-#include "empathy-roster-window.h"
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
-#include "empathy-status-icon.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-ft-factory.h"
 #include "empathy-ft-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-location-manager.h"
 #include "empathy-notifications-approver.h"
+#include "empathy-presence-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-roster-window.h"
+#include "empathy-status-icon.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"
 
@@ -214,11 +212,6 @@ new_ft_handler_cb (EmpathyFTFactory *factory,
   g_object_unref (handler);
 }
 
-static gboolean
-empathy_app_local_command_line (GApplication *app,
-    gchar ***arguments,
-    gint *exit_status);
-
 static void
 empathy_presence_manager_set_auto_away_cb (GSettings *gsettings,
     const gchar *key,
@@ -285,32 +278,18 @@ out:
     }
 }
 
-static int
-empathy_app_command_line (GApplication *app,
-    GApplicationCommandLine *cmdline)
+static void
+empathy_app_activate (GApplication *app)
 {
   EmpathyApp *self = (EmpathyApp *) app;
-  gchar **args, **argv;
-  gint argc, exit_status, i;
-
-  args = g_application_command_line_get_arguments (cmdline, &argc);
-  /* We have to make an extra copy of the array, since g_option_context_parse()
-   * assumes that it can remove strings from the array without freeing them. */
-  argv = g_new (gchar*, argc + 1);
-  for (i = 0; i <= argc; i++)
-    argv[i] = args[i];
-
-  if (empathy_app_local_command_line (app, &argv, &exit_status))
-    DEBUG ("failed to parse command line!");
-
-  g_free (argv);
-  g_strfreev (args);
 
   if (!self->activated)
     {
       GError *error = NULL;
       TpDBusDaemon *dbus;
 
+      empathy_gtk_init ();
+
       /* Create the FT factory */
       self->ft_factory = empathy_ft_factory_dup_singleton ();
       g_signal_connect (self->ft_factory, "new-ft-handler",
@@ -356,21 +335,20 @@ empathy_app_command_line (GApplication *app,
   if (self->show_preferences)
     {
       empathy_roster_window_show_preferences (
-          EMPATHY_ROSTER_WINDOW (self->window), self->preferences_tab);
+          EMPATHY_ROSTER_WINDOW (self->window),
+          tp_str_empty (self->preferences_tab) ? NULL : self->preferences_tab);
 
       self->show_preferences = FALSE;
     }
   else
     {
       if (!self->start_hidden)
-        empathy_window_present (GTK_WINDOW (self->window));
+        tpaw_window_present (GTK_WINDOW (self->window));
     }
 
   /* Display the accounts dialog if needed */
   tp_proxy_prepare_async (self->account_manager, NULL,
       account_manager_ready_cb, self);
-
-  return 0;
 }
 
 static gboolean
@@ -395,16 +373,30 @@ show_version_cb (const char *option_name,
     gpointer data,
     GError **error);
 
+static void
+open_preference_action_cb (GAction  *action,
+    GVariant *parameter,
+    gpointer  data)
+{
+  EmpathyApp *self = EMPATHY_APP (data);
+
+  self->show_preferences = TRUE;
+
+  g_free (self->preferences_tab);
+  self->preferences_tab = g_variant_dup_string (parameter, NULL);
+}
+
 static gboolean
 empathy_app_local_command_line (GApplication *app,
     gchar ***arguments,
     gint *exit_status)
 {
   EmpathyApp *self = (EmpathyApp *) app;
+  GSimpleAction *action;
   gint i;
   gchar **argv;
   gint argc = 0;
-  gboolean retval = FALSE;
+  gboolean retval = TRUE;
   GError *error = NULL;
   gboolean no_connect = FALSE, start_hidden = FALSE;
 
@@ -428,13 +420,26 @@ empathy_app_local_command_line (GApplication *app,
       { NULL }
   };
 
+  if (!g_application_register (app, NULL, &error))
+    {
+      g_warning("Impossible to register empathy: %s", error->message);
+      g_clear_error (&error);
+      *exit_status = EXIT_FAILURE;
+      return retval;
+    }
+
+  action = g_simple_action_new ("open-preferences", G_VARIANT_TYPE_STRING);
+  g_signal_connect (action, "activate", G_CALLBACK (open_preference_action_cb), app);
+  g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action));
+  g_object_unref (action);
+
   /* We create a group so that GOptionArgFuncs get the user data */
   group = g_option_group_new ("empathy", NULL, NULL, app, NULL);
   g_option_group_set_translation_domain (group, GETTEXT_PACKAGE);
   g_option_group_add_entries (group, options);
 
   optcontext = g_option_context_new (N_("- Empathy IM Client"));
-  g_option_context_add_group (optcontext, gtk_get_option_group (TRUE));
+  g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
   g_option_context_set_main_group (optcontext, group);
   g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
 
@@ -453,17 +458,27 @@ empathy_app_local_command_line (GApplication *app,
           "line options.\n",
           error->message, argv[0]);
       g_warning ("Error in empathy init: %s", error->message);
+      g_clear_error (&error);
 
       *exit_status = EXIT_FAILURE;
-      retval = TRUE;
     }
+  else
+    {
+      self->no_connect = no_connect;
+      self->start_hidden = start_hidden;
 
-  g_free (argv);
+      if (self->show_preferences)
+        {
+          GVariant *parameter;
+          parameter = g_variant_new_string (self->preferences_tab ? self->preferences_tab : "");
+          g_action_group_activate_action (G_ACTION_GROUP (app), "open-preferences", parameter);
+        }
 
-  g_option_context_free (optcontext);
+      g_application_activate (app);
+    }
 
-  self->no_connect = no_connect;
-  self->start_hidden = start_hidden;
+  g_free (argv);
+  g_option_context_free (optcontext);
 
   return retval;
 }
@@ -482,8 +497,8 @@ empathy_app_class_init (EmpathyAppClass *klass)
   gobject_class->dispose = empathy_app_dispose;
   gobject_class->finalize = empathy_app_finalize;
 
-  g_app_class->command_line = empathy_app_command_line;
   g_app_class->local_command_line = empathy_app_local_command_line;
+  g_app_class->activate = empathy_app_activate;
 
   spec = g_param_spec_boolean ("no-connect", "no connect",
       "Don't connect on startup",
@@ -818,14 +833,11 @@ main (int argc, char *argv[])
 
   g_type_init ();
   empathy_init ();
-  gtk_init (&argc, &argv);
-  empathy_gtk_init ();
 
   add_empathy_features ();
 
   app = g_object_new (EMPATHY_TYPE_APP,
       "application-id", EMPATHY_DBUS_NAME,
-      "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
       NULL);
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);
diff --git a/telepathy-account-widgets b/telepathy-account-widgets
new file mode 160000
+Subproject fc5e5715096bc50fea89717b07806e5364e0228
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdd67482a..eba5c022f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,10 +10,12 @@ EXTRA_DIST = 		\
 
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy                     	\
+	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)				\
 	-DSRCDIR=\""$(abs_srcdir)"\"			\
@@ -22,6 +24,7 @@ AM_CPPFLAGS =						\
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
+	$(TPAW_LIBS)						\
 	$(EMPATHY_LIBS)						\
 	$(NULL)
 
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 7ecb82ac4..7ebf87803 100644
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -1,12 +1,4 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib/gstdio.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-chatroom-manager.h>
-
+#include "empathy-chatroom-manager.h"
 #include "test-helper.h"
 
 #define CHATROOM_SAMPLE "chatrooms-sample.xml"
diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c
index 3826411a5..a64fd2ce0 100644
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -3,8 +3,7 @@
 #include <string.h>
 
 #include "test-helper.h"
-
-#include <libempathy/empathy-chatroom.h>
+#include "empathy-chatroom.h"
 
 #if 0
 static EmpathyChatroom *
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index ba01c3782..7b7e7a42d 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -2,37 +2,36 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
-#include "test-irc-helper.h"
 #include "test-helper.h"
-
-#include <libempathy/empathy-irc-network-manager.h>
+#include "test-irc-helper.h"
 
 #define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
 #define USER_SAMPLE "user-irc-networks-sample.xml"
 #define USER_FILE "user-irc-networks.xml"
 
 static void
-test_empathy_irc_network_manager_add (void)
+test_tpaw_irc_network_manager_add (void)
 {
-  EmpathyIrcNetworkManager *mgr;
-  EmpathyIrcNetwork *network;
+  TpawIrcNetworkManager *mgr;
+  TpawIrcNetwork *network;
   GSList *networks;
   gchar *name;
 
-  mgr = empathy_irc_network_manager_new (NULL, NULL);
+  mgr = tpaw_irc_network_manager_new (NULL, NULL);
   g_assert (mgr != NULL);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert (networks == NULL);
 
   /* add a network */
-  network = empathy_irc_network_new ("My Network");
+  network = tpaw_irc_network_new ("My Network");
   g_assert (network != NULL);
-  empathy_irc_network_manager_add (mgr, network);
+  tpaw_irc_network_manager_add (mgr, network);
   g_object_unref (network);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 1);
   g_object_get (networks->data, "name", &name, NULL);
   g_assert_cmpstr (name, ==, "My Network");
@@ -41,12 +40,12 @@ test_empathy_irc_network_manager_add (void)
   g_slist_free (networks);
 
   /* add another network having the same name */
-  network = empathy_irc_network_new ("My Network");
+  network = tpaw_irc_network_new ("My Network");
   g_assert (network != NULL);
-  empathy_irc_network_manager_add (mgr, network);
+  tpaw_irc_network_manager_add (mgr, network);
   g_object_unref (network);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 2);
   g_object_get (networks->data, "name", &name, NULL);
   g_assert_cmpstr (name, ==, "My Network");
@@ -63,7 +62,7 @@ test_empathy_irc_network_manager_add (void)
 static void
 test_load_global_file (void)
 {
-  EmpathyIrcNetworkManager *mgr;
+  TpawIrcNetworkManager *mgr;
   gchar *global_file, *user_file;
   GSList *networks, *l;
   struct server_t freenode_servers[] = {
@@ -80,7 +79,7 @@ test_load_global_file (void)
   gchar *global_file_orig;
 
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, NULL);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, NULL);
 
   g_object_get (mgr,
       "global-file", &global_file,
@@ -91,7 +90,7 @@ test_load_global_file (void)
   g_free (global_file_orig);
   g_free (user_file);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 4);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
@@ -140,18 +139,18 @@ test_load_global_file (void)
 }
 
 static gboolean
-remove_network_named (EmpathyIrcNetworkManager *mgr,
+remove_network_named (TpawIrcNetworkManager *mgr,
                       const gchar *network_name)
 {
   GSList *networks, *l;
   gboolean removed = FALSE;
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
 
   /* check networks and servers */
   for (l = networks; l != NULL && !removed; l = g_slist_next (l))
     {
-      EmpathyIrcNetwork *network = l->data;
+      TpawIrcNetwork *network = l->data;
       gchar *name;
 
       g_object_get (network, "name", &name, NULL);
@@ -159,7 +158,7 @@ remove_network_named (EmpathyIrcNetworkManager *mgr,
 
       if (strcmp (name, network_name) == 0)
         {
-          empathy_irc_network_manager_remove (mgr, network);
+          tpaw_irc_network_manager_remove (mgr, network);
           removed = TRUE;
         }
 
@@ -173,9 +172,9 @@ remove_network_named (EmpathyIrcNetworkManager *mgr,
 }
 
 static void
-test_empathy_irc_network_manager_remove (void)
+test_tpaw_irc_network_manager_remove (void)
 {
-  EmpathyIrcNetworkManager *mgr;
+  TpawIrcNetworkManager *mgr;
   GSList *networks, *l;
   struct server_t freenode_servers[] = {
     { "irc.freenode.net", 6667, FALSE },
@@ -189,13 +188,13 @@ test_empathy_irc_network_manager_remove (void)
   gchar *global_file_orig;
 
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, NULL);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, NULL);
   g_free (global_file_orig);
 
   result = remove_network_named (mgr, "GIMPNet");
   g_assert (result);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
@@ -239,7 +238,7 @@ test_empathy_irc_network_manager_remove (void)
 static void
 test_load_user_file (void)
 {
-  EmpathyIrcNetworkManager *mgr;
+  TpawIrcNetworkManager *mgr;
   gchar *global_file, *user_file;
   GSList *networks, *l;
   struct server_t gimpnet_servers[] = {
@@ -255,7 +254,7 @@ test_load_user_file (void)
 
   copy_xml_file (USER_SAMPLE, USER_FILE);
   user_file_orig = get_user_xml_file (USER_FILE);
-  mgr = empathy_irc_network_manager_new (NULL, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (NULL, user_file_orig);
 
   g_object_get (mgr,
       "global-file", &global_file,
@@ -267,7 +266,7 @@ test_load_user_file (void)
   g_free (user_file);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
@@ -311,7 +310,7 @@ test_load_user_file (void)
 static void
 test_load_both_files (void)
 {
-  EmpathyIrcNetworkManager *mgr;
+  TpawIrcNetworkManager *mgr;
   gchar *global_file, *user_file;
   GSList *networks, *l;
   struct server_t freenode_servers[] = {
@@ -332,7 +331,7 @@ test_load_both_files (void)
 
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
   user_file_orig = get_user_xml_file (USER_FILE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, user_file_orig);
 
   g_object_get (mgr,
       "global-file", &global_file,
@@ -345,7 +344,7 @@ test_load_both_files (void)
   g_free (user_file);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 5);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
@@ -401,9 +400,9 @@ test_load_both_files (void)
 static void
 test_modify_user_file (void)
 {
-  EmpathyIrcNetworkManager *mgr;
-  EmpathyIrcNetwork *network;
-  EmpathyIrcServer *server;
+  TpawIrcNetworkManager *mgr;
+  TpawIrcNetwork *network;
+  TpawIrcServer *server;
   gchar *global_file, *user_file;
   GSList *networks, *l;
   struct server_t gimpnet_servers[] = {
@@ -419,7 +418,7 @@ test_modify_user_file (void)
 
   copy_xml_file (USER_SAMPLE, USER_FILE);
   user_file_orig = get_user_xml_file (USER_FILE);
-  mgr = empathy_irc_network_manager_new (NULL, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (NULL, user_file_orig);
 
   g_object_get (mgr,
       "global-file", &global_file,
@@ -430,7 +429,7 @@ test_modify_user_file (void)
   g_free (global_file);
   g_free (user_file);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_modified[0] = network_modified[1] = FALSE;
@@ -450,7 +449,7 @@ test_modify_user_file (void)
           /* change charset */
           g_object_set (network, "charset", "ISO-8859-1", NULL);
 
-          servers = empathy_irc_network_get_servers (network);
+          servers = tpaw_irc_network_get_servers (network);
           for (ll = servers; ll != NULL; ll = g_slist_next (ll))
             {
               gchar *address;
@@ -470,7 +469,7 @@ test_modify_user_file (void)
               else if (strcmp (address, "irc.au.gimp.org") == 0)
                 {
                   /* remove this server */
-                  empathy_irc_network_remove_server (network, server);
+                  tpaw_irc_network_remove_server (network, server);
                 }
               else
                 {
@@ -488,7 +487,7 @@ test_modify_user_file (void)
       else if (strcmp (name, "My Server") == 0)
         {
           /* remove this network */
-          empathy_irc_network_manager_remove (mgr, network);
+          tpaw_irc_network_manager_remove (mgr, network);
           network_modified[1] = TRUE;
         }
       else if (strcmp (name, "Another Server") == 0)
@@ -505,10 +504,10 @@ test_modify_user_file (void)
   g_assert (network_modified[0] && network_modified[1]);
 
   /* Add a new network */
-  network = empathy_irc_network_new ("Great Server");
-  server = empathy_irc_server_new ("irc.greatserver.com", 7873, TRUE);
-  empathy_irc_network_append_server (network, server);
-  empathy_irc_network_manager_add (mgr, network);
+  network = tpaw_irc_network_new ("Great Server");
+  server = tpaw_irc_server_new ("irc.greatserver.com", 7873, TRUE);
+  tpaw_irc_network_append_server (network, server);
+  tpaw_irc_network_manager_add (mgr, network);
   g_object_unref (server);
   g_object_unref (network);
 
@@ -518,10 +517,10 @@ test_modify_user_file (void)
 
 
   /* Now let's reload the file and check its contain */
-  mgr = empathy_irc_network_manager_new (NULL, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (NULL, user_file_orig);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 3);
 
   network_checked[0] = network_checked[1] = network_checked[2] = FALSE;
@@ -565,9 +564,9 @@ test_modify_user_file (void)
 static void
 test_modify_both_files (void)
 {
-  EmpathyIrcNetworkManager *mgr;
-  EmpathyIrcNetwork *network;
-  EmpathyIrcServer *server;
+  TpawIrcNetworkManager *mgr;
+  TpawIrcNetwork *network;
+  TpawIrcServer *server;
   gchar *global_file, *user_file;
   GSList *networks, *l;
   struct server_t gimpnet_servers[] = {
@@ -587,7 +586,7 @@ test_modify_both_files (void)
   copy_xml_file (USER_SAMPLE, USER_FILE);
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
   user_file_orig = get_user_xml_file (USER_FILE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, user_file_orig);
 
   g_object_get (mgr,
       "global-file", &global_file,
@@ -600,7 +599,7 @@ test_modify_both_files (void)
   g_free (user_file);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 5);
 
   network_modified[0] = network_modified[1] = network_modified[2] =
@@ -619,7 +618,7 @@ test_modify_both_files (void)
           /* Modify user network */
           GSList *servers, *ll;
 
-          servers = empathy_irc_network_get_servers (network);
+          servers = tpaw_irc_network_get_servers (network);
           for (ll = servers; ll != NULL; ll = g_slist_next (ll))
             {
               gchar *address;
@@ -639,7 +638,7 @@ test_modify_both_files (void)
               else if (strcmp (address, "irc.au.gimp.org") == 0)
                 {
                   /* remove this server */
-                  empathy_irc_network_remove_server (network, server);
+                  tpaw_irc_network_remove_server (network, server);
                 }
               else
                 {
@@ -657,20 +656,20 @@ test_modify_both_files (void)
       else if (strcmp (name, "My Server") == 0)
         {
           /* remove user network */
-          empathy_irc_network_manager_remove (mgr, network);
+          tpaw_irc_network_manager_remove (mgr, network);
           network_modified[1] = TRUE;
         }
       else if (strcmp (name, "Freenode") == 0)
         {
           /* remove global network */
-          empathy_irc_network_manager_remove (mgr, network);
+          tpaw_irc_network_manager_remove (mgr, network);
           network_modified[2] = TRUE;
         }
       else if (strcmp (name, "Undernet") == 0)
         {
           /* modify global network */
-          server = empathy_irc_server_new ("us.undernet.org", 6667, FALSE);
-          empathy_irc_network_append_server (network, server);
+          server = tpaw_irc_server_new ("us.undernet.org", 6667, FALSE);
+          tpaw_irc_network_append_server (network, server);
           g_object_unref (server);
 
           network_modified[3] = TRUE;
@@ -690,10 +689,10 @@ test_modify_both_files (void)
       && network_modified[3]);
 
   /* Add a new network */
-  network = empathy_irc_network_new ("Great Server");
-  server = empathy_irc_server_new ("irc.greatserver.com", 7873, TRUE);
-  empathy_irc_network_append_server (network, server);
-  empathy_irc_network_manager_add (mgr, network);
+  network = tpaw_irc_network_new ("Great Server");
+  server = tpaw_irc_server_new ("irc.greatserver.com", 7873, TRUE);
+  tpaw_irc_network_append_server (network, server);
+  tpaw_irc_network_manager_add (mgr, network);
   g_object_unref (server);
   g_object_unref (network);
 
@@ -705,11 +704,11 @@ test_modify_both_files (void)
   /* Now let's reload the file and check its contain */
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
   user_file_orig = get_user_xml_file (USER_FILE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, user_file_orig);
   g_free (global_file_orig);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 4);
 
   network_checked[0] = network_checked[1] = network_checked[2] =
@@ -758,30 +757,30 @@ test_modify_both_files (void)
 }
 
 static void
-test_empathy_irc_network_manager_find_network_by_address (void)
+test_tpaw_irc_network_manager_find_network_by_address (void)
 {
-  EmpathyIrcNetworkManager *mgr;
-  EmpathyIrcNetwork *network;
+  TpawIrcNetworkManager *mgr;
+  TpawIrcNetwork *network;
   struct server_t freenode_servers[] = {
     { "irc.freenode.net", 6667, FALSE },
     { "irc.eu.freenode.net", 6667, FALSE }};
   gchar *global_file_orig;
 
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, NULL);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, NULL);
   g_free (global_file_orig);
 
-  network = empathy_irc_network_manager_find_network_by_address (mgr,
+  network = tpaw_irc_network_manager_find_network_by_address (mgr,
       "irc.freenode.net");
   g_assert (network != NULL);
   check_network (network, "Freenode", "UTF-8", freenode_servers, 2);
 
-  network = empathy_irc_network_manager_find_network_by_address (mgr,
+  network = tpaw_irc_network_manager_find_network_by_address (mgr,
       "irc.eu.freenode.net");
   g_assert (network != NULL);
   check_network (network, "Freenode", "UTF-8", freenode_servers, 2);
 
-  network = empathy_irc_network_manager_find_network_by_address (mgr,
+  network = tpaw_irc_network_manager_find_network_by_address (mgr,
       "unknown");
   g_assert (network == NULL);
 
@@ -791,7 +790,7 @@ test_empathy_irc_network_manager_find_network_by_address (void)
 static void
 test_no_modify_with_empty_user_file (void)
 {
-  EmpathyIrcNetworkManager *mgr;
+  TpawIrcNetworkManager *mgr;
   GSList *networks;
   gchar *global_file_orig;
   gchar *user_file_orig;
@@ -801,15 +800,15 @@ test_no_modify_with_empty_user_file (void)
   g_unlink (user_file_orig);
 
   global_file_orig = get_xml_file (GLOBAL_SAMPLE);
-  mgr = empathy_irc_network_manager_new (global_file_orig, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (global_file_orig, user_file_orig);
   g_free (global_file_orig);
   g_object_unref (mgr);
 
   /* We didn't modify anything so USER_FILE should be empty */
-  mgr = empathy_irc_network_manager_new (NULL, user_file_orig);
+  mgr = tpaw_irc_network_manager_new (NULL, user_file_orig);
   g_free (user_file_orig);
 
-  networks = empathy_irc_network_manager_get_networks (mgr);
+  networks = tpaw_irc_network_manager_get_networks (mgr);
   g_assert_cmpuint (g_slist_length (networks), ==, 0);
 
   g_slist_foreach (networks, (GFunc) g_object_unref, NULL);
@@ -826,11 +825,11 @@ main (int argc,
   test_init (argc, argv);
 
   g_test_add_func ("/irc-network-manager/add",
-      test_empathy_irc_network_manager_add);
+      test_tpaw_irc_network_manager_add);
   g_test_add_func ("/irc-network-manager/load-global-file",
       test_load_global_file);
   g_test_add_func ("/irc-network-manager/remove",
-      test_empathy_irc_network_manager_remove);
+      test_tpaw_irc_network_manager_remove);
   g_test_add_func ("/irc-network-manager/load-user-file", test_load_user_file);
   g_test_add_func ("/irc-network-manager/load-both-files",
       test_load_both_files);
@@ -839,7 +838,7 @@ main (int argc,
   g_test_add_func ("/irc-network-manager/modify-both-files",
       test_modify_both_files);
   g_test_add_func ("/irc-network-manager/find-network-by-address",
-      test_empathy_irc_network_manager_find_network_by_address);
+      test_tpaw_irc_network_manager_find_network_by_address);
   g_test_add_func ("/irc-network-manager/no-modify-with-empty-user-file",
       test_no_modify_with_empty_user_file);
 
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index 313ab0651..c784641f2 100644
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -1,18 +1,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-network.h>
 
-#include "test-irc-helper.h"
 #include "test-helper.h"
-
-#include <libempathy/empathy-irc-network.h>
+#include "test-irc-helper.h"
 
 static void
-test_empathy_irc_network_new (void)
+test_tpaw_irc_network_new (void)
 {
-  EmpathyIrcNetwork *network;
+  TpawIrcNetwork *network;
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   g_object_unref (network);
@@ -21,9 +20,9 @@ test_empathy_irc_network_new (void)
 static void
 test_property_change (void)
 {
-  EmpathyIrcNetwork *network;
+  TpawIrcNetwork *network;
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   g_object_set (network,
@@ -40,7 +39,7 @@ test_property_change (void)
 static gboolean modified;
 
 static void
-modified_cb (EmpathyIrcNetwork *network,
+modified_cb (TpawIrcNetwork *network,
              gpointer unused)
 {
   modified = TRUE;
@@ -49,9 +48,9 @@ modified_cb (EmpathyIrcNetwork *network,
 static void
 test_modified_signal (void)
 {
-  EmpathyIrcNetwork *network;
+  TpawIrcNetwork *network;
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   modified = FALSE;
@@ -67,7 +66,7 @@ test_modified_signal (void)
 }
 
 static void
-add_servers (EmpathyIrcNetwork *network,
+add_servers (TpawIrcNetwork *network,
              struct server_t *servers,
              guint nb_servers)
 {
@@ -75,12 +74,12 @@ add_servers (EmpathyIrcNetwork *network,
 
   for (i = 0; i < nb_servers; i ++)
     {
-      EmpathyIrcServer *server;
+      TpawIrcServer *server;
 
-      server = empathy_irc_server_new (servers[i].address,
+      server = tpaw_irc_server_new (servers[i].address,
           servers[i].port, servers[i].ssl);
       modified = FALSE;
-      empathy_irc_network_append_server (network, server);
+      tpaw_irc_network_append_server (network, server);
       g_assert (modified);
       g_object_unref (server);
     }
@@ -89,8 +88,8 @@ add_servers (EmpathyIrcNetwork *network,
 static void
 test_add_server (void)
 {
-  EmpathyIrcNetwork *network;
-  EmpathyIrcServer *server;
+  TpawIrcNetwork *network;
+  TpawIrcServer *server;
   GSList *servers, *l;
   struct server_t test_servers[] = {
     { "server1", 6667, FALSE },
@@ -102,7 +101,7 @@ test_add_server (void)
     { "server2", 6668, TRUE },
     { "server4", 6669, TRUE }};
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   modified = FALSE;
@@ -116,12 +115,12 @@ test_add_server (void)
   check_network (network, "Network1", "UTF-8", test_servers, 4);
 
   /* Now let's remove the 3rd server */
-  servers = empathy_irc_network_get_servers (network);
+  servers = tpaw_irc_network_get_servers (network);
   l = g_slist_nth (servers, 2);
   g_assert (l != NULL);
   server = l->data;
   modified = FALSE;
-  empathy_irc_network_remove_server (network, server);
+  tpaw_irc_network_remove_server (network, server);
   g_assert (modified);
 
   /* free the list */
@@ -137,16 +136,16 @@ test_add_server (void)
 static void
 test_modified_signal_because_of_server (void)
 {
-  EmpathyIrcNetwork *network;
-  EmpathyIrcServer *server;
+  TpawIrcNetwork *network;
+  TpawIrcServer *server;
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   g_signal_connect (network, "modified", G_CALLBACK (modified_cb), NULL);
 
-  server = empathy_irc_server_new ("server1", 6667, FALSE);
-  empathy_irc_network_append_server (network, server);
+  server = tpaw_irc_server_new ("server1", 6667, FALSE);
+  tpaw_irc_network_append_server (network, server);
 
   /* Change server properties */
   modified = FALSE;
@@ -159,7 +158,7 @@ test_modified_signal_because_of_server (void)
   g_object_set (server, "ssl", TRUE, NULL);
   g_assert (modified);
 
-  empathy_irc_network_remove_server (network, server);
+  tpaw_irc_network_remove_server (network, server);
   modified = FALSE;
   g_object_set (server, "address", "server3", NULL);
   /* We removed the server so the network is not modified anymore */
@@ -169,9 +168,9 @@ test_modified_signal_because_of_server (void)
 }
 
 static void
-test_empathy_irc_network_set_server_position (void)
+test_tpaw_irc_network_set_server_position (void)
 {
-  EmpathyIrcNetwork *network;
+  TpawIrcNetwork *network;
   GSList *servers, *l;
   struct server_t test_servers[] = {
     { "server1", 6667, FALSE },
@@ -184,7 +183,7 @@ test_empathy_irc_network_set_server_position (void)
     { "server3", 6667, FALSE },
     { "server1", 6667, FALSE }};
 
-  network = empathy_irc_network_new ("Network1");
+  network = tpaw_irc_network_new ("Network1");
   check_network (network, "Network1", "UTF-8", NULL, 0);
 
   modified = FALSE;
@@ -195,24 +194,24 @@ test_empathy_irc_network_set_server_position (void)
   check_network (network, "Network1", "UTF-8", test_servers, 4);
 
   /* get servers list */
-  servers = empathy_irc_network_get_servers (network);
+  servers = tpaw_irc_network_get_servers (network);
   g_assert (g_slist_length (servers) == 4);
   modified = FALSE;
 
   /* server1 go to the last position */
-  empathy_irc_network_set_server_position (network, servers->data, -1);
+  tpaw_irc_network_set_server_position (network, servers->data, -1);
 
   /* server2 go to the first position */
   l = servers->next;
-  empathy_irc_network_set_server_position (network, l->data, 0);
+  tpaw_irc_network_set_server_position (network, l->data, 0);
 
   /* server3 go to the third position */
   l = l->next;
-  empathy_irc_network_set_server_position (network, l->data, 2);
+  tpaw_irc_network_set_server_position (network, l->data, 2);
 
   /* server4 go to the second position*/
   l = l->next;
-  empathy_irc_network_set_server_position (network, l->data, 1);
+  tpaw_irc_network_set_server_position (network, l->data, 1);
 
   g_assert (modified);
 
@@ -232,14 +231,14 @@ main (int argc,
 
   test_init (argc, argv);
 
-  g_test_add_func ("/irc-network/new", test_empathy_irc_network_new);
+  g_test_add_func ("/irc-network/new", test_tpaw_irc_network_new);
   g_test_add_func ("/irc-network/property-change", test_property_change);
   g_test_add_func ("/irc-network/modified-signal", test_modified_signal);
   g_test_add_func ("/irc-network/add-server", test_add_server);
   g_test_add_func ("/irc-network/modified-signal-because-of-server",
       test_modified_signal_because_of_server);
   g_test_add_func ("/irc-network/set-server-position",
-      test_empathy_irc_network_set_server_position);
+      test_tpaw_irc_network_set_server_position);
 
   result = g_test_run ();
   test_deinit ();
diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index 573967e43..fc0eb5b15 100644
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -1,18 +1,17 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-irc-server.h>
 
-#include "test-irc-helper.h"
 #include "test-helper.h"
-
-#include <libempathy/empathy-irc-server.h>
+#include "test-irc-helper.h"
 
 static void
-test_empathy_irc_server_new (void)
+test_tpaw_irc_server_new (void)
 {
-  EmpathyIrcServer *server;
+  TpawIrcServer *server;
 
-  server = empathy_irc_server_new ("test.localhost", 6667, TRUE);
+  server = tpaw_irc_server_new ("test.localhost", 6667, TRUE);
   check_server (server, "test.localhost", 6667, TRUE);
 
   g_object_unref (server);
@@ -21,9 +20,9 @@ test_empathy_irc_server_new (void)
 static void
 test_property_change (void)
 {
-  EmpathyIrcServer *server;
+  TpawIrcServer *server;
 
-  server = empathy_irc_server_new ("test.localhost", 6667, TRUE);
+  server = tpaw_irc_server_new ("test.localhost", 6667, TRUE);
   g_assert (server != NULL);
 
   g_object_set (server,
@@ -40,7 +39,7 @@ test_property_change (void)
 static gboolean modified = FALSE;
 
 static void
-modified_cb (EmpathyIrcServer *server,
+modified_cb (TpawIrcServer *server,
              gpointer unused)
 {
   modified = TRUE;
@@ -49,9 +48,9 @@ modified_cb (EmpathyIrcServer *server,
 static void
 test_modified_signal (void)
 {
-  EmpathyIrcServer *server;
+  TpawIrcServer *server;
 
-  server = empathy_irc_server_new ("test.localhost", 6667, TRUE);
+  server = tpaw_irc_server_new ("test.localhost", 6667, TRUE);
   g_assert (server != NULL);
 
   g_signal_connect (server, "modified", G_CALLBACK (modified_cb), NULL);
@@ -88,7 +87,7 @@ main (int argc,
 
   test_init (argc, argv);
 
-  g_test_add_func ("/irc-server/new", test_empathy_irc_server_new);
+  g_test_add_func ("/irc-server/new", test_tpaw_irc_server_new);
   g_test_add_func ("/irc-server/property-change", test_property_change);
   g_test_add_func ("/irc-server/modified-signal", test_modified_signal);
 
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 6c53f07ad..2fb3e48db 100644
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -3,13 +3,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <tp-account-widgets/tpaw-live-search.h>
 
 #include "test-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-live-search.h>
+#include "empathy-debug.h"
 
 typedef struct
 {
@@ -58,7 +57,7 @@ test_live_search (void)
       gboolean match;
       gboolean ok;
 
-      match = empathy_live_search_match_string (tests[i].string, tests[i].prefix);
+      match = tpaw_live_search_match_string (tests[i].string, tests[i].prefix);
       ok = (match == tests[i].should_match);
 
       DEBUG ("'%s' - '%s' %s: %s", tests[i].string, tests[i].prefix,
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 4ae6f775a..843bf368c 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -3,15 +3,14 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <telepathy-glib/telepathy-glib.h>
+#include <tp-account-widgets/tpaw-string-parser.h>
 
+#include "empathy-string-parser.h"
 #include "test-helper.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
-#include <libempathy/empathy-debug.h>
-
-#include <libempathy-gtk/empathy-string-parser.h>
+#include "empathy-debug.h"
 
 static void
 test_replace_match (const gchar *text,
@@ -97,11 +96,11 @@ test_parsers (void)
 
       NULL, NULL
     };
-  EmpathyStringParser parsers[] =
+  TpawStringParser parsers[] =
     {
-      {empathy_string_match_link, test_replace_match},
+      {tpaw_string_match_link, test_replace_match},
       {empathy_string_match_smiley, test_replace_match},
-      {empathy_string_match_all, empathy_string_replace_escaped},
+      {tpaw_string_match_all, tpaw_string_replace_escaped},
       {NULL, NULL}
     };
   guint i;
@@ -113,7 +112,7 @@ test_parsers (void)
       gboolean ok;
 
       string = g_string_new (NULL);
-      empathy_string_parser_substr (tests[i], -1, parsers, string);
+      tpaw_string_parser_substr (tests[i], -1, parsers, string);
 
       ok = !tp_strdiff (tests[i + 1], string->str);
       DEBUG ("'%s' => '%s': %s", tests[i], string->str, ok ? "OK" : "FAILED");
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 2004383d6..2155c68b2 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -1,18 +1,9 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <libempathy/empathy-tls-verifier.h>
-#include "test-helper.h"
-#include "mock-pkcs11.h"
-
-#include <gcr/gcr.h>
-
 #include <gnutls/gnutls.h>
-
-#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-glib/svc-tls.h>
-#include <telepathy-glib/svc-generic.h>
+
+#include "empathy-tls-verifier.h"
+#include "mock-pkcs11.h"
+#include "test-helper.h"
 
 #define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate"
 
diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 27fdbf7e4..e1236f4ba 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,14 +1,17 @@
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy                     	\
+	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
+	$(TPAW_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
 LDADD =								\
 	$(top_builddir)/libempathy-gtk/libempathy-gtk.la	\
 	$(top_builddir)/libempathy/libempathy.la		\
+	$(TPAW_LIBS)						\
 	$(EMPATHY_LIBS)
 
 noinst_PROGRAMS =			\
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 0ed9f95e4..613bf7516 100644
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -19,15 +19,16 @@
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-log-window.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-debug.h"
+#include "empathy-log-window.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 static void
 destroy_cb (GtkWidget *dialog,
diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index 7622a6248..159f8fcfa 100644
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-account-chooser.h>
+#include "empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
 
 static void
 filter_func (TpAccount *account,
diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c
index df91f1f2d..a3207eed2 100644
--- a/tests/interactive/test-empathy-calendar-button.c
+++ b/tests/interactive/test-empathy-calendar-button.c
@@ -21,10 +21,10 @@
 
 #include "config.h"
 
-#include <libempathy-gtk/empathy-calendar-button.h>
+#include <tp-account-widgets/tpaw-calendar-button.h>
 
 static void
-date_changed_cb (EmpathyCalendarButton *button,
+date_changed_cb (TpawCalendarButton *button,
     GDate *date,
     gpointer user_data)
 {
@@ -55,10 +55,10 @@ main (int argc,
   g_signal_connect_swapped (win, "destroy",
       G_CALLBACK (gtk_main_quit), NULL);
 
-  button = empathy_calendar_button_new ();
+  button = tpaw_calendar_button_new ();
 
   date = g_date_new_dmy (30, 11, 1984);
-  empathy_calendar_button_set_date (EMPATHY_CALENDAR_BUTTON (button), date);
+  tpaw_calendar_button_set_date (TPAW_CALENDAR_BUTTON (button), date);
   g_date_free (date);
 
   g_signal_connect (button, "date-changed",
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index 66353f13d..185f4e954 100644
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -19,14 +19,13 @@
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
+#include "empathy-client-factory.h"
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
 
 static void
 am_prepare_cb (GObject *source,
diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c
index 50903c01f..0d4b889d3 100644
--- a/tests/interactive/test-empathy-dual-roster-view.c
+++ b/tests/interactive/test-empathy-dual-roster-view.c
@@ -1,10 +1,9 @@
-#include <config.h>
+#include "config.h"
 
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
 
 static void
 individual_activated_cb (EmpathyRosterView *self,
@@ -19,6 +18,7 @@ individual_activated_cb (EmpathyRosterView *self,
 
 static void
 popup_individual_menu_cb (EmpathyRosterView *self,
+    const gchar *group,
     FolksIndividual *individual,
     guint button,
     guint time,
@@ -26,8 +26,8 @@ popup_individual_menu_cb (EmpathyRosterView *self,
 {
   GtkWidget *menu, *item;
 
-  g_print ("'%s' popup menu\n",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
+  g_print ("'%s' (group: %s) popup menu\n",
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), group);
 
   menu = gtk_menu_new ();
 
@@ -94,16 +94,15 @@ create_view_box (EmpathyRosterModel *model,
   empathy_roster_view_show_offline (EMPATHY_ROSTER_VIEW (view), show_offline);
   empathy_roster_view_show_groups (EMPATHY_ROSTER_VIEW (view), show_groups);
 
-  search = empathy_live_search_new (view);
+  search = tpaw_live_search_new (view);
   empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view),
-      EMPATHY_LIVE_SEARCH (search));
+      TPAW_LIVE_SEARCH (search));
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
-  egg_list_box_add_to_scrolled (EGG_LIST_BOX (view),
-      GTK_SCROLLED_WINDOW (scrolled));
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
 
   gtk_box_pack_start (GTK_BOX (box), search, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), scrolled, TRUE, TRUE, 0);
diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 12d35b4c6..208c9a12e 100644
--- a/tests/interactive/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
@@ -20,14 +20,13 @@
  * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-status-presets.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
+#include "empathy-presence-chooser.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
 
 int
 main (int argc, char **argv)
diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index 90b1797a3..ca548a85b 100644
--- a/tests/interactive/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
@@ -1,9 +1,9 @@
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
+#include "empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
 
 int
 main (int argc,
diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c
index 49f2012f0..a25109631 100644
--- a/tests/interactive/test-empathy-roster-model-aggregator.c
+++ b/tests/interactive/test-empathy-roster-model-aggregator.c
@@ -1,10 +1,9 @@
-#include <config.h>
+#include "config.h"
 
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-aggregator.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model-aggregator.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;
@@ -29,6 +28,7 @@ individual_activated_cb (EmpathyRosterView *self,
 
 static void
 popup_individual_menu_cb (EmpathyRosterView *self,
+    const gchar *group,
     FolksIndividual *individual,
     guint button,
     guint time,
@@ -36,8 +36,8 @@ popup_individual_menu_cb (EmpathyRosterView *self,
 {
   GtkWidget *menu, *item;
 
-  g_print ("'%s' popup menu\n",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
+  g_print ("'%s' (group: %s) popup menu\n",
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), group);
 
   menu = gtk_menu_new ();
 
@@ -137,16 +137,15 @@ main (int argc,
   empathy_roster_view_show_offline (EMPATHY_ROSTER_VIEW (view), show_offline);
   empathy_roster_view_show_groups (EMPATHY_ROSTER_VIEW (view), show_groups);
 
-  search = empathy_live_search_new (view);
+  search = tpaw_live_search_new (view);
   empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view),
-      EMPATHY_LIVE_SEARCH (search));
+      TPAW_LIVE_SEARCH (search));
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
-  egg_list_box_add_to_scrolled (EGG_LIST_BOX (view),
-      GTK_SCROLLED_WINDOW (scrolled));
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
 
   gtk_box_pack_start (GTK_BOX (box), search, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), scrolled, TRUE, TRUE, 0);
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 96137c395..fbf09c71d 100644
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,10 +1,9 @@
-#include <config.h>
+#include "config.h"
 
-#include <libempathy-gtk/empathy-roster-model.h>
-#include <libempathy-gtk/empathy-roster-model-manager.h>
-
-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"
 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;
@@ -29,6 +28,7 @@ individual_activated_cb (EmpathyRosterView *self,
 
 static void
 popup_individual_menu_cb (EmpathyRosterView *self,
+    const gchar *group,
     FolksIndividual *individual,
     guint button,
     guint time,
@@ -36,8 +36,8 @@ popup_individual_menu_cb (EmpathyRosterView *self,
 {
   GtkWidget *menu, *item;
 
-  g_print ("'%s' popup menu\n",
-      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)));
+  g_print ("'%s' (group: %s) popup menu\n",
+      folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), group);
 
   menu = gtk_menu_new ();
 
@@ -129,16 +129,15 @@ main (int argc,
 
   g_object_unref (mgr);
 
-  search = empathy_live_search_new (view);
+  search = tpaw_live_search_new (view);
   empathy_roster_view_set_live_search (EMPATHY_ROSTER_VIEW (view),
-      EMPATHY_LIVE_SEARCH (search));
+      TPAW_LIVE_SEARCH (search));
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
       GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 
-  egg_list_box_add_to_scrolled (EGG_LIST_BOX (view),
-      GTK_SCROLLED_WINDOW (scrolled));
+  gtk_container_add (GTK_CONTAINER (scrolled), view);
 
   gtk_box_pack_start (GTK_BOX (box), search, FALSE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (box), scrolled, TRUE, TRUE, 0);
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index e71852509..2494d78b7 100644
--- a/tests/interactive/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
@@ -22,14 +22,13 @@
  *   Will Thompson <will.thompson@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-status-presets.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-status-preset-dialog.h>
+#include "empathy-status-preset-dialog.h"
+#include "empathy-status-presets.h"
+#include "empathy-ui-utils.h"
 
 int
 main (int argc, char **argv)
diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 4b1219f2c..572221acc 100644
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -19,13 +19,8 @@
  */
 
 #include "config.h"
-
 #include "mock-pkcs11.h"
 
-#include <gcr/gcr.h>
-
-#include <glib.h>
-
 #include <string.h>
 
 /*
diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h
index 67d94bef3..aa024fcc9 100644
--- a/tests/mock-pkcs11.h
+++ b/tests/mock-pkcs11.h
@@ -18,12 +18,8 @@
  * 02111-1307, USA.
  */
 
-#include <glib.h>
-
-#include <gcr/gcr.h>
-
-#include <p11-kit/pkcs11.h>
 #include <gck/pkcs11x.h>
+#include <gcr/gcr.h>
 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H
diff --git a/tests/test-helper.c b/tests/test-helper.c
index ca763adb4..efe3e3fd6 100644
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -17,15 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-
+#include "config.h"
 #include "test-helper.h"
 
+#include "empathy-ui-utils.h"
+
 void
 test_init (int argc,
     char **argv)
diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c
index ade247f39..82d933a7d 100644
--- a/tests/test-irc-helper.c
+++ b/tests/test-irc-helper.c
@@ -1,7 +1,8 @@
+#include "config.h"
 #include "test-irc-helper.h"
 
 void
-check_server (EmpathyIrcServer *server,
+check_server (TpawIrcServer *server,
               const gchar *_address,
               guint _port,
               gboolean _ssl)
@@ -26,7 +27,7 @@ check_server (EmpathyIrcServer *server,
 }
 
 void
-check_network (EmpathyIrcNetwork *network,
+check_network (TpawIrcNetwork *network,
               const gchar *_name,
               const gchar *_charset,
               struct server_t *_servers,
@@ -46,13 +47,13 @@ check_network (EmpathyIrcNetwork *network,
   g_assert (name != NULL && strcmp (name, _name) == 0);
   g_assert (charset != NULL && strcmp (charset, _charset) == 0);
 
-  servers = empathy_irc_network_get_servers (network);
+  servers = tpaw_irc_network_get_servers (network);
   g_assert (g_slist_length (servers) == nb_servers);
 
   /* Is that the right servers ? */
   for (l = servers, i = 0; l != NULL; l = g_slist_next (l), i++)
     {
-      EmpathyIrcServer *server;
+      TpawIrcServer *server;
       gchar *address;
       guint port;
       gboolean ssl;
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index e375f6fb6..02eda9178 100644
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,6 @@
-#include <stdlib.h>
 #include <string.h>
 
-#include <libempathy/empathy-irc-server.h>
-#include <libempathy/empathy-irc-network.h>
-#include <libempathy/empathy-irc-network-manager.h>
+#include <tp-account-widgets/tpaw-irc-network-manager.h>
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
@@ -15,10 +12,10 @@ struct server_t
   gboolean ssl;
 };
 
-void check_server (EmpathyIrcServer *server, const gchar *_address,
+void check_server (TpawIrcServer *server, const gchar *_address,
     guint _port, gboolean _ssl);
 
-void check_network (EmpathyIrcNetwork *network, const gchar *_name,
+void check_network (TpawIrcNetwork *network, const gchar *_name,
     const gchar *_charset, struct server_t *_servers, guint nb_servers);
 
 #endif /* __CHECK_IRC_HELPER_H__ */
diff --git a/tools/empathy-env.in b/tools/empathy-env.in
index 3de477910..3c9e1e363 100644
--- a/tools/empathy-env.in
+++ b/tools/empathy-env.in
@@ -3,6 +3,9 @@ abs_top_builddir="@abs_top_builddir@"
 export abs_top_builddir
 EMPATHY_SRCDIR=$abs_top_builddir
 export EMPATHY_SRCDIR
+TPAW_SRCDIR="${EMPATHY_SRCDIR}/telepathy-account-widgets"
+export TPAW_SRCDIR
+export EMPATHY_SRCDIR
 GSETTINGS_SCHEMA_DIR="${EMPATHY_SRCDIR}/data/"
 export GSETTINGS_SCHEMA_DIR
 
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index f76c2fa53..1271f6ec3 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -2,7 +2,8 @@ plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
 
 INCLUDES =					\
 	-I$(top_builddir)			\
-	-I$(top_srcdir)				\
+	-I$(top_srcdir)/libempathy		\
+	-I$(top_srcdir)/libempathy-gtk		\
 	-DLOCALEDIR=\""$(datadir)/locale"\"	\
 	$(UOA_CFLAGS)				\
 	$(WARN_CFLAGS)				\
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index f90815924..c0f29e2c7 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "empathy-accounts-plugin-widget.h"
+#include "tpaw-accounts-plugin-widget.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -30,7 +30,7 @@
 #include <libaccounts-glib/ag-service.h>
 #include <libaccounts-glib/ag-account-service.h>
 
-#include <libempathy-gtk/empathy-account-widget.h>
+#include "tpaw-account-widget.h"
 
 G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
 
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
index 17963e656..27d114c0e 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 #define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index 939912aad..1f322ec52 100644
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
@@ -22,8 +22,8 @@
 
 #include "empathy-accounts-plugin.h"
 
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-uoa-utils.h>
+#include "empathy-client-factory.h"
+#include "empathy-uoa-utils.h"
 
 #include "empathy-accounts-plugin-widget.h"
 
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
index e3351266b..801c2d8a1 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/Makefile.am
@@ -3,6 +3,8 @@ plugindir = $(ACCOUNTS_APP_PLUGIN_DIR)
 INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_srcdir)				\
+	-I$(top_srcdir)/libempathy		\
+	-I$(top_srcdir)/libempathy-gtk		\
 	-DLOCALEDIR=\""$(datadir)/locale"\"	\
 	$(UOA_CFLAGS)				\
 	$(WARN_CFLAGS)				\
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
index 768f0965d..6895a04d5 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
@@ -27,8 +27,8 @@
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-provider.h>
 
-#include <libempathy/empathy-contact.h>
-#include <libempathy-gtk/empathy-user-info.h>
+#include "empathy-contact.h"
+#include "empathy-user-info.h"
 
 #include "empathy-app-plugin-widget.h"
 
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
index b1bfb28cd..aa9d3a204 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h
@@ -18,12 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__
 #define __EMPATHY_APP_PLUGIN_WIDGET_H__
 
 #include <gtk/gtk.h>
-
 #include <libaccounts-glib/ag-account.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
index c15a13a7a..c22c6d59b 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
@@ -22,7 +22,7 @@
 
 #include "empathy-app-plugin.h"
 
-#include <libempathy/empathy-client-factory.h>
+#include "empathy-client-factory.h"
 
 #include "empathy-app-plugin-widget.h"
 
diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
index 0167c851e..679639670 100644
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h
@@ -22,7 +22,6 @@
 #define __EMPATHY_APP_PLUGIN_H__
 
 #include <glib-object.h>
-
 #include <libaccount-plugin/application-plugin.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
index 439bbda65..761e22154 100644
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c
@@ -1,13 +1,10 @@
 #include "config.h"
+#include "empathy-webcredentials-monitor.h"
 
 #include <gio/gio.h>
-
 #include <telepathy-glib/telepathy-glib.h>
-
 #include <libaccounts-glib/ag-account.h>
 
-#include "empathy-webcredentials-monitor.h"
-
 G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT)
 
 #define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials"
diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
index cf373a2d4..1c96f3368 100644
--- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
+++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h
@@ -2,7 +2,6 @@
 #define __EMPATHY_WEBCREDENTIALS_MONITOR_H__
 
 #include <glib-object.h>
-
 #include <libaccounts-glib/ag-manager.h>
 
 G_BEGIN_DECLS
diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
index 8919065ef..0607b9e29 100644
--- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
+++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c
@@ -20,12 +20,10 @@
 #include "mcp-account-manager-uoa.h"
 
 #include <telepathy-glib/telepathy-glib.h>
-
 #include <libaccounts-glib/ag-account.h>
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-service.h>
-
 #include <string.h>
 #include <ctype.h>
 
diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
index d7a33fd43..3e61dc3ba 100644
--- a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
+++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c
@@ -22,6 +22,8 @@
  * Authors: Xavier Claessens <xavier.claessens@collabora.co.uk>
  */
 
+#include "config.h"
+
 #include <mission-control-plugins/mission-control-plugins.h>
 
 #include "mcp-account-manager-uoa.h"