Reorganize the entries in the column and row context menus

Change-Id: Ia833a7ca147b9a2730715de14cc18f6d839cdb2a
Reviewed-on: https://gerrit.libreoffice.org/16012
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>

2 files changed, 57 insertions, 53 deletions

diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src
index ef715632151f..0fa3d1dbeb8a 100644
--- a/sc/source/ui/src/hdrcont.src
+++ b/sc/source/ui/src/hdrcont.src
@@ -50,21 +50,12 @@ Menu RID_POPUP_ROWHEADER
 {
     ItemList =
     {
-        PART1
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_ROW_HEIGHT ;
-            HelpId = CMD_FID_ROW_HEIGHT ;
-            Text [ en-US ] = "Row Hei~ght..." ;
-        };
+        PART2
         MenuItem
         {
-            Identifier = FID_ROW_OPT_HEIGHT ;
-            HelpId = CMD_FID_ROW_OPT_HEIGHT ;
-            Text [ en-US ] = "Optimal ~Row Height..." ;
+            Identifier = SID_PASTE_SPECIAL ;
+            HelpId = CMD_SID_PASTE_SPECIAL ;
+            Text [ en-US ] = "P~aste Special..." ;
         };
 
         MenuItem { Separator = TRUE ; };
@@ -73,7 +64,7 @@ Menu RID_POPUP_ROWHEADER
         {
             Identifier = FID_INS_ROWS_BEFORE ;
             HelpId = CMD_FID_INS_ROWS_BEFORE ;
-            Text [ en-US ] = "~Insert Rows Above" ;
+            Text [ en-US ] = "Insert Rows A~bove" ;
         };
         MenuItem
         {
@@ -85,38 +76,45 @@ Menu RID_POPUP_ROWHEADER
         {
             Identifier = SID_DEL_ROWS ;
             HelpId = CMD_SID_DEL_ROWS ;
-            Text [ en-US ] = "~Delete Selected Rows" ;
+            Text [ en-US ] = "~Delete Rows" ;
         };
         MenuItem
         {
             Identifier = SID_DELETE ;
             HelpId = CMD_SID_DELETE ;
-            Text [ en-US ] = "De~lete Row Contents..." ;
+            Text [ en-US ] = "Cl~ear Contents..." ;
         };
 
         MenuItem { Separator = TRUE ; };
 
+        PART1
+
         MenuItem
         {
-            Identifier = FID_ROW_HIDE ;
-            HelpId = CMD_FID_ROW_HIDE ;
-            Text [ en-US ] = "~Hide" ;
+            Identifier = FID_ROW_HEIGHT ;
+            HelpId = CMD_FID_ROW_HEIGHT ;
+            Text [ en-US ] = "Row Hei~ght..." ;
         };
         MenuItem
         {
-            Identifier = FID_ROW_SHOW ;
-            HelpId = CMD_FID_ROW_SHOW ;
-            Text [ en-US ] = "~Show" ;
+            Identifier = FID_ROW_OPT_HEIGHT ;
+            HelpId = CMD_FID_ROW_OPT_HEIGHT ;
+            Text [ en-US ] = "~Optimal Row Height..." ;
         };
 
         MenuItem { Separator = TRUE ; };
 
-        PART2
         MenuItem
         {
-            Identifier = SID_PASTE_SPECIAL ;
-            HelpId = CMD_SID_PASTE_SPECIAL ;
-            Text [ en-US ] = "P~aste Special..." ;
+            Identifier = FID_ROW_HIDE ;
+            HelpId = CMD_FID_ROW_HIDE ;
+            Text [ en-US ] = "~Hide Rows" ;
+        };
+        MenuItem
+        {
+            Identifier = FID_ROW_SHOW ;
+            HelpId = CMD_FID_ROW_SHOW ;
+            Text [ en-US ] = "~Show Rows" ;
         };
     };
 };
