controltextrendering: merge changes from DEV300_m61

21 files changed, 639 insertions, 219 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 26143aa76407..355879f036ac 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1245,7 +1245,7 @@
     </node>
     <node oor:name="V_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:PasteClipboard</value>
+      <value xml:lang="en-US">.uno:PasteSpecial</value>
      </prop>
     </node>
     <node oor:name="X_MOD1" oor:op="replace">
@@ -1872,7 +1872,19 @@
     </node>
    </node>
    <node oor:name="com.sun.star.presentation.PresentationDocument" oor:op="replace">
-    <node oor:name="1_MOD1" oor:op="replace">
+     <node oor:name="PAGEDOWN_MOD1_MOD2" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="en-US">.uno:NextAnnotation</value>
+       </prop>
+     </node>
+     <node oor:name="PAGEUP_MOD1_MOD2" oor:op="replace">
+       <prop oor:name="Command">
+         <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
+         <value xml:lang="en-US">.uno:PreviousAnnotation</value>
+       </prop>
+     </node>
+     <node oor:name="1_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
       <value xml:lang="en-US">.uno:SpacePara1</value>
      </prop>
@@ -2200,7 +2212,7 @@
     </node>
     <node oor:name="V_SHIFT_MOD1" oor:op="replace">
      <prop oor:name="Command"><value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-      <value xml:lang="en-US">.uno:PasteClipboard</value>
+      <value xml:lang="en-US">.uno:PasteSpecial</value>
      </prop>
     </node>
     <node oor:name="X_MOD1" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index a638a78d069d..c9e64be54ee5 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -575,4 +575,13 @@
       </prop>
     </node>
   </node>
+  <node oor:name="Path">
+    <node oor:name="Current">
+      <prop oor:name="Temp" oor:type="xs:string">
+        <value install:module="macosx">$(userurl)/temp</value>
+        <value install:module="unx">$(temp)</value>
+        <value install:module="wnt">$(temp)</value>
+      </prop>
+    </node>
+  </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index e4bec2eaee19..b979f0f097c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -179,12 +179,13 @@
 
         <node oor:name="Temp" oor:op="fuse" oor:mandatory="true">
             <prop oor:name="IsSinglePath" oor:finalized="true">
-                <value>true</value>
+                  <value>true</value>
             </prop>
-            <node oor:name="InternalPaths" oor:finalized="true" />
-            <prop oor:name="UserPaths" oor:finalized="true" />
+            <node oor:name="InternalPaths" oor:finalized="true"/>
+            <prop oor:name="UserPaths" oor:finalized="true"/>
             <prop oor:name="WritePath">
-                     <value>$(temp)</value>
+                  <value install:module="macosx">$(userurl)/temp</value>
+                  <value install:module="unxwnt">$(temp)</value>
             </prop>
         </node>
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 991ea9a64d10..8c76a2dadd9f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -681,12 +681,20 @@
             </node>
             <node oor:name=".uno:NoteVisible" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Show Note</value>
-                </prop>
-            </node>
+                    <value xml:lang="en-US">Show Comment</value>
+                </prop>
+      </node>
+      <node oor:name=".uno:InsertAnnotation" oor:op="replace">
+          <prop oor:name="Label" oor:type="xs:string">
+            <value xml:lang="en-US">Comm~ent</value>
+          </prop>
+          <prop oor:name="Properties" oor:type="xs:int">
+            <value>1</value>
+          </prop>
+      </node>
             <node oor:name=".uno:DeleteNote" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete Note</value>
+                    <value xml:lang="en-US">Delete Comment</value>
                 </prop>
             </node>
             <node oor:name=".uno:InputLineVisible" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
index e574c72b314e..296a16a9e697 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu
@@ -3,64 +3,62 @@
 <oor:component-data oor:name="ChartCommands" oor:package="org.openoffice.Office.UI" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <node oor:name="UserInterface">
         <node oor:name="Commands">
-            <node oor:name=".uno:DiagramData" oor:op="replace">
+
+            <!-- Menu-Insert -->
+            <node oor:name=".uno:InsertMenuTitles" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Chart ~Data Table...</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value xml:lang="en-US">~Titles...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DataRanges" oor:op="replace">
+            <node oor:name=".uno:InsertMenuLegend" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Data ~Ranges...</value>
+                    <value xml:lang="en-US">~Legend...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertTitle" oor:op="replace">
+            <node oor:name=".uno:InsertMenuAxes" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Title...</value>
+                    <value xml:lang="en-US">~Axes...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertLegend" oor:op="replace">
+            <node oor:name=".uno:InsertMenuGrids" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Legend...</value>
+                    <value xml:lang="en-US">~Grids...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertDescription" oor:op="replace">
+            <node oor:name=".uno:InsertMenuDataLabels" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
                     <value xml:lang="en-US">~Data Labels...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertAxis" oor:op="replace">
