officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu    |    4 
++--
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |    2 +-
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu  |   10 
+++++-----
 sc/uiconfig/scalc/menubar/menubar.xml                                |    3 +--
 svx/uiconfig/ui/acceptrejectchangesdialog.ui                         |    2 +-
 sw/uiconfig/sglobal/menubar/menubar.xml                              |    3 +--
 sw/uiconfig/swform/menubar/menubar.xml                               |    3 +--
 sw/uiconfig/swreport/menubar/menubar.xml                             |    3 +--
 sw/uiconfig/swriter/menubar/menubar.xml                              |    3 +--
 sw/uiconfig/swxform/menubar/menubar.xml                              |    3 +--
 10 files changed, 15 insertions(+), 21 deletions(-)

New commits:
commit d61c55b4d11f4a4ffdf4fb75ba2e950de8ae2beb
Author: Yousuf Philips <philip...@hotmail.com>
Date:   Sun Oct 26 00:49:50 2014 +0400

    fdo#85046 - MENU: Edit > Changes should be renamed for better clarity
    
    Change-Id: I8bb6582cc0e5bac390c18308fea8e647d5a0526d
    Reviewed-on: https://gerrit.libreoffice.org/12098
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Reviewed-by: Matthew Francis <mjay.fran...@gmail.com>
    Tested-by: Matthew Francis <mjay.fran...@gmail.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 38e9dc2..5919776 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -911,7 +911,7 @@
       </node>
       <node oor:name=".uno:AcceptChanges" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Accept or Reject Changes...</value>
+          <value xml:lang="en-US">~List of Changes...</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">~Accept or Reject...</value>
@@ -927,7 +927,7 @@
       </node>
       <node oor:name=".uno:CommentChange" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Comments...</value>
+          <value xml:lang="en-US">~Comment on Change...</value>
         </prop>
       </node>
       <node oor:name=".uno:UnderlineDotted" 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 3417c20..a5b5140 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5436,7 +5436,7 @@
       </node>
       <node oor:name=".uno:ChangesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Chan~ges</value>
+          <value xml:lang="en-US">Track Chan~ges</value>
         </prop>
       </node>
       <node oor:name=".uno:ToolsMenu" oor:op="replace">
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 2c9f5f6..839f5cd 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -158,7 +158,7 @@
       </node>
       <node oor:name=".uno:ProtectTraceChangeMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Protect Records...</value>
+          <value xml:lang="en-US">~Protect Changes...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -203,7 +203,7 @@
       </node>
       <node oor:name=".uno:TrackChanges" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Record</value>
+          <value xml:lang="en-US">~Record Changes</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -211,7 +211,7 @@
       </node>
       <node oor:name=".uno:ShowTrackedChanges" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Show</value>
+          <value xml:lang="en-US">~Show Changes</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -224,7 +224,7 @@
       </node>
       <node oor:name=".uno:CommentChangeTracking" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Comment...</value>
+          <value xml:lang="en-US">~Comment on Change...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -242,7 +242,7 @@
       </node>
       <node oor:name=".uno:AcceptTrackedChanges" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">~Accept or Reject...</value>
+          <value xml:lang="en-US">~List of Changes...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 0816450..fc85d04 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -93,10 +93,9 @@
                     <menu:menuseparator/>
                     <menu:menuitem menu:id=".uno:AcceptChanges"/>
                     <menu:menuitem menu:id=".uno:CommentChange"/>
-                    <menu:menuseparator/>
-                    <menu:menuitem menu:id=".uno:MergeDocuments"/>
                 </menu:menupopup>
             </menu:menu>
+            <menu:menuitem menu:id=".uno:MergeDocuments"/>
             <menu:menuitem menu:id=".uno:CompareDocuments"/>
             <menu:menuseparator/>
             <menu:menu menu:id=".uno:FillCellsMenu">
diff --git a/svx/uiconfig/ui/acceptrejectchangesdialog.ui 
b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
index 6377c6c..7b596c9 100644
--- a/svx/uiconfig/ui/acceptrejectchangesdialog.ui
+++ b/svx/uiconfig/ui/acceptrejectchangesdialog.ui
@@ -4,7 +4,7 @@
   <object class="GtkDialog" id="AcceptRejectChangesDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">Accept or Reject 
Changes</property>
+    <property name="title" translatable="yes">List of Changes</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index f5357b7..b14f457 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -106,10 +106,9 @@
           <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
           <menu:menuitem menu:id=".uno:NextTrackedChange"/>
           <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:MergeDocuments"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id=".uno:MergeDocuments"/>
       <menu:menuitem menu:id=".uno:CompareDocuments"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index 3721bb4..4b06fda 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -105,10 +105,9 @@
           <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
           <menu:menuitem menu:id=".uno:NextTrackedChange"/>
           <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:MergeDocuments"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id=".uno:MergeDocuments"/>
       <menu:menuitem menu:id=".uno:CompareDocuments"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index e74cef4..dfc9d9c 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -106,10 +106,9 @@
           <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
           <menu:menuitem menu:id=".uno:NextTrackedChange"/>
           <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:MergeDocuments"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id=".uno:MergeDocuments"/>
       <menu:menuitem menu:id=".uno:CompareDocuments"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index a05a8a8..f022bb9 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -110,10 +110,9 @@
           <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
           <menu:menuitem menu:id=".uno:NextTrackedChange"/>
           <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:MergeDocuments"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id=".uno:MergeDocuments"/>
       <menu:menuitem menu:id=".uno:CompareDocuments"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 33eeea7..de63a3f 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -107,10 +107,9 @@
           <menu:menuitem menu:id=".uno:CommentChangeTracking"/>
           <menu:menuitem menu:id=".uno:NextTrackedChange"/>
           <menu:menuitem menu:id=".uno:PreviousTrackedChange"/>
-          <menu:menuseparator/>
-          <menu:menuitem menu:id=".uno:MergeDocuments"/>
         </menu:menupopup>
       </menu:menu>
+      <menu:menuitem menu:id=".uno:MergeDocuments"/>
       <menu:menuitem menu:id=".uno:CompareDocuments"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChangeDatabaseField"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to