sw/inc/strings.hrc                       |    4 ++--
 sw/uiconfig/swriter/ui/tocentriespage.ui |   16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit e78e3b2de19f8a2f9b5d6f256bd3b1c147fee780
Author:     Seth Chaiklin <sdc.bla...@youmail.dk>
AuthorDate: Tue Mar 7 22:10:34 2023 +0000
Commit:     Seth Chaiklin <sdc.bla...@youmail.dk>
CommitDate: Wed Mar 8 16:22:20 2023 +0000

    tdf#153712 revise labels for Chapter Info and its related options
    
        "Chapter Info" -> "Heading Info" (in Entries tab)
           add tooltip; revise extended tip
        "CI" -> "HI"  (on Structure widget)
           and its tooltip
        "Chapter entry" -> "Heading info"
            add accelerator
         change labels in dropdown box to number and contents
          (consistent with 'Heading' type field variable)
            add tooltip; revise extended tip
    
    Change-Id: Ic937d0db6af28c9fc416e6a960c0f22a69bfbadb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148406
    Tested-by: Jenkins
    Reviewed-by: Seth Chaiklin <sdc.bla...@youmail.dk>

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 8af6eef01a4d..033a1a225a92 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1337,7 +1337,7 @@
 #define STR_TOKEN_ENTRY                         NC_("STR_TOKEN_ENTRY", "E")
 #define STR_TOKEN_TAB_STOP                      NC_("STR_TOKEN_TAB_STOP", "T")
 #define STR_TOKEN_PAGE_NUMS                     NC_("STR_TOKEN_PAGE_NUMS", "#")
-#define STR_TOKEN_CHAPTER_INFO                  NC_("STR_TOKEN_CHAPTER_INFO", 
"CI")
+#define STR_TOKEN_CHAPTER_INFO                  NC_("STR_TOKEN_CHAPTER_INFO", 
"HI")
 #define STR_TOKEN_LINK_START                    NC_("STR_TOKEN_LINK_START", 
"LS")
 #define STR_TOKEN_LINK_END                      NC_("STR_TOKEN_LINK_END", "LE")
 #define STR_TOKEN_AUTHORITY                     NC_("STR_TOKEN_AUTHORITY", "A")
@@ -1346,7 +1346,7 @@
 #define STR_TOKEN_HELP_TAB_STOP                 NC_("STR_TOKEN_HELP_TAB_STOP", 
"Tab stop")
 #define STR_TOKEN_HELP_TEXT                     NC_("STR_TOKEN_HELP_TEXT", 
"Text")
 #define STR_TOKEN_HELP_PAGE_NUMS                
NC_("STR_TOKEN_HELP_PAGE_NUMS", "Page number")
-#define STR_TOKEN_HELP_CHAPTER_INFO             
NC_("STR_TOKEN_HELP_CHAPTER_INFO", "Chapter info")
+#define STR_TOKEN_HELP_CHAPTER_INFO             
NC_("STR_TOKEN_HELP_CHAPTER_INFO", "Heading info")
 #define STR_TOKEN_HELP_LINK_START               
NC_("STR_TOKEN_HELP_LINK_START", "Hyperlink start")
 #define STR_TOKEN_HELP_LINK_END                 NC_("STR_TOKEN_HELP_LINK_END", 
"Hyperlink end")
 #define STR_TOKEN_HELP_AUTHORITY                
NC_("STR_TOKEN_HELP_AUTHORITY", "Bibliography entry: ")
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui 
b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 0336bdd7fae3..88af0ea08c58 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -393,7 +393,7 @@
                           <object class="GtkLabel" id="chapterentryft">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" 
context="tocentriespage|chapterentryft">Chapter entry:</property>
+                            <property name="label" translatable="yes" 
context="tocentriespage|chapterentryft">Heading _info:</property>
                             <property name="use-underline">True</property>
                             <property 
name="mnemonic-widget">chapterentry</property>
                             <property name="xalign">0</property>
@@ -409,14 +409,15 @@
                             <property name="can-focus">False</property>
                             <property name="valign">center</property>
                             <property name="hexpand">True</property>
+                            <property name="tooltip_text" translatable="yes" 
context="tocentriespage|tooltip_text|chapterentry">Select the heading 
information to include in the index entry.</property>
                             <items>
-                              <item translatable="yes" 
context="tocentriespage|chapterentry">Number range only</item>
-                              <item translatable="yes" 
context="tocentriespage|chapterentry">Description only</item>
-                              <item translatable="yes" 
context="tocentriespage|chapterentry">Number range and description</item>
+                              <item translatable="yes" 
context="tocentriespage|chapterentry">Number</item>
+                              <item translatable="yes" 
context="tocentriespage|chapterentry">Contents</item>
+                              <item translatable="yes" 
context="tocentriespage|chapterentry">Number and contents</item>
                             </items>
                             <child internal-child="accessible">
                               <object class="AtkObject" 
id="chapterentry-atkobject">
-                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|chapterentry">Select the chapter 
information that you want to include in the index entry.</property>
+                                <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|chapterentry">Select the heading 
information to include in the index entry.</property>
                               </object>
                             </child>
                           </object>
@@ -640,14 +641,15 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="chapterinfo">
-                                <property name="label" translatable="yes" 
context="tocentriespage|chapterinfo">_Chapter Info</property>
+                                <property name="label" translatable="yes" 
context="tocentriespage|chapterinfo">_Heading Info</property>
                                 <property name="visible">True</property>
                                 <property name="can-focus">True</property>
                                 <property 
name="receives-default">True</property>
                                 <property name="use-underline">True</property>
+                                <property name="tooltip-text" 
translatable="yes" context="tocentriespage|extended_tip|chapterinfo">Insert to 
include heading number or contents. Select inserted icon to choose what 
information to display.</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" 
id="chapterinfo-atkobject">
-                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|chapterinfo">Inserts chapter information, 
such as the chapter heading and number. Select the information that you want to 
display in the Chapter entry box.</property>
+                                    <property 
name="AtkObject::accessible-description" translatable="yes" 
context="tocentriespage|extended_tip|chapterinfo">Insert to include heading 
number or contents. The heading information comes from the heading immediately 
prior to the entry. Select the inserted icon to choose what information to 
display.</property>
                                   </object>
                                 </child>
                               </object>

Reply via email to