tdf#111413 Terminology change: "Slide Master"

... and Master Pages are renamed to Master Slide(s)

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

4 files changed, 27 insertions, 27 deletions

diff --git a/source/text/simpress/guide/footer.xhp b/source/text/simpress/guide/footer.xhp
index 11525dd43e..c1c5929523 100644
--- a/source/text/simpress/guide/footer.xhp
+++ b/source/text/simpress/guide/footer.xhp
@@ -32,9 +32,9 @@
   
   
   
-<bookmark xml-lang="en-US" branch="index" id="bm_id3153191"><bookmark_value>footers;slide masters</bookmark_value>
-<bookmark_value>slide masters; headers and footers</bookmark_value>
-<bookmark_value>headers and footers; slide masters</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3153191"><bookmark_value>footers;master slides</bookmark_value>
+<bookmark_value>master slides; headers and footers</bookmark_value>
+<bookmark_value>headers and footers; master slides</bookmark_value>
 <bookmark_value>inserting;headers/footers in all slides</bookmark_value>
 <bookmark_value>slide numbers on all slides</bookmark_value>
 <bookmark_value>page numbers on all slides</bookmark_value>
@@ -44,25 +44,25 @@
   <comment>mw changed "adding;" to "inserting;"</comment>
   <paragraph xml-lang="en-US" id="hd_id3153191" role="heading" level="1"><variable id="footer"><link href="text/simpress/guide/footer.xhp" name="Adding a Header or a Footer to All Slides">Adding a Header or a Footer to All Slides</link> 
 </variable></paragraph>
-  <paragraph xml-lang="en-US" id="par_id1356547" role="paragraph">Every slide is based on a slide master. The text, pictures, tables, fields or other objects that you place on the slide master are visible as a background on all slides that are based on that slide master.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id1356547" role="paragraph">Every slide is based on a master slide. The text, pictures, tables, fields or other objects that you place on the master slide are visible as a background on all slides that are based on that master slide.</paragraph>
   <paragraph xml-lang="en-US" id="par_id704672" role="paragraph">Masters exist for slides, notes, and handouts. </paragraph>
   <list type="unordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id8403576" role="paragraph">To edit a slide master, choose <emph>View - Slide Master</emph>. Click the Close Master View icon on the Master View toolbar, or choose <emph>View - Normal</emph>, to leave the slide master.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id8403576" role="paragraph">To edit a master slide, choose <emph>View - Master Slide</emph>. Click the Close Master View icon on the Master View toolbar, or choose <emph>View - Normal</emph>, to leave the master slide.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id5641651" role="paragraph">To edit a notes master, choose <emph>View - Notes Master</emph>. Click the Close Master View icon on the Master View toolbar, or choose <emph>View - Normal</emph>, to leave the notes master.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id5641651" role="paragraph">To edit a master notes, choose <emph>View - Master Notes</emph>. Click the Close Master View icon on the Master View toolbar, or choose <emph>View - Normal</emph>, to leave the master notes.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id1583300" role="paragraph">To edit a handout master, click the Handout tab above the slide. Click the Normal tab to leave the handout master.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id1583300" role="paragraph">To edit a master handout, click the Handout tab above the slide. Click the Normal tab to leave the master handout.</paragraph>
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="hd_id7251808" role="heading" level="2">Adding predefined header or footer objects</paragraph>
   <comment>see i53011</comment>
   <paragraph xml-lang="en-US" id="par_id5015411" role="paragraph">Every type of master has some predefined areas to hold the date, footer, and slide numbers. </paragraph>
   <paragraph xml-lang="en-US" id="par_id8217413" role="paragraph">When you switch to the master view, you can move those areas to any position on the master. Also, you can enter additional text into them, resize them, and select their contents to apply text formatting. For example, you can change the font size or color.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id7549668" role="tip">A predefined Header Area is available only for notes and handouts. If you want a header on all slides, you can move the Footer Area on the slide master to the top.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id1829889" role="paragraph">Objects that you insert on a slide master are visible on all slides that are based on that slide master.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id7549668" role="tip">A predefined Header Area is available only for notes and handouts. If you want a header on all slides, you can move the Footer Area on the master slide to the top.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id1829889" role="paragraph">Objects that you insert on a master slide are visible on all slides that are based on that master slide.</paragraph>
   <list type="ordered">
    <listitem>
     <paragraph xml-lang="en-US" id="par_id8843043" role="paragraph">Choose <emph>Insert - Header and Footer</emph>.</paragraph>