+            <node oor:name=".uno:InsertMenuTrendlines" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Axes...</value>
+                    <value xml:lang="en-US">Tre~nd Lines...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ChartTitle" oor:op="replace">
+            <node oor:name=".uno:InsertMenuMeanValues" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Chart Title</value>
+                    <value xml:lang="en-US">Mean ~Value Lines</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Legend" oor:op="replace">
+            <node oor:name=".uno:InsertMenuYErrorBars" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Y Error ~Bars...</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">~Legend...</value>
+            <!--  Menu - Format -->
+            <node oor:name=".uno:FormatSelection" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Selection...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGrid" oor:op="replace">
+            <node oor:name=".uno:Legend" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Edit Grid</value>
+                    <value xml:lang="en-US">~Legend...</value>
                 </prop>
             </node>
             <node oor:name=".uno:DiagramWall" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
                     <value xml:lang="en-US">Chart ~Wall...</value>
                 </prop>
             </node>
@@ -74,11 +72,6 @@
                     <value xml:lang="en-US">Chart ~Area...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:View3D" oor:op="replace">
-                <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~3D View...</value>
-                </prop>
-            </node>
             <node oor:name=".uno:DiagramType" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Chart T~ype...</value>
@@ -87,101 +80,91 @@
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToggleTitle" oor:op="replace">
+            <node oor:name=".uno:DataRanges" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Title On/Off</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value xml:lang="en-US">~Data Ranges...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToggleLegend" oor:op="replace">
+            <node oor:name=".uno:DiagramData" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Legend On/Off</value>
+                    <value xml:lang="en-US">Chart ~Data Table...</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToggleAxisDescr" oor:op="replace">
+            <node oor:name=".uno:View3D" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Show/Hide Axis Description(s)</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value xml:lang="en-US">~3D View...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToggleGridHorizontal" oor:op="replace">
+
+            <!-- sub menu - format arrangement -->
+
+            <node oor:name=".uno:Forward" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Horizontal Grid On/Off</value>
+                    <value xml:lang="en-US">Bring ~Forward</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToggleGridVertical" oor:op="replace">
+            <node oor:name=".uno:Backward" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Vertical Grid On/Off</value>
+                    <value xml:lang="en-US">Send Back~ward</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DataInRows" oor:op="replace">
+
+            <!-- sub menu: format title-->
+            <node oor:name=".uno:MainTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Data in Rows</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value xml:lang="en-US">~Main Title...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DataInColumns" oor:op="replace">
+            <node oor:name=".uno:SubTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Data in Columns</value>
-                </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+                    <value xml:lang="en-US">~Subtitle...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ToolSelect" oor:op="replace">
+            <node oor:name=".uno:XTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Select Tool</value>
+                    <value xml:lang="en-US">~X Axis Title...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ContextType" oor:op="replace">
+            <node oor:name=".uno:YTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">Chart Type</value>
+                    <value xml:lang="en-US">~Y Axis Title...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:NewArrangement" oor:op="replace">
+            <node oor:name=".uno:ZTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Automatic Layout</value>
+                    <value xml:lang="en-US">~Z Axis Title...</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+            </node>
+            <node oor:name=".uno:SecondaryXTitle" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">S~econdary X Axis Title...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertGrids" oor:op="replace">
+            <node oor:name=".uno:SecondaryYTitle" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-
-                    <value xml:lang="en-US">~Grids...</value>
+                    <value xml:lang="en-US">Se~condary Y Axis Title...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Update" oor:op="replace">
+            <node oor:name=".uno:AllTitles" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Update Chart</value>
+                    <value xml:lang="en-US">~All Titles...</value>
                 </prop>
             </node>
+
+            <!-- sub menu: format axis-->
             <node oor:name=".uno:DiagramAxisX" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
@@ -200,235 +183,502 @@
                     <value xml:lang="en-US">~Z Axis...</value>
                 </prop>
             </node>
+            <node oor:name=".uno:DiagramAxisA" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">~Secondary X Axis...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DiagramAxisB" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">S~econdary Y Axis...</value>
+                </prop>
+            </node>
             <node oor:name=".uno:DiagramAxisAll" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
                     <value xml:lang="en-US">~All Axes...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertTrendlines" oor:op="replace">
