tdf#87783 Unify image wrap option labels wording
In Image properties dialog - Wrap tab, and UNO commands
Change-Id: I420884a5df3373e74e14bba48bff75555ae7f5ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94762
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index a15e89e..5cf5ed8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1301,7 +1301,7 @@
</node>
<node oor:name=".uno:WrapOff" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Wrap Off</value>
<value xml:lang="en-US">None</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>15</value>
@@ -1309,7 +1309,7 @@
</node>
<node oor:name=".uno:WrapOn" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Page Wrap</value>
<value xml:lang="en-US">~Parallel</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -1333,7 +1333,7 @@
</node>
<node oor:name=".uno:WrapThrough" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Wrap Through</value>
<value xml:lang="en-US">~Through</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>7</value>
@@ -2281,7 +2281,7 @@
</node>
<node oor:name=".uno:WrapIdeal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Optimal Page Wrap</value>
<value xml:lang="en-US">~Optimal</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2398,7 +2398,7 @@
</node>
<node oor:name=".uno:WrapLeft" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Wrap Left</value>
<value xml:lang="en-US">Before</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
@@ -2411,7 +2411,7 @@
</node>
<node oor:name=".uno:WrapRight" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Wrap Right</value>
<value xml:lang="en-US">After</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>1</value>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index e498db3..46a4ec2 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1073,12 +1073,12 @@
#define STR_NO_FOOTER NC_("STR_NO_FOOTER", "No footer")
#define STR_HEADER NC_("STR_HEADER", "Header")
#define STR_NO_HEADER NC_("STR_NO_HEADER", "No header")
#define STR_SURROUND_IDEAL NC_("STR_SURROUND_IDEAL", "Optimal wrap")
#define STR_SURROUND_NONE NC_("STR_SURROUND_NONE", "No wrap")
#define STR_SURROUND_IDEAL NC_("STR_SURROUND_IDEAL", "Optimal")
#define STR_SURROUND_NONE NC_("STR_SURROUND_NONE", "None")
#define STR_SURROUND_THROUGH NC_("STR_SURROUND_THROUGH", "Through")
#define STR_SURROUND_PARALLEL NC_("STR_SURROUND_PARALLEL", "Parallel wrap")
#define STR_SURROUND_LEFT NC_("STR_SURROUND_LEFT", "Left wrap")
#define STR_SURROUND_RIGHT NC_("STR_SURROUND_RIGHT", "Right wrap")
#define STR_SURROUND_PARALLEL NC_("STR_SURROUND_PARALLEL", "Parallel")
#define STR_SURROUND_LEFT NC_("STR_SURROUND_LEFT", "Before")
#define STR_SURROUND_RIGHT NC_("STR_SURROUND_RIGHT", "After")
#define STR_SURROUND_ANCHORONLY NC_("STR_SURROUND_ANCHORONLY", "(Anchor only)")
#define STR_FRM_WIDTH NC_("STR_FRM_WIDTH", "Width:")
#define STR_FRM_FIXEDHEIGHT NC_("STR_FRM_FIXEDHEIGHT", "Fixed height:")
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index b48338b..4be7267 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -70,7 +70,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapOff">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">Wrap Off</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">None</property>
<property name="use_underline">True</property>
<property name="active">True</property>
</object>
@@ -83,7 +83,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapOn">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Wrap On</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Parallel</property>
<property name="use_underline">True</property>
<property name="group">.uno:WrapOff</property>
</object>
@@ -96,7 +96,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapIdeal">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Wrap Ideal</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Optimal</property>
<property name="use_underline">True</property>
<property name="group">.uno:WrapOff</property>
</object>
@@ -109,7 +109,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapLeft">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapleft|tooltip_text">Wrap Left</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapbefore|tooltip_text">Before</property>
<property name="use_underline">True</property>
<property name="group">.uno:WrapOff</property>
</object>
@@ -122,7 +122,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapRight">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapright|tooltip_text">Wrap Right</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapafter|tooltip_text">After</property>
<property name="use_underline">True</property>
<property name="group">.uno:WrapOff</property>
</object>
@@ -135,7 +135,7 @@
<object class="GtkRadioToolButton" id=".uno:WrapThrough">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Wrap Through</property>
<property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Through</property>
<property name="use_underline">True</property>
<property name="group">.uno:WrapOff</property>
</object>
diff --git a/sw/uiconfig/swriter/ui/wrappage.ui b/sw/uiconfig/swriter/ui/wrappage.ui
index 64a362d..a8236fe 100644
--- a/sw/uiconfig/swriter/ui/wrappage.ui
+++ b/sw/uiconfig/swriter/ui/wrappage.ui
@@ -54,7 +54,7 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkRadioButton" id="none">
<property name="label" translatable="yes" context="wrappage|none">_None</property>
<property name="label" translatable="yes" context="wrappage|none">_Wrap Off</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -76,7 +76,7 @@
</child>
<child>
<object class="GtkRadioButton" id="before">
<property name="label" translatable="yes" context="wrappage|before">Before</property>
<property name="label" translatable="yes" context="wrappage|before">Be_fore</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -98,7 +98,7 @@
</child>
<child>
<object class="GtkRadioButton" id="after">
<property name="label" translatable="yes" context="wrappage|after">After</property>
<property name="label" translatable="yes" context="wrappage|after">Aft_er</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
