CWS-TOOLING: integrate CWS hcmac02

13 files changed, 46 insertions, 46 deletions

diff --git a/helpcontent2/source/text/scalc/guide/address_auto.xhp b/helpcontent2/source/text/scalc/guide/address_auto.xhp
index 776c22c5ca..e03baa41f4 100644
--- a/helpcontent2/source/text/scalc/guide/address_auto.xhp
+++ b/helpcontent2/source/text/scalc/guide/address_auto.xhp
@@ -68,7 +68,7 @@
       </table>
 
       <paragraph xml-lang="en-US" id="par_id3154512" role="paragraph" l10n="CHG" oldref="22">In the example spreadsheet, you can use the string <item type="literal">'Column One'</item> in a formula to refer to the cell range <item type="literal">B3</item> to <item type="literal">B5</item>, or <item type="literal">'Column Two'</item> for the cell range <item type="literal">C2</item> to <item type="literal">C5</item>. You can also use <item type="literal">'Row One'</item> for the cell range <item type="literal">B3</item> to <item type="literal">D3</item>, or <item type="literal">'Row Two'</item> for the cell range <item type="literal">B4</item> to <item type="literal">D4</item>. The result of a formula that uses a cell name, for example, <item type="literal">SUM('Column One')</item>, is 600.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155443" role="paragraph" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155443" role="paragraph" l10n="CHG" oldref="24">This function is active by default. To turn this function off, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph> and clear the <emph>Automatically find column and row labels</emph> check box.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149210" role="tip" l10n="CHG" oldref="37">If you want a name to be automatically recognized by Calc, the name must start with a letter and be composed of alphanumeric characters. If you enter the name in the formula yourself, enclose the name in single quotation marks ('). If a single quotation mark appears in a name, you must enter a backslash in front of the quotation mark, for example, <item type="literal">'Harry\'s Bar'.</item>
 </paragraph>
       <section id="relatedtopics"><comment>mw changed reference to deleted Calc guide address_byname.xhp to refer to Calc guide value_with_name.xhp</comment><comment>UFI: changed embedvar links to embed links</comment><embed href="text/scalc/guide/value_with_name.xhp#value_with_name"/>
diff --git a/helpcontent2/source/text/scalc/guide/calc_series.xhp b/helpcontent2/source/text/scalc/guide/calc_series.xhp
index 806acd7d59..c52cdde766 100755
--- a/helpcontent2/source/text/scalc/guide/calc_series.xhp
+++ b/helpcontent2/source/text/scalc/guide/calc_series.xhp
@@ -72,7 +72,7 @@
       <paragraph xml-lang="en-US" id="par_idN106EE" role="tip" l10n="NEW">To quickly create a list of consecutive days, enter <item type="literal">Monday</item> in a cell, and drag the fill handle.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9720145" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command 
 </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem">Tools - Options - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154490" role="note" l10n="CHG" oldref="18">If you select two or more adjacent cells that contain different numbers, and drag, the remaining cells are filled with the arithmetic pattern that is recognized in the numbers. The AutoFill function also recognizes customized lists that are defined under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</item>.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10737" role="tip" l10n="NEW">You can double-click the fill handle to automatically fill all empty columns of the current data block. For example, first enter Jan into A1 and drag the fill handle down to A12 to get the twelve months in the first column. Now enter some values into B1 and C1. Select those two cells, and double-click the fill handle. This fills automatically the data block B1:C12.</paragraph>
       <paragraph xml-lang="en-US" id="par_idN10713" role="heading" level="2" l10n="NEW">Using a Defined Series</paragraph>
       <list type="ordered">
diff --git a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
index a11288e033..6e56ae6ef5 100755
--- a/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreferences_url.xhp
@@ -69,7 +69,7 @@ oldref="15"><variable id="cellreferences_url"><link href="text/scalc/guide/cellr
 <paragraph xml-lang="en-US" id="par_id3144768" role="listitem" l10n="U" oldref="30">Save your spreadsheet. When you open it again later, $[officename] Calc will update the linked cells following an inquiry.</paragraph>
 </listitem>
 <listitem>
