tdf#111413 Slide Master -> Master Slide'

Change-Id: I444e72f87133ea8b22541319c0deeb31b4103cc5
Reviewed-on: https://gerrit.libreoffice.org/40997
Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>

8 files changed, 20 insertions, 21 deletions

diff --git a/source/text/simpress/00/00000403.xhp b/source/text/simpress/00/00000403.xhp
index 7318a6fd8b..6d9ab71946 100644
--- a/source/text/simpress/00/00000403.xhp
+++ b/source/text/simpress/00/00000403.xhp
@@ -85,7 +85,7 @@
 <section id="ashtgd">
 <paragraph id="par_id3151264" role="paragraph" xml-lang="en-US">Choose <emph>View - Master</emph></paragraph>
 </section>
-<paragraph id="par_idN10AF7" role="paragraph" xml-lang="en-US"><variable id="masterlayouts">Choose <emph>View - Slide Master </emph></variable></paragraph>
+<paragraph id="par_idN10AF7" role="paragraph" xml-lang="en-US"><variable id="masterlayouts">Choose <emph>View - Master Slide </emph></variable></paragraph>
 <paragraph id="par_idN10B19" role="paragraph" xml-lang="en-US"><variable id="notesmaster">Choose <emph>View - Master Notes</emph> </variable></paragraph>
 <paragraph id="par_idN10B07" role="paragraph" xml-lang="en-US"><variable id="master">Choose <emph>Slide - Master Elements</emph> </variable></paragraph>
 
@@ -95,7 +95,7 @@
 <paragraph id="par_idN10B74" role="paragraph" xml-lang="en-US">Choose <emph>Insert - Date and time</emph></paragraph>
 </section>
 <paragraph id="par_id3149286" role="paragraph" xml-lang="en-US"><variable id="hinterzeichnung">Choose <emph>View - Normal</emph> </variable></paragraph>
-<paragraph id="par_id3153480" role="paragraph" xml-lang="en-US"><variable id="master_drawing">Choose <emph>View - Slide Master</emph> </variable></paragraph>
+<paragraph id="par_id3153480" role="paragraph" xml-lang="en-US"><variable id="master_drawing">Choose <emph>View - Master Slide</emph> </variable></paragraph>
 <paragraph id="par_id3147254" role="paragraph" xml-lang="en-US"><variable id="hinternotizen">Choose <emph>View - Notes</emph> </variable></paragraph>
 </body>
 
diff --git a/source/text/simpress/00/00000405.xhp b/source/text/simpress/00/00000405.xhp
index 442e8703a0..8b1b9963fc 100644
--- a/source/text/simpress/00/00000405.xhp
+++ b/source/text/simpress/00/00000405.xhp
@@ -47,7 +47,7 @@
 </paragraph>
 <paragraph role="paragraph" id="par_id3154765" xml-lang="en-US">Choose <emph>Format - Layer</emph> (only $[officename] Draw)</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3153012" xml-lang="en-US"><variable id="seitenvorlage">Choose <emph>Slide - Slide Master Design</emph>
+<paragraph role="paragraph" id="par_id3153012" xml-lang="en-US"><variable id="seitenvorlage">Choose <emph>Slide - Master Slide Design</emph>
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/simpress/01/03080000.xhp b/source/text/simpress/01/03080000.xhp
index b8f0e20daa..b5d00ddf5d 100644
--- a/source/text/simpress/01/03080000.xhp
+++ b/source/text/simpress/01/03080000.xhp
@@ -47,11 +47,11 @@
  <bookmark xml-lang="en-US" branch="hid/.uno:PageMenu" id="bm_id9935605" localize="false"/>
  <paragraph id="par_id1977294" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Opens a submenu with commands for the current slide.</ahelp></paragraph><comment>Display Background of Master</comment>
  <bookmark xml-lang="en-US" branch="hid/.uno:DisplayMasterBackground" id="bm_id2551347" localize="false"/>
- <paragraph id="par_id9628894" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">When enabled, the current slide shows the background of the slide master.</ahelp></paragraph><comment>Display Objects from Master</comment>
+ <paragraph id="par_id9628894" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">When enabled, the current slide shows the background of the master slide.</ahelp></paragraph><comment>Display Objects from Master</comment>
  <bookmark xml-lang="en-US" branch="hid/.uno:DisplayMasterObjects" id="bm_id9849543" localize="false"/>
- <paragraph id="par_id7587206" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">When enabled, the current slide shows the objects of the slide master.</ahelp></paragraph><comment>Set Background Picture for Slide</comment><comment>i83563</comment>
+ <paragraph id="par_id7587206" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">When enabled, the current slide shows the objects of the master slide.</ahelp></paragraph><comment>Set Background Picture for Slide</comment><comment>i83563</comment>
  <bookmark xml-lang="en-US" branch="hid/.uno:SelectBackground" id="bm_id1203650" localize="false"/>
