summaryrefslogtreecommitdiffstats
path: root/source/text/shared/00
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-16 08:37:42 -0300
committerOlivier Hallot <olivier.hallot@libreoffice.org>2019-11-19 00:34:27 +0100
commite20b575c56ebe912501e932192e509b6a227ce3c (patch)
treea53c95652b9ffd56913c16693bf8b500d118750f /source/text/shared/00
parentFix L10N of xapian templates (diff)
downloadhelp-e20b575c56ebe912501e932192e509b6a227ce3c.tar.gz
help-e20b575c56ebe912501e932192e509b6a227ce3c.zip
tdf#128227 disambiguate text frame and text box
in summary, on Writer, Text frame -> Frame On other modules Text Frame -> text box Change-Id: I3b218fafb03cd5ab79c8c0b902ec417bf5445ff8 Reviewed-on: https://gerrit.libreoffice.org/82976 Tested-by: Jenkins Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'source/text/shared/00')
-rw-r--r--source/text/shared/00/00000002.xhp6
-rw-r--r--source/text/shared/00/00000020.xhp4
2 files changed, 5 insertions, 5 deletions
diff --git a/source/text/shared/00/00000002.xhp b/source/text/shared/00/00000002.xhp
index b417867dce..5a9ce270f1 100644
--- a/source/text/shared/00/00000002.xhp
+++ b/source/text/shared/00/00000002.xhp
@@ -99,7 +99,7 @@
<paragraph id="hd_id3149290" role="heading" level="2" xml-lang="en-US">Hyperlink</paragraph>
<paragraph id="par_id3145420" role="paragraph" xml-lang="en-US">Hyperlinks are cross-references, highlighted in text in various colors and activated by mouse-click. With the aid of hyperlinks, readers can jump to specific information within a document as well as to related information in other documents.</paragraph>
-<paragraph id="par_id3156281" role="paragraph" xml-lang="en-US">In $[officename] you can assign hyperlinks to text as well as to graphics and text frames (see the Hyperlink Dialog icon on the Standard bar).</paragraph>
+<paragraph id="par_id3156281" role="paragraph" xml-lang="en-US">In $[officename] you can assign hyperlinks to text as well as to graphics and frames (see the Hyperlink Dialog icon on the Standard bar).</paragraph>
</section>
<section id="imagemap">
@@ -109,7 +109,7 @@
<paragraph id="hd_id3152805" role="heading" level="2" xml-lang="en-US">ImageMap</paragraph>
-<paragraph id="par_id3154685" role="paragraph" xml-lang="en-US">An ImageMap is a reference-sensitive graphic or text frame. You can click on defined areas of the graphic or text frame to go to a target (<link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>), which is linked with the area. The reference areas, along with the linked URLs and corresponding text displayed when resting the mouse pointer on these areas, are defined in the <link href="text/shared/01/02220000.xhp" name="ImageMap Editor">ImageMap Editor</link>.</paragraph>
+<paragraph id="par_id3154685" role="paragraph" xml-lang="en-US">An ImageMap is a reference-sensitive graphic or frame. You can click on defined areas of the graphic or frame to go to a target (<link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>), which is linked with the area. The reference areas, along with the linked URLs and corresponding text displayed when resting the mouse pointer on these areas, are defined in the <link href="text/shared/01/02220000.xhp" name="ImageMap Editor">ImageMap Editor</link>.</paragraph>
<paragraph id="par_id3153178" role="paragraph" xml-lang="en-US">There are two different types of ImageMaps. A Client Side ImageMap is evaluated on the client computer, which loaded the graphic from the Internet, while a Server Side ImageMap is evaluated on the server computer which provides the <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> page on the Internet. In server evaluation, clicking an ImageMap sends the relative coordinates of the cursor within the image to the server, and a dedicated program on the server responds. In the client evaluation, clicking a defined hotspot of the ImageMap activates the URL, as if it were a normal text link. The URL appears below the mouse pointer when passing across the ImageMap.</paragraph>
<paragraph id="par_id3150740" role="paragraph" xml-lang="en-US">As ImageMaps can be used in different ways, they can be stored in different formats.</paragraph>
@@ -144,7 +144,7 @@
<paragraph id="hd_id3152418" role="heading" level="2" xml-lang="en-US">Client Side ImageMap</paragraph>
<paragraph id="par_id3151290" role="paragraph" xml-lang="en-US">The area of the picture or frame where the reader can click is indicated by the appearance of the linked <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> when the mouse passes over the area. The ImageMap is stored in a layer below the picture and contains information about the referenced regions. The only disadvantage of Client Side ImageMaps is that older Web browsers cannot read them; a disadvantage that will, however, resolve itself in time.</paragraph>
-<paragraph id="par_id3149664" role="paragraph" xml-lang="en-US">When saving the ImageMap, select the file type <emph>SIP - StarView ImageMap</emph>. This saves the ImageMap directly in a format which can be applied to every active picture or frame in your document. However, if you just want to use the ImageMap on the current picture or text frame, you do not have to save it in any special format. After defining the regions, simply click <emph>Apply</emph>. Nothing more is necessary. Client Side ImageMaps saved in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> format are inserted directly into the page in HTML code.</paragraph>
+<paragraph id="par_id3149664" role="paragraph" xml-lang="en-US">When saving the ImageMap, select the file type <emph>SIP - StarView ImageMap</emph>. This saves the ImageMap directly in a format which can be applied to every active picture or frame in your document. However, if you just want to use the ImageMap on the current picture or frame, you do not have to save it in any special format. After defining the regions, simply click <emph>Apply</emph>. Nothing more is necessary. Client Side ImageMaps saved in <link href="text/shared/00/00000002.xhp#html" name="HTML">HTML</link> format are inserted directly into the page in HTML code.</paragraph>
</section>
<section id="java">
diff --git a/source/text/shared/00/00000020.xhp b/source/text/shared/00/00000020.xhp
index 1a57d70384..96f26b8a11 100644
--- a/source/text/shared/00/00000020.xhp
+++ b/source/text/shared/00/00000020.xhp
@@ -89,9 +89,9 @@
</list>
<paragraph role="paragraph" id="par_id3155135" xml-lang="en-US">If MS Internet Explorer or $[officename] Writer are set as the export option, the sizes of the control field and their internal margins are exported as styles (print formats). CSS1 size properties are based on "width" and "height" values. The "Margin" property is used to set equal margins on all sides of the page. To allow different margins, the "Margin-Left", "Margin-Right", "Margin-Top" and "Margin-Bottom" properties are used.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US">The distances of graphics and Plug-Ins to the content can be set individually for export to $[officename] Writer and MS Internet Explorer. If the top/bottom or right/left margin is set differently, the distances are exported in a "STYLE" option for the corresponding tag as CSS1 size properties "Margin-Top", "Margin-Bottom", "Margin-Left" and "Margin-Right".</paragraph>
-<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Mozilla Firefox, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
+<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US">Frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Mozilla Firefox, MS Internet Explorer, and $[officename] Writer. Frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US">Frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - General</emph> or <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
<table id="tbl_id3154346">
<tablerow>