+
+            <!-- sub menu: format grid-->
+            <node oor:name=".uno:DiagramGridXMain" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">T~rend Lines...</value>
+                    <value xml:lang="en-US">~Y Axis Major Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertMeanValues" oor:op="replace">
+            <node oor:name=".uno:DiagramGridYMain" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Mean ~Value Lines</value>
+                    <value xml:lang="en-US">~X Axis Major Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertYErrorbars" oor:op="replace">
+            <node oor:name=".uno:DiagramGridZMain" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Y Error Bars...</value>
+                    <value xml:lang="en-US">~Z Axis Major Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:MainTitle" oor:op="replace">
+            <node oor:name=".uno:DiagramGridXHelp" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">~Main Title...</value>
+                    <value xml:lang="en-US">Y Axis Minor ~Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:SubTitle" oor:op="replace">
+            <node oor:name=".uno:DiagramGridYHelp" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Subtitle...</value>
+
+                    <value xml:lang="en-US">X Axis ~Minor Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:XTitle" oor:op="replace">
+            <node oor:name=".uno:DiagramGridZHelp" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~X Axis Title...</value>
+
+                    <value xml:lang="en-US">Z Ax~is Minor Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:YTitle" oor:op="replace">
+            <node oor:name=".uno:DiagramGridAll" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Y Axis Title...</value>
+                    <value xml:lang="en-US">~All Grids...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ZTitle" oor:op="replace">
+
+            <!-- context menu - insert/delete/formatof several elements-->
+
+            <node oor:name=".uno:FormatWall" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Z Axis Title...</value>
+
+                    <value xml:lang="en-US">Format Wall...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:SecondaryXTitle" oor:op="replace">
+            <node oor:name=".uno:FormatFloor" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">S~econdary X Axis Title...</value>
+                    <value xml:lang="en-US">Format Floor...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:SecondaryYTitle" oor:op="replace">
+            <node oor:name=".uno:FormatChartArea" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Se~condary Y Axis Title...</value>
+                    <value xml:lang="en-US">Format Chart Area...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:AllTitles" oor:op="replace">
+
+            <!-- title -->
+            <node oor:name=".uno:InsertTitles" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Titles...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatTitle" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Title...</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">~All Titles...</value>
+            <!-- legend -->
+
+            <node oor:name=".uno:InsertLegend" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Legend</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridXMain" oor:op="replace">
+            <node oor:name=".uno:DeleteLegend" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Y Axis Major Grid...</value>
+                    <value xml:lang="en-US">Delete Legend</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridYMain" oor:op="replace">
+            <node oor:name=".uno:FormatLegend" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~X Axis Major Grid...</value>
+                    <value xml:lang="en-US">Format Legend...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridZMain" oor:op="replace">
+
+            <!-- axis -->
+
+            <node oor:name=".uno:InsertRemoveAxes" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Z Axis Major Grid...</value>
+                    <value xml:lang="en-US">Insert/Delete Axes...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridAll" oor:op="replace">
+            <node oor:name=".uno:InsertAxis" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~All Grids...</value>
+
+                    <value xml:lang="en-US">Insert Axis</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramObjects" oor:op="replace">
+            <node oor:name=".uno:DeleteAxis" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Object Properties...</value>
+
+                    <value xml:lang="en-US">Delete Axis</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridXHelp" oor:op="replace">
+            <node oor:name=".uno:FormatAxis" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Axis...</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">Y Axis Minor ~Grid...</value>
+            <node oor:name=".uno:InsertAxisTitle" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">Insert Axis Title</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridYHelp" oor:op="replace">
+
+            <!-- grids -->
+
+            <node oor:name=".uno:InsertMajorGrid" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">X Axis ~Minor Grid...</value>
+                    <value xml:lang="en-US">Insert Major Grid</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridZHelp" oor:op="replace">
+            <node oor:name=".uno:DeleteMajorGrid" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Z Ax~is Minor Grid...</value>
+                    <value xml:lang="en-US">Delete Major Grid</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ScaleText" oor:op="replace">
+            <node oor:name=".uno:FormatMajorGrid" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Scale Text</value>
+                    <value xml:lang="en-US">Format Major Grid...</value>
                 </prop>
-                <prop oor:name="Properties" oor:type="xs:int">
-                    <value>1</value>
+            </node>
+
+            <node oor:name=".uno:InsertMinorGrid" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">Insert Minor Grid</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DataDescriptionType" oor:op="replace">
+            <node oor:name=".uno:DeleteMinorGrid" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Caption Type for Chart Data</value>
+                    <value xml:lang="en-US">Delete Minor Grid</value>
                 </prop>
             </node>
