[Libreoffice-commits] .: configmgr/qa editeng/source officecfg/registry scripting/workben svx/inc

Christian Dywan cdywan at kemper.freedesktop.org
Wed May 18 07:17:11 PDT 2011


 configmgr/qa/unit/data.xcd                                               |    2 -
 editeng/source/editeng/editeng.src                                       |    2 -
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |    8 +++---
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu     |    2 -
 officecfg/registry/schema/org/openoffice/Office/Calc.xcs                 |    4 +--
 officecfg/registry/schema/org/openoffice/Office/Draw.xcs                 |    2 -
 officecfg/registry/schema/org/openoffice/Office/Impress.xcs              |    2 -
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs               |    4 +--
 officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs            |    4 +--
 scripting/workben/bindings/drawmenubar.xml                               |   12 +++++-----
 scripting/workben/bindings/impressmenubar.xml                            |   12 +++++-----
 svx/inc/globlmn_tmpl.hrc                                                 |    4 +--
 12 files changed, 29 insertions(+), 29 deletions(-)

New commits:
commit 4aa8f069f1b8860d57fb62923bf17beb71342747
Author: Christian Dywan <christian.dywan at lanedo.com>
Date:   Wed May 18 16:06:39 2011 +0200

    Unify Display Grid/ Grid Visible and other menu items

diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 027aa59..97e0aed 100755
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -2982,7 +2982,7 @@
       </node>
       <node oor:name=".uno:HelplinesMove" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Guides When Moving</value>
+          <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Helplines While Moving</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/editeng/source/editeng/editeng.src b/editeng/source/editeng/editeng.src
index 7543185..4ee600e 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -70,7 +70,7 @@ String RID_EDITUNDO_SETSTYLE
 
 String RID_EDITUNDO_TRANSLITERATE
 {
-    Text [ en-US ] = "Case/Characters";
+    Text [ en-US ] = "~Change Case";
 };
 
 
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 7138636..dc84fb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -342,7 +342,7 @@
       <node oor:name=".uno:HelplinesVisible" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Display Guides</value>
+          <value xml:lang="en-US">~Display Snap Lines</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -351,7 +351,7 @@
       <node oor:name=".uno:HelplinesFront" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">Guides to ~Front</value>
+          <value xml:lang="en-US">Snap Lines to ~Front</value>
         </prop>
       </node>
       <node oor:name=".uno:BeforeObject" oor:op="replace">
@@ -1441,7 +1441,7 @@
       <node oor:name=".uno:HelplinesUse" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Snap to Guides</value>
+          <value xml:lang="en-US">~Snap to Snap Lines</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -1776,7 +1776,7 @@
       <node oor:name=".uno:SnapLinesMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
 
-          <value xml:lang="en-US">~Guides</value>
+          <value xml:lang="en-US">~Snap Lines</value>
         </prop>
       </node>
       <node oor:name=".uno:MasterPageMenu" 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 eec4ff3..0610270 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2934,7 +2934,7 @@
             </node>
             <node oor:name=".uno:HelplinesMove" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
-                    <value xml:lang="en-US">Guides When Moving</value>
+                    <value xml:lang="en-US">Helplines While Moving</value>
                 </prop>
                 <prop oor:name="Properties" oor:type="xs:int">
                     <value>9</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index baf777b..8e50f95 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -326,8 +326,8 @@
 					<!-- UIHints: Tools - Options -Spreadsheets - Layout - [Section] Lines -->
 					<info>
 						<author>NN</author>
-						<desc>Specifies whether guides are displayed when moving objects.</desc>
-						<label>Guides</label>
+						<desc>Specifies whether helplines are displayed when moving objects.</desc>
+						<label>Helplines</label>
 					</info>
 					<value>false</value>
 				</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
index e3c6c5c..8a77738 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Draw.xcs
@@ -69,7 +69,7 @@
 					<info>
 						<author>AF</author>
 						<desc>Indicates whether to show help lines when moving an object.</desc>
-						<label>Guides when moving</label>
+						<label>Helplines While Moving</label>
 					</info>
 					<value>false</value>
 				</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index a2590a2..123dffc 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -126,7 +126,7 @@
           <!-- UIHints: Tools - Options - Presentation - Layout - [Section] Display -->
           <info>
             <desc>Indicates whether to show help-lines when moving an object.</desc>
-            <label>Guides when moving</label>
+            <label>Helplines While Moving</label>
           </info>
           <value>false</value>
         </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index cb951f9..c125a92 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1301,8 +1301,8 @@
 					<!-- UIHints: Tools - Options - Text document - Layout - [Section] Lines -->
 					<info>
 						<author>OS</author>