@@ -125,21 +123,12 @@ Menu RID_POPUP_COLHEADER
 {
     ItemList =
     {
-        PART1
-
-        MenuItem { Separator = TRUE ; };
-
-        MenuItem
-        {
-            Identifier = FID_COL_WIDTH ;
-            HelpId = CMD_FID_COL_WIDTH ;
-            Text [ en-US ] = "Col~umn Width..." ;
-        };
+        PART2
         MenuItem
         {
-            Identifier = FID_COL_OPT_WIDTH ;
-            HelpId = CMD_FID_COL_OPT_WIDTH ;
-            Text [ en-US ] = "O~ptimal Column Width..." ;
+            Identifier = SID_PASTE_SPECIAL ;
+            HelpId = CMD_SID_PASTE_SPECIAL ;
+            Text [ en-US ] = "P~aste Special..." ;
         };
 
         MenuItem { Separator = TRUE ; };
@@ -148,7 +137,7 @@ Menu RID_POPUP_COLHEADER
         {
             Identifier = FID_INS_COLUMNS_BEFORE ;
             HelpId = CMD_FID_INS_COLUMNS_BEFORE ;
-            Text [ en-US ] = "~Insert Columns Left" ;
+            Text [ en-US ] = "Insert Columns ~Left" ;
         };
         MenuItem
         {
@@ -160,38 +149,45 @@ Menu RID_POPUP_COLHEADER
         {
             Identifier = SID_DEL_COLS ;
             HelpId = CMD_SID_DEL_COLS ;
-            Text [ en-US ] = "~Delete Selected Columns" ;
+            Text [ en-US ] = "~Delete Columns" ;
         };
         MenuItem
         {
             Identifier = SID_DELETE ;
             HelpId = CMD_SID_DELETE ;
-            Text [ en-US ] = "D~elete Column Contents..." ;
+            Text [ en-US ] = "Cl~ear Contents..." ;
         };
 
         MenuItem { Separator = TRUE ; };
 
+        PART1
+
         MenuItem
         {
-            Identifier = FID_COL_HIDE ;
-            HelpId = CMD_FID_COL_HIDE ;
-            Text [ en-US ] = "~Hide" ;
+            Identifier = FID_COL_WIDTH ;
+            HelpId = CMD_FID_COL_WIDTH ;
+            Text [ en-US ] = "Column ~Width..." ;
         };
         MenuItem
         {
-            Identifier = FID_COL_SHOW ;
-            HelpId = CMD_FID_COL_SHOW ;
-            Text [ en-US ] = "~Show" ;
+            Identifier = FID_COL_OPT_WIDTH ;
+            HelpId = CMD_FID_COL_OPT_WIDTH ;
+            Text [ en-US ] = "~Optimal Column Width..." ;
         };
 
         MenuItem { Separator = TRUE ; };
 
-        PART2
         MenuItem
         {
-            Identifier = SID_PASTE_SPECIAL ;
-            HelpId = CMD_SID_PASTE_SPECIAL ;
-            Text [ en-US ] = "Paste ~Special..." ;
+            Identifier = FID_COL_HIDE ;
+            HelpId = CMD_FID_COL_HIDE ;
+            Text [ en-US ] = "~Hide Columns" ;
+        };
+        MenuItem
+        {
+            Identifier = FID_COL_SHOW ;
+            HelpId = CMD_FID_COL_SHOW ;
+            Text [ en-US ] = "~Show Columns" ;
         };
     };
 };
diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src
index 7090d0d3aa07..972aa94a1487 100644
--- a/sc/source/ui/src/popup.src
+++ b/sc/source/ui/src/popup.src
@@ -125,7 +125,7 @@ Menu RID_POPUP_CELLS
         {
             Identifier = SID_DELETE ;
             HelpId = CMD_SID_DELETE ;
-            Text [ en-US ] = "Delete C~ontents..." ;
+            Text [ en-US ] = "Cl~ear Contents..." ;
         };
         MenuItem
         {
@@ -217,6 +217,9 @@ Menu RID_POPUP_TAB
             HelpId = CMD_FID_TAB_MOVE ;
             Text [ en-US ] = "~Move/Copy Sheet..." ;
         };
+
+        MenuItem { Separator = TRUE ; };
+
         MenuItem
         {
             Identifier = FID_TAB_MENU_SET_TAB_BG_COLOR ;
@@ -231,6 +234,11 @@ Menu RID_POPUP_TAB
         };
         MenuItem
         {
+            Identifier = FID_TAB_TOGGLE_GRID ;
+            Text [ en-US ] = "Sheet ~Gridlines..." ;
+        };
+        MenuItem
+        {
             Identifier = FID_TAB_RTL ;
             HelpId = CMD_FID_TAB_RTL ;
             Text [ en-US ] = "S~heet Right-To-Left" ;