[Libreoffice-commits] core.git: cui/source officecfg/registry

[TiagoSantos]

 cui/source/tabpages/strings.src                            |    2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    9 +++++----
 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 125ea721e1988bb815ef8c72ef58d00938e3e45a
Author: TiagoSantos <tiagofsantos81 at sapo.pt>
Date:   Mon May 1 21:58:40 2017 +0100

    document /italic/ and -strikeout- markup
    
    added in commit https://gerrit.libreoffice.org/#/c/31076/
    
    former changes verified in:
    https://bugs.documentfoundation.org/show_bug.cgi?id=83037
    
    Change-Id: I4b5973137edbec7bb430264867bf55b766248e1f
    Reviewed-on: https://gerrit.libreoffice.org/37127
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src
index 8b7b4880e7f9..744aa6b60d58 100644
--- a/cui/source/tabpages/strings.src
+++ b/cui/source/tabpages/strings.src
@@ -105,7 +105,7 @@ String RID_SVXSTR_CPTL_STT_SENT
 };
 String RID_SVXSTR_BOLD_UNDER
 {
-    Text [ en-US ] = "Automatic *bold* and _underline_" ;
+    Text [ en-US ] = "Automatic *bold*, /italic/, -strikeout- and _underline_" ;
 };
 String RID_SVXSTR_NO_DBL_SPACES
 {
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 7bad088a2d5b..367d45d676d9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1260,12 +1260,13 @@
       <prop oor:name="ChangeUnderlineWeight" oor:type="xs:boolean" oor:nillable="false">
         <!-- OldPath: AutoCorrect/Options/All -->
         <!-- OldLocation: Soffice.cfg -->
-        <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Automatic *bold*
-             and _underline_ -->
+        <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Automatic *bold*,
+             /italic/, -strikeout- and _underline_ -->
         <info>
           <desc>Specifies if text should be formatted in bold or underlined when
-          the corresponding characters are entered (*bold*, _underline_).</desc>
-          <label>Apply underline or bold</label>
+          the corresponding characters are entered (*bold*, /italic/, -strikeout-, 
+          _underline_).</desc>
+          <label>Apply bold, italics, strikeout or underline</label>
         </info>
         <value>true</value>
       </prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index e17bd6d6a486..7a21b5bbd344 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -4250,9 +4250,9 @@
           <prop oor:name="ChangeUnderlineWeight" oor:type="xs:boolean" oor:nillable="false">
             <!-- OldPath: Writer/AutoFormat/Options -->
             <!-- OldLocation: Soffice.cfg -->
-            <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Automatic *bold* and _underline_ -->
+            <!-- UIHints: Tools  AutoCorrect/AutoFormat  Options - Automatic *bold*, /italic/, -strikeout- and _underline_ -->
             <info>
-              <desc>Specifies whether text is formatted in bold or underlined when the corresponding characters are entered (*bold*, _underline_).</desc>
+              <desc>Specifies whether text is formatted in bold or underlined when the corresponding characters are entered (*bold*, /italic/, -strikeout-, _underline_).</desc>
               <label>Apply underline or bold</label>
             </info>
             <value>true</value>