From 772686adb99137733db79b7d1ab6ebb21bf93b4a Mon Sep 17 00:00:00 2001
From: heiko tietze <tietze.heiko@gmail.com>
Date: Thu, 27 Jul 2017 14:57:12 +0200
Subject: [PATCH] tdf#88742 Renaming of Styles deck

Styles and Formatting renamed to just Styles

Change-Id: I058d41589cf94de556ed4b4e0e0fb7048be1eff2
Reviewed-on: https://gerrit.libreoffice.org/40487
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
---
 .../data/org/openoffice/Office/UI/GenericCommands.xcu       | 6 +++---
 .../registry/data/org/openoffice/Office/UI/Sidebar.xcu      | 4 ++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f815b33ac341..a5c01ea3da65 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!-- <?xml version="1.0" encoding="UTF-8"?> -->
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -2779,10 +2779,10 @@
           <value xml:lang="en-US">Styles</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">St~yles and Formatting</value>
+          <value xml:lang="en-US">St~yles</value>
         </prop>
         <prop oor:name="TooltipLabel" oor:type="xs:string">
-          <value xml:lang="en-US">Show Styles and Formatting Sidebar</value>
+          <value xml:lang="en-US">Show the Styles Sidebar</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 0d7c4bf2d848..ed65eeb699ad 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -187,7 +187,7 @@
 
       <node oor:name="StyleListDeck" oor:op="replace">
         <prop oor:name="Title" oor:type="xs:string">
-          <value xml:lang="en-US">Styles and Formatting</value>
+          <value xml:lang="en-US">Styles</value>
         </prop>
         <prop oor:name="Id" oor:type="xs:string">
           <value>StyleListDeck</value>
@@ -1243,7 +1243,7 @@
 
       <node oor:name="StyleListPanel" oor:op="replace">
         <prop oor:name="Title" oor:type="xs:string">
-          <value xml:lang="en-US">Styles and Formatting</value>
+          <value xml:lang="en-US">Styles</value>
         </prop>
         <prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
           <value>true</value>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 0793ee4e6ad9..a94ba7cc81bd 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6709,11 +6709,11 @@
     </group>
     <group oor:name="StylesAndFormatting">
       <info>
-        <desc>Contains settings for Styles and Formatting.</desc>
+        <desc>Contains settings for Styles.</desc>
       </info>
       <prop oor:name="Preview" oor:type="xs:boolean" oor:nillable="false">
         <info>
-           <desc>Specifies if the styles and formatting preview is enabled.</desc>
+           <desc>Specifies if the styles preview is enabled.</desc>
         </info>
         <value>true</value>
       </prop>