replace 'Desktop' menu with 'System'. Fixes #350489

  * gosoverview.xml, gosstartsession.xml, gospanel.xml, goseditmainmenu.xml,
  gosnautilus.xml, gostools.xml, goscustdesk.xml:
  replace 'Desktop' menu with 'System'. Fixes #350489

8 files changed, 28 insertions, 22 deletions

diff --git a/gnome2-user-guide/C/ChangeLog b/gnome2-user-guide/C/ChangeLog
index 0ba076e..865b836 100644
--- a/gnome2-user-guide/C/ChangeLog
+++ b/gnome2-user-guide/C/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-10 Joachim Noreiko <jnoreiko@yahoo.com>
+
+  * gosoverview.xml, gosstartsession.xml, gospanel.xml, goseditmainmenu.xml,
+  gosnautilus.xml, gostools.xml, goscustdesk.xml:
+  replace 'Desktop' menu with 'System'. Fixes #350489
+
 2006-07-08 Joachim Noreiko <jnoreiko@yahoo.com>
 
 	* goseditmainmenu.xml:
diff --git a/gnome2-user-guide/C/goscustdesk.xml b/gnome2-user-guide/C/goscustdesk.xml
index 729fbaf..43a9a41 100644
--- a/gnome2-user-guide/C/goscustdesk.xml
+++ b/gnome2-user-guide/C/goscustdesk.xml
@@ -20,11 +20,11 @@ customize the GNOME Desktop.</para>
   </highlights>
   <!-- move the following to its own section, "Using Pref Tools"? -->
   <para>A preference tool is a small application that allows you to change settings in the GNOME Desktop. Each preference tool covers a particular aspect of your computer. For example, with the <application>Mouse</application> preference tool you can set your mouse to left-handed or right-handed use, or change the speed of the pointer on the screen. With the <application>Windows</application> preference tool you can set behaviour common to all windows such as the way in which you select them with the mouse.</para>
-  <para>To open a preference tool, choose <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> in the top panel. Choose the tool
+  <para>To open a preference tool, choose <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> in the top panel. Choose the tool
 that you require from the submenu.</para>
   <para>With a few exceptions, the changes you make to settings in a preference tool take effect immediately, without needing to close the preference tool. You can keep the preference tool window open while you try the changes, and make further changes if you wish.</para>
   <para>Some applications or system components may add their own preference tools to the menu.</para>
-  <note><para>Some settings for your system require administrator access. These are in the <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu.</para></note>
+  <note><para>Some settings for your system require administrator access. These are in the <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu.</para></note>
   
   <sect1 id="goscustaccess-11">
     <title>Assistive Technology Preferences</title>
@@ -241,7 +241,7 @@ database in the <guilabel>Port</guilabel> field.</para>
       <secondary>customizing desktop background</secondary>
     </indexterm>
     <para>The <link linkend="overview-desktop">desktop</link> background is the image or color that is applied to your
-desktop. You can open <application>Desktop Background Preferences</application> by right-clicking on the desktop and choosing <guimenuitem>Change Desktop Background</guimenuitem>, as well as from the <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> menu.</para>
+desktop. You can open <application>Desktop Background Preferences</application> by right-clicking on the desktop and choosing <guimenuitem>Change Desktop Background</guimenuitem>, as well as from the <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> menu.</para>
     <para>You can customize the desktop background in the following ways:</para>
     <itemizedlist>
       <listitem>
@@ -596,7 +596,7 @@ folder.</para>
       <para>A preview of a font shows the characters of a font at different sizes, as well as copyright and technical information. To preview a font, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Open the <application>Font</application> preference tool by choosing <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
+          <para>Open the <application>Font</application> preference tool by choosing <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
         </listitem>
         <listitem><para>Click on <guibutton>Details</guibutton>.</para></listitem>
         <listitem><para>Click on <guibutton>Go to font folder</guibutton>. The <guilabel>Fonts</guilabel> folder opens.</para></listitem>
