cui/uiconfig/ui/textflowpage.ui | 8 ++++---- editeng/source/items/paraitem.cxx | 4 ++-- helpcontent2 | 2 +- include/editeng/editrids.hrc | 4 ++-- include/svx/svxitems.hrc | 6 +++--- sw/inc/inspectorproperties.hrc | 4 ++-- sw/qa/uitest/styleInspector/tdf137513.py | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 04b9809e3fc99e0110a45bf00b8fccd3fe6c6795 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Fri Dec 12 05:20:23 2025 +0100 Commit: Gerrit Code Review <[email protected]> CommitDate: Fri Dec 12 05:20:23 2025 +0100 Update git submodules * Update helpcontent2 from branch 'libreoffice-26-2' to e7b3fa0fd241848ed409919871f2c801125a219c - tdf#159169 Update documentation to refer to new attribute names Also remove the explanatory section refering to Widow & Orphan terms which is no longer necessary after removing those terms. Change-Id: I8a9b42605bbd7df3cdcda2b9119b18b0ecf9e897 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/195447 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 7d5e9ba2a38b8d48f7bb0f3d9757b0cd93a836f9) Reviewed-on: https://gerrit.libreoffice.org/c/help/+/195501 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/helpcontent2 b/helpcontent2 index a8d51716d9c0..e7b3fa0fd241 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a8d51716d9c01cf1f4b7aabf2ac4f0de2e08b359 +Subproject commit e7b3fa0fd241848ed409919871f2c801125a219c commit a571e8820e2b7a12d3155a6154be9a412f10fd17 Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Thu Dec 11 11:44:08 2025 +0100 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Fri Dec 12 05:20:07 2025 +0100 tdf#159169 Avoid typesetter language 'orphans' and 'widows' Similiar to 47edf86a62784aa275de7cc89df01a4fcd4e90c8, use descriptive language to make it obvious what these options do. Change-Id: Idacb56acfc43546a574257ca989710d4de1ac2f2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195445 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit 7136d7be94748f7cb3d89d24a909b571c5ff4653) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195500 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/cui/uiconfig/ui/textflowpage.ui b/cui/uiconfig/ui/textflowpage.ui index 87946f69c81e..99dd498d15d3 100644 --- a/cui/uiconfig/ui/textflowpage.ui +++ b/cui/uiconfig/ui/textflowpage.ui @@ -898,11 +898,11 @@ </child> <child> <object class="GtkCheckButton" id="checkOrphan"> - <property name="label" translatable="yes" context="textflowpage|checkOrphan">No split at _beginning of paragraph</property> + <property name="label" translatable="yes" context="textflowpage|checkOrphan">Don’t split at _beginning of paragraph</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes" context="textflowpage|checkOrphan">Number of lines, that will be kept together at the beginning of the paragraph (orphan control).</property> + <property name="tooltip-text" translatable="yes" context="textflowpage|checkOrphan">Minimum number of lines in a paragraph before a page break.</property> <property name="margin-start">12</property> <property name="use-underline">True</property> <property name="inconsistent">True</property> @@ -923,11 +923,11 @@ </child> <child> <object class="GtkCheckButton" id="checkWidow"> - <property name="label" translatable="yes" context="textflowpage|checkWidow">No split at _end of paragraph</property> + <property name="label" translatable="yes" context="textflowpage|checkWidow">Don’t split at _end of paragraph</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">False</property> - <property name="tooltip-text" translatable="yes" context="textflowpage|checkOrphan">Number of lines, that will be kept together at the end of the paragraph (widow control).</property> + <property name="tooltip-text" translatable="yes" context="textflowpage|checkWidow">Minimum number of lines in a paragraph in the first page after the break.</property> <property name="margin-start">12</property> <property name="use-underline">True</property> <property name="inconsistent">True</property> diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx index f49b1f986717..7be60eb87528 100644 --- a/editeng/source/items/paraitem.cxx +++ b/editeng/source/items/paraitem.cxx @@ -553,7 +553,7 @@ bool SvxWidowsItem::GetPresentation case SfxItemPresentation::Complete: { - rText = EditResId(RID_SVXITEMS_WIDOWS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_WIDOWS_COMPLETE); break; } @@ -597,7 +597,7 @@ bool SvxOrphansItem::GetPresentation case SfxItemPresentation::Complete: { - rText = EditResId(RID_SVXITEMS_ORPHANS_COMPLETE) + " " + EditResId(RID_SVXITEMS_LINES); + rText = EditResId(RID_SVXITEMS_ORPHANS_COMPLETE); break; } diff --git a/include/editeng/editrids.hrc b/include/editeng/editrids.hrc index a257b9004b58..83713f7d15cd 100644 --- a/include/editeng/editrids.hrc +++ b/include/editeng/editrids.hrc @@ -237,8 +237,8 @@ #define RID_SVXITEMS_LINESPACING_FIXED NC_("RID_SVXITEMS_LINESPACING_FIXED", "Fixed") // To translators: %1 == will be replaced by the number of lines #define RID_SVXITEMS_LINES NC_("RID_SVXITEMS_LINES", "%1 Lines") -#define RID_SVXITEMS_WIDOWS_COMPLETE NC_("RID_SVXITEMS_WIDOWS_COMPLETE", "Widow control") -#define RID_SVXITEMS_ORPHANS_COMPLETE NC_("RID_SVXITEMS_ORPHANS_COMPLETE", "Orphan control") +#define RID_SVXITEMS_WIDOWS_COMPLETE NC_("RID_SVXITEMS_WIDOWS_COMPLETE", "Don’t split at end of paragraph: %1 lines") +#define RID_SVXITEMS_ORPHANS_COMPLETE NC_("RID_SVXITEMS_ORPHANS_COMPLETE", "Don’t split at beginning of paragraph: %1 lines") #define RID_SVXITEMS_HYPHEN_MINLEAD NC_("RID_SVXITEMS_HYPHEN_MINLEAD", "%1 characters at end of line") #define RID_SVXITEMS_HYPHEN_MINTRAIL NC_("RID_SVXITEMS_HYPHEN_MINTRAIL", "%1 characters at beginning of line") #define RID_SVXITEMS_HYPHEN_COMPOUND_MINLEAD NC_("RID_SVXITEMS_HYPHEN_COMPOUND_MINLEAD", "%1 compound word characters at end of line") diff --git a/include/svx/svxitems.hrc b/include/svx/svxitems.hrc index 0687ffe2842f..a882a37b5d86 100644 --- a/include/svx/svxitems.hrc +++ b/include/svx/svxitems.hrc @@ -56,9 +56,9 @@ const std::pair<TranslateId, sal_uInt16> RID_ATTR_NAMES[] = { NC_("RID_ATTR_NAMES", "Line spacing") , SID_ATTR_PARA_LINESPACE }, { NC_("RID_ATTR_NAMES", "Page Break") , SID_ATTR_PARA_PAGEBREAK }, { NC_("RID_ATTR_NAMES", "Hyphenation") , SID_ATTR_PARA_HYPHENZONE }, - { NC_("RID_ATTR_NAMES", "Do not split paragraph"), SID_ATTR_PARA_SPLIT }, - { NC_("RID_ATTR_NAMES", "Orphans") , SID_ATTR_PARA_ORPHANS }, - { NC_("RID_ATTR_NAMES", "Widows") , SID_ATTR_PARA_WIDOWS }, + { NC_("RID_ATTR_NAMES", "Don’t split paragraph"), SID_ATTR_PARA_SPLIT }, + { NC_("RID_ATTR_NAMES", "Don’t split at beginning of paragraph"), SID_ATTR_PARA_ORPHANS }, + { NC_("RID_ATTR_NAMES", "Don’t split at end of paragraph"), SID_ATTR_PARA_WIDOWS }, { NC_("RID_ATTR_NAMES", "Paragraph spacing") , SID_ATTR_PARA_ULSPACE }, { NC_("RID_ATTR_NAMES", "Paragraph indent") , SID_ATTR_PARA_LRSPACE }, { NC_("RID_ATTR_NAMES", "Indent") , SID_ATTR_LRSPACE }, diff --git a/sw/inc/inspectorproperties.hrc b/sw/inc/inspectorproperties.hrc index d6dedab2f9f3..f4b42273de8e 100644 --- a/sw/inc/inspectorproperties.hrc +++ b/sw/inc/inspectorproperties.hrc @@ -235,7 +235,7 @@ #define RID_PARA_LETTER_SPACING_MIN NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Letter Spacing Minimum") #define RID_PARA_LETTER_SPACING_MAX NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Letter Spacing Maximum") #define RID_PARA_LINE_SPACING NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Line Spacing") -#define RID_PARA_ORPHANS NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Orphans") +#define RID_PARA_ORPHANS NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Don’t split at beginning (lines)") #define RID_PARA_REGISTER_MODE_ACTIVE NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Register Mode Active") #define RID_PARA_RIGHT_MARGIN NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Right Margin") #define RID_PARA_RIGHT_MARGIN_RELATIVE NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Right Margin Relative") @@ -249,7 +249,7 @@ #define RID_PARA_TOP_MARGIN_RELATIVE NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Top Margin Relative") #define RID_PARA_USER_DEFINED_ATTRIBUTES NC_("RID_ATTRIBUTE_NAMES_MAP", "Para User Defined Attributes") #define RID_PARA_VERT_ALIGNMENT NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Vertical Alignment") -#define RID_PARA_WIDOWS NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Widows") +#define RID_PARA_WIDOWS NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Don’t split at end (lines)") #define RID_PARA_WORD_SPACING_MIN NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Word Spacing Minimum") #define RID_PARA_WORD_SPACING NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Word Spacing") #define RID_PARA_WORD_SPACING_MAX NC_("RID_ATTRIBUTE_NAMES_MAP", "Para Word Spacing Maximum") diff --git a/sw/qa/uitest/styleInspector/tdf137513.py b/sw/qa/uitest/styleInspector/tdf137513.py index b5271f487593..34f055541e62 100644 --- a/sw/qa/uitest/styleInspector/tdf137513.py +++ b/sw/qa/uitest/styleInspector/tdf137513.py @@ -40,10 +40,10 @@ class tdf137513(UITestCase): xTableContent = xListBox.getChild('0').getChild('1') self.assertEqual(5, len(xTableContent.getChildren())) self.assertEqual("Follow Style Table Contents", get_state_as_dict(xTableContent.getChild('0'))['Text']) - self.assertEqual("Para Line Number Count False", get_state_as_dict(xTableContent.getChild('1'))['Text']) - self.assertEqual("Para Line Number Start Value 0", get_state_as_dict(xTableContent.getChild('2'))['Text']) - self.assertEqual("Para Orphans 0", get_state_as_dict(xTableContent.getChild('3'))['Text']) - self.assertEqual("Para Widows 0", get_state_as_dict(xTableContent.getChild('4'))['Text']) + self.assertEqual("Para Don’t split at beginning (lines) 0", get_state_as_dict(xTableContent.getChild('1'))['Text']) + self.assertEqual("Para Don’t split at end (lines) 0", get_state_as_dict(xTableContent.getChild('2'))['Text']) + self.assertEqual("Para Line Number Count False", get_state_as_dict(xTableContent.getChild('3'))['Text']) + self.assertEqual("Para Line Number Start Value 0", get_state_as_dict(xTableContent.getChild('4'))['Text']) xParDirFormatting = xListBox.getChild('1')
