Resolves tdf#144493 - Improve Promote/Demote wording
Promote Chapter = Move Chapter Up
Demote Chapter = Move Chapter Down
Promote Level = Promote Outline Level
Demote Level = Demote Outline Level
Promote/Demote List Level reversed (promote to left,
demote right)
Change-Id: Ia119d311b1cf99d1b07e008e54a3bd070b87410c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128722
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index a51ab13..d97996d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2853,6 +2853,9 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
</node>
<node oor:name=".uno:OutlineUp" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Chapter Up</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Move Up</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -2869,6 +2872,9 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
</node>
<node oor:name=".uno:OutlineDown" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Chapter Down</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Move Down</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -2885,6 +2891,9 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
</node>
<node oor:name=".uno:OutlineLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Promote Outline Level</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Promote</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
@@ -2918,6 +2927,9 @@ bit 3 (0x8): #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
</node>
<node oor:name=".uno:OutlineRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Demote Outline Level</value>
</prop>
<prop oor:name="ContextLabel" oor:type="xs:string">
<value xml:lang="en-US">Demote</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c70f51e..602ab4e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1877,7 +1877,7 @@
</node>
<node oor:name=".uno:DecrementLevel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Demote One Level</value>
<value xml:lang="en-US">Demote Outline Level</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1890,7 +1890,7 @@
</node>
<node oor:name=".uno:IncrementLevel" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Promote One Level</value>
<value xml:lang="en-US">Promote Outline Level</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1926,7 +1926,7 @@
</node>
<node oor:name=".uno:MoveUp" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Up</value>
<value xml:lang="en-US">Move Chapter Up</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1939,7 +1939,7 @@
</node>
<node oor:name=".uno:MoveDown" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Down</value>
<value xml:lang="en-US">Move Chapter Down</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1986,7 +1986,7 @@
</node>
<node oor:name=".uno:DecrementSubLevels" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Demote One Level With Subpoints</value>
<value xml:lang="en-US">Demote Outline Level With Subpoints</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1999,7 +1999,7 @@
</node>
<node oor:name=".uno:IncrementSubLevels" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Promote One Level With Subpoints</value>
<value xml:lang="en-US">Promote Outline Level With Subpoints</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -2007,7 +2007,7 @@
</node>
<node oor:name=".uno:MoveUpSubItems" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Up with Subpoints</value>
<value xml:lang="en-US">Move Chapter Up with Subpoints</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -2020,7 +2020,7 @@
</node>
<node oor:name=".uno:MoveDownSubItems" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Move Down with Subpoints</value>
<value xml:lang="en-US">Move Chapter Down with Subpoints</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 18d9b02..afcbbb8 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -457,12 +457,12 @@
#define STR_REPLACE_STYLE NC_("STR_REPLACE_STYLE", "Replace style: $1 $2 $3")
#define STR_DELETE_PAGE_BREAK NC_("STR_DELETE_PAGE_BREAK", "Delete page break")
#define STR_TEXT_CORRECTION NC_("STR_TEXT_CORRECTION", "Text Correction")
#define STR_OUTLINE_LR NC_("STR_OUTLINE_LR", "Promote/demote outline")
#define STR_OUTLINE_UD NC_("STR_OUTLINE_UD", "Move outline")
#define STR_OUTLINE_LR NC_("STR_OUTLINE_LR", "Promote/demote outline level")
#define STR_OUTLINE_UD NC_("STR_OUTLINE_UD", "Move chapter up/down")
#define STR_OUTLINE_EDIT NC_("STR_OUTLINE_EDIT", "Modify outline")
#define STR_INSNUM NC_("STR_INSNUM", "Insert numbering")
#define STR_NUMUP NC_("STR_NUMUP", "Promote level")
#define STR_NUMDOWN NC_("STR_NUMDOWN", "Demote level")
#define STR_NUMUP NC_("STR_NUMUP", "Demote list level")
#define STR_NUMDOWN NC_("STR_NUMDOWN", "Promote list level")
#define STR_MOVENUM NC_("STR_MOVENUM", "Move paragraphs")
#define STR_INSERTDRAW NC_("STR_INSERTDRAW", "Insert drawing object: $1")
#define STR_NUMORNONUM NC_("STR_NUMORNONUM", "Number On/Off")
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 0acbe9a..7c677e67 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -194,7 +194,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes" context="assignstylesdialog|left|tooltip_text">Promote level</property>
<property name="tooltip-text" translatable="yes" context="assignstylesdialog|left|tooltip_text">Promote outline level</property>
<property name="image">image1</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
@@ -215,7 +215,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="tooltip-text" translatable="yes" context="assignstylesdialog|right|tooltip_text">Demote level</property>
<property name="tooltip-text" translatable="yes" context="assignstylesdialog|right|tooltip_text">Demote outline level</property>
<property name="image">image2</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
diff --git a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
index f9f8cb1..5cda603 100644
--- a/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
+++ b/sw/uiconfig/swriter/ui/navigatorcontextmenu.ui
@@ -57,7 +57,7 @@
<object class="GtkMenuItem" id="801">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_PROMOTE_CHAPTER">Promote Chapter</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_PROMOTE_CHAPTER">Move Chapter Up</property>
<property name="use-underline">True</property>
<accelerator key="Up" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
@@ -66,7 +66,7 @@
<object class="GtkMenuItem" id="802">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_DEMOTE_CHAPTER">Demote Chapter</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_DEMOTE_CHAPTER">Move Chapter Down</property>
<property name="use-underline">True</property>
<accelerator key="Down" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
@@ -75,7 +75,7 @@
<object class="GtkMenuItem" id="803">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_PROMOTE_LEVEL">Promote Level</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_PROMOTE_LEVEL">Promote Outline Level</property>
<property name="use-underline">True</property>
<accelerator key="Left" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
@@ -84,7 +84,7 @@
<object class="GtkMenuItem" id="804">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_DEMOTE_LEVEL">Demote Level</property>
<property name="label" translatable="yes" context="navigatorcontextmenu|STR_DEMOTE_LEVEL">Demote Outline Level</property>
<property name="use-underline">True</property>
<accelerator key="Right" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
diff --git a/sw/uiconfig/swriter/ui/navigatorpanel.ui b/sw/uiconfig/swriter/ui/navigatorpanel.ui
index 1fd8ca3..f385186 100644
--- a/sw/uiconfig/swriter/ui/navigatorpanel.ui
+++ b/sw/uiconfig/swriter/ui/navigatorpanel.ui
@@ -567,7 +567,7 @@
<child>
<object class="GtkToolButton" id="promote">
<property name="visible">True</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|promote|tooltip_text">Promote Level</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|promote|tooltip_text">Promote outline level</property>
<property name="icon-name">sw/res/sc20172.png</property>
<child internal-child="accessible">
<object class="AtkObject" id="promote-atkobject">
@@ -583,7 +583,7 @@
<child>
<object class="GtkToolButton" id="demote">
<property name="visible">True</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|demote|tooltip_text">Demote Level</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|demote|tooltip_text">Demote outline level</property>
<property name="icon-name">sw/res/sc20173.png</property>
<child internal-child="accessible">
<object class="AtkObject" id="demote-atkobject">
@@ -599,7 +599,7 @@
<child>
<object class="GtkToolButton" id="chapterup">
<property name="visible">True</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|chapterup|tooltip_text">Promote Chapter</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|chapterup|tooltip_text">Move chapter up</property>
<property name="icon-name">sw/res/sc20174.png</property>
<child internal-child="accessible">
<object class="AtkObject" id="chapterup-atkobject">
@@ -615,7 +615,7 @@
<child>
<object class="GtkToolButton" id="chapterdown">
<property name="visible">True</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|chapterdown|tooltip_text">Demote Chapter</property>
<property name="tooltip-text" translatable="yes" context="navigatorpanel|chapterdown|tooltip_text">Move chapter down</property>
<property name="icon-name">sw/res/sc20171.png</property>
<child internal-child="accessible">
<object class="AtkObject" id="chapterdown-atkobject">