@@ -610,7 +610,7 @@ folder.</para>
       <para>To add a TrueType font to your system, perform the following steps:</para>
       <orderedlist>
         <listitem>
-          <para>Open the <application>Font</application> preference tool by choosing <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
+          <para>Open the <application>Font</application> preference tool by choosing <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>Font</guimenuitem></menuchoice> in the top panel.</para>
         </listitem>
         <listitem><para>Click on <guibutton>Details</guibutton>.</para></listitem>
         <listitem><para>Click on <guibutton>Go to font folder</guibutton>. The <guilabel>Fonts</guilabel> folder opens.</para></listitem>      
@@ -676,7 +676,7 @@ accessibility options</secondary>
     <para>To open the <application>Keyboard Accessibility</application> preference tool, do one of the following:</para>
     <itemizedlist>
       <listitem>
-        <para>From the <guimenu>Main Menu</guimenu>, choose <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Accessibility</guimenuitem><guimenuitem>Keyboard</guimenuitem></menuchoice>.
+        <para>From the <guimenu>Main Menu</guimenu>, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Accessibility</guimenuitem><guimenuitem>Keyboard</guimenuitem></menuchoice>.
         </para>
       </listitem>
       <listitem>
@@ -1814,7 +1814,7 @@ computer on a network. </para>
 Applications</application> preference tool to specify the applications that
 you want the GNOME Desktop to use when the GNOME Desktop starts an application
 for you. For example, you can specify <application>Xterm</application> as
-your preferred terminal application. When you open the <guimenu>Desktop</guimenu>
+your preferred terminal application. When you open the <guimenu>System</guimenu>
 menu then choose <guimenuitem>Open Terminal</guimenuitem>, <application>Xterm</application> starts.</para>
     <para>You can customize the preferences for the <application>Preferred Applications</application> preference tool in the following functional areas.</para>
     <itemizedlist>
diff --git a/gnome2-user-guide/C/goseditmainmenu.xml b/gnome2-user-guide/C/goseditmainmenu.xml
index 2a5ad70..cb6edd2 100644
--- a/gnome2-user-guide/C/goseditmainmenu.xml
+++ b/gnome2-user-guide/C/goseditmainmenu.xml
@@ -26,7 +26,7 @@
     <secondary>introduction</secondary>
   </indexterm>  
 
-  <para>The panel menubar is your main point of access to GNOME. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>Desktop</guimenu> to customize your system, get help with GNOME, and log out of GNOME or shut down your computer.</para>
+  <para>The panel menubar is your main point of access to GNOME. Use the <guimenu>Applications</guimenu> menu to launch applications, the <guimenu>Places</guimenu> to open locations on your computer or network, and the <guimenu>System</guimenu> to customize your system, get help with GNOME, and log out of GNOME or shut down your computer.</para>
   <para>The following sections describe these three menus.</para>
   <tip><para>By default, the panel menubar is on the <link linkend="top-panel">Top Edge Panel</link>. But like any other panel object, you can move the menubar to another panel, or have more than one instance of the menubar in your panels. For more on this, see <xref linkend="panel-menus"/>.</para></tip>
 
@@ -72,11 +72,11 @@
     </itemizedlist>                
   </section>
   <section id="desktop-menu">
-    <title>Desktop Menu</title>  
+    <title>System Menu</title>  
     <indexterm>
-      <primary>Desktop Menu</primary>
+      <primary>System Menu</primary>
     </indexterm>
-    <para>The <guimenu>Desktop</guimenu> menu allows you to set your preferences for the GNOME Desktop, get help with using GNOME, and log out or shut down.</para>  
+    <para>The <guimenu>System</guimenu> menu allows you to set your preferences for the GNOME Desktop, get help with using GNOME, and log out or shut down.</para>  
     <itemizedlist>
       <listitem><para>The <guimenuitem>Administration</guimenuitem> submenu contains tools to manage your computer. These all require your system's password.</para></listitem>
       <listitem><para>The <guimenuitem>Preferences</guimenuitem> submenu contains all the <firstterm>preference tools</firstterm>. With these you can configure your GNOME Desktop. For more on preference tools, see <xref linkend="prefs"/>.</para></listitem>
