officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs | 2 +-
sw/inc/strings.hrc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1d7f160f9a0f01ce74bf306a86bd9e8a9f291a7e
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Mon Jun 30 14:04:58 2025 +0500
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Jun 30 15:31:10 2025 +0200
tdf#156061: fix UI strings for EmptyDbFieldHidesPara compat option
Make it clear, that hiding only happens on merged documents generation.
Change-Id: I95953a09e69e6754adc5010fdaa97215324a33c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187175
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit e488d7190d53ae236ad5fc89a0c2577e7f564fc2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187184
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
index d22a2c465191..fecd8b23ffec 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Compatibility.xcs
@@ -130,7 +130,7 @@
</prop>
<prop oor:name="EmptyDbFieldHidesPara" oor:type="xs:boolean"
oor:nillable="false">
<info>
- <desc>Hide paragraphs of database fields (e.g., mail merge) with an
empty value</desc>
+ <desc>Hide paragraphs of mail merge fields with empty value when
generating merged documents</desc>
</info>
<value>true</value>
</prop>
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index edbc744db6a0..90a0a35a2c3a 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1525,7 +1525,7 @@
#define STR_COMPAT_OPT_PROTECTFORM
NC_("STR_COMPAT_OPT_PROTECTFORM", "Protect form (no longer protects whole
document. Insert write protected section instead)")
#define STR_COMPAT_OPT_MSWORDCOMPTRAILINGBLANKS
NC_("STR_COMPAT_OPT_MSWORDCOMPTRAILINGBLANKS", "Word-compatible trailing
blanks")
#define STR_COMPAT_OPT_SUBTRACTFLYSANCHOREDATFLYS
NC_("STR_COMPAT_OPT_SUBTRACTFLYSANCHOREDATFLYS", "Tolerate white lines that may
appear in PDF page backgrounds")
-#define STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA
NC_("STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA", "Hide paragraphs of database fields
(e.g., mail merge) with an empty value")
+#define STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA
NC_("STR_COMPAT_OPT_EMPTYDBFIELDHIDESPARA", "Hide paragraphs of mail merge
fields with empty value when generating merged documents")
#define STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP
NC_("STR_COMPAT_OPT_USEVARIABLEWIDTHNBSP", "Render non-breaking spaces (NBSP)
as standard-space-width (off for fixed size)")
#define STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER
NC_("STR_COMPAT_OPT_NOGAPAFTERNOTENUMBER", "Do not add an extra space after
number in footnotes / endnotes with hanging first line")
#define STR_COMPAT_OPT_TABSRELATIVETOINDENT
NC_("STR_COMPAT_OPT_TABSRELATIVETOINDENT", "Set tabstops relative to indent of
paragraph")