-<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <link href="text/shared/optionen/01040900.xhp" name="Tools - Options - Spreadsheet - General"><item type="menuitem">Tools - Options - %PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3159204" role="listitem" l10n="U" oldref="38">Under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040900.xhp" name="Spreadsheet - General"><item type="menuitem">%PRODUCTNAME Calc - General</item></link> you can choose to have the update, when opened, automatically carried out either always, upon request or never. The update can be started manually in the dialog under <item type="menuitem">Edit - Links</item>.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/csv_files.xhp b/helpcontent2/source/text/scalc/guide/csv_files.xhp
index 9fc1d70b89..f88d612664 100755
--- a/helpcontent2/source/text/scalc/guide/csv_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_files.xhp
@@ -110,7 +110,7 @@
 <section id="relatedtopics">
 <embed href="text/scalc/guide/csv_formula.xhp#csv_formula"/>
 <embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
 <paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
 <paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
 </section>
diff --git a/helpcontent2/source/text/scalc/guide/csv_formula.xhp b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
index 906c6e28ce..4e776f2cfa 100755
--- a/helpcontent2/source/text/scalc/guide/csv_formula.xhp
+++ b/helpcontent2/source/text/scalc/guide/csv_formula.xhp
@@ -62,7 +62,7 @@
             <paragraph xml-lang="en-US" id="par_id3149565" role="listitem" l10n="U" oldref="18">You will see the <item type="menuitem">Text Import</item> dialog. Click <item type="menuitem">OK</item>.</paragraph>
          </listitem>
       </list>
-      <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3149255" role="tip" l10n="CHG" oldref="19">If the csv file contains formulas, but you want to import the results of those formulas, then choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and clear the <emph>Formulas</emph> check box.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3154022" role="heading" level="2" l10n="U" oldref="3">To Export Formulas and Values as CSV Files</paragraph>
       <list type="ordered">
          <listitem>
@@ -70,7 +70,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3166423" role="listitem" l10n="U" oldref="5">If you want to export the formulas as formulas, for example, in the form =SUM(A1:B5), proceed as follows:</paragraph>
-            <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155111" role="listitem" l10n="U" oldref="6">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
             <paragraph xml-lang="en-US" id="par_id3150200" role="listitem" l10n="U" oldref="7">Under <emph>Display</emph>, mark the <emph>Formulas</emph> check box. Click <emph>OK</emph>.</paragraph>
             <paragraph xml-lang="en-US" id="par_id3154484" role="listitem" l10n="U" oldref="8">If you want to export the calculation results instead of the formulas, do not mark <emph>Formulas</emph>.</paragraph>
          </listitem>
@@ -94,7 +94,7 @@
       </list>
       <section id="relatedtopics">
          <embed href="text/scalc/guide/csv_files.xhp#csv_files"/>
-         <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3153487" role="paragraph" l10n="U" oldref="20"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3153008" role="paragraph" l10n="U" oldref="21"><link href="text/shared/00/00000207.xhp" name="Export text files">Export text files</link></paragraph>
          <paragraph xml-lang="en-US" id="par_id3155595" role="paragraph" l10n="U" oldref="22"><link href="text/shared/00/00000208.xhp" name="Import text files">Import text files</link></paragraph>
       </section>
diff --git a/helpcontent2/source/text/scalc/guide/currency_format.xhp b/helpcontent2/source/text/scalc/guide/currency_format.xhp
index b7d1544a9a..1c671892cd 100644
--- a/helpcontent2/source/text/scalc/guide/currency_format.xhp
+++ b/helpcontent2/source/text/scalc/guide/currency_format.xhp
@@ -54,7 +54,7 @@ oldref="46"><variable id="currency_format"><link href="text/scalc/guide/currency
 </variable></paragraph>
 <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="47">In <item type="productname">%PRODUCTNAME</item> Calc you can give numbers any currency format. When you click the <item type="menuitem">Currency</item> icon 
 <image id="img_id3150791" src="res/commandimagelist/sc_currencyfield.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3150791">Icon</alt>