-						<desc>Displays guides around the frames when frames are moved.</desc>
-						<label>Guides</label>
+						<desc>Displays helplines around the frames when frames are moved.</desc>
+						<label>Helplines</label>
 					</info>
 					<value>false</value>
 				</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
index b92e468..b42c61c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs
@@ -205,8 +205,8 @@
 					<!-- UIHints: Tools - Option - HTML-Document - Layout - [Section] Lines -->
 					<info>
 						<author>OS</author>
-						<desc>Displays guides around the frames when frames are moved.</desc>
-						<label>Guides</label>
+						<desc>Displays helplines around the frames when frames are moved.</desc>
+						<label>Helplines</label>
 					</info>
 					<value>false</value>
 				</prop>
diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml
index 2fbfe54..5f115b9 100755
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
@@ -120,7 +120,7 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:338" menu:label="~Grid">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/>
+     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/>
      <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/>
      <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/>
     </menu:menupopup>
@@ -128,9 +128,9 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:339" menu:label="~Snap Lines">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/>
-     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/>
-     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/>
+     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/>
+     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/>
+     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/>
     </menu:menupopup>
    </menu:menu>
    <menu:menuseparator/>
@@ -197,8 +197,8 @@
    <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/>
-   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/>
-   <menu:menu menu:id="slot:1" menu:label="Case/Characters">
+   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/>
+   <menu:menu menu:id="slot:1" menu:label="~Change Case">
     <menu:menupopup>
      <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/>
      <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/>
diff --git a/scripting/workben/bindings/impressmenubar.xml b/scripting/workben/bindings/impressmenubar.xml
index 627fd16..02d6d66 100755
--- a/scripting/workben/bindings/impressmenubar.xml
+++ b/scripting/workben/bindings/impressmenubar.xml
@@ -138,7 +138,7 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:338" menu:label="~Grid">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Visible Grid"/>
+     <menu:menuitem menu:id="slot:27322" menu:helpid="27322" menu:label="~Display Grid"/>
      <menu:menuitem menu:id="slot:27154" menu:helpid="27154" menu:label="Snap to Grid"/>
      <menu:menuitem menu:id="slot:27323" menu:helpid="27323" menu:label="Grid to ~Front"/>
     </menu:menupopup>
@@ -146,9 +146,9 @@
    <menu:menuseparator/>
    <menu:menu menu:id="slot:339" menu:label="~Snap Lines">
     <menu:menupopup>
-     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Snap Lines Visible"/>
-     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="Snap to Snap Lines"/>
-     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to Front"/>
+     <menu:menuitem menu:id="slot:27324" menu:helpid="27324" menu:label="~Display Snap Lines"/>
+     <menu:menuitem menu:id="slot:27152" menu:helpid="27152" menu:label="~Snap to Snap Lines"/>
+     <menu:menuitem menu:id="slot:27325" menu:helpid="27325" menu:label="Snap Lines to ~Front"/>
     </menu:menupopup>
    </menu:menu>
    <menu:menuseparator/>
@@ -215,8 +215,8 @@
    <menu:menuitem menu:id="slot:27338" menu:helpid="27338" menu:label="~Connector..."/>
    <menu:menuseparator/>
    <menu:menuitem menu:id="slot:10296" menu:helpid="10296" menu:label="C~haracter..."/>
-   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Numbering/Bullets..."/>
-   <menu:menu menu:id="slot:1" menu:label="Case/Characters">
+   <menu:menuitem menu:id="slot:10156" menu:helpid="10156" menu:label="~Bullets and Numbering..."/>
+   <menu:menu menu:id="slot:1" menu:label="~Change Case">
     <menu:menupopup>
      <menu:menuitem menu:id="slot:10912" menu:helpid="10912" menu:label="~Uppercase"/>
      <menu:menuitem menu:id="slot:10913" menu:helpid="10913" menu:label="~Lowercase"/>
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 1b88228..3089dec 100755
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -654,7 +654,7 @@
     MenuItem\
     {\
         Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \
-        Text [ en-US ] = "~Numbering/Bullets..." ; \
+        Text [ en-US ] = "~Bullets and Numbering..." ; \
             };
 
 
@@ -1209,7 +1209,7 @@
                 };\
             };\
         };\
-        Text [ en-US ] = "Case/Characters";\
+        Text [ en-US ] = "~Change Case";\
             };
 
 #define ITEM_OPEN_HYPERLINK \


More information about the Libreoffice-commits mailing list