From cdd7ef358d8e97ebf13431b78337f61ad5c2c01a Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Thu, 11 Jun 2015 18:13:55 +0400
Subject: tdf#91820 Minor fixes and fix icon links

Change-Id: I8b151c09bd8630abfc5b7ec3b56870e0075c8d36
Reviewed-on: https://gerrit.libreoffice.org/16231
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
---
 icon-themes/breeze/links.txt                       |  8 +++----
 icon-themes/galaxy/links.txt                       |  8 +++----
 icon-themes/tango/links.txt                        |  8 +++----
 .../data/org/openoffice/Office/UI/CalcCommands.xcu | 13 +++++++----
 .../org/openoffice/Office/UI/GenericCommands.xcu   |  2 +-
 sc/uiconfig/scalc/menubar/menubar.xml              | 27 +++++++++++-----------
 6 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 41b7a040c392..9ad8fb147ea9 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -45,10 +45,10 @@ cmd/lc_linespacing.png cmd/lc_spacepara15.png
 cmd/sc_linespacing.png cmd/sc_spacepara15.png
 
 # calc menu entries
-cmd/datapilotmenu.png cmd/sc_datadatapilotrun.png
-cmd/insertrowsmenu.png cmd/sc_insertrows.png
-cmd/insertcolumnsmenu.png cmd/sc_insertcolumns.png
-cmd/functiondialog.png cmd/sc_insertformula.png
+cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
+cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
+cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
+cmd/sc_functiondialog.png cmd/sc_insertformula.png
 
 # Shapes
 cmd/lc_basicshapes.png cmd/lc_basicshapes.diamond.png
diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 2c5cb9e21c88..2e42f1194ebd 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -40,10 +40,10 @@ cmd/sc_mirrorhorz.png cmd/sc_fliphorizontal.png
 cmd/sc_mirrorvert.png cmd/sc_flipvertical.png
 
 # calc menu entries
-cmd/datapilotmenu.png cmd/sc_datadatapilotrun.png
-cmd/insertrowsmenu.png cmd/sc_insertrows.png
-cmd/insertcolumnsmenu.png cmd/sc_insertcolumns.png
-cmd/functiondialog.png cmd/sc_insertformula.png
+cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
+cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
+cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
+cmd/sc_functiondialog.png cmd/sc_insertformula.png
 
 # image/object context menu entries
 cmd/sc_wrapmenu.png cmd/sc_wrapon.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e75badaea0f8..7ee19c8fff8a 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -415,10 +415,10 @@ cmd/he/sc_undo.png cmd/fa/sc_undo.png
 cmd/he/lc_undo.png cmd/fa/lc_undo.png
 
 # calc menu entries
-cmd/datapilotmenu.png cmd/sc_datadatapilotrun.png
-cmd/insertrowsmenu.png cmd/sc_insertrows.png
-cmd/insertcolumnsmenu.png cmd/sc_insertcolumns.png
-cmd/functiondialog.png cmd/sc_insertformula.png
+cmd/sc_datapilotmenu.png cmd/sc_datadatapilotrun.png
+cmd/sc_insertrowsmenu.png cmd/sc_insertrows.png
+cmd/sc_insertcolumnsmenu.png cmd/sc_insertcolumns.png
+cmd/sc_functiondialog.png cmd/sc_insertformula.png
 
 # RTL Problems
 cmd/sc_recundo.png cmd/sc_undo.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 87c1e4cd2c23..891ac1e23c77 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -331,10 +331,10 @@
       </node>
       <node oor:name=".uno:DataDataPilotRun" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Create Pivot Table...</value>
+          <value xml:lang="en-US">Insert Pivot Table...</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Create...</value>
+          <value xml:lang="en-US">Pi~vot Table...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -390,7 +390,7 @@
       </node>
       <node oor:name=".uno:InsertObjectChartFromFile" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Chart From File</value>
+          <value xml:lang="en-US">Chart From File...</value>
         </prop>
       </node>
       <node oor:name=".uno:StarChartDialog" oor:op="replace">
