Merge branch 'gnome-3-8'

[empathy.git] / help / C / prob-conn-name.page

diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 3196da8a87e4945ed3a129cff02d6b30d945c0e1..f3bdefd35212334f661b7d4dad3e6a3a18de35d9 100644 (file)
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -1,60 +1,71 @@
 <page xmlns="http://projectmallard.org/1.0/"
-  type="topic"
-  id="prob-conn-name">
+      xmlns:its="http://www.w3.org/2005/11/its"
+      type="topic"
+      id="prob-conn-name">
 
   <info>
     <link type="guide" xref="prob-conn"/>
     <link type="guide" xref="irc-manage#problems"/>
+    <link type="seealso" xref="account-irc"/>
+    <title type="link" role="error-msg">“Name in use”</title>
     <desc>
-      An error message appears in the main <app>Empathy</app> window which says 
-      "Name in use".
+      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"/>
+    <revision pkgversion="2.30" version="0.3" date="2010-02-16" status="review"/>
+    <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
-      <email>milo@ubuntu.com</email>
+      <email its:translate="no">milo@ubuntu.com</email>
     </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+<!--
     <copyright>
       <year>2009</year>
       <name>GNOME Documentation Project</name>
     </copyright>
-    <license>Creative Commons Share Alike 3.0</license>
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
   </info>
 
-  <!--
-    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.
-   -->
-
-  <title>I get a message that says "Name in use"</title>
+  <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 being used by someone else on that particular 
+    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>
 
-  <p>
-    To resolve this problem, click on the <gui>Edit Account</gui> button and 
-    perform one of the following:
-  </p>
-  
-  <list>
+  <steps>
     <item>
-      <p>
-        Change your nickname.
-      </p>
+      <p>Click the <media type="image" mime="image/png" src="figures/gtk-edit.png" its:translate="no"><span its:translate="yes">edit</span></media>
+      icon in the error message.</p>
+    </item>
+    <item>
+      <list>
+        <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>
-        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"/>.
+        Switch the account off, and then switch it on to try to reconnect to the
+        service.
       </p>
     </item>
-  </list> 
+  </steps>
 
 </page>