source/text/shared/01/01020000.xhp | 2 +-
source/text/shared/3dsettings_toolbar.xhp | 20 +++++---------------
2 files changed, 6 insertions(+), 16 deletions(-)
New commits:
commit 575aa5ef741998bf6a739b856087023668291836
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Tue May 30 22:49:10 2017 +0200
tdf#107299 Fix reference to File - Templates menu item
Change-Id: Iae0120954fc7ac7a1748ece724eb4c6ddd3321b7
Reviewed-on: https://gerrit.libreoffice.org/38243
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit 78472fa975bce0b4bb26bce0cad6c15c910e8361)
Reviewed-on: https://gerrit.libreoffice.org/38272
diff --git a/source/text/shared/01/01020000.xhp
b/source/text/shared/01/01020000.xhp
index 68da088cf..abfdf1ae4 100644
--- a/source/text/shared/01/01020000.xhp
+++ b/source/text/shared/01/01020000.xhp
@@ -148,7 +148,7 @@
<paragraph id="par_id3146905" role="listitem" xml-lang="en-US">all
template folders as defined in <switchinline select="sys"><caseinline
select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
</caseinline><defaultinline><emph>Tools -
Options</emph></defaultinline></switchinline><emph> - </emph><link
href="text/shared/optionen/01010300.xhp" name="%PRODUCTNAME -
Paths"><emph>%PRODUCTNAME - Paths</emph></link></paragraph>
</listitem></list>
-<paragraph id="par_id7375713" role="note" xml-lang="en-US">When you use <item
type="menuitem">File - Template - Save</item> to save a template, the template
will be stored in your user template folder. When you open a document that is
based on such a template, the document will be checked for a changed template
as decribed below. The template is associated with the document, it may be
called a "sticky template".</paragraph>
+<paragraph id="par_id7375713" role="note" xml-lang="en-US">When you use <item
type="menuitem">File - Templates - Save as Template</item> to save a template,
the template will be stored in your user template folder. When you open a
document that is based on such a template, the document will be checked for a
changed template as decribed below. The template is associated with the
document, it may be called a "sticky template".</paragraph>
<paragraph id="par_id6930143" role="note" xml-lang="en-US">When you use <item
type="menuitem">File - Save As</item> and select a template filter to save a
template at any other folder that is not in the list, then the documents based
on that template will not be checked.</paragraph>
<paragraph id="par_id3150105" role="paragraph" xml-lang="en-US">When you open
a document that was created from a "sticky template" (as defined above), <item
type="productname">%PRODUCTNAME</item> checks to see if the template has been
modified since the document was last opened. If the template was changed a
dialog is shown where you can select which styles to apply to the
document.</paragraph>
<paragraph id="par_id3153096" role="paragraph" xml-lang="en-US">To apply the
new styles from the template to the document, click <emph>Update
Styles</emph>.</paragraph>
commit 43a999d9e06ec8552f4d258fdbaf7283759f5cbb
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Tue May 30 22:47:47 2017 +0200
Fix bookmarks and ahelps on 3D-Settings toolbar page
Remove duplicate bookmarks
Remove unnecessary ahelps
Change-Id: I986b3e8dfc5aa9c00c5414ab41845060ff43d709
Reviewed-on: https://gerrit.libreoffice.org/38242
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
(cherry picked from commit 5cb25526e443e7492414ec27254843826de194cd)
Reviewed-on: https://gerrit.libreoffice.org/38271
diff --git a/source/text/shared/3dsettings_toolbar.xhp
b/source/text/shared/3dsettings_toolbar.xhp
index 96970dc3e..3b12f7457 100644
--- a/source/text/shared/3dsettings_toolbar.xhp
+++ b/source/text/shared/3dsettings_toolbar.xhp
@@ -33,52 +33,42 @@
<paragraph xml-lang="en-US" id="par_idN1056A" role="paragraph"><ahelp
hid=".">The 3D-Settings toolbar controls properties of selected 3D
objects.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionToggle" id="bm_id9720450"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionToggle" id="bm_id7128513"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10575" role="heading"
level="2">Extrusion on/off</paragraph>
<paragraph xml-lang="en-US" id="par_idN10579" role="paragraph"><ahelp
hid=".">Switches the 3D effects on and off for the selected
objects.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltDown"
id="bm_id4860377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltDown"
id="bm_id9378337" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2">Tilt
Down</paragraph>
<paragraph xml-lang="en-US" id="par_idN10594" role="paragraph"><ahelp
hid=".">Tilts the selected object downwards by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltUp" id="bm_id1682790"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltUp" id="bm_id8217413"
localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105AB" role="heading" level="2">Tilt
Up</paragraph>
<paragraph xml-lang="en-US" id="par_idN105AF" role="paragraph"><ahelp
hid=".">Tilts the selected object upwards by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltLeft"
id="bm_id8390758" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltLeft"
id="bm_id3715628" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105C6" role="heading" level="2">Tilt
Left</paragraph>
<paragraph xml-lang="en-US" id="par_idN105CA" role="paragraph"><ahelp
hid=".">Tilts the selected object left by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltRight"
id="bm_id3985717" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionTiltRight"
id="bm_id5299844" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105E1" role="heading" level="2">Tilt
Right</paragraph>
<paragraph xml-lang="en-US" id="par_idN105E5" role="paragraph"><ahelp
hid=".">Tilts the selected object right by five degrees.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDepthFloater"
id="bm_id1778008" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDepthFloater"
id="bm_id408642" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN105FC" role="heading"
level="2">Depth</paragraph>
<paragraph xml-lang="en-US" id="par_idN10600" role="paragraph"><ahelp
hid=".">Opens the Extrusion Depth window.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph"><ahelp
hid=".">Select an extrusion depth.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10617" role="paragraph">Select an
extrusion depth.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/svx/ui/extrustiondepthdialog/ExtrustionDepthDialog"
id="bm_id5449079" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10632" role="paragraph"><ahelp
hid=".">Enter an extrusion depth.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDirectionFloater"
id="bm_id6154362" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionDirectionFloater"
id="bm_id3699453" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN1064C" role="heading"
level="2">Direction</paragraph>
<paragraph xml-lang="en-US" id="par_idN10650" role="paragraph"><ahelp
hid=".">Opens the Extrusion Direction window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_POPUP_LINEEND_CTRL"
id="bm_id3675649" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10667" role="paragraph"><ahelp
hid=".">Select a direction.</ahelp><comment>UFI: same ID for Direction and
Lighting direction</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph"><ahelp
hid=".">Select a perspective or parallel extrusion method.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10698" role="paragraph">Select a
perspective or parallel extrusion method.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionLightingFloater"
id="bm_id70192" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionLightingFloater"
id="bm_id7180394" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106B3" role="heading"
level="2">Lighting</paragraph>
<paragraph xml-lang="en-US" id="par_idN106B7" role="paragraph"><ahelp
hid=".">Opens the Extrusion Lighting window.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN106C6" role="paragraph"><ahelp
hid=".">Select a lighting direction.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN106E1" role="paragraph"><ahelp
hid=".">Select a lighting intensity.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106C6" role="paragraph">Select a
lighting direction.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E1" role="paragraph">Select a
lighting intensity.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionSurfaceFloater"
id="bm_id3682363" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:ExtrusionSurfaceFloater"
id="bm_id9263893" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN106FC" role="heading"
level="2">Surface</paragraph>
<paragraph xml-lang="en-US" id="par_idN10700" role="paragraph"><ahelp
hid=".">Opens the Extrusion Surface window.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10717" role="paragraph"><ahelp
hid=".">Select a surface material or a wireframe display.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10717" role="paragraph">Select a
surface material or a wireframe display.</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:Extrusion3DColor" id="bm_id144047"
localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Extrusion3DColor"
id="bm_id7303994" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10732" role="heading" level="2">3D
Color</paragraph>
<paragraph xml-lang="en-US" id="par_idN10736" role="paragraph"><ahelp
hid=".">Opens the Extrusion Color toolbar.</ahelp></paragraph>
</body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