-</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
+</image> in the <item type="menuitem">Formatting</item> bar to format a number, the cell is given the default currency format set under <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3150010" role="note" l10n="CHG" oldref="48">Exchanging of <item type="productname">%PRODUCTNAME</item> Calc documents can lead to misunderstandings, if your <item type="productname">%PRODUCTNAME</item> Calc document is loaded by a user who uses a different default currency format.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3156442" role="paragraph" l10n="U" oldref="52">In <item type="productname">%PRODUCTNAME</item> Calc you can define that a number that you have formatted as "1,234.50 €", still remains in euros in another country and does not become dollars.</paragraph>
 <paragraph xml-lang="en-US" id="par_id3151075" role="paragraph" l10n="CHG" oldref="49">You can change the currency format in the <item type="menuitem">Format Cells</item> dialog (choose <item type="menuitem">Format - Cells - Numbers</item> tab) by two country settings. In the <item type="menuitem">Language</item> combo box select the basic setting for decimal and thousands separators. In the <item type="menuitem">Format</item> list box you can select the currency symbol and its position.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_enter.xhp b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
index 5c3a77bc8e..ff16d5406d 100644
--- a/helpcontent2/source/text/scalc/guide/formula_enter.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_enter.xhp
@@ -67,7 +67,7 @@
 <paragraph role="paragraph" id="par_id4206976" xml-lang="en-US" l10n="NEW">You can also press the + or - key on the numerical keyboard to start a formula. NumLock must be "on". For example, press the following keys in succession:</paragraph>
 <paragraph role="code" id="par_id1836909" xml-lang="en-US" l10n="NEW">+ 5 0 - 8 Enter</paragraph>
 <paragraph role="paragraph" id="par_id8171330" xml-lang="en-US" l10n="NEW">You see the result <item type="literal">42</item> in the cell. The cell contains the formula <item type="literal">=+50-8</item>.</paragraph>
-<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color </emph>can be deactivated under <link href="text/shared/optionen/01060300.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link>.</paragraph>
+<paragraph role="note" id="par_id3155764" xml-lang="en-US" l10n="U" oldref="6">If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. <emph>Show references in color</emph> can be deactivated under <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060300.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link>.</paragraph>
 <paragraph role="tip" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="7"><variable id="tip">If you would like to view the calculation of individual elements of a formula, select the respective elements and press F9. For example, in the formula =SUM(A1:B12)*SUM(C1:D12) select the section SUM(C1:D12) and press F9 to view the subtotal for this area. 
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3150304" xml-lang="en-US" l10n="U" oldref="5">If an error occurs when creating the formula, an <link href="text/scalc/05/02140000.xhp" name="error message">error message</link> appears in the active cell.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formula_value.xhp b/helpcontent2/source/text/scalc/guide/formula_value.xhp
index bac87624a7..ac87c5fb2b 100755
--- a/helpcontent2/source/text/scalc/guide/formula_value.xhp
+++ b/helpcontent2/source/text/scalc/guide/formula_value.xhp
@@ -56,7 +56,7 @@
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="2">If you want to display the formulas in the cells, for example in the form =SUM(A1:B5), proceed as follows:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="4">In the <emph>Display</emph> area mark the <emph>Formulas</emph> box. Click OK.</paragraph>
@@ -64,7 +64,7 @@
 </list>
 <paragraph role="paragraph" id="par_id3147396" xml-lang="en-US" l10n="U" oldref="5">If you want to view the calculation results instead of the formula, do not mark the Formulas box.</paragraph>
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><link href="text/shared/optionen/01060100.xhp" name="Tools - Options - Spreadsheet - View">Tools - Options - %PRODUCTNAME Calc - View</link></paragraph>
+<paragraph role="paragraph" id="par_id3153157" xml-lang="en-US" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01060100.xhp" name="Spreadsheet - View">%PRODUCTNAME Calc - View</link></paragraph>
 </section>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index 32644ced09..9b79cc472f 100755..100644
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.xhp
@@ -51,31 +51,31 @@
 <paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
                  oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150440" role="paragraph" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
