[Libreoffice-commits] help.git: source/auxiliary source/text
Olivier Hallot
olivier.hallot at libreoffice.org
Mon Aug 7 20:57:33 UTC 2017
source/auxiliary/simpress.tree | 2
source/text/sdraw/main0103.xhp | 6 +-
source/text/shared/optionen/01070500.xhp | 2
source/text/simpress/00/00000403.xhp | 6 +-
source/text/simpress/01/03080000.xhp | 68 +++++++++++++++---------------
source/text/simpress/01/03150100.xhp | 18 +++----
source/text/simpress/01/03150300.xhp | 6 +-
source/text/simpress/01/03151000.xhp | 6 +-
source/text/simpress/01/03151100.xhp | 16 +++----
source/text/simpress/01/03151200.xhp | 6 +-
source/text/simpress/01/04010000.xhp | 8 +--
source/text/simpress/01/05100000.xhp | 2
source/text/simpress/guide/footer.xhp | 29 ++++++------
source/text/simpress/guide/layers.xhp | 2
source/text/simpress/guide/masterpage.xhp | 19 ++++----
source/text/simpress/guide/printing.xhp | 4 -
16 files changed, 100 insertions(+), 100 deletions(-)
New commits:
commit d08dda71a035dbaa6812e2f30dc18ec772fc5471
Author: Olivier Hallot <olivier.hallot at libreoffice.org>
Date: Sun Aug 6 19:52:51 2017 -0300
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 at edx.srv.br>
Tested-by: Olivier Hallot <olivier.hallot at edx.srv.br>
diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree
index 491920fa0..e2fc40d50 100644
--- a/source/auxiliary/simpress.tree
+++ b/source/auxiliary/simpress.tree
@@ -106,7 +106,7 @@
<topic id="sdraw/text/sdraw/guide/align_arrange.xhp">Arranging, Aligning and Distributing Objects</topic>
<topic id="simpress/text/simpress/guide/background.xhp">Changing the Slide Background Fill</topic>
<topic id="simpress/text/simpress/guide/footer.xhp">Adding a Header or a Footer to All Slides</topic>
-<topic id="simpress/text/simpress/guide/masterpage.xhp">Applying a Slide Design to a Slide Master </topic>
+<topic id="simpress/text/simpress/guide/masterpage.xhp">Applying a Slide Design to a Master Slide</topic>
<topic id="simpress/text/simpress/guide/move_object.xhp">Moving Objects</topic>
</node>
<node id="0405" title="Printing">
diff --git a/source/text/sdraw/main0103.xhp b/source/text/sdraw/main0103.xhp
index 0560fcb3a..b098cc85f 100644
--- a/source/text/sdraw/main0103.xhp
+++ b/source/text/sdraw/main0103.xhp
@@ -37,8 +37,8 @@
<paragraph id="par_idN105AB" role="heading" level="2" xml-lang="en-US">Normal</paragraph>
<paragraph id="par_idN105AF" role="paragraph" xml-lang="en-US">Switch to normal view of the page.</paragraph>
-<paragraph id="par_idN105B2" role="heading" level="2" xml-lang="en-US">Master</paragraph>
-<paragraph id="par_idN105B6" role="paragraph" xml-lang="en-US">Switch to the master page view.</paragraph>
+<paragraph id="par_idN105B2" role="heading" level="2" xml-lang="en-US">Master Slide</paragraph>
+<paragraph id="par_idN105B6" role="paragraph" xml-lang="en-US">Switch to the master slide view.</paragraph>
<embed href="text/simpress/01/03180000.xhp#color_grayscale"/>
<embed href="text/simpress/01/slidesorter.xhp#page_slide_pane"/>
<embed href="text/shared/01/03060000.xhp#status_bar"/>
@@ -52,4 +52,4 @@
<embed href="text/shared/01/03010000.xhp#zoom_text"/>
</body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/optionen/01070500.xhp b/source/text/shared/optionen/01070500.xhp
index 7ecb8c5c0..04191f5c7 100644
--- a/source/text/shared/optionen/01070500.xhp
+++ b/source/text/shared/optionen/01070500.xhp
@@ -72,7 +72,7 @@
<paragraph role="heading" id="hd_id3154638" xml-lang="en-US" level="2">Settings</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/backgroundback" id="bm_id3145750" localize="false"/>
<paragraph role="heading" id="hd_id3146120" xml-lang="en-US" level="3">Use background cache</paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US"><ahelp hid="modules/simpress/ui/optimpressgeneralpage/backgroundback">Specifies whether to use the cache for displaying objects on the master page.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master page.</paragraph>
+<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US"><ahelp hid="modules/simpress/ui/optimpressgeneralpage/backgroundback">Specifies whether to use the cache for displaying objects on the master slide.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master slide.</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/optimpressgeneralpage/copywhenmove" id="bm_id3150094" localize="false"/>
<paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3">Copy when moving</paragraph>
<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US"><ahelp hid=".">If enabled, a copy is created when you move an object while holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph>
diff --git a/source/text/simpress/00/00000403.xhp b/source/text/simpress/00/00000403.xhp
index 380d08326..7318a6fd8 100644
--- a/source/text/simpress/00/00000403.xhp
+++ b/source/text/simpress/00/00000403.xhp
@@ -54,7 +54,7 @@
</section>
<section id="ashdz">
-<paragraph id="par_id3155255" role="paragraph" xml-lang="en-US">Choose <emph>View - Handout Master</emph></paragraph>
+<paragraph id="par_id3155255" role="paragraph" xml-lang="en-US">Choose <emph>View - Master Handout</emph></paragraph>
</section>
<section id="asbsp">
@@ -86,8 +86,8 @@
<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_idN10B19" role="paragraph" xml-lang="en-US"><variable id="notesmaster">Choose <emph>View - Notes Master</emph> </variable></paragraph>
-<paragraph id="par_idN10B07" role="paragraph" xml-lang="en-US"><variable id="master">Choose <emph>View - Master Elements</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>
<section id="headerandfooter">
<paragraph id="par_idN10B57" role="paragraph" xml-lang="en-US">Choose <emph>Insert - Header and Footer</emph></paragraph>
diff --git a/source/text/simpress/01/03080000.xhp b/source/text/simpress/01/03080000.xhp
index 960c6e2d8..b8f0e20da 100644
--- a/source/text/simpress/01/03080000.xhp
+++ b/source/text/simpress/01/03080000.xhp
@@ -18,40 +18,40 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-<meta>
- <topic id="textsimpress0103080000xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Normal View</title>
- <filename>/text/simpress/01/03080000.xhp</filename>
- </topic>
-</meta>
-
-<body>
-
-
-<section id="normal_view">
-<bookmark xml-lang="en-US" branch="index" id="bm_id3148576">
- <bookmark_value>normal view;presentations</bookmark_value>
-</bookmark>
-
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawingMode" id="bm_id4758646" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SD_HID_SD_BTN_DRAW" id="bm_id3147436" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:NormalMultiPaneGUI" id="bm_id9567247" localize="false"/>
-
-<paragraph id="hd_id3148576" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03080000.xhp" name="Normal View">Normal</link></paragraph>
-<paragraph id="par_id3145251" role="paragraph" xml-lang="en-US"><ahelp hid="HID_SD_BTN_DRAW">Switches to normal view, where you can create and edit your slides.</ahelp></paragraph>
-</section>
-
-<section id="howtoget">
-<embed href="text/simpress/00/00000403.xhp#aszng"/>
-</section><comment>some context menu commands in Normal view</comment><comment>Slide command in context menu</comment>
-<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>
-<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>
-<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>
+ <meta>
+ <topic id="textsimpress0103080000xml" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Normal View</title>
+ <filename>/text/simpress/01/03080000.xhp</filename>
+ </topic>
+ </meta>
+
+ <body>
+
+
+ <section id="normal_view">
+ <bookmark xml-lang="en-US" branch="index" id="bm_id3148576">
+ <bookmark_value>normal view;presentations</bookmark_value>
+ </bookmark>
+
+ <bookmark xml-lang="en-US" branch="hid/.uno:DrawingMode" id="bm_id4758646" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_BTN_DRAW" id="bm_id3147436" localize="false"/>
+ <bookmark xml-lang="en-US" branch="hid/.uno:NormalMultiPaneGUI" id="bm_id9567247" localize="false"/>
+
+ <paragraph id="hd_id3148576" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03080000.xhp" name="Normal View">Normal</link></paragraph>
+ <paragraph id="par_id3145251" role="paragraph" xml-lang="en-US"><ahelp hid="HID_SD_BTN_DRAW">Switches to normal view, where you can create and edit your slides.</ahelp></paragraph>
+ </section>
+
+ <section id="howtoget">
+ <embed href="text/simpress/00/00000403.xhp#aszng"/>
+ </section><comment>some context menu commands in Normal view</comment><comment>Slide command in context menu</comment>
+ <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>
+ <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>
+ <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>
</body>
</helpdocument>
diff --git a/source/text/simpress/01/03150100.xhp b/source/text/simpress/01/03150100.xhp
index e203665ce..6519c54c4 100644
--- a/source/text/simpress/01/03150100.xhp
+++ b/source/text/simpress/01/03150100.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsimpress0103150100xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Slide Master</title>
+ <title id="tit" xml-lang="en-US">Master Slide</title>
<filename>/text/simpress/01/03150100.xhp</filename>
</topic>
</meta>
@@ -32,27 +32,27 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3154013">
<bookmark_value>normal view; backgrounds</bookmark_value>
<bookmark_value>backgrounds; normal view</bookmark_value>
- <bookmark_value>views;slide master view</bookmark_value>
- <bookmark_value>slide master view</bookmark_value>
+ <bookmark_value>views;master slide view</bookmark_value>
+ <bookmark_value>master slide view</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/.uno:SlideMasterPage" id="bm_id3129665" localize="false"/>
-<paragraph id="hd_id3154013" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03150100.xhp" name="Slide Master">Slide Master</link></paragraph>
-<paragraph id="par_id3151075" role="paragraph" xml-lang="en-US"><ahelp hid=".">Switches to slide master view, where you can add elements that you want to appear on all of the slides that use the same slide master.</ahelp></paragraph>
+<paragraph id="hd_id3154013" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03150100.xhp" name="Master Slide">Master Slide</link></paragraph>
+<paragraph id="par_id3151075" role="paragraph" xml-lang="en-US"><ahelp hid=".">Switches to master slide view, where you can add elements that you want to appear on all of the slides that use the same master slide.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/00000403.xhp#master_drawing"/>
</section>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertMasterPage" id="bm_id6843775" localize="false"/>
-<paragraph id="par_id4941557" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Inserts a new slide master into the document. Double-click the new slide master on the Slides pane to apply it to all slides.</ahelp></paragraph>
+<paragraph id="par_id4941557" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Inserts a new master slide into the document. Double-click the new master slide on the Slides pane to apply it to all slides.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:DeleteMasterPage" id="bm_id755943" localize="false"/>
-<paragraph id="par_id9961851" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a slide master and click this icon to remove the slide master from the document.</ahelp></paragraph>
+<paragraph id="par_id9961851" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a master slide and click this icon to remove the master slide from the document.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:RenameMasterPage" id="bm_id5988952" localize="false"/>
-<paragraph id="par_id4526200" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a slide master and click this icon to rename the slide master.</ahelp></paragraph>
+<paragraph id="par_id4526200" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a master slide and click this icon to rename the master slide.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:CloseMasterPage" id="bm_id3304544" localize="false"/>
-<paragraph id="par_id8036133" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Closes the slide master view.</ahelp></paragraph>
+<paragraph id="par_id8036133" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Closes the master slide view.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/simpress/01/03150300.xhp b/source/text/simpress/01/03150300.xhp
index 1f5468867..246a7ea67 100644
--- a/source/text/simpress/01/03150300.xhp
+++ b/source/text/simpress/01/03150300.xhp
@@ -20,7 +20,7 @@
<meta>
<topic id="textsimpress0103150300xml" indexer="include" status="PUBLISH">
- <title id="tit" xml-lang="en-US">Notes Master</title>
+ <title id="tit" xml-lang="en-US">Master Notes</title>
<filename>/text/simpress/01/03150300.xhp</filename>
</topic>
</meta>
@@ -37,8 +37,8 @@
<bookmark xml-lang="en-US" branch="hid/.uno:NotesMasterPage" id="bm_id3260211" localize="false"/>
-<paragraph id="hd_id3153144" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03150300.xhp" name="Notes Master">Notes Master</link></paragraph>
-<paragraph id="par_id3154491" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the notes master, where you can set the default formatting for notes.</ahelp></paragraph>
+<paragraph id="hd_id3153144" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03150300.xhp" name="Master Notes">Master Notes</link></paragraph>
+<paragraph id="par_id3154491" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays the master notes, where you can set the default formatting for notes.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/simpress/01/03151000.xhp b/source/text/simpress/01/03151000.xhp
index 4b3ab93ef..0e125a8cc 100644
--- a/source/text/simpress/01/03151000.xhp
+++ b/source/text/simpress/01/03151000.xhp
@@ -28,8 +28,8 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id4083986">
- <bookmark_value>headers and footers;master layouts</bookmark_value>
- <bookmark_value>master layouts with headers and footers</bookmark_value>
+ <bookmark_value>headers and footers;master slides layouts</bookmark_value>
+ <bookmark_value>master slides layouts with headers and footers</bookmark_value>
</bookmark>
@@ -37,7 +37,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:MasterLayouts" id="bm_id6164738" localize="false"/>
<paragraph id="par_idN1056D" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/03151000.xhp" name="Master Elements">Master Elements</link></paragraph>
-<paragraph id="par_idN1057D" role="paragraph" xml-lang="en-US"><ahelp hid=".">Add header, footer, date, and slide number placeholders to the slide master.</ahelp></paragraph>
+<paragraph id="par_idN1057D" role="paragraph" xml-lang="en-US"><ahelp hid=".">Add header, footer, date, and slide number placeholders to the master slide.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/simpress/01/03151100.xhp b/source/text/simpress/01/03151100.xhp
index ab56f786b..1d490cd0a 100644
--- a/source/text/simpress/01/03151100.xhp
+++ b/source/text/simpress/01/03151100.xhp
@@ -21,18 +21,18 @@
-->
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103151100xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Master Layout</title>
+<title id="tit" xml-lang="en-US">Master Slide Layout</title>
<filename>/text/simpress/01/03151100.xhp</filename>
</topic>
</meta>
<body>
<section id="master">
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/masterlayoutdlg/MasterLayoutDialog" id="bm_id8343456" localize="false"/>
-<paragraph role="heading" id="par_idN10537" xml-lang="en-US" level="1"><link href="text/simpress/01/03151100.xhp">Master Layout</link></paragraph>
-<paragraph role="paragraph" id="par_idN1053B" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/MasterLayoutDialog">Adds or removes header, footer, date, and slide number placeholders to the layout of the slide master.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10537" xml-lang="en-US" level="1"><link href="text/simpress/01/03151100.xhp">Master Slide Layout</link></paragraph>
+<paragraph role="paragraph" id="par_idN1053B" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/MasterLayoutDialog">Adds or removes header, footer, date, and slide number placeholders to the layout of the master slide.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/00000403.xhp#master"/>
@@ -40,13 +40,13 @@
<section id="placeholders">
<paragraph role="heading" id="par_idN1054A" xml-lang="en-US" level="2">Placeholders</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/masterlayoutdlg/header" id="bm_id8343455" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="3">Header</paragraph>
-<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/header">Adds a header placeholder to the slide master for notes.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/header">Adds a header placeholder to the master slide for notes.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/masterlayoutdlg/datetime" id="bm_id2532731" localize="false"/><paragraph role="heading" id="par_idN10571" xml-lang="en-US" level="3">Date/time</paragraph>
-<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/datetime">Adds a date/time placeholder to the slide master.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10575" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/datetime">Adds a date/time placeholder to the master slide.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/masterlayoutdlg/footer" id="bm_id3733634" localize="false"/><paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="3">Footer</paragraph>
-<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/footer">Adds a footer placeholder to the slide master.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/footer">Adds a footer placeholder to the master slide.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/simpress/ui/masterlayoutdlg/pagenumber" id="bm_id2174443" localize="false"/><paragraph role="heading" id="par_idN105A7" xml-lang="en-US" level="3">Slide number</paragraph>
-<paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/pagenumber">Adds a slide number placeholder to the slide master.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105AB" xml-lang="en-US"><ahelp hid="modules/simpress/ui/masterlayoutdlg/pagenumber">Adds a slide number placeholder to the master slide.</ahelp></paragraph>
</section>
</body>
</helpdocument>
diff --git a/source/text/simpress/01/03151200.xhp b/source/text/simpress/01/03151200.xhp
index 6cd384bf7..91c16232f 100644
--- a/source/text/simpress/01/03151200.xhp
+++ b/source/text/simpress/01/03151200.xhp
@@ -24,14 +24,14 @@
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103151200xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Notes Master Layout</title>
+<title id="tit" xml-lang="en-US">Master Notes Layout</title>
<filename>/text/simpress/01/03151200.xhp</filename>
</topic>
</meta>
<body>
<section id="notesmaster">
-<!-- removed HID SID_MASTER_LAYOUTS_NOTES --><paragraph role="heading" id="par_idN10527" xml-lang="en-US" level="1"><link href="text/simpress/01/03151200.xhp">Notes Master Layout</link></paragraph>
-<paragraph role="paragraph" id="par_idN1052B" xml-lang="en-US"><ahelp hid="SID_MASTER_LAYOUTS_NOTES">Add header, footer, date, and slide number to the notes master.</ahelp></paragraph>
+<!-- removed HID SID_MASTER_LAYOUTS_NOTES --><paragraph role="heading" id="par_idN10527" xml-lang="en-US" level="1"><link href="text/simpress/01/03151200.xhp">Master Notes Layout</link></paragraph>
+<paragraph role="paragraph" id="par_idN1052B" xml-lang="en-US"><ahelp hid="SID_MASTER_LAYOUTS_NOTES">Add header, footer, date, and slide number to the master notes.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/00000403.xhp#notesmaster"/>
diff --git a/source/text/simpress/01/04010000.xhp b/source/text/simpress/01/04010000.xhp
index d3d601019..4dac70cc5 100644
--- a/source/text/simpress/01/04010000.xhp
+++ b/source/text/simpress/01/04010000.xhp
@@ -40,9 +40,9 @@
<section id="howtoget">
<embed href="text/simpress/00/slide_menu.xhp#new_page_slide"/>
</section>
-<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_BACKGROUND --><paragraph role="paragraph" id="par_id3149207" xml-lang="en-US"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Applies the slide master background to the new slide.
-</caseinline><defaultinline>Applies the master page background to the new page.</defaultinline></switchinline></ahelp><comment>UFI: deleted some paras, changed avis to ahid tags, see #i60536</comment></paragraph>
-<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_OBJECTS --><paragraph role="paragraph" id="par_id3145584" xml-lang="en-US"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Includes objects on the slide master in the new slide.
-</caseinline><defaultinline>Includes objects on the master page in the new page.</defaultinline></switchinline></ahelp></paragraph>
+<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_BACKGROUND --><paragraph role="paragraph" id="par_id3149207" xml-lang="en-US"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Applies the master slide background to the new slide.
+</caseinline><defaultinline>Applies the master slide background to the new page.</defaultinline></switchinline></ahelp><comment>UFI: deleted some paras, changed avis to ahid tags, see #i60536</comment></paragraph>
+<!-- removed HID SD:CHECKBOX:DLG_NEW_FOIL:CBX_OBJECTS --><paragraph role="paragraph" id="par_id3145584" xml-lang="en-US"><ahelp hid="." visibility="hidden"><switchinline select="appl"><caseinline select="IMPRESS">Includes objects on the master slide in the new slide.
+</caseinline><defaultinline>Includes objects on the master slide in the new page.</defaultinline></switchinline></ahelp></paragraph>
</body>
</helpdocument>
diff --git a/source/text/simpress/01/05100000.xhp b/source/text/simpress/01/05100000.xhp
index 00a939dcc..05e0f8730 100644
--- a/source/text/simpress/01/05100000.xhp
+++ b/source/text/simpress/01/05100000.xhp
@@ -46,7 +46,7 @@
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#gestalter"/>
</section>
-<paragraph id="par_id3146121" role="paragraph" xml-lang="en-US">When you edit a style, the changes are automatically applied to all of the elements formatted with this style in your document. If you want to ensure that the styles on a specific slide are not updated, create a new <link href="text/simpress/guide/masterpage.xhp" name="master page">master page</link> for the slide.</paragraph>
+<paragraph id="par_id3146121" role="paragraph" xml-lang="en-US">When you edit a style, the changes are automatically applied to all of the elements formatted with this style in your document. If you want to ensure that the styles on a specific slide are not updated, create a new <link href="text/simpress/guide/masterpage.xhp" name="master slide">master slide</link> for the slide.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ListStyle" id="bm_id2536167" localize="false"/>
<paragraph id="hd_id3145251" role="heading" level="2" xml-lang="en-US">Presentation Styles</paragraph>
diff --git a/source/text/simpress/guide/footer.xhp b/source/text/simpress/guide/footer.xhp
index 11525dd43..c1c592952 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 <date/time> 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 35f9010ef..5f88358ac 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 a2c8dce6f..34c3ad39a 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 68a51abea..63027a46a 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>
More information about the Libreoffice-commits
mailing list