- <paragraph id="par_id3257545" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Opens a file dialog to select a picture. The picture will be scaled and inserted on the background of the current slide master. Use Format - Slide/Page - Background to remove the picture.</ahelp></paragraph>
+ <paragraph id="par_id3257545" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Opens a file dialog to select a picture. The picture will be scaled and inserted on the background of the current master slide.</ahelp></paragraph>
 </body>
 
 </helpdocument>
diff --git a/source/text/simpress/01/03152000.xhp b/source/text/simpress/01/03152000.xhp
index 8aec32cf90..f9268b62db 100644
--- a/source/text/simpress/01/03152000.xhp
+++ b/source/text/simpress/01/03152000.xhp
@@ -38,7 +38,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:HeaderAndFooter" id="bm_id1853999" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/headerfooterdialog/HeaderFooterDialog" id="bm_id3146458" localize="false"/>
 <paragraph role="heading" id="par_idN1053E" xml-lang="en-US" level="1"><link href="text/simpress/01/03152000.xhp">Header and Footer</link></paragraph>
-<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfooterdialog/HeaderFooterDialog">Adds or changes text in placeholders at the top and the bottom of slides and slide masters.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1054E" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfooterdialog/HeaderFooterDialog">Adds or changes text in placeholders at the top and the bottom of slides and master slides.</ahelp></paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000403.xhp#headerandfooter"/>
@@ -88,7 +88,7 @@
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/headerfootertab/not_on_title" id="bm_id3088778" localize="false"/><paragraph role="heading" id="par_idN107BF" xml-lang="en-US" level="2">Do not show on first slide</paragraph>
 <paragraph role="paragraph" id="par_idN107C2" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfootertab/not_on_title">Does not display your specified information on the first slide of your presentation.</ahelp></paragraph>
 <paragraph role="heading" id="par_idN107D1" xml-lang="en-US" level="2">Apply to All</paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/headerfooterdialog/apply_all" id="bm_id4796899" localize="false"/><paragraph role="paragraph" id="par_idN107DC" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfooterdialog/apply_all">Applies the settings to all the slides in your presentation, including the corresponding slide masters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/headerfooterdialog/apply_all" id="bm_id4796899" localize="false"/><paragraph role="paragraph" id="par_idN107DC" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfooterdialog/apply_all">Applies the settings to all the slides in your presentation, including the corresponding master slides.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/headerfooterdialog/apply" id="bm_id1924497" localize="false"/><paragraph role="heading" id="par_idN107FD" xml-lang="en-US" level="2">Apply</paragraph>
 <paragraph role="paragraph" id="par_idN10800" xml-lang="en-US"><ahelp hid="modules/simpress/ui/headerfooterdialog/apply">Applies the current settings to the selected slides.</ahelp></paragraph>
 </body>
diff --git a/source/text/simpress/01/04990500.xhp b/source/text/simpress/01/04990500.xhp
index 05ff050073..6b9fdf89bb 100644
--- a/source/text/simpress/01/04990500.xhp
+++ b/source/text/simpress/01/04990500.xhp
@@ -39,8 +39,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertPageField" id="bm_id8803425" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:InsertPageField" id="bm_id3150012" localize="false"/>
 <paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="1"><link href="text/simpress/01/04990500.xhp" name="Page Numbers">Page Number</link></paragraph>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><ahelp hid=".">Inserts the page number into the current slide or page.</ahelp> If you want to add a page number to every slide, choose View - Master<switchinline select="appl"><caseinline select="IMPRESS"> - Slide Master
-</caseinline></switchinline> and insert the page number field. To change the number format, choose <emph>Format - Page</emph> and then select a format from the list in the <emph>Layout Settings</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US"><ahelp hid=".">Inserts the page number into the current slide or page.</ahelp> If you want to add a page number to every slide, choose View - Master<switchinline select="appl"><caseinline select="IMPRESS"> Slide</caseinline></switchinline> and insert the page number field. To change the number format, choose <emph>Format - Page</emph> and then select a format from the list in the <emph>Layout Settings</emph> area.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#feldbf5"/>
diff --git a/source/text/simpress/guide/background.xhp b/source/text/simpress/guide/background.xhp
index 1f77bf6e8a..0768d6e5ff 100644
--- a/source/text/simpress/guide/background.xhp
+++ b/source/text/simpress/guide/background.xhp
@@ -28,7 +28,7 @@
     <body>
         <bookmark xml-lang="en-US" branch="index" id="bm_id3150199">
             <bookmark_value>backgrounds; changing</bookmark_value>
-            <bookmark_value>slide masters; changing backgrounds</bookmark_value>
+            <bookmark_value>master slides; changing backgrounds</bookmark_value>
             <bookmark_value>slides;changing backgrounds</bookmark_value>
         </bookmark>
         <paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1">
@@ -37,7 +37,7 @@
             </variable>
         </paragraph>
         <paragraph role="paragraph" id="par_id3155067" xml-lang="en-US">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
