From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 17 Jun 2013 09:58:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b7c6186d4b17e1ee7064de7b3c5255988304bc33;hp=e23e2b8330f63207867224ab96ef11b2aedf9cfc

Merge remote-tracking branch 'origin/gnome-3-8'
---

diff --git a/NEWS b/NEWS
index 86eb15a6..7fc15118 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,42 @@
-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/configure.ac b/configure.ac
index 3ce63fe4..fd61787e 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], [3])
+m4_define([empathy_minor_version], [9])
+m4_define([empathy_micro_version], [2])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in
index c5dea6f7..2e9b9fc9 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/extensions/extensions.h b/extensions/extensions.h
index 2dbd79cc..c1c42164 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 41eb8f6e..dc9e036e 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 40653056..d4e8ae29 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 90a9e908..89cbe39a 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 213247c8..4b4b9277 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/add-contact.page b/help/C/add-contact.page
index 0bf6a0b5..3426cd6f 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 024b4637..4d9707f3 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/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
deleted file mode 100644
index f45d15d5..00000000
Binary files a/help/C/figures/audio-input-microphone.png and /dev/null differ
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
deleted file mode 100644
index e5406c5b..00000000
Binary files a/help/C/figures/camera-web.png and /dev/null differ
diff --git a/help/C/index.page b/help/C/index.page
index 5b700188..16e0563c 100644
--- a/help/C/index.page
+++ b/help/C/index.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="guide"
       id="index">
 
@@ -25,8 +26,8 @@
   </info>
 
   <title>
-    <media type="image" mime="image/png" src="figures/empathy-logo.png">
-      Empathy Internet Messenger logo
+    <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no">
+      <span its:translate="yes">Empathy Internet Messenger logo</span>
     </media>
     Empathy Internet Messenger
   </title>
diff --git a/help/C/link-contacts.page b/help/C/link-contacts.page
index 06184ac6..6a23cd14 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 daa67b84..2ce72a9d 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 38ca57c4..0ce4a506 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 00407a66..f3bdefd3 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 91d48222..146c0eb7 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 be63f994..1212fdb7 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 bbd4c681..0cdd63c1 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 60b9faca..6253e2a0 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 3193c282..d1fdd8f1 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/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:30(media/span)
+msgid "Empathy Internet Messenger logo"
+msgstr "Logotip del programa de 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/index.page:28(page/title)
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "<_:media-1/> Missatgeria d'Internet Empathy"
 
-#: 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/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "Xarxes"
 
