[gnumeric] Add merge and unmerge menu items

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

commit 283399919c7e8bf9ca9992c81e1265e6be167c0d
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Thu Jul 8 00:28:22 2010 -0600

    Add merge and unmerge menu items
    
    2010-07-08  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/GNOME_Gnumeric-gtk.xml.in: add merge and unmerge menu items
    	* src/HILDON_Gnumeric-gtk.xml.in: ditto
    	* component/Gnumeric-embed.xml.in: ditto
    	* src/wbc-gtk-actions.c (permanent_actions): add cellformat sub menu
    	(actions): modify menu text

 ChangeLog                       |    8 ++++++++
 NEWS                            |    1 +
 component/Gnumeric-embed.xml.in |    4 ++++
 src/GNOME_Gnumeric-gtk.xml.in   |    4 ++++
 src/HILDON_Gnumeric-gtk.xml.in  |    4 ++++
 src/wbc-gtk-actions.c           |    5 +++--
 6 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 83c2c81..5b6ddef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-08  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/GNOME_Gnumeric-gtk.xml.in: add merge and unmerge menu items
+	* src/HILDON_Gnumeric-gtk.xml.in: ditto
+	* component/Gnumeric-embed.xml.in: ditto
+	* src/wbc-gtk-actions.c (permanent_actions): add cellformat sub menu
+	(actions): modify menu text
+
 2010-07-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/wbc-gtk-actions.c (cb_edit_clear_all): include CLEAR_COMMENTS
diff --git a/NEWS b/NEWS
index 22443a3..b65c34a 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,7 @@ Andreas:
 	* New functions DATE2HDATE, DATE2HDATE_HEB and DATE2JULIAN.
 	* Add hyperlink and comment removal menu items.
 	* Fix undoing of Clear->All. [#623803]
+	* Add merge and unmerge menu items.
 
 Jean:
 	* Fix strong/weak cursor display. [#623241]
diff --git a/component/Gnumeric-embed.xml.in b/component/Gnumeric-embed.xml.in
index 6468fbe..8f21618 100644
--- a/component/Gnumeric-embed.xml.in
+++ b/component/Gnumeric-embed.xml.in
@@ -127,7 +127,11 @@
       </menu>
     </menu>
     <menu name="Format" action="MenuFormat">
+      <menu name="FormatCellsMenu" action="MenuFormatCells">
       <menuitem action="FormatCells"/>
+      <menuitem action="FormatMergeCells"/>
+      <menuitem action="FormatUnmergeCells"/>
+      </menu>
       <menu name="FormatColumn" action="MenuFormatColumn">
         <menuitem action="ColumnSize"/>
         <menuitem action="ColumnAutoSize"/>
diff --git a/src/GNOME_Gnumeric-gtk.xml.in b/src/GNOME_Gnumeric-gtk.xml.in
index dbd6fd0..7a6723a 100644
--- a/src/GNOME_Gnumeric-gtk.xml.in
+++ b/src/GNOME_Gnumeric-gtk.xml.in
@@ -128,7 +128,11 @@
       </menu>
     </menu>
     <menu name="Format" action="MenuFormat">
+      <menu name="FormatCellsMenu" action="MenuFormatCells">
       <menuitem action="FormatCells"/>
+      <menuitem action="FormatMergeCells"/>
+      <menuitem action="FormatUnmergeCells"/>
+      </menu>
       <menu name="FormatColumn" action="MenuFormatColumn">
         <menuitem action="ColumnSize"/>
         <menuitem action="ColumnAutoSize"/>
diff --git a/src/HILDON_Gnumeric-gtk.xml.in b/src/HILDON_Gnumeric-gtk.xml.in
index 2e8eb92..8ef322c 100644
--- a/src/HILDON_Gnumeric-gtk.xml.in
+++ b/src/HILDON_Gnumeric-gtk.xml.in
@@ -137,7 +137,11 @@
       </menu>
     </menu>
     <menu name="Format" action="MenuFormat">
+      <menu name="FormatCellsMenu" action="MenuFormatCells">
       <menuitem action="FormatCells"/>
+      <menuitem action="FormatMergeCells"/>
+      <menuitem action="FormatUnmergeCells"/>
+      </menu>
       <menu name="FormatColumn" action="MenuFormatColumn">
         <menuitem action="ColumnSize"/>
         <menuitem action="ColumnAutoSize"/>
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 8cd04f8..1a2b1f0 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1775,6 +1775,7 @@ static GtkActionEntry const permanent_actions[] = {
 	{ "MenuInsert",		NULL, N_("_Insert") },
 		{ "MenuInsertSpecial",		NULL, N_("S_pecial") },
 	{ "MenuFormat",		NULL, N_("F_ormat") },
+		{ "MenuFormatCells",		NULL, N_("_Cells") },
 		{ "MenuFormatColumn",		NULL, N_("C_olumn") },
 		{ "MenuFormatRow",		NULL, N_("_Row") },
 		{ "MenuFormatSheet",		NULL, N_("_Sheet") },
@@ -2120,7 +2121,7 @@ static GtkActionEntry const actions[] = {
 		G_CALLBACK (cb_define_name) },
 
 /* Format */
-	{ "FormatCells", NULL, N_("_Cells..."),
+	{ "FormatCells", NULL, N_("_Format..."),
 		"<control>1", N_("Modify the formatting of the selected cells"),
 		G_CALLBACK (cb_format_cells) },
 	{ "FormatWorkbook", NULL, N_("View _Properties..."),
@@ -2467,7 +2468,7 @@ static GtkActionEntry const actions[] = {
 	{ "FormatMergeCells", "Gnumeric_MergeCells", N_("Merge"),
 		NULL, N_("Merge a range of cells"),
 		G_CALLBACK (cb_merge_cells) },
-	{ "FormatUnmergeCells", "Gnumeric_SplitCells", N_("Split"),
+	{ "FormatUnmergeCells", "Gnumeric_SplitCells", N_("Unmerge"),
 		NULL, N_("Split merged ranges of cells"),
 		G_CALLBACK (cb_unmerge_cells) },