-            <node oor:name=".uno:LegendPosition" oor:op="replace">
+            <node oor:name=".uno:FormatMinorGrid" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Legend Position</value>
+                    <value xml:lang="en-US">Format Minor Grid...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DefaultColors" oor:op="replace">
+
+            <!-- trend line -->
+
+            <node oor:name=".uno:InsertTrendline" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Tre~nd Line...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteTrendline" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Tre~nd Line</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatTrendline" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Trend Line...</value>
+                </prop>
+            </node>
+
+            <!-- trend line equation -->
+
+            <node oor:name=".uno:InsertTrendlineEquation" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Trend Line ~Equation</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:InsertTrendlineEquationAndR2" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert R² and Trend Line Equation</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:InsertR2Value" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert R²</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteR2Value" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete R²</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteTrendlineEquation" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Trend Line ~Equation</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatTrendlineEquation" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Trend Line Equation...</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">Default Colors for Data Series</value>
+            <!-- mean value -->
+
+            <node oor:name=".uno:InsertMeanValue" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Mean ~Value Line</value>
                 </prop>
             </node>
-            <node oor:name=".uno:BarWidth" oor:op="replace">
+            <node oor:name=".uno:DeleteMeanValue" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Mean ~Value Line</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatMeanValue" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Bar Width</value>
+                    <value xml:lang="en-US">Format Mean Value Line...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:NumberOfLines" oor:op="replace">
+
+            <!-- error bars -->
+
+            <node oor:name=".uno:InsertYErrorBars" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Insert Y Error ~Bars...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteYErrorBars" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Delete Y Error ~Bars</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatYErrorBars" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Y Error Bars...</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">Number of lines in combination chart</value>
+            <!-- data labels -->
+
+            <node oor:name=".uno:InsertDataLabels" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">Insert Data Labels</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Forward" oor:op="replace">
+            <node oor:name=".uno:DeleteDataLabels" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
-                    <value xml:lang="en-US">Bring ~Forward</value>
+                    <value xml:lang="en-US">Delete Data Labels</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatDataLabels" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Data Labels...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:InsertDataLabel" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">Insert Single Data Label</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DeleteDataLabel" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+
+                    <value xml:lang="en-US">Delete Single Data Label</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatDataLabel" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Single Data Label...</value>
+                </prop>
+            </node>
+
+            <!-- data series and point -->
+
+            <node oor:name=".uno:FormatDataSeries" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Data Series...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatDataPoint" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Data Point...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ResetDataPoint" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Reset Data Point</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ResetAllDataPoints" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Reset all Data Points</value>
+                </prop>
+            </node>
+
+
+            <node oor:name=".uno:FormatStockLoss" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Stock Loss...</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:FormatStockGain" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Format Stock Gain...</value>
+                </prop>
+            </node>
+
+            <!-- some toolbar button commands -->
+
+            <node oor:name=".uno:ChartElementSelector" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Select Chart Element</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:Backward" oor:op="replace">
+
+            <node oor:name=".uno:ToggleGridHorizontal" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Horizontal Grid On/Off</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ScaleText" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Scale Text</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:NewArrangement" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Automatic Layout</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">Send Back~ward</value>
+            <!-- unused? -->
+            <node oor:name=".uno:Update" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Update Chart</value>
+                </prop>
+            </node>
+
+            <node oor:name=".uno:ToggleTitle" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Title On/Off</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramAxisA" oor:op="replace">
+            <node oor:name=".uno:ToggleLegend" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Legend On/Off</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:ToggleAxisDescr" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Show/Hide Axis Description(s)</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
 
-                    <value xml:lang="en-US">~Secondary X Axis...</value>
+            <node oor:name=".uno:ToggleGridVertical" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Vertical Grid On/Off</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramAxisB" oor:op="replace">
+
+            <node oor:name=".uno:DataInRows" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">S~econdary Y Axis...</value>
+                    <value xml:lang="en-US">Data in Rows</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
                 </prop>
             </node>
-        </node>
-        <node oor:name="Popups">
-            <node oor:name=".uno:ArrangeRow" oor:op="replace">
+            <node oor:name=".uno:DataInColumns" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Arrange~ment</value>
+                    <value xml:lang="en-US">Data in Columns</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramAxisMenu" oor:op="replace">
+            <node oor:name=".uno:ToolSelect" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">A~xis</value>
+
+                    <value xml:lang="en-US">Select Tool</value>
                 </prop>
             </node>