-      <list type="unordered">
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3145750" role="listitem" l10n="CHG" oldref="34">The comment is visible whenever the mouse pointer is over the cell, if you did enable tips under <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3148575" role="listitem" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3149958" role="listitem" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_idN10699" role="listitem" l10n="NEW">Move or resize each comment as you like.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_idN1069D" role="listitem" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
-         </listitem>
-         <listitem>
-            <paragraph xml-lang="en-US" id="par_id3144764" role="listitem" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
-         </listitem>
-      </list>
-      <paragraph xml-lang="en-US" id="par_id3150715" role="paragraph" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
-      <section id="relatedtopics">
-         <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
-         <embed href="text/scalc/guide/validity.xhp#validity"/>
-      </section>
-   </body>
-</helpdocument>
\ No newline at end of file
+<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="32">You can assign a comment to each cell by choosing <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link>. The comment is indicated by a small red square, the comment indicator, in the cell.</paragraph>
+<list type="unordered">
+<listitem>
+<paragraph role="listitem" id="par_id3145750" xml-lang="en-US" l10n="U" oldref="34">The comment is visible whenever the mouse pointer is over the cell, provided you have activated <emph>Help - Tips</emph> or - <emph>Extended Tips</emph>.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3148575" xml-lang="en-US" l10n="U" oldref="33">When you select the cell, you can choose <emph>Show Comment</emph> from the context menu of the cell. Doing so keeps the comment visible until you deactivate the <emph>Show Comment</emph> command from the same context menu.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3149958" xml-lang="en-US" l10n="U" oldref="35">To edit a permanently visible comment, just click in it. If you delete the entire text of the comment, the comment itself is deleted.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_idN10699" xml-lang="en-US" l10n="NEW">Move or resize each comment as you like.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_idN1069D" xml-lang="en-US" l10n="NEW">Format each comment by specifying background color, transparency, border style, and text alignment. Choose the commands from the context menu of the comment.</paragraph>
+</listitem>
+<listitem>
+<paragraph role="listitem" id="par_id3144764" xml-lang="en-US" l10n="U" oldref="38">To show or hide the comment indicator, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph> and mark or unmark the <emph>Comment indicator</emph> check box.</paragraph>
+</listitem>
+</list>
+<paragraph role="paragraph" id="par_id3150715" xml-lang="en-US" l10n="U" oldref="39">To display a help tip for a selected cell, use <emph>Data - Validity - Input Help</emph>.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="36"><link href="text/shared/01/04050000.xhp" name="Insert - Comment">Insert - Comment</link></paragraph>
+<embed href="text/scalc/guide/validity.xhp#validity"/>
+</section>
+</body>
+</helpdocument>
diff --git a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
index 1cd50455c4..d4da5642d7 100755
--- a/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
+++ b/helpcontent2/source/text/scalc/guide/rounding_numbers.xhp
@@ -76,7 +76,7 @@
 <paragraph role="heading" id="hd_id3155415" xml-lang="en-US" level="3" l10n="U" oldref="8">To change this everywhere</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150715" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153707" xml-lang="en-US" l10n="U" oldref="10">Go to the <emph>Calculate</emph> page. Modify the number of <emph>Decimal places</emph> and exit the dialog with OK.</paragraph>
@@ -85,10 +85,10 @@
 <paragraph role="heading" id="hd_id3154755" xml-lang="en-US" level="3" l10n="U" oldref="11">To calculate with the rounded off numbers instead of the internal exact values</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph>Tools - Options - %PRODUCTNAME Calc</emph> .</paragraph>