@@ -75,18 +75,18 @@
     <paragraph xml-lang="en-US" id="par_id1445966" role="paragraph">Enter or select the contents that should be visible on all slides.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id1956236" role="paragraph">If you want to change the position and formatting of the master objects, choose <emph>View - Master - Slide Master</emph>.</paragraph>
-    <paragraph xml-lang="en-US" id="par_id5259559" role="paragraph">You see the slide master with areas near the bottom. You can move the areas , and you can select the fields and apply some formatting. You can also enter some text here which will be shown next to the fields.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id1956236" role="paragraph">If you want to change the position and formatting of the master objects, choose <emph>View - Master</emph>.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id5259559" role="paragraph">You see the master slide with areas near the bottom. You can move the areas , and you can select the fields and apply some formatting. You can also enter some text here which will be shown next to the fields.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id2521439" role="paragraph">Click the Date Area and move the time and date field. Select the &lt;date/time&gt; field and apply some formatting to change the format for the date and time on all slides. The same applies to the Footer Area and the Slide Number Area.</paragraph>
    </listitem>
   </list>
   <paragraph xml-lang="en-US" id="hd_id4712057" role="heading" level="2">Adding text objects as header or footer objects</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph">You can add a text object anywhere on the slide master.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3155064" role="paragraph">You can add a text object anywhere on the master slide.</paragraph>
   <list type="ordered">
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id3148866" role="paragraph">Choose <emph>View - Slide Master</emph>.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id3148866" role="paragraph">Choose <emph>View - Master Slide</emph>.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph">On the <emph>Drawing</emph> bar, select the <emph>Text</emph> icon 
@@ -94,7 +94,7 @@
 	</image>.</paragraph>
    </listitem>
    <listitem>
-    <paragraph xml-lang="en-US" id="par_id3149947" role="paragraph">Drag in the slide master to draw a text object, and then type or paste your text.</paragraph>
+    <paragraph xml-lang="en-US" id="par_id3149947" role="paragraph">Drag in the master slide to draw a text object, and then type or paste your text.</paragraph>
    </listitem>
    <listitem>
     <paragraph xml-lang="en-US" id="par_id3155441" role="paragraph">Choose <emph>View - Normal</emph> when you are finished.</paragraph>
@@ -106,7 +106,6 @@
    <embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
    <embed href="text/simpress/guide/layers.xhp#layers"/>
    <paragraph xml-lang="en-US" id="par_id3155848" role="paragraph"><link href="text/simpress/01/04990000.xhp" name="Insert Fields">Insert Fields</link></paragraph>
-   
   </section>
  </body>
 </helpdocument>
diff --git a/source/text/simpress/guide/layers.xhp b/source/text/simpress/guide/layers.xhp
index 35f9010ef3..5f88358acc 100644
--- a/source/text/simpress/guide/layers.xhp
+++ b/source/text/simpress/guide/layers.xhp
@@ -54,7 +54,7 @@
 <paragraph role="paragraph" id="par_id3150534" xml-lang="en-US">The <emph>Layout</emph> layer is the default workspace. The <emph>Layout</emph> layer determines the location of title, text, and object placeholders on your page.</paragraph>
 <paragraph role="paragraph" id="par_id3150742" xml-lang="en-US">The <emph>Controls</emph> layer can be used for buttons that have been assigned an action, but that should not be printed. Set the layer's properties to not printable. Objects on the <emph>Controls</emph> layer are always in front of objects on other layers.</paragraph>
 <paragraph role="paragraph" id="par_id3153085" xml-lang="en-US">The <emph>Dimension Lines</emph> layer is where you draw, for example, the dimension lines. By switching the layer to show or hide, you can easily switch these lines on and off.</paragraph>
-<paragraph role="tip" id="par_id3154507" xml-lang="en-US">You can lock a layer to protect its contents, or hide a layer and its contents from view or from printing. When you add a new layer to a page, the layer is added to all of the pages in your document. However, when you add an object to a layer, it is only added to the current page. If you want the object to appear on all of the pages, add the object to the master page (<item type="menuitem">View - Master</item>).</paragraph>
+<paragraph role="tip" id="par_id3154507" xml-lang="en-US">You can lock a layer to protect its contents, or hide a layer and its contents from view or from printing. When you add a new layer to a page, the layer is added to all of the pages in your document. However, when you add an object to a layer, it is only added to the current page. If you want the object to appear on all of the pages, add the object to the master slide (<item type="menuitem">View - Master Slide</item>).</paragraph>
 <section id="relatedtopics">
 <embed href="text/simpress/guide/layer_new.xhp#layer_new"/>
 <embed href="text/simpress/guide/layer_move.xhp#layer_move"/>
