commit d7a7334a747acc6c1e97b05ad6ece39b05881020
Author: Paul Bolle <pebolle@tiscali.nl>
Date:   Thu Dec 10 12:38:56 2009 +0100

    Bug #560726 - "View" > "Switcher Appearance" cleanup
    
    Small step: reword and reorganize View > "Switcher Appearance" menu
    items.

diff --git a/help/C/evolution.xml b/help/C/evolution.xml
index 22719cb..45040b4 100644
--- a/help/C/evolution.xml
+++ b/help/C/evolution.xml
@@ -960,28 +960,28 @@
     </orderedlist>
 
     <section id="b17s9pb0">
-     <title>Changing Switcher Appearance:</title>
-     <para>To change the appearance of your switcher click <emphasis>View &gt; Switcher Appearance</emphasis> from the Menu Bar. Under Switcher Appearance you can select:</para>
+     <title>Showing or hiding the switcher:</title>
+     <para>To show or hide the switcher click <emphasis>View &gt; Switcher</emphasis> from the Menu Bar. Under Switcher you can select:</para>
+     <formalpara id="b13cfifx">
+      <title>Show Switcher:</title>
+      <para>This option shows or hides all the shortcut buttons of the switcher.</para>
+     </formalpara>
      <formalpara id="b13cep2o">
       <title>Icons and Text:</title>
-      <para>Displays buttons with the label and the icon corresponding to it.</para>
+      <para>Displays the switcher's buttons with the label and the icon corresponding to it.</para>
      </formalpara>
      <formalpara id="b13ceqsq">
       <title>Icons Only:</title>
-      <para>Shows only the icons.</para>
+      <para>Shows only the icons of the switcher's buttons.</para>
      </formalpara>
      <formalpara id="b13ceqv1">
       <title>Texts Only:</title>
-      <para> Displays buttons with the label, not the icons.</para>
+      <para> Displays the switcher's buttons with the label, not the icons.</para>
      </formalpara>
      <formalpara id="b13cfibm">
       <title>Toolbar Style:</title>
-      <para>Shows buttons using the desktop toolbar settings.</para>
-    </formalpara>
-    <formalpara id="b13cfifx">
-     <title>Hide Buttons:</title>
-     <para>This option hides all the shortcut buttons of switcher.</para>
-    </formalpara>
+      <para>Shows the switcher's buttons using the desktop toolbar settings.</para>
+     </formalpara>
     </section>
 
     <section id="subfolders">
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index df96043..952e71b 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1635,7 +1635,7 @@ static GtkActionEntry shell_entries[] = {
 
 	{ "switcher-menu",
 	  NULL,
-	  N_("_Switcher Appearance"),
+	  N_("_Switcher"),
 	  NULL,
 	  NULL,
 	  NULL },
@@ -1667,9 +1667,9 @@ static GtkToggleActionEntry shell_toggle_entries[] = {
 
 	{ "show-switcher",
 	  NULL,
-	  N_("Show _Buttons"),
+	  N_("Show _Switcher"),
 	  NULL,
-	  N_("Show the switcher buttons"),
+	  N_("Show the switcher"),
 	  NULL,
 	  TRUE },
 
@@ -1709,28 +1709,28 @@ static GtkRadioActionEntry shell_switcher_style_entries[] = {
 	  NULL,
 	  N_("_Icons Only"),
 	  NULL,
-	  N_("Display window buttons with icons only"),
+	  N_("Display buttons with icons only"),
 	  GTK_TOOLBAR_ICONS },
 
 	{ "switcher-style-text",
 	  NULL,
 	  N_("_Text Only"),
 	  NULL,
-	  N_("Display window buttons with text only"),
+	  N_("Display buttons with text only"),
 	  GTK_TOOLBAR_TEXT },
 
 	{ "switcher-style-both",
 	  NULL,
 	  N_("Icons _and Text"),
 	  NULL,
-	  N_("Display window buttons with icons and text"),
+	  N_("Display buttons with icons and text"),
 	  GTK_TOOLBAR_BOTH_HORIZ },
 
 	{ "switcher-style-user",
 	  NULL,
 	  N_("Tool_bar Style"),
 	  NULL,
-	  N_("Display window buttons using the desktop toolbar setting"),
+	  N_("Display buttons using the desktop toolbar setting"),
 	  -1 }
 };
 
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index ccfeb86..83c2e7a 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -43,12 +43,12 @@
       </menu>
       <placeholder name='view-custom-menus'/>
       <menu action='switcher-menu'>
+        <menuitem action='show-switcher'/>
+        <separator/>
         <menuitem action='switcher-style-both'/>
         <menuitem action='switcher-style-icons'/>
         <menuitem action='switcher-style-text'/>
         <menuitem action='switcher-style-user'/>
-        <separator/>
-        <menuitem action='show-switcher'/>
       </menu>
     </menu>
     <placeholder name='custom-menus'/>