@@ -105,10 +105,10 @@
         <para><guimenu>Applications</guimenu> menu</para>
       </listitem>
       <listitem>
-        <para><menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> submenu</para>
+        <para><menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu></menuchoice> submenu</para>
       </listitem>
       <listitem>
-        <para><menuchoice><guimenu>Desktop</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu</para>
+        <para><menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu></menuchoice> submenu</para>
       </listitem>      
     </itemizedlist>
     
diff --git a/gnome2-user-guide/C/gosnautilus.xml b/gnome2-user-guide/C/gosnautilus.xml
index 4d9f450..b93430d 100644
--- a/gnome2-user-guide/C/gosnautilus.xml
+++ b/gnome2-user-guide/C/gosnautilus.xml
@@ -3422,7 +3422,7 @@ file manager</primary>
     <para>Use the <guilabel>File Management Preferences</guilabel> dialog to customize the file manager to suit your requirements
 and preferences.</para>
 		<para>To display the <guilabel>File Management Preferences</guilabel> dialog, choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Preferences</guimenuitem></menuchoice>. You can also access this dialog directly from the top panel Menubar
-by choosing <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>File Management</guimenuitem></menuchoice>.</para>
+by choosing <menuchoice><guimenu>System</guimenu><guisubmenu>Preferences</guisubmenu><guimenuitem>File Management</guimenuitem></menuchoice>.</para>
     <para>You can set preferences in the following categories: </para>
     <itemizedlist>
       <listitem>
diff --git a/gnome2-user-guide/C/gosoverview.xml b/gnome2-user-guide/C/gosoverview.xml
index e796ae8..5383752 100644
--- a/gnome2-user-guide/C/gosoverview.xml
+++ b/gnome2-user-guide/C/gosoverview.xml
@@ -94,7 +94,7 @@
       <firstterm>preference tools</firstterm>.  Each tool controls
       a particular part of the behavior of the desktop.  The preference
       tools can be found in the <guimenu>Preferences</guimenu> submenu
-      of the <guimenu>Desktop</guimenu> top-level menu on your panel.
+      of the <guimenu>System</guimenu> top-level menu on your panel.
       See <xref linkend="prefs"/> for more information on the various
       preference tools.</para></listitem>
     </varlistentry>
diff --git a/gnome2-user-guide/C/gospanel.xml b/gnome2-user-guide/C/gospanel.xml
index 262f8e5..43258fe 100644
--- a/gnome2-user-guide/C/gospanel.xml
+++ b/gnome2-user-guide/C/gospanel.xml
@@ -76,7 +76,7 @@ these panels.</para>
       <variablelist>
       	<varlistentry>
       		<term><application>Menu Bar</application> applet</term>
-      		<listitem><para>The panel menubar contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>Desktop</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
+      		<listitem><para>The panel menubar contains the <guimenu>Applications</guimenu>, the <guimenu>Places</guimenu>, and the <guimenu>System</guimenu> menu. For more on the menu bar, see <xref linkend="menubar"/>.</para></listitem>
       	</varlistentry>
       	<varlistentry>
       	  <term><application>Web Browser Launcher</application></term>
@@ -1908,7 +1908,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
         <secondary>introduction</secondary>
       </indexterm>
       <para>The <guimenu>Main Menu</guimenu> provides access to
-  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>Desktop</guimenu> menu. You can access almost all of the standard applications,
+  the <guimenu>Applications</guimenu> menu and many of the items in the <guimenu>System</guimenu> menu. You can access almost all of the standard applications,
   commands, and configuration options from the <guimenu>Main Menu</guimenu>. </para>
       <para>You can add <guimenu>Main Menu</guimenu> buttons to your panels. Click
   on the <guimenu>Main Menu</guimenu> button to open the <guimenu>Main Menu</guimenu>.</para>
@@ -1935,7 +1935,7 @@ right-click on any vacant space on the panel. Choose <menuchoice><guimenu>Add to
           </textobject>
         </mediaobject>
       </screenshot>