-            <node oor:name=".uno:ChartTitleMenu" oor:op="replace">
+            <node oor:name=".uno:ContextType" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Title</value>
+                    <value xml:lang="en-US">Chart Type</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DiagramGridMenu" oor:op="replace">
+
+            <node oor:name=".uno:DataDescriptionType" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Grid</value>
+                    <value xml:lang="en-US">Caption Type for Chart Data</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertTrendline" oor:op="replace">
+            <node oor:name=".uno:LegendPosition" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Tre~nd Line...</value>
+
+                    <value xml:lang="en-US">Legend Position</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertMeanValue" oor:op="replace">
+            <node oor:name=".uno:DefaultColors" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Mean ~Value Line</value>
+
+                    <value xml:lang="en-US">Default Colors for Data Series</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertTrendlineEquation" oor:op="replace">
+            <node oor:name=".uno:BarWidth" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert Trend Line ~Equation</value>
+
+                    <value xml:lang="en-US">Bar Width</value>
                 </prop>
             </node>
-            <node oor:name=".uno:InsertYErrorbar" oor:op="replace">
+            <node oor:name=".uno:NumberOfLines" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Insert ~Y Error Bars...</value>
+
+                    <value xml:lang="en-US">Number of lines in combination chart</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DeleteMeanValue" oor:op="replace">
+        </node>
+
+        <!-- menu items with sub menu -->
+
+        <node oor:name="Popups">
+            <node oor:name=".uno:ArrangeRow" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete Mean ~Value Line</value>
+                    <value xml:lang="en-US">Arrange~ment</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DeleteTrendline" oor:op="replace">
+            <node oor:name=".uno:ChartTitleMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete Tre~ndline</value>
+                    <value xml:lang="en-US">~Title</value>
                 </prop>
             </node>
-            <node oor:name=".uno:DeleteYErrorbar" oor:op="replace">
+            <node oor:name=".uno:DiagramAxisMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Delete ~Y Error Bars</value>
+                    <value xml:lang="en-US">A~xis</value>
+                </prop>
+            </node>
+            <node oor:name=".uno:DiagramGridMenu" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">~Grid</value>
                 </prop>
             </node>
         </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index fb4b18aa9f78..3f3caf1f8be3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -221,6 +221,17 @@
           <value>com.sun.star.svx.FontHeightToolBoxController</value>
         </prop>
       </node>
+      <node oor:name="c3" oor:op="replace">
+        <prop oor:name="Command">
+            <value>.uno:ChartElementSelector</value>
+        </prop>
+        <prop oor:name="Module">
+            <value>com.sun.star.chart2.ChartDocument</value>
+        </prop>
+        <prop oor:name="Controller">
+            <value>com.sun.star.comp.chart.ElementSelectorToolbarController</value>
+        </prop>
+    </node>
     </node>
     <node oor:name="StatusBar">
       <node oor:name="c1" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 104fb106836c..2925c2a97802 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -651,7 +651,7 @@
                     <value xml:lang="en-US">~Page...</value>
                 </prop>
             </node>
-            <node oor:name=".uno:PasteClipboard" oor:op="replace">
+                        <node oor:name=".uno:PasteSpecial" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
                     <value xml:lang="en-US">Paste ~Special...</value>
@@ -1743,7 +1743,12 @@
                     <value xml:lang="en-US">~Slide Show</value>
                 </prop>
             </node>
-            <node oor:name=".uno:GroupMenu" oor:op="replace">
+      <!--node oor:name=".uno:ReviewMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Review</value>
+        </prop>
+      </node-->
+      <node oor:name=".uno:GroupMenu" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
 
                     <value xml:lang="en-US">~Group</value>
@@ -2061,6 +2066,54 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:InsertAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Comme~nt</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShowAnnotations" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Comme~nts</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">~Delete Comment</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:DeleteAllAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Delete ~All Comments</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:NextAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Next Comment</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:PreviousAnnotation" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Previous Comment</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
     </node>
     </node>
 </oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index 9e6a1be3c80e..e0db837c21a5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -666,7 +666,21 @@
                     <value>true</value>
                 </prop>
             </node>
-            <node oor:name="private:resource/toolbar/masterviewtoolbar" oor:op="replace">
+      <node oor:name="private:resource/toolbar/commentsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comments</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/masterviewtoolbar" oor:op="replace">
                 <prop oor:name="Docked" oor:type="xs:boolean">
                     <value>false</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 23caee9af12d..fa69145371f4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1951,7 +1951,7 @@
             </node>
             <node oor:name=".uno:InsertAnnotation" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Not~e</value>
+                    <value xml:lang="en-US">Comme~nt</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
@@ -4144,13 +4144,20 @@
             </node>
             <node oor:name=".uno:ExportDialog" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="de">Dialog exportieren</value>
                     <value xml:lang="en-US">Export Dialog</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
                 </prop>
             </node>
+            <node oor:name=".uno:ImportDialog" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Import Dialog</value>
+                </prop>
+                <prop oor:name="Properties" oor:type="xs:int">
+                    <value>1</value>
+                </prop>
+            </node>
             <node oor:name=".uno:CompileBasic" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Compile</value>