diff --git a/source/text/simpress/guide/masterpage.xhp b/source/text/simpress/guide/masterpage.xhp
index a2c8dce6fe..34c3ad39a9 100644
--- a/source/text/simpress/guide/masterpage.xhp
+++ b/source/text/simpress/guide/masterpage.xhp
@@ -29,16 +29,17 @@
 </topic>
 </meta>
 <body>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3152596"><bookmark_value>slide designs</bookmark_value>
-<bookmark_value>slide masters; designing</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3152596">
+<bookmark_value>slide designs</bookmark_value>
+<bookmark_value>master slides; designing</bookmark_value>
 <bookmark_value>backgrounds; slides</bookmark_value>
 <bookmark_value>slides; backgrounds</bookmark_value>
-<bookmark_value>master pages, see slide masters</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>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US">Every slide in a presentation has exactly one slide master, also known as master page. A slide master determines the text formatting style for the title and outline and the background design for all slides that use this slide master.</paragraph>
-<paragraph role="heading" id="hd_id3149018" xml-lang="en-US" level="3">To apply a new slide master</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>
@@ -71,14 +72,14 @@
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" id="bm_id2108523" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_RECENT" id="bm_id433362" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_ALL" id="bm_id8973662" localize="false"/>
-<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US"><ahelp hid="." visibility="hidden">Left-click to apply the master page to all slides. Right-click for a context menu.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN106FA" xml-lang="en-US"><ahelp hid="." visibility="hidden">Left-click to apply the master slide to all slides. Right-click for a context menu.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToAllSlides" id="bm_id2527848" localize="false"/>
-<paragraph role="paragraph" id="par_idN10747" xml-lang="en-US"><ahelp hid="." visibility="hidden">Applies the master page to all slides.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10747" xml-lang="en-US"><ahelp hid="." visibility="hidden">Applies the master slide to all slides.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneApplyToSelectedSlides" id="bm_id5487228" localize="false"/>
-<paragraph role="paragraph" id="par_idN10762" xml-lang="en-US"><ahelp hid="." visibility="hidden">Applies the master page or the slide design to the selected slides.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10762" xml-lang="en-US"><ahelp hid="." visibility="hidden">Applies the master slide or the slide design to the selected slides.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowLargePreview" id="bm_id9531235" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:TaskPaneShowSmallPreview" id="bm_id4315622" localize="false"/>
-<paragraph role="paragraph" id="par_idN10785" xml-lang="en-US"><ahelp hid="." visibility="hidden">Resizes the preview of the master pages.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10785" xml-lang="en-US"><ahelp hid="." visibility="hidden">Resizes the preview of the master slides.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS" id="bm_id6526688" localize="false"/>
 <paragraph role="paragraph" id="par_idN107CB" xml-lang="en-US"><ahelp hid="." visibility="hidden">Click to apply a slide design to all selected slides. Right-click for a context menu.</ahelp></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
diff --git a/source/text/simpress/guide/printing.xhp b/source/text/simpress/guide/printing.xhp
index 68a51abeac..63027a46ad 100644
--- a/source/text/simpress/guide/printing.xhp
+++ b/source/text/simpress/guide/printing.xhp
@@ -77,14 +77,14 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id6752220" role="paragraph">Click <emph>Notes and Handouts</emph> to enter the header and footer text for handouts.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id5703909" role="paragraph">You see four areas on this dialog with check boxes for Header, Date and time, Footer, and Page number. These four areas correspond to the four areas in the corners of the handout master view.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id5703909" role="paragraph">You see four areas on this dialog with check boxes for Header, Date and time, Footer, and Page number. These four areas correspond to the four areas in the corners of the master handout view.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id4984282" role="paragraph">Enter text for header, footer, and date. Check the <emph>Page number</emph> box, if you want to number the handout pages. Ensure the <emph>Header</emph> check box is enabled if you want your header text to be printed.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id816064" role="paragraph">Click <emph>Apply to All</emph>.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id863063" role="paragraph">The fields in the handout master view on screen are not updated, but the text that you entered will be printed.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id863063" role="paragraph">The fields in the master handout view on screen are not updated, but the text that you entered will be printed.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id5036164" role="heading" level="1">Printing handouts or notes</paragraph>