-        <paragraph role="paragraph" id="par_id3148701" xml-lang="en-US">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph>
+        <paragraph role="paragraph" id="par_id3148701" xml-lang="en-US">If you want to change the background fill for all of the slides, choose <emph>View - Master Slide</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph>
         <comment>insert help id when available</comment>
         <paragraph role="paragraph" id="par_id624713" xml-lang="en-US">
             <ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp>
@@ -78,13 +78,13 @@
             </listitem>
         </list>
         <paragraph role="paragraph" id="par_id3158403" xml-lang="en-US">This modification is only valid for the current presentation document.</paragraph>
-        <paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3">To save a new slide master as a template</paragraph>
+        <paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3">To save a new master slide as a template</paragraph>
         <list type="ordered">
             <listitem>
-                <paragraph role="paragraph" id="par_idN10827" xml-lang="en-US">Choose <emph>View - Master - Slide Master</emph> to change to the slide master.</paragraph>
+                <paragraph role="paragraph" id="par_idN10827" xml-lang="en-US">Choose <emph>View - Master Slide</emph> to change to the master slide.</paragraph>
             </listitem>
             <listitem>
-                <paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this slide master.</paragraph>
+                <paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this master slide.</paragraph>
             </listitem>
             <listitem>
                 <paragraph role="paragraph" id="par_idN10837" xml-lang="en-US">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
diff --git a/source/text/simpress/guide/masterpage.xhp b/source/text/simpress/guide/masterpage.xhp
index 34c3ad39a9..95f746f88a 100644
--- a/source/text/simpress/guide/masterpage.xhp
+++ b/source/text/simpress/guide/masterpage.xhp
@@ -24,7 +24,7 @@
 		<helpdocument version="1.0">
 <meta>
 <topic id="textsimpressguidemasterpagexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Applying a Slide Design to a Slide Master </title>
+<title id="tit" xml-lang="en-US">Applying a Slide Design to a Master Slide </title>
 <filename>/text/simpress/guide/masterpage.xhp</filename>
 </topic>
 </meta>
@@ -36,13 +36,13 @@
 <bookmark_value>slides; backgrounds</bookmark_value>
 <bookmark_value>master pages, see master slides</bookmark_value>
 </bookmark>
-<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="1"><variable id="masterpage"><link href="text/simpress/guide/masterpage.xhp" name="Applying a Slide Design to a Slide Master">Applying a Slide Design to a Slide Master</link>
+<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="1"><variable id="masterpage"><link href="text/simpress/guide/masterpage.xhp" name="Applying a Slide Design to a Master Slide">Applying a Slide Design to a Master Slide</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3154017" xml-lang="en-US">Every slide in a presentation has exactly one master slide, also known as master slide. A master slide determines the text formatting style for the title and outline and the background design for all slides that use this master slide.</paragraph>
 <paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3">To apply a new master slide</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Select <emph>Slide - Slide Master Design</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154702" xml-lang="en-US">Select <emph>Slide - Master Slide Design</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3148485" xml-lang="en-US">Click <emph>Load</emph>.</paragraph>
diff --git a/source/text/simpress/main0103.xhp b/source/text/simpress/main0103.xhp
index e075dca339..269ac277d5 100644
--- a/source/text/simpress/main0103.xhp
+++ b/source/text/simpress/main0103.xhp
@@ -59,10 +59,10 @@
 <paragraph id="par_id102720150112252443" role="paragraph" xml-lang="en-US">Show or hide a presentation's annotations.</paragraph>
 
 <paragraph id="hd_id102720151246523444" role="heading" level="2" xml-lang="en-US">Master Background</paragraph>
-<paragraph id="par_id102720150112257941" role="paragraph" xml-lang="en-US">Toggle the visibility of a slide master's background to be used as the background of the current slide.</paragraph>
+<paragraph id="par_id102720150112257941" role="paragraph" xml-lang="en-US">Toggle the visibility of a master slide's background to be used as the background of the current slide.</paragraph>
 
 <paragraph id="hd_id102720151246521837" role="heading" level="2" xml-lang="en-US">Master Objects</paragraph>
-<paragraph id="par_id102720150112256473" role="paragraph" xml-lang="en-US">Toggle the visibility of a slide master's objects to appear on the current slide.</paragraph>
+<paragraph id="par_id102720150112256473" role="paragraph" xml-lang="en-US">Toggle the visibility of a master slide's objects to appear on the current slide.</paragraph>
 <embed href="text/simpress/01/03151000.xhp#master_elements"/>
 <embed href="text/shared/01/menu_view_sidebar.xhp#sidebar"/>
 <embed href="text/simpress/01/05100000.xhp#styles_and_formatting"/>
@@ -75,4 +75,4 @@
 <embed href="text/shared/01/03010000.xhp#zoom_text"/>
 </body>
 
-</helpdocument>
\ No newline at end of file
+</helpdocument>