@@ -5127,17 +5134,17 @@
             </node> -->
       <node oor:name=".uno:DeleteAllNotes" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Notes</value>
+          <value xml:lang="en-US">Delete All Comments</value>
         </prop>
       </node>
       <node oor:name=".uno:DeleteAuthor" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete All Notes by This Author</value>
+          <value xml:lang="en-US">Delete All Comments by This Author</value>
         </prop>
       </node>
       <node oor:name=".uno:DeleteNote" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Delete Note</value>
+          <value xml:lang="en-US">Delete Comment</value>
         </prop>
       </node>
     </node>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 86bf55f3dc51..cc309efb2f59 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -196,7 +196,7 @@
                     <value>false</value>
                 </prop>
             </node>
-            <node oor:name="private:resource/toolbar/formtextobjectbar" oor:op="replace">
+      <node oor:name="private:resource/toolbar/formtextobjectbar" oor:op="replace">
                 <prop oor:name="UIName" oor:type="xs:string">
                     <value xml:lang="en-US">Text Box Formatting</value>
                 </prop>
@@ -761,7 +761,21 @@
                     <value>true</value>
                 </prop>
             </node>
-            <node oor:name="private:resource/toolbar/masterviewtoolbar" oor:op="replace">
+      <node oor:name="private:resource/toolbar/commentsbar" oor:op="replace">
+        <prop oor:name="Docked" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="Visible" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+        <prop oor:name="UIName" oor:type="xs:string">
+          <value xml:lang="en-US">Comments</value>
+        </prop>
+        <prop oor:name="HideFromToolbarMenu" oor:type="xs:boolean">
+          <value>false</value>
+        </prop>
+      </node>
+      <node oor:name="private:resource/toolbar/masterviewtoolbar" oor:op="replace">
                 <prop oor:name="Docked" oor:type="xs:boolean">
                     <value>false</value>
                 </prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 55365975b790..0ba86ef6b1aa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -41,7 +41,7 @@
             </node>
             <node oor:name=".uno:ShowAnnotations" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Notes</value>
+                    <value xml:lang="en-US">Comments</value>
                 </prop>
             </node>
             <node oor:name=".uno:InsertScript" oor:op="replace">
@@ -330,7 +330,7 @@
             </node>
             <node oor:name=".uno:InsertAnnotation" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">~Note</value>
+                    <value xml:lang="en-US">Comme~nt</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 52f31ee38261..50b67954aeef 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -86,6 +86,8 @@ MODULEFILES= \
     Common-cjk.xcu   \
     Common-ctl.xcu   \
     Common-korea.xcu   \
+    Paths-macosx.xcu    \
+    Paths-unxwnt.xcu    \
     Writer-cjk.xcu \
     Writer-defaultfontarial.xcu \
     Writer-directcursor.xcu \
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index fd7c52ef4df2..1ab6b58b4d13 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -124,8 +124,8 @@
 					<!-- UIHints: Tools - Options -Spreadsheets - Contents - [Section] Display -->
 					<info>
 						<author>NN</author>
-						<desc>Indicates whether notes are marked.</desc>
-						<label>Note tags</label>
+						<desc>Indicates whether comments are marked.</desc>
+						<label>Comment tags</label>
 					</info>
 					<value>true</value>
 				</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 72a296f4eb1b..ecf79b5814c9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -920,6 +920,12 @@
           <desc>Contains a list of passwords encoded with the master password.</desc>
         </info>
       </set>
+			<prop oor:name="AuthenticateUsingSystemCredentials" oor:type="oor:string-list">
+				<info>
+					<author>KSO</author>
+					<desc>Contains a list of URLs that should be accessed using system credentials of the user.</desc>
+				</info>
+			</prop>
     </group>
     <group oor:name="_3D_Engine">
       <info>
@@ -1675,10 +1681,11 @@
         </prop>
         <prop oor:name="Temp" oor:type="xs:string">
           <info>
+            <deprecated>Replaced by org.openoffice.Office.Paths/Temp</deprecated>
             <author>MBA</author>
             <desc>Specifies the base directory used by the Office to store temp files.</desc>
           </info>
-          <value>$(temp)</value>
+          <value/>
         </prop>
         <prop oor:name="Template" oor:type="oor:string-list">
           <info>
@@ -2376,11 +2383,16 @@
                 <desc>ODFVER_011</desc>
               </info>
             </enumeration>
-            <enumeration oor:value="3">
+            <enumeration oor:value="4">
               <info>
                 <desc>ODFVER_012</desc>
               </info>
             </enumeration>