-#: C/share-desktop.page:51(p)
+#: 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)
-msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
-msgstr ""
-"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista "
-"desplegable de la part superior."
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr "<gui>Servidors</gui>"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-irc.page:142(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>."
+"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 ""
-"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>."
+"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:58(p)
+#: C/account-irc.page:147(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."
+"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 ""
-"Introduïu el missatge personalitzat a la caixa de text de dalt de la finestra "
-"i premeu <key>Retorn</key> per establir el missatge."
+"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:64(p)
+#: C/account-irc.page:151(item/p)
 msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"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 ""
-"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."
+"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/set-custom-status.page:69(p)
-msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
-msgstr ""
-"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/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "Editeu , suprimiu i afegiu un missatge personalitzat"
-
-#: 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: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:95(p)
-msgid "To edit a custom message:"
-msgstr "Per editar un missatge personalitzat:"
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Dades dels comptes de Jabber"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:31(page/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."
+"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 ""
-"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:"
+"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:118(p)
+#: C/account-jabber.page:39(note/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
 msgstr ""
-"Des de la caixa <guilabel>Paràmetres desats</guilabel>, seleccioneu el "
-"missatge d'estat que voleu suprimir."
+"Com que el Google Talk també és un tipus de compte de Jabber, les "
+"instruccions següents també serveixen."
 
-#: 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:45(item/title)
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "<gui>Es requereix encriptació (TLS/SSL)</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:131(p)
+#: C/account-jabber.page:47(item/p)
 msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+"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 ""
-"Per afegir un missatge personalitzat nou des de la secció <gui>Afegeix un "
-"paràmetre nou</gui>:"
+"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:136(p)
+#: C/account-jabber.page:52(item/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
+"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 ""
-"Feu clic a la llista desplegable per seleccionar l'estat al que voleu "
-"afegir-hi el missatge personalitzat."
-
-#: 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."
+"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:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr ""
-"Feu clic a <gui>Afegeix</gui> per afegir el missatge nou als per defecte."
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr "<gui>Recurs</gui>"
 
-#: 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/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
+msgstr "<gui>Prioritat</gui>"
 
-#: C/set-custom-status.page:163(p)
+#: C/account-jabber.page:61(item/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"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 ""
-"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>."
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "Envieu un missatge a un dels contactes."
-
-#: 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"
+"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/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/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 ""
+"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/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "Envieu una missatge a algú"
+#: C/account-jabber.page:70(item/title)
+msgid "<gui>Override server settings</gui>"
+msgstr "<gui>Sobreescriu els paràmetres del servidor</gui>"
 
-#: C/send-message.page:36(p)
-#, fuzzy
-#| msgid ""
-#| "Double click the name of the contact that you want to have a conversation "
-#| "with."
+#: C/account-jabber.page:71(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."
+"<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 doble clic sobre el nom del contacte amb el qual voleu tindre la "
-"conversació."
+"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/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "Afegiu, modifiqueu i suprimiu comptes."
+
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "Finestra dels comptes"
 
-#: C/send-message.page:42(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
 msgstr ""
-"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."
+"La finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir "
+"comptes."
 
-#: 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/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "Dades dels comptes"
 
-#: C/send-message.page:58(p)
+#: C/accounts-window.page:44(section/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
 msgstr ""
-"Seleccioneu el contacte amb el que voleu conversar i des del menú seleccioneu "
-"<gui style=\"menuitem\">Xat</gui>."
+"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-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."
+#: 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-file.page:36(title)
-msgid "Send files"
-msgstr "Envia fitxers"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "Afegiu un compte nou"
 
-#: C/send-file.page:45(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
-"Feu clic amb el botó secundari al contacte que li voleu enviar el fitxer i "
-"seleccioneu <gui>Envia un fitxer</gui>."
+"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-file.page:50(p)
+#: C/add-account.page:49(item/p) C/disable-account.page:49(item/p)
+#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p)
 msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgstr ""
-"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>."
-
-#: 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>."
+"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-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-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "Feu clic a <gui style=\"button\">+</gui>."
 
-#: C/send-file.page:66(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
 msgstr ""
-"Espereu que el contacte accepti la transferència del fitxer o feu clic a "
-"<gui>Atura</gui> per aturar la transferència."
+"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de "
+"compte que vulgueu afegir."
 
-#: C/send-file.page:72(p)
+#: C/add-account.page:62(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
 msgstr ""
-"Una vegada s'hagi acabat la transferència podeu tancar la finestra "
-"<gui>Transferències de fitxers</gui>."
+"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:80(p)
+#: C/add-account.page:69(item/p)
 msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/>for more information."
 msgstr ""
-"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."
+"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:87(p)
-msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
-msgstr ""
-"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: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/send-file.page:93(p)
+#: C/add-account.page:81(note/p)
 msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"Per enviar un fitxer a algú us cal estar connectat a Internet o a una "
-"xarxa d'àrea local."
+"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/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "Explicació sobre la funció de «Gent propera»."
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "Afegiu algú a la llista de contactes."
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "Què és la «Gent propera»?"
+#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name)
+#: C/prob-conn-acctdisabled.page:15(credit/name)
+#: C/prob-conn-auth.page:17(credit/name)
+#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name)
+#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "Afegiu algú a la llista de contactes"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
 msgstr ""
+"Seleccioneu <guiseq><gui>Xat</gui><gui>Afegeix contacte</gui></guiseq>."
 
-#: C/salut-protocol.page:40(p)
+#: C/add-contact.page:40(item/p)
 msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
+"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 ""
-"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."
+"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/salut-protocol.page:45(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una "
-"xarxa local i no cal una connexió a Internet activa."
+"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/salut-protocol.page:49(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
 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."
+"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/salut-protocol.page:54(p)
+#: C/add-contact.page:61(note/p)
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei."
+"Per afegir una persona nova a la llista de contactes heu d'estar connectat a "
+"Internet i al compte."
 
-#: 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:10(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "Truqueu els contactes per Internet."
 
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "Com suprimir un compte"
+#: 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/remove-account.page:35(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-call.page:35(page/title)
+msgid "Start an audio conversation"
+msgstr "Inicieu una conversa de veu"
 
-#: 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:37(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"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 ""
-"Des de la finestra <gui>Llista de contactes</gui> seleccioneu "
-"<guiseq><gui>Edita</gui><gui>Comptes</gui></guiseq> o premeu <key>F4</key>."
+"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/remove-account.page:46(p)
+#: C/audio-call.page:43(item/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
-"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part "
-"esquerra de la finestra."
-
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "Feu clic al botó <gui style=\"button\">Suprimeix</gui>."
+"Amb el botó secundari feu clic al contacte amb el qual voleu conversar i "
+"escolliu <gui style=\"menuitem\">Trucada de veu</gui>."
 
-#: C/remove-account.page:53(p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"Es mostrarà un diàleg sol·licitant la confirmació. Feu clic al botó "
-"<gui>Suprimeix</gui> per a suprimir el compte permanentment."
+"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/remove-account.page:59(p)
+#: C/audio-call.page:55(item/p)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
 msgstr ""
-"Fins i tot després de la supressió d'un compte l'<app>Empathy</app> no esborrarà "
-"l'historial de converses del compte."
+"Per acabar la conversa feu clic al botó <gui style=\"button\">Penja</gui>."
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
+#: 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 ""
-"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de missatgeria "
-"instantània."
+"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/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "Problemes connectant a un servei de missatgeria instantània"
-
-#. 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-call.page:71(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "Inicieu una conversa de veu amb un metacontacte"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/p)
 msgid ""
-"An error message which says “<gui>Network error</gui>” appears in the main "
-"window."
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
 msgstr ""
-"Apareix un missatge d'error a la finestra principal que diu «<gui>Error de "
-"xarxa</gui>»."
-
-#: 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"
+"Des de la finestra <gui>Llista de contactes</gui>, feu clic amb el botó "
+"secundari al metacontacte."
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/audio-call.page:79(item/p)
 msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
+"Seleccioneu el contacte amb el que voleu mantenir la conversa i des del menú "
+"seleccioneu <gui style=\"menuitem\">Trucada de veu</gui>."
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(note/p)
 msgid ""
-"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/prob-conn-neterror.page:45(p)
-msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
+"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 ""
-"També es pot produir quan intenteu utilitzar un compte d'IRC sense configurar "
-"el sobrenom."
+"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/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."
+#. 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/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
+#: C/audio-video.page:8(info/desc)
 msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
+"Information on when it is possible to have an audio or video conversation."
 msgstr ""
-"Feu clic a la icona <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
-"edit.png\">Edita</media> del missatge d'error."
+"Informació sobre quan és possible realitzar una conversa de veu o de vídeo."
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
-msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
-msgstr ""
-"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/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "Àudio i vídeo"
 
-#: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
+#: C/audio-video.page:34(page/p)
 msgid ""
-"Deselect the <gui>Enabled</gui>, and then select it again to try to "
-"reconnect to the service."
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
 msgstr ""
-"Desactiveu <gui>Activat</gui> i torneu-lo a activar de nou per comprovar si "
-"es reconnecta el servei."
+"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-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "Accés a través de servidor intermediari"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "Icona"
+
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "Descripció"
 
-#: C/prob-conn-neterror.page:91(p)
+#: C/audio-video.page:57(td/p)
 msgid ""
-"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
-"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un "
-"servidor intermediari."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icona per a una conversa de veu </media>"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use”"
-msgstr "«Nom utilitzat»"
+#: 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-name.page:10(desc)
+#: C/audio-video.page:69(td/p)
 msgid ""
-"An error message which says “<gui>Name in use</gui>” appears in the main "
-"window."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"Apareix un missatge a la finestra principal que diu «<gui>Nom utilitzat</gui>»."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icona per a una conversa de vídeo </media>"
 
-#: 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: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-name.page:34(p)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
 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/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."
+"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-name.page:55(p)
+#: C/audio-video.page:87(note/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\"/>."
+"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 ""
-"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ó."
+"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/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "Tipus de comptes permesos"
 
-#: C/prob-conn-name.page:64(p)
+#: C/audio-video.page:97(section/p)
 msgid ""
-"Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
-"and then select it again to try to reconnect to the service."
+"You can 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 ""
-"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."
+"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-auth.page:8(desc)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"An error message which says “<gui>Authentication failed</gui>” appears in "
-"the main window."
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
 msgstr ""
-"Apareix un missatge d'error a la finestra principal que diu «<gui>Errada en "
-"l'autenticació</gui>»."
+"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-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:128(td/p)
+msgid "Service"
+msgstr "Servei"
 
-#: 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:129(td/p)
+msgid "Audio"
+msgstr "Àudio"
 
-#: 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:130(td/p)
+msgid "Video"
+msgstr "Vídeo"
 
-#: 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:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: 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:136(td/p) C/audio-video.page:137(td/p)
+#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p)
+#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p)
+#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p)
+#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p)
+#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p)
+#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p)
+#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p)
+#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p)
+#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p)
+#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p)
+#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p)
+#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p)
+msgid "No"
+msgstr "No"
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "El meu compte està habilitat"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Xat de Facebook"
 
-#: 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:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: 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:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: 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: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/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "Navegueu o cerqueu per les converses anteriors."
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "Visualitzeu les converses anteriors"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: 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/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: C/prev-conv.page:46(p)
-msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
-msgstr ""
-"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/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/prev-conv.page:54(p)
-msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
-msgstr ""
-"No us cal estar connectat a Internet per visualitzar i cercar a les "
-"converses anteriors."
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "Cerqueu a les converses anteriors"
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: C/prev-conv.page:63(p)
-msgid ""
-"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/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
-msgstr ""
-"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/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "Gent propera"
 
-#: C/prev-conv.page:71(p)
-msgid "Select the <gui>Search</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Cerca</gui>."
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: C/prev-conv.page:78(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 ""
-"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."
+#: C/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: C/prev-conv.page:82(p)
-msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
-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."
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "Navegueu per les converses anteriors"
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: C/prev-conv.page:91(p)
-msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
-msgstr ""
-"Podeu navegar, per data, per les converses anteriors amb els contactes i "
-"pels xats a les sales."
+#: 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:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Converses</gui>."
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "Canvi de l'estat"
 
-#: C/prev-conv.page:103(p)
+#: C/change-status.page:41(page/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."
+"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 ""
-"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."
+"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:107(p)
+#: C/change-status.page:46(item/p)
 msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"Seleccioneu un contacte o una sala de xat per veure'n les converses anteriors. "
-"Per defecte es mostrarà la conversa més recent."
+"Feu clic a la llista desplegable a la part de dalt de la finestra "
+"<gui>Llista de contactes</gui>."
 
-#: C/prev-conv.page:111(p)
-msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
-msgstr ""
-"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/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "Seleccioneu un estat de la llista."
 
-#: C/prev-conv.page:117(p)
+#: C/change-status.page:57(page/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."
+"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 cercar text a la conversa mostrada escrivint al camp de cerca a la "
-"part superior. Es ressaltarà el text que coincideixi."
+"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:121(p)
+#: C/change-status.page:63(note/p)
 msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
+"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 ""
-"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."
+"Si no utilitzeu l'ordinador durant una estona o s'activa l'estalvi de "
+"pantalla, l'estat es posarà a absent."
 
-#: C/link-contacts.page:11(desc)
-msgid "Merge and separate different contacts into a single one."
-msgstr ""
+#: 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/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr ""
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "Registreu un compte nou"
 
-#: C/link-contacts.page:26(p)
+#: C/create-account.page:36(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."
+"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 ""
+"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/link-contacts.page:30(p)
+#: C/create-account.page:42(page/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
+"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 ""
+"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/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/link-contacts.page:34(p)
+#: C/create-account.page:48(section/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
+"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 é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/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:52(section/p)
+msgid ""
+"To use Facebook to communicate with your friends, you will need to create a "
+"new account from the website: <link href=\"http://www.facebook.com\">www."
+"facebook.com</link>."
 msgstr ""
+"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/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:62(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>."
+"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."
 
-#: 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:66(section/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
+"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 ""
-"Des de la caixa<guilabel>Paràmetres desats</guilabel>, seleccioneu l'estat "
-"del missatge que voleu suprimir."
+"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/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:71(note/p)
+msgid ""
+"If you use Google Mail or Google Talk, you already have a Jabber account. "
+"Google Talk is a Jabber service. Simply use your Google Mail address and "
+"password in <app>Empathy</app> to connect."
+msgstr ""
+"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/link-contacts.page:82(p)
+#: C/create-account.page:80(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."
+"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:91(title)
-msgid "Separating contacts"
-msgstr "Separació de contactes"
+#: 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:94(p)
+#: C/create-account.page:91(section/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"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:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "Feu clic a <gui style=\"button\">Desenllaça</gui>."
+#: 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 ""
+"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/license.page:8(desc)
-msgid "Legal information."
-msgstr "Informació legal."
+#: C/create-account.page:102(section/p)
+msgid ""
+"Some SIP providers allow you to call normal phones from your computer. "
+"Generally, you will need to subscribe to a paid service for this feature."
+msgstr ""
+"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/license.page:11(title)
-msgid "License"
-msgstr "Llicència"
+#: 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/license.page:12(p)
+#: C/create-account.page:114(section/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"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 ""
-"Aquest treball es distribueix sota la llicència Creative Commons "
-"Reconeixement-Compartir igual 3.0 llicència no adaptada."
+"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/license.page:20(p)
-msgid "You are free:"
-msgstr "Sou lliure de:"
+#: 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 ""
+"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/license.page:25(em)
-msgid "To share"
-msgstr "Compartir"
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "Serveis propietaris"
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "Copiar, distribuir i transmetre el treball."
+#: C/create-account.page:124(section/p)
+msgid ""
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
+msgstr ""
+"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/license.page:29(em)
-msgid "To remix"
-msgstr "Fer-ne obres derivades"
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
+msgstr "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "Adaptar el treball."
+#: C/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
+msgstr "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "sota les següents condicions:"
+#: C/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr "<link href=\"https://accountservices.passport.net\">MSN</link>"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "Reconeixement"
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
 
-#: C/license.page:39(p)
-msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
 msgstr ""
-"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)."
+"Impedeix que l'<app>Empathy</app> es connecti de forma automàtica a un "
+"compte."
 
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "Compartir igual"
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "Inhabiliteu un compte"
 
-#: C/license.page:47(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr ""
-"Si 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."
+"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:53(p)
+#: C/disable-account.page:53(item/p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
 msgstr ""
-"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>."
+"Seleccioneu el compte que voleu inhabilitar del llistat de comptes al quadre "
+"de l'esquerra de la finestra."
 
-#: 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/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/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "Xatejeu amb algú a l'IRC"
+#: 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/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 ""
-"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/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "Com configurar, entrar i gestionar sales preferides."
+
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "Sales preferides"
+
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "Establiu un sala com a preferida"
+
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "Com entrar en una sala."
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:40(item/p)
 msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
 msgstr ""
-"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>."
+"Per saber-ne més de com entrar en una sala d'IRC vegeu <link xref=\"irc-join-"
+"room\"/>."
 
-#: C/irc-start-conversation.page:45(p)
+#: C/favorite-rooms.page:46(item/p)
 msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"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."
+"Per saber-ne més de com iniciar o unir-se a una conversa de grup vegeu <link "
+"xref=\"group-conversations\"/>."
 
-#: C/irc-start-conversation.page:52(p)
+#: C/favorite-rooms.page:54(item/p)
 msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"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."
+"A la finestra de conversa escolliu <guiseq><gui>Conversa</gui><gui>Sala de "
+"xat preferida</gui></guiseq>."
 
-#: 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/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "Com entrar a sales preferides"
 
-#: 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."
+#: 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 ""
+"Des de la finestra <gui>Llista de contactes</gui> executeu una de les "
+"següents accions:"
 
-#: 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:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "Premeu <key>F5</key>."
 
-#: C/irc-nick-password.page:35(p)
+#: C/favorite-rooms.page:76(item/p)
 msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"En 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."
+"Escolliu <guiseq><gui>Sala</gui><gui>Uneix-te als preferits</gui></guiseq>, "
+"per entrar a totes les sales preferides."
 
-#: 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."
-msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
 msgstr ""
-"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."
+"Escolliu <gui>Sala</gui> i seleccioneu la sala preferida a la qual voleu "
+"entrar."
 
-#: 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:90(note/p)
+msgid ""
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr ""
+"Per entrar a una sala preferida us cal estar connectat a Internet i a un "
+"compte."
 
-#: 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:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "Com gestionar les sales preferides"
 
-#: C/irc-nick-password.page:57(p)
+#: C/favorite-rooms.page:101(item/p)
 msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"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>."
+"A la finestra <gui>Llista de contactes</gui>, escolliu <guiseq><gui>Sala</"
+"gui><gui>Gestiona les preferides</gui></guiseq>."
 
-#: C/irc-nick-password.page:69(p)
+#: C/favorite-rooms.page:107(item/p)
 msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
 msgstr ""
-"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."
+"A la llista desplegable <gui>Compte</gui>, seleccioneu el compte del que "
+"vulgueu gestionar les sales 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/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-manage.page:34(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "Internet Relay Chat (IRC)"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "Seleccioneu la sala preferida que voleu gestionar:"
 
-#: C/irc-manage.page:37(p) C/account-irc.page:39(p)
+#: C/favorite-rooms.page:121(item/p)
 msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
 msgstr ""
-"Heu de tenir instal·lat el paquet <sys>telepathy-idle</sys> per utilitzar "
-"l'IRC amb l'<app>Empathy</app>."
+"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-manage.page:43(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "Sales de xat de l'IRC i converses"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr ""
+"Feu clic a <gui>Suprimeix</gui> per esborrar la sala de la llista de "
+"preferides."
 
-#: C/irc-manage.page:45(title)
-msgid "Chat Rooms and Conversations"
-msgstr "Sales de xat i converses"
+#: 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:50(title)
-msgid "Common IRC Problems"
-msgstr "Problemes d'IRC comuns"
+#: 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:52(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "Problemes comuns"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "Posició geogràfica"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "Uniu-vos a un canal d'IRC."
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "Geolocalització"
 
-#: 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.page:39(section/title)
+msgid "Fix common problems"
+msgstr "Arreglar problemes comuns"
 
-#: C/irc-join-room.page:33(p)
-msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
-msgstr ""
-"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-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/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "Posició geogràfica no publicada"
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
+#: C/geolocation-not-showing.page:34(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
 msgstr ""
-"A la finestra <gui>Llista de contactes</gui> escolliu <guiseq><gui>Sala</"
-"gui><gui>Entra</gui></guiseq>."
+"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:45(p)
+#: C/geolocation-not-showing.page:38(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
-"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que "
-"correspon a la xarxa que voleu utilitzar."
+"En aquest cas, no es publicarà la vostra posició, però podreu veure la "
+"localització dels contactes."
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
 msgstr ""
-"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>)."
+"Si voleu fer pública la posició geogràfica, podeu utilitzar un dispositiu "
+"extern com un GPS."
 
-#: 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)
+#: C/geolocation-not-showing.page:48(note/p)
 msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
-"Per entrar en més d'una sala, haureu de repetir els passos de sobre per cada "
-"sala."
+"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-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:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "Quina informació s'envia i a qui."
 
-#: 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:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "Privacitat de la geolocalització"
+
+#: 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/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "Què és el mode de privacitat"
 
-#: 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: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/introduction.page:28(p)
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "Descripció de la privacitat"
+
+#: 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/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/introduction.page:32(p)
+#: C/geolocation-privacy.page:87(item/p)
 msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
+"Privacy mode prevails even when using external and more precise devices."
 msgstr ""
-"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"
-
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "Converses d'àudio i vídeo"
-
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "Opcions avançades"
+"É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/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-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "Compatibilitat"
 
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
+#: 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:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+#: 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:42(title)
-msgid "Import an existing account"
-msgstr "Com importar un compte existent"
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "Activeu/Desactiveu la geolocalització"
 
-#: C/import-account.page:44(p)
-msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
-msgstr ""
-"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-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:50(p)
-msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
-msgstr ""
-"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes "
-"quantes opcions per crear comptes nous."
+#: 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:54(p)
+#: C/geolocation-turn.page:47(item/p)
 msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
 msgstr ""
-"Seleccioneu <gui>Sí, importa les dades dels comptes de</gui> i feu clic a "
-"<gui>Endavant</gui>."
+"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per "
+"activar-la."
 
-#: 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-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "Per desactivar la geolocalització, desseleccioneu-ho."
 
-#: C/import-account.page:66(p)
+#: C/geolocation-turn.page:55(item/p)
 msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
 msgstr ""
-"No és possible importar comptes nous després d'haver completat l'auxiliar "
-"de la primera execució."
+"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix "
+"la precisió de la localització</gui>."
 
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+#: C/geolocation-turn.page:61(item/p)
+msgid ""
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
 msgstr ""
-"Oculta el contactes fora de línia de la <gui>Llista de contactes</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/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "Com amagar els contactes fora de línia"
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "Comprenent la geolocalització."
+
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "Què és la geolocalització?"
 
-#: C/hide-contacts.page:21(p)
+#: C/geolocation-what-is.page:35(page/p)
 msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
 msgstr ""
-"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."
+"La geolocalització us permet identificar la localització geogràfica real "
+"d'un ordinador o un dispositiu connectat a Internet."
 
-#: 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:"
+#: 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/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/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr ""
+"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/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/geolocation-what-is.page:52(p)
+#: 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ó."
+"Executeu l'<app>Empathy</app> per primer cop. Un assistent us oferirà unes "
+"quantes opcions per crear comptes nous."
 
-#: 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>."
+#: 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:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "Activeu/Desactiveu la geolocalització"
+#: 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: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: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:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "Seleccioneu la pestanya <gui>Localització</gui>."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/introduction.page:41(media)
+msgctxt "_"
+msgid ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
+msgstr ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
+
+#: C/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/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "Introducció"
 
-#: C/geolocation-turn.page:47(p)
+#: C/introduction.page:23(page/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+"<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 ""
-"Seleccioneu <gui>Publica la localització per als meus contactes</gui> per "
-"activar-la."
+"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:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "Per desactivar la geolocalització, desseleccioneu-ho."
+#: C/introduction.page:28(page/p)
+msgid ""
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
+msgstr ""
+"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-turn.page:55(p)
+#: C/introduction.page:32(page/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
+"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 ""
-"Per augmentar l'exactitud de la vostra posició, desseleccioneu <gui>Redueix "
-"la precisió de la localització</gui>."
+"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/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "Finestra de la <gui>Llista de contactes</gui>"
+
+#: 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/geolocation-turn.page:61(p)
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "Ordres de l'IRC"
+
+#: C/irc-commands.page:19(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."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 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>."
+"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:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "Serveis que utilitzen la geolocalització i la compatibilitat."
+#: 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/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "Serveis que l'utilitzen"
+#: 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/geolocation-supported.page:33(p)
+#: C/irc-join-pwd.page:27(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."
+"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 ""
-"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."
+"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(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:39(p)
+#: C/irc-join-pwd.page:38(item/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."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 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."
+"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/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "Uniu-vos a un canal d'IRC."
+
+#: 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/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 ""
+"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/irc-join-room.page:45(item/p)
+msgid ""
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr ""
+"Des de la llista desplegable <gui>Compte</gui>, trieu el compte d'IRC que "
+"correspon a la xarxa que voleu utilitzar."
+
+#: 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 ""
+"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/irc-join-room.page:64(note/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/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-supported.page:47(title)
-msgid "Compatibility"
-msgstr "Compatibilitat"
+#: C/irc-manage.page:23(credit/name)
+msgid "Sindhu S"
+msgstr "Sindhu S"
+
+#: C/irc-manage.page:39(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "Internet Relay Chat (IRC)"
 
-#: C/geolocation-supported.page:49(p)
+#: C/irc-manage.page:47(when/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>."
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
+"idle</link>"
 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>."
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Instal·la el paquet "
+"telepathy-idle</link>"
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "Quina informació s'envia i a qui."
+#: 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/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "Privacitat de la geolocalització"
+#: C/irc-manage.page:57(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "Sales de xat i converses"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "Quina informació s'envia"
+#: C/irc-manage.page:62(info/title)
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "Problemes de l'IRC més habituals"
 
-#: C/geolocation-privacy.page:36(p)
-msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
 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ó."
+"Protegiu el vostre sobrenom per impedir que altres usuaris de l'IRC l'usin."
 
-#: 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 ""
-"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-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:44(p)
+#: C/irc-nick-password.page:35(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, 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 ""
-"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."
+"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:49(p)
+#: C/irc-nick-password.page:40(page/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."
+"<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 ""
-"Quan s'habilita el mode de privacitat, la màxima precisió que s'enviarà serà la "
-"ciutat, encara que feu servir un dispositiu extern."
+"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:56(title)
-msgid "Who can see the information sent"
-msgstr "Qui pot veure la informació enviada"
-
-#: 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-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:63(title)
-msgid "What is the privacy mode"
-msgstr "Què és el mode de privacitat"
+#: 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/geolocation-privacy.page:64(p)
+#: C/irc-nick-password.page:57(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."
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
 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."
-
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "Descripció de la privacitat"
+"Al camp <gui>Contrasenya</gui> escriviu la contrasenya que heu utilitzat per "
+"registrar el sobrenom."
 
-#: C/geolocation-privacy.page:72(p)
+#: C/irc-nick-password.page:69(note/p)
 msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+"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 ""
-"Descripció de varis paràmetres de geolocalització en l'<app>Empathy</app>."
-
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "La geolocalització no s'activa per defecte."
-
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "El mode de privacitat s'activa per defecte."
+"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-privacy.page:87(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
 msgstr ""
-"El mode de privacitat preval inclús quan esteu utilitzant dispositius "
-"externs amb més precisió."
+"L'<app>Empathy</app> encara no permet l'enviament de fitxers utilitzant "
+"l'IRC."
 
-#: 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-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "Enviament de fitxer a través de l'IRC."
 
-#: 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: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/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "Posició geogràfica no publicada"
+#: 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/favorite-rooms.page:76(p)
+#: C/link-contacts.page:29(page/title)
+msgid "Link and unlink contacts"
+msgstr "Enllaceu i desenllaceu contactes"
+
+#: 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."
+#: 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/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Desenllaceu contactes"
+
+#: 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 ""
+"Press <gui style=\"button\">Edit</gui> in the top-right corner of "
+"<app>Contacts</app>."
 msgstr ""
-"Impedeix que l'<app>Empathy</app> es connecti de forma automàtica a un compte."
+"Premeu <gui style=\"button\">Edita</gui> a la cantonada de dalt a la dreta "
+"del <app>Contactes</app>."
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "Com inhabilitar un compte"
+#: 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:41(p)
+#: C/link-contacts.page:113(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\">Remove</gui> to unlink an entry from the linked "
+"contact."
 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."
+"Feu clic a <gui style=\"button\">Suprimeix</gui> per desenllaçar una entrada "
+"del metacontacte."
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:118(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\">Close</gui> if you do not want to unlink any "
+"more contacts."
+msgstr ""
+"Feu clic a <gui style=\"button\">Tanca</gui> si no voleu desenllaçar més "
+"contactes."
+
+#: C/link-contacts.page:123(item/p)
+msgid "Finally, press <gui style=\"button\">Done</gui> to finish editing."
+msgstr ""
+"Per acabar, feu clic a <gui style=\"button\">Fet</gui> per acabar l'edició."
+
+#. 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 ""
-"Seleccioneu el compte que voleu desactivar del llistat de comptes al quadre "
-"de l'esquerra de la finestra."
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
 
-#: C/disable-account.page:56(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 ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 msgstr ""
-"Desseleccioneu <gui style=\"checkbox\">Activat</gui> a la part dreta de la "
-"finestra."
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 
-#: C/disable-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:39(media)
+msgctxt "_"
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr ""
-"Per tornar a activar el compte, només us cal seleccionar <gui style=\"checkbox"
-"\">Activat</gui>."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 
-#: 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."
+#: 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/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "Registre d'un compte nou"
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
+msgstr "Aruna S"
 
-#: C/create-account.page:36(p)
-msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
-msgstr ""
-"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/overview.page:24(page/title)
+msgid "Overview of instant messaging"
+msgstr "Visió general de la missatgeria instantània"
 
-#: 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: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."
-
-#: 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ó."
+"Es mostrarà totes les converses que compleixin els criteris de cerca. Per "
+"defecte, les converses estan ordenades per data."
 
-#: 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."
+"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:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
-
-#: 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/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/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Xat de Facebook"
-
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
-
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
-
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "Sí"
-
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: C/prob-conn-neterror.page:46(page/p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr ""
+"També es pot produir quan intenteu utilitzar un compte d'IRC sense "
+"configurar el sobrenom."
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "Accés a través de servidor intermediari"
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/prob-conn-neterror.page:88(section/p)
+msgid ""
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr ""
+"Ara mateix l'<app>Empathy</app> no es pot configurar perquè funcioni amb un "
+"servidor intermediari."
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnostiqueu problemes comuns en intentar-se connectar a un servei de "
+"missatgeria instantània."
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemes connectant a un servei de missatgeria instantània"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "Truqueu els contactes per Internet."
+#: 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-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "Inicieu una conversa d'àudio"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "Suprimiu un compte"
 
-#: C/audio-call.page:29(p)
+#: C/remove-account.page:36(page/p)
 msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
-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>."
+"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 ""
-"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>."
+"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-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/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>."
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
 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>."
+"Seleccioneu el compte que vulgueu suprimir de la llista de comptes a la part "
+"esquerra de la finestra."
 
-#: 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"
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "Feu clic a <gui style=\"button\">-</gui>."
 
-#: 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/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 ""
-"Premeu el botó dret sobre el nom del contacte amb el qual voleu conversar, i "
-"escolliu <gui>Xat</gui>."
+"Es mostrarà un diàleg sol·licitant la confirmació. Feu clic al botó "
+"<gui>Suprimeix</gui> per a suprimir el compte permanentment."
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "Afegiu algú a la llista de contactes."
+#: 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/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "Afegiu algú a la llista de contactes"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "Explicació sobre la funció de «Gent propera»."
 
-#: 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/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "Què és la «Gent propera»?"
 
-#: 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 ""
-"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."
+"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/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."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr ""
+"Aquest tipus de sistema de missatgeria descentralitzat està restringit a una "
+"xarxa local i no cal una connexió a Internet activa."
+
+#: C/salut-protocol.page:49(page/p)
+msgid ""
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
 msgstr ""
-"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."
+"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:49(p)
+#: C/salut-protocol.page:54(page/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"Al camp <gui>Àlies</gui> introduïu el nom del contacte tal com voleu que "
-"aparegui a la llista de contactes."
+"Totes les xarxes locals modernes haurien de permetre aquest tipus de servei."
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Envieu un fitxer des del vostre ordinador a un dels contactes."
+
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "Envieu fitxers"
+
+#: C/send-file.page:45(item/p)
+msgid ""
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
 msgstr ""
-"Feu clic a <gui>Afegeix</gui> per afegir el contacte a la llista de contactes."
+"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:61(p)
+#: C/send-file.page:50(item/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
+"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 ""
-"Per afegir una persona nova a la llista de contactes heu d'estar "
-"connectat a Internet i al compte."
+"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/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/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-account.page:39(title)
-msgid "Add a new account"
-msgstr "Com afegir un compte nou"
+#: 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/add-account.page:41(p)
+#: C/send-file.page:66(item/p)
 msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
 msgstr ""
-"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ó."
+"Espereu que el contacte accepti la transferència del fitxer o feu clic a "
+"<gui>Atura</gui> per aturar la transferència."
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "Feu clic a <gui style=\"button\">Afegeix</gui>."
+#: C/send-file.page:72(item/p)
+msgid ""
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr ""
+"Una vegada s'hagi acabat la transferència podeu tancar la finestra "
+"<gui>Transferències de fitxers</gui>."
 
-#: C/add-account.page:57(p)
+#: C/send-file.page:80(note/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
+"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 ""
-"Des de la llista desplegable de <gui>Protocol</gui>, seleccioneu el tipus de "
-"compte que vulgueu afegir."
+"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:61(p)
+#: C/send-file.page:87(note/p)
 msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 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ó."
+"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:66(p)
+#: C/send-file.page:93(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."
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
 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ó."
+"Per enviar un fitxer a algú us cal estar connectat a Internet o a una xarxa "
+"d'àrea local."
+
+#: 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/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:32(page/title)
+msgid "Send a message to someone"
+msgstr "Enviament de missatges"
 
-#: C/add-account.page:78(p)
+#: C/send-message.page:36(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."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 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."
+"Des de la finestra <gui>Llista de contactes</gui> feu doble clic al nom del "
+"contacte amb el que voleu parlar."
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "Afegiu, modifiqueu i suprimiu comptes."
+#: 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 ""
+"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/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "Finestra dels comptes"
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "Com enviar un missatge a un metacontacte"
 
-#: C/accounts-window.page:35(p)
+#: C/send-message.page:58(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"La finestra dels <gui>Comptes</gui> us permet afegir, modificar i suprimir "
-"comptes."
+"Seleccioneu el contacte amb el que voleu conversar i des del menú "
+"seleccioneu <gui style=\"menuitem\">Xat</gui>."
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "Dades dels 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/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "Establiu un missatge personalitzat"
 
-#: C/accounts-window.page:44(p)
+#: C/set-custom-status.page:36(page/p)
 msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+"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 ""
-"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."
+"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/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Dades dels comptes de Jabber"
+#: 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/account-jabber.page:31(p)
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
 msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
 msgstr ""
-"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."
+"Des de la finestra <gui>Llista de contactes</gui> feu clic a la llista "
+"desplegable de la part superior."
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:52(item/p)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"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)"
+"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:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignora els errors del certificat SSL"
+#: C/set-custom-status.page:58(item/p)
+msgid ""
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
+msgstr ""
+"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/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "Per editar un missatge personalitzat:"
 
-#: C/account-jabber.page:61(p)
+#: C/set-custom-status.page:100(item/p)
 msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
-"Si 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."
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/account-irc.page:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Feu clic al botó <gui>Suprimeix</gui>."
+
+#: 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/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/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "Servidors"
+#: 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/el/el.po b/help/el/el.po
index 82c4c3b4..6e4d45ea 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 c0c5072d..51112740 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-05-16 23:05+0000\n"
+"PO-Revision-Date: 2013-05-17 12:37+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -21,39 +21,21 @@ 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)
+#: C/index.page:8(info/title)
 msgctxt "link"
 msgid "Empathy Internet Messenger"
 msgstr "Mensajería para Internet Empathy"
 
-#: C/index.page:8(info/title)
+#: C/index.page:9(info/title)
 msgctxt "text"
 msgid "Empathy Internet Messenger"
 msgstr "Mensajerí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/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)
@@ -71,19 +53,19 @@ msgstr "Mensajerí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/index.page:24(license/p) C/account-irc.page:21(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)
@@ -98,116 +80,66 @@ 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)
-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"
+#: C/index.page:30(media/span)
+msgid "Empathy Internet Messenger logo"
+msgstr "Logo de mensajería para Internet Empathy"
+
+#: C/index.page:28(page/title)
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "<_:media-1/> Mensajería para Internet Empathy"
 
-#: C/index.page:35(section/title)
+#: C/index.page:36(section/title)
 msgid "Account Management"
 msgstr "Gestión de cuentas"
 
-#: C/index.page:39(section/title)
+#: C/index.page:40(section/title)
 msgid "Contact Management"
 msgstr "Gestión de contactos"
 
-#: C/index.page:43(section/title)
+#: C/index.page:44(section/title)
 msgid "Text Conversations"
 msgstr "Conversaciones de texto"
 
-#: C/index.page:47(section/title)
+#: C/index.page:48(section/title)
 msgid "Audio and Video Conversations"
 msgstr "Conversaciones de sonido y vídeo"
 
-#: C/index.page:51(section/title)
+#: C/index.page:52(section/title)
 msgid "Advanced Actions"
 msgstr "Acciones avanzadas"
 
-#: 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 "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/account-irc.page:17(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)
+#: 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 +151,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 +159,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 +176,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 +191,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 +205,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 +225,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 +237,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 +251,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 +270,60 @@ 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: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:107(item/p)
+#: 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>."
 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:110(item/p)
+#: C/account-irc.page:116(media/span)
+msgid "Remove"
+msgstr "Quitar"
+
+#: 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 ""
-"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 +337,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 +348,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 +365,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 +376,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 "
@@ -676,8 +616,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 +670,54 @@ 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/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 +726,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 +746,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 +765,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 ""
@@ -2157,9 +2082,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 +2309,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 +2333,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:91(section/title)
-msgid "Separating contacts"
-msgstr "Separar contactos"
+#: C/link-contacts.page:92(section/title)
+msgid "Unlink contacts"
+msgstr "Desenlazar contactos"
 
-#: C/link-contacts.page:94(item/p)
+#: C/link-contacts.page:93(section/p)
+msgid "To unlink a linked contact:"
+msgstr "Para desenlazar un contacto enlazado:"
+
+#: 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 +2463,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 +2652,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 +2666,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 +2674,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 +2688,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 +2696,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 +2710,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 +2720,18 @@ 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 on the <gui>Edit Account</gui> button in the error message."
+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 +2739,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 +2752,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 +2766,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 +2780,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 +2795,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 +2807,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 +2815,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 +3260,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:40(item/title)
+msgid "<_:media-1/> <gui>Available</gui>"
+msgstr "<_:media-1/> <gui>Disponible</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."
@@ -3421,15 +3285,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:47(item/p)
+#: C/status-icons.page:46(item/title)
+msgid "<_:media-1/> <gui>Busy</gui>"
+msgstr "<_:media-1/> <gui>Ocupado</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 "
@@ -3443,15 +3307,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 +3330,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 +3348,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 +3360,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 +3380,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: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 ""
+"Para finalizar una conversación pulse el botón <gui style=\"button\">Colgar</"
+"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>."
@@ -3541,11 +3405,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 +3417,221 @@ msgstr ""
 "Seleccione el contacto con el que quiere tener la conversación y, del menú, "
 "seleccione <gui style=\"menuitem\">Llamada de vídeo</gui>."
 
+#~ 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 +3880,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 +3903,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/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index c70bd5cd..de41b6a3 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"
+
+#. 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"
 
-#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:112(media)
+#, 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)
-msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr "如果需要更多关于如何使用远程桌面查共享程序的信息，请参看其帮助。"
+#: C/account-irc.page:125(item/title)
+#, fuzzy
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>联系人列表</gui>窗口"
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:126(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
 msgstr ""
-"当您与其他人共享您的桌面的时候，可能会出现系统性能降低和网络速度下降的现象。"
+"这指明了网络上常用的字符编码。字符编码是计算机内部记录字符的一种特定方式。有"
+"许多不同的字符编码，您需要与其他用户使用同样的字符编码才能正确地看到他们的信"
+"息。"
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:135(item/p)
 msgid ""
-"Some of your contacts may not be able to use this feature. It is necessary "
-"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
-"compatible remote desktop viewer application installed in their system."
-msgstr ""
-"并非您的所有联系人都可以使用这个功能。他们必须使用 2.28 或更新版本的 "
-"<app>Empathy</app> 并且在安装了兼容的远程桌面查看器程序。"
+"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/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "为您的状态添加、编辑或删除个人消息。"
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr ""
 
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+#: C/account-irc.page:142(item/p)
+msgid ""
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+msgstr ""
+"一个 IRC 网络可能有许多服务器供您连接。当您连接到一个特定网络的服务器后，您可"
+"以和同一网络中所有服务器的用户交流。您可以为一个网络添加或删除服务器，使用"
+"<gui>添加</gui>或<gui>删除</gui>按钮。"
 
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+#: 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:34(title)
-msgid "Set a custom message"
-msgstr "设置一个自定义消息"
+#: 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/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Jabber 和 Google Talk 帐号的高级选项。"
+
+#: 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)
+#: C/account-jabber.page:45(item/title)
+#, fuzzy
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "需要加密(TLS/SSL)"
+
+#: 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 ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
-msgstr "在<gui>联系人列表</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 ""
+"只要有可能，<app>Empathy</app> 与 Jabber 服务器之间的通讯就会被加密。如果不可"
+"能加密，消息就可能被明文发送。选择<gui>需要加密</gui>以阻止不能加密时 "
+"<app>Empathy</app> 与 Jabber 服务器进行明文通讯。"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-jabber.page:52(item/p)
 msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"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 ""
+"有些 Jabber 服务器可能使用不合法的证书加密数据，或者使用来自未知的证书认证机"
+"构的证书。如果您信任您的服务器，您可以选择<gui>忽略 SSL 证书错误</gui>以允许"
+"使用不合法的证书进行加密通讯。"
+
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
+msgstr ""
+
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
 msgstr ""
-"选择您希望添加自定义消息的状态。您必须选择有<gui>自定义消息</gui>标签标记的状"
-"态。"
 
-#: C/set-custom-status.page:58(p)
+#: C/account-jabber.page:61(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."
+"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 ""
-"在窗口顶部的文本框中输入您的自定义消息，然后按<key>Enter</key>来设定这个消"
-"息。"
+"如果您有多个应用程序(比如，在另一台计算机上)同时连接了您的帐号，您可以设置“资"
+"源”以唯一地标识每一个连接的程序。默认地，<app>Empathy</app> 会使用 "
+"<input>Telepathy</input> 作为“资源”。"
 
-#: C/set-custom-status.page:64(p)
+#: C/account-jabber.page:65(item/p)
 msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+"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/account-jabber.page:70(item/title)
+#, fuzzy
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "覆盖服务器设置"
 
-#: C/set-custom-status.page:69(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
+"<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> 的时候，这个自定义消息就不"
-"会再出现。它只在 <app>Empathy</app> 本次运行期间被保留。"
+"<app>Empathy</app> 会根据您的登录 ID 以默认的设置连接 Jabber 服务器。对某些 "
+"Jabber 服务器，您需要人工输入一些服务器设置。这些设置应该由您的 Jabber 服务提"
+"供商提供。"
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "编辑、删除和添加自定义消息"
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "添加、修改和删除帐号。"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "选择<gui>编辑自定义消息</gui>。"
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "帐号窗口"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "要编辑自定义消息："
+#: C/accounts-window.page:35(page/p)
+msgid ""
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr "<gui>帐号</gui>窗口允许您添加、修改和删除帐号。"
+
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "帐号详细信息"
 
-#: C/set-custom-status.page:100(p)
+#: C/accounts-window.page:44(section/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>中，选择您想要编辑的状态消息并双击它。"
+"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:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr "输入新的自定义消息并且按<key>Enter</key>来修改它。"
+#: 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:113(p)
-msgid "To remove a custom message:"
-msgstr "要删除自定义消息："
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "添加一个新帐号"
 
-#: C/set-custom-status.page:118(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
-msgstr "在<gui>已保存的自定义状态</gui>中，选择要删除的状态消息。"
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "点击<gui>删除</gui>按钮。"
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
+msgstr ""
+"您可以添加任何支持的服务的即时消息帐号，以在 <app>Empathy</app> 中与您的联系"
+"人交流。对于某些帐号提供商，这些步骤也允许您注册新帐号。更多细节参见<link "
+"xref=\"create-account\"/>。"
 
-#: C/set-custom-status.page:131(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)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
+#| "gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
 msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr "要添加一条新的自定义消息，在<gui>添加新自定义状态</gui>选项卡："
+"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/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "点击<gui style=\"button\">+</gui>。"
 
-#: C/set-custom-status.page:136(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
-msgstr "点击下拉列表选择您想要设定自定义消息的状态。"
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr "在<gui>协议</gui>下拉列表，选择您要创建的帐号类型。"
 
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "点击文本框，输入新的自定义消息。"
+#: 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 ""
+"如果您还没有注册帐号，选择<gui>在服务器上创建新的帐号</gui>。这个功能并不是对"
+"于每一种帐号都可用，也可能对于某些帐号提供商不可用。更多信息参见<link xref="
+"\"create-account\"/>。"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "点击<gui>添加</gui>将新消息添加到已保存的的自定义消息列表中。"
+#: C/add-account.page:69(item/p)
+msgid ""
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/>for more information."
+msgstr ""
+"输入必要的信息。对于大多数帐号，您只需要输入登录 ID 和密码。有些帐号可能需要"
+"更多信息。参见<link xref=\"accounts-window#details\"/>获取更多信息。"
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</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/set-custom-status.page:163(p)
+#: C/add-account.page:81(note/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"当你编辑或添加新自定义消息的时候，它不会被设为当前状态消息。您需要在<gui>联系"
-"人列表</gui>窗口中选中它。"
+"要改变帐号在<gui>帐号</gui>窗口中的作为标识的名字，在左侧的列表中选择帐号，然"
+"后点击名字或者按空格键。编辑帐号的名字，完成后按<key>Enter</key>。"
 
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "发送消息给一个您的联系人。"
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+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)
+#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name)
+#: C/prob-conn-acctdisabled.page:15(credit/name)
+#: C/prob-conn-auth.page:17(credit/name)
+#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name)
+#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/send-message.page:18(email) C/send-file.page:18(email)
-#: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
-#: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
-#: C/change-status.page:20(email) C/add-contact.page:19(email)
-msgid "philbull@gmail.com"
-msgstr "philbull@gmail.com"
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "添加某人到您的联系人列表"
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "向某人发送消息"
+#: 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-message.page:36(p)
+#: C/add-contact.page:40(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
-msgstr "在<gui>联系人列表</gui>窗口中，双击要与之聊天的联系人的名字。"
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
+msgstr ""
+"在 <gui>帐号</gui> 下拉列表中，选择您用来与您的联系人联系的帐号。您的联系人需"
+"要使用与您选择的帐号相同的服务。"
 
-#: C/send-message.page:42(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"A new window will open. Type a message into the box at the bottom of the "
-"window and press <key>Enter</key> to send it."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"一个新窗口会被打开。在窗口底部的文本框中输入一条消息，然后按<key>Enter</key>"
-"发送。"
+"在 <gui>标识符</gui> 一栏中，输入这种服务中您的联系人的登录 ID，用户名，显示"
+"名或其他合适的标识符。"
 
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "向一位元联系人发送消息"
+#: C/add-contact.page:49(item/p)
+msgid ""
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr "在 <gui>别名</gui> 中，输入您希望这个联系人显示在联系人列表中的名字。"
+
+#: 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/send-message.page:58(p)
+#: C/add-contact.page:61(note/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
-msgstr ""
-"选择您想要与之聊天的联系人，并在菜单中选择 <gui style=\"menuitem\">聊天</"
-"gui>。"
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
+msgstr "要添加联系人到您的联系人列表，您需要连接因特网和您的帐号。"
 
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "从您的计算机发送文件给您的联系人。"
+#: C/audio-call.page:10(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "通过互联网呼叫您的联系人。"
 
-#: C/send-file.page:36(title)
-msgid "Send files"
-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/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>窗口，执行下列操作之一："
+#: C/audio-call.page:35(page/title)
+msgid "Start an audio conversation"
+msgstr "开始语音聊天"
 
-#: C/send-file.page:45(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 ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
-msgstr "右键点击要向其发送文件的联系人，然后选择<gui>发送文件</gui>。"
+"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/send-file.page:50(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 ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
-"点击要向其发送文件的联系人，然后选择<guiseq><gui>编辑</gui><gui>联系人</"
-"gui><gui>发送文件</gui></guiseq>。"
+"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
+"gui>。"
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "选择要发送的文件，并点击<gui>发送</gui>。"
+#: 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 ""
+"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/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "<gui>文件传输</gui>窗口会被显示。"
+#: C/audio-call.page:55(item/p)
+#, fuzzy
+#| 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>以结束会话。"
 
-#: C/send-file.page:66(p)
+#: 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 ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
-msgstr "请等待您的联系人接受文件传输，或点击<gui>停止</gui>来终止传输。"
+"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/audio-call.page:71(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "向一位元联系人发起语音会话"
 
-#: C/send-file.page:72(p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/p)
 msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
-msgstr "传输结束之后，就可以关闭<gui>文件传输</gui>窗口了。"
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "在<gui>联系人列表</gui>窗口，右键点击该元联系人。"
 
-#: C/send-file.page:80(p)
+#: C/audio-call.page:79(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."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"如果窗口中列出了很多已经完成的传输，点击<gui>清除</gui>可以清空列表。这只会将"
-"列表清空，而不会从您的计算机上删除这些文件。"
+"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
+"gui>。"
 
-#: C/send-file.page:87(p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(note/p)
 msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+"To 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>Jabber</em>、<em>Google Talk</em>和<em>附近"
-"的人</em>。"
+"要识别一个联系人是否是<em>元联系人</em>，将您的鼠标移动到<gui>联系人列表</"
+"gui>窗口中的一个联系人上，并停留几秒钟：一个小弹出消息会显示这个元联系人是由"
+"几个联系人组成的。"
 
-#: C/send-file.page:93(p)
-msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
-msgstr "要向别人发送文件，您需要连接到互联网，或本地局域网。"
+#. 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/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "理解附近的人(People Nearby)功能"
+#. 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 ""
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "什么是“附近的人”？"
+#: C/audio-video.page:8(info/desc)
+msgid ""
+"Information on when it is possible to have an audio or video conversation."
+msgstr "语音或视频会话的条件。"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "我希望看到更多的人来用这个。"
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "语音和视频支持"
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-video.page:34(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 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 ""
-"附近的人(People Nearby)服务是一个无服务器的通讯服务：您不需要连接并认证到一个"
-"中央服务器来使用这个功能。"
+"您的联系人也在使用支持语音和视频会话的程序时，您才可以和他们进行语音、视频会"
+"话。如果您的联系人可以进行语音或视频会话，您将在联系人列表中他们的姓名旁看到"
+"下列图标："
 
-#: C/salut-protocol.page:45(p)
-msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
-msgstr "这类无服务器的通讯系统只局限于本地局域网，并且不需要互联网链接。"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "图标"
 
-#: C/salut-protocol.page:49(p)
-msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
-msgstr ""
-"会自动的发现在同一个局域网中使用这个服务的人，并且可以给他们发送消息甚至文"
-"件，想其它服务一样。"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "描述"
 
-#: C/salut-protocol.page:54(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 ""
-"All the modern local area networks should be able to support this kind of "
-"service."
-msgstr "所有现代的本地局域网都应该可以支持这类服务。"
-
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "从 <app>Empathy</app> 中完全地删除一个账户。"
+"<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/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "删除账户"
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "联系人可以进行语音聊天。"
 
-#: C/remove-account.page:35(p)
+#: 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 ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"如果你不想再使用某个账户，您可以从 <app>Empathy</app> 中完全地删除这个账户。"
-"如果您将来又希望在 <app>Empathy</app> 中使用这个账户了，您可以再添加这个账"
-"户。"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
+
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "联系人可以进行视频聊天。"
 
-#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:48(p)
+#: C/audio-video.page:83(note/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"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 ""
-"在<gui>联系人列表</gui>窗口中，选择<guiseq><gui>编辑</gui><gui>账户</gui></"
-"guiseq>，或按<key>F4</key>。"
+"要进行语音聊天，您需要有一块声卡，且您的操作系统必需支持它，还需要一个能正常"
+"工作的麦克风。"
 
-#: C/remove-account.page:46(p)
+#: C/audio-video.page:87(note/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
-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/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "点击<gui style=\"button\">删除</gui>。"
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "支持的帐号类型"
 
-#: C/remove-account.page:53(p)
+#: C/audio-video.page:97(section/p)
 msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
 msgstr ""
-"一个弹出对话框会要求您确认删除。点击<gui>删除</gui>按钮来永久的删除这个账户。"
+"只有一些特定类型的帐号支持语音或视频聊天。下表列出了每种类型的帐号的语音、视"
+"频支持情况。"
 
-#: C/remove-account.page:59(p)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
-msgstr "即使删除了账户，<app>Empathy</app> 也不会删除这个账户的聊天记录。"
+"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 ""
+"帐号类型是由插件提供的。您的系统上不一定有以下列出的全部类型，也可能有一些类"
+"型没有在下面列出。插件的升级可能使下表中不支持语音或视频的帐号类型获得支持。"
 
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
-msgstr "诊断连接到一个即时消息服务的常见问题。"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "服务"
 
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "连接到即时消息服务时的问题"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+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:130(td/p)
+msgid "Video"
+msgstr "视频"
 
-#: C/prob-conn-neterror.page:7(desc)
-msgid ""
-"An error message which says “<gui>Network error</gui>” appears in the main "
-"window."
-msgstr "主窗口中显示了一个错误提示信息，“<gui>网络错误</gui>”。"
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error”"
-msgstr "我收到“网络错误”的错误提示信息"
+#: 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-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook 聊天"
 
-#: C/prob-conn-neterror.page:37(p)
-msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
-msgstr ""
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-neterror.page:41(p)
-msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
-msgstr ""
-"这种错误在 <app>Empathy</app> 由于某种原因而无法和即时通讯服务器连上时出现。"
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/prob-conn-neterror.page:45(p)
-msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
-msgstr "此外，这种错误也在您试图不设置昵称而使用 IRC 账户时出现。"
+#: 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-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 "确保您已经连接到互联网，或者一个本地网络。"
+#: C/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
-msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
-msgstr ""
-"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
-"gtk-edit.png\">编辑</media>图标。"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
-msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
-msgstr ""
-"检查<gui>高级</gui>选项卡中的所有细节是否正确。您应当可以从即时通讯服务商的网"
-"站上找到这些信息。"
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: 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:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "代理支持"
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: 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:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use”"
-msgstr "“用户名已经被占用”"
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: 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:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "附近的人"
 
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use”"
-msgstr "我收到“用户名已经被占用”的错误提示信息"
+#: C/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: 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:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: 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:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: 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:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: 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/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "改变您的状态以向您的联系人表明您是否闲暇。"
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed”"
-msgstr "我收到“验证失败”的错误提示信息"
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "改变您的状态"
 
-#: C/prob-conn-auth.page:38(p)
+#: C/change-status.page:41(page/p)
 msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
+"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> 允许您"
+"从一些定义好的状态中选择一个。"
 
-#: C/prob-conn-auth.page:50(p)
+#: C/change-status.page:46(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 ""
-"确保您已经在要连接的服务上注册了账户。如果没有账户，多数服务都不会允许您连"
-"接。"
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "点击 <gui>联系人列表</gui> 窗口顶部的下拉列表。"
 
-#: 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/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "从列表中选择一个状态。"
 
-#: C/prob-conn-acctdisabled.page:7(desc)
+#: C/change-status.page:57(page/p)
 msgid ""
-"The instant messaging account that you want to use is not enabled in the "
-"list of accounts."
-msgstr "您要连接的即时通信账户没有在账户列表中启用。"
-
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-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/prob-conn-acctdisabled.page:35(p)
+#: C/change-status.page:63(note/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."
+"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 ""
-"如果当您尝试开始一个新会话或者加入房间时，要使用的即时聊天账户没有在下拉的账"
-"户列表中启用，您的账户信息可能不正确。"
+"如果您一段时间不使用计算机，或屏幕保护开始运行，您的状态会自动变为“离开”。"
+
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "为某种支持的服务注册帐号。"
 
-#: C/prob-conn-acctdisabled.page:48(p)
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "注册一个新帐号"
+
+#: C/create-account.page:36(page/p)
 msgid ""
-"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
-"account that is not working."
+"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 ""
-"选择<guiseq><gui>编辑</gui><gui>账户</gui></guiseq>，再选择不工作的账户。"
+"大多帐号类型需要您在使用 <app>Empathy</app> 这样的即时通讯软件连接之前先建立"
+"帐号。但对于某些帐号提供商，您可以使用 <app>Empathy</app> 来注册新帐号，使用"
+"与 <link xref=\"add-account\">添加帐号</link> 相同的步骤。"
 
-#: C/prob-conn-acctdisabled.page:65(p)
+#: C/create-account.page:42(page/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."
+"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 ""
-"检查<gui style=\"checkbox\">已启用</gui>选框是否勾选。没有的勾选它已启用账"
-"户。"
-
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "浏览或搜索您之前的会话。"
+"这一页是关于建立各种类型的帐号的。您应当已经从您的帐号提供商那里得到了登录 "
+"ID 和密码，以及其他使用 <app>Empathy</app> 连接这个帐号需要的信息。"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "查看之前的会话"
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/prev-conv.page:39(p)
+#: C/create-account.page:48(section/p)
 msgid ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
+"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:46(p)
+#: C/create-account.page:52(section/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."
+"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 ""
-"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
-"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
-"\">浏览之前的会话</link>。"
+"要使用 Facebook 与您的朋友们交流，您需要在其网站上建立一个新帐号：<link href="
+"\"http://www.facebook.com\">www.facebook.com</link>。"
 
-#: C/prev-conv.page:54(p)
+#: C/create-account.page:62(section/p)
 msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
-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:61(title)
-msgid "Search previous conversations"
-msgstr "搜索之前的会话"
+#: C/create-account.page:66(section/p)
+msgid ""
+"You will need to create a new account with a Jabber provider. There are many "
+"free providers; one popular provider is <link href=\"http://register.jabber."
+"org/\">Jabber.org</link>."
+msgstr ""
+"您需要在某个 Jabber 服务提供商那里建立帐号。有许多 Jabber 服务提供商，<link "
+"href=\"http://register.jabber.org/\">Jabber.org</link> 是很流行的一个。"
 
-#: C/prev-conv.page:63(p)
+#: C/create-account.page:71(note/p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr "您可以在之前的所有会话中进行全文搜索。"
+"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:67(p) C/prev-conv.page:96(p)
+#: C/create-account.page:80(section/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"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>窗口，选择<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:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "更多信息参见<link xref=\"salut-protocol\"/>。"
 
-#: C/prev-conv.page:74(p)
+#: C/create-account.page:91(section/p)
 msgid ""
-"In the <gui>For</gui> field, type the text you want to search for. Click "
-"<gui>Find</gui> or press <key>Enter</key>."
+"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 ""
-"在<gui>关键词</gui>中，输入您想要搜索的文字。点击<gui>查找</gui>或按"
-"<key>Enter</key>。"
+"SIP 是一种允许用户通过互联网进行语音和视频会话的开放系统。您需要在某个 SIP 服"
+"务提供商处创建帐号。您可以和其他的 SIP 用户交流，无论他们的 SIP 服务提供商与"
+"您是否相同。"
 
-#: C/prev-conv.page:78(p)
+#: C/create-account.page:97(note/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 "符合搜索条件的会话会显示在下面的列表中。会话默认按日期排序。"
+"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/prev-conv.page:82(p)
+#: C/create-account.page:102(section/p)
 msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"Some 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 ""
-"点击一个会话以查看。<app>Empathy</app> 会选择这个会话中符合您搜索条件的文字。"
-
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "浏览之前的会话"
+"有些 SIP 服务提供商允许用您的计算机呼叫一般的电话。通常，您需要订阅某种付费服"
+"务才能使用这个功能。"
 
-#: C/prev-conv.page:91(p)
+#: C/create-account.page:109(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>标签。"
+"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/prev-conv.page:103(p)
+#: C/create-account.page:114(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."
+"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 ""
-"在左上的下拉列表中选择一个账户。下方会显示这个账户的联系人和聊天室列表。"
+"有些 IRC 网络上有一种叫做 NickServ 的服务，允许用户保护他们的昵称。更多信息参"
+"见<link xref=\"irc-nick-password\"/>。"
 
-#: C/prev-conv.page:107(p)
+#: C/create-account.page:117(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 "选择一个联系人或聊天室以查看之前的会话。默认显示的是最近的会话。"
+"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/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "专有的服务"
 
-#: C/prev-conv.page:111(p)
+#: C/create-account.page:124(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."
+"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/prev-conv.page:117(p)
-msgid ""
-"You can search for text in the displayed conversation by typing into the "
-"search field at the top. The matching text will be highlighted."
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
 msgstr ""
-"您可以在上方的搜索栏中输入文字，以在显示的会话中搜索文字。匹配的文字会被高亮"
-"显示。"
 
-#: C/prev-conv.page:121(p)
-msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
+#: C/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 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/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr ""
 
-#: C/link-contacts.page:25(title)
-msgid "Combine and separate contacts"
-msgstr "合并和分割联系人"
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr ""
 
-#: C/link-contacts.page:26(p)
-msgid ""
-"If one, or more, of your contacts has multiple accounts with different "
-"messaging services, you can combine these contacts into a single one."
-msgstr "如果您的联系人有多个聊天服务的多个账户，您可以将他们合并成一个联系人。"
+#: 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/link-contacts.page:30(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
-msgstr "产生的联系人称为一个<em>元联系人</em>：由多个不同联系人组成的联系人。"
+"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 ""
+"您可以禁用一个帐号以阻止 <app>Empathy</app> 自动登录这个帐号而不必将其彻底删"
+"除。您可能想要禁用、启用某个帐号如果您只想偶尔登录这个帐号，但又想使用 "
+"<app>Empathy</app> 中的其他帐号。"
 
-#: C/link-contacts.page:34(p)
+#: C/disable-account.page:53(item/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
-msgstr "如果您有一个叫做 Jane Smith 的联系人，她使用三种不同的聊天服务："
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr "在窗口左侧的帐号列表中，选择您想要禁用的帐号。"
 
-#: C/link-contacts.page:40(p)
-msgid "janes@facebook"
-msgstr "janes@facebook"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "在窗口的右侧关闭它。"
 
-#: C/link-contacts.page:45(p)
-msgid "jane.smith@gmail"
-msgstr "jane.smith@gmail"
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "要重新启用这个帐号，则开启它。"
 
-#: C/link-contacts.page:50(p)
-msgid "jane_smith@hotmail"
-msgstr "jane_smith@hotmail"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "设立，加入或管理聊天室收藏。"
 
-#: C/link-contacts.page:55(p)
-msgid "You can combine these contacts into a single Jane Smith one."
-msgstr "您可以将这些联系人合并成一个 Jane Smith."
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "聊天室收藏"
 
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "合并联系人"
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "收藏一个聊天室"
 
-#: C/link-contacts.page:63(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click one of the contact that "
-"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
-"gui>."
-msgstr ""
-"在 <gui>联系人列表</gui> 窗口，右键点击有不同账户的联系人，并选择 <gui style="
-"\"menuitem\">绑定联系人…</gui>"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "加入一个聊天室。"
 
-#: C/link-contacts.page:70(p)
+#: C/favorite-rooms.page:40(item/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
-msgstr "在 <gui>绑定联系人</gui> 窗口的左窗格，选择您想要关联起来的联系人。"
-
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "点击 <gui style=\"button\">绑定</gui>."
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
+msgstr "关于如何加入 IRC 聊天室，参见 <link xref=\"irc-join-room\"/>。"
 
-#: C/link-contacts.page:82(p)
+#: C/favorite-rooms.page:46(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."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"当一个元联系人被创建后，您双击该联系人时默认使用的联系人是有最高的在线状态的"
-"联系人。"
-
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "分割联系人"
+"关于如何发起或加入群组聊天，参见 <link xref=\"group-conversations\"/>。"
 
-#: C/link-contacts.page:94(p)
+#: C/favorite-rooms.page:54(item/p)
 msgid ""
-"From the <gui>Contact List</gui>, right-click the contact to separate, and "
-"select <gui style=\"menuitem\">Link Contacts...</gui>."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 msgstr ""
-"在 <gui>联系人列表</gui> 窗口中，右键点击要分割的联系人，并选择 <gui style="
-"\"menuitem\">绑定联系人…</gui>"
+"在会话窗口，选择 <guiseq><gui>会话</gui><gui>收藏聊天室</gui></guiseq>。"
 
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "点击 <gui style=\"button\">解除绑定</gui>。"
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "加入收藏的聊天室"
 
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "法律信息。"
+#: 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/license.page:11(title)
-msgid "License"
-msgstr "许可"
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "按 <key>F5</key> 键。"
 
-#: C/license.page:12(p)
+#: C/favorite-rooms.page:76(item/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
+"选择 <guiseq><gui>聊天室</gui><gui>加入已收藏的聊天室</gui></guiseq>，以加入"
+"您之前收藏的聊天室。"
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "您可以自由："
-
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "分享"
-
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "复制、分发或者传播作品。"
-
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "再创作"
-
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "修改作品。"
-
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "需遵守一下条件："
-
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "署名"
+#: 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/license.page:39(p)
+#: C/favorite-rooms.page:90(note/p)
 msgid ""
-"You must attribute the work in the manner specified by the author or "
-"licensor (but not in any way that suggests that they endorse you or your use "
-"of the work)."
-msgstr ""
-"您必须按照作者或许可人指定的方式对作品署名(但不能以任何方式暗示他们认可您或者"
-"您对作品的使用)。"
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr "要加入一个已收藏的聊天室，您必须连接互联网和您的帐号。"
 
-#: C/license.page:46(em)
-msgid "Share Alike"
-msgstr "相同方式共享"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "管理聊天室收藏"
 
-#: C/license.page:47(p)
+#: C/favorite-rooms.page:101(item/p)
 msgid ""
-"If you alter, transform, or build upon this work, you may distribute the "
-"resulting work only under the same, similar or a compatible license."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"如果您改变、转换本作品或者以本作品为基础进行再创作，您应以相同、相似或者兼容"
-"的协议发布修改后的作品。"
+"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>管理收藏夹"
+"</gui></guiseq>。"
 
-#: C/license.page:53(p)
+#: C/favorite-rooms.page:107(item/p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
-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>。"
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr "在 <gui>帐号</gui> 下拉列表中，选择您要管理聊天室收藏的帐号。"
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "向一位 IRC 联系人发起会话。"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "选择 <gui>全部</gui> 以看到搜有您收藏的聊天室。"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "与 IRC 中某人聊天"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "选择您要管理的收藏："
 
-#: C/irc-start-conversation.page:32(p)
+#: C/favorite-rooms.page:121(item/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 用"
-"户进行会话："
+"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-start-conversation.page:37(p)
-msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
-msgstr ""
-"在一个 IRC 聊天室的联系人列表中，双击您想要聊天的用户。或者，右键点击用户的姓"
-"名并选择 <gui>聊天</gui>"
+#: 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-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:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "完成后，点击 <gui>关闭</gui>。"
 
-#: C/irc-start-conversation.page:52(p)
-msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
-msgstr ""
-"IRC 聊天室的联系人列表通常位于窗口右侧。如果您没有看到它，选择 <guiseq><gui>"
-"对话</gui><gui>显示联系人列表</gui></guiseq>。"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "使用和了解 <app>Empathy</app> 中的地理位置。"
 
-#: 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/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "地理位置"
 
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "通过 IRC 传送文件"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "地理位置"
 
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "目前无法用 IRC 传送文件。"
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "修复常见问题"
 
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-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-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "在 IRC 中使用昵称和密码"
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "地理位置没有被公布。"
 
-#: C/irc-nick-password.page:35(p)
+#: C/geolocation-not-showing.page:34(page/p)
 msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
+"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 网络上，您可以通过 NickServ 服务注册您的昵称。通过向 NickServ 发送"
-"特殊的消息，您可以设置密码来认证您自己。一些 IRC 聊天室可能不允许您加入，除非"
-"您有注册过的昵称。"
+"如果您的联系人不能看到您的位置，可能是因为 <app>Empathy</app> 无法发现有一定"
+"精度的您的地理位置信息。"
 
-#: C/irc-nick-password.page:40(p)
+#: C/geolocation-not-showing.page:38(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."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 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 账户"
-
-#: 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/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/irc-nick-password.page:69(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
-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)"
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr "如果您想要公布您的地理位置，您可以试一试使用 GPS 等外部设备。"
 
-#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
+#: C/geolocation-not-showing.page:48(note/p)
 msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
-"要在 <app>Empathy</app> 中使用 IRC，您必须安装 <sys>telepathy-idle</sys> 包。"
-
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "安装 telepathy-idle"
-
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "IRC 聊天室和会话"
-
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "聊天室和会话"
-
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "常见 IRC 问题"
-
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "常见问题"
-
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "加入一个 IRC 频道。"
-
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "加入一个 IRC 聊天室"
+"要发布您的地理位置，您的 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:33(p)
-msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
-msgstr ""
-"您可以加入您已经连接的所有 IRC 网络上的 IRC 聊天室(也称为 IRC 频道)。要连接一"
-"个 IRC 网络，参见 <link xref=\"add-account\"/> and <link xref=\"account-irc"
-"\"/>。"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "发送了什么信息，发送给谁了？"
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
-msgstr ""
-"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>加入</"
-"gui></guiseq>。"
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "地理位置隐私"
 
-#: C/irc-join-room.page:45(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
-msgstr "在 <gui>账户</gui> 下拉列表中，选择与您想要使用的网络对应的 IRC 账户。"
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "什么信息被发送了"
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-privacy.page:36(section/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"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 ""
-"在 <gui>聊天室</gui> 文本框中，输入您想要加入的频道的名称。IRC 频道名称以井号"
-"(<sys>#</sys>)开头。"
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "点击<gui>加入</gui>来进入房间。"
-
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr "要加入多个房间，您需要对每个房间重复上面的步骤。"
-
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "进入有密码保护的 IRC 聊天室。"
-
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "加入一个受保护的 IRC 聊天室"
+"有可能被发送的信息：您所在的国家，地区，地方，区域，街道，建筑，楼层，房间，"
+"邮政编码及经纬度，您的速度和方向。"
 
-#: C/irc-join-pwd.page:27(p)
+#: C/geolocation-privacy.page:40(section/p)
 msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
-msgstr ""
-"在某些 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>。"
+"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-join-pwd.page:38(p)
+#: C/geolocation-privacy.page:44(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>."
+"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 ""
-"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 命令"
+"不同的网络可能有不同的精度设置，可能发送不同的信息。使用外部设备，如 GPS 或手"
+"机，可以增加发送的信息的精度。"
 
-#: C/irc-commands.page:19(p)
+#: C/geolocation-privacy.page:49(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>."
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
 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 "所有可用命令都有一个简单的用法描述。"
+"当隐私模式被启用后，只有您所在的城市信息会被发送，即使您正在使用外部设备。"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/introduction.page:41(None)
-msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
-msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "谁会看到这些发送出去的信息"
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "只有您的联系人可以看到您的地理位置。"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-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/hide-contacts.page:21(page/p)
+msgid ""
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
+msgstr ""
+"一般情况下，<app>Empathy</app> 会显示您所有的联系人：您可以与之进行会话的在线"
+"的联系人，和那些离线的联系人。"
+
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "要隐藏离线的联系人："
+
+#: 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 ""
+"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/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "要再次显示离线的联系人，重复上面的步骤。"
+
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "从其他即时聊天程序中导入帐号。"
+
+#: 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 "导入已存在的帐号"
+
+#: C/import-account.page:44(page/p)
+msgid ""
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
+msgstr ""
+"<app>Empathy</app> 第一次运行时，会提示您可以从其他即时通讯程序中导入帐号。目"
+"前，支持的程序只有 <app>Pidgin</app>。"
+
+#: C/import-account.page:50(item/p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"第一次运行 <app>Empathy</app>，一个助理程序会提供若干选项以创建新帐号。"
+
+#: C/import-account.page:54(item/p)
+msgid ""
+"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/import-account.page:66(note/p)
+msgid ""
+"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 ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
+
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
+
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "介绍"
+
+#: C/introduction.page:23(page/p)
+msgid ""
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
+msgstr ""
+"<app>Empathy</app> 是 GNOME 桌面的即时通讯程序。它支持文字消息，语音和视频呼"
+"叫，文件传输，支持最常用的即时通讯系统，包括 MSN 和 Google Talk."
+
+#: C/introduction.page:28(page/p)
+msgid ""
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
+msgstr ""
+"<app>Empathy</app> 可以帮助您在工作中更好的合作，也可以帮助您与您的朋友们保持"
+"联系。"
+
+#: 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 ""
+"使用 <app>Empathy</app>，您可以将所有的会话组织在同一个窗口中，或者为不同类型"
+"的会话使用不同的窗口，还可以很容易地搜索之前的会话，或者共享您的桌面，只需要"
+"两次点击。"
 
-#: C/geolocation-what-is.page:35(p)
-msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
-msgstr "地理位置允许您确定连接到网络的一台电脑或设备在地理上的真实位置。"
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>联系人列表</gui>窗口"
 
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "通过 <app>Empathy</app> 中的地理位置，您可以："
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app> 主窗口"
 
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "公布您的地理位置给联系人。"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app> 主窗口。"
 
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr "查看联系人的地址位置并快速联系他们。"
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "支持的 IRC 命令。"
 
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
-msgstr "设置您的地理位置的精度及可以用来发现您的地理位置的设备。"
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "支持的 IRC 命令"
 
-#: C/geolocation-what-is.page:60(p)
+#: C/irc-commands.page:19(page/p)
 msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
-msgstr "您的联系人必须使用支持地理位置的程序，您才能看到他们的地理位置。"
-
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "在 <app>Empathy</app> 中如何激活和禁用地理位置。"
+"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-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "激活/禁用地理位置"
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+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/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "进入有密码保护的 IRC 聊天室。"
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "选择<gui>位置</gui>标签。"
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "加入一个受保护的 IRC 聊天室"
 
-#: C/geolocation-turn.page:47(p)
+#: C/irc-join-pwd.page:27(page/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
-msgstr "选择 <gui>向我的联系人公布位置信息</gui> 以激活地理位置。"
-
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "要禁用地理位置，请取消选择。"
+"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 ""
+"在某些 IRC 网络上，私人的 IRC 房间可以被密码保护。如果您知道这密码，按照下面"
+"的步骤加入："
 
-#: C/geolocation-turn.page:55(p)
-msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
-msgstr "要提高您的位置的精度，请取消选择 <gui>降低位置信息精度</gui>。"
+#: 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/geolocation-turn.page:61(p)
+#: C/irc-join-pwd.page:38(item/p)
 msgid ""
-"If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Location sources</gui> "
-"section."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"如果您有 GPS 这样的外部设备，或者想要发送更加精确的位置信息，在<gui>位置来源"
-"</gui>选项卡中选择适当的选项。"
+"Empathy 会提示您输入密码。输入这个 IRC 聊天室的密码并点击 <gui style=\"button"
+"\">加入</gui>。"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "支持地理位置的服务和及其兼容性。"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "加入一个 IRC 频道。"
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "支持的设备"
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "加入一个 IRC 聊天室"
 
-#: C/geolocation-supported.page:33(p)
+#: C/irc-join-room.page:33(page/p)
 msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
+"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 ""
-"目前，只有 Jabber 服务与地理位置功能兼容。要使用地理位置，您和您的联系人必须"
-"有 Jabber 账户。"
+"您可以加入您已经连接的所有 IRC 网络上的 IRC 聊天室(也称为 IRC 频道)。要连接一"
+"个 IRC 网络，参见 <link xref=\"add-account\"/> and <link xref=\"account-irc"
+"\"/>。"
 
-#: C/geolocation-supported.page:39(p)
+#: C/irc-join-room.page:45(item/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."
+"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 ""
-"而且，您使用的服务器也需要支持地理位置功能。大多 Jabber 服务器都支持。要了解"
-"更多，请参看您的服务提供者的网站文档。"
+"在 <gui>聊天室</gui> 文本框中，输入您想要加入的频道的名称。IRC 频道名称以井号"
+"(<sys>#</sys>)开头。"
 
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "兼容性"
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "点击<gui>加入</gui>来进入房间。"
 
-#: C/geolocation-supported.page:49(p)
+#: C/irc-join-room.page:64(note/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>。"
+"To join multiple rooms, you need to repeat the steps above for each room."
+msgstr "要加入多个房间，您需要对每个房间重复上面的步骤。"
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-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:32(title)
-msgid "Geolocation Privacy"
-msgstr "地理位置隐私"
+#: C/irc-manage.page:23(credit/name)
+msgid "Sindhu S"
+msgstr ""
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "什么信息被发送了"
+#: C/irc-manage.page:39(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "互联网中继聊天(IRC)"
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-manage.page:47(when/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."
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
+"idle</link>"
 msgstr ""
-"有可能被发送的信息：您所在的国家，地区，地方，区域，街道，建筑，楼层，房间，"
-"邮政编码及经纬度，您的速度和方向。"
 
-#: 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-manage.page:55(info/title)
+#, fuzzy
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC 聊天室和会话"
+
+#: C/irc-manage.page:57(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "聊天室和会话"
+
+#: C/irc-manage.page:62(info/title)
+#, fuzzy
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "常见 IRC 问题"
 
-#: C/geolocation-privacy.page:44(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 ""
-"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, 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 ""
-"不同的网络可能有不同的精度设置，可能发送不同的信息。使用外部设备，如 GPS 或手"
-"机，可以增加发送的信息的精度。"
+"在某些 IRC 网络上，您可以通过 NickServ 服务注册您的昵称。通过向 NickServ 发送"
+"特殊的消息，您可以设置密码来认证您自己。一些 IRC 聊天室可能不允许您加入，除非"
+"您有注册过的昵称。"
 
-#: C/geolocation-privacy.page:49(p)
+#: C/irc-nick-password.page:40(page/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."
+"<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/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "谁会看到这些发送出去的信息"
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "设置一个 IRC 密码："
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "只有您的联系人可以看到您的地理位置。"
+#: 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/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "什么是隐私模式"
+#: C/irc-nick-password.page:57(item/p)
+msgid ""
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr "在 <gui>密码</gui> 一栏中，输入您注册您的昵称时使用的密码。"
 
-#: C/geolocation-privacy.page:64(p)
+#: C/irc-nick-password.page:69(note/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."
+"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 ""
-"隐私模式是精度降低模式，它会降低发送给您的联系人的地理位置信息的精度。隐私模"
-"式默认开启。"
-
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "隐私概述"
+"这些说明只是允许您在特定的 IRC 网络上使用密码保护的昵称。目前在 "
+"<app>Empathy</app> 中还不能注册 IRC 昵称或修改密码。"
 
-#: C/geolocation-privacy.page:72(p)
-msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
-msgstr "<app>Empathy</app> 中一些关于地理位置隐私的选项的概况。"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> 目前不支持 IRC 传文件。"
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "地理位置默认不开启。"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "通过 IRC 传送文件"
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "隐私模式默认被激活"
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "目前无法用 IRC 传送文件。"
 
-#: C/geolocation-privacy.page:87(p)
-msgid ""
-"Privacy mode prevails even when using external and more precise devices."
-msgstr "即使在使用精度更高的外部设备，隐私模式也会发挥作用。"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "向一位 IRC 联系人发起会话。"
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "只有您的联系人可以看到您的位置。"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+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-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/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "地理位置没有被公布。"
+#: C/irc-start-conversation.page:37(item/p)
+msgid ""
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
+msgstr ""
+"在一个 IRC 聊天室的联系人列表中，双击您想要聊天的用户。或者，右键点击用户的姓"
+"名并选择 <gui>聊天</gui>"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/irc-start-conversation.page:45(item/p)
 msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
+"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 ""
-"如果您的联系人不能看到您的位置，可能是因为 <app>Empathy</app> 无法发现有一定"
-"精度的您的地理位置信息。"
+"IRC 聊天室的联系人列表与 <app>Empathy</app> 的联系人列表不同。它包含了您加入"
+"的这个 IRC 聊天室中的用户列表。不同的聊天室可能有不同的联系人列表。"
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/irc-start-conversation.page:52(item/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"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/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "法律信息。"
 
-#: C/geolocation-not-showing.page:42(p)
-msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
-msgstr "如果您想要公布您的地理位置，您可以试一试使用 GPS 等外部设备。"
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "许可"
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/license.page:12(page/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."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 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 "地理位置"
+"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "地理位置"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "您可以自由："
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "修复常见问题"
+#: C/license.page:25(item/title)
+#, fuzzy
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "分享"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "设立，加入或管理聊天室收藏。"
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "复制、分发或者传播作品。"
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "聊天室收藏"
+#: C/license.page:29(item/title)
+#, fuzzy
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "再创作"
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "收藏一个聊天室"
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "修改作品。"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "加入一个聊天室。"
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "需遵守一下条件："
 
-#: C/favorite-rooms.page:40(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\"/>。"
+#: C/license.page:38(item/title)
+#, fuzzy
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "署名"
 
-#: C/favorite-rooms.page:46(p)
+#: C/license.page:39(item/p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"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 ""
-"关于如何发起或加入群组聊天，参见 <link xref=\"group-conversations\"/>。"
+"您必须按照作者或许可人指定的方式对作品署名(但不能以任何方式暗示他们认可您或者"
+"您对作品的使用)。"
 
-#: C/favorite-rooms.page:54(p)
+#: C/license.page:46(item/title)
+#, fuzzy
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "相同方式共享"
+
+#: C/license.page:47(item/p)
 msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"If you alter, transform, or build upon this work, you may distribute the "
+"resulting work only under the same, similar or a compatible license."
 msgstr ""
-"在会话窗口，选择 <guiseq><gui>会话</gui><gui>收藏聊天室</gui></guiseq>。"
-
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "加入收藏的聊天室"
-
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "按 <key>F5</key> 键。"
+"如果您改变、转换本作品或者以本作品为基础进行再创作，您应以相同、相似或者兼容"
+"的协议发布修改后的作品。"
 
-#: C/favorite-rooms.page:76(p)
+#: C/license.page:53(page/p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"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 ""
-"选择 <guiseq><gui>聊天室</gui><gui>加入已收藏的聊天室</gui></guiseq>，以加入"
-"您之前收藏的聊天室。"
-
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "选择 <gui>聊天室</gui>，并选择您要加入的已收藏的聊天室。"
+"许可的全文参见 <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/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/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "将不同的联系人合并分割为一个联系人。"
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "管理聊天室收藏"
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "合并和分割联系人"
 
-#: C/favorite-rooms.page:101(p)
+#: C/link-contacts.page:26(page/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>。"
+"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/favorite-rooms.page:107(p)
+#: C/link-contacts.page:30(page/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/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "选择 <gui>全部</gui> 以看到搜有您收藏的聊天室。"
-
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "选择您要管理的收藏："
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr "产生的联系人称为一个<em>元联系人</em>：由多个不同联系人组成的联系人。"
 
-#: C/favorite-rooms.page:121(p)
+#: C/link-contacts.page:34(page/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>，则您连接到您的账户后，会自动加入这个聊天室。"
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr "如果您有一个叫做 Jane Smith 的联系人，她使用三种不同的聊天服务："
 
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "点击 <gui>删除</gui> 以从收藏夹中删除这个聊天室。"
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
 
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "完成后，点击 <gui>关闭</gui>。"
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "使 <app>Empathy</app> 不要自动登录一个账户。"
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "禁用一个账户"
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "您可以将这些联系人合并成一个 Jane Smith."
+
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "合并联系人"
 
-#: C/disable-account.page:41(p)
+#: C/link-contacts.page:63(item/p)
 msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
 msgstr ""
-"您可以禁用一个账户以阻止 <app>Empathy</app> 自动登录这个账户而不必将其彻底删"
-"除。您可能想要禁用、启用某个账户如果您只想偶尔登录这个账户，但又想使用 "
-"<app>Empathy</app> 中的其他账户。"
+"在 <gui>联系人列表</gui> 窗口，右键点击有不同帐号的联系人，并选择 <gui style="
+"\"menuitem\">绑定联系人…</gui>"
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:70(item/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
-msgstr "在窗口左侧的账户列表中，选择您想要禁用的账户。"
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr "在 <gui>绑定联系人</gui> 窗口的左窗格，选择您想要关联起来的联系人。"
 
-#: C/disable-account.page:56(p)
-msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
-msgstr "在窗口右侧，取消选择 <gui style=\"checkbox\">启用</gui>。"
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "点击 <gui style=\"button\">绑定</gui>."
 
-#: C/disable-account.page:62(p)
+#: C/link-contacts.page:82(note/p)
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
-msgstr "要重新启用这个账户，只需选择 <gui style=\"checkbox\">启用</gui>。"
-
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "为某种支持的服务注册账户。"
+"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 ""
+"当一个元联系人被创建后，您双击该联系人时默认使用的联系人是有最高的在线状态的"
+"联系人。"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "注册一个新账户"
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "分割联系人"
 
-#: C/create-account.page:36(p)
+#: C/link-contacts.page:94(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>, right-click the contact to separate, 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:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</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/overview.page:37(media)
+msgctxt "_"
 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>."
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
 msgstr ""
-"这一页是关于建立各种类型的账户的。您应当已经从您的账户提供商那里得到了登录 "
-"ID 和密码，以及其他使用 <app>Empathy</app> 连接这个账户需要的信息。"
-
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
 
-#: C/create-account.page:48(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 ""
-"Facebook is one of the most-used social networks. It allows users to create "
-"their own profile and to communicate with their friends."
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 msgstr ""
-"Facebook 是最常用的社交网络之一。它允许用户对自己进行个性化的描述并与朋友们交"
-"流。"
 
-#: C/create-account.page:52(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 ""
-"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>."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr ""
-"要使用 Facebook 与您的朋友们交流，您需要在其网站上建立一个新账户：<link href="
-"\"http://www.facebook.com\">www.facebook.com</link>。"
 
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+#: C/overview.page:8(info/desc)
+msgid "What instant messaging is and how you can use it."
+msgstr ""
 
-#: C/create-account.page:62(p)
-msgid ""
-"Jabber is an open instant messaging system. Like email, Jabber allows you to "
-"choose your account provider and communicate with all other Jabber users, "
-"regardless of their account provider."
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
 msgstr ""
-"Jabber 是一种开放的即时通讯系统。像 email 一样，Jabber 允许您选择账户提供商，"
-"并与其他 Jabber 用户交流，无论他们使用哪里账户提供商。"
 
-#: C/create-account.page:66(p)
-msgid ""
-"You will need to create a new account with a Jabber provider. There are many "
-"free providers; one popular provider is <link href=\"http://register.jabber."
-"org/\">Jabber.org</link>."
+#: C/overview.page:24(page/title)
+msgid "Overview of instant messaging"
 msgstr ""
-"您需要在某个 Jabber 服务提供商那里建立账户。有许多 Jabber 服务提供商，<link "
-"href=\"http://register.jabber.org/\">Jabber.org</link> 是很流行的一个。"
 
-#: C/create-account.page:71(p)
+#: C/overview.page:26(page/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."
+"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 ""
-"如果您使用 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/overview.page:42(td/p)
+msgid "Video Conference"
+msgstr ""
+
+#: C/overview.page:43(td/p)
+#, fuzzy
+#| msgid "Group conversations"
+msgid "Group chats"
+msgstr "群组聊天"
 
-#: C/create-account.page:80(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 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."
+"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 ""
-"要使用这个服务，您并不需要在某个服务提供商那里创建账户，只需要连接到一个本地"
-"网络，比如一个无线热点。它会自动发现网络中使用这个服务的其他用户。"
 
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "更多信息参见<link xref=\"salut-protocol\"/>。"
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "浏览或搜索您之前的会话。"
 
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "查看之前的会话"
 
-#: C/create-account.page:91(p)
+#: C/prev-conv.page:38(page/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."
+"<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 ""
-"SIP 是一种允许用户通过互联网进行语音和视频会话的开放系统。您需要在某个 SIP 服"
-"务提供商处创建账户。您可以和其他的 SIP 用户交流，无论他们的 SIP 服务提供商与"
-"您是否相同。"
+"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
+"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
+"\">浏览之前的会话</link>。"
+
+#: C/prev-conv.page:46(note/p)
+msgid ""
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr "您不需要连接到网络来查看和搜索您之前的会话。"
+
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "搜索之前的会话"
+
+#: C/prev-conv.page:55(section/p)
+msgid ""
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "您可以在之前的所有会话中进行全文搜索。"
 
-#: C/create-account.page:97(p)
+#: 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 ""
-"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>."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
 msgstr ""
-"由于技术上的差别，免费的 <link href=\"https://www.ekiga.net/index.php?"
-"page=register\">Ekiga.net</link> 服务目前在 <app>Empathy</app> 中还不能使用。"
+"从<gui>联系人列表</gui>窗口，选择<guiseq><gui>查看</gui><gui>最近会话</gui></"
+"guiseq>。或者可以按<key>F3</key>键。"
 
-#: C/create-account.page:102(p)
+#: C/prev-conv.page:63(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."
-msgstr ""
-"有些 SIP 服务提供商允许用您的计算机呼叫一般的电话。通常，您需要订阅某种付费服"
-"务才能使用这个功能。"
+"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:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+#: 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:109(p)
+#: C/prev-conv.page:71(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."
-msgstr ""
-"您不需要注册账户就可以使用 IRC。尽管您在 <app>Empathy</app> 中添加 IRC 账户时"
-"指定了一个昵称，这个昵称只是您每次连接时才建立。如果有其他用户在使用这个昵"
-"称，您需要选择一个其他昵称。"
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
+msgstr "符合搜索条件的会话会显示在下面的列表中。会话默认按日期排序。"
+
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "浏览之前的会话"
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:82(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 ""
-"有些 IRC 网络上有一种叫做 NickServ 的服务，允许用户保护他们的昵称。更多信息参"
-"见<link xref=\"irc-nick-password\"/>。"
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr "您可以按时间顺序浏览之前和联系人或在聊天室中的会话。"
 
-#: C/create-account.page:117(p)
+#: C/prev-conv.page:91(item/p)
 msgid ""
-"Some IRC servers are password protected. You will need to know the password "
-"to connect to these servers. Generally, these are private IRC networks."
+"Select 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 ""
-"有些 IRC 服务器是被密码保护的。您需要知道密码才能连接到这些服务器。通常，这样"
-"的服务器是私有的。"
+"在左上的下拉列表中选择一个帐号。下方会显示这个帐号的联系人和聊天室列表。"
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "专有的服务"
+#: C/prev-conv.page:95(item/p)
+msgid ""
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr "选择一个联系人或聊天室以查看之前的会话。默认显示的是最近的会话。"
 
-#: C/create-account.page:124(p)
+#: C/prev-conv.page:99(item/p)
 msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
 msgstr ""
-"许多不同的公司或组织开发了一些专营的即时消息服务。<app>Empathy</app> 允许您连"
-"接大多常见服务的既存账户。要为这样的服务创建账户，您需要访问其网站并同意其使"
-"用条款。"
-
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
-
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
-
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
-
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
-
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "改变您的状态以向您的联系人表明您是否闲暇。"
+"您可以按日期浏览您的会话。如果在某日您所选择的帐号有过会话，该日会以粗体显"
+"示。点击一个日期以选择它。点击月和年旁的箭头以浏览更早的日期。"
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "改变您的状态"
+#: C/prev-conv.page:105(section/p)
+msgid ""
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
+msgstr ""
+"您可以在顶部的搜索栏中输入文字，以在会话中搜索文字。匹配的会话会显示出来。"
 
-#: C/change-status.page:36(p)
+#: C/prev-conv.page:111(note/p)
 msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
+"gui> window will open with that contact already selected."
 msgstr ""
-"您可以改变您的状态，从而向联系人表明您现在是否闲暇。<app>Empathy</app> 允许您"
-"从一些定义好的状态中选择一个。"
+"在 <gui>联系人列表</gui> 窗口中，您可以快速查看与某个联系人之前进行过的会话。"
+"右键点击该联系人，选择 <gui>最近回话</gui>。与该联系人的<gui>最近会话</gui>窗"
+"口将会打开，并且选中该联系人。"
 
-#: C/change-status.page:41(p)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr "点击 <gui>联系人列表</gui> 窗口顶部的下拉列表。"
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr "您要连接的即时通信帐号没有在帐号列表中启用。"
 
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "从列表中选择一个状态。"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "我的帐号没有启用"
 
-#: C/change-status.page:52(p)
+#: C/prob-conn-acctdisabled.page:36(page/p)
 msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"If the instant messaging account that you want to use is not enabled in the "
+"drop-down account list when you try to start a new conversation or join a "
+"room, your account details may not be correct."
 msgstr ""
-"内置的状态和它们的含义参见<link xref=\"status-icons\"/>。您也可以<link xref="
-"\"set-custom-message\">添加自定义的状态信息</link>来向您的联系人提供更多有关"
-"您当前状态的信息。"
+"如果当您尝试开始一个新会话或者加入房间时，要使用的即时聊天帐号没有在下拉的账"
+"户列表中启用，您的帐号信息可能不正确。"
 
-#: C/change-status.page:58(p)
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
+#: C/prob-conn-neterror.page:53(item/p)
 msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
-msgstr ""
-"如果您一段时间不使用计算机，或屏幕保护开始运行，您的状态会自动变为“离开”。"
+"Make sure that you are connected to the Internet, or to a local area network."
+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/prob-conn-acctdisabled.page:49(item/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
+"account that is not working."
 msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"选择<guiseq><gui>编辑</gui><gui>帐号</gui></guiseq>，再选择不工作的帐号。"
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
-msgstr "语音或视频会话的条件。"
-
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "语音和视频支持"
+"Type your username and password again to make sure that they are correct."
+msgstr "再次输入您的用户名和密码，以确保它们是正确的。"
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/p)
 msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
 msgstr ""
-"您的联系人也在使用支持语音和视频会话的程序时，您才可以和他们进行语音、视频会"
-"话。如果您的联系人可以进行语音或视频会话，您将在联系人列表中他们的姓名旁看到"
-"下列图标："
-
-#: C/audio-video.page:43(p)
-msgid "Icon"
-msgstr "图标"
+"检查<gui>高级</gui>选项卡中的所有细节是否正确。您应当可以从即时通讯服务商的网"
+"站上找到这些信息。"
 
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "描述"
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "检查帐号是否开启。"
 
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "语音聊天的图标"
+#: C/prob-conn-auth.page:8(info/desc)
+msgid ""
+"An error message which says “<gui>Authentication failed</gui>” appears in "
+"the main window."
+msgstr "主窗口中显示了一个错误提示信息，“<gui>验证失败</gui>”。"
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "联系人可以进行语音聊天。"
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed”"
+msgstr "我收到“验证失败”的错误提示信息"
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "视频聊天的图标"
+#: C/prob-conn-auth.page:38(page/p)
+msgid ""
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
+msgstr ""
+"这种错误发生在您的即时通信服务器无法确认您的身份，不允许您连接时。比如，因为"
+"某种原因，它无法识别您的用户名或者密码。"
 
-#: C/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "联系人可以进行视频聊天。"
+#: C/prob-conn-auth.page:50(item/p)
+msgid ""
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
+msgstr ""
+"确保您已经在要连接的服务上注册了帐号。如果没有帐号，多数服务都不会允许您连"
+"接。"
 
-#: C/audio-video.page:83(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 ""
-"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."
+"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:87(p)
+#: C/prob-conn-auth.page:68(item/p)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
-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:95(title)
-msgid "Supported Account Types"
-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:97(p)
+#: C/prob-conn-name.page:10(info/desc)
 msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
-msgstr ""
-"只有一些特定类型的账户支持语音或视频聊天。下表列出了每种类型的账户的语音、视"
-"频支持情况。"
+"An error message which says “<gui>Name in use</gui>” appears in the main "
+"window."
+msgstr "主窗口中显示了一个错误提示信息，“<gui>用户名已被占用</gui>”。"
+
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use”"
+msgstr "我收到“用户名已经被占用”的错误提示信息"
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-name.page:35(page/p)
 msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
+"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:110(p)
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
+
+#: C/prob-conn-name.page:56(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."
+"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:118(p)
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(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 ""
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
+msgstr "关闭帐号，然后开启该帐号并尝试重新连接到服务。"
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-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:129(p)
-msgid "Audio"
-msgstr "语音"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error”"
+msgstr "我收到“网络错误”的错误提示信息"
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "视频"
+#: 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: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-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:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook 聊天"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "代理支持"
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: 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:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging 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.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "连接到即时消息服务时的问题"
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "从 <app>Empathy</app> 中完全地删除一个帐号。"
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: C/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "删除帐号"
 
-#: C/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: 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 ""
+"如果你不想再使用某个帐号，您可以从 <app>Empathy</app> 中完全地删除这个帐号。"
+"如果您将来又希望在 <app>Empathy</app> 中使用这个帐号了，您可以再添加这个账"
+"户。"
+
+#: 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 "在窗口左侧的帐号列表中选择您想要删除的帐号。"
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+# 有个"-"的按钮图标，可以保持 - 不变。
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "点击<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 ""
+"一个弹出对话框会要求您确认删除。点击<gui>删除</gui>按钮来永久的删除这个帐号。"
 
-#: 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 "即使删除了帐号，<app>Empathy</app> 也不会删除这个帐号的聊天记录。"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "通过互联网呼叫您的联系人。"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "理解附近的人(People Nearby)功能"
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "开始语音聊天"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "什么是“附近的人”？"
 
-#: C/audio-call.page:29(p)
+#: C/salut-protocol.page:40(page/p)
 msgid ""
-"You can call your contacts and have an audio conversation with them. This "
-"features only works with certain types of accounts, and it requires the "
-"other person to have an application that supports audio calls."
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
 msgstr ""
-"您可以呼叫您的联系人，与他们进行语音聊天。这个功能仅对于一些特定类型的账户可"
-"用，并且需要另一个人使用的应用程序也支持语音呼叫。"
+"附近的人(People Nearby)服务是一个无服务器的通讯服务：您不需要连接并认证到一个"
+"中央服务器来使用这个功能。"
 
-#: C/audio-call.page:34(p)
+#: C/salut-protocol.page:45(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
-"next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Audio Call</gui>."
-msgstr ""
-"在 <gui>联系人列表</gui> 窗口，点击您想呼叫的联系人的名字旁的 <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media> "
-"图标并选择 <gui style=\"menuitem\">语音呼叫</gui>。"
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr "这类无服务器的通讯系统只局限于本地局域网，并且不需要互联网链接。"
 
-#: C/audio-call.page:55(p)
+#: C/salut-protocol.page:49(page/p)
 msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
 msgstr ""
-"要将语音会话转为视频会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
-"style=\"menuitem\">视频开启</gui></guiseq>。"
+"会自动的发现在同一个局域网中使用这个服务的人，并且可以给他们发送消息甚至文"
+"件，想其它服务一样。"
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "向一位元联系人发起语音会话"
+#: C/salut-protocol.page:54(page/p)
+msgid ""
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr "所有现代的本地局域网都应该可以支持这类服务。"
+
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "从您的计算机发送文件给您的联系人。"
+
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "发送文件"
 
-#: C/audio-call.page:71(p)
+#: C/send-file.page:45(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr "右键点击要向其发送文件的联系人，然后选择<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 ""
-"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
-"gui>。"
+"点击要向其发送文件的联系人，然后选择<guiseq><gui>编辑</gui><gui>联系人</"
+"gui><gui>发送文件</gui></guiseq>。"
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "添加某人到联系人列表。"
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "选择要发送的文件，并点击<gui>发送</gui>。"
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "添加某人到您的联系人列表"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "<gui>文件传输</gui>窗口会被显示。"
 
-#: 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/send-file.page:66(item/p)
+msgid ""
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr "请等待您的联系人接受文件传输，或点击<gui>停止</gui>来终止传输。"
 
-#: C/add-contact.page:40(p)
+#: C/send-file.page:72(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."
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr "传输结束之后，就可以关闭<gui>文件传输</gui>窗口了。"
+
+#: C/send-file.page:80(note/p)
+msgid ""
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
 msgstr ""
-"在 <gui>账户</gui> 下拉列表中，选择您用来与您的联系人联系的账户。您的联系人需"
-"要使用与您选择的账户相同的服务。"
+"如果窗口中列出了很多已经完成的传输，点击<gui>清除</gui>可以清空列表。这只会将"
+"列表清空，而不会从您的计算机上删除这些文件。"
 
-#: C/add-contact.page:45(p)
+#: C/send-file.page:87(note/p)
 msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
+"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> 一栏中，输入这种服务中您的联系人的登录 ID，用户名，显示"
-"名或其他合适的标识符。"
+"只有使用下列服务才能发送文件：<em>Jabber</em>、<em>Google Talk</em>和<em>附近"
+"的人</em>。"
 
-#: C/add-contact.page:49(p)
+#: C/send-file.page:93(note/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
-msgstr "在 <gui>别名</gui> 中，输入您希望这个联系人显示在联系人列表中的名字。"
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
+msgstr "要向别人发送文件，您需要连接到互联网，或本地局域网。"
 
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr "点击<gui>添加</gui>将此人添加到您的联系人列表。"
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "发送消息给一个您的联系人。"
+
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "向某人发送消息"
 
-#: C/add-contact.page:61(p)
+#: C/send-message.page:36(item/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
-msgstr "要添加联系人到您的联系人列表，您需要连接因特网和您的账户。"
+"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/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "向 <app>Empathy</app> 添加新账户。"
+#: 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/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "添加一个新账户"
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "向一位元联系人发送消息"
 
-#: C/add-account.page:41(p)
+#: C/send-message.page:58(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\"/>."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"您可以添加任何支持的服务的即时消息账户，以在 <app>Empathy</app> 中与您的联系"
-"人交流。对于某些账户提供商，这些步骤也允许您注册新账户。更多细节参见<link "
-"xref=\"create-account\"/>。"
+"选择您想要与之聊天的联系人，并在菜单中选择 <gui style=\"menuitem\">聊天</"
+"gui>。"
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "点击<gui style=\"button\">添加</gui>。"
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "为您的状态添加、编辑或删除个人消息。"
 
-#: C/add-account.page:57(p)
-msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
-msgstr "在<gui>协议</gui>下拉列表，选择您要创建的账户类型。"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
+
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "设置一个自定义消息"
 
-#: C/add-account.page:61(p)
+#: C/set-custom-status.page:36(page/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."
+"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 ""
-"如果您还没有注册账户，选择<gui>在服务器上创建新的账户</gui>。这个功能并不是对"
-"于每一种账户都可用，也可能对于某些账户提供商不可用。更多信息参见<link xref="
-"\"create-account\"/>。"
+"有时您也许想要为您的状态设置一个自定义消息，例如，让别人知道您可能在一段时间"
+"内不在。"
 
-#: C/add-account.page:66(p)
+#: C/set-custom-status.page:40(page/p)
 msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
-msgstr ""
-"输入必要的信息。对于大多数账户，您只需要输入登录 ID 和密码。有些账户可能需要"
-"更多信息。参见<link xref=\"accounts-window#details\"/>。"
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr "可以根据不同的状态来设置自定义消息。"
 
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "点击<gui style=\"button\">登入</gui>。"
+#: 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/add-account.page:78(p)
+#: C/set-custom-status.page:52(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 status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"要改变账户在<gui>账户</gui>窗口中的作为标识的名字，在左侧的列表中选择账户，然"
-"后点击名字或者按空格键。编辑账户的名字，完成后按<key>Enter</key>。"
-
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "添加、修改和删除账户。"
-
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "账户窗口"
+"选择您希望添加自定义消息的状态。您必须选择有<gui>自定义消息</gui>标签标记的状"
+"态。"
 
-#: C/accounts-window.page:35(p)
+#: C/set-custom-status.page:58(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
-msgstr "<gui>账户</gui>窗口允许您添加、修改和删除账户。"
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
+msgstr ""
+"在窗口顶部的文本框中输入您的自定义消息，然后按<key>Enter</key>来设定这个消"
+"息。"
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "账户详细信息"
+#: C/set-custom-status.page:64(item/p)
+msgid ""
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little heart on the right of the text box where "
+"you wrote your custom message."
+msgstr ""
+"如果您希望收藏一个自定义消息，即将它保存下来方便日后使用，请点击您撰写自定义"
+"消息的文本框右侧的心形符号。"
 
-#: C/accounts-window.page:44(p)
+#: C/set-custom-status.page:69(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."
+"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 ""
-"对于大多数的账户，您只需要输入登录 ID 和密码。但有些账户或有些类型的账户可能"
-"需要额外的信息。"
+"如果您不这么做，那么下次您使用 <app>Empathy</app> 的时候，这个自定义消息就不"
+"会再出现。它只在 <app>Empathy</app> 本次运行期间被保留。"
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Jabber 和 Google Talk 账户的高级选项。"
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "编辑和删除自定义消息"
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Jabber 账户详情"
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "选择<gui>编辑自定义消息</gui>。"
 
-#: C/account-jabber.page:31(p)
-msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
-msgstr ""
-"大多 Jabber 账户只需要登录 ID 和密码就可以连接。但对于某些账户或某些网络，您"
-"可能需要在<gui>高级</gui>选项卡中输入一些额外的信息。通常，您不需要使用下面的"
-"这些高级选项。添加账户的一般指导参见<link xref=\"add-account\"/>。"
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "要编辑自定义消息："
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:100(item/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 账户同样适用。"
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr "在<gui>已保存的自定义状态</gui>中，选择您想要编辑的状态消息并双击它。"
 
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)"
+#: 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>来修改它。"
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "忽略 SSL 证书错误"
+#: C/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "要删除自定义消息："
 
-#: C/account-jabber.page:47(p)
+#: C/set-custom-status.page:118(item/p)
 msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
-msgstr ""
-"只要有可能，<app>Empathy</app> 与 Jabber 服务器之间的通讯就会被加密。如果不可"
-"能加密，消息就可能被明文发送。选择<gui>需要加密</gui>以阻止不能加密时 "
-"<app>Empathy</app> 与 Jabber 服务器进行明文通讯。"
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr "在<gui>已保存的自定义状态</gui>中，选择要删除的状态消息。"
+
+#: 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-jabber.page:52(p)
+#: C/set-custom-status.page:140(note/p)
 msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+"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 ""
-"有些 Jabber 服务器可能使用不合法的证书加密数据，或者使用来自未知的证书认证机"
-"构的证书。如果您信任您的服务器，您可以选择<gui>忽略 SSL 证书错误</gui>以允许"
-"使用不合法的证书进行加密通讯。"
+"当您编辑自定义消息时，它不会被设为当前状态消息。您需要在<gui>联系人列表</gui>"
+"窗口中选中它。"
 
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "资源"
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "向您的联系人展示您的桌面。"
 
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "优先级"
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "共享您的桌面"
 
-#: C/account-jabber.page:61(p)
+#: C/share-desktop.page:35(page/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."
+"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 ""
-"如果您有多个应用程序(比如，在另一台计算机上)同时连接了您的账户，您可以设置“资"
-"源”以唯一地标识每一个连接的程序。默认地，<app>Empathy</app> 会使用 "
-"<input>Telepathy</input> 作为“资源”。"
+"您可以和联系人共享桌面。使用这个功能，您可以向联系人展示您的桌面，来寻求帮助"
+"或帮助联系人解决问题。"
 
-#: C/account-jabber.page:65(p)
+#: C/share-desktop.page:42(note/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."
+"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 ""
-"您可以设置优先级以指定哪一个程序优先收到您的联系人发送来的消息。新的消息会被"
-"发送给优先级最高的程序。"
+"要共享您的桌面，您的系统中必须安装支持此功能的 VNC 服务器。<app>Vino</app>，"
+"GNOME 的 VNC 服务器，就有这项功能。"
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-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-jabber.page:71(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 ""
-"<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."
+"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 ""
-"<app>Empathy</app> 会根据您的登录 ID 以默认的设置连接 Jabber 服务器。对某些 "
-"Jabber 服务器，您需要人工输入一些服务器设置。这些设置应该由您的 Jabber 服务提"
-"供商提供。"
+"选择您想要共享您的桌面的联系人，并选择 <guiseq><gui>编辑</gui><gui>联系人</"
+"gui><gui>共享我的桌面</gui></guiseq>。"
 
-#. 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/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>。"
 
-#. 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/share-desktop.page:71(item/p)
+msgid ""
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+"您选择的联系人会收到一个查看您桌面的邀请。要查看您的桌面，他们需要接受邀请。"
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "连接 IRC 网络需要的额外信息。"
+#: 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:31(title)
-msgid "IRC account details"
-msgstr "IRC 账户详情"
+#: C/share-desktop.page:82(note/p)
+msgid ""
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
+msgstr "如果需要更多关于如何使用远程桌面查共享程序的信息，请参看其帮助。"
 
-#: C/account-irc.page:33(p)
+#: C/share-desktop.page:90(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."
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
 msgstr ""
-"IRC 账户需要与其他类型的账户不同的信息。要创建 IRC 账户，您至少需要指定一个 "
-"IRC 网络和一个昵称。本页详细介绍了您可以为一个 IRC 账户提供的信息。"
-
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "网络"
+"当您与其他人共享您的桌面的时候，可能会出现系统性能降低和网络速度下降的现象。"
 
-#: C/account-irc.page:46(p)
+#: C/share-desktop.page:96(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."
+"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 ""
-"IRC 是一种开放的系统，它允许人们运行各自的 IRC 网络。每个网络是独立的，有特有"
-"的用户和聊天室。<app>Empathy</app> 在 <gui>网络</gui> 下拉列表中列出了一些最"
-"流行的网络。您可以添加其他的网络。参看下面的<link xref=\"#networks\"/>。"
-
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "昵称"
+"并非您的所有联系人都可以使用这个功能。他们必须使用 2.28 或更新版本的 "
+"<app>Empathy</app> 并且在安装了兼容的远程桌面查看器程序。"
 
-#: C/account-irc.page:54(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:39(media)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgctxt "_"
 msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
-msgstr ""
-"您的昵称是您在 IRC 网络上的唯一性的名字。只有一个人可以使用某个特定的昵称。如"
-"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信息，您需要改变"
-"您的昵称。"
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr "@@image: '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)
+#, fuzzy
+#| msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgctxt "_"
+msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-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: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:61(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. 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 ""
-"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 ""
-"一些服务器，尤其是那些私有网络，需要密码才能连接。如果您被授权使用，网络的管"
-"理员应当为您提供了密码。"
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "NickServ 密码"
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "理解各种状态和状态图标。"
 
-#: C/account-irc.page:66(p)
+#: 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 ""
-"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."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Available icon</media> <gui>Available</gui>"
 msgstr ""
-"在某些网络上，昵称可以通过一种叫做 NickServ 的服务被注册。<app>Empathy</app> "
-"并不直接支持昵称密码。在某些网络上，包括流行的 freenode 网络，服务器密码会被"
-"自动转发给 NickServ，从而允许您设置此项向 NickServ 证明您自己。更多信息参见"
-"<link xref=\"irc-nick-password\"/>。"
-
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "真实姓名"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:77(p)
+#: C/status-icons.page:41(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."
+"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 ""
-"除了昵称，您还可以提供您的真实姓名。其他用户查看您的信息时可以看到您的真实姓"
-"名。"
-
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "退出消息"
+"当您在电脑旁并且有空和您的联系人聊天时，使用<em>在线</em>状态。您可以为此状态"
+"自定一条消息。"
 
-#: C/account-irc.page:82(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 ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</"
+"media> <gui>Busy</gui>"
 msgstr ""
-"当您离线时，一个退出消息会被发送给所有您加入的聊天室和正在与您进行私人聊天的"
-"用户。设置此项以提供自定义的退出消息。"
-
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "IRC 网络"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "网络"
+#: C/status-icons.page:47(item/p)
+msgid ""
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
+msgstr ""
+"使用<em>忙碌</em>以让您的联系人知道您当前不想聊天。他们仍然可以联系您，比如他"
+"们可能有急事需要讨论。默认地，当您忙碌时，<app>Empathy</app> 不会使用气泡提示"
+"和声音提示。您可以为此状态自定一条消息。"
 
-#: C/account-irc.page:99(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 ""
-"<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/away.png\">Away icon</"
+"media> <gui>Away</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:55(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>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 ""
-"要想列表中添加网络，点击<media type=\"image\" mime=\"image/png\" src="
-"\"figures/gtk-add.png\" width=\"16\" height=\"16\">添加</media>。"
+"当您不在电脑旁时，使用<em>离开</em>状态。如果您一段时间内不使用电脑，或者屏幕"
+"保护打开了，<app>Empathy</app> 将自动设置您的状态为离开。默认地，当您离开时，"
+"<app>Empathy</app> 不会使用气泡提示和声音提示。您可以为此状态自定一条消息。"
 
-#: C/account-irc.page:107(p)
+#: 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 ""
-"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/offline.png\">Offline "
+"icon</media> <gui>Invisible</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:64(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>."
+"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 ""
-"要从列表中删除网络，选择要删除的网络并点击<media type=\"image\" mime=\"image/"
-"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">删除</"
-"media>。"
+"当您将状态设置为<em>隐身</em>时，您的联系人会看到您已离线。但您仍然连接着您的"
+"帐号，并且可以看到您的联系人的状态，或者和他们聊天。"
 
-#: C/account-irc.page:115(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 ""
-"When adding or modifying a network, you can enter the following information:"
-msgstr "在添加或修改一个网络时，您可以输入下列信息："
+"<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/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:121(p)
+#: C/status-icons.page:71(item/p)
 msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
-msgstr "这是您希望网络显示在网络列表中的名字。"
+"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:125(gui)
-msgid "Charset"
-msgstr "字符集"
+#: C/video-call.page:37(page/title)
+msgid "Start a video conversation"
+msgstr "开始视频聊天"
 
-#: C/account-irc.page:126(p)
+#: C/video-call.page:39(page/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."
+"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 ""
-"这指明了网络上常用的字符编码。字符编码是计算机内部记录字符的一种特定方式。有"
-"许多不同的字符编码，您需要与其他用户使用同样的字符编码才能正确地看到他们的信"
-"息。"
+"如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频聊天。此功能仅特定类"
+"型的帐号可用，并需要对方使用的程序支持视频呼叫。"
 
-#. Translators: Recommend character encodings that are common
-#.             for your language.
-#: C/account-irc.page:135(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 ""
-"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."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"默认地，<app>Empathy</app> 使用 UTF-8，一种能够处理世界上大多数语言的现代化的"
-"字符编码。简体中文常用的编码还有 GB18030，GBK 和 GB2312。"
-
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "服务器"
+"选择要聊天的联系人，然后在菜单中选择<gui style=\"menuitem\">视频呼叫</gui>"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:54(item/p)
+#, fuzzy
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
-msgstr ""
-"一个 IRC 网络可能有许多服务器供您连接。当您连接到一个特定网络的服务器后，您可"
-"以和同一网络中所有服务器的用户交流。您可以为一个网络添加或删除服务器，使用"
-"<gui>添加</gui>或<gui>删除</gui>按钮。"
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr "点击<gui style=\"button\">挂断</gui>以结束会话。"
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:60(note/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."
+"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>服务器</gui>或<gui>端口</gui>下方的字段来编辑"
-"它。或者，使用左右方向键来聚焦某个字段，并按空格键开始编辑。"
+"要将视频会话转为语音会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">视频关闭</gui></guiseq>。"
+
+#: C/video-call.page:65(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "和一位元联系人进行视频聊天。"
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:73(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."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
-"选择 <gui>SSL</gui> 列中的复选框以加密与服务器间的所有通讯。注意这并不能意味"
-"着其他用户不能看到您在公共聊天室中的发言。"
+"选择要聊天的联系人，然后在菜单中选择<gui style=\"menuitem\">视频呼叫</gui>"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
-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"
+#~ 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 3e3f6f05..3e651d7f 100644
--- a/libempathy-gtk/.gitignore
+++ b/libempathy-gtk/.gitignore
@@ -1,2 +1,3 @@
+empathy-account-widgets-resources.[ch]
 empathy-gtk-marshal.*
 *.gladep
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 902a5e57..72c27b4b 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -4,8 +4,8 @@ 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			\
@@ -22,6 +22,8 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
+	empathy-account-widgets-resources.c		\
+	empathy-account-widgets-resources.h		\
 	empathy-gtk-enum-types.h			\
 	empathy-gtk-enum-types.c
 
@@ -209,10 +211,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 +222,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 +245,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,7 +272,17 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers)
 	&& cp xgen-gtc $(@F) \
 	&& rm -f xgen-gtc
 
-EXTRA_DIST =			\
+account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml)
+
+empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $<
+
+EXTRA_DIST =					\
+	empathy-account-widgets.gresource.xml	\
+	$(account_widgets_ui_files)		\
 	$(ui_DATA)
 
 if HAVE_GEOCLUE
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 03aeacf7..e6f4367c 100644
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -22,14 +22,14 @@
  */
 
 #include "config.h"
+#include "empathy-account-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.h"
-#include "empathy-account-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-account-chooser
diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h
index d58fcf12..5302ad70 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 72a7b2ff..0dd67ea7 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-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index c027fb25..e86cec41 100644
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget-irc.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>
+#include "empathy-debug.h"
 
 typedef struct {
   EmpathyAccountWidget *self;
@@ -142,7 +142,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self,
   settings = g_slice_new0 (EmpathyAccountWidgetIrc);
   settings->self = self;
 
-  self->ui_details->gui = empathy_builder_get_file (filename,
+  self->ui_details->gui = empathy_builder_get_resource (filename,
       "table_irc_settings", table_common_settings,
       "vbox_irc", box,
       "table_irc_settings", &settings->vbox_settings,
@@ -209,7 +209,7 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self,
   settings = g_slice_new0 (EmpathyAccountWidgetIrc);
   settings->self = self;
 
-  self->ui_details->gui = empathy_builder_get_file (filename,
+  self->ui_details->gui = empathy_builder_get_resource (filename,
       "vbox_irc_simple", box,
       "alignment_network_simple", &alignment,
       NULL);
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index bcd45b76..c102d6ea 100644
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,9 +21,8 @@
 #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>
+#include "empathy-account-widget.h"
+#include "empathy-irc-network-chooser.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 988b0988..044e3a99 100644
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,9 +22,7 @@
 #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>
+#include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 4568cf17..b76078d5 100644
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -20,11 +20,11 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget-sip.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 {
@@ -113,7 +113,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
 
   if (is_simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_sip_simple", &vbox_settings,
           NULL);
 
@@ -133,7 +133,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
       settings = g_slice_new0 (EmpathyAccountWidgetSip);
       settings->self = self;
 
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_settings", grid_common_settings,
           "grid_advanced_sip_settings", &grid_advanced,
           "vbox_sip_settings", &vbox_settings,
diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 84e96e7b..4fed35ec 100644
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,8 +21,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
-#include <gtk/gtk.h>
-#include <libempathy-gtk/empathy-account-widget.h>
+#include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 794e7d52..0751b24a 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -25,20 +25,20 @@
  */
 
 #include "config.h"
+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
 
 #include <glib/gi18n-lib.h>
-
-#include <libempathy/empathy-utils.h>
-
 #include <dbus/dbus-protocol.h>
 
+#include "empathy-account-widget-irc.h"
 #include "empathy-account-widget-private.h"
 #include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.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 (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
 
@@ -1060,7 +1060,7 @@ account_widget_build_generic (EmpathyAccountWidget *self,
 {
   GtkWidget *expander_advanced, *box;
 
-  self->ui_details->gui = empathy_builder_get_file (filename,
+  self->ui_details->gui = empathy_builder_get_resource (filename,
       "grid_common_settings", &self->priv->grid_common_settings,
       "vbox_generic_settings", &box,
       "expander_advanced_settings", &expander_advanced,
@@ -1086,7 +1086,7 @@ account_widget_build_salut (EmpathyAccountWidget *self,
 {
   GtkWidget *expander_advanced, *box;
 
-  self->ui_details->gui = empathy_builder_get_file (filename,
+  self->ui_details->gui = empathy_builder_get_resource (filename,
       "grid_common_settings", &self->priv->grid_common_settings,
       "vbox_salut_settings", &box,
       "expander_advanced_settings", &expander_advanced,
@@ -1167,7 +1167,7 @@ account_widget_build_msn (EmpathyAccountWidget *self,
 
   if (self->priv->simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_msn_simple", &box,
           NULL);
 
@@ -1184,7 +1184,7 @@ account_widget_build_msn (EmpathyAccountWidget *self,
     }
   else
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_msn_settings", &self->priv->grid_common_settings,
           "vbox_msn_settings", &box,
           NULL);
@@ -1323,7 +1323,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
   if (self->priv->simple && service == NO_SERVICE)
     {
       /* Simple widget for XMPP */
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_jabber_simple", &box,
           "label_id_simple", &label_id,
           "label_id_create", &label_id_create,
@@ -1354,7 +1354,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
   else if (self->priv->simple && service == GTALK_SERVICE)
     {
       /* Simple widget for Google Talk */
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_gtalk_simple", &box,
           NULL);
 
@@ -1372,7 +1372,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
   else if (self->priv->simple && service == FACEBOOK_SERVICE)
     {
       /* Simple widget for Facebook */
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_fb_simple", &box,
           "entry_id_fb_simple", &entry_id,
           NULL);
@@ -1394,7 +1394,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
       ServiceInfo info = services_infos[service];
 
       /* Full widget for XMPP, Google Talk and Facebook*/
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_settings", &self->priv->grid_common_settings,
           "vbox_jabber_settings", &box,
           "spinbutton_port", &spinbutton_port,
@@ -1474,7 +1474,7 @@ account_widget_build_icq (EmpathyAccountWidget *self,
 
   if (self->priv->simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_icq_simple", &box,
           NULL);
 
@@ -1491,7 +1491,7 @@ account_widget_build_icq (EmpathyAccountWidget *self,
     }
   else
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_settings", &self->priv->grid_common_settings,
           "vbox_icq_settings", &box,
           "spinbutton_port", &spinbutton_port,
@@ -1522,7 +1522,7 @@ account_widget_build_aim (EmpathyAccountWidget *self,
 
   if (self->priv->simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_aim_simple", &box,
           NULL);
 
@@ -1539,7 +1539,7 @@ account_widget_build_aim (EmpathyAccountWidget *self,
     }
   else
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_settings", &self->priv->grid_common_settings,
           "vbox_aim_settings", &box,
           "spinbutton_port", &spinbutton_port,
@@ -1572,7 +1572,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
 
   if (self->priv->simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_yahoo_simple", &box,
           NULL);
 
@@ -1589,7 +1589,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self,
     }
   else
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_settings", &self->priv->grid_common_settings,
           "vbox_yahoo_settings", &box,
           NULL);
@@ -1620,7 +1620,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self,
 
   if (self->priv->simple)
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "vbox_groupwise_simple", &box,
           NULL);
 
@@ -1637,7 +1637,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self,
     }
   else
     {
-      self->ui_details->gui = empathy_builder_get_file (filename,
+      self->ui_details->gui = empathy_builder_get_resource (filename,
           "grid_common_groupwise_settings", &self->priv->grid_common_settings,
           "vbox_groupwise_settings", &box,
           NULL);
@@ -1808,7 +1808,7 @@ out:
 }
 
 #define WIDGET(cm, proto) \
-  { #cm, #proto, "empathy-account-widget-"#proto".ui", \
+  { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \
     account_widget_build_##proto }
 
 static void
@@ -1904,7 +1904,7 @@ do_constructed (GObject *obj)
     const char *file;
     GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename);
   } widgets [] = {
-    { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
+    { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui",
         account_widget_build_salut },
     WIDGET (gabble, jabber),
     WIDGET (haze, msn),
@@ -1928,23 +1928,15 @@ do_constructed (GObject *obj)
       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);
-
+          box = widgets[i].func (self, widgets[i].file);
           break;
         }
     }
 
   if (i == G_N_ELEMENTS (widgets))
     {
-      gchar *filename = empathy_file_lookup (
-          "empathy-account-widget-generic.ui", "libempathy-gtk");
+      gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui";
       box = account_widget_build_generic (self, filename);
-      g_free (filename);
     }
 
   gtk_container_add (GTK_CONTAINER (self), box);
diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index 2f7d5443..65de952c 100644
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-account-widgets.gresource.xml b/libempathy-gtk/empathy-account-widgets.gresource.xml
new file mode 100644
index 00000000..093cb2a9
--- /dev/null
+++ b/libempathy-gtk/empathy-account-widgets.gresource.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/AccountWidgets">
+    <file compressed="true">empathy-account-widget-generic.ui</file>
+    <file compressed="true">empathy-account-widget-jabber.ui</file>
+    <file compressed="true">empathy-account-widget-msn.ui</file>
+    <file compressed="true">empathy-account-widget-sip.ui</file>
+    <file compressed="true">empathy-account-widget-local-xmpp.ui</file>
+    <file compressed="true">empathy-account-widget-irc.ui</file>
+    <file compressed="true">empathy-account-widget-icq.ui</file>
+    <file compressed="true">empathy-account-widget-yahoo.ui</file>
+    <file compressed="true">empathy-account-widget-groupwise.ui</file>
+    <file compressed="true">empathy-account-widget-aim.ui</file>
+  </gresource>
+</gresources>
+
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 553dd4f6..4c58a1aa 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -21,23 +21,22 @@
  */
 
 #include "config.h"
+#include "empathy-avatar-chooser.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 */
 
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.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"
 
 /**
  * SECTION:empathy-avatar-chooser
@@ -854,7 +853,7 @@ avatar_chooser_update_preview_cb (GtkFileChooser *file_chooser,
       else
         {
           gtk_image_set_from_stock (GTK_IMAGE (image),
-                  "gtk-dialog-question",
+                  "dialog-question",
                   GTK_ICON_SIZE_DIALOG);
         }
 
diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h
index dc82c057..1636e289 100644
--- a/libempathy-gtk/empathy-avatar-chooser.h
+++ b/libempathy-gtk/empathy-avatar-chooser.h
@@ -26,6 +26,7 @@
 
 #include <gio/gio.h>
 #include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index acb0903e..f61c1b23 100644
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -22,13 +22,13 @@
  */
 
 #include "config.h"
+#include "empathy-avatar-image.h"
 
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
 
-#include <libempathy/empathy-utils.h>
-#include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /**
  * SECTION:empathy-avatar-image
diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h
index 9429a287..65f088ec 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 a6938b3e..5cdb90d1 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 ad517980..a7d0a6f8 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 20238343..9cbb178f 100644
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -18,14 +18,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-base-password-dialog.h"
 
 #include <glib/gi18n-lib.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)
diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
index 3f4cfdd5..0c8ff525 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
index f4c82eb4..ca96a423 100644
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
+#include "empathy-calendar-button.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-calendar-button.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
 
diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h
index 3f1aed1f..ecc8c78c 100644
--- a/libempathy-gtk/empathy-calendar-button.h
+++ b/libempathy-gtk/empathy-calendar-button.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_CALENDAR_BUTTON_H__
 #define __EMPATHY_CALENDAR_BUTTON_H__
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 9f72ce9b..ebf32047 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)
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 12fca684..788d828f 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 3db35093..bdbf1cb0 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 f7c87361..8653fae8 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 0afd8974..44bbd7ea 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -22,10 +22,10 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
 #include "empathy-cell-renderer-text.h"
 
+#include "empathy-utils.h"
+
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
 typedef struct {
 	gchar    *name;
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ffd92b1c..63364b3a 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -26,33 +26,33 @@
  *          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 "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-keyring.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
@@ -3855,14 +3855,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);
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 269b0059..2a983622 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 9a0498c5..ddcbcf31 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -21,19 +21,18 @@
  *
  * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-blocking-dialog.h"
 
 #include <glib/gi18n-lib.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) \
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 80ea9765..dd81dde4 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);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 0b01bf88..2696f5ab 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"
 
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index cef06d30..80a1aafb 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -20,20 +20,19 @@
  */
 
 #include "config.h"
+#include "empathy-contact-widget.h"
 
 #include <glib/gi18n-lib.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-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 /**
  * SECTION:empathy-contact-widget
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 6f8045d3..5f44adb6 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
index 7ec61310..38f64375 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -21,14 +21,13 @@
  */
 
 #include "config.h"
+#include "empathy-contactinfo-utils.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-time.h>
-#include <libempathy/empathy-request-util.h>
-
-#include "empathy-contactinfo-utils.h"
+#include "empathy-request-util.h"
 #include "empathy-string-parser.h"
+#include "empathy-time.h"
 #include "empathy-ui-utils.h"
 
 static gchar *
diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index 80c18ffa..64514f09 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -21,9 +21,7 @@
 #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
diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c
index bddf42bf..792241fd 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 cca96f3b..cd312bda 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 8fd65bdb..6c85c797 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-geometry.c b/libempathy-gtk/empathy-geometry.c
index d171f72f..452952bb 100644
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -22,15 +22,15 @@
  */
 
 #include "config.h"
+#include "empathy-geometry.h"
 
 #include <sys/stat.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)
diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h
index f9f85c1c..e1412ab8 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 6b6a0d0d..d1a6febf 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -20,13 +20,12 @@
  */
 
 #include "config.h"
+#include "empathy-groups-widget.h"
 
 #include <glib/gi18n-lib.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
diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h
index 1085fac4..2b59db62 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-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 03874c90..ce03d0a2 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 e0710567..b603c576 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 bd43adeb..dbd01c97 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 4f580fb0..747e6824 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 cd6392a9..2b8d64bd 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 cdba07a6..58c22957 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 4cadf22a..e70146bf 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -21,30 +21,30 @@
  */
 
 #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 "empathy-account-selector-dialog.h"
+#include "empathy-call-utils.h"
+#include "empathy-camera-monitor.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)
 
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 0fefb9c8..16134a61 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -24,13 +24,12 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
 #include "empathy-individual-store-channel.h"
 
+#include "empathy-utils.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyIndividualStoreChannelPriv
 {
diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 468effe2..07cc096e 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 ea872b1d..d080242e 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 7656b50e..d442e7ca 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 ddaea26b..3ebe35a6 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -25,16 +25,16 @@
  */
 
 #include "config.h"
+#include "empathy-individual-store.h"
 
 #include <glib/gi18n-lib.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).
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 7e36fe19..87fa3d96 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -25,25 +25,25 @@
  */
 
 #include "config.h"
+#include "empathy-individual-view.h"
 
 #include <glib/gi18n-lib.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).
diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h
index baac701e..e942a42b 100644
--- a/libempathy-gtk/empathy-individual-view.h
+++ b/libempathy-gtk/empathy-individual-view.h
@@ -28,12 +28,11 @@
 #define __EMPATHY_INDIVIDUAL_VIEW_H__
 
 #include <gtk/gtk.h>
-
 #include <folks/folks.h>
 
-#include "empathy-live-search.h"
 #include "empathy-individual-menu.h"
 #include "empathy-individual-store.h"
+#include "empathy-live-search.h"
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_VIEW         (empathy_individual_view_get_type ())
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 12093b57..a267a7d7 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
 
@@ -28,18 +29,17 @@
 #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-time.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
diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h
index b8156c48..fd63377f 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 78502ef8..d7c24a68 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
index 00e9bf0e..60945aed 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -20,17 +20,17 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-chooser-dialog.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-irc-network-manager.h"
 #include "empathy-live-search.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #include "empathy-irc-network-chooser-dialog.h"
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
index 0d4f24e7..1e465491 100644
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-irc-network.h>
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index e19b3e8a..fab6a3a3 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -20,17 +20,15 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-chooser.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"
+#include "empathy-irc-network-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-irc-network-chooser.h"
+#include "empathy-debug.h"
 
 #define DEFAULT_IRC_NETWORK "irc.gimp.org"
 #define DEFAULT_IRC_PORT 6667
diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h
index 3b612505..f4c60328 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.h
+++ b/libempathy-gtk/empathy-irc-network-chooser.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account-settings.h>
-#include <libempathy/empathy-irc-network.h>
+#include "empathy-account-settings.h"
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index aedb5dc7..35457f59 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -19,16 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-dialog.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;
 
@@ -453,7 +450,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
   GtkAdjustment *adjustment;
   GtkTreeSelection *selection;
   GtkTreeViewColumn *column;
-  gchar *filename;
   GtkWidget *sw, *toolbar;
   GtkStyleContext *context;
 
@@ -472,9 +468,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
   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,
+  gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-irc.ui",
       "irc_network_dialog", &dialog->dialog,
       "button_close", &dialog->button_close,
       "entry_network", &dialog->entry_network,
@@ -487,7 +481,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       "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);
diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index df4a8b15..a49c63da 100644
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-irc-network.h>
+#include "empathy-irc-network.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index e65adbe4..51f6a2e0 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -22,11 +22,10 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
-
 #include "empathy-live-search.h"
 
+#include "empathy-utils.h"
+
 G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX)
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch)
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index b714fa49..f0f6aefe 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,13 +23,12 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-account-widget.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)
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index dafd7fb2..efea64d2 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 ab72fff7..3a97c94c 100644
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -20,17 +20,16 @@
  */
 
 #include "config.h"
+#include "empathy-location-manager.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 "empathy-gsettings.h"
+#include "empathy-location.h"
+#include "empathy-time.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 /* Seconds before updating the location */
 #define TIMEOUT 10
diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h
index 525e490b..6ea8b7bf 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 cba8ae2c..4eb44c9b 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -23,32 +23,28 @@
  */
 
 #include "config.h"
+#include "empathy-log-window.h"
 
 #include <glib/gi18n-lib.h>
-#include <webkit/webkit.h>
-
 #include <telepathy-glib/proxy-subclass.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-camera-monitor.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"
 
diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index f8f76905..48554fc3 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-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index c36cfcfc..6d13d15e 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -22,11 +22,11 @@
 
 #include <glib/gi18n-lib.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-account-widget.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)
@@ -148,7 +148,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
diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index 07fc22f9..6a5d5c2d 100644
--- a/libempathy-gtk/empathy-new-account-dialog.h
+++ b/libempathy-gtk/empathy-new-account-dialog.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
-#include <libempathy/empathy-account-settings.h>
+#include "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index d770d6d9..7dda2f9e 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 <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-utils.h>
+#include "empathy-call-utils.h"
+#include "empathy-camera-monitor.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;
 
diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h
index d3f05e64..e7413568 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 c38a1c75..36614725 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 390101a2..5adc4cf9 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 d142b7fa..033557e8 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -18,18 +18,16 @@
  */
 
 #include "config.h"
+#include "empathy-notify-manager.h"
 
 #include <libnotify/notify.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)
 
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index 923ab4a5..7c2fa8c4 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 07fb69fc..ef03061a 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)
diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index ee1c993b..1b19375a 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 ddaa97b7..e1113a07 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 a15ad6a0..216896b4 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 a047890b..445f79b6 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -25,15 +25,16 @@
  */
 
 #include "config.h"
+#include "empathy-presence-chooser.h"
 
 #include <glib/gi18n-lib.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"
diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index d5b0de7c..a060d9f7 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -21,17 +21,16 @@
  */
 
 #include "config.h"
+#include "empathy-protocol-chooser.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-connection-managers.h>
-
-#include "empathy-protocol-chooser.h"
+#include "empathy-connection-managers.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
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index eeaab60c..2ae8017e 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 "empathy-account-settings.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index d8410b5e..2db024a3 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -1,13 +1,11 @@
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-roster-contact.h"
 
-#include <libempathy/empathy-utils.h>
+#include <glib/gi18n-lib.h>
 
-#include <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 
diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c
index 643fed52..9ca53a8e 100644
--- a/libempathy-gtk/empathy-roster-group.c
+++ b/libempathy-gtk/empathy-roster-group.c
@@ -1,5 +1,4 @@
 #include "config.h"
-
 #include "empathy-roster-group.h"
 
 #include <telepathy-glib/telepathy-glib.h>
diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c
index a81b2c25..b82fd162 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 e29e36eb..3b9c0202 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 859edb7a..e0fff03e 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 f7ce1f4e..a38e6593 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 3fd84b7f..994ab989 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 27c5482f..1b35f1a1 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 ed57be3d..657deaa9 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -1,14 +1,12 @@
 #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)
 
diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 0077b684..c09d09c3 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 <libempathy-gtk/empathy-roster-model.h>
+#include "egg-list-box/egg-list-box.h"
+#include "empathy-live-search.h"
+#include "empathy-roster-model.h"
 
 G_BEGIN_DECLS
 
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 018a068a..dce1bdd1 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -18,13 +18,12 @@
  */
 
 #include "config.h"
+#include "empathy-search-bar.h"
 
 #include <glib/gi18n-lib.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)
 
diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h
index afda250b..a710965b 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 8b084504..9c29533c 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 3efeecc1..5953e15e 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 99caa51d..2e8ef3aa 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -21,10 +21,10 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-utils.h>
 #include "empathy-smiley-manager.h"
+
 #include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 typedef struct _SmileyManagerTree SmileyManagerTree;
 
diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h
index 1d6eaac5..b9e753bf 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 3291a9a9..600816f6 100644
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -18,15 +18,15 @@
  */
 
 #include "config.h"
-
 #include "empathy-sound-manager.h"
 
 #include <glib/gi18n-lib.h>
 
+#include "empathy-gsettings.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;
diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 99e96c57..b2fd0d29 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 4242b573..27f27f90 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 19f1fee6..b122f287 100644
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -35,17 +35,16 @@
  */
 
 #include "config.h"
+#include "empathy-status-preset-dialog.h"
 
 #include <glib/gi18n-lib.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)
 
diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5cf0e339..625547fe 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 cb7d3c3e..7cbd290f 100644
--- a/libempathy-gtk/empathy-string-parser.c
+++ b/libempathy-gtk/empathy-string-parser.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-string-parser.h"
+
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 04fae6d1..87883265 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 67ec4d08..31715c30 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -20,22 +20,21 @@
  */
 
 #include "config.h"
+#include "empathy-theme-adium.h"
 
 #include <glib/gi18n-lib.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-time.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
 
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index 88066761..698d2846 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 f3d8d67b..81361c1e 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 812b0261..590c343f 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 82244403..def31d22 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 a9c37ad5..b85e7d09 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 9f430084..86edb3b0 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -30,20 +30,20 @@
  */
 
 #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 "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,8 +75,15 @@ empathy_gtk_init (void)
   initialized = TRUE;
 }
 
+enum _BuilderSource
+{
+  BUILDER_SOURCE_FILE,
+  BUILDER_SOURCE_RESOURCE
+};
+
 static GtkBuilder *
-builder_get_file_valist (const gchar *filename,
+builder_get_valist (const gchar *sourcename,
+    enum _BuilderSource source,
     const gchar *first_object,
     va_list args)
 {
@@ -84,16 +91,29 @@ builder_get_file_valist (const gchar *filename,
   const gchar *name;
   GObject **object_ptr;
   GError *error = NULL;
+  gboolean success;
 
-  DEBUG ("Loading file %s", filename);
+  DEBUG ("Loading %s '%s'", source == BUILDER_SOURCE_FILE ? "file" : "resource", sourcename);
 
   gui = gtk_builder_new ();
   gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE);
 
-  if (!gtk_builder_add_from_file (gui, filename, &error))
+  switch (source)
+    {
+    case BUILDER_SOURCE_FILE:
+      success = gtk_builder_add_from_file (gui, sourcename, &error);
+      break;
+    case BUILDER_SOURCE_RESOURCE:
+      success = gtk_builder_add_from_resource (gui, sourcename, &error);
+      break;
+    default:
+      g_assert_not_reached ();
+    }
+
+  if (!success)
     {
       g_critical ("GtkBuilder Error (%s): %s",
-          filename, error->message);
+          sourcename, error->message);
 
       g_clear_error (&error);
       g_object_unref (gui);
@@ -134,7 +154,22 @@ empathy_builder_get_file (const gchar *filename,
   va_list args;
 
   va_start (args, first_object);
-  gui = builder_get_file_valist (filename, first_object, args);
+  gui = builder_get_valist (filename, BUILDER_SOURCE_FILE, first_object, args);
+  va_end (args);
+
+  return gui;
+}
+
+GtkBuilder *
+empathy_builder_get_resource (const gchar *resourcename,
+    const gchar *first_object,
+    ...)
+{
+  GtkBuilder *gui;
+  va_list args;
+
+  va_start (args, first_object);
+  gui = builder_get_valist (resourcename, BUILDER_SOURCE_RESOURCE, first_object, args);
   va_end (args);
 
   return gui;
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 73232cf5..baf250e3 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -33,14 +33,15 @@
 #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
 
+#define ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets"
+
 #define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \
               (y) + (h) > 0 && \
               (x) < gdk_screen_width () && \
@@ -57,6 +58,9 @@ void empathy_gtk_init (void);
 GtkBuilder * empathy_builder_get_file (const gchar *filename,
     const gchar *first_object,
     ...);
+GtkBuilder * empathy_builder_get_resource (const gchar *resourcename,
+    const gchar *first_object,
+    ...);
 void empathy_builder_connect (GtkBuilder *gui,
     gpointer user_data,
     const gchar *first_object,
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 77b0798f..451caec8 100644
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -22,14 +22,14 @@
 
 #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"
+#include "empathy-time.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
 
 G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID)
 
diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h
index 117bfd32..a06c7291 100644
--- a/libempathy-gtk/empathy-user-info.h
+++ b/libempathy-gtk/empathy-user-info.h
@@ -21,7 +21,6 @@
 #define __EMPATHY_USER_INFO_H__
 
 #include <gtk/gtk.h>
-
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c
index d221e5f9..0fc31908 100644
--- a/libempathy-gtk/empathy-webkit-utils.c
+++ b/libempathy-gtk/empathy-webkit-utils.c
@@ -19,13 +19,13 @@
  */
 
 #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-theme-adium.h"
+#include "empathy-ui-utils.h"
 
 #define BORING_DPI_DEFAULT 96
 
diff --git a/libempathy/.gitignore b/libempathy/.gitignore
index 8617dcbd..5cc6b339 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 36de4d6c..5f4059f2 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,8 +2,7 @@ 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"\"		\
@@ -21,6 +20,8 @@ AM_CPPFLAGS =                                           \
 	$(DISABLE_DEPRECATED)
 
 BUILT_SOURCES = 					\
+	empathy-dtd-resources.c				\
+	empathy-dtd-resources.h				\
 	empathy-enum-types.h				\
 	empathy-enum-types.c
 
@@ -134,8 +135,7 @@ 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		\
@@ -145,8 +145,17 @@ ircnetworksdir = $(datadir)/empathy
 ircnetworks_DATA =		\
 	irc-networks.xml
 
-EXTRA_DIST = 			\
-	$(dtd_DATA)		\
+dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/empathy-dtd.gresource.xml)
+
+empathy-dtd-resources.c: empathy-dtd.gresource.xml $(dtd_resource_files)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
+
+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)		\
 	$(ircnetworks_DATA)
 
 CLEANFILES = 				\
@@ -189,7 +198,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
index 3b937ce9..0e868f2b 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE
 #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 enum EmpathyCameraDeviceMonitorError
 {
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 12b28b8b..064d4d21 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -19,15 +19,15 @@
  */
 
 #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"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings)
 
diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index 162def48..6e4713c4 100644
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.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-auth-factory.c b/libempathy/empathy-auth-factory.c
index b2f2b802..cba4607a 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -19,11 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-auth-factory.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_TLS
-#include "empathy-debug.h"
 #include "empathy-keyring.h"
 #include "empathy-sasl-mechanisms.h"
 #include "empathy-server-sasl-handler.h"
@@ -38,7 +35,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);
 
diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 16d6ad34..73e90578 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
index 1e603e98..6e669112 100644
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-camera-monitor.h"
+
 #include "cheese-camera-device-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index ebdc5043..3f182861 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -22,18 +22,18 @@
  */
 
 #include "config.h"
+#include "empathy-chatroom-manager.h"
 
 #include <sys/stat.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 +320,7 @@ chatroom_manager_file_parse (EmpathyChatroomManager *manager,
       return FALSE;
     }
 
-  if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME))
+  if (!empathy_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 b8232dc6..498d225a 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 dcc72d5f..32bb4ce3 100644
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-chatroom.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom)
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 57ca685c..98ed04b9 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 1c8fc58c..39760998 100644
--- a/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@ -20,7 +20,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-client-factory.h"
 
 #include "empathy-tp-chat.h"
diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index 83e15f15..763715f9 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 71e6e439..267b2093 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
index abf862bc..b94ac125 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -19,12 +19,12 @@
  */
 
 #include "config.h"
-
 #include "empathy-connection-managers.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 static GObject *managers = NULL;
 
diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index d8bcb390..0ed20c93 100644
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.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-contact-groups.c b/libempathy/empathy-contact-groups.c
index 8d49f051..81a1b313 100644
--- a/libempathy/empathy-contact-groups.c
+++ b/libempathy/empathy-contact-groups.c
@@ -21,17 +21,17 @@
  */
 
 #include "config.h"
+#include "empathy-contact-groups.h"
 
 #include <sys/stat.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 +91,7 @@ contact_groups_file_parse (const gchar *filename)
 		return;
 	}
 
-	if (!empathy_xml_validate (doc, CONTACT_GROUPS_DTD_FILENAME)) {
+	if (!empathy_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 181b2875..0be1c81b 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 3c91e631..35610443 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -20,6 +20,7 @@
  */
 
 #include "config.h"
+#include "empathy-contact.h"
 
 #ifdef HAVE_GEOCODE
 #include <geocode-glib/geocode-glib.h>
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 14c3f644..e7ce10e4 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 09573c39..75900f4a 100644
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG
diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index e6b93cc7..5a600602 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>
 
diff --git a/libempathy/empathy-dtd.gresource.xml b/libempathy/empathy-dtd.gresource.xml
new file mode 100644
index 00000000..76cc8170
--- /dev/null
+++ b/libempathy/empathy-dtd.gresource.xml
@@ -0,0 +1,10 @@
+<?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>
+    <file>empathy-irc-networks.dtd</file>
+  </gresource>
+</gresources>
+
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 9cf90014..855ddb98 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 30711c7d..96c8e47f 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -22,10 +22,10 @@
 /* empathy-ft-handler.c */
 
 #include "config.h"
+#include "empathy-ft-handler.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-ft-handler.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index a120f241..2fc1b609 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 3659b372..37973000 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-individual-manager.c b/libempathy/empathy-individual-manager.c
index f3c7565a..71960b5d 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-individual-manager.h"
+
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
index 7f6ed9df..3f53a49a 100644
--- a/libempathy/empathy-irc-network-manager.c
+++ b/libempathy/empathy-irc-network-manager.c
@@ -19,16 +19,16 @@
  */
 
 #include "config.h"
+#include "empathy-irc-network-manager.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_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-irc-networks.dtd"
 #define IRC_NETWORKS_FILENAME "irc-networks.xml"
 #define SAVE_TIMER 4
 
@@ -632,7 +632,7 @@ irc_network_manager_file_parse (EmpathyIrcNetworkManager *self,
       return FALSE;
     }
 
-  if (!empathy_xml_validate (doc, IRC_NETWORKS_DTD_FILENAME)) {
+  if (!empathy_xml_validate_from_resource (doc, IRC_NETWORKS_DTD_RESOURCENAME)) {
     g_warning ("Failed to validate file:'%s'", filename);
     xmlFreeDoc (doc);
     xmlFreeParserCtxt (ctxt);
diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index e0bc84f7..e01116e9 100644
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-network.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork)
diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index 5457f23a..75eb016d 100644
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-irc-server.h"
+
 #include "empathy-utils.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer)
diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c
index 837b2d51..40667342 100644
--- a/libempathy/empathy-keyring.c
+++ b/libempathy/empathy-keyring.c
@@ -17,11 +17,9 @@
  */
 
 #include "config.h"
-
-#include <glib/gi18n-lib.h>
-
 #include "empathy-keyring.h"
 
+#include <glib/gi18n-lib.h>
 #include <libsecret/secret.h>
 
 #ifdef HAVE_UOA
@@ -51,12 +49,6 @@ static const SecretSchema room_keyring_schema =
       { "room-id", SECRET_SCHEMA_ATTRIBUTE_STRING },
       { NULL } } };
 
-gboolean
-empathy_keyring_is_available (void)
-{
-  return TRUE;
-}
-
 /* get */
 
 static void
diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 7e945dc0..8a426a03 100644
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -20,13 +20,10 @@
 #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);
 
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index e19f69b0..1115eddd 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -23,11 +23,11 @@
  */
 
 #include "config.h"
+#include "empathy-message.h"
 
 #include <glib/gi18n-lib.h>
 
 #include "empathy-client-factory.h"
-#include "empathy-message.h"
 #include "empathy-time.h"
 #include "empathy-utils.h"
 #include "empathy-enum-types.h"
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index 1d01b931..21f703b6 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 cdc45fbe..1c288fb9 100644
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-
 #include "empathy-presence-manager.h"
 
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 6357aeec..f616647a 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 8532da57..c5f693f0 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 497c65ee..9c168d7a 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 303bf9e3..a6829c45 100644
--- a/libempathy/empathy-sasl-mechanisms.c
+++ b/libempathy/empathy-sasl-mechanisms.c
@@ -19,13 +19,13 @@
  */
 
 #include "config.h"
+#include "empathy-sasl-mechanisms.h"
 
 #include <libsoup/soup.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"
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index bdca7b62..b18d1a73 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -18,15 +18,14 @@
  */
 
 #include "config.h"
-
 #include "empathy-server-sasl-handler.h"
 
-#include <extensions/extensions.h>
+#include "empathy-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,
diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index d25d90ab..8bf7e3b7 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 d58155f5..34c3147a 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 f4caf353..ed19c72f 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 d8faa4fe..0e651f07 100644
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -21,17 +21,17 @@
  */
 
 #include "config.h"
+#include "empathy-status-presets.h"
 
 #include <sys/stat.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 +92,7 @@ status_presets_file_parse (const gchar *filename)
 		return;
 	}
 
-	if (!empathy_xml_validate (doc, STATUS_PRESETS_DTD_FILENAME)) {
+	if (!empathy_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
index cbb6b3bd..d14f2c4c 100644
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -20,11 +20,10 @@
  */
 
 #include "config.h"
+#include "empathy-time.h"
 
 #include <glib/gi18n-lib.h>
 
-#include "empathy-time.h"
-
 /* Note: EmpathyTime is always in UTC. */
 
 gint64
diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h
index 59bd9269..fc7af28e 100644
--- a/libempathy/empathy-time.h
+++ b/libempathy/empathy-time.h
@@ -24,7 +24,6 @@
 #define __USE_XOPEN
 #endif
 #include <time.h>
-
 #include <glib.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c
index 00447cc4..fcbc559b 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 2f66acb9..c25d9756 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 e15a8c41..4711affc 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-
 #include "empathy-tp-chat.h"
+
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 
diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index d8d4ac31..20fb4e1e 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 a57dd633..7e17b708 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,14 @@
 #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 "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;
diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c
index f63a1519..6032d36b 100644
--- a/libempathy/empathy-uoa-utils.c
+++ b/libempathy/empathy-uoa-utils.c
@@ -19,10 +19,10 @@
  */
 
 #include "config.h"
+#include "empathy-uoa-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
-#include "empathy-uoa-utils.h"
 
 static AgManager *singleton = NULL;
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index b8f54baa..0efe3a18 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -27,17 +27,15 @@
  */
 
 #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>
 
@@ -111,36 +109,36 @@ empathy_init (void)
 }
 
 gboolean
-empathy_xml_validate (xmlDoc      *doc,
-    const gchar *dtd_filename)
+empathy_xml_validate_from_resource (xmlDoc *doc,
+    const gchar *dtd_resourcename)
 {
-  gchar *path;
-  xmlChar *escaped;
+  GBytes *resourcecontents;
+  gconstpointer resourcedata;
+  gsize resourcesize;
+  xmlParserInputBufferPtr buffer;
   xmlValidCtxt  cvp;
   xmlDtd *dtd;
+  GError *error = NULL;
   gboolean ret;
 
-  path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy",
-         dtd_filename, NULL);
-  if (!g_file_test (path, G_FILE_TEST_EXISTS))
+  DEBUG ("Loading dtd resource %s", dtd_resourcename);
+
+  resourcecontents = g_resources_lookup_data (dtd_resourcename, G_RESOURCE_LOOKUP_FLAGS_NONE, &error);
+  if (error != NULL)
     {
-      g_free (path);
-      path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL);
+      g_warning ("Unable to load dtd resource '%s': %s", dtd_resourcename, error->message);
+      g_error_free (error);
+      return FALSE;
     }
-
-  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);
+  resourcedata = g_bytes_get_data (resourcecontents, &resourcesize);
+  buffer = xmlParserInputBufferCreateStatic (resourcedata, resourcesize, XML_CHAR_ENCODING_UTF8);
 
   memset (&cvp, 0, sizeof (cvp));
-  dtd = xmlParseDTD (NULL, escaped);
+  dtd = xmlIOParseDTD (NULL, buffer, XML_CHAR_ENCODING_UTF8);
   ret = xmlValidateDtd (&cvp, doc, dtd);
 
-  xmlFree (escaped);
   xmlFreeDtd (dtd);
+  g_bytes_unref (resourcecontents);
 
   return ret;
 }
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index 5fe79e9e..440fe835 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>
@@ -44,8 +43,8 @@ G_BEGIN_DECLS
 void empathy_init (void);
 
 /* XML */
-gboolean empathy_xml_validate (xmlDoc *doc,
-    const gchar *dtd_filename);
+gboolean empathy_xml_validate_from_resource (xmlDoc *doc,
+    const gchar *dtd_resourcename);
 xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node,
     const gchar *child_name);
 xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node,
diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 171ba2ed..a28415cc 100644
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -2,7 +2,8 @@ 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)				\
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 8b1bafb7..de792385 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/cs.po b/po/cs.po
index c9449130..aa176712 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-05-16 11:29+0000\n"
+"PO-Revision-Date: 2013-05-29 01:53+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"
@@ -506,81 +507,81 @@ msgid ""
 msgstr ""
 "Jestli má Empathy omezit přesnost polohy pro lepší ochranu vašeho soukromí."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Nebyl udán žádný důvod"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Byla vyžádána změna stavu"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Zrušili jste přenos souboru"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Protistrana zrušila přenos souboru"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Chyba při pokusu o odeslání souboru"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Přenos souboru byl dokončen, ale soubor byl poškozen"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Přenos souborů není podporován vzdálenou stranou"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Vybraný soubor není běžným souborem"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Vybraný soubor je prázdný"
 
-#: ../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 "Heslo nenalezeno"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Heslo účtu rychlé komunikace pro %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -588,7 +589,7 @@ msgstr[0] "před %d sekundou"
 msgstr[1] "před %d sekundami"
 msgstr[2] "před %d sekundami"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -596,7 +597,7 @@ msgstr[0] "před minutou"
 msgstr[1] "před %d minutami"
 msgstr[2] "před %d minutami"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -604,7 +605,7 @@ msgstr[0] "před hodinou"
 msgstr[1] "před %d hodinami"
 msgstr[2] "před %d hodinami"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -612,7 +613,7 @@ msgstr[0] "včera"
 msgstr[1] "před %d dny"
 msgstr[2] "před %d dny"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -620,7 +621,7 @@ 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
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -628,143 +629,143 @@ 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
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "v budoucnosti"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Přítomen"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Zaneprázdněn"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Nepřítomen"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Skrytý"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Odpojen"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámo"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 msgid "No reason specified"
 msgstr "Neudán žádný důvod"
 
-#: ../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 "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: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 "Chyba sítě"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "Autentizace selhala"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Chyba šifrování"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "Jméno používáno"
 
-#: ../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 "Certifikát nebyl poskytnut"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "Nedůvěryhodný certifikát"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "Platnost certifikátu vypršela"
 
-#: ../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 "Certifikát není aktivován"
 
-#: ../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 "Certifikát názvu počítače nesouhlasí"
 
-#: ../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 "Certifikát otisku prstu nesouhlasí"
 
-#: ../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 "Certifikát je podepsán sám sebou"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "Šifrování není dostupné"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Spojení bylo odmítnuto"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "Spojení nemohlo být navázáno"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Spojení bylo ztraceno"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
 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:342
 msgid "The account already exists on the server"
 msgstr "Takový účet již na serveru existuje"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
 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:346
 msgid "Certificate has been revoked"
 msgstr "Certifikát byl odvolán"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 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:351
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -772,32 +773,32 @@ 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:355
 msgid "Your software is too old"
 msgstr "Váš software je příliš zastaralý"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Interní chyba"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Lidé v okolí"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Všechny účty"
 
@@ -876,56 +877,56 @@ msgstr "Jaké je vaše heslo k AIM?"
 msgid "Remember Password"
 msgstr "Zapamatovat heslo"
 
-#: ../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 "Účet"
 
-#: ../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 "Heslo"
 
-#: ../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 "Uživatelské jméno:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Použít"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "Přip_ojit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Takový účet již existuje"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Vytvořit nový účet na serveru"
 
@@ -934,19 +935,19 @@ msgstr "Vytvořit nový účet na serveru"
 #. * 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 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
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "Účet služby %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Nový účet"
 
@@ -1170,32 +1171,32 @@ msgstr "Jaké je ID pro Windows Live?"
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../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 "Zaregistrovat"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Volby"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Žádný"
 
@@ -1307,55 +1308,55 @@ msgstr "Jaké je vaše Yahoo! ID?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Nelze konvertovat obrázek"
 
-#: ../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 "Váš systém neobsahuje žádný z podporovaných formátů obrázku"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "Nelze uložit obrázek do souboru"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Vyberte si obrázek avataru"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Vyfotografovat…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Žádný obrázek"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "VÅ¡echny soubory"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Opakovat"
 
 #: ../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"
@@ -1364,72 +1365,72 @@ msgstr ""
 "Zadejte své heslo pro účet\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Vybrat…"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Vybrat"
 
-#: ../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:731
 msgid "Failed to open private chat"
 msgstr "Nepovedlo se otevřít soukromou konverzaci"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "Neplatné ID kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1437,23 +1438,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:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1463,11 +1464,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:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1475,126 +1476,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Použití: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "není k dispozici"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "odpojen"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "příliš dlouhá zpráva"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "neimplementováno"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Nastavit téma na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Nestanoveno žádné téma"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Žádné návrhy)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Odeslat"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "Návrhy pravopi_sných oprav"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 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:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se odpojil"
@@ -1602,12 +1603,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s byl vyhozen"
@@ -1615,17 +1616,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:2844
 #, 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:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s byl zakázán"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s opustil místnost"
@@ -1635,17 +1636,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: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 se připojil do místnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je teď znám jako %s"
@@ -1653,82 +1654,82 @@ 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: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 "Odpojen"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 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:3790
 msgid "Remember"
 msgstr "Zapamatovat"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Nyní ne"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Připojit"
 
-#: ../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 "Připojen"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Neznámý nebo neplatný identifikátor"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokování kontaktů není dočasně k dispozici"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blokování kontaktů není k dispozici"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Oprávnění odepřeno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Nelze blokovat kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Upravit blokované kontakty"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1738,120 +1739,120 @@ msgstr "Účet:"
 msgid "Blocked Contacts"
 msgstr "Blokované kontakty"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Celé jméno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "E-mailová adresa"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Webové stránky"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Birthday"
 msgstr "Narozeniny"
 
 #. Note to translators: this is the caption for a string of the form "5
 #. * minutes ago", and refers to the time since the contact last interacted
 #. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Naposledy spatřen:"
 
-#: ../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 "Připojen z:"
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Zpráva v nepřítomnosti:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "pracovní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "domů"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "mobilní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "hlasový"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "upřednostňovaný"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "poštovní"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "doručovací"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Hledat kontakty"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Hledat: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "Přid_at kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Nenalezen žádný kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Nelze uložit avatar"
 
 #. 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 "Identifikátor"
 
 #. 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 "Přezdívka"
 
@@ -1885,11 +1886,11 @@ msgstr "Verze"
 msgid "Client"
 msgstr "Klient"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Skupiny"
 
-#: ../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."
@@ -1897,77 +1898,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:348
 msgid "_Add Group"
 msgstr "_Přidat skupinu"
 
-#: ../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 "Vybrat"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 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 +1977,47 @@ 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Mobilní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Pracovní"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Soukromý"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Blokovat kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Smazat a _blokovat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2025,218 +2026,218 @@ 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiohovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videohovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Odeslat soubor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Oblíbený"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Infor_mace"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 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:1692
 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:1888
 msgid "_Add Contact…"
 msgstr "_Přidat kontakt…"
 
-#: ../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 "Opravdu chcete odstranit skupinu „%s“?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Skupina  se odstraňuje"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanály:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "Kód země ISO:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Země:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Město:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Ulice:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Budova:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Podlaží:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../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 "Popis:"
 
-#: ../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 "Úroveň přesnosti:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Vertikální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Horizontální chyba (v metrech):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Azimut:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Rychlost stoupání:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Poslední aktualizace:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Zeměpisná délka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Zeměpisná šířka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Nadmořská výška:"
 
-#: ../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 "Poloha"
 
 #. 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 v %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 "Identifikátor:"
 
-#: ../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"
@@ -2252,32 +2253,32 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Nová síť"
 
-#: ../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ýběr sítě IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Vymazat sez_nam sítí"
 
-#: ../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 "Vybrat"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "nový 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 "
@@ -2288,11 +2289,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:100
 msgid "People nearby"
 msgstr "Lidé v okolí"
 
-#: ../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."
@@ -2300,48 +2301,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:607
 msgid "History"
 msgstr "Historie"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Hledat"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, 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:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2349,7 +2350,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:1367
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2357,80 +2358,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:1375
 #, 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:1706
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 msgid "Anytime"
 msgstr "Kdykoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "Kdokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "Kdy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "Cokoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "Konverzace"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "Příchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "Odchozí hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "Vymazat vše"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "Smazat z:"
 
@@ -2452,7 +2453,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Diskuze"
 
@@ -2477,72 +2478,72 @@ msgstr "Jaký typ účtu chcete vytvořit?"
 msgid "Adding new account"
 msgstr "Přidává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"
 
@@ -2552,26 +2553,26 @@ msgstr "Nová konverzace"
 #. 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 "Vlastní zpráva…"
 
-#: ../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 "Upravit vlastní zprávy…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2581,12 +2582,12 @@ 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:386
 msgid "Set status"
 msgstr "Nastavit stav"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Vlastní zprávy…"
 
@@ -2594,12 +2595,12 @@ msgstr "Vlastní zprávy…"
 #. 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 "Nový účet %s"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "Rozlišovat velikost _znaků"
 
@@ -2623,166 +2624,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:49
 msgid "Received an instant message"
 msgstr "Přijata rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "Odeslána rychlá zpráva"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "Příchozí žádost o diskuzi"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Kontakt je připojen"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Připojeno k serveru"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Odpojeno od serveru"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Příchozí hovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Odchozí hovor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Hovor ukončen"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 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:1096
 #, 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:721
 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:1211
 #, 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:1913
 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:1078
 msgid "Unable to open URI"
 msgstr "Nelze otevřít URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
 msgid "Select a file"
 msgstr "Vybrat soubor"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2791,16 +2792,16 @@ 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:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Příchozí soubor od %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 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
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "<b>Osobní údaje</b>"
 
@@ -2819,197 +2820,197 @@ msgstr "_Otevřít odkaz"
 msgid "Inspect HTML"
 msgstr "Prozkoumat HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "arabské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "baltské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "čínské – zjednodušené"
 
-#: ../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 "čínské – tradiční"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "cyrilice"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "cyrilice – ruská"
 
-#: ../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 "cyrilice – ukrajinská"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "řecké"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "gudžarátské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 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
+#: ../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 "hebrejské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "hebrejské – vizuální"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "hindské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 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
+#: ../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 "korejské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "skandinávské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "perské"
 
-#: ../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 "rumunské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "jihoevropské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "západní"
 
-#: ../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 "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: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:201
 #, 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 +3021,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 +3032,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 +3042,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 +3059,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "V účtu %s máte neuložené změny."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Probíhá připojování…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojen — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Offline — Není k dispozici síť"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: ../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 "
@@ -3132,28 +3133,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:486
 msgid "Offline — Account Disabled"
 msgstr "Offline — Účet zakázán"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Úprava parametrů připojení"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "Upravit param_etry připojení…"
 
-#: ../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 "Opravdu chcete odstranit z vašeho počítače „%s“?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3162,24 +3163,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:1652
 msgid "_Enabled"
 msgstr "_Povolit"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "Pře_skočit"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Připojit"
 
-#: ../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?"
@@ -3188,7 +3189,7 @@ 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:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Účty IM a VoIP"
 
@@ -3212,31 +3213,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:407
 msgid "Don't connect on startup"
 msgstr "Nepřipojovat se po spuštění"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "– komunikátor Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Chyba při kontaktování správce účtu"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3249,105 +3250,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Probíhá hovor"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "– audio/videoklient Empathy"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 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: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 "Neznámo"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "Čeká na lince"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Ztišit"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "Doba"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3356,7 +3357,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:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3365,7 +3366,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:3101
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3374,25 +3375,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:3107
 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:3111
 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:3114
 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:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3403,32 +3404,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:3135
 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:3138
 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:3178
 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:3188
 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:3225
 #, 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:3229
 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:3231
 msgid "Top Up"
 msgstr "Dobití kreditu"
 
@@ -3544,19 +3545,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:243
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Místnost"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Automaticky připojit"
 
@@ -3564,11 +3565,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:275
 msgid "Close this window?"
 msgstr "Zavřít toto okno?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3577,7 +3578,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3595,12 +3596,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "Opustit místnost %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3608,15 +3609,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:326
 msgid "Close window"
 msgstr "Zavřít okno"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Opustit místnost"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3624,7 +3625,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:680
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3632,7 +3633,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:696
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3640,7 +3641,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:705
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3648,11 +3649,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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3660,7 +3661,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:970
 msgid "Typing a message."
 msgstr "Píše zprávu."
 
@@ -3724,76 +3725,76 @@ msgstr "Posunout kartu do_prava"
 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:1588
 msgid "Save"
 msgstr "Uložit"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Odkaz na Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Odpověď z Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Ladící okno"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Odeslat na Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Úroveň "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Ladění"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Informace"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Varování"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Kritické"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +3811,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:2051
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Doména"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Kategorie"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 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:500
 msgid "Incoming video call"
 msgstr "Příchozí videohovor"
 
-#: ../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 "Volá vám %s, chcete to zvednout?"
 
-#: ../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 "Volá vám %s, chcete to zvednout?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "O_dmítnout"
 
-#: ../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 "_Zvednout"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Videohovor"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Pozvání do místnosti"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, 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:713
 #, 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:726
 msgid "_Join"
 msgstr "Připo_jit"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Požadováno heslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3905,105 +3906,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: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 "Neznámo"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 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:340
 #, 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:343
 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:482
 #, 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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ odeslán kontaktu %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Vytváří se kontrolní součet „%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 "Soubor"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Zbývá"
 
@@ -4015,11 +4016,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 +4028,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:296
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Diskuzní místnost"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Členové"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 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:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4082,17 +4083,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Ano"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Vstoupit do místnosti"
 
@@ -4135,104 +4136,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:134
 msgid "Message received"
 msgstr "Zpráva přijata"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Nová konverzace"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Kontakt se připojil"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Kontakt se odpojil"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Účet připojen"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Účet odpojen"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Jazyk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Julie"
 
 #. 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 "Ach Romeo, Romeo! Proč jsi 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 "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:648
 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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "Julie se odpojila"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Nastavení"
 
@@ -4244,7 +4245,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:2226
 msgid "Contact List"
 msgstr "Seznam kontaktů"
 
@@ -4410,85 +4411,85 @@ msgstr "Varianta:"
 msgid "Themes"
 msgstr "Motivy"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Poskytnout heslo"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 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."
+#: ../src/empathy-roster-window.c:478
+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
+#: ../src/empathy-roster-window.c:554
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Účet %s nemůže být bohužel použit, dokud nebude váš software %s aktualizován."
 
-#: ../src/empathy-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 "Účet %s vyžaduje přihlášení"
 
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Účty on-line"
 
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Aktualizovat software…"
 
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Znovu připojit"
 
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Upravit účet"
 
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Zavřít"
 
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Dobít kredit účtu"
 
-#: ../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 "Abyste zde viděli kontakty, musíte povolit některý ze svých účtů."
 
 #. 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 "Abyste zde viděli kontakty, musíte povolit účet %s."
 
-#: ../src/empathy-roster-window.c:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Abyste zde viděli kontakty, musíte změnit svůj stav"
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Nic nenalezeno"
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Zatím jste nepřidali žádný kontakt"
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Žádné kontakty na příjmu"
 
@@ -4585,12 +4586,12 @@ msgstr "Nový _hovor…"
 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/es.po b/po/es.po
index 184e3609..8125e81e 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-05-03 12:35+0000\n"
+"PO-Revision-Date: 2013-05-03 18:04+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@@ -526,261 +526,261 @@ msgstr ""
 "Indica si Empathy debería reducir la precisión de la ubicación por motivos "
 "de privacidad."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Se requirió un cambio en el estado"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "El otro participante canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Error la intentar transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Se completó la transferencia de archivo pero el archivo está corrupto"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "El contacto remoto no soporta la transferencia de archivos"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "El archivo seleccionado no es un archivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../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 "No se encontró la contraseña"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Contraseña de la cuenta IM para %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, 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
+#: ../libempathy/empathy-time.c:92
 #, 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
+#: ../libempathy/empathy-time.c:98
 #, 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
+#: ../libempathy/empathy-time.c:104
 #, 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
+#: ../libempathy/empathy-time.c:110
 #, 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
+#: ../libempathy/empathy-time.c:116
 #, 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
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 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:269 ../libempathy/empathy-utils.c:325
 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: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 "Error de red"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../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 "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../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 "El certificado no está activado"
 
-#: ../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 "El nombre del equipo del certificado no coincide"
 
-#: ../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 "La huella del certificado no coincide"
 
-#: ../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 "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
 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:342
 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:344
 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:346
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 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:351
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -789,32 +789,32 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:355
 msgid "Your software is too old"
 msgstr "Su software es demasiado antiguo"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Error interno"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo Japón"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:642
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
@@ -893,56 +893,56 @@ msgstr "¿Cuál es su contraseña de AIM?"
 msgid "Remember Password"
 msgstr "Recordar contraseña"
 
-#: ../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 "Cuenta"
 
-#: ../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 "Contraseña"
 
-#: ../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 "Servidor"
 
-#: ../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 "Puerto"
 
-#: ../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 "Nombre de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Esta cuenta ya existe en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva en el servidor"
 
@@ -951,19 +951,19 @@ msgstr "Crear una cuenta nueva en el servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, 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
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Cuenta nueva"
 
@@ -1186,32 +1186,32 @@ 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?"
 
-#: ../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 "Registrador"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Opciones"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Ninguno"
 
@@ -1323,55 +1323,55 @@ msgstr "¿Cuál es su ID de Yahoo!?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "No se pudo convertir la imagen"
 
-#: ../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 "Su sistema no soporta ninguno de los formatos de imagen aceptados"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "No se pudo guardar la imagen a un archivo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Seleccione su imagen de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Tomar una imagen…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Sin imagen"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Todos los archivos"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
 #: ../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"
@@ -1380,72 +1380,72 @@ msgstr ""
 "Introduzca su contraseña para la cuenta\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Seleccionar…"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../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:731
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "ID de contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1453,23 +1453,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:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1479,11 +1479,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:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1491,128 +1491,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, 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:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1620,12 +1620,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1633,17 +1633,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:2844
 #, 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:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1653,17 +1653,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: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 ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -1671,82 +1671,82 @@ 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: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 "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 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:3790
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Unirse"
 
-#: ../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 "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Identificador desconocido o no válido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueo de contactos no disponible temporalmente"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Bloqueo de contactos no disponible"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "No se pudo bloquear el contacto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1756,107 +1756,107 @@ msgstr "Cuenta:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Nombre completo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "Dirección de correo-e"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Página web"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Última actividad:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Mensaje de ausencia:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "trabajo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "personal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "móvil"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "voz"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "preferido"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "postal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "grupo"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Buscar:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "_Añadir contacto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "No se encontraron contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
@@ -1903,11 +1903,11 @@ msgstr "Versión"
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../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."
@@ -1915,122 +1915,122 @@ 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:348
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: ../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 "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccionar la cuenta que usar para realizar la llamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Eliminar y _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2039,218 +2039,218 @@ 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 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:1692
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "_Añadir contacto…"
 
-#: ../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 "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Quitando grupo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Canales:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Edificio:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Planta:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Habitación:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../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 "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Error vertical (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Error horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Retardo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Velocidad de ascenso:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Actualizado por última vez:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Longitud_"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Latitud:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Altitud:"
 
-#: ../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 "Ubicación geográfica"
 
 #. 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 "%e de %B de %Y a las %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 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:1501
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../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"
@@ -2265,32 +2265,32 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Red nueva"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Elegir una red IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Rei_niciar lista de redes"
 
-#: ../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 "Seleccionar"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "servidor nuevo"
 
-#: ../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 "
@@ -2300,11 +2300,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:100
 msgid "People nearby"
 msgstr "Gente cerca"
 
-#: ../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."
@@ -2313,137 +2313,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:607
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatee en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, 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:1367
 #, 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:1375
 #, 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:1706
 msgid "Today"
 msgstr "Hoy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 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:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "Quién"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "Cuándo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "Cualquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "Chats de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Llamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "Llamadas entrantes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "Llamadas salientes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "Llamadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "Qué"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "Eliminar de:"
 
@@ -2465,7 +2465,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Chat"
 
@@ -2490,72 +2490,72 @@ msgstr "¿Qué tipo de cuenta tiene?"
 msgid "Adding new account"
 msgstr "Añadiendo 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"
 
@@ -2565,26 +2565,26 @@ msgstr "Conversación nueva"
 #. 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 "Mensaje personalizado…"
 
-#: ../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 "Editar mensajes personalizados…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2594,12 +2594,12 @@ 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:386
 msgid "Set status"
 msgstr "Establecer estado"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Mensajes personalizados…"
 
@@ -2607,12 +2607,12 @@ msgstr "Mensajes personalizados…"
 #. 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 "Cuenta de %s nueva"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
@@ -2636,169 +2636,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:49
 msgid "Received an instant message"
 msgstr "Mensaje instantáneo recibido"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "Enviar un mensaje instantáneo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "Solicitud de chat entrante"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Conectado con el servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Desconectado del servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Llamada de voz entrante"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Llamada de voz saliente"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 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:294
 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:1096
 #, 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:721
 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:1211
 #, 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: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 ""
 "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:1078
 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:1202
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2807,7 +2807,7 @@ msgstr ""
 "Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s "
 "disponible. Elija otra ubicación."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
@@ -2835,197 +2835,197 @@ msgstr "_Abrir enlace"
 msgid "Inspect HTML"
 msgstr "Inspeccionar HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "Árabe"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "Chino simplificado"
 
-#: ../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 "Chino tradicional"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "Cirílico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Cirílico/Ruso"
 
-#: ../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 "Cirílico/Ucraniano"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Griego"
 
-#: ../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 "Hebreo"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Hebreo visual"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 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
+#: ../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 "Coreano"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nórdico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persa"
 
-#: ../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 "Rumano"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Europa del sur"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "Occidental"
 
-#: ../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 "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: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:201
 #, 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 +3037,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 +3049,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 +3059,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existen modificaciones sin guardar en su cuenta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Desconectado: sin conexión de red"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: ../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 "
@@ -3142,28 +3142,28 @@ 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:486
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar los parámetros de la conexión…"
 
-#: ../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 "¿Quiere quitar %s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3172,24 +3172,24 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1652
 msgid "_Enabled"
 msgstr "_Activada"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../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?"
@@ -3198,7 +3198,7 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Cuentas de mensajería y Voz IP"
 
@@ -3222,31 +3222,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:407
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensajería instantánea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Error al contactar con el Gestor de cuentas"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3259,111 +3259,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "En una llamada"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr ": Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-call-window.c:1555 ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
-#: ../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: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 "Desconocido"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "Duración"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3372,7 +3366,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:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3381,7 +3375,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:3101
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3390,25 +3384,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:3107
 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:3111
 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:3114
 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:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3419,32 +3413,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:3135
 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:3138
 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:3178
 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:3188
 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:3225
 #, 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:3229
 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:3231
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -3560,19 +3554,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:243
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Sala"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
@@ -3580,11 +3574,11 @@ msgstr "Autoconectar"
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "¿Cerrar esta ventana?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3593,7 +3587,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3608,65 +3602,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "¿Cerrar %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 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:326
 msgid "Close window"
 msgstr "Cerrar la ventana"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Abandonar la sala"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, 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:680
 #, 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:696
 #, 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:705
 #, 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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, 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:970
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
@@ -3730,77 +3724,77 @@ msgstr "Mover pestaña a la _derecha"
 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:1588
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Enlace a pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Respuesta de pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Enviar a pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +3813,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:2051
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3843,70 +3837,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:500
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../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 le está llamando con vídeo. ¿Quiere responder?"
 
-#: ../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 le está llamando. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../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 "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, 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:713
 #, 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:726
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3916,105 +3910,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: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 "Desconocido"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 msgid "Error receiving a file"
 msgstr "Error al recibir un archivo"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, 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:343
 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:482
 #, 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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» enviado a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obteniendo el «hash» de «%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 "Archivo"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -4028,11 +4022,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 +4034,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:296
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Sala de chat"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Miembros"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Falló al listar las salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4095,17 +4089,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Sí"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Unirse a sala"
 
@@ -4148,104 +4142,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:134
 msgid "Message received"
 msgstr "Mensaje recibido"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Conversación nueva"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "El contacto se conecta"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "El contacto se desconecta"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Cuenta conectada"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Cuenta desconectada"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Julieta"
 
 #. 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 "¡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:645
 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:648
 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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "Julieta se ha desconectado"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4257,7 +4251,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:2226
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4424,86 +4418,87 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 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:478
+#| 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 una cuenta para ver contactos aquí."
 
-#: ../src/empathy-roster-window.c:540
+#: ../src/empathy-roster-window.c:554
 #, 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:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:644
+#: ../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:659
+#: ../src/empathy-roster-window.c:674
 #, 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:685
 msgid "Online Accounts"
 msgstr "Cuentas en línea"
 
-#: ../src/empathy-roster-window.c:717
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:723
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:727
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
-#: ../src/empathy-roster-window.c:732
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/empathy-roster-window.c:869
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Recargar cuenta"
 
-#: ../src/empathy-roster-window.c:1551
+#: ../src/empathy-roster-window.c:1575
 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:1583
 #, 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:1637
+#: ../src/empathy-roster-window.c:1661
 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:1670
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-roster-window.c:1653
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Todavía no ha añadido ningún contacto"
 
-#: ../src/empathy-roster-window.c:1656
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "No hay contactos no conectados"
 
@@ -4581,12 +4576,10 @@ 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…"
 
@@ -4602,12 +4595,12 @@ msgstr "_Llamada nueva…"
 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 +4612,6 @@ 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 "i"
+#~ msgstr "Información"
diff --git a/po/gl.po b/po/gl.po
index 1245e94d..a549bfd1 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-06-01 23:18+0200\n"
+"PO-Revision-Date: 2013-06-01 23:18+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -600,283 +600,283 @@ msgstr ""
 "motivos de privacidade."
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr ""
 "Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "O contacto remoto non admite a tranferencia de ficheiros"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
-#: ../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 "Contrasinal non atopado"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Contrasinal da conta de mensaxaría para %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, 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
+#: ../libempathy/empathy-time.c:92
 #, 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
+#: ../libempathy/empathy-time.c:98
 #, 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
+#: ../libempathy/empathy-time.c:104
 #, 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
+#: ../libempathy/empathy-time.c:110
 #, 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
+#: ../libempathy/empathy-time.c:116
 #, 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
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../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 "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: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 "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../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 "Non se forneceu o certificado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "Certificado sen confianza"
 
 # rever
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "O certificado expirou"
 
 # rever
-#: ../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 "O certificado non está activado"
 
 # rever
-#: ../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 "O nome do host do certificado non coincide"
 
 # rever
-#: ../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 "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../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 "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Erro do certificado"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
 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:342
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
 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:346
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 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:351
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -885,34 +885,34 @@ msgstr ""
 "certificado do servidor excede os límites impostos pola biblioteca de "
 "criptografía"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:355
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Erro interno"
 
 # rever
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Xente cerca"
 
 # rever
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Conversa de Facebook"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Todas as contas"
 
@@ -992,56 +992,56 @@ msgstr "Cal e o seu contrasinal para AIM?"
 msgid "Remember Password"
 msgstr "Lembrar o contrasinal"
 
-#: ../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 "Conta"
 
-#: ../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 "Contrasinal"
 
-#: ../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 "Servidor"
 
-#: ../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 "Porto"
 
-#: ../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 "Nome de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
@@ -1051,20 +1051,20 @@ msgstr "Crear unha nova conta no servidor"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, 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
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Conta nova"
 
@@ -1297,32 +1297,32 @@ msgstr "Cal é o seu ID de Windows Live?"
 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
+#: ../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 "Rexistrador"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Opcións"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Ningún"
 
@@ -1439,58 +1439,58 @@ 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Non foi posíbel converter a imaxe"
 
 # rever
-#: ../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 "Ningún dos formatos aceptados de imaxe é compatíbel co seu sistema"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Seleccione a súa imaxe de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Tomar unha foto…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Sen imaxe"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Todos os ficheiros"
 
 # rever
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Reintentar"
 
 #: ../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"
@@ -1499,74 +1499,74 @@ msgstr ""
 "Escriba o contrasinal para a conta\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Seleccionar…"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: ../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:731
 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:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "ID de contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1574,23 +1574,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:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1600,11 +1600,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:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1612,134 +1612,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, 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:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Non se definiu o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 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:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1747,12 +1747,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1760,17 +1760,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:2844
 #, 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:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1780,18 +1780,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:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1799,83 +1799,83 @@ 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: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 "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Unirse"
 
-#: ../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 "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Identificador descoñecido ou non válido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel temporalmente"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Bloqueo de contactos non dispoñíbel"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Permiso denegado"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Non foi posíbel bloquear o contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1886,126 +1886,126 @@ msgstr "Conta:"
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Sitio web"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Última actividade"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Mensaxe de ausencia:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "traballo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "persoal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "móbil"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "voz"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "prefirido"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "postal"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "grupo"
 
 # rever
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Buscar contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Buscar:"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "_Engadir contacto"
 
 # rever
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Non se atoparon contactos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
 #. 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 "Identificador"
 
 #. 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 "Alias"
 
@@ -2042,11 +2042,11 @@ msgstr "Versión"
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../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."
@@ -2054,76 +2054,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:348
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../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 "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 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 +2131,49 @@ 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2182,226 +2182,226 @@ 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Chamada de son"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 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:1692
 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:1888
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
 # rever
-#: ../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 "Está seguro de que quere retirar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Retirando o grupo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Canles:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "Código ISO de país:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Rexión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Rúa:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Edificio:"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "_Andar:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Descrición:"
 
-#: ../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 "Nivel de precisión:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Erro vertical (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Erro horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Orientación:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Velocidade de incremento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Última actualización:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Lonxitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../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 "Localización"
 
 #. 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 de %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../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:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
 msgid "Identifier:"
 msgstr "Identificador:"
 
-#: ../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"
@@ -2416,33 +2416,33 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Rede nova"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Seleccione unha rede IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Rei_niciar a lista de redes"
 
-#: ../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 "Seleccionar"
 
 # rever
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "servidor novo"
 
-#: ../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 "
@@ -2453,11 +2453,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:100
 msgid "People nearby"
 msgstr "Xente cerca"
 
-#: ../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."
@@ -2466,137 +2466,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:607
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1331
 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:1274
 #, 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:1280
 #, 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:1355
 #, 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:1362
 #, 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:1370
 #, 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:1701
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1705
 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:1720
 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:1824
+#: ../libempathy-gtk/empathy-log-window.c:3447
 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:1923
+#: ../libempathy-gtk/empathy-log-window.c:2382
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2695
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2904
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3022
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3024
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3025
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3030
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3031
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3740
 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:3744
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3751
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
@@ -2618,7 +2618,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Conversa"
 
@@ -2644,76 +2644,76 @@ msgstr "Que tipo de conta ten?"
 msgid "Adding new account"
 msgstr "Engadindo conta nova"
 
-#: ../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"
 
@@ -2723,26 +2723,26 @@ msgstr "Conversa nova"
 #. 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 "Mensaxe personalizada…"
 
-#: ../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 "Editar mensaxes personalizadas…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2752,12 +2752,12 @@ 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:386
 msgid "Set status"
 msgstr "Estabelecer status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Mensaxes personalizadas…"
 
@@ -2766,12 +2766,12 @@ msgstr "Mensaxes personalizadas…"
 #. 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 "Conta nova de %s"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
@@ -2797,185 +2797,185 @@ msgid "Phrase not found"
 msgstr "Frase non atopada"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:49
 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:51
 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:53
 msgid "Incoming chat request"
 msgstr "Solicitude de conversa entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Contacto conectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Contacto desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Conectado co servidor"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Chamada de voz entrante"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Chamada de voz saínte"
 
 # rever
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Chamada de voz finalizada"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 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:1096
 #, 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:721
 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:1211
 #, 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: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 ""
 "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:1078
 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:1202
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2984,17 +2984,17 @@ 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:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 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
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "<b>Detalles persoais</b>"
 
@@ -3013,200 +3013,200 @@ msgstr "_Abrir a ligazón"
 msgid "Inspect HTML"
 msgstr "Inspeccionar HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "Árabe"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Báltico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "Chinés simplificado"
 
-#: ../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 "Chinés tradicional"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "Cirílico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Cirílico/Ruso"
 
-#: ../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 "Cirílico/Ucraíno"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Grego"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "Guxarati"
 
-#: ../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 "Hebreo"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Hebreo visual"
 
-#: ../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 "Islandés"
 
-#: ../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 "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
+#: ../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 "Coreano"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nórdico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persa"
 
-#: ../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 "Romanés"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Sureuropeo"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "Occidental"
 
-#: ../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 "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
+#: ../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:201
 #, 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 +3219,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 +3231,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 +3242,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 +3259,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Hai modificacións sen gardar respecto da súa conta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../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 "
@@ -3333,31 +3333,31 @@ 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:486
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../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 "Está seguro de que quere retirar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3366,25 +3366,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:1652
 msgid "_Enabled"
 msgstr "_Activado"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Omitir"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Conectar"
 
 # rever
-#: ../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?"
@@ -3393,7 +3393,7 @@ msgstr ""
 "Está seguro de que quere continuar?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Contas de mensaxaría e Voz IP"
 
@@ -3420,34 +3420,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:407
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3461,116 +3461,110 @@ msgstr ""
 "%s"
 
 # rever
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Nunha chamada"
 
 # rever
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
-#: ../src/empathy-call-window.c:1555 ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada con %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../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: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 "Descoñecido"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2952
 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:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
 # rever
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3579,7 +3573,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:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3588,7 +3582,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:3101
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3597,21 +3591,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:3107
 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:3111
 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:3114
 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:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3622,32 +3616,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:3135
 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:3138
 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:3178
 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:3188
 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:3225
 #, 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:3229
 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:3231
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -3764,20 +3758,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:243
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Sala"
 
 # rever
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
@@ -3787,11 +3781,11 @@ msgid "Manage Favorite Rooms"
 msgstr "Xestionar as salas favoritas"
 
 # rever
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "Pechar esta xanela?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3800,7 +3794,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3815,60 +3809,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "Saír de %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 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:326
 msgid "Close window"
 msgstr "Pechar a xanela"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 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:665 ../src/empathy-chat-window.c:688
 #, 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:680
 #, 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:696
 #, 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:705
 #, 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:942
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3876,7 +3870,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:982
+#: ../src/empathy-chat-window.c:970
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -3944,76 +3938,76 @@ msgstr "Mover lapela á _dereita"
 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:1588
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Ligazón a pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Resposta de pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Enviar a pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +4025,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:2051
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4056,79 +4050,79 @@ msgstr ""
 "depuración remota."
 
 # rever
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:500
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../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 está chamándoo con vídeo. Desexa responderlle?"
 
 # rever
-#: ../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 estao chamando. Quere responder?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../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 "_Responder"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
 # rever
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Convite a unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, 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:713
 #, 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:726
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -4138,44 +4132,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: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 "Descoñecido"
 
 # rever
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando «%s» a %s"
@@ -4183,30 +4177,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:332
 #, 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:335
 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:340
 #, 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:343
 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:482
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "«%s» recibido de %s"
@@ -4214,39 +4208,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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» enviado a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obtendo o «hash» de «%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 "Ficheiro"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Restantes"
 
@@ -4261,12 +4255,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 +4269,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:296
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Salas de conversas"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Membros"
 
 # rever
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 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:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4332,17 +4326,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "Non"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Unirse á sala"
 
@@ -4389,109 +4383,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:134
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Conversa nova"
 
 # rever
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "O contacto desconéctase"
 
 # rever
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Conta conectada"
 
 # rever
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Conta desconectada"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. 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 "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:645
 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:648
 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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4505,7 +4499,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:2226
 msgid "Contact List"
 msgstr "Lista de contactos"
 
@@ -4687,88 +4681,88 @@ msgstr "Variante:"
 msgid "Themes"
 msgstr "Temas"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../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 "Debe configurar unha conta para ver contactos aquí."
 
-#: ../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 ""
 "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:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../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:688
+#: ../src/empathy-roster-window.c:674
 #, 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:685
 msgid "Online Accounts"
 msgstr "Contas en liña"
 
-#: ../src/empathy-roster-window.c:746
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Editar a conta"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Recargar conta"
 
-#: ../src/empathy-roster-window.c:1585
+#: ../src/empathy-roster-window.c:1575
 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:1583
 #, 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:1661
 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:1670
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:1687
+#: ../src/empathy-roster-window.c:1677
 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:1680
 msgid "No online contacts"
 msgstr "Non hai contactos en liña"
 
@@ -4871,12 +4865,12 @@ msgstr "Nova _chamada…"
 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 +4884,9 @@ msgstr "Editar as opcións da conta %s"
 msgid "Integrate your IM accounts"
 msgstr "Integre as súas contas de MI"
 
+#~ msgid "i"
+#~ msgstr "Información"
+
 #~ msgid "Manage Messaging and VoIP accounts"
 #~ msgstr "Xestionar as contas de mensaxaría e Voz IP"
 
diff --git a/po/he.po b/po/he.po
index 6eaef79f..da6b4748 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-26 19:56+0200\n"
-"PO-Revision-Date: 2012-12-26 19:58+0200\n"
+"POT-Creation-Date: 2013-05-24 11:47+0300\n"
+"PO-Revision-Date: 2013-05-24 11:48+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -431,299 +431,299 @@ msgstr "Empathy should reduce the location's accuracy"
 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
+#: ../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 "ססמת חשבון המסרים המידיים עבור %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' דרך החשבון %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
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שנייה"
 msgstr[1] "לפני %d שניות"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "לפני יום"
 msgstr[1] "לפני %d ימים"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %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 "התעודה נשללה"
 
-#: ../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-gtk/empathy-roster-model.h:30
+#: ../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:538
-#: ../src/empathy-roster-window.c:671
+#: ../libempathy/empathy-utils.c:527
+#: ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../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 "כל החשבונות"
 
@@ -802,56 +802,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:532
+#: ../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 "ה_חלה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "_כניסה"
 
-#: ../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 "יצירת חשבון חדש על השרת"
 
@@ -860,19 +860,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 "‏%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
+#: ../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 "חשבון חדש"
 
@@ -1089,32 +1089,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 "ללא"
 
@@ -1226,55 +1226,55 @@ msgstr "מהו המזהה בחשבון ה־Yahoo! שלך?"
 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"
@@ -1283,226 +1283,226 @@ 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 "_בחירה"
 
-#: ../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 "מזהה איש קשר שגוי"
 
-#: ../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 "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הוא בררת המחדל"
 
-#: ../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 <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../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 join a new chat room\""
 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 <מזהה המשתמש>:‎ הצגת פרטים על איש הקשר"
 
-#: ../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'>Top up</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:979
+#: ../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 "_שליחה"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "הצעות _איות"
 
-#: ../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 התנתק"
@@ -1510,12 +1510,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 סולק"
@@ -1523,17 +1523,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 "‏%1$s נחסם על ידי %2$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 עזב את החדר"
@@ -1543,17 +1543,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"
@@ -1561,86 +1561,86 @@ 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: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:770
 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 (SMS)"
 
-#: ../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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1650,120 +1650,120 @@ 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:521
 msgid "Search contacts"
 msgstr "חיפוש בין אנשי הקשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "חיפוש:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "הוספת _איש קשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "לא נמצאו אנשי קשר"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 msgid "Your message introducing yourself:"
 msgstr "ההודעה המציגה אותך:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:651
 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 "כינוי"
 
@@ -1797,345 +1797,345 @@ 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 "הוס_פת קבוצה"
 
-#: ../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] "הזהות הבאה תיחסם:"
 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "נא לבחור את החשבון לשימוש לצורך ההתקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:357
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../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:413
 msgid "Mobile"
 msgstr "סלולרי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "עבודה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "בית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "ח_סימת איש קשר"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "מחיקה ו_חסימה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../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:796
+#: ../libempathy-gtk/empathy-individual-menu.c:787
 #, 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:798
 msgid "Removing contact"
 msgstr "איש קשר מוסר"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _וידאו"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "שליחת קובץ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "מועדף"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "מזמין/ה אותך לחדר זה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
 msgid "_Invite to Chat Room"
 msgstr "ה_זמנה לחדר שיחה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "הוספת _איש קשר…"
 
-#: ../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 "כתובת:"
 
-#: ../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"
@@ -2150,172 +2150,172 @@ 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 "_איפוס רשימת הרשתות"
 
-#: ../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: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 details below are correct."
 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."
 msgstr "באפשרותך לשנות פרטים אלה מאוחר יותר או לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה ← חשבונות</span> ברשימת אנשי הקשר."
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:607
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "הצגה"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "שיחה תחת %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, 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:1367
 #, 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:1375
 #, 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:1706
 msgid "Today"
 msgstr "היום"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 msgid "Anytime"
 msgstr "כל זמן שהוא"
 
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "מי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "מתי"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "כל דבר"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "צ׳אטים בטקסט"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "שיחות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "שיחות נכנסות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "שיחות יוצאות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "שיחות שלא נענו"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "מה"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "מחיקת הכול"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "מחיקה עד מ־:"
 
@@ -2338,7 +2338,7 @@ msgid "Profile"
 msgstr "פרופיל"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.c:1438
+#: ../src/empathy-chat-window.c:1426
 #: ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "שיחה"
@@ -2364,72 +2364,72 @@ msgstr "אילו חשבונות יש לך?"
 msgid "Adding 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 "שיחה חדשה"
 
@@ -2439,26 +2439,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"
@@ -2467,12 +2467,12 @@ msgstr ""
 "<b>הודעה נוכחית: %s</b>\n"
 "<small>יש ללחוץ על Enter כדי להגדיר הודעה חדשה או Esc כדי לבטל.</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 "הודעות מותאמות אישית…"
 
@@ -2480,12 +2480,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 "התאמת _רישיות"
 
@@ -2509,179 +2509,179 @@ msgstr "התאמת _רישיות"
 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 "_סירוב"
 
-#: ../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:1211
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1801
+#: ../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 "אישור אבטחה זה אינו חתום על ידי רשות אישורי אבטחה."
 
-#: ../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:1078
 msgid "Unable to open URI"
 msgstr "לא ניתן לפתוח את הכתובת"
 
-#: ../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>"
 
@@ -2700,213 +2700,213 @@ msgstr "_פתיחת קישור"
 msgid "Inspect HTML"
 msgstr "ניתוח ה־HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../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 "יוניקוד"
 
-#: ../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 "וייטנאמית"
 
-#: ../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: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:201
 #, 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 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: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 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
+#: ../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 "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 +2915,92 @@ 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 "אין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבוא) ולאחריה התכנית תסגר"
 
-#: ../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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ישנם שינויים שלא נשמרו בחשבון ה־%s שלך."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c: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:1274
+#: ../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 the account."
 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:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "ע_ריכת הגדרות החיבור..."
 
-#: ../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 "האם ברצונך להסיר את החשבון '%s' ממחשבך?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 msgid "This will not remove your account on the server."
 msgstr "פעולה זו לא תסיר את חשבונך מהשרת."
 
-#: ../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?"
@@ -3009,24 +3009,24 @@ msgstr ""
 "את השינויים שלך. האם להמשיך?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1652
 msgid "_Enabled"
 msgstr "מו_פעל"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_דילוג"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "הת_חברות"
 
-#: ../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?"
@@ -3035,7 +3035,7 @@ msgstr ""
 "את השינויים שלך. האם להמשיך?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "חשבונות התכתבות ו־VoIP"
 
@@ -3055,31 +3055,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. The error was:\n"
@@ -3090,174 +3090,167 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "בשיחה"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- לקוח השמע/הווידאו Empathy"
 
-#: ../src/empathy-call.c:248
+#: ../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: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:1533
+#: ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
-#: ../src/empathy-call-window.c:1555
-#: ../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:1555
-#: ../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:1559
-#: ../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:1560
-#: ../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:1927
+#: ../src/empathy-call-window.c:1913
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה עם %s"
 
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2165
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנראית על ידי המחשב"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2167
 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:2169
 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:2171
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-call-window.c:2173
 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: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:2959
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "פרטים טכניים"
 
-#: ../src/empathy-call-window.c:3103
+#: ../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:3108
+#: ../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:3114
+#: ../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:3120
+#: ../src/empathy-call-window.c:3107
 msgid "There was a failure on the network"
 msgstr "אירעה שגיאה ברשת"
 
-#: ../src/empathy-call-window.c:3124
+#: ../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:3127
+#: ../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:3139
+#: ../src/empathy-call-window.c:3126
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה."
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3135
 msgid "There was a failure in the call engine"
 msgstr "אירעה שגיאה במנוע הקריאה"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3138
 msgid "The end of the stream was reached"
 msgstr "התזרים הגיע לסיומו"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3178
 msgid "Can't establish audio stream"
 msgstr "לא ניתן לקיים תזרים שמע"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3188
 msgid "Can't establish video stream"
 msgstr "לא ניתן לקיים תזרים וידאו"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3225
 #, c-format
 msgid "Your current balance is %s."
 msgstr "המאזן הנוכחי שלך הוא %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3229
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "אין לך מספיק אשראי כדי לבצע שיחה זו."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3231
 msgid "Top Up"
 msgstr "Top Up"
 
@@ -3376,19 +3369,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: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 "חיבור אוטומטי"
 
@@ -3396,80 +3389,80 @@ msgstr "חיבור אוטומטי"
 msgid "Manage Favorite Rooms"
 msgstr "ניהול חדרי שיחה מועדפים"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "האם לסגור חלון זה?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../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:306
+#: ../src/empathy-chat-window.c:294
 #, 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
+#: ../src/empathy-chat-window.c:305
 #, c-format
 msgid "Leave %s?"
 msgstr "האם לעזוב את %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../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:338
+#: ../src/empathy-chat-window.c:326
 msgid "Close window"
 msgstr "סגירת החלון"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "עזיבת החדר"
 
-#: ../src/empathy-chat-window.c:677
-#: ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665
+#: ../src/empathy-chat-window.c:688
 #, 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:680
 #, 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:696
 #, 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:705
 #, 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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, 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:970
 msgid "Typing a message."
 msgstr "הודעה מוקלדת."
 
@@ -3534,76 +3527,76 @@ msgstr "הזזת הלשונית _ימינה"
 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:1588
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "קישור ל־Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "תגובה מ־Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "חלון ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "שליחה ל־Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:2002
-#: ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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>."
@@ -3611,92 +3604,92 @@ msgstr ""
 "אפילו ללא הצגת ססמאות, יומנים עלולים להכיל מידע רגיש כגון אנשי הקשר שלך או ההודעות האחרונות ששלחת או קיבלת.\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:2051
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "תחום"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 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 "_דחייה"
 
+#: ../src/empathy-event-manager.c:541
 #: ../src/empathy-event-manager.c:549
-#: ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr "_מענה"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "מ_ענה עם וידאו"
 
-#: ../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 "ה_צטרפות"
 
-#: ../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:227
+#: ../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"
@@ -3706,108 +3699,108 @@ 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 "‏%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\" מ־%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 "‏\"%s\" נשלח אל \"%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 "ארעה שגיאה בקבלת הקובץ \"%s\" מ־%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 "שגיאה בשליחת הקובץ \"%s\" אל %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 "הקובץ \"%s\" התקבל מאת %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 "הקובץ \"%s\" נשלח אל %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 "נותר"
 
@@ -3819,57 +3812,57 @@ 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."
 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:429
 #, c-format
 msgid ""
 "%s\n"
@@ -3882,17 +3875,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "כן"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "לא"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "הצטרפות לחדר"
 
@@ -3924,104 +3917,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 "הו רומיאו, רומיאו, מן אין שבת רומיאו?"
 
 #. 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 "התכחש לאביך וסרב לשמו;"
 
 #. 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 "או אם לא תסכים, אשבע לך באהבתי"
 
 #. 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 "ולא אהיה עוד בת קפולט."
 
 #. 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 "האם דיברתי די או שמא אוסיף לדבר?"
 
 #. 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 "העדפות"
 
@@ -4034,7 +4027,7 @@ msgid "Show account balances"
 msgstr "הצגת מאזני החשבונות"
 
 #: ../src/empathy-preferences.ui.h:4
-#: ../src/empathy-roster-window.c:2236
+#: ../src/empathy-roster-window.c:2226
 msgid "Contact List"
 msgstr "רשימת אנשי קשר"
 
@@ -4183,84 +4176,84 @@ msgstr "הגוון:"
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "הזנת ססמה"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "ניתוק"
 
-#: ../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 "עליך להגדיר חשבון כדי שיופיעו כאן אנשי קשר."
 
-#: ../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 "לא ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
 
-#: ../src/empathy-roster-window.c:669
+#: ../src/empathy-roster-window.c:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../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:688
+#: ../src/empathy-roster-window.c:674
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "חשבון ה־%s דורש אימות"
 
-#: ../src/empathy-roster-window.c:699
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "חשבונות מקוונים"
 
-#: ../src/empathy-roster-window.c:746
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "עדכון התכנה..."
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "התחברות מחדש"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "סגירה"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "חשבון Top up"
 
-#: ../src/empathy-roster-window.c:1585
+#: ../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:1593
+#: ../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:1671
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "שינוי הנוכחות שלך כדי לצפות באנשי קשר להלן"
 
-#: ../src/empathy-roster-window.c:1680
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "לא נמצאה התאמה"
 
-#: ../src/empathy-roster-window.c:1687
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "לא הוספת אנשי קשר עדיין"
 
-#: ../src/empathy-roster-window.c:1690
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "אין אנשי קשר מחוברים"
 
@@ -4357,12 +4350,12 @@ msgstr "_שיחה חדשה…"
 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 +4368,9 @@ msgstr "עריכת אפשרויות חשבון ה־%s"
 msgid "Integrate your IM accounts"
 msgstr "שילוב חשבונות המסרים המידיים שלך"
 
+#~ msgid "i"
+#~ msgstr "i"
+
 #~ msgid "Manage Messaging and VoIP accounts"
 #~ msgstr "ניהול חשבונות התכתבות ו־VoIP"
 
diff --git a/po/it.po b/po/it.po
index e82aa658..9700351b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # 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 
@@ -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-04-28 12:42+0200\n"
+"PO-Revision-Date: 2013-04-28 12:50+0200\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -537,262 +537,262 @@ msgstr ""
 "Indica se il programma deve ridurre o meno la precisione della posizione "
 "geografica per motivi di privacy."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "È stata richiesta la modifica dello stato"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "È stato annullato il trasferimento del file"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "L'altro utente ha annullato il trasferimento del file"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Errore nel tentativo di trasferire il file"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:293
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferimento file completato, ma il file era danneggiato"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Il trasferimento di file non è supportato dal contatto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Il file selezionato non è un file regolare"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Il file selezionato è vuoto"
 
-#: ../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 "Password non trovata"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Password account messaggistica per %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, 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
+#: ../libempathy/empathy-time.c:92
 #, 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
+#: ../libempathy/empathy-time.c:98
 #, 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
+#: ../libempathy/empathy-time.c:104
 #, 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
+#: ../libempathy/empathy-time.c:110
 #, 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
+#: ../libempathy/empathy-time.c:116
 #, 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
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "nel futuro"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:213
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:215
 msgid "Busy"
 msgstr "Non disponibile"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:218
 msgid "Away"
 msgstr "Assente"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:220
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:222
 msgid "Offline"
 msgstr "Fuori rete"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:225
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:265
 msgid "No reason specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:267 ../libempathy/empathy-utils.c:323
 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:269 ../libempathy/empathy-utils.c:303
+#: ../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:271 ../libempathy/empathy-utils.c:305
 msgid "Authentication failed"
 msgstr "Autenticazione non riuscita"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Encryption error"
 msgstr "Errore di cifratura"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:275
 msgid "Name in use"
 msgstr "Nome in uso"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:277 ../libempathy/empathy-utils.c:309
 msgid "Certificate not provided"
 msgstr "Certificato non fornito"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311
 msgid "Certificate untrusted"
 msgstr "Certificato non fidato"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate expired"
 msgstr "Certificato scaduto"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate not activated"
 msgstr "Certificato non attivato"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317
 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:287 ../libempathy/empathy-utils.c:319
 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:289 ../libempathy/empathy-utils.c:321
 msgid "Certificate self-signed"
 msgstr "Certificato auto-firmato"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:291
 msgid "Certificate error"
 msgstr "Errore nel certificato"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:325
 msgid "Encryption is not available"
 msgstr "La cifratura non è disponibile"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:327
 msgid "Certificate is invalid"
 msgstr "Il certificato non è valido"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:329
 msgid "Connection has been refused"
 msgstr "La connessione è stata rifiutata"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection can't be established"
 msgstr "La connessione non può essere stabilita"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection has been lost"
 msgstr "La connessione è stata persa"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:335
 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:337
 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:340
 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:342
 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:344
 msgid "Certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:346
 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:349
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -800,33 +800,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:353
 msgid "Your software is too old"
 msgstr "Il software in uso è troppo datato"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:355
 msgid "Internal error"
 msgstr "Errore interno"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:484
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Persone nelle vicinanze"
 
 # (ndt) opzione
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:489
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Giappone"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:525 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:526
 msgid "Facebook Chat"
 msgstr "Chat di Facebook"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Tutti gli account"
 
@@ -907,57 +907,57 @@ msgstr "Qual è la password di AIM?"
 msgid "Remember Password"
 msgstr "Ricordare la password"
 
-#: ../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 "Account"
 
-#: ../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 "Password"
 
-#: ../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 "Porta"
 
-#: ../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 "Nome utente:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "A_pplica"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "Acce_di"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Questo account esiste già sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Creare un nuovo account sul server"
 
@@ -966,7 +966,7 @@ msgstr "Creare un nuovo account sul server"
 #. * 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 su %2$s"
@@ -974,12 +974,12 @@ msgstr "%1$s su %2$s"
 # (ndt) il %s pare sia il protocollo
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "Account %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Nuovo account"
 
@@ -1208,32 +1208,32 @@ msgstr "Qual è l'identificativo di Windows Live?"
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Automatico"
 
-#: ../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 "Register"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Nessuno"
 
@@ -1350,56 +1350,56 @@ msgstr "Qual è l'identificativo Yahoo?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Impossibile convertire l'immagine"
 
-#: ../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 "Nessuno dei formati di immagine accettati è supportato dal sistema"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "Impossibile salvare l'immagine su file"
 
 # (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Selezione immagine"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Scatta foto..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Nessuna immagine"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Immagini"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Riprova"
 
 #: ../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"
@@ -1408,73 +1408,73 @@ msgstr ""
 "Inserire la password per l'account\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Seleziona..."
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Seleziona"
 
-#: ../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:731
 msgid "Failed to open private chat"
 msgstr "Apertura della conversazione privata non riuscita"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "ID contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1482,23 +1482,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:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1508,11 +1508,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:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1520,127 +1520,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "non possibile"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "fuori rete"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "messaggio troppo lungo"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "non implementato"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Argomento impostato a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1710
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Nessun argomento definito"
 
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Nessun suggerimento)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Invia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Suggerimenti ortografici"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2583
 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:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "L'utente %s si è disconnesso"
@@ -1648,13 +1648,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "L'utente %s è stato espulso"
@@ -1662,19 +1662,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:2844
 #, 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:2847
 #, 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:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "L'utente %s ha lasciato la stanza"
@@ -1684,19 +1684,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:2860
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2894
+#: ../libempathy-gtk/empathy-chat.c:2885
 #, 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:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "L'utente %s è ora conosciuto come %s"
@@ -1705,85 +1705,85 @@ 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:3097 ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641
+#: ../src/empathy-call-window.c:2947 ../src/empathy-event-manager.c:1158
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3784
 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:3790
 msgid "Remember"
 msgstr "Ricorda"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3848
 msgid "Wrong password; please try again:"
 msgstr "Password errata. Provare nuovamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3987
+#: ../libempathy-gtk/empathy-chat.c:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Entra"
 
-#: ../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 "Connessi"
 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Identificatore sconosciuto o non valido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blocco del contatto momentaneamente non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blocco del contatto non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Permesso negato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Impossibile bloccare il contatto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Modifica contatti bloccati"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1483
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1793,23 +1793,23 @@ msgstr "Account:"
 msgid "Blocked Contacts"
 msgstr "Contatti bloccati"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Numero di telefono"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "Indirizzo email"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Sito web"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Birthday"
 msgstr "Compleanno"
 
@@ -1817,85 +1817,85 @@ msgstr "Compleanno"
 #. 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 "Ultima attività:"
 
-#: ../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 "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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Messaggio di assenza:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "lavoro"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "casa"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "cellulare"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "voce"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "preferito"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "postale"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "parcel"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Cerca contatti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Impossibile salvare l'immagine"
 
@@ -1944,11 +1944,11 @@ msgstr "Versione"
 msgid "Client"
 msgstr "Client"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../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."
@@ -1957,125 +1957,125 @@ msgstr ""
 "selezionarne più di uno oppure nessuno."
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
 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:383
 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:393
 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # (ndt) è un titolo...
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Blocca contatto"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Elimina e _blocca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2084,225 +2084,225 @@ 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Chiamata _audio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Chiamata _video"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Invia file"
 
 # (ndt) voce di menù
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Preferito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Informa_zioni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "Invito per questa stanza"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
 msgid "_Invite to Chat Room"
 msgstr "_Invita nella stanza"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "A_ggiungi contatto..."
 
-#: ../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 "Rimuovere veramente il gruppo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Rimozione gruppo"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "_Rinomina"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "Codice ISO del paese:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Stato:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Città:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Via:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 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:461
 msgid "Floor:"
 msgstr "Piano:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Testo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../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 "Livello di precisione:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Errore verticale (metri):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Errore orizzontale (metri):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Orientamento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Velocità di salita:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Longitudine:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Latitudine:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Altitudine:"
 
 # (ndt) nome della scheda
-#: ../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 "Posizione geografica"
 
 #. 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 "%-d %B %Y alle %H.%M UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 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:1501
 msgid "Identifier:"
 msgstr "Identificatore:"
 
 # (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../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"
@@ -2318,33 +2318,33 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Nuova rete"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Scegliere una rete IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Ripristina ele_nco reti"
 
 #
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleziona"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "nuovo 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 "
@@ -2354,11 +2354,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:100
 msgid "People nearby"
 msgstr "Persone nelle vicinanze"
 
-#: ../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."
@@ -2367,139 +2367,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:607
 msgid "History"
 msgstr "Cronologia"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Mostra"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversazione in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, 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:1367
 #, 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:1375
 #, 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:1706
 msgid "Today"
 msgstr "Oggi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 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:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "Chi"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "Qualsiasi cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "Testo conversazioni"
 
 # (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Chiamate"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "Chiamate in arrivo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "Chiamate in uscita"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "Chiamate perse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "Cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "Elimina tutto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "Elimina da:"
 
@@ -2521,7 +2521,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Conversazione"
 
@@ -2546,74 +2546,74 @@ msgstr "Che tipo di account è disponibile?"
 msgid "Adding 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"
 
@@ -2623,27 +2623,27 @@ msgstr "Nuova conversazione"
 #. 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 "Messaggio personalizzato..."
 
-#: ../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 "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:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2653,12 +2653,12 @@ 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:386
 msgid "Set status"
 msgstr "Imposta lo stato"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Messaggi personalizzati..."
 
@@ -2666,12 +2666,12 @@ msgstr "Messaggi personalizzati..."
 #. 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 "Nuovo account %s"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Maiuscole/minuscole"
 
@@ -2696,174 +2696,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:49
 msgid "Received an instant message"
 msgstr "Messaggio istantaneo ricevuto"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "Messaggio istantaneo inviato"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "Richiesta di conversazione in arrivo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Contatto connesso"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Connessi al server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Disconnessi dal server"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Chiamata vocale in arrivo"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Chiamata vocale in uscita"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Chiamata vocale terminata"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 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:1096
 #, 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:721
 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:1211
 #, 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:1913
 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:1078
 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:1202
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2872,7 +2872,7 @@ msgstr ""
 "%s di spazio libero sono richiesti per salvare questo file, ma sono "
 "disponibili solamente %s. Scegliere un'altra posizione."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "File in arrivo da parte di %s"
@@ -2900,198 +2900,198 @@ msgstr "Apri c_ollegamento"
 msgid "Inspect HTML"
 msgstr "Ispeziona HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "Arabo"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Baltico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "Cinese semplificato"
 
-#: ../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 "Cinese tradizionale"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "Cirillico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Cirillico/Russo"
 
-#: ../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 "Cirillico/Ucraino"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Greco"
 
-#: ../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 "Ebraico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Ebraico visuale"
 
-#: ../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 "Islandese"
 
-#: ../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 "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
+#: ../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 "Coreano"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nordico"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persiano"
 
-#: ../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 "Rumeno"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Sud europeo"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "Occidentale"
 
 # (ndt) suggerimento 
-#: ../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 "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: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:201
 #, 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 +3103,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 +3115,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 +3125,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 +3150,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Sono presenti delle modifiche non salvate per l'account %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Connessione..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, 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:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnessi — %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Fuori rete — Nessuna connessione di rete"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: ../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 "
@@ -3213,29 +3213,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:486
 msgid "Offline — Account Disabled"
 msgstr "Fuori rete — Account disabilitato"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Modifica parametri connessione"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Modifica parametri connessione..."
 
-#: ../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 "Rimuovere «%s» dal computer?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3244,25 +3244,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:1652
 msgid "_Enabled"
 msgstr "_Abilitato"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Rinomina"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Salta"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Connetti"
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../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?"
@@ -3271,7 +3271,7 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Account di messaggistica e VoIP"
 
@@ -3296,33 +3296,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:407
 msgid "Don't connect on startup"
 msgstr "Non connettere all'avvio"
 
 # (ndt) opzione
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "- Messaggistica istantanea Empathy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Errore nel contattare il gestore di account"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3334,107 +3334,107 @@ msgstr ""
 "account Telepathy:\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Chiamata in corso"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client audio/video Empathy"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Chiamata con %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 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: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 "Sconosciuto"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2945
 msgid "On hold"
 msgstr "In attesa"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2949
 msgid "Mute"
 msgstr "Muto"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2951
 msgid "Duration"
 msgstr "Durata"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2954
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d.%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3050
 msgid "Technical Details"
 msgstr "Dettagli tecnici"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3089
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3443,7 +3443,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:3094
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3452,7 +3452,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:3100
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3461,23 +3461,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:3106
 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:3110
 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:3113
 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:3125
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3488,32 +3488,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:3134
 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:3137
 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:3177
 msgid "Can't establish audio stream"
 msgstr "Impossibile stabilire il flusso audio"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3187
 msgid "Can't establish video stream"
 msgstr "Impossibile stabilire il flusso video"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3224
 #, 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:3228
 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:3230
 msgid "Top Up"
 msgstr "Ricarica"
 
@@ -3634,20 +3634,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:243
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Stanza"
 
 # (ndt) dovrebbe essere il nome di una colonna
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Connessione automatica"
 
@@ -3656,11 +3656,11 @@ msgstr "Connessione automatica"
 msgid "Manage Favorite Rooms"
 msgstr "Gestione stanze preferite"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "Chiudere la finestra?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3669,7 +3669,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3684,65 +3684,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "Uscire da %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 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:326
 msgid "Close window"
 msgstr "Chiudi finestra"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Lascia stanza"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, 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:680
 #, 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:696
 #, 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:705
 #, 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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, 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:970
 msgid "Typing a message."
 msgstr "Scrittura messaggio."
 
@@ -3807,75 +3807,75 @@ msgstr "Sposta scheda a _destra"
 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:1588
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Collegamento Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Risposta Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Invia a Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Livello "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Informazioni"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +3894,23 @@ msgstr ""
 "\"https://bugzilla.gnome.org/enter_bug.cgi?product=empathy\">segnalazione</"
 "a>."
 
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2051
 msgid "Time"
 msgstr "Orario"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Livello"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3918,71 +3918,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:500
 msgid "Incoming video call"
 msgstr "Chiamata video in arrivo"
 
-#: ../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 sta video-chiamando, rispondere?"
 
-#: ../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 sta chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "Ri_fiuta"
 
-#: ../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 "_Rispondi"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "Rispondi con _video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Invito in una stanza"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invito per entrare in %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 sta inviando un invito per entrare in %s"
 
 # (ndt) pulsante
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Password richiesta"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3992,105 +3992,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: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 "Sconosciuta"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 msgid "Error receiving a file"
 msgstr "Errore nel ricevere un file"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, 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:343
 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:482
 #, 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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "File «%s» inviato a %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Calcolo codice di controllo di «%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 "File"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Restante"
 
@@ -4106,11 +4106,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 +4119,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:296
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Stanza"
 
 # (ndt) titolo scheda
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Membri"
 
 # (ndt) un po' libera
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 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:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4178,17 +4178,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Sì"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Entra nella stanza"
 
@@ -4231,106 +4231,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:134
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Nuova conversazione"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Il contatto entra in rete"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Il contatto va fuori rete"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Account connesso"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Account disconnesso"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Lingua"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Giulietta"
 
 #. 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, Romeo, perché sei tu 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 "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:648
 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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "L'utente Giulietta si è disconnesso"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -4344,7 +4344,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:2226
 msgid "Contact List"
 msgstr "Elenco contatti"
 
@@ -4451,10 +4451,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
@@ -4528,91 +4527,91 @@ msgid "Themes"
 msgstr "Temi"
 
 # (ndt) pare tooltip... mah...
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Fornisce password"
 
 # (ndt) tooltip
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Disconnette"
 
-#: ../src/empathy-roster-window.c:493
+#: ../src/empathy-roster-window.c:478
 msgid "You need to setup an account to see contacts here."
 msgstr "È necessario configurare un account per poter visualizzare i contatti."
 
-#: ../src/empathy-roster-window.c:569
+#: ../src/empathy-roster-window.c:554
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "L'account «%s» non può essere utilizzato fino all'aggiornamento del software "
 "«%s»."
 
-#: ../src/empathy-roster-window.c: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 "L'account %s richiede l'autorizzazione"
 
 # (ndt) suggerimento
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Account online"
 
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Aggiorna software..."
 
 # (ndt) suggerimento
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Riconnette"
 
 # (ndt) suggerimento
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Modifica account"
 
 # (ndt) suggerimento
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Chiude"
 
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Ricarica account"
 
-#: ../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 "È necessario abilitare uno degli account per visualizzare i contatti."
 
 #. 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 "È necessario abilitare «%s» per visualizzare i contatti."
 
-#: ../src/empathy-roster-window.c:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Modificare la propria presenza per visualizzare i contatti"
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Nessun risultato"
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Non è stato aggiunto ancora alcun contatto"
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Nessun contatto collegato"
 
@@ -4714,12 +4713,12 @@ msgstr "Nuova c_hiamata..."
 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/nb.po b/po/nb.po
index 4130c9d0..598ad1b6 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.8.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-05-16 13:27+0200\n"
+"PO-Revision-Date: 2013-05-16 13:28+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"
@@ -479,259 +479,259 @@ msgid ""
 msgstr ""
 "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverføring fullført, men filen ble korrupt"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverføring støttes ikke av ekstern kontakt"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
-#: ../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 "Passordet ble ikke funnet"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Passord for lynmeldingskonto for %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, 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
+#: ../libempathy/empathy-time.c:92
 #, 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
+#: ../libempathy/empathy-time.c:98
 #, 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
+#: ../libempathy/empathy-time.c:104
 #, 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
+#: ../libempathy/empathy-time.c:110
 #, 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
+#: ../libempathy/empathy-time.c:116
 #, 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
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../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 "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: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 "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../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 "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../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 "Sertifikat ikke aktivert"
 
-#: ../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 "Feil vertsnavn i forhold til sertifikat"
 
-#: ../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 "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../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 "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
 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:342
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
 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:346
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 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:351
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -739,32 +739,32 @@ 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:355
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:671
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Alle kontoer"
 
@@ -843,56 +843,56 @@ msgstr "HVa er ditt AIM-passord?"
 msgid "Remember Password"
 msgstr "Husk passord"
 
-#: ../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 "Passord"
 
-#: ../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 "Tjener"
 
-#: ../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 "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
@@ -901,19 +901,19 @@ msgstr "Lag en ny konto på tjeneren"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, 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
+#: ../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 "Ny konto"
 
@@ -1136,32 +1136,32 @@ msgstr "Hva er din ID på Windows Live?"
 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
+#: ../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 "Register"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Alternativer"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Ingen"
 
@@ -1273,55 +1273,55 @@ msgstr "Hva er din Yahoo!-ID?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere bilde"
 
-#: ../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 "Ingen av de godkjente bildeformatene støttes av ditt system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke lagre bilde til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Velg personbilde"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Ta et bilde …"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Ingen bilde"
 
-#: ../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 filer"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Prøv igjen"
 
 #: ../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"
@@ -1330,72 +1330,72 @@ msgstr ""
 "Oppgi ditt passord for konto\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Velg …"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Velg"
 
-#: ../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:731
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "Ugyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1403,23 +1403,23 @@ msgstr ""
 "/part [<praterom-ID>] [<Ã¥rsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1429,11 +1429,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:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,126 +1441,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1568,12 +1568,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1581,17 +1581,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:2844
 #, 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:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1601,17 +1601,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: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 har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1619,82 +1619,82 @@ 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: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 "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 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:3790
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Bli med"
 
-#: ../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 "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Ukjent eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokkering av kontakter midlertidig utilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blokkering av kontakter er ikke tilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Kunne ikke blokkere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1704,120 +1704,120 @@ msgstr "Konto:"
 msgid "Blocked Contacts"
 msgstr "Blokkerte kontakter"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Fullt navn"
 
-#: ../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-postadresse"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Nettsted"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Sist sett:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Tjener:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Bortemelding:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "arbeid"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "hjemme"
 
-#: ../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 "tale"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "foretrukket"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "post"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "pakke"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Søk i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Søk: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "_Legg til kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Ingen kontakter funnet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
 #. 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 "Identifikator"
 
 #. 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 "Alias"
 
@@ -1851,11 +1851,11 @@ msgstr "Versjon"
 msgid "Client"
 msgstr "Klient"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../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."
@@ -1863,121 +1863,121 @@ 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:348
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../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 "Velg"
 
-#: ../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 "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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1986,218 +1986,218 @@ 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 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:1692
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../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 "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "Endre _navn"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "ISO-kode for land:"
 
-#: ../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 "Tilstand:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Postkode:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Etasje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../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 "Nøyaktighetsnivå:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Vertikal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Horisontal feil (meter):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Retning:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Klatrehastighet:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Sist oppdatert:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Lengdegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Altitude:"
 msgstr "Høyde:"
 
-#: ../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 "Sted"
 
 #. 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: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 "Identifikator:"
 
-#: ../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"
@@ -2212,32 +2212,32 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Nytt nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Velg et IRC-nettverk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Nullstill _nettverksliste"
 
-#: ../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 "Velg"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "ny tjener"
 
-#: ../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 "
@@ -2247,11 +2247,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:100
 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:115
 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 +2259,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:607
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, 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:1367
 #, 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:1375
 #, 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:1706
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 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:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "NÃ¥r"
 
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2409,7 +2409,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Prat"
 
@@ -2434,72 +2434,72 @@ msgstr "Hvilken type konto har du?"
 msgid "Adding new account"
 msgstr "Legger 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"
 
@@ -2509,26 +2509,26 @@ msgstr "Ny samtale"
 #. 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 "Egendefinert melding …"
 
-#: ../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 "Rediger egendefinerte meldinger …"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -2538,12 +2538,12 @@ 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:386
 msgid "Set status"
 msgstr "Sett status"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Egendefinerte meldinger …"
 
@@ -2551,12 +2551,12 @@ msgstr "Egendefinerte meldinger …"
 #. 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 "Ny %s-konto"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
@@ -2580,168 +2580,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:49
 msgid "Received an instant message"
 msgstr "Mottok en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Sent an instant message"
 msgstr "Send en lynmelding"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Incoming chat request"
 msgstr "Innkommende samtaleforespørsel"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Kontakt koblet til"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Kontakt koblet fra"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Koblet til tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Koblet fra tjener"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Innkommende samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Utgående samtale"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Samtale avsluttet"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 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:1096
 #, 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:721
 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:1211
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1824
+#: ../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 "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:1078
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2750,16 +2750,16 @@ 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:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
 
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 msgid "Go online to edit your personal information."
 msgstr "Rediger din personlige informasjon på nettet."
 
-#: ../libempathy-gtk/empathy-user-info.c:464
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "<b>Personlige detaljer</b>"
 
@@ -2778,197 +2778,197 @@ msgstr "_Åpne lenke"
 msgid "Inspect HTML"
 msgstr "Inspiser HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "Arabisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Baltisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "Forenklet kinesisk"
 
-#: ../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 "Tradisjonell kinesisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "Kyrillisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Kyrillisk/Russisk"
 
-#: ../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 "Kyrillisk/Ukrainsk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Gresk"
 
-#: ../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 "Hebraisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Visuell hebraisk"
 
-#: ../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 "Islandsk"
 
-#: ../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 "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
+#: ../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 "Koreansk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Nordisk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Persisk"
 
-#: ../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 "Rumensk"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Sør-Europeisk"
 
-#: ../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 "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
+#: ../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 "Vestlig"
 
-#: ../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 "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: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:201
 #, 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 +2980,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 +2991,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 +3001,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 +3013,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../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 "
@@ -3086,28 +3086,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:486
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "R_ediger parametere for tilkoblingen …"
 
-#: ../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 "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3116,24 +3116,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:1652
 msgid "_Enabled"
 msgstr "Slått _på"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Endre navn"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Hopp over"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Koble til"
 
-#: ../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?"
@@ -3142,7 +3142,7 @@ 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:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Meldings- og VoIP-kontoer"
 
@@ -3166,31 +3166,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:407
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3203,111 +3203,105 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "I en samtale"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-call-window.c:1555 ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-call-window.c:2181
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 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: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 "Ukjent"
 
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "PÃ¥ vent"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2967
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3066
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-call-window.c:3105
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3316,7 +3310,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:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3325,7 +3319,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:3101
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3334,25 +3328,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:3107
 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:3111
 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:3114
 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:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3363,32 +3357,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:3135
 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:3138
 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:3178
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
-#: ../src/empathy-call-window.c:3203
+#: ../src/empathy-call-window.c:3188
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
-#: ../src/empathy-call-window.c:3240
+#: ../src/empathy-call-window.c:3225
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3229
 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:3231
 msgid "Top Up"
 msgstr "Fyll opp"
 
@@ -3504,19 +3498,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:243
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Rom"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Koble til automatisk"
 
@@ -3524,11 +3518,11 @@ msgstr "Koble til automatisk"
 msgid "Manage Favorite Rooms"
 msgstr "HÃ¥ndter favorittrom"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "Lukk dette vinduet?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -3537,7 +3531,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3552,12 +3546,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "Forlat %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -3565,54 +3559,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:326
 msgid "Close window"
 msgstr "Lukk vindu"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Forlat rom"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, 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:680
 #, 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:696
 #, 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:705
 #, 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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, 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:970
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3676,77 +3670,77 @@ msgstr "Flytt fane til høy_re"
 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:1588
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Lenke til Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Svar fra Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Send til Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:2002 ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +3758,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:2051
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 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:500
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../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 ringer deg med video. Vil du svare?"
 
-#: ../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 ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "Av_vis"
 
-#: ../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 "Sv_ar"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, 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:713
 #, 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:726
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3860,105 +3854,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: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 "Ukjent"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 msgid "Error receiving a file"
 msgstr "Feil ved mottak av en fil"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, 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:343
 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:482
 #, 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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "«%s» sendt til %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher «%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 "Fil"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Gjenstår"
 
@@ -3970,59 +3964,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:296
 msgid "Import"
 msgstr "Importer"
 
-#: ../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 "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:184
 msgid "Chat Room"
 msgstr "Samtalerom"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Medlemmer"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Klarte ikke å vise rom"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4035,17 +4029,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "Nei"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Bli med i rom"
 
@@ -4088,104 +4082,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:134
 msgid "Message received"
 msgstr "Melding mottatt"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Kontakt kobler fra"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Konto koblet til"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Konto koblet fra"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Juliet"
 
 #. 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, 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 "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4197,7 +4191,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:2226
 msgid "Contact List"
 msgstr "Kontaktliste"
 
@@ -4362,84 +4356,84 @@ msgstr "Variant:"
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../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 "Du må sette opp en konto for å se kontakter her."
 
-#: ../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 "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-roster-window.c:669
+#: ../src/empathy-roster-window.c:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
-#: ../src/empathy-roster-window.c:673
+#: ../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:688
+#: ../src/empathy-roster-window.c:674
 #, c-format
 msgid "%s account requires authorisation"
 msgstr "%s-konto krever autorisering"
 
-#: ../src/empathy-roster-window.c:699
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Kontoer på nettet"
 
-#: ../src/empathy-roster-window.c:746
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:752
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:756
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Rediger konto"
 
-#: ../src/empathy-roster-window.c:761
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:903
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Fyll opp konto"
 
-#: ../src/empathy-roster-window.c:1589
+#: ../src/empathy-roster-window.c:1575
 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:1583
 #, 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:1661
 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:1670
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:1691
+#: ../src/empathy-roster-window.c:1677
 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:1680
 msgid "No online contacts"
 msgstr "Ingen kontakter tilkoblet"
 
@@ -4536,12 +4530,12 @@ msgstr "Ny _samtale …"
 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/sk.po b/po/sk.po
index 364444e5..7bc064be 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-05-24 14:02+0000\n"
+"PO-Revision-Date: 2013-05-08 12:34+0100\n"
 "Last-Translator: Pavol Klačanský <pavol@klacansky.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -598,82 +598,82 @@ msgstr ""
 "Či má Empathy znížiť presnosť určenia polohy z dôvodu ochrany súkromia."
 
 # Chyby ktoré vzniknú zmenou stavu
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Nebol špecifikovaný žiaden dôvod"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Bola vyžiadaná zmena stavu"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Zrušili ste prenos súboru"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Druhý účastník zrušil prenos súboru"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Chyba počas pokusu o prenos súboru"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos súboru bol dokončený, ale súbor bol poškodený"
 
 # znie to viac slovensky
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Vzdialený kontakt nepodporuje prenos súboru"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Vybraný súbor nie je obyčajný súbor"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Vybraný súbor je prázdny"
 
-#: ../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 "Heslo sa nenašlo"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Heslo pre účet internetovej komunikácie %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -681,7 +681,7 @@ msgstr[0] "pred %d sekundami"
 msgstr[1] "pred %d sekundou"
 msgstr[2] "pred %d sekundami"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -689,7 +689,7 @@ msgstr[0] "pred %d minútami"
 msgstr[1] "pred %d minútou"
 msgstr[2] "pred %d minútami"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -697,7 +697,7 @@ msgstr[0] "pred %d hodinami"
 msgstr[1] "pred %d hodinou"
 msgstr[2] "pred %d hodinami"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -705,7 +705,7 @@ msgstr[0] "pred %d dňami"
 msgstr[1] "pred %d dňom"
 msgstr[2] "pred %d dňami"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -713,7 +713,7 @@ 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
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -721,175 +721,175 @@ msgstr[0] "pred %d mesiacmi"
 msgstr[1] "pred %d mesiacom"
 msgstr[2] "pred %d mesiacmi"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "v budúcnosti"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Prítomný"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Preč"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Neviditeľný"
 
 # stav prítomnosti
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Odhlásený"
 
 # stav prítomnosti
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznámy"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 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:269 ../libempathy/empathy-utils.c:325
 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: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 "Chyba siete"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 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:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Chyba Å¡ifrovania"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 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:279 ../libempathy/empathy-utils.c:311
 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:281 ../libempathy/empathy-utils.c:313
 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:283 ../libempathy/empathy-utils.c:315
 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:285 ../libempathy/empathy-utils.c:317
 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:287 ../libempathy/empathy-utils.c:319
 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:289 ../libempathy/empathy-utils.c:321
 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:291 ../libempathy/empathy-utils.c:323
 msgid "Certificate self-signed"
 msgstr "Certifikát podpísaný sám sebou"
 
 # status reason message
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Chyba certifikátu"
 
 # error
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "Šifrovanie nie je dostupné"
 
 # error
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "Certifikát je neplatný"
 
 # error
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Spojenie bolo zamietnuté"
 
 # error
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "Spojenie sa nedá vytvoriť"
 
 # error
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Spojenie bolo prerušené"
 
 # error
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
 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:342
 msgid "The account already exists on the server"
 msgstr "Účet už na serveri existuje"
 
 # error
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
 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:346
 msgid "Certificate has been revoked"
 msgstr "Certifikát mal zrušenú platnosť"
 
 # error
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
 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:351
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -898,38 +898,38 @@ msgstr ""
 "hranice vynútené kryptografickou knižnicou"
 
 # error
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:355
 msgid "Your software is too old"
 msgstr "Váš softvér je príliš zastaralý"
 
 # error
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
 # protocol name
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Ľudia v okolí"
 
 # protocol name
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
 # service name
-#: ../libempathy/empathy-utils.c:538 ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
 # service name
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Všetky účty"
 
@@ -1019,66 +1019,66 @@ msgid "Remember Password"
 msgstr "Zapamätať heslo"
 
 # hash table
-#: ../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 "Účet"
 
 # hash table
-#: ../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 "Heslo"
 
 # hash table
-#: ../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"
 
 # hash table
-#: ../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"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-#: ../libempathy-gtk/empathy-account-widget.c:762
+#: ../libempathy-gtk/empathy-account-widget.c:755
 #, c-format
 msgid "%s"
 msgstr "%s"
 
 # * https://bugzilla.gnome.org/show_bug.cgi?id=694486
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
 # gtk_label
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
 msgid "Username:"
 msgstr "Používateľské meno:"
 
 # gtk_button
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "Po_užiť"
 
 # gtk_button
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "_Prihlásiť sa"
 
 # gtk_radio_button
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 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
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Vytvoriť na serveri nový účet"
 
@@ -1090,19 +1090,19 @@ msgstr "Vytvoriť na serveri nový účet"
 #. * 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 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
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "Účet %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Nový účet"
 
@@ -1378,42 +1378,42 @@ msgstr "Aké je vaše heslo pre Windows Live?"
 #  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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Automaticky"
 
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
 msgid "UDP"
 msgstr "UDP"
 
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
 msgid "TCP"
 msgstr "TCP"
 
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Options"
 
 # gtk_list_store
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Žiadne"
 
@@ -1552,63 +1552,63 @@ msgstr "Aký je váš identifikátor pre Yahoo!?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Nepodarilo sa previesť obrázok"
 
-#: ../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 ""
 "Žiadny z prípustných formátov obrázkov nie je podporovaný vo vašom systéme"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Výber obrázka podobizne"
 
 # button
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Odfotografovať…"
 
 # button
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Bez obrázka"
 
 # file filter name
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Obrázky"
 
 # file filter name
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Všetky súbory"
 
 # tooltip
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Opakovať"
 
 #: ../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"
@@ -1618,85 +1618,85 @@ msgstr ""
 "<b>%s</b>"
 
 # button
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Vybrať…"
 
 # button
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Vybrať"
 
 # 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:731
 msgid "Failed to open private chat"
 msgstr "Zlyhalo otvorenie súkromného rozhovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:798
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "Neplatný identifikátor kontaktu"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1705,27 +1705,27 @@ msgstr ""
 "miestnosť, predvolene aktuálnu"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1075
 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:1078
 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:1081
 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:1084
 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: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 "
@@ -1736,12 +1736,12 @@ msgstr ""
 "vstúpenie do novej diskusnej miestnosti“"
 
 # chat command item
-#: ../libempathy-gtk/empathy-chat.c:1101
+#: ../libempathy-gtk/empathy-chat.c:1092
 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:1095
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1750,107 +1750,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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Použitie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1168
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Neznámy príkaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1294
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "neschopný"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "odpojený"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "neplatný kontakt"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "prístup zamietnutý"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "príliš dlhá správa"
 
 # chat_send_error
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1613
 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:1617
 msgid "unknown"
 msgstr "neznáma"
 
-#: ../libempathy-gtk/empathy-chat.c:1693 ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Téma:"
 
 # %s priv->subject
-#: ../libempathy-gtk/empathy-chat.c:1708
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, 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:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Nebola nastavená žiadna téma"
 
 # gtk_menu_item
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2222
 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:2290
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Pridať „%s“ do slovníka"
@@ -1859,35 +1859,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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Poslať"
 
 # gtk_image_menu_item
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2481
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "_Návrhy kontroly pravopisu"
 
-#: ../libempathy-gtk/empathy-chat.c:2592
+#: ../libempathy-gtk/empathy-chat.c:2583
 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:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "Účastník %s sa odpojil"
@@ -1896,13 +1896,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "Účastník %s bol vykopnutý"
@@ -1911,19 +1911,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:2844
 #, 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:2847
 #, 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:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "Účastník %s opustil miestnosť"
@@ -1933,17 +1933,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: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 "Účastník %s vstúpil do miestnosti"
 
-#: ../libempathy-gtk/empathy-chat.c:2919
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Účastník %s je teraz známy ako %s"
@@ -1951,96 +1951,96 @@ 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: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 "Odpojený"
 
 # label
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3793
+#: ../libempathy-gtk/empathy-chat.c:3784
 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:3790
 msgid "Remember"
 msgstr "Zapamätať"
 
 # button
-#: ../libempathy-gtk/empathy-chat.c:3809
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Teraz nie"
 
 # label
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Vstúpiť"
 
-#: ../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 "Pripojený"
 
 # empathy_chat_dup_name 
-#: ../libempathy-gtk/empathy-chat.c:4261
+#: ../libempathy-gtk/empathy-chat.c:4246
 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:4251
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
 # label
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261
 msgid "Unknown or invalid identifier"
 msgstr "Neznámy alebo neplatný identifikátor"
 
 # label
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokovanie kontaktu je dočasne nedostupné"
 
 # label
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blokovanie kontaktu je nedostupné"
 
 # label
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Prístup zamietnutý"
 
 # label
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Nepodarilo sa zablokovať kontakt"
 
 # windows title
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -2052,27 +2052,27 @@ msgid "Blocked Contacts"
 msgstr "Zablokované kontakty"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Celé meno"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Telefónne číslo"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "Emailová adresa"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Webová stránka"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 msgid "Birthday"
 msgstr "Narodeniny"
 
@@ -2080,100 +2080,100 @@ msgstr "Narodeniny"
 #. 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 "Naposledy videný:"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Server:"
 
 # info_field_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Správa pri odchode:"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "pracovný"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "domov"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "mobilný"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "hlasový"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "prednostný"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "poštový"
 
 # info_parameter_data
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "doručovací"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Hľadanie kontaktov"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Hľadať: "
 
 # button
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "_Pridať kontakt"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Nenašiel sa žiadny kontakt"
 
 # label
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 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:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Podobizeň sa nedá uložiť"
 
@@ -2181,14 +2181,14 @@ msgstr "Podobizeň sa nedá uložiť"
 #. 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 "Identifikátor"
 
 # GtkLabel
 #. 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 "Prezývka"
 
@@ -2230,12 +2230,12 @@ msgid "Client"
 msgstr "Klient"
 
 # label
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 msgid "Groups"
 msgstr "Skupiny"
 
 # label
-#: ../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."
@@ -2244,47 +2244,47 @@ msgstr ""
 "jednu skupinu alebo nevybrať žiadnu skupinu."
 
 # button
-#: ../libempathy-gtk/empathy-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
 msgid "_Add Group"
 msgstr "_Pridať skupinu"
 
 #  treeviewcolumn
-#: ../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 "Vybrať"
 
 #  treeviewcolumn
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 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 +2292,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 +2308,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 +2333,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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
@@ -2341,12 +2341,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:344
 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:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:20
 msgid "Call"
@@ -2354,38 +2354,38 @@ msgstr "Hovor"
 
 # Call %s (%s); second %s
 # phone type
-#: ../libempathy-gtk/empathy-individual-menu.c:422
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
 # Call %s (%s); second %s
 # phone type
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 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:417
 msgid "HOME"
 msgstr "Domov"
 
 # gtk_check_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "Za_blokovať kontakt"
 
 # button
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Odstrániť a za_blokovať"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2395,69 +2395,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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvukový hovor"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 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:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Poslať súbor"
 
 # gtk_image_menu_item
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Obľúbený"
 
 # gtk_check_menu_item;
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "_Informácie"
 
 # gtk_check_menu_item;
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Upraviť"
@@ -2465,190 +2465,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:1646
+#: ../src/empathy-chat-window.c:1233
 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:1692
 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:1888
 msgid "_Add Contact…"
 msgstr "_Pridať kontakt…"
 
-#: ../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 "Naozaj chcete odstrániť skupinu „%s“?"
 
 # dialog title
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Odstránenie skupiny"
 
 # gtk_menu_item
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "P_remenovať"
 
 # label
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanály:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 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:447
 msgid "Country:"
 msgstr "Krajina:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Štát:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Mesto:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Oblasť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "PSČ:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Ulica:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Budova:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Poschodie:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Miestnosť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Text:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Popis:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "URI:"
 msgstr "URI:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Accuracy Level:"
 msgstr "Stupeň presnosti:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Chyba:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 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:477
 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:479
 msgid "Speed:"
 msgstr "Rýchlosť:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Azimut:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 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:485
 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:487
 msgid "Longitude:"
 msgstr "Zemepisná dĺžka:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Zemepisná šírka:"
 
 # location_key_to_label
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 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:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../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:600
 #, c-format
 msgid "%s, %s"
 msgstr "%s dňa %s"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 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:1292
 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:1501
 msgid "Identifier:"
 msgstr "Identifikátor:"
 
-#: ../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"
@@ -2666,38 +2666,38 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Nová sieť"
 
 # window title
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Výber siete IRC"
 
 # button
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:621
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Obnoviť zoznam _sietí"
 
 # button
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:625
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
 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
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "nový server"
 
 # niekde v nejakej tabuľke
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:547
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:534
 msgid "SSL"
 msgstr "SSL"
 
 # label
-#: ../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 "
@@ -2707,12 +2707,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:100
 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:115
 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 +2721,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:607
 msgid "History"
 msgstr "História"
 
 # label
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Zobraziť"
 
 # label
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Rozhovor v miestnosti %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1331
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e. %B %Y"
@@ -2754,19 +2754,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:1274
 #, 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:1280
 #, 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:1355
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2774,7 +2774,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:1362
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2782,83 +2782,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:1370
 #, 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:1701
 msgid "Today"
 msgstr "Dnes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1705
 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:1720
 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:1824
+#: ../libempathy-gtk/empathy-log-window.c:3447
 msgid "Anytime"
 msgstr "Hocikedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1923
+#: ../libempathy-gtk/empathy-log-window.c:2382
 msgid "Anyone"
 msgstr "VÅ¡etci"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2695
 msgid "Who"
 msgstr "Kto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2904
 msgid "When"
 msgstr "Kedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3022
 msgid "Anything"
 msgstr "VÅ¡etko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3024
 msgid "Text chats"
 msgstr "Textové rozhovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3025
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Incoming calls"
 msgstr "Prichádzajúce hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3030
 msgid "Outgoing calls"
 msgstr "Odchádzajúce hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3031
 msgid "Missed calls"
 msgstr "Zmeškané hovory"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "What"
 msgstr "Čo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3740
 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:3744
 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:3751
 msgid "Delete from:"
 msgstr "Odstrániť z:"
 
@@ -2885,7 +2885,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Rozhovor"
 
@@ -2916,84 +2916,84 @@ msgid "Adding 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"
 
@@ -3005,29 +3005,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:157
+#: ../libempathy-gtk/empathy-presence-chooser.c:193
 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:210
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
 msgid "Edit Custom Messages…"
 msgstr "Upraviť vlastné správy…"
 
 # tooltip
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
@@ -3038,13 +3038,13 @@ msgstr ""
 "Esc.</i></small>"
 
 # tooltip
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:386
 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:1094
 msgid "Custom messages…"
 msgstr "Vlastné správy…"
 
@@ -3052,13 +3052,13 @@ msgstr "Vlastné správy…"
 #. 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 "Nový účet %s"
 
 # gtk_check_menu_item
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Rozlišovať veľkosť"
 
@@ -3089,197 +3089,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:49
 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:51
 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:53
 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:55
 msgid "Contact connected"
 msgstr "Kontakt sa pripojil"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Kontakt sa odpojil"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Pripojenie k serveru"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Disconnected from server"
 msgstr "Odpojenie od servera"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Incoming voice call"
 msgstr "Prichádzajúci hovor"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Odchádzajúci hovor"
 
 # sound_entries
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 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:294
 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:1096
 #, 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:721
 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:1211
 #, 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:1913
 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:1078
 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:1202
 msgid "Select a file"
 msgstr "Výber súboru"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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:1284
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3288,18 +3288,18 @@ 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:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prichádzajúci súbor od kontaktu %s"
 
 # label
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
 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
+#: ../libempathy-gtk/empathy-user-info.c:475
 msgid "<b>Personal Details</b>"
 msgstr "<b>Osobné údaje</b>"
 
@@ -3319,198 +3319,198 @@ msgid "Inspect HTML"
 msgstr "Preskúmať HTML"
 
 # PM: podľa dohody v ML treba zmeniť
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "Arabské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "Baltské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "Čínske - zjednodušené"
 
-#: ../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 "Čínske - tradičné"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "Cyrilika"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "Cyrilika/Ruské"
 
-#: ../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 "Cyrilika/Ukrajinské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "Grécke"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "Gudžarátske"
 
-#: ../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 "Hebrejské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "Hebrejské vizuálne"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "Hindské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 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
+#: ../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 "Kórejské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "Škandinávske"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "Perzské"
 
-#: ../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 "Rumunské"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "Juhoeurópske"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "Západné"
 
-#: ../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 "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
+#: ../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:201
 #, 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 +3523,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 +3535,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 +3545,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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Vo vašom účte %s 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:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Pripája sa…"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Odhlásený — %s"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Odpojený — %s"
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 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:459
 msgid "Unknown Status"
 msgstr "Neznámy stav"
 
 # status infobar message
-#: ../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 "
@@ -3642,30 +3642,30 @@ msgstr ""
 "reláciu aby sa účet premigroval."
 
 # status infobar message
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:486
 msgid "Offline — Account Disabled"
 msgstr "Odhlásený — Zablokovaný účet"
 
 # window title
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Úprava parametrov pripojenia"
 
 # button
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Upraviť parametre pripojenia…"
 
-#: ../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 "Naozaj chcete odstrániť účet %s z vášho počítača?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3674,26 +3674,26 @@ msgstr ""
 "Naozaj chcete pokračovať?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1668
+#: ../src/empathy-accounts-dialog.c:1652
 msgid "_Enabled"
 msgstr "_Povolený"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Premenovať"
 
 # button
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "_Preskočiť"
 
 # button
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "P_ripojiť"
 
-#: ../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?"
@@ -3703,7 +3703,7 @@ msgstr ""
 
 # window title
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Rozhovory a účty VoIP"
 
@@ -3732,36 +3732,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:407
 msgid "Don't connect on startup"
 msgstr "Nepripojí sa po spustení"
 
 # cmd desc
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "- Klient Empathy pre rýchle správy"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Chyba pri spájaní sa so Správcom účtov"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3775,119 +3775,119 @@ msgstr ""
 "%s"
 
 # Správa pre dbus potlačenie spánku
-#: ../src/empathy-call.c:124
+#: ../src/empathy-call.c:115
 msgid "In a call"
 msgstr "Prebieha hovor"
 
 # g_option_context
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- Klient Empathy pre zvukový hovor a videohovor"
 
 # application_name
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 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:1539 ../src/empathy-event-manager.c:905
 #, 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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Hovor s kontaktom %s"
 
 # candidate_type
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 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: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 "Neznámy"
 
 # status
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "Podržaný"
 
 # status   
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Stlmený"
 
 # status
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "Trvanie"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d min %02d s"
 
 # expander
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Technické podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3896,7 +3896,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:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3905,7 +3905,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:3101
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3914,23 +3914,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:3107
 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:3111
 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:3114
 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:3126
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3941,32 +3941,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:3135
 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:3138
 msgid "The end of the stream was reached"
 msgstr "Bol dosiahnutý koniec streamu"
 
-#: ../src/empathy-call-window.c:3198
+#: ../src/empathy-call-window.c:3178
 msgid "Can't establish audio stream"
 msgstr "Audio spojenie sa nedá nadviazať"
 
-#: ../src/empathy-call-window.c:3208
+#: ../src/empathy-call-window.c:3188
 msgid "Can't establish video stream"
 msgstr "Video spojenie sa nedá nadviazať"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3225
 #, 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:3229
 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:3231
 msgid "Top Up"
 msgstr "Dobiť"
 
@@ -4111,22 +4111,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:243
 msgid "Name"
 msgstr "Názov"
 
 # gtk_tree_view_column
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Miestnosť"
 
 # gtk_tree_view_column
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Pripojiť sa automaticky"
 
@@ -4135,11 +4135,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:275
 msgid "Close this window?"
 msgstr "Zavrieť toto okno?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:281
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
@@ -4148,7 +4148,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:294
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -4166,12 +4166,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:305
 #, c-format
 msgid "Leave %s?"
 msgstr "Opustiť diskusnú miestnosť %s?"
 
-#: ../src/empathy-chat-window.c:319
+#: ../src/empathy-chat-window.c:307
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
@@ -4180,16 +4180,16 @@ msgstr ""
 "nej znovu nevstúpite."
 
 # button
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Close window"
 msgstr "Zavrieť okno"
 
 # button
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Opustiť miestnosť"
 
-#: ../src/empathy-chat-window.c:677 ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -4198,7 +4198,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:680
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -4207,7 +4207,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:696
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -4215,7 +4215,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:705
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -4224,12 +4224,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:942
 msgid "SMS:"
 msgstr "SMS:"
 
 # tooltip
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -4238,7 +4238,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:970
 msgid "Typing a message."
 msgstr "Píše správu."
 
@@ -4319,89 +4319,89 @@ 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:1588
 msgid "Save"
 msgstr "Uložiť"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Odkaz na pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Odpoveď z pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Okno ladenia"
 
 # gtk_tool_button
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Poslať na pastebin"
 
 # gtk_tool_button
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Pozastaviť"
 
 # label
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Úroveň"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Ladenie"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 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:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Správa"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Upozornenie"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Kritická"
 
 # gtk_list_store
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Chyba"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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 +4419,100 @@ msgstr ""
 "cgi?product=empathy\">hlásenia o chybe</a>."
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2062
+#: ../src/empathy-debug-window.c:2051
 msgid "Time"
 msgstr "Čas"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Doména"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Kategória"
 
 # gtk_tree_view
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 msgid "Level"
 msgstr "Úroveň"
 
-#: ../src/empathy-debug-window.c:2100
+#: ../src/empathy-debug-window.c:2089
 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:500
 msgid "Incoming video call"
 msgstr "Prichádzajúci videohovor"
 
-#: ../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 vám volá. Chcete prijať videohovor?"
 
-#: ../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 vám volá. Chcete prijať hovor?"
 
 # button
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "_Odmietnuť"
 
 # button
-#: ../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 "_Prijať"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Prijať a zapnúť video"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Pozvanie do miestnosti"
 
 # window title
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, 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:713
 #, 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:726
 msgid "_Join"
 msgstr "_Vstúpiť"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Vyžaduje sa heslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -4522,108 +4522,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: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 "0:%02u:%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:172
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 msgid "Error receiving a file"
 msgstr "Chyba pri prijímaní súboru"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, 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:343
 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:482
 #, 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:487
 #, 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:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, 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:1019
 msgid "%"
 msgstr "%"
 
 # gtk_tree_view
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1031
 msgid "File"
 msgstr "Súbor"
 
 # gtk_tree_view
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Zostáva"
 
@@ -4638,11 +4638,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 +4651,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:296
 msgid "Import"
 msgstr "Importovať"
 
 # column name
 # gtk_tree_view
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protokol"
 
 # column name
 # gtk_tree_view
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Diskusná miestnosť"
 
 # gtk_tree_view
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Účastníci"
 
 # label
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Zlyhalo vypísanie miestností"
 
 # tooltip
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:429
 #, c-format
 msgid ""
 "%s\n"
@@ -4718,18 +4718,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Áno"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "Nie"
 
 # window title
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 msgid "Join Room"
 msgstr "Vstup do miestnosti"
 
@@ -4780,116 +4780,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:134
 msgid "Message received"
 msgstr "Prijatá správa"
 
 # sound_entries
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Odoslaná správa"
 
 # sound_entries
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Nová konverzácia"
 
 # sound_entries
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Kontakt sa prihlásil"
 
 # sound_entries
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Kontakt sa odpojil"
 
 # sound_entries
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Účet pripojený"
 
 # sound_entries
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Účet odpojený"
 
 # gtk_tree_view
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Jazyk"
 
 #. 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 "Rómeo"
 
 #. 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 "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:645
 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:648
 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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "Kontakt Júlia sa odpojil"
 
 # window title
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Nastavenia"
 
@@ -4904,7 +4904,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:2226
 msgid "Contact List"
 msgstr "Zoznam kontaktov"
 
@@ -5110,94 +5110,94 @@ 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:229
 msgid "Provide Password"
 msgstr "Otvorí okno na poskytnutie hesla"
 
 #  tooltip
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 msgid "Disconnect"
 msgstr "Odpojí"
 
-#: ../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 "Aby ste tu videli kontakty, musíte nastaviť účet."
 
-#: ../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 ""
 "Prepáčte, %s účty nemôžu byt používané pokým nebude aktualizovaný softvér %s."
 
 # service name
-#: ../src/empathy-roster-window.c:670
+#: ../src/empathy-roster-window.c:655
 msgid "Windows Live"
 msgstr "Windows Live"
 
 # service name
-#: ../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 "Účet %s vyžaduje potvrdenie prístupu"
 
 # tooltip
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Online účty"
 
 # button
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Aktualizovať softvér…"
 
 # tooltip
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Obnoví spojenie"
 
 # tooltip
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Otvorí okno na úpravu účtu"
 
 # tooltip
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Zavrie"
 
 # tooltip
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Dobije kredit na účte"
 
-#: ../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 "Aby ste tu videli kontakty musíte povoliť jeden z vašich účtov."
 
 #. 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 "Aby ste tu videli kontakty musíte povoliť %s účet."
 
-#: ../src/empathy-roster-window.c:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Prihláste sa aby ste tu videli kontakty"
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Nenájdená žiadna zhoda"
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Nepridali ste ešte žiadny kontakt"
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Žiadne prihlásené kontakty"
 
@@ -5318,12 +5318,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 +5336,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 5ed53f8b..559fc97e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,16 +9,18 @@
 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-05-03 16:15+0000\n"
+"PO-Revision-Date: 2013-05-04 21:08+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,87 +491,86 @@ 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
+#: ../libempathy/empathy-ft-handler.c:732
 msgid "No reason was specified"
 msgstr "Ni navedenega vzroka"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
 msgid "The change in state was requested"
 msgstr "Zahtevana je bila zamenjava stanja"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "You canceled the file transfer"
 msgstr "Prenos datoteke ste preklicali"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The other participant canceled the file transfer"
 msgstr "Drug uporabnik je preklical prenos datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "Error while trying to transfer the file"
 msgstr "Prišlo je do napake med prenosom datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
 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:750 ../libempathy/empathy-utils.c:295
 msgid "Unknown reason"
 msgstr "Neznan vzrok"
 
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je končan, vendar je datoteka pokvarjena"
 
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
 msgid "File transfer not supported by remote contact"
 msgstr "Prenos datotek s strani oddaljenega stika ni podprt"
 
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
 msgid "The selected file is not a regular file"
 msgstr "Izbrana datoteka ni običajna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
-#: ../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 "Gesla ni mogoče najti"
 
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
 #, c-format
 msgid "IM account password for %s (%s)"
 msgstr "Geslo računa hipnega sporočanja za %s (%s)"
 
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
 #, 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
+#: ../libempathy/empathy-time.c:86
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -522,7 +579,7 @@ msgstr[1] "Pred %d sekundo"
 msgstr[2] "Pred %d sekundama"
 msgstr[3] "Pred %d sekundami"
 
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -531,7 +588,7 @@ msgstr[1] "Pred %d minuto"
 msgstr[2] "Pred %d minutama"
 msgstr[3] "Pred %d minutami"
 
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -540,7 +597,7 @@ msgstr[1] "Pred %d uro"
 msgstr[2] "Pred %d urama"
 msgstr[3] "Pred %d urami"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -549,7 +606,7 @@ msgstr[1] "Pred %d dnevom"
 msgstr[2] "Pred %d dnevoma"
 msgstr[3] "Pred %d dnevi"
 
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -558,7 +615,7 @@ msgstr[1] "Pred %d tednom"
 msgstr[2] "Pred %d tednoma"
 msgstr[3] "Pred %d tedni"
 
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -567,180 +624,175 @@ msgstr[1] "Pred %d mesecem"
 msgstr[2] "Pred %d mesecema"
 msgstr[3] "Pred %d meseci"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:138
 msgid "in the future"
 msgstr "v prihodnosti"
 
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
 msgid "No reason specified"
 msgstr "Ni določenega razloga"
 
-#: ../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 "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: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 "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:284
-#: ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:286
-#: ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
 msgid "Encryption error"
 msgstr "Napaka Å¡ifriranja"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../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 "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:292
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:294
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../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 "Potrdilo ni potrjeno"
 
-#: ../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 "Neustrezno potrdilo gostitelja"
 
-#: ../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 "Neustrezen prstni odtis potrdila"
 
-#: ../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 "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption is not available"
 msgstr "Å ifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
 msgid "Connection can't be established"
 msgstr "Povezave ni mogoče vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
 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:339
+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:342
 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:344
 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:346
 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:348
+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: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 ""
+"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:355
 msgid "Your software is too old"
 msgstr "Programska oprema je prestara"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
 msgid "Internal error"
 msgstr "Notranja napaka"
 
-#: ../libempathy/empathy-utils.c:497
-#: ../libempathy-gtk/empathy-roster-model.h:30
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
 msgid "People Nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:538
-#: ../src/empathy-roster-window.c:672
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:528
 msgid "Facebook Chat"
 msgstr "Facebook klepetanje"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
 msgid "All accounts"
 msgstr "Vsi računi"
 
@@ -819,56 +871,56 @@ msgstr "Kakšno je vaše geslo AIM?"
 msgid "Remember Password"
 msgstr "Zapomni si geslo"
 
-#: ../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 "Račun"
 
-#: ../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 "Geslo"
 
-#: ../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 "Strežnik"
 
-#: ../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 "Vrata"
 
-#: ../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 "Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "A_pply"
 msgstr "_Uveljavi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
 msgid "L_og in"
 msgstr "_Prijava"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
 msgid "This account already exists on the server"
 msgstr "Ta račun na strežniku že obstaja"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
 msgid "Create a new account on the server"
 msgstr "Ustvari nov račun na strežniku"
 
@@ -877,19 +929,19 @@ msgstr "Ustvari nov račun na strežniku"
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
 #, 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
+#: ../libempathy-gtk/empathy-account-widget.c:2281
 #, c-format
 msgid "%s Account"
 msgstr "%s račun"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
 msgid "New account"
 msgstr "Nov račun"
 
@@ -968,8 +1020,12 @@ 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."
+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"
@@ -1004,11 +1060,13 @@ 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."
+"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."
+"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?"
@@ -1106,32 +1164,32 @@ msgstr "Kakšen je vaš ID Windows Live?"
 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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
 msgid "Auto"
 msgstr "Samodejno"
 
-#: ../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 "Vpiši se"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "None"
 msgstr "Brez"
 
@@ -1243,55 +1301,55 @@ msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
 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
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
 msgid "Couldn't convert image"
 msgstr "Ni bilo mogoče pretvoriti slike"
 
-#: ../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 "Vaš sistem ne podpira nobene izmed sprejetih vrst slik"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
 msgid "Couldn't save picture to file"
 msgstr "Ni mogoče shraniti slike v datoteko"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
 msgid "Select Your Avatar Image"
 msgstr "Izberite sliko za svojo podobo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
 msgid "Take a picture..."
 msgstr "Zajem slike ..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
 msgid "No Image"
 msgstr "Brez slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
 msgid "Images"
 msgstr "Slike"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
 msgid "All Files"
 msgstr "Vse datoteke"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
 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:3844
 msgid "Retry"
 msgstr "Poskusi znova"
 
 #: ../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"
@@ -1300,226 +1358,237 @@ msgstr ""
 "Treba je vnesti geslo za račun\n"
 "<b>%s</b>"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
 msgid "Select..."
 msgstr "Izberi ..."
 
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
 msgid "_Select"
 msgstr "_Izberi"
 
-#: ../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:731
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
 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:795
 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:971
 msgid "Invalid contact ID"
 msgstr "Neveljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
 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:1061
 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:1064
 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:1067
 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:1071
+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:1075
 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:1078
 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:1081
 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:1084
 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: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 "
+"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:1092
 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:1095
+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:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
 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:1542
 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:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1554
 #, 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:1594
 msgid "not capable"
 msgstr "ni mogoče"
 
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "predolgo sporočilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1680
-#: ../src/empathy-chat-window.c:979
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, 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:1701
 #, 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:1706
 msgid "No topic defined"
 msgstr "Ni določene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. 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 "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:2327
 #, 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:2397
 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:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
 msgid "_Spelling Suggestions"
 msgstr "Predlogi čr_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1527,12 +1596,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:2833
 #, 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:2836
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1540,17 +1609,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:2844
 #, 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:2847
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izobčen"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1560,17 +1629,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: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 je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
@@ -1578,86 +1647,82 @@ 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: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 "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3790
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
 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:3972
 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:3999
+#: ../src/empathy-new-chatroom-dialog.c:770
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../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 "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
 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: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 "Neznano ali neveljavno določilo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje stikov začasno ni na voljo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje stika ni na voljo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Permission Denied"
 msgstr "Dovoljenje je zavrnjeno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
 msgid "Could not block contact"
 msgstr "Stika ni mogoče blokirati"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 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:528
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
 #: ../src/empathy-chatrooms-window.ui.h:2
 #: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
@@ -1667,107 +1732,107 @@ msgstr "Račun:"
 msgid "Blocked Contacts"
 msgstr "Blokirani stiki"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
 msgid "Full name"
 msgstr "Polno Ime"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
 msgid "Phone number"
 msgstr "Telefonska Å¡tevilka"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
 msgid "E-mail address"
 msgstr "Elektronski naslov"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
 msgid "Website"
 msgstr "Spletišče"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
 msgid "Last seen:"
 msgstr "Zadnjič viden:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
 msgid "Server:"
 msgstr "Strežnik:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
 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
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
 msgid "Away message:"
 msgstr "Sporočilo odsotnosti:"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
 msgid "work"
 msgstr "delovno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
 msgid "home"
 msgstr "domače"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
 msgid "mobile"
 msgstr "prenosni telefon"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
 msgid "voice"
 msgstr "glasovno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
 msgid "preferred"
 msgstr "prednostno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
 msgid "postal"
 msgstr "poštno"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
 msgid "parcel"
 msgstr "paketno"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
 msgid "Search contacts"
 msgstr "Iskanje stikov"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:551
 msgid "Search: "
 msgstr "Poišči:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:609
 msgid "_Add Contact"
 msgstr "_Dodaj stik"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
 msgid "No contacts found"
 msgstr "Ni najdenih stikov."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:643
 msgid "Your message introducing yourself:"
 msgstr "Predstavitveno sporočilo:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:651
 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:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
 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:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
 msgid "Unable to save avatar"
 msgstr "Ni mogoče shraniti podobe"
 
@@ -1814,44 +1879,50 @@ msgstr "Različica"
 msgid "Client"
 msgstr "Odjemalec:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
 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: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 ""
+"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:348
 msgid "_Add Group"
 msgstr "_Dodaj skupino"
 
-#: ../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 "Izbor"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 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 +1930,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 +1938,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 +1953,288 @@ 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:168
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:353
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 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:348
 #: ../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:413
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:424
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Delo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:426
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Domača mapa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:669
+#: ../libempathy-gtk/empathy-individual-menu.c:660
 msgid "_Block Contact"
 msgstr "_Blokiraj stik"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:716
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:787
+#: ../libempathy-gtk/empathy-individual-menu.c:778
 #, 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:787
 #, 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:798
 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:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
 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:1225
+#: ../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:1260
+#: ../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:1293
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvočni klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1335
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1376
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
 #: ../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:1396
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1435
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 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:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
 msgid "Favorite"
 msgstr "Priljubljeno"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1490
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1539
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
 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:1646
+#: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "Vabila v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1701
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
 msgid "_Invite to Chat Room"
 msgstr "_Povabi v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1897
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
 msgid "_Add Contact…"
 msgstr "_Dodaj stik ..."
 
-#: ../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 "Ali zares želite odstraniti skupino '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
 msgid "Re_name"
 msgstr "P_reimenuj"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
 msgid "Country ISO Code:"
 msgstr "ISO oznaka države:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
 msgid "State:"
 msgstr "Okraj:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Area:"
 msgstr "Področje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Postal Code:"
 msgstr "Poštna številka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "Building:"
 msgstr "Stavba:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Floor:"
 msgstr "Nadstropje:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Room:"
 msgstr "Klepetalnica:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Text:"
 msgstr "Besedilo:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../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 "Raven natančnosti:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Vertical Error (meters):"
 msgstr "Napaka navpično (v metrih):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Horizontal Error (meters):"
 msgstr "Napaka vodoravno (v metrih):"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Speed:"
 msgstr "Hitrost:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Bearing:"
 msgstr "Smer:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Climb Speed:"
 msgstr "Hitrost dviganja:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Last Updated on:"
 msgstr "Zadnjič posodobljeno:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Longitude:"
 msgstr "Zemljepisna dolžina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Latitude:"
 msgstr "Zemljepisna Å¡irina:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 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:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../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: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 "%e.%B %Y ob %R UTC"
 
 #. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1302
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
 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:1501
 msgid "Identifier:"
 msgstr "Določilo:"
 
-#: ../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"
@@ -2175,85 +2251,95 @@ 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
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
 msgid "New Network"
 msgstr "Novo omrežje"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:548
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
 msgid "Choose an IRC network"
 msgstr "Izbor IRC omrežja"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:631
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
 msgid "Reset _Networks List"
 msgstr "Ponastavi seznam _omrežij"
 
-#: ../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 "Izbor"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
 msgid "new server"
 msgstr "nov strežnik"
 
-#: ../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
-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: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 "
+"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:100
 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:115
+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:607
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:662
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:684
 msgid "Search"
 msgstr "Poišči"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1135
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1137
 #, 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:1187
+#: ../libempathy-gtk/empathy-log-window.c:1336
 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:1277
 #, 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:1283
 #, 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:1360
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2262,7 +2348,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:1367
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2271,80 +2357,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:1375
 #, 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:1706
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1725
+#: ../libempathy-gtk/empathy-log-window.c:1710
 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:1725
 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:1829
+#: ../libempathy-gtk/empathy-log-window.c:3452
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1943
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1928
+#: ../libempathy-gtk/empathy-log-window.c:2387
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2700
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2909
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3027
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3029
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3030
 #: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3034
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3035
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3036
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3056
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3760
+#: ../libempathy-gtk/empathy-log-window.c:3745
 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:3749
 msgid "Clear All"
 msgstr "Počisti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3771
+#: ../libempathy-gtk/empathy-log-window.c:3756
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
@@ -2353,8 +2441,7 @@ 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:9
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -2367,8 +2454,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:1426 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "Klepet"
 
@@ -2393,72 +2479,72 @@ msgstr "Kakšno vrsto klepetalnega računa imate?"
 msgid "Adding new account"
 msgstr "Dodajanje novega računa"
 
-#: ../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"
 
@@ -2468,40 +2554,41 @@ msgstr "Nov pogovor"
 #. 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 "Sporočilo po meri ..."
 
-#: ../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 "Uredi sporočilo po meri ..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
 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:343
 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:377
 #, 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:386
 msgid "Set status"
 msgstr "Nastavi stanje"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
 msgid "Custom messages…"
 msgstr "Sporočila po meri ..."
 
@@ -2509,12 +2596,12 @@ msgstr "Sporočila po meri ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
+#: ../libempathy-gtk/empathy-protocol-chooser.c:603
 #, c-format
 msgid "New %s account"
 msgstr "Nov račun %s"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
 msgid "_Match case"
 msgstr "_Upoštevaj velikost črk"
 
@@ -2538,170 +2625,175 @@ 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:49
 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:51
 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:53
 msgid "Incoming chat request"
 msgstr "Prejeta je bila zahteva za klepet"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Contact connected"
 msgstr "Povezava s stikom je bila vzpostavljena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact disconnected"
 msgstr "Povezava s stikom je bila prekinjena"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Connected to server"
 msgstr "Povezano s strežnikom"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 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:63
 msgid "Incoming voice call"
 msgstr "Dohodni klic"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Outgoing voice call"
 msgstr "Odhodni klic"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Voice call ended"
 msgstr "Klic je končan"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
 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:1096
 #, 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:721
 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:1211
 #, 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:1913
 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:1078
 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:1202
 msgid "Select a file"
 msgstr "Izbor datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
 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: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 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:1330
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prihajajoča datoteka od %s"
@@ -2729,302 +2821,334 @@ msgstr "_Odpri povezavo"
 msgid "Inspect HTML"
 msgstr "Pregled HTML"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
 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
+#: ../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 "arabska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
 msgid "Baltic"
 msgstr "baltska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
 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
+#: ../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 "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
+#: ../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 "kitajska poenostavljena"
 
-#: ../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 "kitajska tradicionalna"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
 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
+#: ../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 "cirilica"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
 msgid "Cyrillic/Russian"
 msgstr "cirilica / ruska"
 
-#: ../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 "cirilica / ukrajinska "
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
 msgid "Greek"
 msgstr "grška"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
 msgid "Gujarati"
 msgstr "gudžarati"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
 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
+#: ../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 "hebrejska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
 msgid "Hebrew Visual"
 msgstr "hebrejska predočena"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
 msgid "Hindi"
 msgstr "hindujska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
 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
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
 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
+#: ../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 "korejska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
 msgid "Nordic"
 msgstr "nordijska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
 msgid "Persian"
 msgstr "perzijska"
 
-#: ../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 "romunska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
 msgid "South European"
 msgstr "južnoevropska"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
 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
+#: ../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 "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
+#: ../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 "zahodnoevropska"
 
-#: ../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 "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: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:201
 #, 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:52
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Obstajajo neshranjene spremembe vašega %s računa."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:56
 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:388 ../src/empathy-call-window.c:1258
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
 #, c-format
 msgid "Offline — %s"
 msgstr "Brez povezave - %s"
 
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Prekinjena povezava - %s"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
 msgid "Offline — No Network Connection"
 msgstr "Brez povezave - ni omrežne povezave"
 
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
 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: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 "
+"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:486
 msgid "Offline — Account Disabled"
 msgstr "Brez povezave - račun je onemogočen"
 
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
 msgid "Edit Connection Parameters"
 msgstr "Uredi parametre povezave"
 
-#: ../src/empathy-accounts-dialog.c:735
+#: ../src/empathy-accounts-dialog.c:719
 msgid "_Edit Connection Parameters..."
 msgstr "_Uredi parametre povezave ..."
 
-#: ../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 "Ali želite odstraniti %s iz računalnika?"
 
-#: ../src/empathy-accounts-dialog.c:1272
+#: ../src/empathy-accounts-dialog.c:1256
 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:1461
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3033,24 +3157,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:1652
 msgid "_Enabled"
 msgstr "_Omogoči"
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1691
+#: ../src/empathy-accounts-dialog.c:1675
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: ../src/empathy-accounts-dialog.c:2107
+#: ../src/empathy-accounts-dialog.c:2091
 msgid "_Skip"
 msgstr "Pre_skoči"
 
-#: ../src/empathy-accounts-dialog.c:2111
+#: ../src/empathy-accounts-dialog.c:2095
 msgid "_Connect"
 msgstr "_Poveži"
 
-#: ../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?"
@@ -3059,7 +3183,7 @@ msgstr ""
 "Ali ste prepričani, da želite nadaljevati?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2433
+#: ../src/empathy-accounts-dialog.c:2417
 msgid "Messaging and VoIP Accounts"
 msgstr "Sporočanje in računi VoIP"
 
@@ -3072,208 +3196,225 @@ 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:407
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
 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:440
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporočilnik"
 
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika računov"
 
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
 #, 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:115
 msgid "In a call"
 msgstr "V pogovoru"
 
-#: ../src/empathy-call.c:224
+#: ../src/empathy-call.c:215
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy odjemalec zvoka in slike"
 
-#: ../src/empathy-call.c:248
+#: ../src/empathy-call.c:239
 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:1533 ../src/empathy-event-manager.c:500
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../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 "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:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
 #, 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:1543
+#: ../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:1544
+#: ../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:1913
 #, c-format
 msgid "Call with %s"
 msgstr "Klic z %s"
 
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2165
 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:2167
 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:2169
 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:2171
 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:2173
 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: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 "Neznano"
 
-#: ../src/empathy-call-window.c:2966
+#: ../src/empathy-call-window.c:2946
 msgid "On hold"
 msgstr "Zadržano"
 
-#: ../src/empathy-call-window.c:2970
+#: ../src/empathy-call-window.c:2950
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-call-window.c:2952
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2975
+#: ../src/empathy-call-window.c:2955
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3051
 msgid "Technical Details"
 msgstr "Tehnične podrobnosti"
 
-#: ../src/empathy-call-window.c:3110
+#: ../src/empathy-call-window.c:3090
 #, 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:3095
 #, 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: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 "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:3107
 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:3111
+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:3114
+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:3126
 #, 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:3135
 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:3138
 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:3178
 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:3188
 msgid "Can't establish video stream"
 msgstr "Ni mogoče vzpostaviti video pretoka"
 
-#: ../src/empathy-call-window.c:3245
+#: ../src/empathy-call-window.c:3225
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Trenutno stanje je %s."
 
-#: ../src/empathy-call-window.c:3249
+#: ../src/empathy-call-window.c:3229
 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:3231
 msgid "Top Up"
 msgstr "Povišaj"
 
@@ -3297,13 +3438,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:17
 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:18
 msgid "_Contents"
 msgstr "_Vsebina"
 
@@ -3387,24 +3526,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:243
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
 msgid "Room"
 msgstr "Klepetalnica"
 
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Auto-Connect"
 msgstr "Samodejno povezovanje"
 
@@ -3412,43 +3550,61 @@ msgstr "Samodejno povezovanje"
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-chat-window.c:287
+#: ../src/empathy-chat-window.c:275
 msgid "Close this window?"
 msgstr "Ali naj se okno zapre?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../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 "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:294
 #, 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:305
 #, 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:307
+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:326
 msgid "Close window"
 msgstr "Zapri okno"
 
-#: ../src/empathy-chat-window.c:338
+#: ../src/empathy-chat-window.c:326
 msgid "Leave room"
 msgstr "Zapusti klepetalnico"
 
-#: ../src/empathy-chat-window.c:677
-#: ../src/empathy-chat-window.c:700
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3457,7 +3613,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:680
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3466,7 +3622,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:696
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3475,7 +3631,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:705
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3484,11 +3640,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:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:962
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3497,7 +3653,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:970
 msgid "Typing a message."
 msgstr "Pisanje sporočila."
 
@@ -3521,8 +3677,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"
 
@@ -3562,169 +3717,181 @@ msgstr "Premakni zavihek _desno"
 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:1588
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1648
 msgid "Pastebin link"
 msgstr "Povezava odložišča Pastebin"
 
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1657
 msgid "Pastebin response"
 msgstr "Odziv odložišča Pastebin"
 
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1664
 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:1846
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
 
-#: ../src/empathy-debug-window.c:1917
+#: ../src/empathy-debug-window.c:1906
 msgid "Send to pastebin"
 msgstr "Pošlji na odložišče Pastebin"
 
-#: ../src/empathy-debug-window.c:1961
+#: ../src/empathy-debug-window.c:1950
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/empathy-debug-window.c:1973
+#: ../src/empathy-debug-window.c:1962
 msgid "Level "
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1992
+#: ../src/empathy-debug-window.c:1981
 msgid "Debug"
 msgstr "Razhroščevanje"
 
-#: ../src/empathy-debug-window.c:1997
+#: ../src/empathy-debug-window.c:1986
 msgid "Info"
 msgstr "Podrobnosti"
 
-#: ../src/empathy-debug-window.c:2002
-#: ../src/empathy-debug-window.c:2077
+#: ../src/empathy-debug-window.c:1991 ../src/empathy-debug-window.c:2066
 msgid "Message"
 msgstr "Sporočilo"
 
-#: ../src/empathy-debug-window.c:2007
+#: ../src/empathy-debug-window.c:1996
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/empathy-debug-window.c:2012
+#: ../src/empathy-debug-window.c:2001
 msgid "Critical"
 msgstr "Kritično"
 
-#: ../src/empathy-debug-window.c:2017
+#: ../src/empathy-debug-window.c:2006
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/empathy-debug-window.c:2030
+#: ../src/empathy-debug-window.c:2019
 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:2051
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/empathy-debug-window.c:2065
+#: ../src/empathy-debug-window.c:2054
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:2068
+#: ../src/empathy-debug-window.c:2057
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:2071
+#: ../src/empathy-debug-window.c:2060
 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:2089
+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:500
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../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 vas kliče preko video kanala. Ali se želite javiti?"
 
-#: ../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 vas kliče. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../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 "_Odgovori"
 
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %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 vas vabi, da se pridružite v %s"
 
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
 #, 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:758
 #, 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:937
 #, 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:965 ../src/empathy-roster-window.c:212
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
 #, c-format
 msgid ""
 "\n"
@@ -3734,108 +3901,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: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 "Neznano"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
 #, 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:268
 #, 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:299
 #, 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:302
 #, 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:332
 #, 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:335
 msgid "Error receiving a file"
 msgstr "Napaka med prejemanjem datoteke"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
 #, 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:343
 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:482
 #, 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:487
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" poslano %s"
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
 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:609 ../src/empathy-ft-manager.c:773
 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:635 ../src/empathy-ft-manager.c:673
 #, 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:638 ../src/empathy-ft-manager.c:676
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Ustvarjanje razpršila \"%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 "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -3847,57 +4011,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:296
 msgid "Import"
 msgstr "Uvozi"
 
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
 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:184
 msgid "Chat Room"
 msgstr "Klepetelnica"
 
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
 msgid "Members"
 msgstr "Člani"
 
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
 msgid "Failed to list rooms"
 msgstr "Izpis seznama klepetalnic je spodletel"
 
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:429
 #, c-format
 msgid ""
 "%s\n"
@@ -3910,35 +4078,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:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:431
+#: ../src/empathy-new-chatroom-dialog.c:432
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:774
 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 +4131,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:134
 msgid "Message received"
 msgstr "Sporočilo je bilo prejeto"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
 msgid "Message sent"
 msgstr "Sporočilo je bilo poslano"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
 msgid "New conversation"
 msgstr "Nov pogovor"
 
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
 msgid "Contact comes online"
 msgstr "Stik se je povezal"
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes offline"
 msgstr "Stik se je odjavil"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Account connected"
 msgstr "Povezava z računom je vzpostavljena"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Account disconnected"
 msgstr "Povezava z računom je prekinjena"
 
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
 msgid "Juliet"
 msgstr "Julija"
 
 #. 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, Romeo, zakaj li 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 "Odreci se rodu, odvrzi ime,"
 
 #. 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 "č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:651
 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:654
 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:657
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
 msgid "Preferences"
 msgstr "Možnosti"
 
@@ -4061,8 +4240,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:2226
 msgid "Contact List"
 msgstr "Seznam stikov"
 
@@ -4151,16 +4329,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 +4380,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,84 +4405,86 @@ msgstr "Različica:"
 msgid "Themes"
 msgstr "Teme"
 
-#: ../src/empathy-roster-window.c:244
+#: ../src/empathy-roster-window.c:229
 msgid "Provide Password"
 msgstr "Vpis gesla"
 
-#: ../src/empathy-roster-window.c:250
+#: ../src/empathy-roster-window.c:235
 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."
+#: ../src/empathy-roster-window.c:478
+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
+#: ../src/empathy-roster-window.c:554
 #, 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
+#: ../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 "Račun %s zahteva overitev"
 
-#: ../src/empathy-roster-window.c:700
+#: ../src/empathy-roster-window.c:685
 msgid "Online Accounts"
 msgstr "Spletni računi"
 
-#: ../src/empathy-roster-window.c:747
+#: ../src/empathy-roster-window.c:732
 msgid "Update software..."
 msgstr "Posodobitev programske opreme ..."
 
-#: ../src/empathy-roster-window.c:753
+#: ../src/empathy-roster-window.c:738
 msgid "Reconnect"
 msgstr "Ponovno se poveži"
 
-#: ../src/empathy-roster-window.c:757
+#: ../src/empathy-roster-window.c:742
 msgid "Edit Account"
 msgstr "Uredi račun"
 
-#: ../src/empathy-roster-window.c:762
+#: ../src/empathy-roster-window.c:747
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/empathy-roster-window.c:904
+#: ../src/empathy-roster-window.c:889
 msgid "Top up account"
 msgstr "Povišaj znesek na računu"
 
-#: ../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 "Omogočiti je treba enega izmed računov za prikaz stikov."
 
 #. 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 "Omogočiti je treba račun %s za prikaz stikov."
 
-#: ../src/empathy-roster-window.c:1676
+#: ../src/empathy-roster-window.c:1661
 msgid "Change your presence to see contacts here"
 msgstr "Spremenite nastavitve za prikaz stikov."
 
-#: ../src/empathy-roster-window.c:1685
+#: ../src/empathy-roster-window.c:1670
 msgid "No match found"
 msgstr "Ni najdenih zadetkov."
 
-#: ../src/empathy-roster-window.c:1692
+#: ../src/empathy-roster-window.c:1677
 msgid "You haven't added any contact yet"
 msgstr "Ni Å¡e dodanih stikov"
 
-#: ../src/empathy-roster-window.c:1695
+#: ../src/empathy-roster-window.c:1680
 msgid "No online contacts"
 msgstr "Ni prijavljenih stikov"
 
@@ -4385,12 +4581,12 @@ msgstr "Nov k_lic ..."
 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"
 
@@ -4505,8 +4701,8 @@ msgstr "Podpora različnim računom IM"
 
 #~ msgid "Details"
 #~ msgstr "Podrobnosti"
-#~ msgctxt "codec"
 
+#~ msgctxt "codec"
 #~ msgid "Unknown"
 #~ msgstr "Neznano"
 
@@ -4620,15 +4816,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 +4844,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 +4969,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 +5025,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 +5113,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/release.py b/release.py
index 1ef6da9b..160650ed 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 b52e9ad8..db30af3f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,11 @@ include $(top_srcdir)/tools/flymake.mk
 CPPFLAGS_COMMON =					\
 	$(EMPATHY_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)				\
@@ -203,14 +207,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 2480d756..bd6b2f86 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 537b43e3..772e6868 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 39d094d2..1cb24d7d 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 f0a2db9a..27f41d37 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -25,25 +25,23 @@
  */
 
 #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 "empathy-accounts-common.h"
-#include "empathy-accounts-dialog.h"
+#include "empathy-account-widget-sip.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-user-info.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
diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index d436fed0..070cd02e 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 90d7947e..88923681 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 0c3693b6..985a1fa3 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 ceb0bbe3..85b576c4 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 fe62a6c4..bc3aa50c 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "empathy-audio-src.h"
 
 #ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
@@ -26,14 +27,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)
 
diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index ef87c44c..2d1a6960 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 323ef8ed..f7a00378 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 f1d42b74..be5b13a0 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 dbd5ecf7..60700ac0 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)
 
diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index 174fbf4b..b913d8e5 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 b1d4f297..1c4939af 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 36c6cfdc..5050d801 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 bf42b055..41e9bdfc 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 <libempathy-gtk/empathy-images.h>
-#include <libempathy-gtk/empathy-notify-manager.h>
-
-#include "empathy-call-observer.h"
+#include "empathy-images.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;
diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h
index 1d5a58b5..3fdb6b79 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 ca291472..e6dca486 100644
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -22,10 +22,11 @@
  * 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 "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h
index 7e9bd63e..56ddf99b 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 77722f1a..eb39855b 100644
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -19,38 +19,35 @@
  */
 
 #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 <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-camera-monitor.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
@@ -4018,7 +4015,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 a5df2dac..2090b1be 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
diff --git a/src/empathy-call-window.ui b/src/empathy-call-window.ui
index f26f33b4..133f4ca4 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 9d5ab8a8..8a554969 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <glib/gi18n.h>
-
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
@@ -31,13 +30,12 @@
 #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
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index a6f8d3d1..8dc037bd 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -20,14 +20,13 @@
  */
 
 #include "config.h"
-
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-
 #include "empathy-camera-menu.h"
 
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 struct _EmpathyCameraMenuPrivate
 {
diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h
index 92760f67..b55726be 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 15a4e7a4..02ed0d94 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 7dfd5348..b5516c33 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 292c1a9a..480570d0 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -26,31 +26,27 @@
  */
 
 #include "config.h"
+#include "empathy-chat-window.h"
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.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
  */
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 2041634a..ae986cc7 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.c b/src/empathy-chat.c
index 0e70885d..1c4c57d2 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 a18cccb1..553c9129 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -24,16 +24,14 @@
  */
 
 #include "config.h"
+#include "empathy-chatrooms-window.h"
 
 #include <glib/gi18n.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;
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 0a1d7f78..4522c6a0 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -20,18 +20,17 @@
 */
 
 #include "config.h"
+#include "empathy-debug-window.h"
 
 #include <glib/gi18n.h>
 #include <libsoup/soup.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)
diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 42bb43ef..c8944bf0 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 00dc98c8..fb4ef1e4 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 f652c216..a0171858 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -20,26 +20,24 @@
  */
 
 #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 "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)
 
diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 70af9a1c..f2878c7c 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 f89004f3..18e05dc1 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -28,17 +28,16 @@
 /* The original file transfer manager code was copied from Epiphany */
 
 #include "config.h"
+#include "empathy-ft-manager.h"
 
 #include <glib/gi18n.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
 {
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 0ff820f0..be41730e 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 d4dd70d0..5e6fa8d5 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,
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a412037d..87f1198f 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 "empathy-connection-managers.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 8fd7eaef..92adb861 100644
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -20,16 +20,16 @@
  * */
 
 #include "config.h"
+#include "empathy-import-pidgin.h"
 
 #include <glib/gstdio.h>
 #include <dbus/dbus-protocol.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
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 7007dee5..c3823364 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,11 +19,12 @@
  *          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 "empathy-connection-managers.h"
 #include "empathy-import-pidgin.h"
+#include "empathy-utils.h"
 
 EmpathyImportAccountData *
 empathy_import_account_data_new (const gchar *source)
diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 59e1cb4d..d860c4ee 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 77048a4b..86dc9515 100644
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -23,17 +23,15 @@
 /* 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 <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)
 
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 14a01d79..8e9f32f5 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -25,10 +25,9 @@
 #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 "empathy-connection-managers.h"
 #include "empathy-import-utils.h"
 
 G_BEGIN_DECLS
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 0b42ab4a..e562dc56 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 7946fa00..daa3448d 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 b86aec4b..612ff34b 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 c06e786e..ae2b0c07 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -18,16 +18,14 @@
  */
 
 #include "config.h"
+#include "empathy-mic-monitor.h"
 
-#include <gtk/gtk.h>
 #include <pulse/glib-mainloop.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
 {
diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h
index 4ad4a28f..73771681 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 cb8f2a1f..5edf45a5 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -22,20 +22,18 @@
  */
 
 #include "config.h"
+#include "empathy-new-chatroom-dialog.h"
 
 #include <glib/gi18n.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)
diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h
index 02bf3b2a..31212cb5 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 c3c996bd..fb36f2ac 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 bfeef61b..6901aa9c 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -24,21 +24,19 @@
  */
 
 #include "config.h"
+#include "empathy-preferences.h"
 
 #include <glib/gi18n.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);
 
@@ -1026,7 +1024,7 @@ 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,
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 05d2a1fb..93001d8d 100644
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -22,44 +22,42 @@
  */
 
 #include "config.h"
+#include "empathy-roster-window.h"
 
 #include <sys/stat.h>
 #include <glib/gi18n.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
@@ -477,7 +475,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);
 }
 
diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c
index 038cb495..89e3144c 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 49fc03fd..29a7797a 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 67c0e27c..810fa0df 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 e4bf72c6..b9988d53 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 7ac7d040..46c0b213 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 ab75757d..c5d870d0 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 f7ac7d99..827a34eb 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 "empathy-keyring.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-uoa-utils.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.
diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h
index 32000163..f7299325 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 54e49a30..917fab38 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -20,20 +20,18 @@
  */
 
 #include "config.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 "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
diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h
index ca21af83..586e651e 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 12f8d6b4..9856efed 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 e49c79a0..60127ba2 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 c36f2a2d..5cfe9f38 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -23,34 +23,31 @@
 
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
+#include <libnotify/notify.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 +211,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 +277,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,7 +334,8 @@ 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;
     }
@@ -369,8 +348,6 @@ empathy_app_command_line (GApplication *app,
   /* 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 +372,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 +419,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 +457,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 +496,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 +832,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/tests/Makefile.am b/tests/Makefile.am
index fdd67482..67fe5d89 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,8 @@ 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)				\
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 7ecb82ac..7ebf8780 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 3826411a..a64fd2ce 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 ba01c378..7fb195f0 100644
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -3,10 +3,9 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
-#include "test-irc-helper.h"
+#include "empathy-irc-network-manager.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"
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index 313ab065..5ca4fba7 100644
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -2,10 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-irc-helper.h"
+#include "empathy-irc-network.h"
 #include "test-helper.h"
-
-#include <libempathy/empathy-irc-network.h>
+#include "test-irc-helper.h"
 
 static void
 test_empathy_irc_network_new (void)
diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index 573967e4..225d57bc 100644
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -2,10 +2,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "test-irc-helper.h"
+#include "empathy-irc-server.h"
 #include "test-helper.h"
-
-#include <libempathy/empathy-irc-server.h>
+#include "test-irc-helper.h"
 
 static void
 test_empathy_irc_server_new (void)
diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 6c53f07a..10f0346f 100644
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -4,12 +4,11 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "empathy-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
 {
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 4ae6f775..0cf03744 100644
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -3,15 +3,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <telepathy-glib/telepathy-glib.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,
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 2004383d..2155c68b 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 27fdbf7e..4ca1989e 100644
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS =						\
 	$(ERROR_CFLAGS)					\
-	-I$(top_srcdir)                          	\
+	-I$(top_srcdir)/libempathy                     	\
+	-I$(top_srcdir)/libempathy-gtk                 	\
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	$(EMPATHY_CFLAGS)				\
 	$(WARN_CFLAGS)					\
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 0ed9f95e..613bf751 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 7622a624..159f8fcf 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 df91f1f2..81241090 100644
--- a/tests/interactive/test-empathy-calendar-button.c
+++ b/tests/interactive/test-empathy-calendar-button.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <libempathy-gtk/empathy-calendar-button.h>
+#include "empathy-calendar-button.h"
 
 static void
 date_changed_cb (EmpathyCalendarButton *button,
diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index 66353f13..185f4e95 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 50903c01..74bb59f1 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,
diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 12d35b4c..208c9a12 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 90b1797a..ca548a85 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 49f2012f..478b4e6c 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;
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 96137c39..f814d965 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;
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index e7185250..2494d78b 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 4b1219f2..572221ac 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 67d94bef..aa024fcc 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 ca763adb..efe3e3fd 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 ade247f3..6fafac80 100644
--- a/tests/test-irc-helper.c
+++ b/tests/test-irc-helper.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "test-irc-helper.h"
 
 void
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index e375f6fb..6010bc18 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 "empathy-irc-network-manager.h"
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index f76c2fa5..1271f6ec 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 f9081592..58074eec 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
@@ -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 "empathy-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 17963e65..27d114c0 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 939912aa..1f322ec5 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 e3351266..801c2d8a 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 768f0965..6895a04d 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 b1bfb28c..aa9d3a20 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 c15a13a7..c22c6d59 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 0167c851..67963967 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 439bbda6..761e2215 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 cf373a2d..1c96f336 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 8919065e..0607b9e2 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 d7a33fd4..3e61dc3b 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"