-      <para>The <application>Menu Bar</application> provides access to the panel menubar, which contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>Desktop</guimenu> menus. You can access
+      <para>The <application>Menu Bar</application> provides access to the panel menubar, which contains the <guimenu>Applications</guimenu>, <guimenu>Places</guimenu>, and <guimenu>System</guimenu> menus. You can access
   almost all of the standard applications, commands, and configuration options
   from the <application>Menu Bar</application>. For more on using the panel menubar, see <xref linkend="menubar"/>.</para>
       <section id="goseditmainmenu-66">
diff --git a/gnome2-user-guide/C/gosstartsession.xml b/gnome2-user-guide/C/gosstartsession.xml
index 87ee3a3..2da37c9 100644
--- a/gnome2-user-guide/C/gosstartsession.xml
+++ b/gnome2-user-guide/C/gosstartsession.xml
@@ -146,7 +146,7 @@ for the session. To choose a keyboard layout, use the <ulink type="help" url="gh
 one of the following actions:</para>
     <itemizedlist>
       <listitem>
-        <para>Choose <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Lock Screen</guimenuitem></menuchoice>.</para>
+        <para>Choose <menuchoice><guimenu>System</guimenu><guimenuitem>Lock Screen</guimenuitem></menuchoice>.</para>
       </listitem>
       <listitem>
         <para>If the <guibutton>Lock Screen</guibutton> button is present on a
@@ -309,10 +309,10 @@ option on the <guilabel>Session Options</guilabel> tabbed section.</para>
     <para>When you have finished using your computer, you can choose to do one of the following:</para>
     <itemizedlist>
       <listitem>
-        <para>Log out for another user to begin working with it. To log out of GNOME, choose <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Log Out <replaceable>username</replaceable></guimenuitem></menuchoice> <!-- Translators: your locale might only have a "Log Out" label in the menu if "Log Out username" is not valid. In this case, remove "<replaceable>username</replaceable>". -->.</para>
+        <para>Log out for another user to begin working with it. To log out of GNOME, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Log Out <replaceable>username</replaceable></guimenuitem></menuchoice> <!-- Translators: your locale might only have a "Log Out" label in the menu if "Log Out username" is not valid. In this case, remove "<replaceable>username</replaceable>". -->.</para>
       </listitem>
       <listitem>
-        <para>Shut down your computer and switch off the power. To shut down, choose <menuchoice><guimenu>Desktop</guimenu><guimenuitem>Shut Down</guimenuitem></menuchoice>.</para>
+        <para>Shut down your computer and switch off the power. To shut down, choose <menuchoice><guimenu>System</guimenu><guimenuitem>Shut Down</guimenuitem></menuchoice>.</para>
       </listitem>
       <listitem>
         <para>Depending on your computer's configuration, you can also <firstterm>Hibernate</firstterm> your computer. During hibernation, less power is used, but the state of your computer is preserved: all the applications you have running and open documents.</para>
diff --git a/gnome2-user-guide/C/gostools.xml b/gnome2-user-guide/C/gostools.xml
index d83dc9f..fa1415a 100644
--- a/gnome2-user-guide/C/gostools.xml
+++ b/gnome2-user-guide/C/gostools.xml
@@ -180,7 +180,7 @@ command.</para>
 <section id="printer-setup">
   <title>Setting up a Printer</title>
   
-  <para>To set up a printer to use with GNOME, choose <menuchoice><guimenu>Desktop</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Printing</guimenuitem></menuchoice> in the panel menubar. The <guilabel>Printers</guilabel> window opens.</para>
+  <para>To set up a printer to use with GNOME, choose <menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Printing</guimenuitem></menuchoice> in the panel menubar. The <guilabel>Printers</guilabel> window opens.</para>
   
   <para>Choose <menuchoice><guimenu>Printer</guimenu><guimenuitem>Add Printer</guimenuitem></menuchoice>. The <application>Add a Printer</application> assistant opens. This guides you through the process of setting up the printer.</para>