From 5c7db49e2b492bed87ceeffd85545695cf90b3fd Mon Sep 17 00:00:00 2001
From: Seth Chaiklin <sdc.blanco@youmail.dk>
Date: Fri, 29 Jan 2021 12:59:04 +0100
Subject: [PATCH] tdf#139667 change labels for Bullets icon and Numbering icon

  general aim to introduce consistency and clarity in labelling
  between menus, toolbar and appearance in Customize dialog.

  Label is shown in Customize dialog
  Context Label is shown in Menus
  Tooltip is shown in Toolbar

  GenericCommands.xcu has the .uno commands.
  WriterCommands.xcu has some .uno aliases that are used in
  the menubar and the context menus, but they use actual
  list styles. For now have marked their true labels, so that
  it is possible to see in UI whether one is working with DF
  or a List Style. Further development may be needed.

Change-Id: I2790a19d133d2c2a7bdf074eca398fda1e6f8e81
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110137
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>
---
 .../org/openoffice/Office/UI/GenericCommands.xcu     | 12 ++++++------
 .../data/org/openoffice/Office/UI/WriterCommands.xcu | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index c39a8e987762..624dbf9818c8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2617,13 +2617,13 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
       </node>
       <node oor:name=".uno:DefaultBullet" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Bullets</value>
+          <value xml:lang="en-US">Unordered Lists</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Bulleted List</value>
+          <value xml:lang="en-US">~Unordered List</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Toggle Bulleted List</value>
+          <value xml:lang="en-US">Toggle Unordered List</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>15</value>
@@ -2631,13 +2631,13 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
       </node>
       <node oor:name=".uno:DefaultNumbering" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Numbering</value>
+          <value xml:lang="en-US">Numbered Lists</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Numbered List</value>
+          <value xml:lang="en-US">~Ordered List</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Toggle Numbered List</value>
+          <value xml:lang="en-US">Toggle Ordered List</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>15</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 588d0fd16379..7450d72396d9 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3533,15 +3533,15 @@
       </node>
       <node oor:name=".uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Bullet List</value>
+          <value xml:lang="en-US">Bullet • List Style</value>
         </prop>
       </node>
       <node oor:name=".uno:BulletListStyle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Bullet List</value>
+          <value xml:lang="en-US">Bullet • List Style</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Bullet List Style</value>
+          <value xml:lang="en-US">Bullet • List Style</value>
         </prop>
         <prop oor:name="TargetURL" oor:type="xs:string">
           <value>.uno:StyleApply?Style:string=List 1&amp;FamilyName:string=NumberingStyles</value>
@@ -3552,15 +3552,15 @@
       </node>
       <node oor:name=".uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number List</value>
+          <value xml:lang="en-US">Numbering 123 List Style</value>
         </prop>
       </node>
       <node oor:name=".uno:NumberListStyle" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Number List</value>
+          <value xml:lang="en-US">Numbering 123 List Style</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Number List Style</value>
+          <value xml:lang="en-US">Numbering 123 List Style</value>
         </prop>
         <prop oor:name="TargetURL" oor:type="xs:string">
           <value>.uno:StyleApply?Style:string=Numbering 123&amp;FamilyName:string=NumberingStyles</value>