+            <enumeration oor:value="3">
+              <info>
+                <desc>ODFVER_LATEST</desc>
+              </info>
+            </enumeration>
           </constraints>
           <value>3</value>
         </prop>
@@ -6021,7 +6033,7 @@
         <!-- UIHints: Edit Search/Replace  -->
         <info>
           <author>mod</author>
-          <desc>Specifies if search includes notes(SwPostItFields)</desc>
+          <desc>Specifies if search includes comments(SwPostItFields)</desc>
         </info>
         <value>false</value>
       </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
index c6eec8845e00..cb684017c7c3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/DataAccess.xcs
@@ -197,14 +197,25 @@
 		<info>
 			<author>OJ</author>
 		</info>
-        <group oor:name="ApplicationIntegration">
+        <group oor:name="Policies">
             <info>
-                <desc>Specifies sevaral settings related to integrating data access functionality into the main applications.</desc>
+                <desc>Defines different policies for working with OpenOffice.org Base.</desc>
             </info>
-            <group oor:name="InstalledFeatures">
+            <group oor:name="Features">
                 <info>
-                    <desc>Specifies which data-access related features are available in non-Base applications.</desc>
+                    <desc>controls availability of certain database access related features in the OpenOffice.org applications.</desc>
                 </info>
+                <group oor:name="Base">
+                    <info>
+                        <desc>controls availability of features within OpenOffice.org Base.</desc>
+                    </info>
+                    <prop oor:name="CreateLocalDatabase" oor:type="xs:boolean">
+                        <info>
+                            <desc>Specifies that the user is able to creatte new local database documents in the "Create Database" wizard.</desc>
+                        </info>
+                        <value>true</value>
+                    </prop>
+                </group>
                 <group oor:name="Writer">
                     <info>
                         <desc>Specifies which data-access related features are available in OpenOffice.org Writer.</desc>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index f29972ca7fcf..c7e4f71c677c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -359,18 +359,26 @@
 				</constraints>
 				<value>0</value>
 			</prop>
-			<prop oor:name="SimpleHandles" oor:type="xs:boolean">
-				<!-- OldPath: Draw/Other -->
-				<!-- OldLocation: soffice.cfg -->
-				<!-- UIHints: Optionbar -->
+			<prop oor:name="ShowComments" oor:type="xs:boolean">
 				<info>
-					<author>AF</author>
-					<desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
-					<label>Simple Handles</label>
+					<author>CL</author>
+					<desc>Indicates whether to show comments (true) or hide them (false).</desc>
+					<label>Show Comments</label>
 				</info>
 				<value>true</value>
 			</prop>
-			<prop oor:name="BigHandles" oor:type="xs:boolean">
+      <prop oor:name="SimpleHandles" oor:type="xs:boolean">
+        <!-- OldPath: Draw/Other -->
+        <!-- OldLocation: soffice.cfg -->
+        <!-- UIHints: Optionbar -->
+        <info>
+          <author>AF</author>
+          <desc>Indicates whether to show simple (true) or 3D-handles (false).</desc>
+          <label>Simple Handles</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="BigHandles" oor:type="xs:boolean">
 				<!-- OldPath: Draw/Other -->
 				<!-- OldLocation: soffice.cfg -->
 				<!-- UIHints: Optionbar -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 6cf3a7abdc68..bfa2e7dce407 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -398,7 +398,15 @@
 				</constraints>
 				<value>0</value>
 			</prop>
-			<prop oor:name="SimpleHandles" oor:type="xs:boolean">
+      <prop oor:name="ShowComments" oor:type="xs:boolean">
+        <info>
+          <author>CL</author>
+          <desc>Indicates whether to show comments (true) or hide them (false).</desc>
+          <label>Show Comments</label>
+        </info>
+        <value>true</value>
+      </prop>
+      <prop oor:name="SimpleHandles" oor:type="xs:boolean">
 				<!-- OldPath: Impress/Other -->
 				<!-- OldLocation: soffice.cfg -->
 				<!-- UIHints: Optionbar -->
diff --git a/officecfg/registry/schema/org/openoffice/Office/UI.xcs b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
index 02e90d75daef..48368c263b34 100644
--- a/officecfg/registry/schema/org/openoffice/Office/UI.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/UI.xcs
@@ -418,11 +418,11 @@
 			</group>
 			<group oor:name="CalcNotesBackground">
 				<info>
-					<desc>Specifies the settings used for the background of notes in Calc.</desc>
+					<desc>Specifies the settings used for the background of comments in Calc.</desc>
 				</info>
 				<prop oor:name="Color" oor:type="xs:int">
 					<info>
