tdf#153560 "chapter" -> "heading" for Type and Format and adjust "level" label

* also change "name" to "contents" for Format
* change "Outline Level" to "Up to level" and add colon, because it
is a buddy control. The new label gives a better indication of the
function of the control.
* update tooltip and extended tip for the "Up to level" option.

Needed to modify unit test: sw/qa/uitest/fieldDialog/tdf143483.py

Change-Id: Idafd693fe4ce161d4fa069da59a78a6111be8e8a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147276
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin <sdc.blanco@youmail.dk>

3 files changed, 16 insertions, 16 deletions

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 7e41e6b08cae..476df842a9f1 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -908,7 +908,7 @@
 #define STR_TIMEFLD                             NC_("STR_TIMEFLD", "Time")
 #define STR_FILENAMEFLD                         NC_("STR_FILENAMEFLD", "File name")
 #define STR_DBNAMEFLD                           NC_("STR_DBNAMEFLD", "Database Name")
-#define STR_CHAPTERFLD                          NC_("STR_CHAPTERFLD", "Chapter")
+#define STR_CHAPTERFLD                          NC_("STR_CHAPTERFLD", "~Heading")
 #define STR_PAGENUMBERFLD                       NC_("STR_PAGENUMBERFLD", "Page number")
 #define STR_DOCSTATFLD                          NC_("STR_DOCSTATFLD", "Statistics")
 #define STR_AUTHORFLD                           NC_("STR_AUTHORFLD", "Author")
@@ -1003,10 +1003,10 @@
 /*--------------------------------------------------------------------
     Description: format chapter
  --------------------------------------------------------------------*/
-#define FMT_CHAPTER_NAME                        NC_("FMT_CHAPTER_NAME", "Chapter name")
-#define FMT_CHAPTER_NO                          NC_("FMT_CHAPTER_NO", "Chapter number")
-#define FMT_CHAPTER_NO_NOSEPARATOR              NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Chapter number without separator")
-#define FMT_CHAPTER_NAMENO                      NC_("FMT_CHAPTER_NAMENO", "Chapter number and name")
+#define FMT_CHAPTER_NAME                        NC_("FMT_CHAPTER_NAME", "Heading contents")
+#define FMT_CHAPTER_NO                          NC_("FMT_CHAPTER_NO", "Heading number")
+#define FMT_CHAPTER_NO_NOSEPARATOR              NC_("FMT_CHAPTER_NO_NOSEPARATOR", "Heading number without separator")
+#define FMT_CHAPTER_NAMENO                      NC_("FMT_CHAPTER_NAMENO", "Heading number and contents")
 /*--------------------------------------------------------------------
     Description: formats
  --------------------------------------------------------------------*/
diff --git a/sw/qa/uitest/fieldDialog/tdf143483.py b/sw/qa/uitest/fieldDialog/tdf143483.py
index 357c283badbf..03eeceb7954a 100644
--- a/sw/qa/uitest/fieldDialog/tdf143483.py
+++ b/sw/qa/uitest/fieldDialog/tdf143483.py
@@ -21,26 +21,26 @@ class Tdf143483(UITestCase):
             with self.ui_test.execute_dialog_through_command(".uno:FieldDialog") as xDialog:
 
                 xDoc = xDialog.getChild("type-doc")
-                self.assertEqual("Chapter", get_state_as_dict(xDoc)['SelectEntryText'])
+                self.assertEqual("Heading", get_state_as_dict(xDoc)['SelectEntryText'])
 
                 xFormat = xDialog.getChild("format-doc")
-                self.assertEqual("Chapter name", get_state_as_dict(xFormat)['SelectEntryText'])
+                self.assertEqual("Heading contents", get_state_as_dict(xFormat)['SelectEntryText'])
 
                 xNext = xDialog.getChild("next")
                 xNext.executeAction("CLICK", tuple())
 
-                self.assertEqual("Chapter", get_state_as_dict(xDoc)['SelectEntryText'])
-                self.assertEqual("Chapter number", get_state_as_dict(xFormat)['SelectEntryText'])
+                self.assertEqual("Heading", get_state_as_dict(xDoc)['SelectEntryText'])
+                self.assertEqual("Heading number", get_state_as_dict(xFormat)['SelectEntryText'])
 
                 xNext.executeAction("CLICK", tuple())
 
-                self.assertEqual("Chapter", get_state_as_dict(xDoc)['SelectEntryText'])
-                self.assertEqual("Chapter number and name", get_state_as_dict(xFormat)['SelectEntryText'])
+                self.assertEqual("Heading", get_state_as_dict(xDoc)['SelectEntryText'])
+                self.assertEqual("Heading number and contents", get_state_as_dict(xFormat)['SelectEntryText'])
 
                 xNext.executeAction("CLICK", tuple())
 
-                self.assertEqual("Chapter", get_state_as_dict(xDoc)['SelectEntryText'])
-                self.assertEqual("Chapter number without separator", get_state_as_dict(xFormat)['SelectEntryText'])
+                self.assertEqual("Heading", get_state_as_dict(xDoc)['SelectEntryText'])
+                self.assertEqual("Heading number without separator", get_state_as_dict(xFormat)['SelectEntryText'])
 
             xEnumeration = document.Text.createEnumeration()
             self.assertEqual("Another title", xEnumeration.nextElement().String)
diff --git a/sw/uiconfig/swriter/ui/flddocumentpage.ui b/sw/uiconfig/swriter/ui/flddocumentpage.ui
index 086dc0c924f0..a2e382a9a148 100644
--- a/sw/uiconfig/swriter/ui/flddocumentpage.ui
+++ b/sw/uiconfig/swriter/ui/flddocumentpage.ui
@@ -345,7 +345,7 @@
               <object class="GtkLabel" id="levelft">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes" context="flddocumentpage|levelft">_Outline level</property>
+                <property name="label" translatable="yes" context="flddocumentpage|levelft">_Up to level:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">level</property>
                 <property name="xalign">0</property>
@@ -361,10 +361,10 @@
                 <property name="can_focus">True</property>
                 <property name="adjustment">adjustment1</property>
                 <property name="truncate-multiline">True</property>
-                <property name="tooltip_text" translatable="yes" context="flddocumentpage|level|tooltip_text">Specifies the maximum outline level of the immediately prior heading to be used.</property>
+                <property name="tooltip_text" translatable="yes" context="flddocumentpage|level|tooltip_text">Specifies the number of outline levels of the immediately prior heading number to display.</property>
                 <child internal-child="accessible">
                   <object class="AtkObject" id="level-atkobject">
-                    <property name="AtkObject::accessible-description" translatable="yes" context="flddocumentpage|extended_tip|level">The first immediately prior heading with an outline level equal or less than the specified number is selected for display. If “Chapter number” is selected, then numbering must be applied in the Chapter Numbering dialog (see Tools menu).</property>
+                    <property name="AtkObject::accessible-description" translatable="yes" context="flddocumentpage|extended_tip|level">Use this option in combination with “Heading number” to control how many levels of the immediately prior heading number are displayed. For example, selecting “2” will display the first two levels of the heading number. Heading numbers can be enabled in the “Heading Numbering“ dialog (see Tools menu).</property>
                   </object>
                 </child>
               </object>