[gnumeric] some minor menu rearrangement

[Andreas J. Guelzow <guelzow src gnome org>]

commit 1cb39ec37792bd77b47a6d9ada6ca071bbdb6e30
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Wed Nov 11 02:02:08 2009 -0700

    some minor menu rearrangement
    
    2009-11-11  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* component/Gnumeric-embed.xml.in: move FormatWorkbook to View menu
    	* src/GNOME_Gnumeric-gtk.xml.in: ditto
    	* src/HILDON_Gnumeric-gtk.xml.in: ditto and rename FilePreferences
    	  action to EditPreferences
    	* src/wbc-gtk-actions.c: adjust names and description of FileMetaData
    	and FormatWorkbook actions

 ChangeLog                       |    9 +++++++++
 component/Gnumeric-embed.xml.in |    2 +-
 src/GNOME_Gnumeric-gtk.xml.in   |    2 +-
 src/HILDON_Gnumeric-gtk.xml.in  |    7 +++----
 src/wbc-gtk-actions.c           |    8 ++++----
 5 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3b47031..8f02d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-11  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* component/Gnumeric-embed.xml.in: move FormatWorkbook to View menu
+	* src/GNOME_Gnumeric-gtk.xml.in: ditto
+	* src/HILDON_Gnumeric-gtk.xml.in: ditto and rename FilePreferences
+	  action to EditPreferences
+	* src/wbc-gtk-actions.c: adjust names and description of FileMetaData
+	and FormatWorkbook actions
+
 2009-11-09  Morten Welinder  <terra gnome org>
 
 	* src/workbook-view.c (wb_view_new_from_input): Add extra uri
diff --git a/component/Gnumeric-embed.xml.in b/component/Gnumeric-embed.xml.in
index dae6271..3bac369 100644
--- a/component/Gnumeric-embed.xml.in
+++ b/component/Gnumeric-embed.xml.in
@@ -90,6 +90,7 @@
       <menuitem action="ViewStatusbar"/>
       <menuitem action="ViewFullScreen"/>
       <menuitem action="ViewZoom"/>
+      <menuitem action="FormatWorkbook"/>
     </menu>
     <menu name="Insert" action="MenuInsert">
       <menuitem action="InsertCells"/>
@@ -144,7 +145,6 @@
         <menuitem action="SheetHideRowHeader"/>
 	<menuitem action="SheetDirection"/>
       </menu>
-      <menuitem action="FormatWorkbook"/>
       <menuitem action="FormatAuto"/>
     </menu>
     <menu name="Tools" action="MenuTools">
diff --git a/src/GNOME_Gnumeric-gtk.xml.in b/src/GNOME_Gnumeric-gtk.xml.in
index d9161ad..a4fa459 100644
--- a/src/GNOME_Gnumeric-gtk.xml.in
+++ b/src/GNOME_Gnumeric-gtk.xml.in
@@ -89,6 +89,7 @@
       <menuitem action="ViewStatusbar"/>
       <menuitem action="ViewFullScreen"/>
       <menuitem action="ViewZoom"/>
+      <menuitem action="FormatWorkbook"/>
     </menu>
     <menu name="Insert" action="MenuInsert">
       <menuitem action="InsertCells"/>
@@ -143,7 +144,6 @@
         <menuitem action="SheetHideRowHeader"/>
 	<menuitem action="SheetDirection"/>
       </menu>
-      <menuitem action="FormatWorkbook"/>
       <menuitem action="FormatAuto"/>
     </menu>
     <menu name="Tools" action="MenuTools">
diff --git a/src/HILDON_Gnumeric-gtk.xml.in b/src/HILDON_Gnumeric-gtk.xml.in
index bcf2520..aa86e3c 100644
--- a/src/HILDON_Gnumeric-gtk.xml.in
+++ b/src/HILDON_Gnumeric-gtk.xml.in
@@ -21,7 +21,6 @@
       -->
       <menuitem action="FileSend"/>
       <menuitem action="FileMetaData"/>
-      <menuitem action="FilePreferences"/>
       <separator name="file-sep4"/>
       <placeholder name="FileHistory" />
       <separator name="file-sep5"/>
@@ -83,6 +82,7 @@
       </menu>
       <menuitem action="EditRecalc"/>
       <placeholder name="ops"/>
+      <menuitem action="EditPreferences"/>
     </menu>
     <menu name="View" action="MenuView">
       <menuitem action="ViewNew"/>
@@ -97,7 +97,8 @@
       <menuitem action="ViewZoom"/>
       <menuitem action="ViewZoomIn"/>
       <menuitem action="ViewZoomOut"/>
-    </menu>
+      <menuitem action="FormatWorkbook"/>
+     </menu>
     <menu name="Insert" action="MenuInsert">
       <menuitem action="InsertCells"/>
       <menuitem action="InsertColumns"/>
@@ -150,8 +151,6 @@
         <menuitem action="SheetHideColHeader"/>
         <menuitem action="SheetHideRowHeader"/>
       </menu>
-      <menuitem action="FormatWorkbook"/>
-      <menuitem action="FilePreferences"/>
       <menuitem action="FormatAuto"/>
     </menu>
     <menu name="Tools" action="MenuTools">
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 5dae22e..305ce24 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1778,8 +1778,8 @@ static GtkActionEntry const actions[] = {
 	{ "FilePrint", GTK_STOCK_PRINT, NULL,
 		"<control>p", N_("Print the current file"),
 		G_CALLBACK (cb_file_print) },
-	{ "FileMetaData", GTK_STOCK_PROPERTIES, N_("Proper_ties..."),
-		NULL, N_("Edit descriptive information"),
+	{ "FileMetaData", GTK_STOCK_PROPERTIES, N_("Document Proper_ties..."),
+		NULL, N_("Edit document properties"),
 		G_CALLBACK (cb_doc_meta_data) },
 	{ "FileHistoryFull", NULL, N_("Full _History..."),
 		NULL, N_("Access previously used file"),
@@ -1985,8 +1985,8 @@ static GtkActionEntry const actions[] = {
 	{ "FormatCells", NULL, N_("_Cells..."),
 		"<control>1", N_("Modify the formatting of the selected cells"),
 		G_CALLBACK (cb_format_cells) },
-	{ "FormatWorkbook", NULL, N_("_Workbook..."),
-		NULL, N_("Modify the workbook attributes"),
+	{ "FormatWorkbook", NULL, N_("View _Properties..."),
+		NULL, N_("Modify the view properties"),
 		G_CALLBACK (cb_workbook_attr) },
 	{ "FormatAuto", NULL, N_("_Autoformat..."),
 		NULL, N_("Format a region of cells according to a pre-defined template"),