-						<desc>Specifies the color used for the background of notes.</desc>
+						<desc>Specifies the color used for the background of comments.</desc>
 					</info>
 				</prop>
 			</group>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 1b21017e3f3c..cb22883eba09 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1097,8 +1097,8 @@
 					<!-- UIHints: Tools - Options - Text document - Contents - [Section] Display -->
 					<info>
 						<author>OS</author>
-						<desc>Specifies if notes are displayed.</desc>
-						<label>Notes</label>
+						<desc>Specifies if comments are displayed.</desc>
+						<label>Comments</label>
 					</info>
 					<value>true</value>
 				</prop>
@@ -2145,7 +2145,7 @@
 					<!-- UIHints: Tools - Options - Text document - Print - [Section] Notes -->
 					<info>
 						<author>OS</author>
-						<desc>Specifies if and how notes are printed.</desc>
+						<desc>Specifies if and how comments are printed.</desc>
 					</info>
 					<constraints>
 						<enumeration oor:value="0">
@@ -2155,7 +2155,7 @@
 						</enumeration>
 						<enumeration oor:value="1">
 							<info>
-								<desc>Notes only</desc>
+								<desc>Comments only</desc>
 							</info>
 						</enumeration>
 						<enumeration oor:value="2">
@@ -5659,13 +5659,13 @@
 		</group>
 		<group oor:name="Notes">
                 	<info>
-                        	<desc>Contains settings for notes</desc>
+                        	<desc>Contains settings for comments</desc>
                 	</info>
                 	<prop oor:name="ShowAnkor" oor:type="xs:boolean">
                		<info>
                         	<author>mod</author>
-                        	<desc>configures if note anchor should be shown or hidden when display is off</desc>
-                        	<label>Notes Ankor on/off</label>
+                        	<desc>configures if comment anchor should be shown or hidden when display is off</desc>
+                        	<label>Comments Ankor on/off</label>
                 	</info>
                 	<value>false</value>
                 	</prop>
@@ -6983,7 +6983,7 @@
 				</prop>
 				<prop oor:type="xs:boolean" oor:name="ShowNotes">
 					<info>
-						<desc>Show the "notes" heading ? </desc>
+						<desc>Show the "comments" heading ? </desc>
 					</info>
 				</prop>
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index 6063ce1b55c9..ebb9fca30962 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -93,8 +93,8 @@
 					<!-- UIHints: Tools - Option - HTML-Document  Contents - [Section] Display -->
 					<info>
 						<author>OS</author>
-						<desc>Specifies if notes are displayed.</desc>
-						<label>Notes</label>
+						<desc>Specifies if comments are displayed.</desc>
+						<label>Comments</label>
 					</info>
 					<value>true</value>
 				</prop>
@@ -686,7 +686,7 @@
 					<!-- UIHints: Tools - Option - HTML-Document  Print - [Section] Notes -->
 					<info>
 						<author>OS</author>
-						<desc>Specifies if notes are printed and how they are printed.</desc>
+						<desc>Specifies if comments are printed and how they are printed.</desc>
 					</info>
 					<constraints>
 						<enumeration oor:value="0">
@@ -696,7 +696,7 @@
 						</enumeration>
 						<enumeration oor:value="1">
 							<info>
-								<desc>Notes only</desc>
+								<desc>Comments only</desc>
 							</info>
 						</enumeration>
 						<enumeration oor:value="2">
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index 47ae08165928..fd03d973cf71 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -61,7 +61,7 @@
 			<xsl:choose>
 				<xsl:when test="string-length($locale)">
 			        <xsl:apply-templates select = "@*" mode="locale"/>
-					<xsl:apply-templates mode="locale"/>
+					<xsl:apply-templates select = "node|prop" mode="locale"/>
 				</xsl:when>
 				<xsl:otherwise>
 			        <xsl:apply-templates select = "@*"/>
@@ -85,7 +85,7 @@
                 <xsl:if test="descendant::value[@xml:lang=$locale]/../value[not (@xml:lang)]">
   			        <xsl:copy>
 				        <xsl:apply-templates select = "@*" mode="locale"/>
-				        <xsl:apply-templates mode = "locale"/>
+				        <xsl:apply-templates select = "node|prop|value" mode = "locale"/>
 			        </xsl:copy>
                 </xsl:if>
             </xsl:when>
@@ -93,7 +93,7 @@
                 <xsl:if test="descendant::value[@xml:lang = $locale]">
   			        <xsl:copy>
 				        <xsl:apply-templates select = "@*" mode="locale"/>
-				        <xsl:apply-templates mode = "locale"/>
+				        <xsl:apply-templates select = "node|prop|value" mode = "locale"/>
 			        </xsl:copy>
                 </xsl:if>
             </xsl:otherwise>