Merge back from master

52 files changed, 4380 insertions, 2612 deletions

diff --git a/help/.gitignore b/help/.gitignore
index 2f8d8eb55..597bd8fcf 100644
--- a/help/.gitignore
+++ b/help/.gitignore
@@ -13,3 +13,14 @@ it/*.xml
 ru/*.xml
 sv/*.xml
 
+ca/*.page
+cs/*.page
+de/*.page
+el/*.page
+en_GB/*.page
+es/*.page
+fi/*.page
+fr/*.page
+it/*.page
+ru/*.page
+sv/*.page
diff --git a/help/C/add-account.page b/help/C/add-account.page
new file mode 100644
index 000000000..5821a856c
--- /dev/null
+++ b/help/C/add-account.page
@@ -0,0 +1,96 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>Add a new account to <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add a new account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          the service you wish to add an account for, then click
+	          on the <gui>Create</gui> button.
+	       </p>
+        </item>
+      </list>
+      <p>
+        Otherwise:
+      </p>
+      <steps>
+        <item>
+          <p>
+            Click on the <gui>Add</gui> button.
+          </p>
+        </item>
+        <item>
+          <p>
+            From the <gui>Type</gui> drop-down list choose
+             the service you wish to add an account for, then click
+             on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </steps>
+    </item>
+    <item>
+      <p>
+        Fill the required fields with your <em>user
+         name</em> and	<em>password</em>.
+      </p>
+    </item>
+    <item>
+      <p>
+        To enable the new account, select the
+         <gui>Enabled</gui> check-box next to
+         the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      If you want to change the name that identifies the account in the <gui>Accounts</gui>
+      dialog, double-click on the name of the account in the box on the left of the dialog
+      and type the new name.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/add-contact.page b/help/C/add-contact.page
new file mode 100644
index 000000000..14d49a57a
--- /dev/null
+++ b/help/C/add-contact.page
@@ -0,0 +1,63 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="add-contact">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="offline-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"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Add someone to your list of contacts</title>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the type of
+        service the person you want to add to your contacts is using.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Identifier</gui> text box, type the email address
+        or the username of the person you want to add to your
+        contacts list.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Alias</gui> text box, type their name.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click <gui>Add</gui> to add the person to your list of
+        contacts.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      To add a new person to your list of contacts, you need to be
+      connected to the Internet and to your account.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-call.page b/help/C/audio-call.page
new file mode 100644
index 000000000..8c18b9453
--- /dev/null
+++ b/help/C/audio-call.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start an audio conversation with one of your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start an audio conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the audio call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Audio Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note style="tip">
+    <p>
+      To turn an audio conversation into a video one, from the call window select
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/audio-video.page b/help/C/audio-video.page
new file mode 100644
index 000000000..cef06e126
--- /dev/null
+++ b/help/C/audio-video.page
@@ -0,0 +1,148 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="audio-video">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <desc>
+      When it is possible to have an audio or video conversation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Audio and video conversations</title>
+
+  <p>
+    When your contacts support audio or video conversations, you will see, next to
+    the contacts name in the <gui>Contact List</gui> window, one or two small icons that
+    represent the different conversations you can have.
+  </p>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/audio-input-microphone.png">
+            Icon for audio conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have an audio conversation.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+          <media type="image" mime="image/png" src="figures/camera-web.png">
+            Icon for video conversation
+          </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the icon that represents the possibility to have a video conversation.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  
+  <note>
+    <p>
+      In order to have a video conversation, you need to have a web-cam that is
+      supported by your operating system, and a working microphone.
+    </p>
+    <p>
+      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. 
+    </p>
+  </note>
+  
+  <section id="supported-services">
+  
+  <title>Supported services</title>
+  
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td><p>
+          Protocol / Service
+        </p></td>
+        <td><p>
+          Video conversations
+        </p></td>
+        <td><p>
+          Audio conversations
+        </p></td>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td><p>AIM</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Google Talk</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
+        <td><p>ICQ</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Jabber</p></td>
+        <td><p>Yes</p></td>
+        <td><p>Yes</p></td>
+      </tr>
+      <tr>
+        <td><p>MSN</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Salut</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+      <tr>
+        <td><p>Yahoo!</p></td>
+        <td><p>No</p></td>
+        <td><p>No</p></td>
+      </tr>
+    </tbody>
+  </table>
+  
+  </section>
+
+</page>
diff --git a/help/C/change-status.page b/help/C/change-status.page
new file mode 100644
index 000000000..a2e687ffc
--- /dev/null
+++ b/help/C/change-status.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="change-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="status-icons"/>
+    <desc>
+      Change your status, if you are going away from your computer for example.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Change your status</title>
+
+  <steps>
+    <item>
+      <p>
+        Click on the drop-down list at the top of the <gui>Contact List</gui> window.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select a status from the list.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    For example, if you are busy and do not want to
+    be disturbed, select <gui>Busy</gui>.
+  </p>
+
+  <note>
+    <p>
+      If you do not use your computer for a while, or if the screen saver is turned on,
+       the status will be automatically set to <gui>Away</gui>.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/create-account.page b/help/C/create-account.page
new file mode 100644
index 000000000..46f58395e
--- /dev/null
+++ b/help/C/create-account.page
@@ -0,0 +1,137 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="create-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="add-account"/>
+    <link type="seealso" xref="irc-account"/>
+    <desc>
+      Register an account with one of the supported messaging services.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Register for a new account</title>
+
+  <p>
+    You can freely create an account on any of the services listed below.
+    Follow the instructions reported on each website on
+    how to register your new account.
+  </p>
+  <p>
+    At the end of the registration process you should have a <em>user
+      name</em> (or an <em>account ID</em>) and a <em>password</em>
+      that you will use to add the account to <app>Empathy</app>.
+  </p>
+  <p>
+    Click on the name of the service to visit its website.
+  </p>
+
+  <section id="im-services">
+    <title>Instant Messaging Services</title>
+
+    <list>
+      <item>
+        <p>
+          <link href="http://dashboard.aim.com/aim">AIM</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://www.google.com/talk/">Google Talk</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://www.icq.com/register/">ICQ</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="http://register.jabber.org/">Jabber</link>
+        </p>
+        <note style="tip">
+          <p>
+            It is possible to use the automatic creation of accounts
+            with this service. Not all the service providers support it.
+             One service provider known to work is <em>jabber.org</em>,
+             the default one of the application.
+          </p>
+        </note>
+      </item>
+      <item>
+        <p>
+          <link href="https://accountservices.passport.net">MSN</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://login.yahoo.com/config/login">Yahoo!</link>
+        </p>
+      </item>
+    </list>
+  </section>
+
+  <section id="local-service">
+    <title>Local Instant Messaging Services</title>
+    <p>
+      This service works when you are connected to a local network,
+      you do not need an Internet connection in order to use it.
+    </p>
+    <list>
+      <item>
+        <p>
+          <em>Salut</em>
+        </p>
+      </item>
+    </list>
+
+    <p>
+      For more information, see <link xref="salut-protocol" />.
+    </p>
+
+  </section>
+
+  <section id ="sip-services">
+    <title>Telephony Services</title>
+
+    <p>
+      These services will let you do voice call over the Internet with
+      other people using the same service or even to normal phones.
+    </p>
+
+    <list>
+      <item>
+        <p>
+          <link href="https://www.ekiga.net/index.php?page=register">Ekiga</link>
+        </p>
+      </item>
+      <item>
+        <p>
+          <link href="https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">Sipphone</link>
+        </p>
+      </item>
+    </list>
+
+    <note>
+      <p>
+        In order to call normal phones over the Internet, you may need
+        to subscribe to a paid service. For more information, please
+        refer to the instructions provided on the website of the
+        service you will use.
+      </p>
+    </note>
+
+  </section>
+</page>
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
new file mode 100644
index 000000000..2ded8067a
--- /dev/null
+++ b/help/C/disable-account.page
@@ -0,0 +1,66 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="disable-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="remove-account"/>
+    <desc>
+      Prevent an account from logging-in automatically when you start
+      <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Disable an account</title>
+
+  <p>
+    Disabling an account means to deactivate it, temporarily or
+     permanently. All the conversations you had will be kept in your computer.
+  </p>
+  <p>
+    After disabling an account, it is possible to enable it again.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to disable from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Deselect the <gui>Enabled</gui> check-box.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/empathy.xml b/help/C/empathy.xml
deleted file mode 100644
index e6a1a7282..000000000
--- a/help/C/empathy.xml
+++ /dev/null
@@ -1,1395 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" 
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-<!ENTITY legal SYSTEM "legal.xml">
-<!ENTITY appversion "2.28">
-<!ENTITY manrevision "2.2">
-<!ENTITY date "May 2009">
-<!ENTITY app "<application>Empathy</application>">
-<!ENTITY appname "Empathy">
-<!ENTITY gtalk "http://www.google.com/talk/">
-<!ENTITY icq "https://www.icq.com/register/">
-<!ENTITY aim "http://dashboard.aim.com/aim">
-<!ENTITY msn "https://accountservices.passport.net">
-<!ENTITY yahoo "https://login.yahoo.com/config/login">
-<!ENTITY fwd
-"http://account2.freeworlddialup.com/index.php?section_id=94">
-<!ENTITY ekiga "https://www.ekiga.net/index.php?page=register">
-<!ENTITY sipphone
-"https://signup.sipphone.com/new-users/app?class=NewUser;proc=start">
-<!ENTITY jabber "http://www.jabber.org/web/Jabber.org">
-]>
-<?db.chunk.max_depth 2?>
-<article id="index" lang="en">
-  <!-- please do not change the id; for translations, change lang to -->
-  <!-- appropriate code -->
-  <articleinfo>
-    <title>&app; Manual V&manrevision;</title>
-
-    <copyright>
-      <year>2008, 2009</year>
-      <holder>Ubuntu Documentation Project</holder>
-    </copyright>
-    <copyright>
-      <year>2009</year>
-      <holder>GNOME Documentation Project</holder>
-    </copyright>
-
-    <!-- An address can be added to the publisher information.  If a role is 
-    not specified, the publisher/author is the same for all versions of the 
-    document.  -->
-    <publisher>
-      <publishername>GNOME Documentation Project</publishername>
-    </publisher>
-
-    <!-- licence stuff -->
-    &legal;
-    
-    <authorgroup>
-      <author role="maintainer">
-	<firstname>Milo</firstname>
-	<surname>Casagrande</surname>
-	<affiliation>
-	  <orgname>GNOME Documentation Project</orgname>
-	  <address><email>milo@ubuntu.com</email></address>
-	</affiliation>
-	<affiliation>
-	  <orgname>Ubuntu Documentation Project</orgname>
-	  <address><email>milo@ubuntu.com</email></address>
-	</affiliation>
-      </author>
-      <author>
-	<firstname>Seth</firstname>
-	<surname>Dudenhofer</surname>
-	<affiliation>
-	  <orgname>Ubuntu Documentation Project</orgname>
-	  <address><email>sdudenhofer@gmail.com</email></address>
-	</affiliation>
-      </author>
-    </authorgroup>
-
-    <releaseinfo revision="2.28" role="incomplete">
-      <ulink type="bug" url="http://bugzilla.gnome.org/show_bug.cgi?id=561033" />
-      <ulink type="planning" url="http://live.gnome.org/Empathy/Documentation" />
-    </releaseinfo>
-
-<!-- According to GNU FDL, revision history is mandatory if you are -->
-<!-- modifying/reusing someone else's document.  If not, you can omit it. -->
-<!-- Remember to remove the &manrevision; entity from the revision -->
-<!-- entries other than the current revision. -->
-<!-- The revision numbering system for GNOME manuals is as follows: -->
-<!-- * the revision number consists of two components -->
-<!-- * the first component of the revision number reflects the release version of the GNOME desktop. -->
-<!-- * the second component of the revision number is a decimal unit that is incremented with each revision of the manual. -->
-<!-- For example, if the GNOME desktop release is V2.x, the first version of the manual that -->
-<!-- is written in that desktop timeframe is V2.0, the second version of the manual is V2.1, etc. -->
-<!-- When the desktop release version changes to V3.x, the revision number of the manual changes -->
-<!-- to V3.0, and so on. -->
-    <revhistory>
-      <revision>
-	<revnumber>Empathy Manual V&manrevision;</revnumber>
-	<date>&date;</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="publisher">GNOME Documentation Project</para>
-	</revdescription>
-      </revision>
-
-      <revision>
-	<revnumber>Empathy Manual V2.1</revnumber>
-	<date>January 2009</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="publisher">Ubuntu Documentation Project</para>
-	</revdescription>
-      </revision>
-
-      <revision> 
-	<revnumber>Empathy Manual V2.0</revnumber>
-	<date>April 2008</date>
-	<revdescription>
-	  <para role="author">Milo Casagrande
-	    <email>milo@ubuntu.com</email>
-	  </para>
-	  <para role="author">Seth Dudenhofer
-	    <email>sdudenhofer@gmail.com</email>
-	  </para>
-	  <para role="publisher">Ubuntu Documentation Project</para>
-	</revdescription>
-      </revision>
-    </revhistory> 
-    
-    <releaseinfo>
-      This manual describes version &appversion; of &appname;.
-    </releaseinfo> 
-    <legalnotice> 
-      <title>Feedback</title> 
-      <para>
-	To report a bug or make a suggestion regarding the &app; application or
-	this manual, follow the directions in the <ulink url="ghelp:user-guide?feedback" type="help">GNOME Feedback Page</ulink>. 
-      </para>
-    </legalnotice>
-
-    <abstract role="description">
-      <para>
-	&appname; is an application for instant messaging.
-      </para>
-    </abstract>
-
-  </articleinfo>
-
-  <indexterm zone="index"> 
-    <primary>Empathy</primary>
-  </indexterm>
-  <indexterm zone="index">
-    <primary>empathy</primary>
-    <secondary>istant messaging</secondary>
-  </indexterm>
-
-  <sect1 id="empathy-intro">
-    <title>Introduction</title>
-    <para>
-      &app; is a multi-protocol instant messaging program for the
-      GNOME Desktop. With &app; you can keep in touch with all of your
-      friends through lots of supported instant messaging services.
-    </para>
-    <para>
-      &app; supports the following services:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    <acronym>AIM</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Google Talk
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    ICQ
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>IRC</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Jabber (or <acronym>XMPP</acronym>)
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>MSN</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Salut
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    <acronym>SIP</acronym>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Yahoo
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    And many others...
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="empathy-getting-started">
-    <title>Getting Started</title>
-
-    <sect2 id="empathy-starting">
-      <title>Starting &appname;</title>
-      <para>You can start &app; in the following ways:
-      </para> 
-      <variablelist>
-    	<varlistentry>
-	  <term><guimenu>Applications</guimenu> menu</term>
-	  <listitem>
-	    <para>Choose 
-	      <menuchoice>
-		<guisubmenu>Internet</guisubmenu>
-		<guimenuitem>Empathy IM Client</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-    	<varlistentry>
-	  <term>Command line</term>
-	  <listitem>
-	    <para>Type <command>empathy</command> and then press
-	      <keycap>Enter</keycap>.
-	    </para>
-	  </listitem>
-    	</varlistentry>
-      </variablelist>
-    </sect2>
-
-    <sect2 id="emphaty-when-start">
-      <title>When You Start &appname;</title>
-      <para>
-	When you start &app; the following window is shown.
-	<!-- Figure 1 -->
-	<figure id="empathy-FIG-mainwindow"> 
-	  <title>&app; Main Window</title> 
-	  <screenshot> 
-	    <mediaobject> 
-	      <imageobject>
-		<imagedata fileref="figures/empathy-main-window.png" format="PNG"/> 
-	      </imageobject>
-	      <textobject> 
-		<phrase>
-		  Shows &app; main window. Contains the	titlebar, the
-		  menubar, contact list, status icon and status arrow
-		  button list.
-		</phrase> 
-	      </textobject> 
-	    </mediaobject> 
-	  </screenshot> 
-	</figure>
-	<!-- End of Figure -->
-      </para>
-      <para>
-	<xref linkend="empathy-TBL-1"/> describes the components of
-	&app;'s main window.
-	<table frame="topbot" id="empathy-TBL-1">
-	  <title>&app; Main Components</title>
-	  <tgroup cols="2" colsep="0" rowsep="0">
-	    <colspec colname="colspec0" colwidth="29.39*"/>
-	    <colspec colname="colspec1" colwidth="70.61*"/>
-	    <thead>
-	      <row rowsep="1">
-		<entry valign="top">
-		  <para>Component</para>
-		</entry>
-		<entry valign="top">
-		  <para>Description</para>
-		</entry>
-	      </row>
-	    </thead>
-	    <tbody>
-	      <row>
-		<entry valign="top">
-		  <para>Menubar</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Contains menus used to perform actions in &app;.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Status Drop-Down List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Allows to update the status.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Account Button</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Opens the <guilabel>Accounts</guilabel> dialog.
-		  </para>
-		</entry>
-	      </row>
-	      <row>
-		<entry valign="top">
-		  <para>Contact List</para>
-		</entry>
-		<entry valign="top">
-		  <para>
-		    Shows all the available contacts and their
-		    associated status.
-		  </para>
-		</entry>
-	      </row>
-	    </tbody>
-	  </tgroup>
-	</table>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="empathy-accounts">
-    <title>Accounts</title>
-    <para>
-      To use &app; you need at least one account of the supported services.
-    </para>
-    <para>
-      If you don't already have an account and you don't have your <emphasis>user
-	name</emphasis> and <emphasis>password</emphasis>, you need to
-	register a new account (see <xref linkend="empathy-register-account" />).
-    </para>
-    <para>
-      In order to talk with other users, also called
-      <emphasis>contacts</emphasis>, you need to use the same service
-      they are using. If, for example, one contact is using the <emphasis
-      role="strong">Jabber</emphasis> service, you need to have an
-      account registered with that service.
-    </para>
-    <para>
-      &app; can handle as many accounts on any supported services as you want and
-      you can have them all open at the same time.
-    </para>
-
-    <sect2 id="empathy-register-account">
-      <title>Registering an Account</title>
-      <para>
-	You can freely register an account on any of the following
-	services. Follow the instructions reported on each website on
-	how to register your new account. At the end of the
-	registration process you should have a <emphasis>user
-	  name</emphasis> (or an <emphasis>account ID</emphasis>) and
-	a <emphasis>password</emphasis> that you will use to
-	create the account in &app;.
-      </para>
-      <para>
-	Click on the name of the service to visit its website:
-	<!-- Need to do like that, if using only
-	<ulink>SERVICE</ulink> it wouldn't be possibile to
-	localize the links -->
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&aim;">AIM</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&gtalk;">Google
-	      Talk</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	   <para>
-	      The <ulink type="http" url="&icq;">ICQ</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&msn;">MSN</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&yahoo;">Yahoo</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	For registering a <acronym>SIP</acronym> account, you can use one of the
-	following service:
-      </para>
-      <para>
-	<itemizedlist>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&ekiga;">Ekiga</ulink> service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&fwd;"><acronym>FWD</acronym></ulink> (Free
-	      World Dialup) service.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <!-- Translators: try to find a localized version of the
-	    registration service website -->
-	    <para>
-	      The <ulink type="http" url="&sipphone;">Sipphone</ulink> service.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-	For registering a <emphasis role="strong">Jabber</emphasis>
-	account, you can use the automatic
-	account creation of &app;. Not all Jabber service
-	providers support the automatic creation of accounts, one
-	service provider known to work with &app; is <ulink
-	type="http" url="&jabber;">jabber.org</ulink>.
-      </para>
-      <para>
-	If you already have a <emphasis
-	role="strong">Jabber</emphasis> account, you can use one of
-	the following services:
-      </para>
-      <para>
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Salut
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-create-account">
-      <title>Adding your Account to &app;</title>
-      <para>
-	To add your account to &app;, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If it is the first time you launch &app;:
-	      <orderedlist>
-		<listitem>
-		  <para>
-		    From the <guilabel>Type</guilabel> drop-down list choose
-		    the service you wish to add an account for, then click
-		    on the <guibutton>Create</guibutton> button.
-		  </para>
-		</listitem>
-	      </orderedlist>
-	    </para>
-	    <para>
-	      Otherwise:
-	      <orderedlist>
-		<listitem>
-		  <para>
-		    Click on the <guilabel>Add</guilabel> button.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    From the <guilabel>Type</guilabel> drop-down list choose
-		    the service you wish to add an account for, then click
-		    on the <guibutton>Create</guibutton> button.
-		  </para>
-		</listitem>
-	      </orderedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Fill the required fields with your <emphasis>user
-		name</emphasis> and
-		<emphasis>password</emphasis>. Optionally, you can
-		modify some advanced options. For more information,
-	      see <xref linkend="empathy-advanced-options"/>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      To enable the new account, select the
-	      <guilabel>Enabled</guilabel> check-box next to
-	      the name of the account in the box on the left.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      
-      <sect3 id="empathy-importing-accounts">
-	<title>Importing Accounts</title>
-	<para>
-	  If you use another instant messaging program, you can import
-	  the accounts from that program into &app;
-	</para>
-	<para>
-	  <note>
-	    <para>
-	      At the moment &app; can import the accounts only from
-	      the instant messaging program
-	      <application>Pidgin</application>. For more information
-	      about <application>Pidgin</application>, see the <ulink
-	      type="http" url="http://www.pidgin.im/">Pidgin website</ulink>.
-	    </para>
-	  </note>
-	</para>
-	<para>
-	  To import the accounts into &app;, proceed as follows:
-	  <orderedlist>
-	    <listitem>
-	      <para>
-		From the <link linkend="empathy-FIG-mainwindow">main window
-		</link> (<guilabel>Contact List</guilabel>)
-		click on the account button or press <keycap>F4</keycap> to open the
-		<guilabel>Accounts</guilabel> dialog.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click on the <guibutton>Import Accounts...</guibutton>
-		button to open the <guilabel>Import
-		Accounts</guilabel> dialog.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the accounts you would like to import by
-		clicking on the <guilabel>Import</guilabel> check-box.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		When you have selected all the desired accounts, click
-		<guibutton>OK</guibutton> to import them. If you don't
-		want to import the accounts, click
-		<guibutton>Cancel</guibutton>.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		When you import a new account into &app;, it will not be
-		enabled by default.
-	      </para>
-	      <para>
-		To enable the new account, select the
-		<guilabel>Enabled</guilabel> check-box next to
-		the name of the account in the box on the left.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="empathy-edit-account">
-      <title>Editing an Account</title>
-      <para>
-	To edit one of your accounts, i.e. to change the
-	<emphasis>password</emphasis> or your <emphasis>user
-	name</emphasis>, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to edit in the box on the
-	      left.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Modify the desired data.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    Based on the type of the account, it is possibile to edit
-	    different settings.
-	  </para>
-	</note>
-      </para>
-      <para>
-	To modify the identifier of an account, how &app; identifies
-	an account, proceed as follows:
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap> to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to edit in the box on the
-	      left and double-click on its name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Change the name of the account as you desire.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-disabling-removing-account">
-      <title>Disabling and Removing an Account</title>
-      <para>
-	To disable an account, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap>
-	      to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to disable in the box on the
-	      left of the dialog and deselect the
-	      <guilabel>Enabled</guilabel> check-box.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove an account, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main window
-	      </link> (<guilabel>Contact List</guilabel>)
-	      click on the account button or press <keycap>F4</keycap>
-	      to open the
-	      <guilabel>Accounts</guilabel> dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the account you wish to disable in the box on the
-	      left of the dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on the <guibutton>Remove</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      A dialog will be shown asking for confirmation. Click on
-	      the <guibutton>Remove</guibutton> button to remove the account.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-edit-personal-information">
-      <title>Editing Personal Information</title>
-      <para>
-	To change your personal information, your alias and your
-	icon (the image that other contacts will see of you), for each
-	of your accounts, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guimenuitem>Personal Information</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Account</guilabel> drop-down list, choose
-	      the account you want to edit.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Alias</guilabel> text box, write your new
-	      alias.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      To change your icon, click on the person-looking button and
-	      choose an image file.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify yourself. You can use your real
-	    name or a nickname.
-	  </para>
-	</note>
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-advanced-options">
-      <title>Advanced Options</title> 
-      <para>
-	Based on the service you are using, it is possible to
-	configure more advanced options to modify the normal behavior of
-	&app;.
-      </para>
-      <para>
-	To configure these options, when you are <link
-	linkend="empathy-create-account">adding a new
-	account</link>, click on the drop-down section
-	<guilabel>Advanced</guilabel>.
-      </para>
-
-      <sect3 id="empathy-xmpp-advanced">
-	<title>
-	  Jabber (or <acronym>XMPP</acronym>) and Google Talk
-	</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Encryption required (TLS/SSL)</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option in order to use some sort of
-		  encryption during your conversations.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Ignore SSL certificate errors</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option in order to ignore the errors
-		  that can be generated by some types of security
-		  certificates. Usually these certificates are called
-		  auto-signed.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      Select this option only if you are sure the
-		      certificate is secure and you can trust it.
-		    </para>
-		  </note>
- 		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Resource</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to set a name with which you can
-		  identify the running program based on where you are
-		  running it. With this option, and the
-		  <guilabel>Priority</guilabel> one, you can
-		  use your account simultaneously in two different
-		  devices. For example, if you set one device to
-		  <replaceable>desktop</replaceable> and the other
-		  one to <replaceable>mobile</replaceable>, you can
-		  connect with both of them and based on the
-		  <guilabel>Priority</guilabel> value you will receive
-		  messages on one of the two devices or both.
-		</para>
-		<para>
-		  This can be useful if you have two devices, a main
-		  one and a portable one, and you move away from the
-		  main one bringing with you the other: you can still
-		  receive messages from your account with the portable
-		  device even if you do not disconnet from the main one.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      If you set the same value for this text box on
-		      both the devices, when you connect with one of
-		      them, the other one will be disconnected, even
-		      if you set a different value with the
-		      <guilabel>Priority</guilabel> spin box.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Priority</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to indicate wich device, set in
-		  the <guilabel>Resource</guilabel> text box, will
-		  receive the new messages. The higher the number, the
-		  higher the priority: you will receive the new
-		  messages on the device with the highest number.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>-128</literal> to <literal>127</literal>.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      If you set the same value of this spin box in
-		      both the devices, you will receive messages on
-		      both of them.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-	<para>
-	  In the <guilabel>Override server settings</guilabel> section
-	  you can set options that take precedence over the default settings.
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Use old SSL</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option to use the old version of the
-		  secure protocol for encrypting your connection.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-yahoo-advanced">
-	<title>Yahoo</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Ignore conference and chatrooms
-		invitations</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option to ignore the invitations that
-		  other people may send you.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Room List locale</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the language
-		  used to retrieve the room list when connecting to
-		  the Yahoo service.
-		</para>
-		<para>
-		  If you need to change this value, use the two letter
-		  code of your language.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Charset</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the set of the
-		  characters used by &app;.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      It is advise to leave this value to
-		      <literal>UTF-8</literal>. Change it only
-		      if that charset does not cover your language.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>		  
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Use Yahoo Japan</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Select this option only if you have a Yahoo! Japan
-		  account. With the Yahoo! Japan service you can only
-		  use a Yahoo! Japan account: if you have registered
-		  an account with the English version of the service,
-		  that account will not work. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-msn-advanced">
-	<title><acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym></title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>	    
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-salut-advanced">
-	<title>Salut</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Published Name</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name that will be
-		  visible to the other users of the network. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Email</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write your email.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Jabber ID</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write your Jabber ID, if you
-		  have one.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-icq-advanced">
-	<title>ICQ</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>
-		<guilabel>Charset</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  The value of this text box identifies the set of the
-		  characters used by &app;.
-		</para>
-		<para>
-		  <note>
-		    <para>
-		      It is advise to leave this value to
-		      <literal>UTF-8</literal>. Change it only
-		      if that charset does not cover your language.
-		    </para>
-		  </note>
-		</para>
-	      </listitem>
-	    </varlistentry>		  
-	    <varlistentry>
-	      <term>
-		<guilabel>Server</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this text box to write the name of the
-		  server you want to use for this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>
-		<guilabel>Port</guilabel>
-	      </term>
-	      <listitem>
-		<para>
-		  Use this spin box to set the number of the port of
-		  the server to use.
-		</para>
-		<para>
-		  You can set values in the range from
-		  <literal>0</literal> to <literal>65,555</literal>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-      <sect3 id="empathy-gadugadu-advanced">
-	<title>Gadu Gadu</title>
-	<para>
-	  <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Nick</guilabel></term>
-	      <listitem>
-		<para>
-		  Use this text box to write an alternative name to
-		  use with this service.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</para>
-      </sect3>
-
-    </sect2>
-    
-  </sect1>
-
-  <sect1 id="empathy-contacts-groups">
-    <title>Contacts and Groups</title>
-    <para>
-      All the contacts are handled within &app;'s <link
-      linkend="empathy-FIG-mainwindow">main window</link>.
-    </para>
-    <para>
-      You can add or remove a contact or you can edit the information
-      of a particular contact. It is also possibile to arrange
-      contacts in groups. You can have a group for your work contacts,
-      one for you family contacts, and so on.
-    </para>
-     <sect2 id="empathy-add-contact">
-      <title>Adding and Removing a Contact</title>
-      <para>
-	To add a new contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link> choose <menuchoice>
-		<guimenu>Chat</guimenu>
-		<guimenuitem>Add Contact...</guimenuitem>
-	      </menuchoice>. The <guilabel>New Contact</guilabel>
-		dialog will be shown.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Account</guilabel> drop-down list,
-	      choose the service used by the contact you are adding.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Identifier</guilabel> text box type the
-	      <emphasis>address</emphasis> of the contact in the form
-	      of
-	      <userinput><replaceable>user name</replaceable>@<replaceable>service
-	      domain</replaceable></userinput>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Alias</guilabel> text box type the name
-	      you want to give at the the new contact.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click on <guibutton>Add</guibutton> to add the new contact.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	To remove a contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-	      window</link>, select the contact you would like
-	      to remove and right-click on it.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the popup menu, choose <guilabel>Remove</guilabel> to
-	      remove the contact.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify that particular contact. You can use the real
-	    name or the nickname of that person.
-	  </para>
-	</note>
-      </para>
-    </sect2>
-    <sect2 id="empathy-edit-contact">
-      <title>Editing a Contact</title>
-      <para>
-	To edit a contact, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select the contact you would like
-	      to modify and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	From the <guilabel>Edit Contact Information</guilabel> dialog,
-	you can modify the <emphasis>alias</emphasis>
-	and the <emphasis>group</emphasis> of the contact.
-      </para>
-      <para>
-	<note>
-	  <para>
-	    An <emphasis>alias</emphasis> is an alternative way you
-	    can identify that particular contact. You can use the real
-	    name or the nickname of that person.
-	  </para>
-	</note>
-      </para>
-      <para>
-	For more information about groups, see <xref
-	  linkend="empathy-add-contact-group"/> and <xref
-	  linkend="empathy-add-group"/>.
-      </para>
-    </sect2>
-    
-    <sect2 id="empathy-add-contact-group">
-      <title>Adding a Contact to a Group</title>
-      <para>
-	To add a contact to one or more groups, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select the contact you would like
-	      to modify and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      From the <guilabel>Groups</guilabel> section, select the
-	      group, or groups, you want to add the contact to.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="empathy-add-group">
-      <title>Adding a New Group</title>
-      <para>
-	To add a new group, proceed as follows:
-      </para>
-      <para>
-	<orderedlist>
-	  <listitem>
-	    <para>
-	      From the <link linkend="empathy-FIG-mainwindow">main
-		window</link>, select one contact and choose <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guisubmenu>Contact</guisubmenu>
-		<guimenuitem>Edit</guimenuitem>
-	      </menuchoice>, or right-click on it
-	      and choose <guilabel>Edit</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the <guilabel>Groups</guilabel> section, write the
-	      name of the group you want to add and then click on
-	      <guibutton>Add Group</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When done, click <guibutton>Close</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>	
-    </sect2>
-  </sect1>
-
-<!--
-  <sect1 id="empathy-send-receive-message">
-    <title>Sending and Receiving Messages</title>
-    <para>
-    </para>
-  </sect1>
-
-  <sect1 id="empathy-preferences">
-    <title>Preferences</title>
-    <para>
-    </para>
-  </sect1>
--->
-  
-</article>
diff --git a/help/C/favorite-rooms.page b/help/C/favorite-rooms.page
new file mode 100644
index 000000000..747c09d66
--- /dev/null
+++ b/help/C/favorite-rooms.page
@@ -0,0 +1,135 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="favorite-rooms">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="irc-join-room"/>
+    <link type="seealso" xref="group-conversations"/>
+    <desc>Set, join and manage favorite rooms.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-21" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Favorite rooms</title>
+
+  <section id="set-favorite">
+  <title>Set a room as a favorite</title>
+  <steps>
+    <item>
+      <p>
+        Join a room.
+      </p>
+      <list>
+        <item>
+          <p>
+             See <link xref="irc-join-room"/> for more information on how to join
+             an IRC room.
+          </p>
+        </item>
+        <item>
+          <p>
+            See <link xref="group-conversations"/> for more information on how to
+            start or join a group conversation.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        From the conversation window, choose 
+        <guiseq><gui>Conversation</gui><gui>Favorite Chatroom</gui></guiseq>.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+  <section id="join-favorite">
+  <title>Join favorite rooms</title>
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F5</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to
+            join all your favorite rooms.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <gui>Room</gui>, and select the favorite room you want to join.
+          </p>
+        </item>
+      </list>
+    </item>
+  </steps>
+  <note>
+    <p>
+      To join a favorite room, you need to be connected to the Internet and to
+      your account.
+    </p>
+  </note>
+  </section>
+
+  <section id="manage-favorite">
+  <title>Manage favorite rooms</title>
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Manage Favorites</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to
+        manage the favorite rooms of.
+      </p>
+      <p>
+        Select <gui>All</gui> to see all you favorite rooms.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the favorite room you want to manage:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the <gui>Auto-Connect</gui> check-box in order to automatically
+            join that room when you connect to your account.
+          </p>
+        </item>
+        <item>
+          <p>
+            Click on <gui>Remove</gui> to remove the room from your favorites.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        When done, click <gui>Close</gui>.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+</page>
diff --git a/help/C/figures/audio-input-microphone.png b/help/C/figures/audio-input-microphone.png
new file mode 100644
index 000000000..f45d15d56
--- /dev/null
+++ b/help/C/figures/audio-input-microphone.png
diff --git a/help/C/figures/available.png b/help/C/figures/available.png
new file mode 100644
index 000000000..66b24967a
--- /dev/null
+++ b/help/C/figures/available.png
diff --git a/help/C/figures/away.png b/help/C/figures/away.png
new file mode 100644
index 000000000..ff59e309d
--- /dev/null
+++ b/help/C/figures/away.png
diff --git a/help/C/figures/busy.png b/help/C/figures/busy.png
new file mode 100644
index 000000000..fec554d89
--- /dev/null
+++ b/help/C/figures/busy.png
diff --git a/help/C/figures/camera-web.png b/help/C/figures/camera-web.png
new file mode 100644
index 000000000..e5406c5b9
--- /dev/null
+++ b/help/C/figures/camera-web.png
diff --git a/help/C/figures/empathy-main-window.png b/help/C/figures/empathy-main-window.png
index 12a6a33fc..bb803442f 100644
--- a/help/C/figures/empathy-main-window.png
+++ b/help/C/figures/empathy-main-window.png
diff --git a/help/C/geolocation-not-showing.page b/help/C/geolocation-not-showing.page
new file mode 100644
index 000000000..845f7e74b
--- /dev/null
+++ b/help/C/geolocation-not-showing.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-not-showing">
+
+  <info>
+    <link type="guide" xref="geolocation#problems"/>
+    <desc>
+      <app>Empathy</app> does not publish my geographical position.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Geographical position not published</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    In this case, your position will not be published, but you are still able to
+    see the location of your contacts.
+  </p>
+  <p>
+    If you want to publish your geographical position, you can try to use an
+    external device such as a GPS.
+  </p>
+
+</page>
diff --git a/help/C/geolocation-privacy.page b/help/C/geolocation-privacy.page
new file mode 100644
index 000000000..23694e2b7
--- /dev/null
+++ b/help/C/geolocation-privacy.page
@@ -0,0 +1,89 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-privacy">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <desc>
+      What information are sent and to who.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Geolocation privacy</title>
+
+  <section id="info-sent">
+  <title>What are the information sent</title>
+  <p>
+    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.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    When the privacy mode is enabled, nothing more precise than your city will be
+    sent, even if you are using an external device.
+  </p>
+  </section>
+  
+  <section id="see-info">
+  <title>Who can see the information sent</title>
+  <p>
+    Only your contacts can see your geographical position.
+  </p>
+  </section>
+  
+  <section id="privacy-mode">
+  <title>What is the privacy mode</title>
+  <p>
+    The privacy mode, enabled by default, is a reduced accuracy mode that will
+    decrease the accuracy of the geographical position sent to your contacts.
+  </p>
+  </section>
+  
+  <section id="privacy-overview">
+  <title>Privacy overview</title>
+  <p>
+    Overview of the various geolocation privacy settings in <app>Empathy</app>.
+  </p>
+  <list>
+    <item>
+      <p>
+        Geolocation is not enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode is enabled by default.
+      </p>
+    </item>
+    <item>
+      <p>
+        Privacy mode prevails even when using external and more precise devices.
+      </p>
+    </item>
+    <item>
+      <p>
+        Only your contacts can see your position.
+      </p>
+    </item>
+  </list>
+  </section>
+
+</page>
diff --git a/help/C/geolocation-supported.page b/help/C/geolocation-supported.page
new file mode 100644
index 000000000..f67b43755
--- /dev/null
+++ b/help/C/geolocation-supported.page
@@ -0,0 +1,47 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-supported">
+
+  <info>
+    <desc>
+      Services that supports geolocation and compatibility.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="draft"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Supported services</title>
+
+  <p>
+    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.
+  </p>
+  
+  <note>
+    <p>
+      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.
+    </p>
+  </note>
+  
+  <section id="compatibility">
+  <title>Compatibility</title>
+  
+  <p>
+    <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>.
+  </p>
+  
+  </section>
+  
+</page>
diff --git a/help/C/geolocation-turn.page b/help/C/geolocation-turn.page
new file mode 100644
index 000000000..6c01be90b
--- /dev/null
+++ b/help/C/geolocation-turn.page
@@ -0,0 +1,59 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-turn">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-privacy"/>
+    <desc>
+      How to activate and deactivate geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Activate/Deactivate geolocation</title>
+
+  <steps>
+    <item>
+      <p>
+        Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select the <gui>Location</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Publish location to my contacts</gui> to activate geolocation.
+      </p>
+      <p>
+        To deactivate geolocation, deselect it.
+      </p>
+    </item>
+    <item>
+      <p>
+        To increase the accuracy of your position, deselect
+        <gui>Reduce location accuracy</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        If you have an external device like a GPS or want to send a more accurate
+        position, select the appropriate option in the <gui>Geoclue Settings</gui>
+        section. 
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/geolocation-what-is.page b/help/C/geolocation-what-is.page
new file mode 100644
index 000000000..77fcff8dd
--- /dev/null
+++ b/help/C/geolocation-what-is.page
@@ -0,0 +1,58 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="geolocation-what-is">
+
+  <info>
+    <link type="guide" xref="geolocation#geoloc"/>
+    <link type="seealso" xref="geolocation-supported"/>
+    <desc>
+      Understanding geolocation.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>What is geolocation</title>
+
+  <p>
+    With <em>geolocation</em> it is intended the possibility to identify the real
+    geographical position of a computer or a device connected to the Internet.
+  </p>
+  <p>
+    With geolocation in <app>Empathy</app> you can:
+  </p>
+  <list>
+    <item>
+      <p>
+        Publish your geographical position to your contacts.
+      </p>
+    </item>
+    <item>
+      <p>
+        See your contacts geographical position and quickly contact them.
+      </p>
+    </item>
+    <item>
+      <p>
+        Set the accuracy of your position and the device used to discover your
+        position.
+      </p>
+    </item>
+  </list>
+
+  <note style="tip">
+    <p>
+      In order to see your contacts geographical position, they need to use a
+      service and an application that support geolocation.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/geolocation.page b/help/C/geolocation.page
new file mode 100644
index 000000000..409d22f49
--- /dev/null
+++ b/help/C/geolocation.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="geolocation"
+  style="2colum">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Use and understand geolocation in <app>Empathy</app>.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+  
+  <title>Geographical position</title>
+
+  <section id="geoloc" style="2column">
+    <title>Geolocation</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/group-conversations.page b/help/C/group-conversations.page
new file mode 100644
index 000000000..fcc0b4365
--- /dev/null
+++ b/help/C/group-conversations.page
@@ -0,0 +1,140 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="group-conversations">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>
+      Start or join a group conversation with your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Group conversations</title>
+  
+  <p>
+    Group conversations permits you to have text conversations with more than one
+    contact at the same time.
+  </p>
+  <p>
+    To have a group conversation you need to have a registered account with either
+    Jabber or Google Talk, or a Salut account.
+  </p>
+
+  <note>
+    <p>
+      You can have a group conversation only with the contacts that are using the
+      same service as yours.
+    </p>
+  </note>
+
+  <section id="start-group-conv">
+
+  <title>Start a group conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to use
+        for the group conversation.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Server</gui> text box, type the name of server in which the conversation
+        will be hosted.
+      </p>
+      <p>
+        Leave it empty if it will be on the current server.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Room</gui> text box, type the name you want to give to the conversation.
+      </p>
+      <note>
+        <p>
+          This will be the name of the room you are going to have a conversation. This
+          name will be publicly available for other people to join. It is not possible
+          to create a private room.
+        </p>
+      </note>
+    </item>
+    <item>
+      <p>
+        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:
+      </p>
+      <list>
+        <item>
+          <p>
+            Right-click on the contact, and select <gui>Invite to chatroom</gui>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</gui></guiseq>.
+          </p>
+        </item>
+      </list> 
+      <p>
+        If you have more than one group conversation open, select the one you want to invite
+        your contacts.
+      </p>
+    </item>
+  </steps>
+  
+  </section>
+
+  <section id="join-group-conv">
+
+  <title>Join a group conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Expand the <gui>Room List</gui> section to see all the existing rooms.
+      </p>
+    </item>
+    <item>
+      <p>
+        Double-click on the name of a room to join it.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    It is not possible to join all existing rooms. Some of the rooms might require a
+    password, or might be invitation only. <app>Empathy</app> does not support these
+    kind of rooms.
+  </p>
+
+  <!-- TODO: find out where the password protected or invitation only icons are
+  and create a table. -->
+
+  </section>
+
+</page>
diff --git a/help/C/index.page b/help/C/index.page
new file mode 100644
index 000000000..a57596560
--- /dev/null
+++ b/help/C/index.page
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      style="2column"
+      id="index">
+
+  <info>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="incomplete"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Empathy Instant Messenger</title>
+
+  <section id="audio-video" style="2column">
+    <title>Audio and video conversations</title>
+  </section>
+
+  <section id="text-conv" style="2column">
+    <title>Text conversations</title>
+  </section>
+
+  <section id="accounts" style="2column">
+    <title>Manage accounts</title>
+  </section>
+
+  <section id="advanced" style="2column">
+    <title>Advanced actions</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+</page>
diff --git a/help/C/introduction.page b/help/C/introduction.page
new file mode 100644
index 000000000..23255b7b1
--- /dev/null
+++ b/help/C/introduction.page
@@ -0,0 +1,46 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="introduction">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-16" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-17" status="review"/>
+    <desc>
+      Introduction to the <app>Empathy</app> instant messenger.
+    </desc>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Introduction</title>
+
+  <p>
+    <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.
+  </p>
+  <p>
+    <app>Empathy</app> includes features that help you better collaborate while at work,
+    and that let you easily keep in touch with your friends.  
+  </p>
+  <p>
+    You can group all the conversations in a single window, or have multiple windows for
+    different kind of conversations; easily search through your previous conversations, and
+    share your desktop in just two clicks.
+  </p>
+
+  <p>
+    <media type="image" src="figures/empathy-main-window.png" mime="image/png" style="right">
+      <app>Empathy</app> main window.
+    </media>
+  </p>
+
+</page>
diff --git a/help/C/irc-account.page b/help/C/irc-account.page
new file mode 100644
index 000000000..dd43fbb97
--- /dev/null
+++ b/help/C/irc-account.page
@@ -0,0 +1,128 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="prob-conn-neterror"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>Create an IRC account.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Create an IRC account</title>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+	      If it is the first time you launch <app>Empathy</app>:
+      </p>
+      <list>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+      </list>
+      <p>
+	      Otherwise:
+      </p>
+      <steps>
+	      <item>
+	        <p>
+	          Click on the <gui>Add</gui> button.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          From the <gui>Type</gui> drop-down list choose
+	          <gui>IRC</gui>, then click on the <gui>Create</gui> button.
+	        </p>
+	      </item>
+	     </steps>
+	   </item>
+	   <item>
+	    <p>
+	      From the <gui>Network</gui> drop-down list, select the name of the network
+	      you are creating the account for.
+	    </p>
+	   </item>
+	   <item>
+	   <!-- TODO: rethink the description of the nickname -->
+	    <p>
+	      In the <gui>Nickname</gui> text box, type the name that will identify yourself
+	      in the network you are creating the account.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname. If you do not have one, leave this field blank.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Real name</gui> text box, type your real name.
+	    </p>
+	    <note>
+	      <p>
+	        It is not necessary to insert your real name.
+	      </p>
+	    </note>
+	   </item>
+	   <item>
+	    <p>
+	      In the <gui>Quit message</gui> text box, type a text message that will be
+	      sent when you close your session.
+	    </p>
+	   </item>
+	   <item>
+	    <p>
+	      To enable the new account, select the <gui>Enabled</gui> check-box
+	      next to the name of the account in the box on the left of the dialog.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    If you want to change the name that identifies the account in the <gui>Accounts</gui>
+    dialog, double-click on the name of the account in the box on the left of the dialog
+    and type the new name.
+  </p>
+
+  <note style="tip">
+    <p>
+      If you want to use different networks at the same time, you need to create an
+      account with each one of the networks you want to use.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/irc-join-pwd.page b/help/C/irc-join-pwd.page
new file mode 100644
index 000000000..67de473bd
--- /dev/null
+++ b/help/C/irc-join-pwd.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-pwd">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="irc-join-room"/>
+    <desc>Join a password protected room.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-07" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a protected room</title>
+
+  <p>
+    At the moment it is not possible to join a password protected room.
+  </p>
+
+</page>
diff --git a/help/C/irc-join-room.page b/help/C/irc-join-room.page
new file mode 100644
index 000000000..8461b1de1
--- /dev/null
+++ b/help/C/irc-join-room.page
@@ -0,0 +1,54 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-join-room">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>Join an IRC channel.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Join a room</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, choose
+        <guiseq><gui>Room</gui><gui>Join</gui></guiseq>.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the IRC account that
+        corresponds to the network you want to use.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Room</gui> text box, type the name of the channel you want to
+        join. Prefix the name with the hash character (<sys>#</sys>).
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on <gui>Join</gui> to enter the room.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      To join multiple rooms, you need to repeat the steps above for each room.
+    </p>
+  </note>
+</page>
diff --git a/help/C/irc-manage.page b/help/C/irc-manage.page
new file mode 100644
index 000000000..07b6163f0
--- /dev/null
+++ b/help/C/irc-manage.page
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="irc-manage">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="seealso" xref="irc-account"/>
+    <desc>How to use IRC with <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-25" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Use IRC</title>
+
+  <section id="manage" style="2column">
+    <title>IRC rooms and conversations</title>
+  </section>
+
+  <section id="problems" style="2column">
+    <title>Fix common problems</title>
+  </section>
+
+
+</page>
diff --git a/help/C/irc-nick-password.page b/help/C/irc-nick-password.page
new file mode 100644
index 000000000..63cdd0965
--- /dev/null
+++ b/help/C/irc-nick-password.page
@@ -0,0 +1,96 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-nick-password">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="prob-conn-name"/>
+    <desc>How to set the password of a nickname.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Set the nickname password</title>
+
+  <p>
+    Registering a nickname is useful to preserve your identity on IRC, and to be able
+    to use always the same nickname. In some cirtumstances, some IRC channels may be
+    configured to accept only registered nickname.
+  </p>
+
+  <p>
+    If you have registered your nickname with a password on a network that supports nickname
+    registration, you can use that password with <app>Empathy</app> to identify yourself as
+    the owner of that nickname.
+  </p>
+  
+  <note>
+    <p>
+      Not all the IRC servers support nickname registration.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+	      From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+	        <p>
+	          Press <key>F4</key>.
+	        </p>
+	      </item>
+	      <item>
+	        <p>
+	          Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+	        </p>
+      	</item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the IRC account from the box on the left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        If the account is enabled, disable it by deselecting the <gui>Enable</gui>
+        check-box next to the name of the account.
+      </p>
+    </item>
+    <item>
+      <p>
+	      In the <gui>Password</gui> text box, type the password you used to register
+	      your nikcname.
+      </p>
+    </item>
+    <item>
+      <p>
+	      Enable the account by selecting the <gui>Enabled</gui> check-box
+	      next to the name of the account.
+      </p>
+      <p>
+        Once connected, you will receive a message from the nickname server that will
+        tell you of the established identification.
+      </p>
+    </item>
+  </steps>
+
+  <note>
+    <p>
+      At the moment it is not possible to register an IRC nickname with <app>Empathy</app>, it is
+      only possible to use the password of an already registered nickname.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/irc-sending-file.page b/help/C/irc-sending-file.page
new file mode 100644
index 000000000..804efa9fa
--- /dev/null
+++ b/help/C/irc-sending-file.page
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-send-file">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <link type="seealso" xref="send-file"/>
+    <desc>Send a file from your computer to one of the IRC contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Send files</title>
+
+  <p>
+    At the moment it is not possible to send files using IRC.
+  </p>
+
+</page>
diff --git a/help/C/irc-start-conversation.page b/help/C/irc-start-conversation.page
new file mode 100644
index 000000000..0f73bdad6
--- /dev/null
+++ b/help/C/irc-start-conversation.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="irc-start-conversation">
+
+  <info>
+    <link type="guide" xref="irc-manage#manage"/>
+    <desc>Start a conversation witn an IRC contact.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start a conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        To start a private conversation with one of the IRC contacts that
+         are in a room, after you joined a room, from the IRC room contact list perform
+         one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Double-click the name of contact you want to have a conversation with.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with,
+             and select <gui>Chat</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+  </steps>
+
+  <list>
+    <item>
+      <p>
+        The IRC room contact list is not the same as <app>Empathy</app> <gui>Contact List</gui>,
+         and is relative only to the IRC room you joined. Different rooms can have different
+         contacts listed.
+      </p>
+    </item>
+    <item>
+      <p>
+        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>.
+      </p>
+    </item>
+  </list>
+
+</page>
diff --git a/help/C/legal.xml b/help/C/legal.xml
index ac97e1de4..86d6173ad 100644
--- a/help/C/legal.xml
+++ b/help/C/legal.xml
@@ -1,76 +1,9 @@
-  <legalnotice id="legalnotice">
-	<para>
-	  Permission is granted to copy, distribute and/or modify this
-	  document under the terms of the GNU Free Documentation
-	  License (GFDL), Version 1.1 or any later version published
-	  by the Free Software Foundation with no Invariant Sections,
-	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
-	  a copy of the GFDL at this <ulink type="help"
-	  url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS
-	  distributed with this manual.
-         </para>
-         <para> This manual is part of a collection of GNOME manuals
-          distributed under the GFDL.  If you want to distribute this
-          manual separately from the collection, you can do so by
-          adding a copy of the license to the manual, as described in
-          section 6 of the license.
-	</para>
-
-	<para>
-	  Many of the names used by companies to distinguish their
-	  products and services are claimed as trademarks. Where those
-	  names appear in any GNOME documentation, and the members of
-	  the GNOME Documentation Project are made aware of those
-	  trademarks, then the names are in capital letters or initial
-	  capital letters.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-
-	  <orderedlist>
-		<listitem>
-		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
-                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
-                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
-                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
-                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
-                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
-                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
-                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
-                    EXCEPT UNDER THIS DISCLAIMER; AND
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
-                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
-                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
-                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
-                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
-                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
-                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
-                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
-                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
-                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-                       THE POSSIBILITY OF SUCH DAMAGES.
-		  </para>
-		</listitem>
-	  </orderedlist>
-	</para>
-  </legalnotice>
-
+<license xmlns="http://projectmallard.org/1.0/"
+         href="http://creativecommons.org/licenses/by-sa/3.0/">
+<p>This work is licensed under a
+<link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons
+Attribution-Share Alike 3.0 Unported License</link>.</p>
+<p>As a special exception, the copyright holders give you permission to copy,
+modify, and distribute the example code contained in this document under the
+terms of your choosing, without restriction.</p>
+</license>
diff --git a/help/C/offline-contacts.page b/help/C/offline-contacts.page
new file mode 100644
index 000000000..b3f30f6cd
--- /dev/null
+++ b/help/C/offline-contacts.page
@@ -0,0 +1,50 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="offline-contacts">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>
+      How to see the contacts that are not online.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-24" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+    	<year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Display offline contacts</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Press <keyseq><key>Ctrl</key><key>H</key></keyseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        To hide the offline contacts again, repeat the same procedure above.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prev-conv.page b/help/C/prev-conv.page
new file mode 100644
index 000000000..b521ada59
--- /dev/null
+++ b/help/C/prev-conv.page
@@ -0,0 +1,153 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prev-conv">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>
+      Search your previous conversations.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-17" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-19" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Previous conversations</title>
+
+  <p>
+    <app>Empathy</app> automatically saves all your text conversations you have
+    with your contacts, and lets you perform two different kinds of search: a
+    normal text search, or a per-conversation search.
+  </p>
+  <p>
+    The normal search is a <em>full text</em> search: it will search the exact text in
+    all your previous conversations.
+  </p>
+  <p>
+    The per-conversation search permits you to limit the text search to a particular
+    contact and conversation, and permits you to look at all the previous
+    conversations you had with your contacts.
+  </p>
+
+  <note>
+    <p>
+      You do not need to be connected to the Internet to search your previous
+      conversations.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+        To start searching your previous conversations, from the <gui>Contact List</gui>
+        window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F3</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>View</gui><gui>Previous Conversations</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Based on the kind of search you want to perform, see
+        <link xref="prev-conv#normal-search"/> or <link xref="prev-conv#contact-search"/>
+        for more information.
+      </p>
+    </item>
+  </steps>
+
+  <section id="normal-search">
+  <title>Normal search</title>
+  <steps>
+    <item>
+      <p>
+        Select the <gui>Search</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>For</gui> text box, type the text you want to search, and click on
+        <gui>Find</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        If there are results, they will be shown in the first pane, ordered by date.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the result to see the exact text you were searching for on the
+        bottom pane.
+      </p>
+      <p>  
+        The search results will be highlighted.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+  <section id="contact-search">
+  <title>Conversation search</title>
+  <steps>
+    <item>
+      <p>
+        Select the <gui>Conversations</gui> tab.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the drop-down list at the top of the window, select your account.
+      </p>
+    </item>
+    <item>
+      <p>
+        From the left top pane, select the contact you want to look the previous
+        conversations of. The previous conversations will be shown on the right pane.
+      </p>
+      <p>
+        By default, the last conversation you had will be shown.
+      </p>
+      <note>
+        <p>
+          Based on your account selected and the service of that account, it will
+          be possible to select contacts, IRC rooms or group conversations. 
+        </p>
+      </note>
+    </item>
+    <item>
+      <p>
+        From the left bottom pane, you can browse your conversations by date. Based
+        on the contact selected, the date in which you had a conversation will
+        be highlighted in bold text.
+      </p>
+    </item>
+    <item>
+      <p>
+        To perform a text search, type the text you want to search in the text box
+        at the top of the window.
+      </p>
+      <p>
+        The search results will be highlighted.
+      </p>
+    </item>
+  </steps>
+  </section>
+
+</page>
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
new file mode 100644
index 000000000..1daf61406
--- /dev/null
+++ b/help/C/prob-conn-acctdisabled.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-acctdisabled">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <desc>
+        The instant messaging account that you want to use is not enabled in
+        the list of accounts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>My account is not enabled</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the account
+        that is not working.
+      </p>
+    </item>
+    <item>
+      <p>
+        Type your username and password again to make sure that they are correct.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+    <item>
+      <p>
+        Check that the <gui>Enabled</gui> check-box next to the name of your account is selected.
+        If it is not, select the check-box to enalbe the account.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn-auth.page b/help/C/prob-conn-auth.page
new file mode 100644
index 000000000..a0d5c187d
--- /dev/null
+++ b/help/C/prob-conn-auth.page
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-auth">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+        An error message which says "<gui>Authentication failed</gui>" appears
+        in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-23" status="draft"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Authentication failed"</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <p>
+        Type your username and password again to make sure that they are correct.
+      </p>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+</page>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
new file mode 100644
index 000000000..3e4edd40c
--- /dev/null
+++ b/help/C/prob-conn-name.page
@@ -0,0 +1,62 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-name">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems"/>
+    <desc>
+      An error message which says "<gui>Name in use</gui>" appears in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Name in use"</title>
+
+  <p>
+    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.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <list>
+        <item>
+          <p>
+            In the <gui>Nickname</gui> text box, type a new nickname.
+          </p>
+        </item>
+        <item>
+          <p>
+            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"/>.            
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
new file mode 100644
index 000000000..8001ed49b
--- /dev/null
+++ b/help/C/prob-conn-neterror.page
@@ -0,0 +1,74 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="prob-conn-neterror">
+
+  <info>
+    <link type="guide" xref="prob-conn"/>
+    <link type="guide" xref="irc-manage#problems" />
+    <desc>
+        An error message which says "<gui>Network error</gui>" appears in the main window.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>I get a message that says "Network error"</title>
+
+  <p>
+    This kind of error happens when <app>Empathy</app> cannot communicate
+    with the instant messaging service for some reason.
+  </p>
+  <p>
+    Also, this kind of error happens when you try to use an IRC account without
+    setting a nickname.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        Make sure that you are connected to the Internet, or to a local area network. 
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Edit Account</gui> button in the error message.
+      </p>
+    </item>
+    <item>
+      <list>
+        <item>
+          <p>
+            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.
+          </p>
+        </item>
+        <item>
+          <p>
+            In the case of an IRC account, type your nickname in the <gui>Nickname</gui>
+            text box.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/prob-conn.page b/help/C/prob-conn.page
new file mode 100644
index 000000000..400793a7b
--- /dev/null
+++ b/help/C/prob-conn.page
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="guide"
+  id="prob-conn">
+
+  <info>
+    <link type="guide" xref="index#problems"/>
+    <desc>
+      Diagnose common problems connecting to an instant messaging service.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-17" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-26" status="draft"/>
+    <revision pkgversion="2.28" version="0.3" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Problems connecting to an instant messaging service</title>
+
+</page>
diff --git a/help/C/remove-account.page b/help/C/remove-account.page
new file mode 100644
index 000000000..5728b40d0
--- /dev/null
+++ b/help/C/remove-account.page
@@ -0,0 +1,70 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="remove-account">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <desc>Completely remove an account from <app>Empathy</app>.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Remove an account</title>
+
+  <p>
+    Removing an account means to delete it from your computer with all
+    the conversations you had with other people.
+  </p>
+  <p>
+    After removing an account you will not be able to recover it or to recover
+     the conversations you had.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Press <key>F4</key>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the account you wish to remove from the box on the
+         left of the dialog.
+      </p>
+    </item>
+    <item>
+      <p>
+        Click on the <gui>Remove</gui> button.
+      </p>
+    </item>
+    <item>
+      <p>
+        A dialog will be shown asking for confirmation. Click on
+         the <gui>Remove</gui> button to permanently remove the
+         account.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/salut-protocol.page b/help/C/salut-protocol.page
new file mode 100644
index 000000000..176921e4c
--- /dev/null
+++ b/help/C/salut-protocol.page
@@ -0,0 +1,43 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic"
+      id="salut-protocol">
+
+  <info>
+    <link type="seealso" xref="create-account"/>
+    <desc>
+      Undesrtanding the <em>Salut</em> protocol.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-12" status="draft"/>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>What is the <em>Salut</em> service?</title>
+
+  <p>
+    The <em>Salut</em> service is a serverless communication service:
+    you do not need to connect and authenticate to a central server in
+    order to use it.
+  </p>
+  <p>
+    This kind of serverless messaging system is restricted to a local area
+    network and an active Internet connection is not necessary.
+  </p>
+  <p>
+    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.
+  </p>
+  <p>
+    All the modern local area networks should be able to support this kind
+    of service.
+  </p>
+</page>
diff --git a/help/C/send-file.page b/help/C/send-file.page
new file mode 100644
index 000000000..960d0cc46
--- /dev/null
+++ b/help/C/send-file.page
@@ -0,0 +1,89 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-file">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>Send a file from your computer to one of your contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send files</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Right-click on the contact you want to send a file, and select <gui>Send file</gui>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Click on the contact you want to send a file, and choose <guiseq><gui>Edit</gui>
+            <gui>Contact</gui><gui>Send file</gui></guiseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        Select the file to send, and click on <gui>Send</gui>.
+      </p>
+    </item>
+    <item>
+      <p>
+        The <gui>File Transfers</gui> window will appear.
+      </p>
+      <p>
+        Wait for your contact to accept the file transfer, or click 
+        <gui>Stop</gui> to halt the transfer.
+      </p>
+    </item>
+    <item>
+      <p>
+        Once the transfer is finished, it is possible to close the <gui>File Transfers</gui>
+        window.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      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.
+    </p>
+  </note>
+  <note>
+    <p>
+      It is possible to send files only using the following services: <em>Jabber</em>,
+       <em>Google Talk</em> and <em>Salut</em>.
+    </p>
+  </note>
+  <note>
+    <p>
+      In order to send a file to someone, you need to be connected to the Internet, or to
+      a local area network.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/send-message.page b/help/C/send-message.page
new file mode 100644
index 000000000..997236ccb
--- /dev/null
+++ b/help/C/send-message.page
@@ -0,0 +1,51 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="send-message">
+
+  <info>
+    <link type="guide" xref="index#text-conv"/>
+    <desc>Send a message to one of your contacts.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-14" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Send a message to someone</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Double-click the name of the contact that you want to have a conversation
+            with.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Chat</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/set-custom-status.page b/help/C/set-custom-status.page
new file mode 100644
index 000000000..6b9dabe50
--- /dev/null
+++ b/help/C/set-custom-status.page
@@ -0,0 +1,166 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="set-custom-status">
+
+  <info>
+    <link type="guide" xref="index#accounts"/>
+    <link type="seealso" xref="change-status"/>
+	  <link type="seealso" xref="status-icons"/>
+    <desc>
+      Add, edit or delete personal messages for your status.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-06-30" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Jim Campbell</name>
+      <email>jwcampbell@gmail.com</email>
+    </credit>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Set a custom message</title>
+
+  <p>
+    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.
+  </p>
+  <p>
+    It is possible to set a custom message based on the different statuses available.
+  </p>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+        the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        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>.
+      </p>
+    </item>
+    <item>
+      <p>
+        Enter your custom message in the text box at the top of the window, and
+        press <key>Enter</key> to set the message.
+      </p>
+    </item>
+    <item>
+      <p>
+        If you want to set the custom message as a favorite, saving it in order to use it
+        again, click on the little star on the right of the text box where you wrote your
+        custom message.
+      </p>
+      <p>
+        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.
+      </p>
+    </item>
+  </steps>
+
+  <section id="edit-custom">
+
+  <title>Edit, remove and add a custom message</title>
+
+  <steps>
+    <item>
+     <p>
+        From the <gui>Contact List</gui> window, click on the drop-down list at
+        the top.
+      </p>
+    </item>
+    <item>
+      <p>
+        Select <gui>Edit Custom Message</gui>.
+      </p>
+    </item>
+	  <item>
+	    <list>
+	      <item>
+	        <p>
+	          To edit a custom message:
+	        </p>
+	        <steps>
+	          <item>
+	            <p>
+	              From the <gui>Saved Presets</gui> box, select the status message
+	              you want to edit and double-click on it.
+              </p>
+            </item>
+            <item>
+              <p>
+                Type the new custom message and press <key>Enter</key> to modify it.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To remove a custom message:
+          </p>
+          <steps>
+            <item>
+              <p>
+                From the <gui>Saved Presets</gui> box, select the status message you want
+                to remove.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the <gui>Remove</gui> button.
+              </p>
+            </item>
+          </steps>
+        </item>
+        <item>
+          <p>
+            To add a new custom message, from the <gui>Add New Preset</gui> section:
+          </p>
+          <steps>
+            <item>
+              <p>
+                Click on the drop-down list to select the status you want to set a custom
+                message to.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on the text box, and type the new custom message.
+              </p>
+            </item>
+            <item>
+              <p>
+                Click on <gui>Add</gui> to add the new message to the presets ones.
+              </p>
+            </item>
+          </steps>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        When finished, click on <gui>Close</gui>.
+      </p>
+    </item>
+  </steps>
+
+  <note style="tip">
+    <p>
+      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.
+    </p>
+  </note>
+
+  </section>
+
+</page>
diff --git a/help/C/share-desktop.page b/help/C/share-desktop.page
new file mode 100644
index 000000000..06a3d7c40
--- /dev/null
+++ b/help/C/share-desktop.page
@@ -0,0 +1,85 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="share-desktop">
+
+  <info>
+    <link type="guide" xref="index#advanced"/>
+    <desc>
+      Share the desktop with your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-10" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Share your desktop</title>
+
+  <p>
+    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.
+  </p>
+
+  <note style="tip">
+    <p>
+      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.
+    </p>
+  </note>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            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>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to share your desktop with,
+             and select <gui>Share my desktop</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        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.
+      </p>
+      <p>
+        For more information about how to use the remote desktop viewer application,
+         refer to its help.
+      </p>
+    </item>
+  </steps>
+
+  <p>
+    When you share your desktop with someone else, it is possible to experience
+     system performance slowdown and low Internet speed.
+  </p>
+
+  <note>
+    <p>
+      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.
+    </p>
+  </note>
+
+</page>
diff --git a/help/C/start-conversation.page b/help/C/start-conversation.page
new file mode 100644
index 000000000..d7123c4e4
--- /dev/null
+++ b/help/C/start-conversation.page
@@ -0,0 +1,71 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="start-conversation">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="guide" xref="index#text-conv"/>
+    <link type="seealso" xref="add-contact"/>
+    <desc>General method to start a conversation.</desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+
+  <title>Start a conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Choose <guiseq><gui>Chat</gui><gui>New conversation</gui></guiseq>.
+          </p>
+        </item>
+        <item>
+          <p>
+            Press <keyseq><key>Ctrl</key><key>N</key></keyseq>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        From the <gui>Account</gui> drop-down list, select the account you want to
+         use for the conversation.
+      </p>
+      <p>
+        This one is one of your accounts.
+      </p>
+    </item>
+    <item>
+      <p>
+        In the <gui>Contact ID</gui> text box, type the identifier of the contact you want to
+         have a conversation with.
+      </p>
+      <p>
+        You have to enter the identifier as it has been inserted when adding a new contact to
+         your contact list. If you are trying to start a conversation using one of your IRC
+         accounts or a SIP account, you have to enter the exact nickname or the
+         exact SIP address of the contact.
+      </p>
+    </item>
+    <item>
+      <p>
+        To start a text conversation, click on <gui>Chat</gui>; to start
+         an audio conversation, click on <gui>Call</gui>.
+      </p>
+    </item>
+  </steps>
+
+</page>
diff --git a/help/C/status-icons.page b/help/C/status-icons.page
new file mode 100644
index 000000000..35c91e543
--- /dev/null
+++ b/help/C/status-icons.page
@@ -0,0 +1,97 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="status-icons">
+
+  <info>
+    <desc>
+      Understanding the various status icons.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-07-18" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-07-21" status="draft"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+  </info>
+
+  <title>Status icons</title>
+
+  <table frame="all" rules="cols" shade="rows">
+    <thead>
+      <tr>
+        <td>
+          <p>
+            Icon
+          </p>
+        </td>
+        <td>
+          <p>
+            Description
+          </p>
+        </td>
+      </tr>
+    </thead>
+    <tbody>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/available.png">
+          Available icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Available</em> status.
+        </p>
+        <p>
+          Use this icon when you are availble to have conversations with other
+          people.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/busy.png">
+          Busy icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Busy</em> status.
+        </p>
+        <p>
+          Use this icon when you do not want to be disturbed.
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <td>
+        <p>
+        <media type="image" mime="image/png" src="figures/away.png">
+          Away icon
+        </media>
+        </p>
+      </td>
+      <td>
+        <p>
+          This is the default icon for the <em>Away</em> status.
+        </p>
+        <p>
+          Use this icon when you are going away from the computer. This icon
+          is used also when you leave the computer and the screensaver turns on.
+        </p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</page>
diff --git a/help/C/video-call.page b/help/C/video-call.page
new file mode 100644
index 000000000..6f918ee6e
--- /dev/null
+++ b/help/C/video-call.page
@@ -0,0 +1,68 @@
+<page xmlns="http://projectmallard.org/1.0/"
+  type="topic"
+  id="video-call">
+
+  <info>
+    <link type="guide" xref="index#audio-video"/>
+    <link type="seealso" xref="audio-video"/>
+    <desc>
+      Start a video conversation with one of your contacts.
+    </desc>
+    <revision pkgversion="2.28" version="0.1" date="2009-08-02" status="stub"/>
+    <revision pkgversion="2.28" version="0.2" date="2009-08-14" status="review"/>
+    <credit type="author">
+      <name>Milo Casagrande</name>
+      <email>milo@ubuntu.com</email>
+    </credit>
+    <copyright>
+      <year>2009</year>
+      <name>GNOME Documentation Project</name>
+    </copyright>
+    <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
+  </info>
+  <title>Start a video conversation</title>
+
+  <steps>
+    <item>
+      <p>
+        From the <gui>Contact List</gui> window, perform one of the following:
+      </p>
+      <list>
+        <item>
+          <p>
+            Select the contact you want to have a conversation with, and click
+            on the video call icon next to their name.
+          </p>
+        </item>
+        <item>
+          <p>
+            Right-click on the name of the contact you want to have a conversation with, and
+            select <gui>Video Call</gui>.
+          </p>
+        </item>
+      </list>
+    </item>
+    <item>
+      <p>
+        A new window will open. When the connection is established, you will
+        see written, at the bottom of the window, <gui>Connected</gui> and the total
+        conversation time.
+      </p>
+    </item>
+    <item>
+      <p>
+        To close the conversation, click on <gui>Hang up</gui>.
+      </p>
+    </item>
+  </steps>
+  <note style="tip">
+    <p>
+      To turn a video conversation into an audio one, from the call window deselect
+      <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>,
+      or click on the video call icon.
+    </p>
+  </note>
+
+
+
+</page>
diff --git a/help/Makefile.am b/help/Makefile.am
index f51965b59..4041f9ad9 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,8 +1,57 @@
 include $(top_srcdir)/gnome-doc-utils.make
 
-DOC_MODULE = empathy
-DOC_ENTITIES = legal.xml
+DOC_ID = empathy
+DOC_INCLUDES = legal.xml
 DOC_FIGURES = \
+	figures/audio-input-microphone.png \
+	figures/available.png \
+	figures/away.png \
+	figures/busy.png \
+	figures/camera-web.png \
 	figures/empathy-main-window.png
+
+DOC_PAGES = \
+	add-account.page \
+	add-contact.page \
+	audio-call.page \
+	audio-video.page \
+	change-status.page \
+	create-account.page \
+	disable-account.page \
+	favorite-rooms.page \
+	geolocation.page \
+	geolocation-not-showing.page \
+	geolocation-privacy.page \
+	geolocation-supported.page \
+	geolocation-turn.page \
+	geolocation-what-is.page \
+	group-conversations.page \
+	index.page \
+	introduction.page \
+	irc-account.page \
+	irc-join-pwd.page \
+	irc-join-room.page \
+	irc-manage.page \
+	irc-nick-password.page \
+	irc-sending-file.page \
+	irc-start-conversation.page \
+	offline-contacts.page \
+	prev-conv.page \
+	prob-conn-acctdisabled.page \
+	prob-conn-auth.page \
+	prob-conn-name.page \
+	prob-conn-neterror.page \
+	prob-conn.page \
+	remove-account.page \
+	salut-protocol.page \
+	send-file.page \
+	send-message.page \
+	set-custom-status.page \
+	share-desktop.page \
+	start-conversation.page \
+	status-icons.page \
+	video-call.page
+
+
 DOC_LINGUAS = ca cs de el en_GB es fi fr it ru sv
 dist-hook: doc-dist-hook
diff --git a/help/de/de.po b/help/de/de.po
index a77763d82..3932dc304 100644
--- a/help/de/de.po
+++ b/help/de/de.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"POT-Creation-Date: 2009-07-26 09:48+0000\n"
-"PO-Revision-Date: 2009-07-26 17:56+0100\n"
+"POT-Creation-Date: 2009-07-30 18:05+0000\n"
+"PO-Revision-Date: 2009-08-04 21:48+0100\n"
 "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -331,9 +331,12 @@ msgid "<guimenu>Applications</guimenu> menu"
 msgstr "Menü <guimenu>Anwendungen</guimenu>"
 
 #: C/empathy.xml:228(para)
+#| msgid ""
+#| "Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
+#| "Instant Messenger</guimenuitem></menuchoice>."
 msgid ""
-"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
-"Instant Messenger</guimenuitem></menuchoice>."
+"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy IM "
+"Client</guimenuitem></menuchoice>."
 msgstr ""
 "Wählen Sie <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
 "Sofortnachrichtendienst</guimenuitem></menuchoice>."
@@ -1417,4 +1420,4 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Mario Blättermann <mariobl@gnome.org>, 2008, 2009\n"
-"Philipp Kerling <k.philipp@gmail.com>, 2008"
\ No newline at end of file
+"Philipp Kerling <k.philipp@gmail.com>, 2008"
diff --git a/help/es/es.po b/help/es/es.po
index 753288b03..8a1a1a79d 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -1,10 +1,10 @@
-# translation of empathy.help.HEAD.po to Español
-# Jorge González <jorgegonz@svn.gnome.org>, 200, 2009.
+# translation of empathy-help.po to Español
+# Jorge González <jorgegonz@svn.gnome.org>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy.help.HEAD\n"
-"POT-Creation-Date: 2009-05-05 20:43+0000\n"
-"PO-Revision-Date: 2009-05-09 10:54+0200\n"
+"Project-Id-Version: empathy-help\n"
+"POT-Creation-Date: 2009-08-14 21:29+0200\n"
+"PO-Revision-Date: 2009-08-15 14:20+0200\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,1488 +13,1675 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#. When image changes, this message will be marked fuzzy or untranslated for you.
-#. It doesn't matter what you translate it to: it's not used at all.
-#: C/empathy.xml:262(None)
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:8(desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "Iniciar una conversación de vídeo con uno de sus contactos."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:14(title)
+msgid "Start a video conversation"
+msgstr "Comenzar una conversación de vídeo"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:18(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:42(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:26(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:31(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:34(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:36(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:39(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:27(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:20(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:26(p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr ""
+"En la ventana de la <gui>Lista de contactos</gui> realice una de las "
+"siguientes acciones:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:23(p)
 msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=38259a866f38ff1f754828e46d2b0e5c"
+"Select the contact you want to have a conversation with, and click on the "
+"video call icon next to their name."
 msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=38259a866f38ff1f754828e46d2b0e5c"
+"Seleccione el contacto con el que quiera tener una conversación y pulse en "
+"el icono de vídeo llamada junto a su nombre."
 
-#: C/empathy.xml:27(title)
-#| msgid "<application>Empathy</application> Manual V2.1"
-msgid "<application>Empathy</application> Manual V2.2"
-msgstr "Manual de <application>Empathy</application> V2.2"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:29(p)
+msgid ""
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Video Call</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Llamada de vídeo</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:39(p)
+msgid ""
+"A new window will open. When the connection is established, you will see "
+"written, at the bottom of the window, <gui>Connected</gui> and the total "
+"conversation time."
+msgstr ""
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá escrito, "
+"en la parte inferior de la ventana, <gui>Connectado</gui> y el tiempo total "
+"de conversación."
 
-#: C/empathy.xml:30(year) C/empathy.xml:46(year)
-msgid "2008, 2009"
-msgstr "2008, 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:46(p)
+msgid "To close the conversation, click on <gui>Hang up</gui>."
+msgstr "Para cerrar la conversación pulse <gui>Colgar</gui>."
 
-#: C/empathy.xml:31(holder) C/empathy.xml:47(publishername)
-#: C/empathy.xml:62(orgname) C/empathy.xml:70(orgname) C/empathy.xml:112(para)
-#: C/empathy.xml:126(para)
-msgid "Ubuntu Documentation Project"
-msgstr "Proyecto de documentación de Ubuntu"
+#: /media/data/jhbuild/checkout/empathy/help/C/video-call.page:50(p)
+msgid ""
+"To turn a video conversation into an audio one, from the call window "
+"deselect <guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click on "
+"the video call icon."
+msgstr ""
+"Para convertir una conversación de vídeo en una de sonido, desde la ventana "
+"de llamada deseleccione <guiseq><gui>Llamar</gui><gui>Enviar vídeo</gui></"
+"guiseq> o pulse el icono de vídeo llamada."
 
-#: C/empathy.xml:34(year) C/empathy.xml:42(year)
-#| msgid "2008"
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:55(None)
+msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:73(None)
+msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:90(None)
+msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:6(desc)
+msgid "Understanding the various status icons."
+msgstr "Entender los diversos iconos de estado."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:36(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:32(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:28(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:25(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:10(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:12(name)
+msgid "Milo Casagrande"
+msgstr "Milo Casagrande"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:17(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:11(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:16(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:16(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:13(email)
+msgid "milo@ubuntu.com"
+msgstr "milo@ubuntu.com"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:20(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:22(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:15(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:17(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:14(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:19(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:18(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:16(year)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:16(year)
 msgid "2009"
 msgstr "2009"
 
-#: C/empathy.xml:35(holder) C/empathy.xml:43(publishername)
-#: C/empathy.xml:58(orgname) C/empathy.xml:101(para)
-#| msgid "Ubuntu Documentation Project"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:21(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:23(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:16(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:18(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:15(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:20(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:19(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:17(name)
 msgid "GNOME Documentation Project"
 msgstr "Proyecto de documentación de GNOME"
 
-#: C/empathy.xml:2(para)
-msgid ""
-"Permission is granted to copy, distribute and/or modify this document under "
-"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
-"later version published by the Free Software Foundation with no Invariant "
-"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
-"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
-"in the file COPYING-DOCS distributed with this manual."
-msgstr ""
-"Se concede permiso para copiar, distribuir o modificar este documento según "
-"las condiciones de la GNU Free Documentation License (GFDL), Versión 1.1 o "
-"cualquier versión posterior publicada por la Free Software Foundation sin "
-"Secciones invariantes, Textos de portada y Textos de contraportada. "
-"Encontrará una copia de la GFDL en este <ulink type=\"help\" url=\"ghelp:fdl"
-"\">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual."
-
-#: C/empathy.xml:12(para)
-msgid ""
-"This manual is part of a collection of GNOME manuals distributed under the "
-"GFDL. If you want to distribute this manual separately from the collection, "
-"you can do so by adding a copy of the license to the manual, as described in "
-"section 6 of the license."
-msgstr ""
-"Este manual forma parte de una colección de documentos de GNOME distribuidos "
-"según la GFDL. Si desea distribuir este manual de forma independiente de la "
-"colección, puede hacerlo agregando una copia de la licencia al documento, "
-"según se describe en la sección 6 de la misma."
-
-#: C/empathy.xml:19(para)
-msgid ""
-"Many of the names used by companies to distinguish their products and "
-"services are claimed as trademarks. Where those names appear in any GNOME "
-"documentation, and the members of the GNOME Documentation Project are made "
-"aware of those trademarks, then the names are in capital letters or initial "
-"capital letters."
-msgstr ""
-"Muchos de los nombres utilizados por las empresas para distinguir sus "
-"productos y servicios se consideran marcas comerciales. Cuando estos nombres "
-"aparezcan en la documentación de GNOME, y siempre que se haya informado a "
-"los miembros del Proyecto de documentación de GNOME de dichas marcas "
-"comerciales, los nombres aparecerán en mayúsculas o con las iniciales en "
-"mayúsculas."
-
-#: C/empathy.xml:35(para)
-msgid ""
-"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
-"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
-"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
-"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
-"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
-"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
-"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
-"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
-"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
-"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
-"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
-msgstr ""
-"EL DOCUMENTO SE PROPORCIONA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, NI "
-"EXPLÍCITA NI IMPLÍCITA INCLUYENDO, SIN LIMITACIÓN, GARANTÍA DE QUE EL "
-"DOCUMENTO O VERSIÓN MODIFICADA DE ÉSTE CAREZCA DE DEFECTOS COMERCIALES, SEA "
-"ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO "
-"RELATIVO A LA CALIDAD, PRECISIÓN Y UTILIDAD DEL DOCUMENTO O SU VERSIÓN "
-"MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÓN MODIFICADA DE "
-"AQUÉL RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR "
-"INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÁ LOS COSTES DE TODA REPARACIÓN, "
-"MANTENIMIENTO O CORRECCIÓN NECESARIOS. ESTA RENUNCIA DE GARANTÍA ES UNA "
-"PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÚN DOCUMENTO "
-"NI VERSIÓN MODIFICADA DE ÉSTE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
-"DE LA RENUNCIA;Y"
-
-#: C/empathy.xml:55(para)
-msgid ""
-"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
-"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
-"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
-"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
-"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
-"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
-"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
-"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
-"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
-"POSSIBILITY OF SUCH DAMAGES."
-msgstr ""
-"EN NINGUNA CIRCUNSTANCIA NI BAJO NINGUNA TEORÍA LEGAL, SEA POR ERROR "
-"(INCLUYENDO NEGLIGENCIA) CONTRATO O DOCUMENTO DE OTRO TIPO, EL AUTOR, EL "
-"ESCRITOR INICIAL, EL AUTOR DE APORTACIONES NI NINGÚN DISTRIBUIDOR DEL "
-"DOCUMENTO O VERSIÓN MODIFICADA DEL DOCUMENTO, NI NINGÚN PROVEEDOR DE NINGUNA "
-"DE ESAS PARTES, SERÁ RESPONSABLE ANTE NINGUNA PERSONA POR NINGÚN DAÑO "
-"DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O DERIVADO DE NINGÚN TIPO, "
-"INCLUYENDO, SIN LIMITACIÓN DAÑOS POR PÉRDIDA DE FONDO DE COMERCIO, PARO "
-"TÉCNICO, FALLO INFORMÁTICO O AVERÍA O CUALQUIER OTRO POSIBLE DAÑO O AVERÍA "
-"DERIVADO O RELACIONADO CON EL USO DEL DOCUMENTO O SUS VERSIONES MODIFICADAS, "
-"AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE SE "
-"PRODUJESEN ESOS DAÑOS."
-
-#: C/empathy.xml:28(para)
-msgid ""
-"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
-"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
-"<placeholder-1/>"
-msgstr ""
-"ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÚN "
-"LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÓN LIBRE DE GNU "
-"(GFDL) Y TENIENDO EN CUENTA QUE: <placeholder-1/>"
-
-#: C/empathy.xml:55(firstname)
-msgid "Milo"
-msgstr "Milo"
-
-#: C/empathy.xml:56(surname)
-msgid "Casagrande"
-msgstr "Casagrande"
-
-#: C/empathy.xml:59(email) C/empathy.xml:63(email)
-msgid "milo@ubuntu.com"
-msgstr "milo@ubuntu.com"
-
-#: C/empathy.xml:67(firstname)
-msgid "Seth"
-msgstr "Seth"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:24(title)
+msgid "Status icons"
+msgstr "Iconos de estado"
 
-#: C/empathy.xml:68(surname)
-msgid "Dudenhofer"
-msgstr "Dudenhofer"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:28(p)
+msgid ""
+"Need to understand when the extended away icon is used: how many minuts/"
+"hours should pass?"
+msgstr ""
+"Necesita entender cuándo se usa el icono de ausencia extendida: ¿cuántos "
+"minutos/horas deben pasar?"
 
-#: C/empathy.xml:71(email)
-msgid "sdudenhofer@gmail.com"
-msgstr "sdudenhofer@gmail.com"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:31(p)
+msgid "Need also to check for images to work!"
+msgstr "Necesita también comprobar que funcionen las imágenes."
 
-#: C/empathy.xml:95(revnumber)
-#| msgid "Empathy Manual V2.1"
-msgid "Empathy Manual V2.2"
-msgstr "Manual de Empathy V2.2"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:40(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:26(p)
+msgid "Icon"
+msgstr "Icono"
 
-#: C/empathy.xml:96(date)
-#| msgid "January 2009"
-msgid "May 2009"
-msgstr "Mayo de 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:45(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:31(p)
+msgid "Description"
+msgstr "Descripción"
 
-#: C/empathy.xml:98(para) C/empathy.xml:109(para) C/empathy.xml:120(para)
-msgid "Milo Casagrande <email>milo@ubuntu.com</email>"
-msgstr "Milo Casagrande <email>milo@ubuntu.com</email>"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:55(media)
+msgid "Available icon"
+msgstr "Icono de disponible"
 
-#: C/empathy.xml:106(revnumber)
-msgid "Empathy Manual V2.1"
-msgstr "Manual de Empathy V2.1"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:61(p)
+msgid "This is the default icon for the <em>Available</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Disponible</em>."
 
-#: C/empathy.xml:107(date)
-msgid "January 2009"
-msgstr "Enero de 2009"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:64(p)
+msgid ""
+"Use this icon when you are availble to have conversations with other people."
+msgstr ""
+"Use este icono cuando esté disponible para tener conversaciones con otras "
+"personas."
 
-#: C/empathy.xml:117(revnumber)
-msgid "Empathy Manual V2.0"
-msgstr "Manual de Empathy V2.0"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:73(media)
+msgid "Busy icon"
+msgstr "Icono de ocupado"
 
-#: C/empathy.xml:118(date)
-msgid "April 2008"
-msgstr "Abril de 2008"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:79(p)
+msgid "This is the default icon for the <em>Busy</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Ocupado</em>."
 
-#: C/empathy.xml:123(para)
-msgid "Seth Dudenhofer <email>sdudenhofer@gmail.com</email>"
-msgstr "Seth Dudenhofer <email>sdudenhofer@gmail.com</email>"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:82(p)
+msgid "Use this icon when you do not want to be disturbed."
+msgstr "Use este icono cuando no quiera que le molesten."
 
-#: C/empathy.xml:131(releaseinfo)
-#| msgid "This manual describes version 2.26 of Empathy."
-msgid "This manual describes version 2.28 of Empathy."
-msgstr "Este manual describe la versión 2.28 de Empathy."
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:90(media)
+msgid "Away icon"
+msgstr "Icono de ausente"
 
-#: C/empathy.xml:135(title)
-msgid "Feedback"
-msgstr "Comentarios"
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:96(p)
+msgid "This is the default icon for the <em>Away</em> status."
+msgstr "Éste es el icono predeterminado para el estado <em>Ausente</em>."
 
-#: C/empathy.xml:136(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/status-icons.page:99(p)
 msgid ""
-"To report a bug or make a suggestion regarding the <application>Empathy</"
-"application> application or this manual, follow the directions in the <ulink "
-"url=\"ghelp:user-guide?feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+"Use this icon when you are going away from the computer. This icon is used "
+"also when you leave the computer and the screensaver turns on."
 msgstr ""
-"Para informar de un fallo, o hacer alguna sugerencia concerniente a la "
-"aplicación <application>Empathy</application> o este manual, siga las "
-"indicaciones en la <ulink url=\"ghelp:user-guide?feedback\" type=\"help"
-"\">Página de comentarios de GNOME</ulink>."
-
-#: C/empathy.xml:143(para)
-msgid "Empathy is an application for instant messaging."
-msgstr "Empathy es una aplicación para mensajería instantánea."
-
-#: C/empathy.xml:151(primary) C/empathy.xml:0(application)
-msgid "Empathy"
-msgstr "Empathy"
+"Use este icono cuando vaya a estar ausente del equipo. Este icono se usa "
+"cuando deja el equipo y se activa el salvapantallas."
 
-#: C/empathy.xml:154(primary)
-msgid "empathy"
-msgstr "empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:7(desc)
+msgid "Share the desktop with your contacts."
+msgstr "Compartir el escritorio con sus contactos."
 
-#: C/empathy.xml:155(secondary)
-msgid "istant messaging"
-msgstr "mensajería instantánea"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:24(title)
+msgid "Share your desktop"
+msgstr "Compartir su escritorio"
 
-#: C/empathy.xml:159(title)
-msgid "Introduction"
-msgstr "Introducción"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:26(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."
+msgstr ""
+"Es posible, con algunos de sus contactos, compartir su escritorio con ellos, "
+"o usar el escritorio de sus contactos. Puede usar esta funcionalidad para "
+"mostrar su escritorio a sus contactos, o preguntar por ayuda o ayudar a sus "
+"contactos a resolver problemas."
 
-#: C/empathy.xml:160(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:34(p)
 msgid ""
-"<application>Empathy</application> is a multi-protocol instant messaging "
-"program for the GNOME Desktop. With <application>Empathy</application> you "
-"can keep in touch with all of your friends through lots of supported instant "
-"messaging services."
+"In order to be able to share your desktop or to remotely use your contacts "
+"desktop, it is necessary to have a remote desktop viewer application "
+"installed in your system."
 msgstr ""
-"<application>Empathy</application> es un programa multiprotocolo de "
-"mensajería instantánea para el Escritorio GNOME. Con <application>Empathy</"
-"application> puede mantenerse en contacto con sus amigos a través de muchos "
-"de los servicios de mensajería instantánea soportados."
+"Para poder compartir su escritorio o usar remotamente el escritorio de sus "
+"contactos es necesario tener una aplicación de visión remota de escritorios "
+"instalada en su sistema."
 
-#: C/empathy.xml:170(acronym)
-msgid "AIM"
-msgstr "AIM"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:47(p)
+msgid ""
+"Select the contact you want to share your desktop with, and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share my desktop</gui></"
+"guiseq>."
+msgstr ""
+"Seleccione el contacto con el que quiera compartir su escritorio y pulse "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Compartir mi escritorio</"
+"gui></guiseq>."
 
-#: C/empathy.xml:174(para)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:53(p)
+msgid ""
+"Right-click on the name of the contact you want to share your desktop with, "
+"and select <gui>Share my desktop</gui>."
+msgstr ""
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera compartir su escritorio y seleccione <gui>Compartir mi escritorio</"
+"gui>."
 
-#: C/empathy.xml:179(para) C/empathy.xml:1114(title)
-msgid "ICQ"
-msgstr "ICQ"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:61(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."
+msgstr ""
+"Se enviará una solicitud al contacto con el que quiere compartir su "
+"escritorio. Si acepta, se lanzará la aplicación de visión remota de "
+"escritorios para permitirle desconectar al usuario que está controlando su "
+"escritorio."
 
-#: C/empathy.xml:185(acronym)
-msgid "IRC"
-msgstr "IRC"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:66(p)
+msgid ""
+"For more information about how to use the remote desktop viewer application, "
+"refer to its help."
+msgstr ""
+"Para obtener más información acerca de cómo usar la aplicación de visión de "
+"escritorios remotos, consulte su ayuda."
 
-#: C/empathy.xml:189(para)
-msgid "Jabber (or <acronym>XMPP</acronym>)"
-msgstr "Jabber (o <acronym>XMPP</acronym>)"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:73(p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+msgstr ""
+"Cuando comparte su escritorio con otros, es posible que experimente una "
+"ralentización del rendimiento del sistema y una baja velocidad de Internet."
 
-#: C/empathy.xml:195(acronym)
-msgid "MSN"
-msgstr "MSN"
+#: /media/data/jhbuild/checkout/empathy/help/C/share-desktop.page:79(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."
+msgstr ""
+"No todos sus contactos pueden usar esta funcionalidad. Es necesario que "
+"tengan al menos la versión 2.28 de <app>Empathy</app> y una aplicación de "
+"visión remota de escritorios instalada en su sistema."
 
-#: C/empathy.xml:199(para) C/empathy.xml:466(para) C/empathy.xml:1074(title)
-msgid "Salut"
-msgstr "Salut"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:9(desc)
+msgid "Set a personal message for your status."
+msgstr "Establecer un mensaje personal para su estado."
 
-#: C/empathy.xml:205(acronym)
-msgid "SIP"
-msgstr "SIP"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:15(name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/empathy.xml:209(para) C/empathy.xml:944(title)
-msgid "Yahoo"
-msgstr "Yahoo"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:16(email)
+msgid "jwcampbell@gmail.com"
+msgstr "jwcampbell@gmail.com"
 
-#: C/empathy.xml:214(para)
-msgid "And many others..."
-msgstr "Y muchos otros…"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:26(title)
+msgid "Set a custom message"
+msgstr "Establecer un mensaje personalizado"
 
-#: C/empathy.xml:165(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:28(p)
 msgid ""
-"<application>Empathy</application> supports the following services: "
-"<placeholder-1/>"
+"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 ""
-"<application>Empathy</application> soporta los siguientes servicios: "
-"<placeholder-1/>"
+"A veces puede querer usar un mensaje personal para su estado, por ejemplo, "
+"para hacer saber a sus contactos que no estará disponible por un periodo de "
+"tiempo."
 
-#: C/empathy.xml:223(title)
-msgid "Getting Started"
-msgstr "Inicio"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:32(p)
+msgid ""
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr ""
+"Es posible establecer un mensaje personalizado basado en los diferentes "
+"estados disponibles."
 
-#: C/empathy.xml:226(title)
-msgid "Starting Empathy"
-msgstr "Iniciar Empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:38(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:74(p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr ""
+"Desde la ventana de la <gui>Lista de contactos</gui>, pulse en la lista "
+"desplegable en la parte superior."
 
-#: C/empathy.xml:227(para)
-msgid "You can start <application>Empathy</application> in the following ways:"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:44(p)
+msgid ""
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"Puede iniciar <application>Empathy</application> de las siguientes formas:"
+"Seleccione el estado al que quiere añadir el mensaje personalizado. Tiene "
+"que seleccionar el identificado con la etiqueta <gui>Mensaje personalizado</"
+"gui>."
 
-#: C/empathy.xml:231(term)
-msgid "<guimenu>Applications</guimenu> menu"
-msgstr "Menú <guimenu>Aplicaciones</guimenu>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:50(p)
+msgid ""
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
+msgstr ""
+"Introduzca su mensaje personalizado en la caja de texto en la parte superior "
+"de la ventana y pulse <key>Intro</key> para establecer el mensaje."
 
-#: C/empathy.xml:233(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:56(p)
 msgid ""
-"Choose <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Empathy "
-"Instant Messenger</guimenuitem></menuchoice>."
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little star on the right of the text box where "
+"you wrote your custom message."
 msgstr ""
-"Elija <menuchoice><guisubmenu>Internet</guisubmenu><guimenuitem>Mensajería "
-"instantánea Empathy</guimenuitem></menuchoice>."
+"Si quiere establecer el mensaje personalizado como un favorito, guardándolo "
+"para usarlo de nuevo, pulse en la pequeña estrella a la derecha de la caja "
+"de texto donde escribió su mensaje personalizado."
 
-#: C/empathy.xml:242(term)
-msgid "Command line"
-msgstr "Línea de comandos"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:61(p)
+msgid ""
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
+msgstr ""
+"Si no lo hace el mensaje personalizado no estará disponible la próxima vez "
+"que use <app>Empathy</app>. Sólo se guardará durante la sesión actual."
 
-#: C/empathy.xml:244(para)
-msgid "Type <command>empathy</command> and then press <keycap>Enter</keycap>."
-msgstr "Escriba <command>empathy</command> y pulse <keycap>intro</keycap>."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:70(title)
+msgid "Edit, remove and add a custom message"
+msgstr "Editar, quitar y añadir un mensaje personalizado"
 
-#: C/empathy.xml:253(title)
-msgid "When You Start Empathy"
-msgstr "Al iniciar Empathy"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:80(p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "Seleccione <gui>Editar mensaje personalizado</gui>."
 
-#: C/empathy.xml:258(title)
-msgid "<application>Empathy</application> Main Window"
-msgstr "Ventana principal de <application>Empathy</application>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:87(p)
+msgid "To edit a custom message:"
+msgstr "Para editar un mensaje personalizado:"
 
-#: C/empathy.xml:265(phrase)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:92(p)
 msgid ""
-"Shows <placeholder-1/> main window. Contains the titlebar, the menubar, "
-"contact list, status icon and status arrow button list."
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
 msgstr ""
-"Muestra la ventana principal de <placeholder-1/>. Contiene la barra de "
-"título, la barra de menú, la lista de contactos, el icono de estado y la "
-"lista de estados."
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere editar y pulse dos veces sobre él."
 
-#: C/empathy.xml:254(para)
-msgid ""
-"When you start <application>Empathy</application> the following window is "
-"shown. <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:98(p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
 msgstr ""
-"Se mostrará la siguiente ventana al iniciar <application>Empathy</"
-"application>. <placeholder-1/>"
+"Escriba el mensaje personalizado nuevo y pulse <key>Intro</key> para "
+"modificarlo."
 
-#: C/empathy.xml:280(title)
-msgid "<application>Empathy</application> Main Components"
-msgstr "Componentes principales de <application>Empathy</application>"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:105(p)
+msgid "To remove a custom message:"
+msgstr "Para quitar un mensaje personalizado:"
 
-#: C/empathy.xml:287(para)
-msgid "Component"
-msgstr "Componente"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:110(p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr ""
+"Desde la caja <gui>Estados guardados</gui>, seleccione el mensaje de estado "
+"que quiere quitar."
 
-#: C/empathy.xml:290(para)
-msgid "Description"
-msgstr "Descripción"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:116(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:57(p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "Pulse el botón <gui>Quitar</gui>."
 
-#: C/empathy.xml:297(para)
-msgid "Menubar"
-msgstr "Barra de menú"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:123(p)
+msgid ""
+"To add a new custom message, from the <gui>Add New Preset</gui> section:"
+msgstr ""
+"Para añadir un mensaje personalizado nuevo, desde la sección <gui>Añadir "
+"estado guardado</gui> "
 
-#: C/empathy.xml:300(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:128(p)
 msgid ""
-"Contains menus used to perform actions in <application>Empathy</application>."
+"Click on the drop-down list to select the status you want to set a custom "
+"message to."
 msgstr ""
-"Contiene los menús usados para realizar acciones en <application>Empathy</"
-"application>."
+"Pulse en la lista desplegable para seleccionar el estado en el que quiere "
+"establecer un mensaje personalizado."
 
-#: C/empathy.xml:307(para)
-msgid "Status Drop-Down List"
-msgstr "Lista desplegable de estados"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:134(p)
+msgid "Click on the text box, and type the new custom message."
+msgstr "Pulse en la caja de texto y escriba el mensaje personalizado nuevo."
 
-#: C/empathy.xml:310(para)
-msgid "Allows to update the status."
-msgstr "Permite actualizar el estado."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:139(p)
+msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+msgstr "Pulse <gui>Añadir</gui> para añadir un mensaje nuevo a los guardados."
 
-#: C/empathy.xml:317(para)
-msgid "Account Button"
-msgstr "Botón Cuentas"
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:148(p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "Cuando haya terminado pulse <gui>Cerrar</gui>."
 
-#: C/empathy.xml:320(para)
-msgid "Opens the <guilabel>Accounts</guilabel> dialog."
-msgstr "Abre el diálogo <guilabel>Cuentas</guilabel>."
+#: /media/data/jhbuild/checkout/empathy/help/C/set-custom-status.page:155(p)
+msgid ""
+"When you edit or add a new custom message, it will not be set as the current "
+"status message. You will need to select it from the <gui>Contact List</gui> "
+"window."
+msgstr ""
+"Cuando edita o añade un mensaje personalizado nuevo no se establece como el "
+"mensaje de estado actual. Tiene que seleccionarlo en la ventana de "
+"<gui>Lista de contactos</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:7(desc)
+msgid "Send a message to one of your contacts."
+msgstr "Enviar un mensaje a uno de sus contactos."
 
-#: C/empathy.xml:327(para)
-msgid "Contact List"
-msgstr "Lista de contactos"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:11(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:27(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:33(cite)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:17(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:13(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:14(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:12(name)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:25(cite)
+msgid "Phil Bull"
+msgstr "Phil Bull"
 
-#: C/empathy.xml:330(para)
-msgid "Shows all the available contacts and their associated status."
-msgstr "Muestra todos los contactos disponibles y su estado asociado."
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:12(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:13(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:18(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:14(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:15(email)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:13(email)
+msgid "philbull@gmail.com"
+msgstr "philbull@gmail.com"
 
-#: C/empathy.xml:276(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:22(title)
+msgid "Send a message to someone"
+msgstr "Enviar un mensaje a alguien"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:31(p)
 msgid ""
-"<xref linkend=\"empathy-TBL-1\"/> describes the components of "
-"<application>Empathy</application>'s main window. <table frame=\"topbot\" id="
-"\"empathy-TBL-1\"><placeholder-1/><tgroup cols=\"2\" colsep=\"0\" rowsep=\"0"
-"\"><colspec colname=\"colspec0\" colwidth=\"29.39*\"/><colspec colname="
-"\"colspec1\" colwidth=\"70.61*\"/><placeholder-2/><placeholder-3/></tgroup></"
-"table>"
+"Double-click the name of the contact that you want to have a conversation "
+"with."
 msgstr ""
-"La <xref linkend=\"empathy-TBL-1\"/> describe los componentes de la ventana "
-"principal de <application>Empathy</application>. <table frame=\"topbot\" id="
-"\"empathy-TBL-1\"><placeholder-1/><tgroup cols=\"2\" colsep=\"0\" rowsep=\"0"
-"\"><colspec colname=\"colspec0\" colwidth=\"29.39*\"/><colspec colname="
-"\"colspec1\" colwidth=\"70.61*\"/><placeholder-2/><placeholder-3/></tgroup></"
-"table>"
-
-#: C/empathy.xml:344(title)
-msgid "Accounts"
-msgstr "Cuentas"
+"Pulse dos veces sobre el nombre del contacto con el que quiere conversar."
 
-#: C/empathy.xml:345(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:37(p)
 msgid ""
-"To use <application>Empathy</application> you need at least one account of "
-"the supported services."
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Chat</gui>."
 msgstr ""
-"Para usar <application>Empathy</application> debe tener al menos una cuenta "
-"de los servicios soportados."
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Chat</gui>."
 
-#: C/empathy.xml:348(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-message.page:45(p)
 msgid ""
-"If you don't already have an account and you don't have your <emphasis>user "
-"name</emphasis> and <emphasis>password</emphasis>, you need to register a "
-"new account (see <xref linkend=\"empathy-register-account\"/>)."
+"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 ""
-"Si aún no tiene una cuenta y no tiene su <emphasis>usuario</emphasis> y "
-"<emphasis>contraseña</emphasis>, debe registrar una cuenta nueva (consulte "
-"<xref linkend=\"empathy-register-account\"/>)."
+"Se abrirá una ventana nueva. Cuando se establezca la conexión, verá la "
+"ventana de charla en la parte inferior de la ventana, <key>Intro</key> y el "
+"tiempo total de conversación."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:7(desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "Enviar un archivo desde su equipo a uno de sus contactos."
 
-#: C/empathy.xml:353(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:27(title)
+msgid "Send files"
+msgstr "Enviar archivos"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:36(p)
 msgid ""
-"In order to talk with other users, also called <emphasis>contacts</"
-"emphasis>, you need to use the same service they are using. If, for example, "
-"one contact is using the <emphasis role=\"strong\">Jabber</emphasis> "
-"service, you need to have an account registered with that service."
+"Right-click on the contact you want to send a file, and select <gui>Send "
+"file</gui>."
 msgstr ""
-"Para poder hablar con otros usuarios (llamados <emphasis>contactos</"
-"emphasis>), debe usar el mismo servicio que ellos usan. Si, por ejemplo, uno "
-"de sus contactos está usando el servicio <emphasis role=\"strong\">Jabber</"
-"emphasis>, necesita tener una cuenta registrada en ese servicio."
+"Pulse con el botón derecho sobre el contacto al que quiere enviar un archivo "
+"y seleccione <gui>Enviar archivo</gui>.."
 
-#: C/empathy.xml:360(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:41(p)
 msgid ""
-"<application>Empathy</application> can handle as many accounts on any "
-"supported services as you want and you can have them all open at the same "
-"time."
+"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 ""
-"<application>Empathy</application> puede gestionar muchas cuentas en "
-"cualquiera de los servicios soportados que quiera añadir y puede tener todas "
-"ellas abiertas al mismo tiempo."
+"Pulse sobre el contacto al que quiere enviar un archivo y elija "
+"<guiseq><gui>Editar</gui><gui>Contacto</gui><gui>Enviar archivo</gui></"
+"guiseq>."
 
-#: C/empathy.xml:366(title)
-msgid "Registering an Account"
-msgstr "Registrar una cuenta"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:49(p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "Seleccione el archivo para enviar y pulse <gui>Enviar</gui>."
 
-#: C/empathy.xml:367(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:54(p)
 msgid ""
-"You can freely register an account on any of the following services. Follow "
-"the instructions reported on each website on how to register your new "
-"account. At the end of the registration process you should have a "
-"<emphasis>user name</emphasis> (or an <emphasis>account ID</emphasis>) and a "
-"<emphasis>password</emphasis> that you will use to create the account in "
-"<application>Empathy</application>."
-msgstr ""
-"Puede registrar libremente una cuenta en cualquiera de los siguientes "
-"servicios. Siga las instrucciones proporcionadas en cada página web acerca "
-"de cómo registrar su nueva cuenta. Al final del proceso de registro debería "
-"tener un <emphasis>nombre de usuario</emphasis> (o un <emphasis>ID de "
-"cuenta</emphasis>) y una <emphasis>contraseña</emphasis> que usará para "
-"crear la cuenta en <application>Empathy</application>."
-
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:385(para)
-msgid ""
-"The <ulink type=\"http\" url=\"http://dashboard.aim.com/aim\">AIM</ulink> "
-"service."
+"The <gui>File Transfers</gui> window will appear. Wait for your contact to "
+"accept the file transfer, or click <gui>Stop</gui> to halt the transfer."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://dashboard.aim.com/aim\">AIM</"
-"ulink>."
+"Aparecerá la ventana de <gui>Transferencias de archivos</gui>. Espere a que "
+"su contacto acepte la transferencia de archivo o pulse <gui>Detener</gui> "
+"para detener la transferencia."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:392(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:62(p)
 msgid ""
-"The <ulink type=\"http\" url=\"http://www.google.com/talk/\">Google Talk</"
-"ulink> service."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>Salut</em>."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://www.google.com/talk/\">Google "
-"Talk</ulink>."
+"Sólo es posible enviar archivos usando los siguientes servicios: <em>Jabber</"
+"em>, <em>Google Talk</em> y <em>Salut</em>."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:400(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:68(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://www.icq.com/register/\">ICQ</ulink> "
-"service."
+"If your contact accepts the file transfer, you can watch the progress of the "
+"transfer and see the estimated amount of time remaining before it is "
+"complete."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://www.icq.com/register/\">ICQ</"
-"ulink>."
+"Si su contacto acepta la transferencia del archivo puede ver el progreso de "
+"la transferencia y el tiempo restante estimado antes de que se complete."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:407(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:72(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://accountservices.passport.net\">MSN</"
-"ulink> service."
+"If they do not accept it, the status of the transfer will change to "
+"<gui>File transfer cancelled</gui>, and the file will not be sent."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://accountservices.passport.net"
-"\">MSN</ulink>."
+"Si no la aceptan, el estado de la transferencia del archivo cambiará a "
+"<gui>Transferencia de archivo cancelada</gui> y no se enviará el archivo."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:414(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:76(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://login.yahoo.com/config/login\">Yahoo</"
-"ulink> service."
+"Once a transfer is finished, you can close the <gui>File Transfers</gui> "
+"window. 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 ""
-"El servicio <ulink type=\"http\" url=\"https://login.yahoo.com/config/login"
-"\">Yahoo</ulink>."
+"Una vez que la transferencia ha finalizado puede cerrar la ventana de "
+"<gui>Transferencias de archivos</gui>. Si tiene múltiples transferencias "
+"finalizadas listas en la ventana pulse <gui>Limpiar</gui> para vaciar la "
+"lista. Esto sólo quitará los archivos de la lista y no los borrará de su "
+"equipo."
 
-#: C/empathy.xml:376(para)
-msgid "Click on the name of the service to visit its website: <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/send-file.page:84(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 ""
-"Pulse en el nombre del servicio para visitar su página web: <placeholder-1/>"
+"Para poder enviar un archivo a alguien necesita estar conectado a Internet o "
+"a una red de área local."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:7(desc)
+msgid "Undesrtanding the <em>Salut</em> protocol."
+msgstr "Entender el protocolo <em>Salut</em>."
 
-#: C/empathy.xml:420(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:24(title)
+msgid "What is the <em>Salut</em> service?"
+msgstr "¿Qué es el servicio <em>Salut</em>?"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:28(p)
 msgid ""
-"For registering a <acronym>SIP</acronym> account, you can use one of the "
-"following service:"
+"Need to work on this section, explaining people in clear words what the hell "
+"is this service!"
 msgstr ""
-"Para registrar una cuenta <acronym>SIP</acronym>, puede usar uno de los "
-"siguientes servicios:"
+"Se necesita trabajo en esta sección, explicando en palabras clara qué "
+"demonios es este servicio."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:429(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:34(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://www.ekiga.net/index.php?page=register"
-"\">Ekiga</ulink> service."
+"The <em>Salut</em> service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"https://www.ekiga.net/index.php?"
-"page=register\">Ekiga</ulink>."
+"El servicio <em>Salut</em> es un servicio de comunicación sin servidores: no "
+"necesita conectarse y autenticarse contra un servidor central para poder "
+"usarlo."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:436(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:39(p)
 msgid ""
-"The <ulink type=\"http\" url=\"http://account2.freeworlddialup.com/index.php?"
-"section_id=94\"><acronym>FWD</acronym></ulink> (Free World Dialup) service."
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
 msgstr ""
-"El servicio <ulink type=\"http\" url=\"http://account2.freeworlddialup.com/"
-"index.php?section_id=94\">FWD<acronym> (Free World Dialup)."
+"Este tipo de sistemas de mensajería sin servidores está restringido a redes "
+"de área local y no se necesita una conexión activa con Internet."
 
-#. Translators: try to find a localized version of the
-#. 	    registration service website
-#: C/empathy.xml:444(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:43(p)
 msgid ""
-"The <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/app?"
-"class=NewUser;proc=start\">Sipphone</ulink> service."
+"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 ""
-"El servicio <ulink type=\"http\" url=\"https://signup.sipphone.com/new-users/"
-"app?class=NewUser;proc=start\">Sipphone</ulink>."
+"La gente que usa este servicio dentro de la misma red de área local se "
+"autodescubrirá y será posible enviarles mensajes y archivos al igual que con "
+"otros servicios."
 
-#: C/empathy.xml:450(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/salut-protocol.page:48(p)
 msgid ""
-"For registering a <emphasis role=\"strong\">Jabber</emphasis> account, you "
-"can use the automatic account creation of <application>Empathy</"
-"application>. Not all Jabber service providers support the automatic "
-"creation of accounts, one service provider known to work with "
-"<application>Empathy</application> is <ulink type=\"http\" url=\"http://www."
-"jabber.org/web/Jabber.org\">jabber.org</ulink>."
+"All the modern local area networks should be able to support this kind of "
+"service."
 msgstr ""
-"Para registrar una cuenta <emphasis role=\"strong\">Jabber</emphasis> puede "
-"usar la creación automática de cuentas de <application>Empathy</"
-"application>. No todos los proveedores de servicio Jabber soportan la "
-"creación automática de cuentas, uno de los proveedores de servicios que se "
-"sabe que funcionan con <application>Empathy</application> es <ulink type="
-"\"http\" url=\"http://www.jabber.org/web/Jabber.org\">jabber.org</ulink>."
+"Todas las redes modernas de área local deberían poder soportar este tipo de "
+"servicio."
 
-#: C/empathy.xml:458(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:7(desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "Quitar completamente una cuenta en <app>Empathy</app>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:21(title)
+msgid "Remove an account"
+msgstr "Quitar una cuenta"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:23(p)
 msgid ""
-"If you already have a <emphasis role=\"strong\">Jabber</emphasis> account, "
-"you can use one of the following services:"
+"Removing an account means to delete it from your computer with all the "
+"conversations you had with other people."
 msgstr ""
-"Si ya tiene una cuenta <emphasis role=\"strong\">Jabber</emphasis> puede "
-"usar uno de los siguientes servicios:"
-
-#: C/empathy.xml:475(title)
-msgid "Adding your Account to <application>Empathy</application>"
-msgstr "Añadir su cuenta a <application>Empathy</application>"
+"Quitar una cuenta significa borrarla de su equipo junto con todas las "
+"conversaciones que haya tenido con otras personas."
 
-#: C/empathy.xml:480(para) C/empathy.xml:558(para) C/empathy.xml:610(para)
-#: C/empathy.xml:643(para) C/empathy.xml:673(para) C/empathy.xml:696(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:27(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window </link> "
-"(<guilabel>Contact List</guilabel>) click on the account button or press "
-"<keycap>F4</keycap> to open the <guilabel>Accounts</guilabel> dialog."
+"After removing an account you will not be able to recover it or to recover "
+"the conversations you had."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link> "
-"(<guilabel>Lista de contactos</guilabel>) pulse en el botón de cuentas o "
-"<keycap>F4</keycap> para abrir el diálogo <guilabel>Cuentas</guilabel>."
+"Después de quitar una cuenta no podrá recuperarla o recuperar las "
+"conversaciones que tuvo con ella."
 
-#: C/empathy.xml:492(para) C/empathy.xml:509(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:39(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:32(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:42(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:31(p)
+msgid "Press <key>F4</key>."
+msgstr "Pulse <key>F4</key>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:49(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:37(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:47(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:36(p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:51(p)
 msgid ""
-"From the <guilabel>Type</guilabel> drop-down list choose the service you "
-"wish to add an account for, then click on the <guibutton>Create</guibutton> "
-"button."
+"Select the account you wish to remove from the box on the left of the dialog."
 msgstr ""
-"Desde la lista desplegable <guilabel>Tipo</guilabel> elija el servicio para "
-"el que quiere crear la cuenta, después pulse en el botón <guibutton>Crear</"
-"guibutton>."
+"Seleccione la cuenta que quiere quitar en la caja a la izquierda del diálogo."
 
-#: C/empathy.xml:488(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/remove-account.page:62(p)
 msgid ""
-"If it is the first time you launch <application>Empathy</application>: "
-"<placeholder-1/>"
+"A dialog will be shown asking for confirmation. Click on the <gui>Remove</"
+"gui> button to permanently remove the account."
 msgstr ""
-"Si ésta es la primera vez que lanza <application>Empathy</application>: "
-"<placeholder-1/>"
+"Se mostrará un diálogo preguntando por una confirmación. Pulse el botón "
+"<gui>Quitar</gui> para quitar la cuenta permanentemente."
 
-#: C/empathy.xml:504(para)
-msgid "Click on the <guilabel>Add</guilabel> button."
-msgstr "Pulse el botón <guibutton>Añadir</guibutton>."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:7(desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr ""
+"Diagnosticar problemas comunes al conectarse a un servicio de mensajería "
+"instantánea."
 
-#: C/empathy.xml:500(para)
-msgid "Otherwise: <placeholder-1/>"
-msgstr "De otra forma: <placeholder-1/>"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:24(title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "Problemas al conectarse a un servicio de mensajería instantánea"
 
-#: C/empathy.xml:519(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:28(p)
 msgid ""
-"Fill the required fields with your <emphasis>user name</emphasis> and "
-"<emphasis>password</emphasis>. Optionally, you can modify some advanced "
-"options. For more information, see <xref linkend=\"empathy-advanced-options"
-"\"/>."
+"This is a stub. We should identify the most common causes for a user not "
+"being able to connect and document those."
 msgstr ""
-"Rellene los campos necesarios con su <emphasis>usuario</emphasis> y "
-"<emphasis>contraseña</emphasis>. Opcionalmente puede modificar algunas "
-"opciones avanzadas. Para obtener más información consulte <xref linkend="
-"\"empathy-advanced-options\"/>."
+"Esto es un esbozo. Deberíamos identificar las causas más comunes para que un "
+"usuario no se pueda conectar y documentarlas."
 
-#: C/empathy.xml:528(para) C/empathy.xml:591(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:34(p)
+msgid "Check whether gui tags are allowed in section titles and descs."
+msgstr ""
+"Comprobar si las etiquetas del IGU están permitidas en los títulos de "
+"sección y descripciones."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn.page:37(p)
 msgid ""
-"To enable the new account, select the <guilabel>Enabled</guilabel> check-box "
-"next to the name of the account in the box on the left."
+"You can... but the end result is not very good: the title is in blue and the "
+"gui element in grey."
 msgstr ""
-"Para activar la cuenta nueva seleccione la caja de verificación "
-"<guilabel>Activada</guilabel> junto al nombre de la cuenta, en la caja de la "
-"izquierda."
+"Puede... pero el resultado no es muy bueno: el título está en azul y el "
+"elemento del IGU en gris."
 
-#: C/empathy.xml:476(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:8(desc)
 msgid ""
-"To add your account to <application>Empathy</application>, proceed as "
-"follows: <placeholder-1/>"
+"An error message appears in the main <app>Empathy</app> window which says "
+"\"Network error\"."
 msgstr ""
-"Para añadir su cuenta a <application>Empathy</application>, proceda como "
-"sigue: <placeholder-1/>"
+"Aparece un mensaje de error en la ventana principal de <app>Empathy</app> "
+"que muestra «Error de red»."
 
-#: C/empathy.xml:538(title)
-msgid "Importing Accounts"
-msgstr "Importar cuentas"
+#. TODO: rework this page in order to talk about the IRC problem: if you
+#.   don't set your nickname, this is the kind of error that will be shown.
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:29(title)
+msgid "I get a message that says \"Network error\""
+msgstr "Obtengo un mensaje que muestra «Error de red»"
 
-#: C/empathy.xml:539(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:31(p)
 msgid ""
-"If you use another instant messaging program, you can import the accounts "
-"from that program into <application>Empathy</application>"
+"If you try to connect and an error message appears in the main Empathy "
+"window which says \"Network error\", Empathy cannot communicate with the "
+"instant messaging service for some reason."
 msgstr ""
-"Si usa otro programa de mensajería instantánea puede importar las cuentas de "
-"ese programa en <application>Empathy</application>"
+"Si intenta conectarse y aparece un mensaje de error en la ventana principal "
+"de Empathy que muestra «Error de red», Empathy no se puede comunicar con el "
+"servicio de mensajería instantánea por alguna razón."
 
-#: C/empathy.xml:545(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:39(p)
+msgid "Check that you are connected to the Internet or network."
+msgstr "Compruebe que está conectado a Internet o a una red."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:46(p)
+msgid "Click the <gui>Edit Account</gui> button in the error message."
+msgstr "Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:51(p)
 msgid ""
-"At the moment <application>Empathy</application> can import the accounts "
-"only from the instant messaging program <application>Pidgin</application>. "
-"For more information about <application>Pidgin</application>, see the <ulink "
-"type=\"http\" url=\"http://www.pidgin.im/\">Pidgin website</ulink>."
+"Expand the <gui>Advanced</gui> section and make sure that the details such "
+"as server address and port are correct. You should be able to find these "
+"details from the website of the messaging service."
 msgstr ""
-"Por el momento <application>Empathy</application> puede importar cuentas "
-"sólo del programa <application>Pidgin</application>. Para obtener más "
-"información acerca de <application>Pidgin</application> consulte la <ulink "
-"type=\"http\" url=\"http://www.pidgin.im/\">página web de Pidgin</ulink>."
+"Expanda la sección <gui>Avanzadas</gui> y asegúrese de que los detalles "
+"tales como la dirección y el puerto del servidor son correctos. Debería "
+"poder encontrar estos detalles en la página web del servicio de mensajería."
 
-#: C/empathy.xml:566(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-neterror.page:58(p)
 msgid ""
-"Click on the <guibutton>Import Accounts...</guibutton> button to open the "
-"<guilabel>Import Accounts</guilabel> dialog."
+"Uncheck the <gui>Enabled</gui> box next to the name of your account and then "
+"check it again to try to connect to the service again."
 msgstr ""
-"Pulse en el botón <guibutton>Importar cuentas...</guibutton> para abrir el "
-"diálogo <guilabel>Importar cuentas</guilabel>."
+"Desmarque la caja <gui>Activada</gui> junto al nombre de su cuenta y después "
+"márquela de nuevo para intentar conectar con el servicio de nuevo."
 
-#: C/empathy.xml:573(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:8(desc)
 msgid ""
-"Select the accounts you would like to import by clicking on the "
-"<guilabel>Import</guilabel> check-box."
+"An error message appears in the main <app>Empathy</app> window which says "
+"\"Name in use\"."
 msgstr ""
-"Seleccione la cuenta que quiere importar pulsando en la casilla de selección "
-"<guilabel>Importar</guilabel>."
+"Aparece un mensaje de error en la ventana principal de <app>Empathy</app> y "
+"muestra «Nombre en uso»."
 
-#: C/empathy.xml:579(para)
+#. TODO: work on this page. This error appears with the IRC account
+#.     when you set a nickname that is already in use on that network. We need
+#.     to write topics for changing your nickname and to set the password of your
+#.     nickname.
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:31(title)
+msgid "I get a message that says \"Name in use\""
+msgstr "Obtengo un mensaje de error que muestra «Nombre en uso»"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:33(p)
 msgid ""
-"When you have selected all the desired accounts, click <guibutton>OK</"
-"guibutton> to import them. If you don't want to import the accounts, click "
-"<guibutton>Cancel</guibutton>."
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is being used by someone else on that "
+"particular network."
 msgstr ""
-"Cuando haya seleccionado todas las cuentas deseadas pulse "
-"<guibutton>Aceptar</guibutton> para importarlas. Si no quiere importar las "
-"cuentas, pulse el botón <guibutton>Cancelar</guibutton>."
+"Este tipo de error sucede cuando intenta conectarse a su cuenta de IRC y "
+"está usando un apodo que ya está usando otra persona en esa red en "
+"particular."
 
-#: C/empathy.xml:587(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:39(p)
 msgid ""
-"When you import a new account into <application>Empathy</application>, it "
-"will not be enabled by default."
+"To resolve this problem, click on the <gui>Edit Account</gui> button and "
+"perform one of the following:"
 msgstr ""
-"Al importar una cuenta nueva en <application>Empathy</application> no se "
-"activará de forma predeterminada."
+"Para resolver este problema pulse el botón <gui>Editar cuenta</gui> y "
+"realice una de las siguientes acciones:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:46(p)
+msgid "Change your nickname."
+msgstr "Cambie su apodo."
 
-#: C/empathy.xml:554(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-name.page:51(p)
 msgid ""
-"To import the accounts into <application>Empathy</application>, proceed as "
-"follows: <placeholder-1/>"
+"Set the password for that nickname, if you have registered that nickname "
+"within the network you are using. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
 msgstr ""
-"Para importar cuentas en <application>Empathy</application> proceda como "
-"sigue: <placeholder-1/>"
+"Establezca la contraseña para ese apodo, si ha registrado ese apodo en la "
+"red que está usando. Para obtener más información consulte la <link xref="
+"\"irc-nick-password\"/>."
 
-#: C/empathy.xml:603(title)
-msgid "Editing an Account"
-msgstr "Editar una cuenta"
-
-#: C/empathy.xml:618(para)
-msgid "Select the account you wish to edit in the box on the left."
-msgstr "Seleccione la cuenta que quiere editar en la caja a la izquierda."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:8(desc)
+msgid ""
+"An error message appears in the main window saying that "
+"\"<gui>Authentication failed</gui>\"."
+msgstr ""
+"Aparece un mensaje de error en la ventana principal y muestra «<gui>Falló la "
+"autenticación</gui>»."
 
-#: C/empathy.xml:624(para)
-msgid "Modify the desired data."
-msgstr "Modifique los datos deseados."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:29(title)
+msgid "I get a message that says \"Authentication failed\""
+msgstr "Obtengo un mensaje que dice «Falló la autenticación»"
 
-#: C/empathy.xml:604(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:33(p)
 msgid ""
-"To edit one of your accounts, i.e. to change the <emphasis>password</"
-"emphasis> or your <emphasis>user name</emphasis>, proceed as follows: "
-"<placeholder-1/>"
+"Could be useful to link here how to change your password or how to recover "
+"it. Need to write that section."
 msgstr ""
-"Para editar una de sus cuentas, por ejemplo, para cambiar la "
-"<emphasis>contraseña</emphasis> o su <emphasis>usuario</emphasis>, proceda "
-"como sigue: <placeholder-1/>"
+"Podría ser útil enlazar aquí cómo cambiar su contraseña o cómo recuperarla. "
+"Se debe escribir esa sección."
 
-#: C/empathy.xml:632(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:39(p)
 msgid ""
-"Based on the type of the account, it is possibile to edit different settings."
-msgstr "Basado en el tipo de cuenta, es posible editar diferentes ajustes."
+"If you try to connect and you get a message saying <gui>Authentication "
+"failed</gui>, your instant messaging service is not allowing you to connect "
+"because it does not recognize your username or password for some reason."
+msgstr ""
+"Si intenta conectarse y obtiene un mensaje diciendo <gui>Falló la "
+"autenticación</gui> su servicio de mensajería instantánea no le está "
+"permitiendo conectarse porque por algún motivo no reconoce su nombre de "
+"usuario o su contraseña."
 
-#: C/empathy.xml:651(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:47(p)
 msgid ""
-"Select the account you wish to edit in the box on the left and double-click "
-"on its name."
+"Make sure that you have registered for 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 ""
-"Seleccione la cuenta que quiere editar en la caja de la izquierda y pulse "
-"dos veces en su nombre."
+"Asegúrese de que ha registrado una cuenta con el servicio al que está "
+"intentando conectarse. Si no tiene una cuenta la mayoría de los servicios no "
+"le permitirán que se conecte."
 
-#: C/empathy.xml:657(para)
-msgid "Change the name of the account as you desire."
-msgstr "Cambie el nombre de la cuenta como desee."
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-auth.page:54(p)
+msgid ""
+"Click the <gui>Edit Account</gui> button in the error message. Type your "
+"username and password again to make sure that they are correct. Deselect the "
+"<gui>Enabled</gui> box next to the name of your account and then select it "
+"to try to connect to the service again."
+msgstr ""
+"Pulse el botón <gui>Editar cuenta</gui> en el mensaje de error. Escriba de "
+"nuevo su nombre de usuario y contraseña para asegurarse de que son "
+"correctos. Desmarque la caja <gui>Activada</gui> junto al nombre de la "
+"cuenta y después márquela para intentar conectarse de nuevo con el servicio."
 
-#: C/empathy.xml:638(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:7(desc)
 msgid ""
-"To modify the identifier of an account, how <application>Empathy</"
-"application> identifies an account, proceed as follows: <placeholder-1/>"
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
 msgstr ""
-"Para modificar el identificador de una cuenta, la forma en la que "
-"<application>Empathy</application> identifica a la cuente, proceda como "
-"sigue: <placeholder-1/>"
+"La cuenta de mensajería instantánea que quiere usar no está activada en la "
+"lista de cuentas."
 
-#: C/empathy.xml:666(title)
-msgid "Disabling and Removing an Account"
-msgstr "Desactivar y quitaruna cuenta"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:23(title)
+msgid "My account is not enabled"
+msgstr "Mi cuenta no está activada"
 
-#: C/empathy.xml:667(para)
-msgid "To disable an account, proceed as follows:"
-msgstr "Para desactivar una cuenta, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:25(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 "
+"chat, your account details may not be correct."
+msgstr ""
+"Si la cuenta de mensajería instantánea que quiere usar no está activada en "
+"la lista desplegable de cuentas cuando intenta iniciar una conversación "
+"nueva o unirse a una charla, puede que los detalles de su cuenta no sean "
+"correctos."
 
-#: C/empathy.xml:682(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:33(p)
 msgid ""
-"Select the account you wish to disable in the box on the left of the dialog "
-"and deselect the <guilabel>Enabled</guilabel> check-box."
+"Click <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and make sure that "
+"the <gui>Enabled</gui> checkbox is checked."
 msgstr ""
-"Seleccione la cuenta que quiere desactivar en la caja a la izquierda del "
-"diálogo y deselecicone la casilla de verificación <guilabel>Activada</"
-"guilabel>."
+"Pulse <guiseq><gui>Editar</gui><gui>Cuentas</gui></guiseq> y asegúrese de "
+"que la caja de verificación <gui>Activada</gui> está marcada."
 
-#: C/empathy.xml:690(para)
-msgid "To remove an account, proceed as follows:"
-msgstr "Para quitar una cuenta, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:39(p)
+msgid "Make sure that your username and password are correct."
+msgstr "Asegúrese de que su nombre de usuario y contraseña son correctos."
 
-#: C/empathy.xml:705(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/prob-conn-acctdisabled.page:44(p)
 msgid ""
-"Select the account you wish to disable in the box on the left of the dialog."
+"Expand the <gui>Advanced</gui> section of the <app>Accounts</app> window and "
+"make sure that all of the server settings are correct."
 msgstr ""
-"Seleccione la cuenta que desea desactivar en la caja a la izquierda del "
-"diálogo."
+"Expanda la sección <gui>Avanzadas</gui> de la ventana de <app>Cuentas</app> "
+"y asegúrese de que todos los ajustes del servidor son correctos."
 
-#: C/empathy.xml:711(para)
-msgid "Click on the <guibutton>Remove</guibutton> button."
-msgstr "Pulse en el botón <guibutton>Quitar</guibutton>."
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:7(desc)
+msgid "How to see the contacts that are not online."
+msgstr "Cómo ver los contactos que no están conectados."
 
-#: C/empathy.xml:716(para)
-msgid ""
-"A dialog will be shown asking for confirmation. Click on the "
-"<guibutton>Remove</guibutton> button to remove the account."
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:25(title)
+msgid "Display offline contacts"
+msgstr "Mostrar contactos desconectados"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:29(p)
+msgid "Need to rework on the terminology used."
+msgstr "Se debe trabajar en la terminología usada."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:41(p)
+msgid "Choose <guiseq><gui>View</gui><gui>Offline Contacts</gui></guiseq>."
 msgstr ""
-"Se mostrará un diálogo preguntando por una confirmación. Pulse en el botón "
-"<guibutton>Quitar</guibutton> para quitar la cuenta."
+"Elija <guiseq><gui>Ver</gui><gui>Contactos desconectados</gui></guiseq>."
 
-#: C/empathy.xml:726(title)
-msgid "Editing Personal Information"
-msgstr "Editar información personal"
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:46(p)
+msgid "Press <keyseq><key>Ctrl</key><key>H</key></keyseq>."
+msgstr "Pulse <keyseq><key>Ctrl</key><key>H</key></keyseq>."
 
-#: C/empathy.xml:727(para)
-msgid ""
-"To change your personal information, your alias and your icon (the image "
-"that other contacts will see of you), for each of your accounts, proceed as "
-"follows:"
+#: /media/data/jhbuild/checkout/empathy/help/C/offline-contacts.page:53(p)
+msgid "To hide the offline contacts again, repeat the same procedure above."
 msgstr ""
-"Para cambiar su información personal, su apodo y su icono (la imagen con la "
-"que otros contactos le ven), para cada una de las cuentas, proceda como "
-"sigue:"
+"Para ocultar los contactos desconectados de nuevo, repita el mismo "
+"procedimiento anterior."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:8(desc)
+msgid "How to set the password of a nickname."
+msgstr "Cómo establecer la contraseña de un apodo."
 
-#: C/empathy.xml:735(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:23(title)
+msgid "Set the nickname password"
+msgstr "Establecer la contraseña para un apodo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:25(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"<menuchoice><guimenu>Edit</guimenu><guimenuitem>Personal Information</"
-"guimenuitem></menuchoice>."
+"Registering a nickname is useful to preserve your identity on IRC and you "
+"will be able to use always the same nickname. In some cirtumstances, some "
+"IRC channels may be configured to accept only registered nickname."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione <menuchoice><guimenu>Editar</guimenu><guimenuitem>Información "
-"personal</guimenuitem></menuchoice>."
+"Registrar un apodo es útil para preservar su identidad en el IRC y siempre "
+"podrá usar ese apodo. En algunas circunstancias, algunos canales de IRC "
+"pueden estar configurados para aceptar sólo apodos registrados."
 
-#: C/empathy.xml:744(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:31(p)
 msgid ""
-"From the <guilabel>Account</guilabel> drop-down list, choose the account you "
-"want to edit."
+"If you have registered your nickname with a password on a network that "
+"supports nickname registration, you can use that password with <app>Empathy</"
+"app> to identify yourself as the owner of the nickname."
 msgstr ""
-"Desde la lista desplegable <guilabel>Cuenta</guilabel>, elija la cuenta que "
-"quiere editar."
+"Si ha registrado su apodo con una contraseña en una red que soporta registro "
+"de apodos, puede usar esa contraseña con <app>Empathy</app> para "
+"identificarse como el propietario del apodo."
 
-#: C/empathy.xml:750(para)
-msgid "In the <guilabel>Alias</guilabel> text box, write your new alias."
-msgstr "En la caja de texto <guilabel>Apodo</guilabel> escriba su nuevo apodo."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:56(p)
+msgid "Select the IRC account from the box on the left of the dialog."
+msgstr "Seleccione la cuenta de IRC en la caja a la izquierda del diálogo."
 
-#: C/empathy.xml:756(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:61(p)
 msgid ""
-"To change your icon, click on the person-looking button and choose an image "
-"file."
+"If the account is enabled, disable it by deselecting the <gui>Enable</gui> "
+"check-box next to the name of the account."
 msgstr ""
-"Para cambiar su icono pulse en el botón de apariencia personal y elija un "
-"archivo de imagen."
-
-#: C/empathy.xml:762(para) C/empathy.xml:1343(para) C/empathy.xml:1377(para)
-msgid "When done, click <guibutton>Close</guibutton>."
-msgstr "Cuando termine pulse <guibutton>Cerrar</guibutton>."
+"Si la cuenta está activada, desactívela deseleccionando la caja de "
+"verificación <gui>Activada</gui> junto al nombre de la cuenta."
 
-#: C/empathy.xml:770(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:67(p)
 msgid ""
-"An <emphasis>alias</emphasis> is an alternative way you can identify "
-"yourself. You can use your real name or a nickname."
+"In the <gui>Password</gui> text box, type the password you used to register "
+"your nikcname."
 msgstr ""
-"Un <emphasis>apodo</emphasis> es una forma alternativa por la que se puede "
-"identificar. Puede usar su nombre real o un apodo."
+"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que quiere "
+"usar para registrar su apodo."
 
-#: C/empathy.xml:780(title)
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:73(p)
+msgid ""
+"Enable the account by selecting the <gui>Enabled</gui> check-box next to the "
+"name of the account."
+msgstr ""
+"Active la cuenta seleccionando la caja de verificación <gui>Activada</gui> "
+"junto al nombre de la cuenta."
 
-#: C/empathy.xml:781(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:80(p)
 msgid ""
-"Based on the service you are using, it is possible to configure more "
-"advanced options to modify the normal behavior of <application>Empathy</"
-"application>."
+"Once you are connected, you will receive a message from the nickname server "
+"that will tell you of the established identification."
 msgstr ""
-"Basado en el servicio que está usando es posible configurar opciones más "
-"avanzadas para modificar el comportamiento normal de <application>Empathy</"
-"application>."
+"Una vez que está conectado recibirá un mensaje desde el servidor de apodos "
+"que le informará acerca del establecimiento de la identificación."
 
-#: C/empathy.xml:786(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-nick-password.page:86(p)
 msgid ""
-"To configure these options, when you are <link linkend=\"empathy-create-"
-"account\">adding a new account</link>, click on the drop-down section "
-"<guilabel>Advanced</guilabel>."
+"At the moment it is not possible to register an IRC nickname with "
+"<app>Empathy</app>, it is only possible to use the password of an already "
+"registered nickname."
 msgstr ""
-"Para configurar esas opciones mientras está <link linkend=\"empathy-create-"
-"account\">añadiendo una cuenta nueva</link>, pulse la sección desplegable "
-"<guilabel>Avanzadas</guilabel>."
+"Por el momento no es posible registrar apodos en el IRC con <app>Empathy</"
+"app>, sólo es posible usar una contraseña de un apodo ya registrado."
 
-#: C/empathy.xml:794(title)
-msgid "Jabber (or <acronym>XMPP</acronym>) and Google Talk"
-msgstr "Jabber (o <acronym>XMPP</acronym>) y Google Talk"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:7(desc)
+msgid "Manage IRC accounts with <app>Empathy</app>."
+msgstr "Gestionar cuentas IRC con <app>Empathy</app>."
 
-#: C/empathy.xml:801(guilabel)
-msgid "Encryption required (TLS/SSL)"
-msgstr "Se requiere cifrado (TLS/SSL)"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:22(title)
+msgid "Use IRC"
+msgstr "Usar IRC"
 
-#: C/empathy.xml:804(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:26(p)
 msgid ""
-"Select this option in order to use some sort of encryption during your "
-"conversations."
+"Guide page for all the IRC related actions. Need to work on this page if the "
+"content starts to grow. In case we don't have a lot of contets for this "
+"page, rework the other."
 msgstr ""
-"Seleccione esta opción para usar algún tipo de cifrado durante sus "
-"conversaciones."
+"Página de guía para todas las acciones relacionadas con el IRC. Se debe "
+"trabajar en este página para que aumente su contenido. En caso de no tener "
+"mucho contenido para esta página, trabajar más en otras."
 
-#: C/empathy.xml:812(guilabel)
-msgid "Ignore SSL certificate errors"
-msgstr "Ignorar los errores de certificados SSL"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:34(title)
+msgid "Manage IRC accounts"
+msgstr "Gestionar cuentas IRC"
 
-#: C/empathy.xml:815(para)
-msgid ""
-"Select this option in order to ignore the errors that can be generated by "
-"some types of security certificates. Usually these certificates are called "
-"auto-signed."
-msgstr ""
-"Selecciones esta opción para ignorar los errores que puedan generar algunos "
-"tipos de certificados de seguridad. Generalmente esos certificados se llaman "
-"autofirmados."
+#. TODO: see prob-conn-neterror.page
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-manage.page:39(title)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:40(title)
+msgid "Fix common problems"
+msgstr "Solucionar problemas comunes"
 
-#: C/empathy.xml:823(para)
-msgid ""
-"Select this option only if you are sure the certificate is secure and you "
-"can trust it."
-msgstr ""
-"Seleccione esta opción sólo si está seguro de que su certificado es seguro y "
-"puede confiar en él."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:7(desc)
+msgid "Entering an IRC channel."
+msgstr "Entrar en un canal IRC."
 
-#: C/empathy.xml:833(guilabel)
-msgid "Resource"
-msgstr "Recurso"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:22(title)
+msgid "Join a room"
+msgstr "Unirse a una sala"
 
-#: C/empathy.xml:836(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:26(p)
 msgid ""
-"Use this text box to set a name with which you can identify the running "
-"program based on where you are running it. With this option, and the "
-"<guilabel>Priority</guilabel> one, you can use your account simultaneously "
-"in two different devices. For example, if you set one device to "
-"<replaceable>desktop</replaceable> and the other one to <replaceable>mobile</"
-"replaceable>, you can connect with both of them and based on the "
-"<guilabel>Priority</guilabel> value you will receive messages on one of the "
-"two devices or both."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
 msgstr ""
-"Use esta caja de texto para establecer un nombre con el que pueda "
-"identificar el programa en ejecución basándose en dónde lo está ejecutando. "
-"Con esta opción, y la opción de <guilabel>Prioridad</guilabel>, puede usar "
-"su cuenta simultáneamente desde dos dispositivos diferentes. Por ejemplo, si "
-"establece uno de los dispositivos como <replaceable>escritorio</replaceable> "
-"y el otro como <replaceable>móvil</replaceable>, puede conectarse con ambos "
-"dispositivos y basándose en el valor <guilabel>Prioridad</guilabel> recibirá "
-"los mensajes en uno de los dispositivos o en ambos."
+"Desde la ventana <gui>Lista de contactos</gui> elija <guiseq><gui>Sala</"
+"gui><gui>Unirse</gui></guiseq>."
 
-#: C/empathy.xml:849(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:32(p)
 msgid ""
-"This can be useful if you have two devices, a main one and a portable one, "
-"and you move away from the main one bringing with you the other: you can "
-"still receive messages from your account with the portable device even if "
-"you do not disconnet from the main one."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
 msgstr ""
-"Esto puede ser útil si tiene dos dispositivos, uno principal y uno portable, "
-"y se desplaza del principal llevándose consigo el otro: aún podrá recibir "
-"mensajes desde su cuenta con el dispositivo portable incluso si no "
-"desconecta el principal."
+"Desde la lista desplegable <gui>Cuenta</gui> elija la cuenta IRC que "
+"corresponda con la red que quiere usar."
 
-#: C/empathy.xml:858(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:38(p)
 msgid ""
-"If you set the same value for this text box on both the devices, when you "
-"connect with one of them, the other one will be disconnected, even if you "
-"set a different value with the <guilabel>Priority</guilabel> spin box."
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. Prefix the name with the hash character (<sys>#</sys>)."
 msgstr ""
-"Si establece el mismo valor para esta caja de texto en ambos dispositivos, "
-"al conectarse con uno de ellos, el otro se desconectará, incluso si "
-"establece un valor diferente en la caja incrementable <guilabel>Prioridad</"
-"guilabel>."
+"En la caja de texto <gui>Sala</gui>, escriba el nombre del canal al que "
+"quiere unirse. Preceda el nombre con el carácter almohadilla (<sys>#</sys>)."
 
-#: C/empathy.xml:871(guilabel)
-msgid "Priority"
-msgstr "Prioridad"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:44(p)
+msgid "Click on <gui>Join</gui> to enter the room."
+msgstr "Pulse <gui>Unirse</gui> para entrar en la sala."
 
-#: C/empathy.xml:874(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-room.page:51(p)
 msgid ""
-"Use this spin box to indicate wich device, set in the <guilabel>Resource</"
-"guilabel> text box, will receive the new messages. The higher the number, "
-"the higher the priority: you will receive the new messages on the device "
-"with the highest number."
+"To join multiple rooms, you need to repeat the steps above for each room."
 msgstr ""
-"Use esta caja incrementable para indicar qué dispositivo, establecido en la "
-"caja de texto <guilabel>Recurso</guilabel>, recibirá los mensajes nuevos. "
-"Cuanto mayor sea el número, mayor será la prioridad: recibirá los mensajes "
-"nuevos en el dispositivo con el número más alto."
+"Para entrar en varias salas, debe repetir los pasos anteriores para cada "
+"sala."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:8(desc)
+msgid "Join a password protected room."
+msgstr "Unirse a una sala protegida con contraseña."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:23(title)
+msgid "Join a protected room"
+msgstr "Unirse a una sala protegida"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-join-pwd.page:25(p)
+msgid "At the moment it is not possible to join a password protected room."
+msgstr "Por el momento no es posible unirse a salas protegidas por contraseña."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:9(desc)
+msgid "Create an IRC account."
+msgstr "Crear una cuenta de IRC."
 
-#: C/empathy.xml:881(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:23(title)
+msgid "Create an IRC account"
+msgstr "Crear una cuenta de IRC"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:44(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:43(p)
+msgid "If it is the first time you launch <app>Empathy</app>:"
+msgstr "Si ésta es la primera vez que lanza <app>Empathy</app>:"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:49(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:65(p)
 msgid ""
-"You can set values in the range from <literal>-128</literal> to "
-"<literal>127</literal>."
+"From the <gui>Type</gui> drop-down list choose <gui>IRC</gui>, then click on "
+"the <gui>Create</gui> button."
 msgstr ""
-"Puede establecer valores en el rango de <literal>-128</literal> a "
-"<literal>127</literal>."
+"De la lista desplegable <gui>Tipo</gui> seleccione <gui>IRC</gui>, después "
+"pulse el botón <gui>Crear</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:55(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:55(p)
+msgid "Otherwise:"
+msgstr "De otra forma:"
 
-#: C/empathy.xml:887(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:60(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:60(p)
+msgid "Click on the <gui>Add</gui> button."
+msgstr "Pulse el botón <gui>Añadir</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:73(p)
 msgid ""
-"If you set the same value of this spin box in both the devices, you will "
-"receive messages on both of them."
+"From the <gui>Network</gui> drop-down list, select the name of the network "
+"you are creating the account for."
 msgstr ""
-"Si establece el mismo valor de esta caja incrementable en ambos "
-"dispositivos, recibirá mensajes en ambos dos."
+"De la lista desplegable <gui>Red</gui> seleccione el nombre de la red para "
+"la que está creando la cuenta."
 
-#: C/empathy.xml:904(guilabel) C/empathy.xml:997(guilabel)
-#: C/empathy.xml:1045(guilabel) C/empathy.xml:1139(guilabel)
-msgid "Server"
-msgstr "Servidor"
+#. TODO: rethink the description of the nickname
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:80(p)
+msgid ""
+"In the <gui>Nickname</gui> text box, type the name that will identify "
+"yourself in the network you are creating the account."
+msgstr ""
+"En la caja de texto <gui>Apodo</gui> escriba el nombre que le identificará "
+"en la red para la que está creando la cuenta."
 
-#: C/empathy.xml:907(para) C/empathy.xml:1000(para) C/empathy.xml:1048(para)
-#: C/empathy.xml:1142(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:86(p)
 msgid ""
-"Use this text box to write the name of the server you want to use for this "
-"service."
+"In the <gui>Password</gui> text box, type the password you used to register "
+"your nikcname. If you do not have one, leave this field blank."
 msgstr ""
-"Use esta caja de texto para escribir el nombre del servidor que quiere usar "
-"para este servicio."
+"En la caja de texto <gui>Contraseña</gui> escriba la contraseña que usó para "
+"registrar su apodo. Si no tiene una, deje este campo vacío."
 
-#: C/empathy.xml:915(guilabel) C/empathy.xml:1008(guilabel)
-#: C/empathy.xml:1056(guilabel) C/empathy.xml:1150(guilabel)
-msgid "Port"
-msgstr "Puerto"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:92(p)
+msgid "In the <gui>Real name</gui> text box, type your real name."
+msgstr "Introduzca su nombre real en la caja de texto <gui>Nombre real</gui>."
 
-#: C/empathy.xml:918(para) C/empathy.xml:1011(para) C/empathy.xml:1059(para)
-#: C/empathy.xml:1153(para)
-msgid "Use this spin box to set the number of the port of the server to use."
-msgstr ""
-"Use esta caja incrementable para establecer el número del puerto del "
-"servidor que usar."
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:96(p)
+msgid "It is not necessary to insert your real name."
+msgstr "No es necesario que introduzca su nombre real."
 
-#: C/empathy.xml:922(para) C/empathy.xml:1015(para) C/empathy.xml:1063(para)
-#: C/empathy.xml:1157(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:102(p)
 msgid ""
-"You can set values in the range from <literal>0</literal> to "
-"<literal>65,555</literal>."
+"In the <gui>Quit message</gui> text box, type a text message that will be "
+"sent when you close your session."
 msgstr ""
-"Puede establecer valores en el rango de <literal>0</literal> a "
-"<literal>65.555</literal>."
+"En la caja de texto <gui>Mensaje de salida</gui> escriba un mensaje de texto "
+"que se enviará cuando cierre su sesión."
 
-#: C/empathy.xml:930(guilabel)
-msgid "Use old SSL"
-msgstr "Usar SSL antiguo"
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:108(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:80(p)
+msgid ""
+"To enable the new account, select the <gui>Enabled</gui> check-box next to "
+"the name of the account in the box on the left of the dialog."
+msgstr ""
+"Para activar la cuenta nueva seleccione la caja de verificación "
+"<gui>Activada</gui> junto al nombre de la cuenta, en la caja a la izquierda "
+"del diálogo."
 
-#: C/empathy.xml:933(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:115(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:88(p)
 msgid ""
-"Select this option to use the old version of the secure protocol for "
-"encrypting your connection."
+"If you want to change the name that identifies the account in the "
+"<gui>Accounts</gui> dialog, double-click on the name of the account in the "
+"box on the left of the dialog and type the new name."
 msgstr ""
-"Seleccione esta opción para usar la versión antigua del protocolo seguro "
-"para cifrar su conexión."
+"Si quiere cambiar el nombre que identifica la cuenta en el diálogo "
+"<gui>Cuentas</gui>, pulse dos veces en el nombre de la cuenta en la caja a "
+"la izquierda del diálogo y estriba el nombre nuevo."
 
-#: C/empathy.xml:898(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/irc-account.page:122(p)
 msgid ""
-"In the <guilabel>Override server settings</guilabel> section you can set "
-"options that take precedence over the default settings. <placeholder-1/>"
+"If you want to use different networks at the same time, you need to create "
+"an account with each one of the networks you want to use."
 msgstr ""
-"En la sección <guilabel>Sobreescribir los ajustes del servidor</guilabel> "
-"puede establecer opciones que tienen preferencia sobre los ajustes "
-"predeterminados. <placeholder-1/>"
+"Si quiere usar diferentes redes al mismo tiempo debe crear una cuenta con "
+"cada una de las redes que quiera usar."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:21(title)
+msgid "Empathy Instant Messenger"
+msgstr "Cliente de mensajería instantánea Empathy"
 
-#: C/empathy.xml:949(guilabel)
-msgid "Ignore conference and chatrooms invitations"
-msgstr "Ignorar invitaciones a conferencias y salas de chat"
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:24(title)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:14(title)
+msgid "Audio and video conversations"
+msgstr "Conversaciones de sonido y vídeo"
 
-#: C/empathy.xml:953(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:28(title)
+msgid "Text conversations"
+msgstr "Conversaciones de texto"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:32(title)
+msgid "Manage accounts"
+msgstr "Gestionar las cuentas"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/index.page:36(title)
+msgid "Advanced actions"
+msgstr "Acciones avanzadas"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/group-conversations.page:7(desc)
+msgid "Start a group conversation with your contacts."
+msgstr "Iniciar una conversación en grupo con sus contactos."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/group-conversations.page:13(title)
+msgid "Group conversations"
+msgstr "Conversaciones de grupos"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:8(desc)
 msgid ""
-"Select this option to ignore the invitations that other people may send you."
+"Prevent an account from logging-in automatically when you start "
+"<app>Empathy</app>."
 msgstr ""
-"Seleccione esta opción para ignorar las invitaciones que otras personas "
-"pueden enviarle."
+"Prevenir que una cuenta inicie sesión automáticamente al iniciar "
+"<app>Empathy</app>."
 
-#: C/empathy.xml:961(guilabel)
-msgid "Room List locale"
-msgstr "Configuración de la lista de salas"
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:25(title)
+msgid "Disable an account"
+msgstr "Desactivar una cuenta"
 
-#: C/empathy.xml:964(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:27(p)
 msgid ""
-"The value of this text box identifies the language used to retrieve the room "
-"list when connecting to the Yahoo service."
+"Disabling an account means to deactivate it, temporarily or permanently. All "
+"the conversations you had will be kept in your computer."
 msgstr ""
-"El valor de esta caja de texto identifica el idioma que usar al obtener la "
-"lista de salas al conectar con el servicio de Yahoo!"
+"Desactivar una cuenta significa desactivarla, temporal o permanentemente. "
+"Todas las conversaciones que tuvo se mantendrán en su equipo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:31(p)
+msgid "After disabling an account, it is possible to enable it again."
+msgstr "Después de desactivar una cuenta es posible activarla de nuevo."
 
-#: C/empathy.xml:969(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:54(p)
 msgid ""
-"If you need to change this value, use the two letter code of your language."
+"Select the account you wish to disable from the box on the left of the "
+"dialog."
 msgstr ""
-"Si necesita cambiar ese valor use el código de dos letras para su idioma."
+"Seleccione la cuenta que desea desactivar en la caja a la izquierda del "
+"diálogo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/disable-account.page:60(p)
+msgid "Deselect the <gui>Enabled</gui> check-box."
+msgstr "Deseleccione la caja de verificación <gui>Activada</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:9(desc)
+msgid "Register an account with one of the supported messaging services."
+msgstr "Registre una cuenta con uno de los servicios de mensajería soportados."
 
-#: C/empathy.xml:977(guilabel) C/empathy.xml:1119(guilabel)
-msgid "Charset"
-msgstr "Conjunto de caracteres"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:25(title)
+msgid "Register for a new account"
+msgstr "Registrar una cuenta nueva"
 
-#: C/empathy.xml:980(para) C/empathy.xml:1122(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:27(p)
 msgid ""
-"The value of this text box identifies the set of the characters used by "
-"<application>Empathy</application>."
+"You can freely create an account on any of the services listed below. Follow "
+"the instructions reported on each website on how to register your new "
+"account."
 msgstr ""
-"El valor de esta caja de texto identifica el conjunto de caracteres que usa "
-"<application>Empathy</application>."
+"Puede crear gratuitamente una cuenta en cualquiera de los servicios listados "
+"debajo. Siga las instrucciones en cada sitio web para saber cómo registrar "
+"una cuenta nueva."
 
-#: C/empathy.xml:986(para) C/empathy.xml:1128(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:32(p)
 msgid ""
-"It is advise to leave this value to <literal>UTF-8</literal>. Change it only "
-"if that charset does not cover your language."
+"At the end of the registration process you should have a <em>user name</em> "
+"(or an <em>account ID</em>) and a <em>password</em> that you will use to add "
+"the account to <app>Empathy</app>."
 msgstr ""
-"Se recomienda dejar este valor en <literal>UTF-8</literal>. Cámbielo sólo si "
-"ese conjunto de caracteres no cubre su idioma."
+"Al final del proceso de registro debería tener un <em>nombre de usuario</em> "
+"(o un <em>ID de cuenta</em>) y una <em>contraseña</em> que usará para añadir "
+"a la cuenta de <app>Empathy</app>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:37(p)
+msgid "Click on the name of the service to visit its website."
+msgstr "Pulse en el nombre del servicio para visitar su página web."
 
-#: C/empathy.xml:1023(guilabel)
-msgid "Use Yahoo Japan"
-msgstr "Usar Yahoo Japón"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:42(title)
+msgid "Instant Messaging Services"
+msgstr "Servicios de mensajería instantánea"
 
-#: C/empathy.xml:1026(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:47(link)
+msgid "AIM"
+msgstr "AIM"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:52(link)
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:57(link)
+msgid "ICQ"
+msgstr "ICQ"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:62(link)
+msgid "Jabber"
+msgstr "Jabber"
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:65(p)
 msgid ""
-"Select this option only if you have a Yahoo! Japan account. With the Yahoo! "
-"Japan service you can only use a Yahoo! Japan account: if you have "
-"registered an account with the English version of the service, that account "
-"will not work."
+"It is possible to use the automatic creation of accounts with this service. "
+"Not all the service providers support it. One service provider known to work "
+"is <em>jabber.org</em>, the default one of the application."
 msgstr ""
-"Seleccione esta opción sólo si tiene una cuenta de Yahoo! Japón. Con el "
-"servicio Yahoo! Japón sólo puede usar una cuenta de Yahoo! Japón: si ha "
-"registrado una cuenta con la versión inglesa del servicio, esa cuenta no "
-"funcionará."
+"Es posible usar creación automática de cuentas con este servicio. No todos "
+"los proveedores de servicios lo soportan. Un proveedor de servicios que se "
+"sabe que funciona es <em>jabber.org</em>, el predeterminado para la "
+"aplicación."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:75(link)
+msgid "MSN"
+msgstr "MSN"
 
-#: C/empathy.xml:1040(title)
-msgid "<acronym>AIM</acronym>, GroupWise and <acronym>MSN</acronym>"
-msgstr "<acronym>AIM</acronym>, GroupWise y <acronym>MSN</acronym>"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:80(link)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/empathy.xml:1079(guilabel)
-msgid "Published Name"
-msgstr "Nombre publicado"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:87(title)
+msgid "Local Instant Messaging Services"
+msgstr "Servicios de mensajería instantánea locales"
 
-#: C/empathy.xml:1082(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:88(p)
 msgid ""
-"Use this text box to write the name that will be visible to the other users "
-"of the network."
+"This service works when you are connected to a local network, you do not "
+"need an Internet connection in order to use it."
 msgstr ""
-"Use esta caja de texto para escribir el nombre que será visible al resto de "
-"usuarios de la red."
+"Este servicio funciona cuando está conectado a una red local, no necesita "
+"una conexión con Internet para usarlo."
 
-#: C/empathy.xml:1090(guilabel)
-msgid "Email"
-msgstr "Correo-e"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:95(em)
+msgid "Salut"
+msgstr "Salut"
 
-#: C/empathy.xml:1093(para)
-msgid "Use this text box to write your email."
-msgstr "Use esta caja de texto para escribir su correo-e."
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:100(p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr ""
+"Para obtener más información consulte la <link xref=\"salut-protocol\"/>."
 
-#: C/empathy.xml:1100(guilabel)
-msgid "Jabber ID"
-msgstr "ID Jabber"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:107(title)
+msgid "Telephony Services"
+msgstr "Servicios de telefonía"
 
-#: C/empathy.xml:1103(para)
-msgid "Use this text box to write your Jabber ID, if you have one."
-msgstr "Use esta caja de texto para escribir su ID Jabber, si tiene uno."
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:109(p)
+msgid ""
+"These services will let you do voice call over the Internet with other "
+"people using the same service or even to normal phones."
+msgstr ""
+"Estos servicios le permiten realizar llamadas de voz en Internet con otras "
+"personas que usen el mismo servicio o incluso teléfonos normales."
 
-#: C/empathy.xml:1168(title)
-msgid "Gadu Gadu"
-msgstr "Gadu Gadu"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:117(link)
+msgid "Ekiga"
+msgstr "Ekiga"
 
-#: C/empathy.xml:1172(guilabel)
-msgid "Nick"
-msgstr "Apodo"
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:122(link)
+msgid "Sipphone"
+msgstr "Sipphone"
 
-#: C/empathy.xml:1174(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/create-account.page:128(p)
 msgid ""
-"Use this text box to write an alternative name to use with this service."
+"In order to call normal phones over the Internet, you may need to subscribe "
+"to a paid service. For more information, please refer to the instructions "
+"provided on the website of the service you will use."
 msgstr ""
-"Use esta caja de texto para escribir un nombre alternativo que usar con este "
-"servicio."
+"Para poder realizar llamadas a teléfonos normales a través de Internet puede "
+"que deba suscribirse a un servicio de pago. Para obtener más información "
+"consulte las instrucciones proporcionadas en la página web del servicio que "
+"usará."
 
-#: C/empathy.xml:1189(title)
-msgid "Contacts and Groups"
-msgstr "Contactos y grupos"
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:8(desc)
+msgid ""
+"Change your status, if you are going away from your computer for example."
+msgstr "Cambie su estado si, por ejemplo, se ausenta del equipo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:24(title)
+msgid "Change your status"
+msgstr "Cambiar su estado"
 
-#: C/empathy.xml:1190(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:28(p)
 msgid ""
-"All the contacts are handled within <application>Empathy</application>'s "
-"<link linkend=\"empathy-FIG-mainwindow\">main window</link>."
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
 msgstr ""
-"Todos los contactos se gestionan en la <link linkend=\"empathy-FIG-mainwindow"
-"\">ventana principal</link> de <application>Empathy</application>."
+"Pulse en la lista desplegable en la parte superior de la ventana de la "
+"<gui>Lista de contactos</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:33(p)
+msgid "Select a status from the list."
+msgstr "Seleccione un estado de la lista."
 
-#: C/empathy.xml:1194(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:39(p)
 msgid ""
-"You can add or remove a contact or you can edit the information of a "
-"particular contact. It is also possibile to arrange contacts in groups. You "
-"can have a group for your work contacts, one for you family contacts, and so "
-"on."
+"For example, if you are busy and do not want to be disturbed, select "
+"<gui>Busy</gui>."
 msgstr ""
-"Puede añadir o quitar un contacto o puede editar la información de un "
-"contacto en particular. También es posible agrupar los contactos en grupos. "
-"Puede tener un grupo para sus contactos del trabajo, uno para los contactos "
-"de su familia, y demás."
+"Por ejemplo, si está ocupado y no quiere que le molesten seleccione "
+"<gui>Ocupado</gui>."
 
-#: C/empathy.xml:1201(title)
-msgid "Adding and Removing a Contact"
-msgstr "Añadir y quitar un contacto"
-
-#: C/empathy.xml:1202(para)
-msgid "To add a new contact, proceed as follows:"
-msgstr "Para añadir un contacto nuevo, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/change-status.page:45(p)
+msgid ""
+"If you do not use your computer for a while, or if the screen saver is "
+"turned on, the status will be automatically set to <gui>Away</gui>."
+msgstr ""
+"Si no usa su equipo durante un rato, o si se activa el salvapantallas, el "
+"estado se cambiará automáticamente a <gui>Ausente</gui>."
 
-#: C/empathy.xml:1208(para)
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:41(None)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link> choose "
-"<menuchoice><guimenu>Chat</guimenu><guimenuitem>Add Contact...</"
-"guimenuitem></menuchoice>. The <guilabel>New Contact</guilabel> dialog will "
-"be shown."
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
+
+#. 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.
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:55(None)
+msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"elija <menuchoice><guimenu>Chat</guimenu><guimenuitem>Añadir contacto...</"
-"guimenuitem></menuchoice>. Se mostrará el diálogo <guilabel>Contacto nuevo</"
-"guilabel>."
+"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 
-#: C/empathy.xml:1218(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:7(desc)
+msgid "When it is possible to have an audio or video conversation."
+msgstr "Cuándo es posible tener conversaciones de sonido o vídeo."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:16(p)
 msgid ""
-"From the <guilabel>Account</guilabel> drop-down list, choose the service "
-"used by the contact you are adding."
+"When your contacts support audio or video conversations, you will see, next "
+"to the contacts name in the <gui>Contact List</gui> window, one or two small "
+"icons that represent the different conversations you can have."
 msgstr ""
-"Desde la lista desplegable <guilabel>Cuenta</guilabel>, elija el servicio "
-"que usa el contacto que está añadiendo."
+"Cuando sus contactos soporten conversaciones de sonido o vídeo verá, junto "
+"al nombre de sus contactos, en la ventana de la <gui>Lista de contactos</"
+"gui>, uno o dos pequeños iconos que representan las diferentes "
+"conversaciones que puede tener."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:41(media)
+msgid "Icon for audio conversation"
+msgstr "Icono para la conversación de sonido"
 
-#: C/empathy.xml:1224(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:47(p)
 msgid ""
-"In the <guilabel>Identifier</guilabel> text box type the <emphasis>address</"
-"emphasis> of the contact in the form of <userinput><replaceable>user name</"
-"replaceable>@<replaceable>service\n"
-"\t      domain</replaceable></userinput>."
+"This is the icon that represents the possibility to have an audio "
+"conversation."
 msgstr ""
-"En la caja de texto <guilabel>Identificador</guilabel> escriba la "
-"<emphasis>dirección</emphasis> del contacto de la forma "
-"<userinput><replaceable>nombre de usuario</"
-"replaceable>@<replaceable>servicio\n"
-"\t     dominio</replaceable></userinput>."
+"Este es el icono que representa la posibilidad de tener una conversación de "
+"sonido."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:55(media)
+msgid "Icon for video conversation"
+msgstr "Icono para la conversación de vídeo"
 
-#: C/empathy.xml:1233(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-video.page:61(p)
 msgid ""
-"In the <guilabel>Alias</guilabel> text box type the name you want to give at "
-"the the new contact."
+"This is the icon that represents the possibility to have a video "
+"conversation."
 msgstr ""
-"En la caja de texto <guilabel>Apodo</guilabel> escriba el nombre que quiere "
-"darle a su nuevo contacto."
+"Este es el icono que representa la posibilidad de tener una conversación de "
+"vídeo."
 
-#: C/empathy.xml:1239(para)
-msgid "Click on <guibutton>Add</guibutton> to add the new contact."
-msgstr "Pulse en <guibutton>Añadir</guibutton> para añadir el contacto nuevo."
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:8(desc)
+msgid "Start an audio conversation with one of your contacts."
+msgstr "Iniciar una conversación de sonido con uno de sus contactos."
 
-#: C/empathy.xml:1245(para)
-msgid "To remove a contact, proceed as follows:"
-msgstr "Para quitar un contacto, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:16(title)
+msgid "Start an audio conversation"
+msgstr "Iniciar una conversación de sonido"
 
-#: C/empathy.xml:1251(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:25(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"the contact you would like to remove and right-click on it."
+"Select the contact you want to have a conversation with, and click on the "
+"audio call icon next to their name."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione el contacto que quiere quitar y pulse con el botón derecho sobre "
-"él."
+"Seleccione el contacto con el que quiera tener una conversación y pulse en "
+"el icono de llamada de sonido junto a su nombre."
 
-#: C/empathy.xml:1258(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:31(p)
 msgid ""
-"From the popup menu, choose <guilabel>Remove</guilabel> to remove the "
-"contact."
+"Right-click on the name of the contact you want to have a conversation with, "
+"and select <gui>Audio Call</gui>."
 msgstr ""
-"Desde el menú emergente, elija <guilabel>Quitar</guilabel> para quitar el "
-"contacto."
+"Pulse con el botón derecho del ratón sobre el nombre del contacto con el que "
+"quiera tener una conversación y seleccione <gui>Llamada de sonido</gui>."
 
-#: C/empathy.xml:1267(para) C/empathy.xml:1303(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/audio-call.page:52(p)
 msgid ""
-"An <emphasis>alias</emphasis> is an alternative way you can identify that "
-"particular contact. You can use the real name or the nickname of that person."
+"To turn an audio conversation into a video one, from the call window select "
+"<guiseq><gui>Call</gui><gui>Send video</gui></guiseq>, or click on the video "
+"call icon."
 msgstr ""
-"Un <emphasis>apodo</emphasis> es una forma alternativa de identificar un "
-"contacto en particular. Puede usar el nombre real o el apodo de esa persona."
+"Para convertir una conversación de sonido en una de vídeo, desde la ventana "
+"de llamada seleccione <guiseq><gui>Llamar</gui><gui>Enviar vídeo</gui></"
+"guiseq> o pulse el icono de vídeo llamada."
 
-#: C/empathy.xml:1276(title)
-msgid "Editing a Contact"
-msgstr "Editar un contacto"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:8(desc)
+msgid "Add someone to the contact list."
+msgstr "Añadir alguien a la lista de contactos."
 
-#: C/empathy.xml:1277(para)
-msgid "To edit a contact, proceed as follows:"
-msgstr "Para editar un contacto, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:22(title)
+msgid "Add someone to your list of contacts"
+msgstr "Añadir alguien a su lista de contactos"
 
-#: C/empathy.xml:1283(para) C/empathy.xml:1325(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:26(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"the contact you would like to modify and choose <menuchoice><guimenu>Edit</"
-"guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></"
-"menuchoice>, or right-click on it and choose <guilabel>Edit</guilabel>."
+"Instructions need review, didn't test with other IM services to confirm the "
+"names of the textboxes. Also, check the name of the Add button."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione el contacto que quiere modificar y elija "
-"<menuchoice><guimenu>Editar</guimenu><guisubmenu>Contacto</"
-"guisubmenu><guimenuitem>Editar</guimenuitem></menuchoice> o pulse con el "
-"botón derecho sobre él y elija <guilabel>Editar</guilabel>."
+"Las instrucciones necesitan revisión, no se confirmaron con otros servicios "
+"de MI para confirmar los nombres de las cajas de texto. También, comprobar "
+"el nombre del botón Añadir."
 
-#: C/empathy.xml:1296(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:32(p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "Elija <guiseq><gui>Chat</gui><gui>Añadir contacto</gui></guiseq>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:37(p)
 msgid ""
-"From the <guilabel>Edit Contact Information</guilabel> dialog, you can "
-"modify the <emphasis>alias</emphasis> and the <emphasis>group</emphasis> of "
-"the contact."
+"From the <gui>Account</gui> drop-down list, select the type of service the "
+"person you want to add to your contacts is using."
 msgstr ""
-"Desde el diálogo <guilabel>Editar información del contacto</guilabel> puede "
-"modificar el <emphasis>apodp</emphasis> y el <emphasis>grupo</emphasis> del "
-"contacto."
+"Desde la lista desplegable <gui>Cuenta</gui> seleccione el tipo de servicio "
+"que está usando la persona que quiere añadir a sus contactos."
 
-#: C/empathy.xml:1310(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:43(p)
 msgid ""
-"For more information about groups, see <xref linkend=\"empathy-add-contact-"
-"group\"/> and <xref linkend=\"empathy-add-group\"/>."
+"In the <gui>Identifier</gui> text box, type the email address or the "
+"username of the person you want to add to your contacts list."
 msgstr ""
-"Para obtener más información acerca de los grupos, consulte <xref linkend="
-"\"empathy-add-contact-group\"/> y <xref linkend=\"empathy-add-group\"/>."
+"En la caja de texto <gui>Identificador</gui> escriba el correo electrónico o "
+"el nombre de usuario de la persona que quiere añadir a su lista de contactos."
 
-#: C/empathy.xml:1318(title)
-msgid "Adding a Contact to a Group"
-msgstr "Añadir un contacto a un grupo"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:50(p)
+msgid "In the <gui>Alias</gui> text box, type their name."
+msgstr "En la caja de texto <gui>Apodo</gui> escriba su nombre."
 
-#: C/empathy.xml:1319(para)
-msgid "To add a contact to one or more groups, proceed as follows:"
-msgstr "Para añadir un contacto a uno o más grupos, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:55(p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr ""
+"Pulse <gui>Añadir</gui> para añadir la persona a su lista de contactos."
 
-#: C/empathy.xml:1337(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-contact.page:63(p)
 msgid ""
-"From the <guilabel>Groups</guilabel> section, select the group, or groups, "
-"you want to add the contact to."
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
 msgstr ""
-"En la sección <guilabel>Grupos</guilabel>, seleccione el grupo o grupos a "
-"los que quiera añadir el contacto."
+"Para añadir una persona nueva a su lista de contactos necesita estar "
+"conectado a Internet y a su cuenta."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:8(desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "Añadir una cuenta nueva en <app>Empathy</app>."
 
-#: C/empathy.xml:1352(title)
-msgid "Adding a New Group"
-msgstr "Añadir un grupo nuevo"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:22(title)
+msgid "Add a new account"
+msgstr "Añadir una cuenta nueva"
 
-#: C/empathy.xml:1353(para)
-msgid "To add a new group, proceed as follows:"
-msgstr "Para añadir un grupo nuevo, proceda como sigue:"
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:48(p)
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:65(p)
+msgid ""
+"From the <gui>Type</gui> drop-down list choose the service you wish to add "
+"an account for, then click on the <gui>Create</gui> button."
+msgstr ""
+"Desde la lista desplegable <gui>Tipo</gui> elija el servicio para el que "
+"quiere crear la cuenta, después pulse en el botón <gui>Crear</gui>."
+
+#: /media/data/jhbuild/checkout/empathy/help/C/add-account.page:74(p)
+msgid ""
+"Fill the required fields with your <em>user name</em> and <em>password</em>."
+msgstr ""
+"Rellene los campos necesarios con su <em>nombre de usuario</em> y su "
+"<em>contraseña</em>."
 
-#: C/empathy.xml:1359(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:3(p)
 msgid ""
-"From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, select "
-"one contact and choose <menuchoice><guimenu>Edit</"
-"guimenu><guisubmenu>Contact</guisubmenu><guimenuitem>Edit</guimenuitem></"
-"menuchoice>, or right-click on it and choose <guilabel>Edit</guilabel>."
+"This work is licensed under a <link href=\"http://creativecommons.org/"
+"licenses/by-sa/3.0/us/\">Creative Commons Attribution-Share Alike 3.0 United "
+"States License</link>."
 msgstr ""
-"Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</link>, "
-"seleccione un contacto y elija <menuchoice><guimenu>Editar</"
-"guimenu><guisubmenu>Contacto</guisubmenu><guimenuitem>Editar</guimenuitem></"
-"menuchoice> o pulse con el botón derecho y elija <guilabel>Editar</guilabel>."
+"Este trabajo está licenciado bajo una <link href=\"http://creativecommons."
+"org/licenses/by-sa/3.0/us/\">Licencia Creative Commons atribución - "
+"compartir igual 3.0 para los Estados Unidos</link>."
 
-#: C/empathy.xml:1370(para)
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:6(p)
 msgid ""
-"In the <guilabel>Groups</guilabel> section, write the name of the group you "
-"want to add and then click on <guibutton>Add Group</guibutton>."
+"As a special exception, the copyright holders give you permission to copy, "
+"modify, and distribute the example code contained in this document under the "
+"terms of your choosing, without restriction."
 msgstr ""
-"En la sección <guilabel>Grupos</guilabel> escriba el nombre del grupo que "
-"quiere añadir y después pulse <guibutton>Añadir grupo</guibutton>."
+"Como excepción especial, los poseedores de los derechos de autor le dan "
+"permiso para copiar, modificar y distribuir el ejemplo de código contenido "
+"en este documento bajo los términos que usted elija, sin restricción."
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: C/empathy.xml:0(None)
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+#: /media/data/jhbuild/checkout/empathy/help/C/legal.xml:0(None)
 msgid "translator-credits"
 msgstr "Jorge González <jorgegonz@svn.gnome.org>, 2008-2009"
-
-#~ msgid "TODO"
-#~ msgstr "POR HACER"
-
-#~| msgid ""
-#~| "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~| "select the contact you would like to remove and right-click on it."
-#~ msgid ""
-#~ "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~ "select the contact you would like to modify and right-click on it."
-#~ msgstr ""
-#~ "Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</"
-#~ "link>, seleccione el contacto que quiere modificar y pulse con el botón "
-#~ "derecho sobre él."
-
-#~| msgid ""
-#~| "From the popup menu, choose <guilabel>Remove</guilabel> to remove the "
-#~| "contact."
-#~ msgid ""
-#~ "From the popup menu, choose <guilabel>Modify</guilabel> to modify the "
-#~ "contact."
-#~ msgstr ""
-#~ "Desde el menú emergente, elija <guilabel>Modificar</guilabel> para "
-#~ "modificar el contacto."
-
-#~ msgid "From the popup menu, choose <guilabel>Modify</guilabel>."
-#~ msgstr "Desde el menú emergente, elija <guilabel>Modificar</guilabel>."
-
-#~| msgid ""
-#~| "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~| "select the contact you would like to remove and right-click on it."
-#~ msgid ""
-#~ "From the <link linkend=\"empathy-FIG-mainwindow\">main window</link>, "
-#~ "select one contact and right-click on it."
-#~ msgstr ""
-#~ "Desde la <link linkend=\"empathy-FIG-mainwindow\">ventana principal</"
-#~ "link>, seleccione un contacto y pulse con el botón derecho sobre él."
-
-#~ msgid ""
-#~ "@@image: 'figures/empathy-new-account.png'; "
-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
-#~ msgstr ""
-#~ "@@image: 'figures/empathy-new-account.png'; "
-#~ "md5=6c1e0d8c709125d387e975e5738b8c0f"
-
-#~ msgid "milo_casagrande@yahoo.it"
-#~ msgstr "milo_casagrande@yahoo.it"
-
-#~ msgid "When You Start Empathy for the First Time"
-#~ msgstr "Al iniciar Empathy por primera vez"
-
-#~ msgid "<application>Empathy</application> Accounts Dialog"
-#~ msgstr "Diálogo de cuentas de <application>Empathy</application>"
-
-#~ msgid "Shows <placeholder-1/> account creation dialog."
-#~ msgstr "Muestra <placeholder-1/> diálogo de creación de cuentas."
-
-#~ msgid ""
-#~ "When you start <application>Empathy</application> for the first time and "
-#~ "you don't have configured any account yet, the following dialog is shown. "
-#~ "<placeholder-1/>"
-#~ msgstr ""
-#~ "Al inicial <application>Empathy</application> la primera vez, no tendrá "
-#~ "configurada ninguna cuenta, entonces se mostrará el siguiente diálogo. "
-#~ "<placeholder-1/>"
-
-#~ msgid ""
-#~ "From here, you can configure and create your accounts. See <xref linkend="
-#~ "\"empathy-accounts\"/> for more information."
-#~ msgstr ""
-#~ "Desde aquí puede configurar y crear sus cuentas. Para obtener más "
-#~ "información consulte <xref linkend=\"empathy-accounts\"/>."
-
-#~ msgid ""
-#~ "You can use one of the following services if you already have a <emphasis "
-#~ "role=\"strong\">Jabber</emphasis> account:"
-#~ msgstr ""
-#~ "Puede usar uno de los siguientes servicios si ya dispone de una cuenta "
-#~ "<emphasis role=\"strong\">Jabber</emphasis>:"
-
-#~ msgid ""
-#~ "Fill the required fields with your <emphasis>user name</emphasis> and "
-#~ "<emphasis>password</emphasis>."
-#~ msgstr ""
-#~ "Rellene los campos requeridos con su <emphasis>nombre de usuario</"
-#~ "emphasis> y su <emphasis>contraseña</emphasis>."
-
-#~ msgid "To create an account, proceed as follow: <placeholder-1/>"
-#~ msgstr "Para crear una cuenta, proceda como sigue: <placeholder-1/>"
-
-#~ msgid "Contacts"
-#~ msgstr "Contactos"
-
-#~ msgid "Modifying a Contact"
-#~ msgstr "Modificar un contacto"
-
-#~ msgid ""
-#~ "The <ulink type=\"http\" url=\"http://www.ekiga.net/user/reg/index.php?"
-#~ "phplib_Session=c1d85267756241f8190e5fc21b029a62\">Ekiga</ulink> service."
-#~ msgstr ""
-#~ "El servicio <ulink type=\"http\" url=\"http://www.ekiga.net/user/reg/"
-#~ "index.php?phplib_Session=c1d85267756241f8190e5fc21b029a62\">Ekiga</ulink>."