tdf#87592 Consistent terminology for Master Slides

All occurences of Slide Master and Master Pages are renamed to
Master Slide(s).

Change-Id: Idd75089f6c402b3d5e30a812b4c86aacc2f5d9bc
Reviewed-on: https://gerrit.libreoffice.org/40485
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

8 files changed, 15 insertions, 15 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index fab5d1945cc7..317ef71a3505 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -119,7 +119,7 @@ The current presentation contains no OLE objects.</value>
             <value xml:lang="en-US">Choose which slides to delete</value>
         </prop>
         <prop oor:name="STR_DELETE_MASTER_PAGES">
-            <value xml:lang="en-US">Delete unused ~master pages</value>
+            <value xml:lang="en-US">Delete unused ~master slides</value>
         </prop>
         <prop oor:name="STR_DELETE_NOTES_PAGES">
             <value xml:lang="en-US">~Clear notes</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 73a35e41ceb6..300c9b43da28 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -453,7 +453,7 @@
       </node>
       <node oor:name=".uno:SlideMasterPage" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Slide ~Master</value>
+          <value xml:lang="en-US">~Master Slide</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -461,7 +461,7 @@
       </node>
       <node oor:name=".uno:NotesMasterPage" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Notes M~aster</value>
+          <value xml:lang="en-US">M~aster Notes</value>
         </prop>
       </node>
       <node oor:name=".uno:InsertPageQuick" oor:op="replace">
@@ -901,7 +901,7 @@
       </node>
       <node oor:name=".uno:PresentationLayout" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Slide Master D~esign...</value>
+          <value xml:lang="en-US">Master Slide D~esign...</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -941,7 +941,7 @@
       </node>
       <node oor:name=".uno:HandoutMode" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Hando~ut Master</value>
+          <value xml:lang="en-US">Master Hando~ut</value>
         </prop>
       </node>
       <node oor:name=".uno:DeletePage" oor:op="replace">
@@ -1582,12 +1582,12 @@
       </node>
       <node oor:name=".uno:MasterLayoutsNotes" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Notes Master Layout...</value>
+          <value xml:lang="en-US">Master Notes Layout...</value>
         </prop>
       </node>
       <node oor:name=".uno:MasterLayoutsHandouts" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Handout Master Layout...</value>
+          <value xml:lang="en-US">Master Handout Layout...</value>
         </prop>
       </node>
       <node oor:name=".uno:HeaderAndFooter" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index 9cef881c7c83..3c566c194ea7 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -132,12 +132,12 @@
       </node>
       <node oor:name="private:resource/popupmenu/pagepanemaster" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Slide Master Sorter/Pane</value>
+          <value xml:lang="en-US">Master Slide Sorter/Pane</value>
         </prop>
       </node>
       <node oor:name="private:resource/popupmenu/pagepanenoselmaster" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">Slide Master Sorter/Pane (no selection)</value>
+          <value xml:lang="en-US">Master Slide Sorter/Pane (no selection)</value>
         </prop>
       </node>
       <node oor:name="private:resource/popupmenu/table" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 5787aeff01ae..0d7c4bf2d848 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -107,7 +107,7 @@
 
       <node oor:name="SdMasterPagesDeck" oor:op="replace">
         <prop oor:name="Title" oor:type="xs:string">
-          <value xml:lang="en-US">Master Pages</value>
+          <value xml:lang="en-US">Master Slides</value>
         </prop>
         <prop oor:name="Id" oor:type="xs:string">
           <value>SdMasterPagesDeck</value>
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index e4feaa27a0ae..e3d350063c0a 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -34,10 +34,10 @@
 #define STR_UNDO_BEZCLOSE                               NC_("STR_UNDO_BEZCLOSE", "Close Polygon")
 #define STR_SLIDE_SORTER_MODE                           NC_("STR_SLIDE_SORTER_MODE", "Slide Sorter")
 #define STR_NORMAL_MODE                                 NC_("STR_NORMAL_MODE", "Normal")
-#define STR_SLIDE_MASTER_MODE                           NC_("STR_SLIDE_MASTER_MODE", "Slide Master")
+#define STR_SLIDE_MASTER_MODE                           NC_("STR_SLIDE_MASTER_MODE", "Master Slide")
 #define STR_OUTLINE_MODE                                NC_("STR_OUTLINE_MODE", "Outline")
 #define STR_NOTES_MODE                                  NC_("STR_NOTES_MODE", "Notes")
-#define STR_NOTES_MASTER_MODE                           NC_("STR_NOTES_MASTER_MODE", "Notes Master")
+#define STR_NOTES_MASTER_MODE                           NC_("STR_NOTES_MASTER_MODE", "Master Notes")
 #define STR_HANDOUT_MASTER_MODE                         NC_("STR_HANDOUT_MASTER_MODE", "Handout")
 #define STR_AUTOLAYOUT_NONE                             NC_("STR_AUTOLAYOUT_NONE", "Blank Slide")
 #define STR_AUTOLAYOUT_ONLY_TITLE                       NC_("STR_AUTOLAYOUT_ONLY_TITLE", "Title Only")
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 392be76b07ed..d32fc57375ce 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1011,7 +1011,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind)
 
             if(eObjKind == PRESOBJ_HEADER )
             {
-                OSL_FAIL( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a slide master" );
+                OSL_FAIL( "SdPage::CreateDefaultPresObj() - can't create a header placeholder for a master slide" );
                 return nullptr;
             }
             else
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 338da53bb7a1..43e0056eb5ac 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -1703,7 +1703,7 @@ void PowerPointExport::AddLayoutIdAndRelation( const FSHelperPtr& pFS, sal_Int32
 
 void PowerPointExport::ImplWriteSlideMaster( sal_uInt32 nPageNum, Reference< XPropertySet > const & aXBackgroundPropSet )
 {
-    SAL_INFO("sd.eppt", "write slide master: " << nPageNum << "\n--------------");
+    SAL_INFO("sd.eppt", "write master slide: " << nPageNum << "\n--------------");
 
     // slides list
     if( nPageNum == 0 )
diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx
index 3560d8818197..be23c0725876 100644
--- a/xmloff/source/draw/ximpbody.cxx
+++ b/xmloff/source/draw/ximpbody.cxx
@@ -177,7 +177,7 @@ SdXMLDrawPageContext::SdXMLDrawPageContext( SdXMLImport& rImport,
                 }
             }
 
-            SAL_WARN_IF( !bDone, "xmloff", "xmloff::SdXMLDrawPageContext::SdXMLDrawPageContext(), could not find a slide master!" );
+            SAL_WARN_IF( !bDone, "xmloff", "xmloff::SdXMLDrawPageContext::SdXMLDrawPageContext(), could not find a master slide!" );
         }
     }