@@ -1879,7 +1879,12 @@
       </node>
       <node oor:name=".uno:NamesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Names Cells</value>
+          <value xml:lang="en-US">~Name Cells</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:EditAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Edit Comment</value>
         </prop>
       </node>
       <node oor:name=".uno:DataPilotMenu" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0cea40856add..0531f3391c7d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3446,7 +3446,7 @@
       </node>
       <node oor:name=".uno:HyperlinkDialog" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Hyperlink</value>
+          <value xml:lang="en-US">~Hyperlink...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>9</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index bebe8a7884cd..153fe0d03bd8 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -55,9 +55,9 @@
                     <menu:menuitem menu:id=".uno:SendViaBluetooth"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:WebHtml"/>
             <menu:menuseparator/>
+            <menu:menuitem menu:id=".uno:PrintPreview"/>
             <menu:menuitem menu:id=".uno:Print"/>
             <menu:menuitem menu:id=".uno:PrinterSetup"/>
             <menu:menuseparator/>
@@ -110,7 +110,6 @@
         <menu:menupopup>
             <menu:menuitem menu:id=".uno:NormalViewMode" menu:style="radio"/>
             <menu:menuitem menu:id=".uno:PagebreakMode"  menu:style="radio"/>
-            <menu:menuitem menu:id=".uno:PrintPreview"   menu:style="radio"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:AvailableToolbars"/>
             <menu:menuitem menu:id=".uno:InputLineVisible"/>
@@ -151,6 +150,16 @@
         <menu:menupopup>
             <menu:menuitem menu:id=".uno:InsertGraphic"/>
             <menu:menuitem menu:id=".uno:InsertObjectChart"/>
+            <menu:menuitem menu:id=".uno:DataDataPilotRun"/>
+            <menu:menu menu:id=".uno:ShapesMenu">
+              <menu:menupopup>
+                <menu:menuitem menu:id=".uno:Line"/>
+                <menu:menuitem menu:id=".uno:Freeline_Unfilled"/>
+                <menu:menuitem menu:id=".uno:Rect"/>
+                <menu:menuitem menu:id=".uno:Ellipse"/>
+                <menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
+              </menu:menupopup>
+            </menu:menu>
             <menu:menu menu:id=".uno:GraphicMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:Gallery"/>
@@ -164,30 +173,21 @@
                     <menu:menuitem menu:id=".uno:InsertAVMedia"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menu menu:id=".uno:ShapesMenu">
-              <menu:menupopup>
-                <menu:menuitem menu:id=".uno:Line"/>
-                <menu:menuitem menu:id=".uno:Freeline_Unfilled"/>
-                <menu:menuitem menu:id=".uno:Rect"/>
-                <menu:menuitem menu:id=".uno:Ellipse"/>
-                <menu:menuitem menu:id=".uno:Polygon_Unfilled"/>
-              </menu:menupopup>
-            </menu:menu>
             <menu:menu menu:id=".uno:ObjectMenu">
                 <menu:menupopup>
+                    <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
                     <menu:menuitem menu:id=".uno:InsertObject"/>
                     <menu:menuitem menu:id=".uno:InsertPlugin"/>
-                    <menu:menuitem menu:id=".uno:InsertObjectStarMath"/>
                     <menu:menuitem menu:id=".uno:InsertObjectChartFromFile"/>
                 </menu:menupopup>
             </menu:menu>
-            <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:FunctionDialog"/>
             <menu:menuitem menu:id=".uno:FunctionBox"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:DrawText"/>
             <menu:menuitem menu:id=".uno:InsertAnnotation"/>
+            <menu:menuitem menu:id=".uno:InsertObjectFloatingFrame"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:HyperlinkDialog"/>
             <menu:menuseparator/>
@@ -277,6 +277,7 @@
                     <menu:menuitem menu:id=".uno:NumberFormatScientific"/>
                 </menu:menupopup>
             </menu:menu>
+            <menu:menuseparator/>
             <menu:menu menu:id=".uno:FormatStylesMenu">
                 <menu:menupopup>
                     <menu:menuitem menu:id=".uno:StyleUpdateByExample"/>
-- 
cgit