+<paragraph role="listitem" id="par_id3150045" xml-lang="en-US" l10n="CHG" oldref="12">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the<emph> Precision as shown</emph> field and exit the dialog with OK.</paragraph>
+<paragraph role="listitem" id="par_id3146920" xml-lang="en-US" l10n="U" oldref="13">Go to the <emph>Calculate</emph> page. Mark the <emph>Precision as shown</emph> field and exit the dialog with OK.</paragraph>
 </listitem>
 </list>
 <section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/sorted_list.xhp b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
index 19d91825f1..1cd4649303 100755
--- a/helpcontent2/source/text/scalc/guide/sorted_list.xhp
+++ b/helpcontent2/source/text/scalc/guide/sorted_list.xhp
@@ -61,7 +61,7 @@
   <paragraph xml-lang="en-US" id="par_id3159154" role="paragraph" l10n="U" oldref="7">Sort lists allow you to type one piece of information in a cell, then drag it to fill in a consecutive list of items.</paragraph>
   <paragraph xml-lang="en-US" id="par_id3148645" role="paragraph" l10n="U" oldref="4">For example, enter the text "Jan" or "January" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months.</paragraph>
   <paragraph xml-lang="en-US" id="par_id2367931" role="paragraph" l10n="NEW">Hold down <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>if you do not want to fill the cells with different values.</paragraph>
-  <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
+  <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="5">The predefined series can be found under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>. You can also create your own lists of text strings tailored to your needs, such as a list of your company's branch offices. When you use the information in these lists later (for example, as headings), just enter the first name in the list and expand the entry by dragging it with your mouse.</paragraph>
   <section id="relatedtopics">
    
    <embed href="text/scalc/guide/calc_series.xhp#calc_series"/>
diff --git a/helpcontent2/source/text/scalc/guide/table_view.xhp b/helpcontent2/source/text/scalc/guide/table_view.xhp
index c0da5d8dba..0a7b680901 100755
--- a/helpcontent2/source/text/scalc/guide/table_view.xhp
+++ b/helpcontent2/source/text/scalc/guide/table_view.xhp
@@ -56,13 +56,13 @@
 <paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2">To hide column and line headers in a table:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153768" xml-lang="en-US" l10n="CHG" oldref="3">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc,</emph> go to the <emph>View</emph> tab page. Unmark<emph> Column/row headers</emph>. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3147436" xml-lang="en-US" l10n="U" oldref="4">To hide grid lines:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+<paragraph role="listitem" id="par_id3153726" xml-lang="en-US" l10n="CHG" oldref="5">Under the menu item <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
 <emph>,</emph> go to the <emph>View</emph> tab page. Unmark <emph>Grid lines</emph>. Confirm with <emph>OK</emph>.</paragraph>
 </listitem>
 </list>
diff --git a/helpcontent2/source/text/scalc/guide/year2000.xhp b/helpcontent2/source/text/scalc/guide/year2000.xhp
index 756b5041d4..b6ed97f815 100755
--- a/helpcontent2/source/text/scalc/guide/year2000.xhp
+++ b/helpcontent2/source/text/scalc/guide/year2000.xhp
@@ -52,7 +52,7 @@
 <paragraph role="paragraph" id="par_id3151116" xml-lang="en-US" l10n="U" oldref="17">The year in a date entry is often entered as two digits. Internally, the year is managed by $[officename] as four digits, so that in the calculation of the difference from 1/1/99 to 1/1/01, the result will correctly be two years.</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph>Tools - Options - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
+<paragraph role="listitem" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="19">Under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph> you can define the century that is used when you enter a year with only two digits. The default is 1930 to 2029.</paragraph>
 </listitem>
 </list>
 <paragraph role="paragraph" id="par_id3150010" xml-lang="en-US" l10n="U" oldref="20">This means that if you enter a date of 1/1/30 or higher, it will be treated internally as 1/1/1930 or higher. All lower two-digit years apply to the 20xx century. So, for example, 1/1/20 is converted into 1/1/2020.</paragraph>