From 77005cc30a87371ab908fdc55cca456caf35b988 Mon Sep 17 00:00:00 2001
From: Milo Casagrande <milo@ubuntu.com>
Date: Sun, 18 Dec 2011 16:34:23 +0100
Subject: [PATCH] [help] Fixed some UI references and typos, fixes bug #653812

	* Fixed the references to the OFF/ON switch
---
 help/C/change-status.page          |  9 +++++++--
 help/C/disable-account.page        |  6 +++---
 help/C/prob-conn-acctdisabled.page |  8 ++++----
 help/C/prob-conn-name.page         | 13 +++++++------
 help/C/prob-conn-neterror.page     | 31 ++++++++++++++----------------
 help/C/video-call.page             | 11 +++++------
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/help/C/change-status.page b/help/C/change-status.page
index ad3b6f7a..2897a504 100644
--- a/help/C/change-status.page
+++ b/help/C/change-status.page
@@ -15,13 +15,18 @@
       <e:review by="shaunm@gnome.org" date="2009-09-01" status="done"/>
       -->
     </revision>
+    <revision pkgversion="3.2" version="0.3" date="2011-12-18" status="review">
+      <!--
+      <e:review by="milo@ubuntu.com" date="2011-12-18" status="done"/>
+      -->
+    </revision>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
 <!--
     <copyright>
       <year>2009</year>
@@ -50,7 +55,7 @@
   </steps>
 
   <p>See <link xref="status-icons"/> for a list of the built-in statuses
-  and what they mean.  You can also <link xref="set-custom-message">add
+  and what they mean.  You can also <link xref="set-custom-status">add
   custom status messages</link> to provide more information about your
   availability to your contacts.</p>
 
diff --git a/help/C/disable-account.page b/help/C/disable-account.page
index 789100c5..eb23d07c 100644
--- a/help/C/disable-account.page
+++ b/help/C/disable-account.page
@@ -16,6 +16,7 @@
       -->
     </revision>
     <revision pkgversion="2.30" version="0.5" date="2010-02-03" status="review"/>
+    <revision pkgversion="3.2" version="0.6" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
@@ -53,13 +54,12 @@
       side of the window.</p>
     </item>
     <item>
-      <p>Deselect <gui style="checkbox">Enabled</gui> on the right side of the
-      window.
+      <p>On the right side of the window, switch it off.
       </p>
     </item>
   </steps>
 
   <p>
-    To re-enable the account, simply select <gui style="checkbox">Enabled</gui>.
+    To re-enable the account, switch it on.
   </p>
 </page>
diff --git a/help/C/prob-conn-acctdisabled.page b/help/C/prob-conn-acctdisabled.page
index 1286459e..926f6548 100644
--- a/help/C/prob-conn-acctdisabled.page
+++ b/help/C/prob-conn-acctdisabled.page
@@ -10,6 +10,7 @@
     </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"/>
+    <revision pkgversion="3.2" version="0.3" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -20,7 +21,7 @@
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
 <!--
     <copyright>
       <year>2009</year>
@@ -41,7 +42,7 @@
   <steps>
     <item>
       <p>
-        Make sure that you are connected to the Internet, or to a local area network. 
+        Make sure that you are connected to the Internet, or to a local area network.
       </p>
     </item>
     <item>
@@ -63,8 +64,7 @@
     </item>
     <item>
       <p>
-        Check that the <gui style="checkbox">Enabled</gui> check-box is selected.
-        If it is not, select the check-box to enable the account.
+        Check that the account is switched on.
       </p>
     </item>
   </steps>
diff --git a/help/C/prob-conn-name.page b/help/C/prob-conn-name.page
index 7ecda499..00407a66 100644
--- a/help/C/prob-conn-name.page
+++ b/help/C/prob-conn-name.page
@@ -12,14 +12,15 @@
     </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="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>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
 <!--
     <copyright>
       <year>2009</year>
@@ -40,7 +41,7 @@
   <steps>
     <item>
       <p>
-        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> 
+        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
         icon in the error message.
       </p>
     </item>
@@ -55,15 +56,15 @@
           <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"/>.            
+            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.
+        Switch the account off, and then switch it on to try to reconnect to the
+        service.
       </p>
     </item>
   </steps>
diff --git a/help/C/prob-conn-neterror.page b/help/C/prob-conn-neterror.page
index b5c1e1c2..91d48222 100644
--- a/help/C/prob-conn-neterror.page
+++ b/help/C/prob-conn-neterror.page
@@ -10,6 +10,7 @@
     <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"/>
     <revision pkgversion="2.28" 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>Phil Bull</name>
       <email>philbull@gmail.com</email>
@@ -20,7 +21,7 @@
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
 <!--
     <copyright>
       <year>2009</year>
@@ -50,24 +51,21 @@
   <steps>
     <item>
       <p>
-        Make sure that you are connected to the Internet, or to a local area network. 
+        Make sure that you are connected to the Internet, or to a local area network.
       </p>
     </item>
     <item>
       <p>
-        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media> 
+        Click the <media type="image" mime="image/png" src="figures/gtk-edit.png">edit</media>
         icon 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>
+      <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>
           <p>
@@ -75,22 +73,21 @@
             text box.
           </p>
         </item>
--->        
-      </list>
+-->
     </item>
     <item>
       <p>
-        Deselect the <gui>Enabled</gui>, and then select it again to try to 
-        reconnect to the service.
+        Switch the account off, and then switch it on to try to reconnect to the
+        service.
       </p>
     </item>
   </steps>
-  
+
   <section id="prob-conn-neterror-proxy">
     <title>Proxy support</title>
     <p>
       At the moment <app>Empathy</app> can not be configured to work with a
-      proxy.  
+      proxy.
     </p>
   </section>
 
diff --git a/help/C/video-call.page b/help/C/video-call.page
index 144db1ed..bbd4c681 100644
--- a/help/C/video-call.page
+++ b/help/C/video-call.page
@@ -16,19 +16,20 @@
       <e:review by="shaunm@gnome.org" date="2009-09-04" status="done"/>
       -->
     </revision>
-    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>    
+    <revision pkgversion="2.30" version="0.3" date="2010-02-14" status="review"/>
+    <revision pkgversion="3.2" version="0.4" date="2011-12-18" status="review"/>
     <credit type="author">
       <name>Milo Casagrande</name>
       <email>milo@ubuntu.com</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
-    </license>    
+    </license>
   </info>
   <title>Start a video conversation</title>
 
   <p>If you have a webcam, you can call your contacts and have a video
-  conversation with them. This features only works with certain types of
+  conversation with them. This feature only works with certain types of
   accounts, and it requires the other person to have an application that
   supports video calls.</p>
 
@@ -61,7 +62,7 @@
     <steps>
       <item>
         <p>
-          From the <gui>Contact List</gui> window, right-click on the meta-contact.   
+          From the <gui>Contact List</gui> window, right-click on the meta-contact.
         </p>
       </item>
       <item>
@@ -80,6 +81,4 @@
       </p>
     </note>
   </section>
-
-  
 </page>
-- 
2.39.2