summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@libreoffice.org>2017-06-27 18:25:50 -0300
committerOlivier Hallot <olivier.hallot@edx.srv.br>2017-07-06 15:00:35 +0200
commit61c61f1181927a3dd78447cd36581682395ccf2d (patch)
treea13f3896c1d9bd84164755f79900f6eb2476c045
parent610919cb26ee24329ca3ba90d0b3074fcc1acef1 (diff)
Fixes for help pages after translation review.
Thanks to all translators for pinpointing these mistakes. Change-Id: I3746d3d81ded2af1e012cb38cdd20e9e529c2667 Reviewed-on: https://gerrit.libreoffice.org/39331 Reviewed-by: Olivier Hallot <olivier.hallot@edx.srv.br> Tested-by: Olivier Hallot <olivier.hallot@edx.srv.br>
-rw-r--r--source/text/sbasic/shared/00000002.xhp2
-rw-r--r--source/text/scalc/guide/autofilter.xhp4
-rw-r--r--source/text/schart/01/04050100.xhp115
-rw-r--r--source/text/shared/explorer/database/rep_prop.xhp115
-rw-r--r--source/text/shared/optionen/01010501.xhp146
-rw-r--r--source/text/swriter/guide/protection.xhp9
6 files changed, 186 insertions, 205 deletions
diff --git a/source/text/sbasic/shared/00000002.xhp b/source/text/sbasic/shared/00000002.xhp
index d54d6985f..ac0ceff37 100644
--- a/source/text/sbasic/shared/00000002.xhp
+++ b/source/text/sbasic/shared/00000002.xhp
@@ -59,7 +59,7 @@
<emph>protocol</emph>://<emph>host.name</emph>/<emph>path/to/the/file.html</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3168612" xml-lang="en-US">The most common usage of URLs is on the internet when specifying web pages. Example for protocols are <emph>http</emph>, <emph>ftp</emph>, or <emph>file</emph>. The <emph>file</emph> protocol specifier is used when referring to a file on the local file system.</paragraph>
-<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US">URL notation does not allow certain special characters to be used. These are either replaced by other characters or encoded. A slash (<emph>/</emph>) is used as a path separator. For example, a file referred to as <emph>C:\My File.odt</emph> on the local host in "Windows notation" becomes <emph>file:///C|/My%20File.odt</emph> in URL notation.</paragraph>
+<paragraph role="paragraph" id="par_id3150324" xml-lang="en-US">URL notation does not allow certain special characters to be used. These are either replaced by other characters or encoded. A slash (<emph>/</emph>) is used as a path separator. For example, a file referred to as <emph>C:\Users\alice\Documents\My File.odt</emph> on the local host in "Windows notation" becomes <emph>file:///C:/Users/alice/Documents/My%20File.odt</emph> in URL notation.</paragraph>
</section>
</sort>
</body>
diff --git a/source/text/scalc/guide/autofilter.xhp b/source/text/scalc/guide/autofilter.xhp
index 16daf9ee7..46b226634 100644
--- a/source/text/scalc/guide/autofilter.xhp
+++ b/source/text/scalc/guide/autofilter.xhp
@@ -52,7 +52,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id9216589" role="paragraph">When you apply an additional AutoFilter on another column of a filtered data range, then the other combo boxes list only the filtered data.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153714" role="paragraph">To display all records again, select the "all<emph>"</emph> entry in the AutoFilter combo box. If you choose "Standard<emph>"</emph>, the <item type="menuitem">Standard Filter</item> dialog appears, allowing you to set up a standard filter. Choose "Top 10" to display the highest 10 values only. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153714" role="paragraph">To display all records again, select the <emph>all</emph> entry in the AutoFilter combo box. If you choose "Standard<emph>"</emph>, the <item type="menuitem">Standard Filter</item> dialog appears, allowing you to set up a standard filter. Choose "Top 10" to display the highest 10 values only. </paragraph>
<paragraph xml-lang="en-US" id="par_id3147340" role="paragraph">To stop using AutoFilter, reselect all cells selected in step 1 and once again choose <emph>Data - Filter - AutoFilter</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id4303415" role="tip">To assign different AutoFilters to different sheets, you must first define a database range on each sheet.</paragraph>
<paragraph xml-lang="en-US" id="par_id3159236" role="warning">The arithmetic functions also take account of the cells that are not visible due to an applied filter. For example, a sum of an entire column will also total the values in the filtered cells. Apply the <link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link> function if only the cells visible after the application of a filter are to be taken into account.</paragraph>
@@ -65,4 +65,4 @@
<paragraph xml-lang="en-US" id="par_id3154484" role="paragraph"><link href="text/scalc/01/04060106.xhp" name="SUBTOTAL">SUBTOTAL</link></paragraph>
</section>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/source/text/schart/01/04050100.xhp b/source/text/schart/01/04050100.xhp
index af4327bb1..1b5302880 100644
--- a/source/text/schart/01/04050100.xhp
+++ b/source/text/schart/01/04050100.xhp
@@ -41,104 +41,68 @@
<paragraph id="par_id7272255" role="paragraph" xml-lang="en-US"> <variable id="trendlinestext"> <ahelp hid=".">Trend lines can be added to all 2D chart types except for Pie and Stock charts.</ahelp> </variable> </paragraph>
<section id="howtoget">
- <embed href="text/schart/00/00000004.xhp#trendlines"/>
-</section>
-
-<comment>Linear</comment>
+<embed href="text/schart/00/00000004.xhp#trendlines"/>
+</section><comment>Linear</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/linear" id="bm_id6944181" localize="false"/>
-<paragraph id="par_id5716727" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A linear trend line is shown.</ahelp></paragraph>
-
-<comment>Logarithmic</comment>
+<paragraph id="par_id5716727" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A linear trend line is shown.</ahelp></paragraph><comment>Logarithmic</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/logarithmic" id="bm_id886257" localize="false"/>
-<paragraph id="par_id5840021" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A logarithmic trend line is shown.</ahelp></paragraph>
-
-<comment>Exponential</comment>
+<paragraph id="par_id5840021" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A logarithmic trend line is shown.</ahelp></paragraph><comment>Exponential</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/exponential" id="bm_id8892483" localize="false"/>
-<paragraph id="par_id9417096" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">An exponential trend line is shown.</ahelp></paragraph>
-
-<comment>Power</comment>
+<paragraph id="par_id9417096" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">An exponential trend line is shown.</ahelp></paragraph><comment>Power</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/power" id="bm_id7198400" localize="false"/>
-<paragraph id="par_id8482924" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A power trend line is shown.</ahelp></paragraph>
-
-<comment>Polynomial</comment>
+<paragraph id="par_id8482924" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A power trend line is shown.</ahelp></paragraph><comment>Polynomial</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/polynomial" id="bm_id180820161047491735" localize="false"/>
-<paragraph id="par_id180820161052123210" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A polynomial trend line is shown with a given degree.</ahelp></paragraph>
-
-<comment>Degree</comment>
+<paragraph id="par_id180820161052123210" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A polynomial trend line is shown with a given degree.</ahelp></paragraph><comment>Degree</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label3" id="bm_id180820161152296070" localize="false"/>
-<paragraph id="par_id180820161102568315" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Degree of polynomial trend line.</ahelp></paragraph>
-
-<comment>Moving average</comment>
+<paragraph id="par_id180820161102568315" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Degree of polynomial trend line.</ahelp></paragraph><comment>Moving average</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/movingAverage" id="bm_id180820161104335824" localize="false"/>
-<paragraph id="par_id180820161105546053" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A moving average trend line is shown with a given period.</ahelp></paragraph>
-
-<comment>Period</comment>
+<paragraph id="par_id180820161105546053" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">A moving average trend line is shown with a given period.</ahelp></paragraph><comment>Period</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label4" id="bm_id180820161157368991" localize="false"/>
-<paragraph id="par_id180820161107537745" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Number of points to calculate average of moving average trend line.</ahelp></paragraph>
-
-<comment>Trend line name</comment>
+<paragraph id="par_id180820161107537745" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Number of points to calculate average of moving average trend line.</ahelp></paragraph><comment>Trend line name</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label5" id="bm_id180820161429301956" localize="false"/>
-<paragraph id="par_id180820161112599880" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Name of trend line in legend.</ahelp></paragraph>
-
-<comment>Extrapolate forward</comment>
+<paragraph id="par_id180820161112599880" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Name of trend line in legend.</ahelp></paragraph><comment>Extrapolate forward</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label7" id="bm_id180820161430141657" localize="false"/>
-<paragraph id="par_id180820161117252261" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Trend line is extrapolated for higher x-values.</ahelp></paragraph>
-
-<comment>Extrapolate backward</comment>
+<paragraph id="par_id180820161117252261" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Trend line is extrapolated for higher x-values.</ahelp></paragraph><comment>Extrapolate backward</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label8" id="bm_id180820161504266451" localize="false"/>
-<paragraph id="par_id18082016111837138" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Trend line is extrapolated for lower x-values.</ahelp></paragraph>
-
-<comment>Force intercept</comment>
+<paragraph id="par_id18082016111837138" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Trend line is extrapolated for lower x-values.</ahelp></paragraph><comment>Force intercept</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/setIntercept" id="bm_id180820161122038174" localize="false"/>
-<paragraph id="par_id180820161124272765" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">For linear, polynomial and exponential trend lines, intercept value is forced to a given value.</ahelp></paragraph>
-
-<comment>Intervept value</comment>
+<paragraph id="par_id180820161124272765" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">For linear, polynomial and exponential trend lines, intercept value is forced to a given value.</ahelp></paragraph><comment>Intervept value</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/interceptValue" id="bm_id180820161125169514" localize="false"/>
-<paragraph id="par_id180820161126064822" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Value of intercept if it is forced.</ahelp></paragraph>
-
-<comment>Show equation</comment>
+<paragraph id="par_id180820161126064822" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Value of intercept if it is forced.</ahelp></paragraph><comment>Show equation</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/showEquation" id="bm_id4724875" localize="false"/>
-<paragraph id="par_id8962370" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Shows the trend line equation next to the trend line.</ahelp></paragraph>
-
-<comment>Show correlation coefficient (R2)</comment>
+<paragraph id="par_id8962370" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Shows the trend line equation next to the trend line.</ahelp></paragraph><comment>Show correlation coefficient (R2)</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/showCorrelationCoefficient" id="bm_id9068880" localize="false"/>
-<paragraph id="par_id6889858" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Shows the coefficient of determination next to the trend line.</ahelp></paragraph>
-
-<comment>X name</comment>
+<paragraph id="par_id6889858" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Shows the coefficient of determination next to the trend line.</ahelp></paragraph><comment>X name</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label6" id="bm_id180820161515523577" localize="false"/>
-<paragraph id="par_id180820161133305870" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Name of X variable in trend line equation.</ahelp></paragraph>
-
-<comment>Y name</comment>
+<paragraph id="par_id180820161133305870" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Name of X variable in trend line equation.</ahelp></paragraph><comment>Y name</comment>
<bookmark xml-lang="en-US" branch="hid/modules/schart/ui/tp_Trendline/label9" id="bm_id180820161516105398" localize="false"/>
<paragraph id="par_id180820161134155865" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Name of Y variable in trend line equation.</ahelp></paragraph>
-
<paragraph id="par_id8398998" role="note" xml-lang="en-US">If you insert a trend line to a chart type that uses categories, like <emph>Line</emph> or <emph>Column</emph>, then the numbers 1, 2, 3, <emph>…</emph> are used as x-values to calculate the trend line. For such charts the XY chart type might be more suitable.</paragraph>
<list type="unordered">
<listitem>
<paragraph id="par_id4349192" role="paragraph" xml-lang="en-US">To insert a trend line for a data series, select the data series in the chart. Choose <item type="menuitem">Insert - Trend Line</item>, or right-click to open the context menu, and choose <item type="menuitem">Insert Trend Line</item>.</paragraph>
</listitem>
- <listitem><bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuMeanValues" id="bm_id7854243" localize="false"/>
+ <listitem>
+<bookmark xml-lang="en-US" branch="hid/.uno:InsertMenuMeanValues" id="bm_id7854243" localize="false"/>
<paragraph id="par_id180820161539033867" role="paragraph" xml-lang="en-US">Mean Value Lines are special trend lines that show the mean value. Use <item type="menuitem">Insert - Mean Value Lines</item> to insert mean value lines for data series.</paragraph>
<embed href="text/schart/01/04030000.xhp#context"/>
</listitem>
<listitem>
<paragraph id="par_id9337443" role="paragraph" xml-lang="en-US">To delete a trend line or mean value line, click the line, then press the Del key.</paragraph>
- </listitem>
-</list>
+ </listitem></list>
<paragraph id="par_id296334" role="note" xml-lang="en-US">A trend line is shown in the legend automatically. Its name can be defined in options of the trend line.</paragraph>
<paragraph id="par_id9569689" role="paragraph" xml-lang="en-US">The trend line has the same color as the corresponding data series. To change the line properties, select the trend line and choose <item type="menuitem">Format - Format Selection - Line</item>.</paragraph>
-
<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquationAndR2" id="bm_id2754601" localize="false"/>
+
<paragraph id="hd_id180820161534333508" role="heading" level="2" xml-lang="en-US">Trend Line Equation and Coefficient of Determination</paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertTrendlineEquation" id="bm_id2754600" localize="false"/>
<paragraph id="par_id8962065" role="paragraph" xml-lang="en-US">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the coefficient of determination R<sup>2</sup>, even if they are not shown: click on the trend line to see the information in the status bar.</paragraph>
<paragraph id="par_id846888" role="paragraph" xml-lang="en-US"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <item type="menuitem">Insert Trend Line Equation</item>.</ahelp></paragraph>
<paragraph id="par_id8962066" role="paragraph" xml-lang="en-US">To change format of values (use less significant digits or scientific notation), select the equation in the chart, right-click to open the context menu, and choose <item type="menuitem">Format Trend Line Equation - Numbers</item>.</paragraph>
<paragraph id="par_id180820161627109994" role="paragraph" xml-lang="en-US">Default equation uses <item type="literal">x</item> for abscissa variable, and <item type="literal">f(x)</item> for ordinate variable. To change these names, select the trend line, choose <item type="menuitem">Format - Format Selection – Type</item> and enter names in <item type="literal">X Variable Name</item> and <item type="literal">Y Variable Name</item> edit boxes.</paragraph>
-
<bookmark xml-lang="en-US" branch="hid/.uno:InsertR2Value" id="bm_id2754602" localize="false"/>
-<paragraph id="par_id18082016163702791" role="paragraph" xml-lang="en-US">To show the coefficient of determination R<sup>2</sup>, select the equation in the chart, right-click to open the context menu, and choose <item type="menuitem">Insert R<sup>2</sup></item>.</paragraph>
+<paragraph id="par_id18082016163702791" role="paragraph" xml-lang="en-US">To show the coefficient of determination R<sup>2</sup>, select the equation in the chart, right-click to open the context menu, and choose <item type="menuitem">Insert R</item><item type="menuitem">2</item>.</paragraph>
<paragraph id="par_id180820161637028632" role="note" xml-lang="en-US">If intercept is forced, coefficient of determination R<sup>2</sup> is not calculated in the same way as with free intercept. R<sup>2</sup> values can not be compared with forced or free intercept.</paragraph>
<paragraph id="hd_id180820161534333509" role="heading" level="2" xml-lang="en-US">Trend Lines Curve Types</paragraph>
@@ -149,16 +113,16 @@
<paragraph id="par_id180820161604098009" role="paragraph" xml-lang="en-US"><emph>Linear</emph> trend line: regression through equation <item type="literal">y=a∙x+b</item>. Intercept <item type="literal">b</item> can be forced.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id180820161612524298" role="paragraph" xml-lang="en-US"><emph>Polynomial</emph> trend line: regression through equation <item type="literal">y=&#931;(a<sub>i</sub>∙x<sup>i</sup>)</item>. Intercept <item type="literal">a<sub>0</sub></item> can be forced. Degree of polynomial must be given (at least 2).</paragraph>
+ <paragraph id="par_id180820161612524298" role="paragraph" xml-lang="en-US"><emph>Polynomial</emph> trend line: regression through equation <item type="literal">y=Σ(a</item><item type="literal">i</item><item type="literal">∙x</item><item type="literal">i</item><item type="literal">)</item>. Intercept <item type="literal">a</item><item type="literal">0</item> can be forced. Degree of polynomial must be given (at least 2).</paragraph>
</listitem>
<listitem>
<paragraph id="par_id180820161612525364" role="paragraph" xml-lang="en-US"><emph>Logarithmic</emph> trend line: regression through equation <item type="literal">y=a∙ln(x)+b</item>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id180820161612526680" role="paragraph" xml-lang="en-US"><emph>Exponential</emph> trend line: regression through equation <item type="literal">y=b∙exp(a∙x)</item>.This equation is equivalent to <item type="literal">y=b∙m<sup>x</sup></item> with <item type="literal">m=exp(a)</item>. Intercept <item type="literal">b</item> can be forced.</paragraph>
+ <paragraph id="par_id180820161612526680" role="paragraph" xml-lang="en-US"><emph>Exponential</emph> trend line: regression through equation <item type="literal">y=b∙exp(a∙x)</item>.This equation is equivalent to <item type="literal">y=b∙m</item><item type="literal">x</item> with <item type="literal">m=exp(a)</item>. Intercept <item type="literal">b</item> can be forced.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id180820161612527230" role="paragraph" xml-lang="en-US"><emph>Power</emph> trend line: regression through equation <item type="literal">y=b∙x<sup>a</sup></item>.</paragraph>
+ <paragraph id="par_id180820161612527230" role="paragraph" xml-lang="en-US"><emph>Power</emph> trend line: regression through equation <item type="literal">y=b∙x</item><item type="literal">a</item>.</paragraph>
</listitem>
<listitem>
<paragraph id="par_id180820161617342768" role="paragraph" xml-lang="en-US"><emph>Moving average</emph> trend line: simple moving average is calculated with the <emph>n</emph> previous y-values, <emph>n</emph> being the period. No equation is available for this trend line.</paragraph>
@@ -175,9 +139,8 @@
<paragraph id="par_id1664479" role="paragraph" xml-lang="en-US">Exponential trend line: only positive y-values are considered, except if all y-values are negative: regression will then follow equation <item type="literal">y=-b∙exp(a∙x)</item>.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id8734702" role="paragraph" xml-lang="en-US">Power trend line: only positive x-values are considered; only positive y-values are considered, except if all y-values are negative: regression will then follow equation<item type="literal"> y=-b∙x<sup>a</sup></item>.</paragraph>
- </listitem>
-</list>
+ <paragraph id="par_id8734702" role="paragraph" xml-lang="en-US">Power trend line: only positive x-values are considered; only positive y-values are considered, except if all y-values are negative: regression will then follow equation<item type="literal"> y=-b∙x</item><item type="literal">a</item>.</paragraph>
+ </listitem></list>
<paragraph id="par_id181279" role="paragraph" xml-lang="en-US">You should transform your data accordingly; it is best to work on a copy of the original data and transform the copied data.</paragraph>
<paragraph id="hd_id180820161528021520" role="heading" level="2" xml-lang="en-US">Calculate Parameters in Calc</paragraph>
@@ -199,14 +162,14 @@
<paragraph id="hd_id7874080" role="heading" level="3" xml-lang="en-US">The exponential regression equation</paragraph>
<paragraph id="par_id4679097" role="paragraph" xml-lang="en-US"> For exponential trend lines a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly.</paragraph>
-<paragraph id="par_id9112216" role="paragraph" xml-lang="en-US">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
+<paragraph id="par_id9112216" role="paragraph" xml-lang="en-US">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m</item><sup>x</sup>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
<paragraph id="par_id4416638" role="code" xml-lang="en-US">a = SLOPE(LN(Data_Y);Data_X) </paragraph>
<paragraph id="par_id1039155" role="paragraph" xml-lang="en-US">The variables for the second variation are calculated as follows:</paragraph>
<paragraph id="par_id7184057" role="code" xml-lang="en-US">m = EXP(SLOPE(LN(Data_Y);Data_X)) </paragraph>
<paragraph id="par_id786767" role="code" xml-lang="en-US">b = EXP(INTERCEPT(LN(Data_Y);Data_X)) </paragraph>
<paragraph id="par_id7127292" role="paragraph" xml-lang="en-US">Calculate the coefficient of determination by</paragraph>
<paragraph id="par_id5437177" role="code" xml-lang="en-US">r<sup>2</sup> = RSQ(LN(Data_Y);Data_X) </paragraph>
-<paragraph id="par_id6946317" role="paragraph" xml-lang="en-US">Besides m, b and r<sup>2</sup> the array function LOGEST provides additional statistics for a regression analysis.</paragraph>
+<paragraph id="par_id6946317" role="paragraph" xml-lang="en-US">Besides m, b and r<sup>2</sup> the array function <emph>LOGEST</emph> provides additional statistics for a regression analysis.</paragraph>
<paragraph id="hd_id6349375" role="heading" level="3" xml-lang="en-US">The power regression equation</paragraph>
<paragraph id="par_id1857661" role="paragraph" xml-lang="en-US"> For <emph>power regression</emph> curves a transformation to a linear model takes place. The power regression follows the equation <item type="literal">y=b*x^a</item> , which is transformed to <item type="literal">ln(y)=ln(b)+a*ln(x)</item>.</paragraph>
@@ -218,17 +181,17 @@
<paragraph id="par_id8918729" role="paragraph" xml-lang="en-US">For <emph>polynomial regression</emph> curves a transformation to a linear model takes place.</paragraph>
<paragraph id="par_id33875" role="paragraph" xml-lang="en-US">Create a table with the columns x, x<sup>2</sup>, x<sup>3</sup>, … , x<sup>n</sup>, y up to the desired degree n. </paragraph>
<paragraph id="par_id8720053" role="paragraph" xml-lang="en-US">Use the formula <item type="literal">=LINEST(Data_Y,Data_X)</item> with the complete range x to x<sup>n</sup> (without headings) as Data_X. </paragraph>
-<paragraph id="par_id5068514" role="paragraph" xml-lang="en-US">The first row of the LINEST output contains the coefficients of the regression polynomial, with the coefficient of xⁿ at the leftmost position.</paragraph>
-<paragraph id="par_id8202154" role="paragraph" xml-lang="en-US">The first element of the third row of the LINEST output is the value of r<sup>2</sup>. See the <link href="text/scalc/01/04060107.xhp#Section8">LINEST</link> function for details on proper use and an explanation of the other output parameters.</paragraph>
+<paragraph id="par_id5068514" role="paragraph" xml-lang="en-US">The first row of the <emph>LINEST</emph> output contains the coefficients of the regression polynomial, with the coefficient of xⁿ at the leftmost position.</paragraph>
+<paragraph id="par_id8202154" role="paragraph" xml-lang="en-US">The first element of the third row of the <emph>LINEST</emph> output is the value of r<sup>2</sup>. See the <link href="text/scalc/01/04060107.xhp#Section8"><emph>LINEST</emph></link> function for details on proper use and an explanation of the other output parameters.</paragraph>
<section id="relatedtopics">
- <paragraph id="par_id4562211" role="paragraph" xml-lang="en-US"><link href="text/schart/01/04050000.xhp">X/Y Error Bars</link></paragraph>
- <paragraph id="par_id4562212" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp#Section8">LINEST</link> function</paragraph>
- <paragraph id="par_id4562216" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp#Section7">LOGEST</link> function</paragraph>
- <paragraph id="par_id4562213" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060185.xhp#slope">SLOPE</link> function</paragraph>
- <paragraph id="par_id4562214" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060181.xhp#intercept">INTERCEPT</link> function</paragraph>
- <paragraph id="par_id4562215" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060181.xhp#rsq">RSQ</link> function</paragraph>
+<paragraph id="par_id4562211" role="paragraph" xml-lang="en-US"><link href="text/schart/01/04050000.xhp">X/Y Error Bars</link></paragraph>
+<paragraph id="par_id4562212" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp#Section8">LINEST</link> function</paragraph>
+<paragraph id="par_id4562216" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060107.xhp#Section7">LOGEST</link> function</paragraph>
+<paragraph id="par_id4562213" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060185.xhp#slope">SLOPE</link> function</paragraph>
+<paragraph id="par_id4562214" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060181.xhp#intercept">INTERCEPT</link> function</paragraph>
+<paragraph id="par_id4562215" role="paragraph" xml-lang="en-US"><link href="text/scalc/01/04060181.xhp#rsq">RSQ</link> function</paragraph>
</section>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file
diff --git a/source/text/shared/explorer/database/rep_prop.xhp b/source/text/shared/explorer/database/rep_prop.xhp
index ff4cad652..041a09eaf 100644
--- a/source/text/shared/explorer/database/rep_prop.xhp
+++ b/source/text/shared/explorer/database/rep_prop.xhp
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -18,52 +16,75 @@
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
+-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedexplorerdatabaserep_propxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Properties </title>
-<filename>/text/shared/explorer/database/rep_prop.xhp</filename>
-</topic>
+ <topic id="textsharedexplorerdatabaserep_propxml" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Properties </title>
+ <filename>/text/shared/explorer/database/rep_prop.xhp</filename>
+ </topic>
</meta>
+
<body>
-<paragraph role="heading" id="hd_id8836939" xml-lang="en-US" level="1"><variable id="rep_prop"><link href="text/shared/explorer/database/rep_prop.xhp">Properties</link>
-</variable></paragraph>
-<paragraph role="paragraph" id="par_id2711264" xml-lang="en-US">The Properties window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
-<paragraph role="tip" id="par_id1080660" xml-lang="en-US">Press <item type="keycode">Shift-F1</item> and point with the mouse at an input box to see a help text for this input box.</paragraph>
-<paragraph role="paragraph" id="par_id7175817" xml-lang="en-US">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
-<paragraph role="paragraph" id="par_id9895931" xml-lang="en-US">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/><paragraph role="paragraph" id="par_id3587145" xml-lang="en-US"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6993926" xml-lang="en-US">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/><paragraph role="tip" id="par_id3729361" xml-lang="en-US"><ahelp hid=".">To display the Data or General tab page for the whole report, choose Edit - Select Report.</ahelp></paragraph><comment>Group keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/><paragraph role="paragraph" id="par_id1768852" xml-lang="en-US"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/><paragraph role="paragraph" id="par_id6304818" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/><paragraph role="paragraph" id="par_id401623" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/><paragraph role="paragraph" id="par_id2162236" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id7022003" xml-lang="en-US">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
-<paragraph role="paragraph" id="par_id7004303" xml-lang="en-US">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/><paragraph role="paragraph" id="par_id2561723" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/><paragraph role="paragraph" id="par_id1064485" xml-lang="en-US"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/><paragraph role="paragraph" id="par_id2356028" xml-lang="en-US"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/><paragraph role="paragraph" id="par_id1404461" xml-lang="en-US"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" Conditions use the following form:</comment><comment>Background transparent</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/><paragraph role="paragraph" id="par_id7404705" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
-<paragraph role="paragraph" id="par_id7466963" xml-lang="en-US">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
-<paragraph role="paragraph" id="par_id3644215" xml-lang="en-US">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/><paragraph role="paragraph" id="par_id3148899" xml-lang="en-US"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/><paragraph role="paragraph" id="par_id6164433" xml-lang="en-US"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/><paragraph role="paragraph" id="par_id7405011" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1536606" xml-lang="en-US">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
-<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US">For a Label field, you can change the displayed text in the Label input box.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/><paragraph role="paragraph" id="par_id7749565" xml-lang="en-US"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/><paragraph role="paragraph" id="par_id4041871" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/><paragraph role="paragraph" id="par_id9930722" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/><paragraph role="paragraph" id="par_id5749687" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/><paragraph role="paragraph" id="par_id79348" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/><paragraph role="paragraph" id="par_id2414014" xml-lang="en-US"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
-<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/><paragraph role="paragraph" id="par_id7617114" xml-lang="en-US"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id1593676" xml-lang="en-US">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/><paragraph role="paragraph" id="par_id1243629" xml-lang="en-US"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
+
+
+<paragraph id="hd_id8836939" role="heading" level="1" xml-lang="en-US"><variable id="rep_prop"><link href="text/shared/explorer/database/rep_prop.xhp">Properties</link> </variable></paragraph>
+<paragraph id="par_id2711264" role="paragraph" xml-lang="en-US">The Properties window of the <link href="text/shared/explorer/database/rep_main.xhp">Report Builder</link> always shows the properties of the currently selected object in the Report Builder view.</paragraph>
+<paragraph id="par_id1080660" role="tip" xml-lang="en-US">Press Shift-F1 and point with the mouse at an input box to see a help text for this input box.</paragraph>
+<paragraph id="par_id7175817" role="paragraph" xml-lang="en-US">On first start of the Report Builder, the Properties window shows the <emph>Data</emph> tab page for the whole report.</paragraph>
+<paragraph id="par_id9895931" role="paragraph" xml-lang="en-US">Select a table from the Contents list, then press Tab or click outside the input box to leave the input box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_FIELD_SEL" id="bm_id5135044" localize="false"/>
+<paragraph id="par_id3587145" role="paragraph" xml-lang="en-US"><ahelp hid=".">The Add Field window is shown automatically when you have selected a table in the Contents box and leave that box. You can also click the Add Field icon on the toolbar, or choose <item type="menuitem">View - Add Field</item>.</ahelp></paragraph>
+<paragraph id="par_id6993926" role="paragraph" xml-lang="en-US">The <emph>General</emph> tab page can be used to change the name of the report, and to disable the Page Header or Page Footer areas, among others.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:SelectReport" id="bm_id9044770" localize="false"/>
+<paragraph id="par_id3729361" role="tip" xml-lang="en-US"><ahelp hid=".">To display the <emph>Data</emph> or <emph>General</emph> tab page for the whole report, choose <item type="menuitem">Edit - Select All - Select Report</item>.</ahelp></paragraph><comment>Group keep together</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" id="bm_id5392315" localize="false"/>
+<paragraph id="par_id1768852" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Groups are kept together by page or by column (default). You must enable Keep Together also.</ahelp></paragraph><comment>Page header</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" id="bm_id7852412" localize="false"/>
+<paragraph id="par_id6304818" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page header will be printed: on all pages, or not on pages with a report header or footer.</ahelp></paragraph><comment>Page footer</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" id="bm_id9031952" localize="false"/>
+<paragraph id="par_id401623" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies in which context the page footer will be printed: on all pages, or not on pages with a report header or footer</ahelp></paragraph><comment>Print repeated values</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" id="bm_id7956785" localize="false"/>
+<paragraph id="par_id2162236" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies to print repeated values.</ahelp></paragraph>
+<paragraph id="par_id7022003" role="paragraph" xml-lang="en-US">If you click the Page Header or Page Footer area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
+<paragraph id="par_id7004303" role="paragraph" xml-lang="en-US">You can edit some visual properties for the area.<comment>screen only or also in report?</comment></paragraph><comment>Background color</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" id="bm_id9801324" localize="false"/>
+<paragraph id="par_id2561723" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the background color for the selected object, both on screen and for printing.</ahelp></paragraph><comment>Visible</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_VISIBLE" id="bm_id7446516" localize="false"/>
+<paragraph id="par_id1064485" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">An invisible object is not shown in the executed report. It is still visible in the Report Builder view.</ahelp></paragraph><comment>Height</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" id="bm_id8859828" localize="false"/>
+<paragraph id="par_id2356028" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Defines the height of the selected object.</ahelp></paragraph><comment>Conditional Print Expression</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" id="bm_id4359874" localize="false"/>
+<paragraph id="par_id1404461" role="paragraph" xml-lang="en-US"><ahelp hid=".">If the Conditional Print Expression evaluates to TRUE, the selected object will be printed.</ahelp></paragraph><comment>id="par_id2386852" Conditions use the following form:</comment><comment>Background transparent</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" id="bm_id5689565" localize="false"/>
+<paragraph id="par_id7404705" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Specifies whether the background of the selected object is transparent or opaque.</ahelp><comment>just guessing</comment></paragraph>
+<paragraph id="par_id7466963" role="paragraph" xml-lang="en-US">If you click the <emph>Detail</emph> area without selecting any object, you see the <emph>General</emph> tab page for that area.</paragraph>
+<paragraph id="par_id3644215" role="paragraph" xml-lang="en-US">You can specify some properties to fine-tune the way the records are printed.</paragraph><comment>Force New Page</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" id="bm_id66225" localize="false"/>
+<paragraph id="par_id3148899" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Force New Page specifies whether the current section and/or the next section is printed on a new page.</ahelp></paragraph><comment>New Row Or Column</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" id="bm_id3920102" localize="false"/>
+<paragraph id="par_id6164433" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">New Row Or Column specifies, for a multi-column design, whether the current section and/or the next section will be printed on a new row or column.</ahelp></paragraph><comment>Keep together</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" id="bm_id8053529" localize="false"/>
+<paragraph id="par_id7405011" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Keep Together specifies to print the current object starting on top of a new page if it doesn't fit on the current page.</ahelp></paragraph>
+<paragraph id="par_id1536606" role="paragraph" xml-lang="en-US">Insert some data fields into the Detail area, or insert other control fields into any area. When you select an inserted field, you can set the properties in the Properties window.</paragraph>
+<paragraph id="par_id9631641" role="paragraph" xml-lang="en-US">For a Label field, you can change the displayed text in the Label input box.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" id="bm_id7422711" localize="false"/>
+<paragraph id="par_id7749565" role="paragraph" xml-lang="en-US"><ahelp hid=".">For a picture, you can specify to either insert the picture as a link to a file or only as an embedded object in the Base file. The embedded option increases the size of the Base file, while the link option is not as portable to other computers.</ahelp></paragraph><comment>Position x</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" id="bm_id6006958" localize="false"/>
+<paragraph id="par_id4041871" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the X Position for the selected object</ahelp><comment>x in pixel or twips? or current measurement units? from origin as on ruler? from elsewhere?</comment></paragraph><comment>Position y</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" id="bm_id7606128" localize="false"/>
+<paragraph id="par_id9930722" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Set the Y Position for the selected object</ahelp></paragraph><comment>Width</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" id="bm_id5778374" localize="false"/>
+<paragraph id="par_id5749687" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Sets the width of the selected object.</ahelp></paragraph><comment>Font</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_RPT_FONT" id="bm_id3184301" localize="false"/>
+<paragraph id="par_id79348" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select the font for the selected text object.</ahelp></paragraph><comment>Print when group change</comment>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" id="bm_id2129276" localize="false"/>
+<paragraph id="par_id2414014" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Print when group change</ahelp></paragraph><comment>Vert. Alignment</comment>
+<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_VERTICAL_ALIGN" id="bm_id9719229" localize="false"/>
+<paragraph id="par_id7617114" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Vert. Alignment</ahelp></paragraph>
+<paragraph id="par_id1593676" role="paragraph" xml-lang="en-US">On the <emph>General</emph> tab page of a data field, you can set the Formatting properties, among others.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/REPORTDESIGN_HID_RPT_PROP_DATAFIELD" id="bm_id3860896" localize="false"/>
+<paragraph id="par_id1243629" role="paragraph" xml-lang="en-US"><ahelp hid=".">On the Data tab page, you can change the data contents to be shown.</ahelp></paragraph>
</body>
-</helpdocument>
+
+</helpdocument> \ No newline at end of file
diff --git a/source/text/shared/optionen/01010501.xhp b/source/text/shared/optionen/01010501.xhp
index 4b018ecc9..bdaeee03e 100644
--- a/source/text/shared/optionen/01010501.xhp
+++ b/source/text/shared/optionen/01010501.xhp
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
<!--
* This file is part of the LibreOffice project.
*
@@ -17,117 +16,114 @@
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<helpdocument version="1.0">
+-->
+
<meta>
-<topic id="textsharedoptionen01010501xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Selecting a new color</title>
-<filename>/text/shared/optionen/01010501.xhp</filename>
-</topic>
+ <topic id="textsharedoptionen01010501xml" indexer="include" status="PUBLISH">
+ <title id="tit" xml-lang="en-US">Selecting a new color</title>
+ <filename>/text/shared/optionen/01010501.xhp</filename>
+ </topic>
</meta>
+
<body>
-<paragraph role="heading" id="hd_id3153126" xml-lang="en-US" level="1">Selecting a new color</paragraph>
+
+
+<paragraph id="hd_id3153126" role="heading" level="1" xml-lang="en-US">Selecting a new color</paragraph>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150771">
-<bookmark_value>defining;colors</bookmark_value>
-<bookmark_value>colors;selection</bookmark_value>
-<bookmark_value>colors;adding</bookmark_value>
+ <bookmark_value>defining;colors</bookmark_value>
+ <bookmark_value>colors;selection</bookmark_value>
+ <bookmark_value>colors;adding</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/ColorPicker" id="bm_id3151211" localize="false"/>
-<paragraph role="paragraph" id="par_id3150771" xml-lang="en-US"><variable id="farbentext"><ahelp hid=".">%PRODUCTNAME lets you define custom colors using a two-dimensional graphic and numerical gradient chart of the Pick a Color dialog.</ahelp></variable> Click <emph>OK</emph> to display the newly defined color in the <emph>New</emph> preview box of the <emph>Colors</emph> tab, where you can then decide if you want to add or replace the new color in the current color palette.</paragraph>
+<paragraph id="par_id3150771" role="paragraph" xml-lang="en-US"><variable id="farbentext"><ahelp hid=".">%PRODUCTNAME lets you define custom colors using a two-dimensional graphic and numerical gradient chart of the Pick a Color dialog.</ahelp></variable> Click <emph>OK</emph> to display the newly defined color in the <emph>New</emph> preview box of the <emph>Colors</emph> tab, where you can then decide if you want to add or replace the new color in the current color palette.</paragraph>
+
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#color2"/>
+<embed href="text/shared/00/00000406.xhp#color2"/>
</section>
-<paragraph role="heading" id="hd_id3149514" xml-lang="en-US" level="2">The Pick a Color Window</paragraph>
-<paragraph id="par_id61884" role="paragraph" xml-lang="en-US"><image id="img_id5337" src="media/screenshots/cui/ui/colorpickerdialog/ColorPicker.png"><caption xml-lang="en-US" id="alt_id34144">Pick a Color window</caption></image></paragraph>
-
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US">The Pick a Color Dialog window consist of four main areas.</paragraph>
+<paragraph id="hd_id3149514" role="heading" level="2" xml-lang="en-US">The Pick a Color Window</paragraph>
+<paragraph id="par_id61884" role="paragraph" xml-lang="en-US"><image id="img_id5337" src="media/screenshots/cui/ui/colorpickerdialog/ColorPicker.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5337">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+<caption xml-lang="en-US" id="alt_id34144">Pick a Color window</caption></image></paragraph>
+<paragraph id="par_id3148944" role="paragraph" xml-lang="en-US">The Pick a Color Dialog window consist of four main areas.</paragraph>
<list type="unordered">
-<listitem>
-<paragraph role="paragraph" id="par_id3148945" xml-lang="en-US">The radio buttons select the color component of the color. This color component can be expressed in either RGB (Red, Green, Blue) or HSB (Hue, Saturation, Brightness) color models. The CMYK color model is not selectable and is provided only to ease the input of color values using CMYK notation.
-</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148946" xml-lang="en-US">The spin buttons are for entering the numerical value of the color component.</paragraph>
-</listitem>
-<listitem>
+ <listitem>
+ <paragraph id="par_id3148945" role="paragraph" xml-lang="en-US">The radio buttons select the color component of the color. This color component can be expressed in either RGB (Red, Green, Blue) or HSB (Hue, Saturation, Brightness) color models. The CMYK color model is not selectable and is provided only to ease the input of color values using CMYK notation. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id3148946" role="paragraph" xml-lang="en-US">The spin buttons are for entering the numerical value of the color component.</paragraph>
+ </listitem>
+ <listitem>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/colorSlider" id="bm_id3153572" localize="false"/>
-<paragraph role="paragraph" id="par_id3148947" xml-lang="en-US"><ahelp hid=".">With the vertical color component slider you can modify the value of each component of the color.</ahelp> With the large colored square you can select the color component approximatively.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3148948" xml-lang="en-US">The horizontal bottom color bar shows the current color and the new color, side by side.</paragraph>
-</listitem>
-</list>
-
+ <paragraph id="par_id3148947" role="paragraph" xml-lang="en-US"><ahelp hid=".">With the vertical color component slider you can modify the value of each component of the color.</ahelp> With the large colored square you can select the color component approximatively.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph id="par_id3148948" role="paragraph" xml-lang="en-US">The horizontal bottom color bar shows the current color and the new color, side by side.</paragraph>
+ </listitem></list>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/colorField" id="bm_id3153571" localize="false"/>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US"><ahelp hid=".">Click in the big color area on the left to select a new color. Using this selector area you can modify two components of the color as represented in the RGB or HSB color models. Note that these are the two components not selected with the radio buttons on the right side of the dialog.</ahelp></paragraph>
-
+<paragraph id="par_id3153061" role="paragraph" xml-lang="en-US"><ahelp hid=".">Click in the big color area on the left to select a new color. Using this selector area you can modify two components of the color as represented in the RGB or HSB color models. Note that these are the two components not selected with the radio buttons on the right side of the dialog.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/previous" id="bm_id3155855" localize="false"/>
-<paragraph role="paragraph" id="par_id3154164" xml-lang="en-US"><ahelp hid=".">In the right part of the bottom bar, you will see the original color from the parent tab, <emph>Colors</emph>.</ahelp></paragraph>
-
+<paragraph id="par_id3154164" role="paragraph" xml-lang="en-US"><ahelp hid=".">In the right part of the bottom bar, you will see the original color from the parent tab, <emph>Colors</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/preview" id="bm_id3155856" localize="false"/>
-<paragraph role="paragraph" id="par_id3154165" xml-lang="en-US"><ahelp hid=".">In the left part of the bottom bar, the current result of your work in this dialog is visible.</ahelp></paragraph>
-
-<paragraph role="note" id="par_id9701528" xml-lang="en-US">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
+<paragraph id="par_id3154165" role="paragraph" xml-lang="en-US"><ahelp hid=".">In the left part of the bottom bar, the current result of your work in this dialog is visible.</ahelp></paragraph>
+<paragraph id="par_id9701528" role="note" xml-lang="en-US">%PRODUCTNAME uses only the RGB color model for printing in color. The CMYK controls are provided only to ease the input of color values using CMYK notation.</paragraph>
-<paragraph role="heading" id="hd_id315200" xml-lang="en-US" level="2">RGB</paragraph>
+<paragraph id="hd_id315200" role="heading" level="2" xml-lang="en-US">RGB</paragraph>
-<paragraph role="heading" id="hd_id3151114" xml-lang="en-US" level="3">Red</paragraph>
+<paragraph id="hd_id3151114" role="heading" level="3" xml-lang="en-US">Red</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/redRadiobutton" id="bm_id3153574" localize="false"/>
-<paragraph role="paragraph" id="par_id3153727" xml-lang="en-US"><ahelp hid=".">Sets the Red component modifiable on the vertical color slider, and the Green and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153726" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/redSpinbutton" visibility="hidden">Set the Red color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
+<paragraph id="par_id3153727" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Red component modifiable on the vertical color slider, and the Green and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
+<paragraph id="par_id3153726" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/redSpinbutton" visibility="hidden">Set the Red color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3148618" xml-lang="en-US" level="3">Green</paragraph>
+<paragraph id="hd_id3148618" role="heading" level="3" xml-lang="en-US">Green</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/greenRadiobutton" id="bm_id3153575" localize="false"/>
-<paragraph role="paragraph" id="par_id3153728" xml-lang="en-US"><ahelp hid=".">Sets the Green component modifiable on the vertical color slider, and the Green and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149298" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/greenSpinbutton" visibility="hidden">Set the Green color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
+<paragraph id="par_id3153728" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Green component modifiable on the vertical color slider, and the Red and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
+<paragraph id="par_id3149298" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/greenSpinbutton" visibility="hidden">Set the Green color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151075" xml-lang="en-US" level="3">Blue</paragraph>
+<paragraph id="hd_id3151075" role="heading" level="3" xml-lang="en-US">Blue</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/blueRadiobutton" id="bm_id3153576" localize="false"/>
-<paragraph role="paragraph" id="par_id3153729" xml-lang="en-US"><ahelp hid=".">Sets the Red component modifiable on the vertical color slider, and the Green and Blue components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3148455" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/blueSpinbutton" visibility="hidden">Set the Blue color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
-
+<paragraph id="par_id3153729" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Blue component modifiable on the vertical color slider, and the Green and Red components in the two dimensional color picker field. Allowed values are 0 to 255.</ahelp></paragraph>
+<paragraph id="par_id3148455" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/blueSpinbutton" visibility="hidden">Set the Blue color value directly. Allowed values are 0 to 255.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/hexEntry" id="bm_id3145800" localize="false"/>
-<paragraph role="heading" id="hd_id3151076" xml-lang="en-US" level="2">Hex #</paragraph>
-<paragraph role="paragraph" id="par_id3148456" xml-lang="en-US"><ahelp hid=".">Displays and sets the color value in the RGB color model expressed as a hexadecimal number.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id315201" xml-lang="en-US" level="2">HSB</paragraph>
+<paragraph id="hd_id3151076" role="heading" level="2" xml-lang="en-US">Hex #</paragraph>
+<paragraph id="par_id3148456" role="paragraph" xml-lang="en-US"><ahelp hid=".">Displays and sets the color value in the RGB color model expressed as a hexadecimal number.</ahelp></paragraph>
+
+<paragraph id="hd_id315201" role="heading" level="2" xml-lang="en-US">HSB</paragraph>
-<paragraph role="heading" id="hd_id3145647" xml-lang="en-US" level="3">Hue</paragraph>
+<paragraph id="hd_id3145647" role="heading" level="3" xml-lang="en-US">Hue</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/hueRadiobutton" id="bm_id3153577" localize="false"/>
-<paragraph role="paragraph" id="par_id3153730" xml-lang="en-US"><ahelp hid=".">Sets the Hue component modifiable on the vertical color slider, and the Saturation and Brightness components in the two dimensional color picker field. Values are expressed in degrees from 0 to 359.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3154729" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/hueSpinbutton" visibility="hidden">Set the Hue directly in the HSB color model. Values are expressed in degrees from 0 to 359.</ahelp></paragraph>
+<paragraph id="par_id3153730" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Hue component modifiable on the vertical color slider, and the Saturation and Brightness components in the two dimensional color picker field. Values are expressed in degrees from 0 to 359.</ahelp></paragraph>
+<paragraph id="par_id3154729" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/hueSpinbutton" visibility="hidden">Set the Hue directly in the HSB color model. Values are expressed in degrees from 0 to 359.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3144766" xml-lang="en-US" level="3">Saturation</paragraph>
+<paragraph id="hd_id3144766" role="heading" level="3" xml-lang="en-US">Saturation</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/satRadiobutton" id="bm_id3153578" localize="false"/>
-<paragraph role="paragraph" id="par_id3153731" xml-lang="en-US"><ahelp hid=".">Sets the Saturation component modifiable on the vertical color slider, and the Hue and Brightness components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3153512" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/satSpinbutton" visibility="hidden">Set the Saturation directly in the HSB color model. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
+<paragraph id="par_id3153731" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Saturation component modifiable on the vertical color slider, and the Hue and Brightness components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
+<paragraph id="par_id3153512" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/satSpinbutton" visibility="hidden">Set the Saturation directly in the HSB color model. Values are expressed in percent (0 to 100).</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3156180" xml-lang="en-US" level="3">Brightness</paragraph>
+<paragraph id="hd_id3156180" role="heading" level="3" xml-lang="en-US">Brightness</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/brightRadiobutton" id="bm_id3153579" localize="false"/>
-<paragraph role="paragraph" id="par_id3153732" xml-lang="en-US"><ahelp hid=".">Sets the Brightness component modifiable on the vertical color slider, and the Hue and Saturation components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3146969" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/brightSpinbutton" visibility="hidden">Set the Brightness directly in the HSB color model. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
-
-<paragraph role="heading" id="hd_id315202" xml-lang="en-US" level="2">CMYK</paragraph>
+<paragraph id="par_id3153732" role="paragraph" xml-lang="en-US"><ahelp hid=".">Sets the Brightness component modifiable on the vertical color slider, and the Hue and Saturation components in the two dimensional color picker field. Values are expressed in percent ( 0 to 100).</ahelp></paragraph>
+<paragraph id="par_id3146969" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/colorpickerdialog/brightSpinbutton" visibility="hidden">Set the Brightness directly in the HSB color model. Values are expressed in percent (0 to 100).</ahelp></paragraph>
+<paragraph id="hd_id315202" role="heading" level="2" xml-lang="en-US">CMYK</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/cyanSpinbutton" id="bm_id3153367" localize="false"/>
-<paragraph role="heading" id="hd_id3149203" xml-lang="en-US" level="3">Cyan</paragraph>
-<paragraph role="paragraph" id="par_id3159252" xml-lang="en-US"><ahelp hid=".">Set the Cyan color value as expressed in the CMYK color model.</ahelp></paragraph>
+<paragraph id="hd_id3149203" role="heading" level="3" xml-lang="en-US">Cyan</paragraph>
+<paragraph id="par_id3159252" role="paragraph" xml-lang="en-US"><ahelp hid=".">Set the Cyan color value as expressed in the CMYK color model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/magSpinbutton" id="bm_id3150486" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3">Magenta</paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US"><ahelp hid=".">Set the Magenta color value as expressed in the CMYK color model.</ahelp></paragraph>
+<paragraph id="hd_id3155429" role="heading" level="3" xml-lang="en-US">Magenta</paragraph>
+<paragraph id="par_id3152596" role="paragraph" xml-lang="en-US"><ahelp hid=".">Set the Magenta color value as expressed in the CMYK color model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/yellowSpinbutton" id="bm_id3152576" localize="false"/>
-<paragraph role="heading" id="hd_id3154147" xml-lang="en-US" level="3">Yellow</paragraph>
-<paragraph role="paragraph" id="par_id3155306" xml-lang="en-US"><ahelp hid=".">Set the Yellow color value as expressed in the CMYK color model.</ahelp></paragraph>
+<paragraph id="hd_id3154147" role="heading" level="3" xml-lang="en-US">Yellow</paragraph>
+<paragraph id="par_id3155306" role="paragraph" xml-lang="en-US"><ahelp hid=".">Set the Yellow color value as expressed in the CMYK color model.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/colorpickerdialog/keySpinbutton" id="bm_id3155854" localize="false"/>
-<paragraph role="heading" id="hd_id3150105" xml-lang="en-US" level="3">Key</paragraph>
-<paragraph role="paragraph" id="par_id3146148" xml-lang="en-US"><ahelp hid=".">Set the Black color value or key (black) as expressed in the CMYK color model.</ahelp></paragraph>
+<paragraph id="hd_id3150105" role="heading" level="3" xml-lang="en-US">Key</paragraph>
+<paragraph id="par_id3146148" role="paragraph" xml-lang="en-US"><ahelp hid=".">Set the Black color value or key (black) as expressed in the CMYK color model.</ahelp></paragraph>
</body>
-</helpdocument>
+
+</helpdocument> \ No newline at end of file
diff --git a/source/text/swriter/guide/protection.xhp b/source/text/swriter/guide/protection.xhp
index 982e15c36..226ba9b7e 100644
--- a/source/text/swriter/guide/protection.xhp
+++ b/source/text/swriter/guide/protection.xhp
@@ -79,7 +79,7 @@
<paragraph id="par_id18112016234567" role="paragraph" xml-lang="en-US">If the protection has a password, and you want only to clear it, uncheck the <emph>With password</emph> under the <emph>Write protection</emph> and enter the correct password.</paragraph>
</listitem>
<listitem>
- <paragraph id="par_id18112016234566" role="paragraph" xml-lang="en-US">If the protection has a password, and you want only to change it, click to the <emph>Password</emph> button in the <emph>Write protection</emph>, enter the correct password twice.</paragraph>
+ <paragraph id="par_id18112016234566" role="paragraph" xml-lang="en-US">If the section is protected with a password and you only want to change it, click on the <emph>Password</emph> button in the <emph>Edit Sections</emph> window and enter the correct password twice.</paragraph>
</listitem>
</list>
@@ -111,7 +111,7 @@
</list>
<paragraph id="par_id3150042" role="heading" level="3" localize="false" xml-lang="en-US"><embedvar href="text/swriter/guide/protection.xhp#turnoff"/></paragraph>
-<paragraph id="par_id3155178" role="note" xml-lang="en-US"><variable id="firstof">If necessary, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item>
+<paragraph id="par_id3155178" role="note" xml-lang="en-US"><variable id="firstof">If necessary, choose <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item>
</caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME Writer - Formatting Aids</item> and select <emph>Enable cursor</emph> under the <emph>Protected Areas</emph>.</variable></paragraph>
<list type="ordered">
@@ -153,11 +153,12 @@
<paragraph id="hd_id1811201623985" role="heading" level="2" xml-lang="en-US">Protection of the whole <item type="productname">%PRODUCTNAME</item> Writer document from changes.</paragraph>
<paragraph id="par_id31544811" role="paragraph" xml-lang="en-US">You can protect the contents of <item type="productname">%PRODUCTNAME</item> Writer document from changes, with one of the following file formats: .doc, .docx, .odt, .ott.</paragraph>
<paragraph id="par_id18112016398104" role="warning" localize="false" xml-lang="en-US"><embedvar href="text/swriter/guide/protection.xhp#protwarn"/></paragraph>
-<paragraph id="par_id18112016812973" role="paragraph" xml-lang="en-US">To enable the protection of the whole document, go to <switchinline select="sys"><caseinline select="MAC"><emph><item type="menuitem">%PRODUCTNAME - Preferences</item></emph></caseinline><defaultinline><emph><item type="menuitem">Tools - Options</item></emph></defaultinline></switchinline><emph><item type="menuitem"> - %PRODUCTNAME Writer - Compatibility</item></emph> and choose <emph>Protect form</emph>. To disable protection, uncheck it.</paragraph>
+<paragraph id="par_id18112016812973" role="paragraph" xml-lang="en-US">To enable the protection of the whole document, go to <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Compatibility</emph> and choose <emph>Protect form</emph>. To disable protection, uncheck it.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
<paragraph id="par_idN10B8C" role="paragraph" localize="false" xml-lang="en-US"> <embedvar href="text/shared/guide/digital_signatures.xhp#digital_signatures"/> </paragraph>
<paragraph id="par_id7858516" role="paragraph" xml-lang="en-US"><link href="text/shared/guide/protection.xhp">Protecting Other Contents</link></paragraph>
</body>
-</helpdocument>
+</helpdocument> \ No newline at end of file