summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared')
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000003.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000005.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000007.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00000020.xhp10
-rwxr-xr-xhelpcontent2/source/text/shared/00/00000021.xhp4
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp144
-rw-r--r--helpcontent2/source/text/shared/00/00000450.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00040500.xhp2
-rw-r--r--helpcontent2/source/text/shared/00/00040502.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/01010303.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/01100200.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/02010000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/02020000.xhp6
-rw-r--r--helpcontent2/source/text/shared/01/04050000.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/04160500.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05020100.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05020200.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05020301.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020700.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05030100.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010600.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/06150120.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/06200000.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/about_meta_tags.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/grid.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/01/mediaplayer.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/online_update.xhp4
-rw-r--r--helpcontent2/source/text/shared/01/online_update_dialog.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/webhtml.xhp4
-rw-r--r--helpcontent2/source/text/shared/02/01170000.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/02/01170003.xhp2
-rw-r--r--helpcontent2/source/text/shared/02/02020000.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000120.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/02010100.xhp5
-rw-r--r--helpcontent2/source/text/shared/explorer/database/05030100.xhp3
-rw-r--r--helpcontent2/source/text/shared/explorer/database/30000000.xhp8
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropadd.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabapropgen.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp4
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/accessibility.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/active_help_on_off.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/collab.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/doc_autosave.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/doc_open.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/export_ms.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/flat_icons.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/imagemap.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/language_select.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/guide/measurement_units.xhp2
-rw-r--r--helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/ms_user.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_blackwhite.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/guide/print_faster.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_enter.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/standard_template.xhp4
-rw-r--r--helpcontent2/source/text/shared/guide/tabs.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/workfolder.xhp4
-rw-r--r--helpcontent2/source/text/shared/main0108.xhp2
-rw-r--r--helpcontent2/source/text/shared/main0650.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01000000.xhp115
-rw-r--r--helpcontent2/source/text/shared/optionen/01010200.xhp3
-rw-r--r--helpcontent2/source/text/shared/optionen/01040000.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01040300.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01050100.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp3
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01060700.xhp3
-rw-r--r--helpcontent2/source/text/shared/optionen/01090000.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/improvement.xhp2
-rw-r--r--helpcontent2/source/text/shared/optionen/online_update.xhp2
75 files changed, 232 insertions, 255 deletions
diff --git a/helpcontent2/source/text/shared/00/00000003.xhp b/helpcontent2/source/text/shared/00/00000003.xhp
index e56ee4b954..b4babf23ee 100755
--- a/helpcontent2/source/text/shared/00/00000003.xhp
+++ b/helpcontent2/source/text/shared/00/00000003.xhp
@@ -53,7 +53,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3147543" xml-lang="en-US" level="1" l10n="U" oldref="1">Conversion of measurement units</paragraph>
<paragraph role="paragraph" id="par_idN1069F" xml-lang="en-US" l10n="CHG">In some dialogs, you can enter measurement values into input boxes. If you just enter a numerical value, the default measurement unit is used.</paragraph>
-<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
+<paragraph role="paragraph" id="par_idN106A2" xml-lang="en-US" l10n="NEW">You define the default measurement unit for Writer text documents in the dialog that you get by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>. For Calc, Draw, and Impress, you open a document of that type and then open the appropriate <emph>General</emph> page as for Writer.</paragraph>
<paragraph role="paragraph" id="par_idN106AD" xml-lang="en-US" l10n="NEW">In input boxes for length units you can also add the unit abbreviation according to the following list:</paragraph>
<table id="tbl_id402233">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000005.xhp b/helpcontent2/source/text/shared/00/00000005.xhp
index d56be6eafa..68880d2b37 100755
--- a/helpcontent2/source/text/shared/00/00000005.xhp
+++ b/helpcontent2/source/text/shared/00/00000005.xhp
@@ -95,7 +95,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id3148677" role="paragraph" l10n="U" oldref="170">Currently, $[officename] supports Hindi, Thai, Hebrew, and Arabic as CTL languages.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151176" role="paragraph" l10n="U" oldref="171">Enable CTL support using <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="kontextmenue">
@@ -126,9 +126,9 @@
<bookmark_value>docking; definition</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="2" l10n="U" oldref="6">Docking</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
+ <paragraph xml-lang="en-US" id="par_id3154638" role="paragraph" l10n="CHG" oldref="7"><variable id="andock1">Some windows in $[officename], for example the Styles and Formatting window and the Navigator, are "dockable" windows. You can move these windows, re-size them or dock them to an edge. On each edge you can dock several windows on top of, or alongside each other; then, by moving the border lines, you can change the relative proportions of the windows.
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the Ctrl key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command </caseinline><defaultinline>Ctrl </defaultinline></switchinline>key.
+ <paragraph xml-lang="en-US" id="par_id3147233" role="paragraph" l10n="CHG" oldref="127"><variable id="andock2">To undock and re-dock, holding down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key, double-click a vacant area in the window. In the Styles and Formatting window, you can also double-click a gray part of the window next to the icons, while you hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.
</variable></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/00/00000007.xhp b/helpcontent2/source/text/shared/00/00000007.xhp
index a21f7b1d7f..9c16125b5d 100755
--- a/helpcontent2/source/text/shared/00/00000007.xhp
+++ b/helpcontent2/source/text/shared/00/00000007.xhp
@@ -58,7 +58,7 @@
<section id="asia">
<paragraph role="heading" id="par_id3153551" xml-lang="en-US" level="2" l10n="U" oldref="11">Asian Language Support</paragraph>
<section id="asiahinweis">
-<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3156326" xml-lang="en-US" l10n="U" oldref="12">These commands can only be accessed after you enable support for Asian languages in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/shared/00/00000020.xhp b/helpcontent2/source/text/shared/00/00000020.xhp
index a9b4bb6bdb..0bc577bb47 100644
--- a/helpcontent2/source/text/shared/00/00000020.xhp
+++ b/helpcontent2/source/text/shared/00/00000020.xhp
@@ -89,8 +89,8 @@
<paragraph role="paragraph" id="par_id3150244" xml-lang="en-US" l10n="U" oldref="198">With $[officename] Writer, you can insert footnotes and endnotes in your HTML document. They are exported as meta tags. The footnote and endnote characters are exported as hyperlinks.</paragraph>
<paragraph role="paragraph" id="par_id3149800" xml-lang="en-US" l10n="U" oldref="199">Comments are used to include unknown characters in an HTML document. Every note that begins with "HTML:..." and ends with "&gt;" is treated as an HTML code, but is exported without these designations. Several tags around text can be included after "HTML:..." Accented characters are converted into the ANSI character set. Comments are created during import (for example, for meta tags that have no room in the file properties or unknown tags).</paragraph>
<paragraph role="paragraph" id="par_id3149734" xml-lang="en-US" l10n="U" oldref="201">The HTML import of $[officename] Writer is able to read files that have UTF-8 or UCS2 character coding. All characters that are contained in the ANSI character set or in the system's character set can be displayed.</paragraph>
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph>Tools - Options - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
-<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
+<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="U" oldref="240">When exporting to HTML, the character set selected in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph> is used. Characters not present there are written in a substitute form, which is displayed correctly in modern web browsers. When exporting such characters, you will receive an appropriate warning.</paragraph>
+<paragraph role="paragraph" id="par_id3153146" xml-lang="en-US" l10n="CHG" oldref="197">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, you select Netscape Navigator, MS Internet Explorer, or $[officename] Writer as the export option, upon export all important font attributes are exported as direct attributes (for example, text color, font size, bold, italic, and so on) in CSS1 styles. (<link href="text/shared/00/00000002.xhp" name="CSS">CSS</link> stands for Cascading Style Sheets.) Importing is also carried out according to this standard.</paragraph>
<paragraph role="paragraph" id="par_id3154143" xml-lang="en-US" l10n="U" oldref="130">The "font" property corresponds to Netscape Navigator; that is, before the font size you can specify optional values for "font-style" (italic, none), "font-variant" (normal, small-caps) and "font-weight" (normal, bold).</paragraph>
<list type="unordered">
<listitem>
@@ -107,7 +107,7 @@
<paragraph role="paragraph" id="par_id3144510" xml-lang="en-US" l10n="CHG" oldref="16">Text frames are supported with the use of CSS1 extensions for absolute positioned objects. This applies only to the export options Netscape Navigator, MS Internet Explorer, and $[officename] Writer. Text frames can be aligned as graphics, <switchinline select="sys"><caseinline select="WIN"> Plug-Ins,
</caseinline></switchinline>and Floating Frames, but character-linked frames are not possible.</paragraph>
<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="U" oldref="46">Text frames are exported as "&lt;SPAN&gt;" or "&lt;DIV&gt;" tags if they do not contain columns. If they do contain columns then they are exported as "&lt;MULTICOL&gt;".</paragraph>
-<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph>Tools - Options - %PRODUCTNAME Writer - General</emph> or <emph>Tools - Options - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
+<paragraph role="paragraph" id="par_id3153896" xml-lang="en-US" l10n="U" oldref="202">The measurement unit set in $[officename] is used for HTML export of CSS1 properties. The unit can be set separately for text and HTML documents under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph> or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - View</emph>. The number of exported decimal places depends on the unit.</paragraph>
<table id="tbl_id3154346">
<tablerow>
<tablecell colspan="" rowspan="">
@@ -176,9 +176,9 @@
</tablecell>
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
+<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="70">The $[officename] Web page filter supports certain capabilities of CSS2. However, to use it, print layout export must be activated in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. Then, in HTML documents, besides the HTML Page Style, you can also use the styles "First page", "Left page" and "Right page". These styles should enable you to set different page sizes and margins for the first page and for right and left pages when printing.</paragraph>
<paragraph role="heading" id="hd_id3145750" xml-lang="en-US" level="3" l10n="U" oldref="223">Importing and Exporting Numbering</paragraph>
-<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
+<paragraph role="paragraph" id="par_id3145591" xml-lang="en-US" l10n="U" oldref="224">If, in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, the export option "$[officename] Writer" or "Internet Explorer" is selected, the indents of numberings are exported as "margin-left" CSS1 property in the STYLE attribute of the &lt;OL&gt; and &lt;UL&gt; tags. The property indicates the difference relative to the indent of the next higher level.</paragraph>
<paragraph role="paragraph" id="par_id3153573" xml-lang="en-US" l10n="U" oldref="225">A left paragraph indent in numbering is indicated as "margin-left" CSS1 property. First-line indents are ignored in numbering and not exported.</paragraph>
<paragraph role="heading" id="hd_id3148556" xml-lang="en-US" level="3" l10n="U" oldref="235">Importing and Exporting Spreadsheet Files</paragraph>
<paragraph role="paragraph" id="par_id3153365" xml-lang="en-US" l10n="U" oldref="236">$[officename] imports and exports references to deleted sections such as, for example, a referenced column. The whole formula can be viewed during the export process and the deleted reference contains an indication (#REF!) to the reference. A #REF! will be correspondingly created for the reference during the import.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..672cc7e127 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -235,7 +235,7 @@
</tablerow>
</table>
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</item> and select the ODF format version.</paragraph>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
<paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
<paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
@@ -243,7 +243,7 @@
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3153178" xml-lang="en-US" l10n="U" oldref="30">The text content of the document is located in <emph>content.xml</emph>.</paragraph>
-<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph>Tools - Options - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154068" xml-lang="en-US" l10n="CHG" oldref="31">By default, <emph>content.xml</emph> is stored without formatting elements like indentation or line breaks to minimize the time for saving and opening the document. On the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> tab page you can activate the use of indentations and line breaks by clearing the check box <emph>Size optimization for ODF format</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3145152" xml-lang="en-US" l10n="U" oldref="32">The file <emph>meta.xml</emph> contains the meta information of the document, which you can enter under <emph>File - Properties</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 0aaabb9150..aa485a6ceb 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -161,44 +161,44 @@
<emph> Options</emph>
<emph> - Word Completion</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3154127" role="paragraph" l10n="U" oldref="88"><variable id="etoplayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph>Tools - Options - %PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3149664" role="paragraph" l10n="U" oldref="93"><variable id="etotm">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw - General</emph>
</variable></paragraph>
<section id="verzeichnis">
<paragraph xml-lang="en-US" id="par_id3145112" role="paragraph" l10n="U" oldref="125">Path selection button in various wizards</paragraph>
<paragraph xml-lang="en-US" id="par_id3153953" role="paragraph" l10n="U" oldref="126">Click <emph>Edit</emph> button for a few entries under <emph>Tools - Options - $[officename] - Paths</emph>
</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph>Tools - Options</emph>
+ <paragraph xml-lang="en-US" id="par_id3147295" role="paragraph" l10n="U" oldref="23"><variable id="optionen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph>Tools - Options - $[officename]</emph>
+ <paragraph xml-lang="en-US" id="par_id3156006" role="paragraph" l10n="U" oldref="24"><variable id="optionenallgemein">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph>Tools - Options - $[officename] - User Data</emph>
+ <paragraph xml-lang="en-US" id="par_id3155308" role="paragraph" l10n="U" oldref="25"><variable id="benutzerdaten">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph>Tools - Options - $[officename] - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3155312" role="paragraph" l10n="U" oldref="136"><variable id="allg">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph>Tools - Options - $[officename] - Memory</emph>
+ <paragraph xml-lang="en-US" id="par_id3150032" role="paragraph" l10n="U" oldref="147"><variable id="arbeit">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph>Tools - Options - $[officename] - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3159153" role="paragraph" l10n="U" oldref="61"><variable id="ansicht">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph>Tools - Options - $[officename] - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3166413" role="paragraph" l10n="U" oldref="137"><variable id="drucken">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>
</variable></paragraph>
<section id="pfade">
-<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3147330" xml-lang="en-US" l10n="U" oldref="26">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3150036" xml-lang="en-US" l10n="U" oldref="54">Choose <emph>Edit - AutoText - Path</emph>
</paragraph>
</section>
<section id="color">
-<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph>Tools - Options - $[officename] - Colors</emph>
+<paragraph role="paragraph" id="par_id3154696" xml-lang="en-US" l10n="U" oldref="30">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3149581" xml-lang="en-US" l10n="U" oldref="31">Choose <emph>Format - Area - Colors</emph> tab</paragraph>
</section>
<section id="color2">
-<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph>Tools - Options - $[officename] - Colors - Edit</emph>
+<paragraph role="paragraph" id="par_id3149270" xml-lang="en-US" l10n="U" oldref="65">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors - Edit</emph>
</paragraph>
<paragraph role="paragraph" id="par_id3145729" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Format - Area - Colors</emph> tab<emph> - Edit</emph> button</paragraph>
<paragraph role="paragraph" id="par_id3149488" xml-lang="en-US" l10n="U" oldref="67">Choose <emph>Format - 3D Effects</emph> icon on the <emph>Illumination</emph> tab</paragraph>
@@ -218,129 +218,129 @@
</section>
</section>
- <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph>Tools - Options - $[officename] - Fonts</emph>
+ <paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Fonts</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph>Tools - Options - $[officename] - Security</emph>
+ <paragraph xml-lang="en-US" id="par_id3150717" role="paragraph" l10n="U" oldref="43"><variable id="scripting">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Security</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph>Tools - Options - $[officename] - Java</emph>
+ <paragraph xml-lang="en-US" id="par_idN10C3D" role="paragraph" l10n="NEW"><variable id="java">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph>Tools - Options - $[officename] - Online Update </emph>
+ <paragraph xml-lang="en-US" id="par_id5485702" role="paragraph" l10n="NEW"><variable id="online_update">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Online Update </emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph>Tools - Options - $[officename] - Accessibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3146989" role="paragraph" l10n="U" oldref="152"><variable id="accessibility">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Accessibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph>Tools - Options - $[officename] - Appearance</emph>
+ <paragraph xml-lang="en-US" id="par_id3144746" role="paragraph" l10n="U" oldref="153"><variable id="appearance">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Appearance</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph>Tools - Options - $[officename] - Improvement Program</emph>
+ <paragraph xml-lang="en-US" id="par_id0526200904120665" role="paragraph" l10n="NEW"><variable id="improvement">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Improvement Program</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph>Tools - Options - Load/Save</emph>
+ <paragraph xml-lang="en-US" id="par_id3156355" role="paragraph" l10n="U" oldref="32"><variable id="landen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph>Tools - Options - Load/Save - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3147223" role="paragraph" l10n="U" oldref="27"><variable id="rsave">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph>Tools - Options - Load/Save</emph> - <emph>VBA Properties</emph>
+ <paragraph xml-lang="en-US" id="par_id3153958" role="paragraph" l10n="U" oldref="119"><variable id="etsofi">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>VBA Properties</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph>Tools - Options - Load/Save</emph> - <emph>Microsoft Office</emph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="U" oldref="122"><variable id="etsofi2">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>Microsoft Office</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph>Tools - Options - Load/Save</emph> - <emph>HTML Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_id3145667" role="paragraph" l10n="U" oldref="49"><variable id="html">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save</emph> - <emph>HTML Compatibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph>Tools - Options - Language Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3146792" role="paragraph" l10n="U" oldref="132"><variable id="asiatypo">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <paragraph xml-lang="en-US" id="par_id3157965" role="paragraph" l10n="U" oldref="131"><variable id="sprachen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph>Tools - Options - Language Settings - Languages - Complex Text Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3155446" role="paragraph" l10n="U" oldref="160"><variable id="sprachenctl">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages - Complex Text Layout</emph>
</variable></paragraph>
<section id="linguistik">
- <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph>Tools - Options - Language Settings - Languages</emph>
+ <paragraph xml-lang="en-US" id="par_id3150745" role="paragraph" l10n="U" oldref="45">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>
</paragraph>
</section>
<section id="linguistikmodule">
- <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148407" role="paragraph" l10n="U" oldref="134">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>, in the <emph>Available language modules </emph>list, select one of the language modules and then click <emph>Edit</emph>.</paragraph>
</section>
<section id="writingaids">
- <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph>Tools - Options - Language Settings - Writing Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3150324" role="paragraph" l10n="U" oldref="157">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Writing Aids</emph>
</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph>Tools - Options - Language Settings - Searching in Japanese</emph>
+ <paragraph xml-lang="en-US" id="par_id3145620" role="paragraph" l10n="U" oldref="135"><variable id="suchja">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Searching in Japanese</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph>Tools - Options - Language Settings - Asian Layout</emph>
+ <paragraph xml-lang="en-US" id="par_id3147341" role="paragraph" l10n="U" oldref="133"><variable id="asialayout">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Asian Layout</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph>Tools - Options - Internet</emph>
+ <paragraph xml-lang="en-US" id="par_id3147359" role="paragraph" l10n="U" oldref="138"><variable id="internet">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph>Tools - Options - Internet - Proxy</emph>
+ <paragraph xml-lang="en-US" id="par_id3156374" role="paragraph" l10n="U" oldref="33"><variable id="internet1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph>Tools - Options - Internet - Search</emph>
+ <paragraph xml-lang="en-US" id="par_id3159339" role="paragraph" l10n="U" oldref="36"><variable id="internet4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Search</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph>
+ <paragraph xml-lang="en-US" id="par_id3149280" role="paragraph" l10n="U" oldref="94"><variable id="optionentextdokument">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Compatibility</emph>
+ <paragraph xml-lang="en-US" id="par_idN10E4F" role="paragraph" l10n="NEW"><variable id="compatibility">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Compatibility</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148929" role="paragraph" l10n="U" oldref="105"><variable id="laden">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
+ <paragraph xml-lang="en-US" id="par_idN10F2F" role="paragraph" l10n="CHG"><variable id="mailmergeemail">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Mail Merge E-mail</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - AutoCaption</emph>
+ <paragraph xml-lang="en-US" id="par_id3149825" role="paragraph" l10n="CHG" oldref="144"><variable id="einfuegenbeschriftung">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - AutoCaption</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
+ <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="U" oldref="96"><variable id="layout">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web </emph>- <emph>View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
+ <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="100"><variable id="registerschattencursor">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web</emph> - <emph>Formatting Aids</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3153534" role="paragraph" l10n="U" oldref="47"><variable id="raster">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Calc/%PRODUCTNAME Writer/Web - Grid</emph>
</variable></paragraph>
<section id="grundschriften">
- <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
+ <paragraph xml-lang="en-US" id="par_id3155961" role="paragraph" l10n="U" oldref="97">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Western)</emph>
</paragraph>
- <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159313" role="paragraph" l10n="U" oldref="151">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Basic Fonts (Asian)</emph> (only available if Asian language support is enabled)</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph>Tools - Options - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose Tools - Options - %PRODUCTNAME Calc - Print
+ <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph>Tools - Options - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
+ <paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph>Tools - Options - %PRODUCTNAME Writer - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3147005" role="paragraph" l10n="U" oldref="101"><variable id="registeraenderungen">Open a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Changes</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web</emph>
+ <paragraph xml-lang="en-US" id="par_id3159333" role="paragraph" l10n="U" oldref="48"><variable id="webbrowser1">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - Background</emph>
+ <paragraph xml-lang="en-US" id="par_id3149448" role="paragraph" l10n="U" oldref="139"><variable id="hinter">Open an HTML document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - Background</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc</emph>
+ <paragraph xml-lang="en-US" id="par_id3149336" role="paragraph" l10n="U" oldref="78"><variable id="tabellendokument">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3152966" role="paragraph" l10n="U" oldref="81"><variable id="tabelleeingabe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3149814" role="paragraph" l10n="U" oldref="79"><variable id="tabelleinhalte">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Calculate</emph>
+ <paragraph xml-lang="en-US" id="par_id3154656" role="paragraph" l10n="U" oldref="84"><variable id="exopbe">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Calculate</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists</emph>
+ <paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
+ <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - Options - %PRODUCTNAME Calc - Changes</emph>
+ <paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress</emph>
+ <paragraph xml-lang="en-US" id="par_id3152582" role="paragraph" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
+ <paragraph xml-lang="en-US" id="par_id3148418" role="paragraph" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
+ <paragraph xml-lang="en-US" id="par_id3150380" role="paragraph" l10n="CHG" oldref="87"><variable id="etopas">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - View</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
+ <paragraph xml-lang="en-US" id="par_id3166423" role="paragraph" l10n="CHG" oldref="89"><variable id="etopfe">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Grid</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
+ <paragraph xml-lang="en-US" id="par_id3148873" role="paragraph" l10n="U" oldref="90"><variable id="etopdk">Open a presentation document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress/%PRODUCTNAME Draw - Print</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph>Tools - Options - %PRODUCTNAME Draw</emph>
+ <paragraph xml-lang="en-US" id="par_id3145220" role="paragraph" l10n="CHG" oldref="92"><variable id="etotallz">Open a drawing document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Draw</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math</emph>
+ <paragraph xml-lang="en-US" id="par_id3149573" role="paragraph" l10n="CHG" oldref="77"><variable id="etsodr">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph>Tools - Options - %PRODUCTNAME Math - Settings</emph>
+ <paragraph xml-lang="en-US" id="par_id3145613" role="paragraph" l10n="CHG" oldref="112"><variable id="formeinst">Open a Math document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Math - Settings</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph>Tools - Options - Charts</emph>
+ <paragraph xml-lang="en-US" id="par_id3155137" role="paragraph" l10n="U" oldref="111"><variable id="diagrfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph>Tools - Options - Charts - Default Colors</emph>
+ <paragraph xml-lang="en-US" id="par_id3149211" role="paragraph" l10n="U" oldref="113"><variable id="diagrgfarbe">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Charts - Default Colors</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph>Tools - Options - %PRODUCTNAME Base</emph>
+ <paragraph xml-lang="en-US" id="par_id3150862" role="paragraph" l10n="CHG" oldref="141"><variable id="datenqu">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph>Tools - Options - %PRODUCTNAME Base - Connections</emph>
+ <paragraph xml-lang="en-US" id="par_id3147368" role="paragraph" l10n="CHG" oldref="142"><variable id="verbindungen">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Connections</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>
+ <paragraph xml-lang="en-US" id="par_idN1120D" role="paragraph" l10n="NEW"><variable id="registered">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>
</variable></paragraph>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/00/00000450.xhp b/helpcontent2/source/text/shared/00/00000450.xhp
index 32c4ea11c9..f4162d9110 100644
--- a/helpcontent2/source/text/shared/00/00000450.xhp
+++ b/helpcontent2/source/text/shared/00/00000450.xhp
@@ -52,7 +52,7 @@
</variable></paragraph>
<paragraph role="paragraph" id="par_id3159411" xml-lang="en-US" l10n="CHG" oldref="5"><variable id="Datenquelle">In a database file window of type ODBC or Address book, choose Edit - Database - Connection Type
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph>Tools - Options - $[officename] - Paths</emph>
+<paragraph role="paragraph" id="par_id3149119" xml-lang="en-US" l10n="U" oldref="6"><variable id="Verzeichnis">Path selection button in various Wizards / <emph>Edit</emph> Buttons for some entries in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3154497" xml-lang="en-US" l10n="CHG" oldref="8"><variable id="ODBC">In a database file window of type ODBC, choose Edit - Database - Connection Type
</variable><comment>see #i56356</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/00/00040500.xhp b/helpcontent2/source/text/shared/00/00040500.xhp
index c00798f2c5..0be3049b3a 100644
--- a/helpcontent2/source/text/shared/00/00040500.xhp
+++ b/helpcontent2/source/text/shared/00/00040500.xhp
@@ -192,7 +192,7 @@
<section id="gestalter">
<paragraph xml-lang="en-US" id="par_id3147404" role="paragraph" l10n="U" oldref="84">Choose <emph>Format - Styles and Formatting</emph>
</paragraph>
- <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95">F11 key</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166447" role="paragraph" l10n="U" oldref="95"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id3147321" role="paragraph" l10n="CHG" oldref="85">On <emph>Formatting</emph> Bar, click</paragraph>
<table id="tbl_id3163807">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00040502.xhp b/helpcontent2/source/text/shared/00/00040502.xhp
index d6fcd04818..6dc157fbdc 100644
--- a/helpcontent2/source/text/shared/00/00040502.xhp
+++ b/helpcontent2/source/text/shared/00/00040502.xhp
@@ -122,7 +122,7 @@
<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="CHG" oldref="28">Choose <emph>Format - </emph><switchinline select="appl"><caseinline select="WRITER"><emph>Object - </emph>
</caseinline><caseinline select="CALC"><emph>Graphic - </emph>
</caseinline></switchinline><emph>Area - Colors</emph> tab</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph>Tools - Options - $[officename] - Colors</emph> tab</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="29">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Colors</emph> tab</paragraph>
</section>
<section id="trans">
<paragraph xml-lang="en-US" id="par_id3154985" role="paragraph" l10n="U" oldref="141">Choose <emph>Format - Area - Transparency</emph> tab (drawing documents)</paragraph>
diff --git a/helpcontent2/source/text/shared/01/01010303.xhp b/helpcontent2/source/text/shared/01/01010303.xhp
index 683a0af779..b3fb5b6d1d 100755
--- a/helpcontent2/source/text/shared/01/01010303.xhp
+++ b/helpcontent2/source/text/shared/01/01010303.xhp
@@ -50,7 +50,7 @@
<embed href="text/shared/00/00000401.xhp#viskartpriv"/>
</section>
<paragraph role="heading" id="hd_id3159201" xml-lang="en-US" level="2" l10n="U" oldref="3">Private data</paragraph>
-<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="4">Enter the contact information that you want to include on your business card. You can also modify or update these entries by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</paragraph>
<embed href="text/shared/optionen/01010100.xhp#datena"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2" id="bm_id3145314" localize="false"/><paragraph role="heading" id="hd_id3156427" xml-lang="en-US" level="3" l10n="U" oldref="15">First name 2</paragraph>
<paragraph role="paragraph" id="par_id3149750" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SW:EDIT:TP_PRIVATE_DATA:ED_FIRSTNAME_2">Enter the first name of the person, whom you want to use as a second contact.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01100200.xhp b/helpcontent2/source/text/shared/01/01100200.xhp
index a5323cefa1..afaaac061c 100755
--- a/helpcontent2/source/text/shared/01/01100200.xhp
+++ b/helpcontent2/source/text/shared/01/01100200.xhp
@@ -87,7 +87,7 @@
<bookmark xml-lang="en-US" branch="hid/SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA" id="bm_id3159270" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="2" l10n="U"
oldref="33">Apply User Data</paragraph>
- <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph>Tools - Options - $[officename] - User Data</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3143271" role="paragraph" l10n="U" oldref="34"><ahelp hid="SFX2:CHECKBOX:TP_DOCINFODOC:CB_USE_USERDATA">Saves the user's full name with the file. You can edit the name by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User Data</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SFX2:PUSHBUTTON:TP_DOCINFODOC:BTN_DELETE" id="bm_id3148686" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
oldref="35">Delete</paragraph>
diff --git a/helpcontent2/source/text/shared/01/02010000.xhp b/helpcontent2/source/text/shared/01/02010000.xhp
index 5375df1012..a4f12aa930 100644
--- a/helpcontent2/source/text/shared/01/02010000.xhp
+++ b/helpcontent2/source/text/shared/01/02010000.xhp
@@ -56,13 +56,13 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#do"/>
</section>
-<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose Tools - Options - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
+<paragraph role="tip" id="par_idN10630" xml-lang="en-US" l10n="NEW">To change the number of commands that you can undo, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Memory, and enter a new value in the number of steps box.</paragraph>
<paragraph role="note" id="par_id3163803" xml-lang="en-US" l10n="U" oldref="8">Some commands (for example, editing Styles) cannot be undone.</paragraph>
<paragraph role="tip" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="11">You can cancel the Undo command by choosing Edit - Redo.</paragraph>
<paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="7">About the Undo command in database tables</paragraph>
<paragraph role="paragraph" id="par_id3148492" xml-lang="en-US" l10n="U" oldref="3">When you are working with database tables, you can only undo the last command.</paragraph>
<paragraph role="warning" id="par_id3155504" xml-lang="en-US" l10n="U" oldref="4">If you change the content of a record in a database table that has not been saved, and then use the<emph> Undo</emph> command, the record is erased.</paragraph>
<paragraph role="heading" id="hd_id3149415" xml-lang="en-US" level="2" l10n="U" oldref="9">About the Undo command in presentations</paragraph>
-<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo </emph>list is cleared when you apply a new layout to a slide.</paragraph>
+<paragraph role="paragraph" id="par_id3159147" xml-lang="en-US" l10n="U" oldref="10">The <emph>Undo</emph> list is cleared when you apply a new layout to a slide.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/02020000.xhp b/helpcontent2/source/text/shared/01/02020000.xhp
index d22517e110..12855ea811 100644
--- a/helpcontent2/source/text/shared/01/02020000.xhp
+++ b/helpcontent2/source/text/shared/01/02020000.xhp
@@ -38,10 +38,6 @@
<title id="tit" xml-lang="en-US">Redo</title>
<filename>/text/shared/01/02020000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T11:24:18">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="wiederholen">
@@ -52,7 +48,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Redo" id="bm_id3154840" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_IMAPDLG_REDO" id="bm_id3155069" localize="false"/>
<paragraph role="heading" id="hd_id3149991" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/02020000.xhp" name="Redo">Redo</link></paragraph>
-<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo </emph>command. To select the <emph>Undo </emph>step that you want to reverse, click the arrow next to the <emph>Redo </emph>icon on the Standard bar.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid="HID_IMAPDLG_REDO">Reverses the action of the last <emph>Undo</emph> command. To select the <emph>Undo</emph> step that you want to reverse, click the arrow next to the <emph>Redo</emph> icon on the Standard bar.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#redo"/>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 50fdbe184f..f1322a5f15 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -64,7 +64,7 @@
</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
<paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
<paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6718649" role="paragraph" l10n="NEW">The comments by different authors get different colors. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</item> to enter your name so that it can show up as the comment author.</paragraph>
<paragraph xml-lang="en-US" id="hd_id2929166" role="heading" level="2" l10n="NEW">Editing comments</paragraph>
<paragraph xml-lang="en-US" id="par_id5201879" role="paragraph" l10n="NEW">Every user with write permission to the document can edit and delete comments of all authors.</paragraph>
<paragraph xml-lang="en-US" id="par_id2571794" role="paragraph" l10n="NEW">The comment box contains an icon with a down arrow. Click the icon to open a menu with some commands to delete comments.</paragraph>
@@ -90,7 +90,7 @@
<paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
<paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
<paragraph xml-lang="en-US" id="hd_id5664235" role="heading" level="2" l10n="NEW">Printing comments</paragraph>
- <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To set the printing options for comments in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for comments for all your text documents, choose <item type="menuitem">Tools - Options - %PRODUCTNAME Writer - Print</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id2254402" role="paragraph" l10n="NEW">To set the printing options for comments in your text document, choose <item type="menuitem">File - Print</item>, then click <emph>Options</emph>. To change the printing option for comments for all your text documents, choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</item>.</paragraph>
<paragraph xml-lang="en-US" id="hd_id0915200910571612" role="heading" level="2" l10n="NEW">Comments in spreadsheets</paragraph>
<paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph>
diff --git a/helpcontent2/source/text/shared/01/04160500.xhp b/helpcontent2/source/text/shared/01/04160500.xhp
index 3204779f73..6bdaad5728 100644
--- a/helpcontent2/source/text/shared/01/04160500.xhp
+++ b/helpcontent2/source/text/shared/01/04160500.xhp
@@ -54,7 +54,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000404.xhp#eiobframe"/>
</section>
-<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph>Tools - Options - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
+<paragraph role="note" id="par_id3151100" xml-lang="en-US" l10n="U" oldref="6">If you want to create HTML pages that use floating frames, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML compatibility</emph>, and then select the "MS Internet Explorer" option. The floating frame is bounded by &lt;IFRAME&gt; and &lt;/IFRAME&gt; tags.</paragraph>
<section id="relatedtopics">
<paragraph role="paragraph" id="par_id3151330" xml-lang="en-US" l10n="C"><link href="text/shared/01/02210101.xhp" name="Floating frame properties">Floating frame properties</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/05020100.xhp b/helpcontent2/source/text/shared/01/05020100.xhp
index fd05be04a3..107382eeb2 100644
--- a/helpcontent2/source/text/shared/01/05020100.xhp
+++ b/helpcontent2/source/text/shared/01/05020100.xhp
@@ -79,7 +79,7 @@
<paragraph role="listitem" id="par_id3147576" xml-lang="en-US" l10n="U" oldref="57">Complex text layout font - right-to-left text direction</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
+<paragraph role="note" id="par_id3153663" xml-lang="en-US" l10n="U" oldref="58">To enable support for complex text layout and Asian character sets, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled </emph>box in the corresponding area.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME" id="bm_id3149796" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_EAST_NAME" id="bm_id3159158" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX_COMBOBOX_RID_SVXPAGE_CHAR_NAME_LB_WEST_NAME_NOCJK" id="bm_id3149795" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05020200.xhp b/helpcontent2/source/text/shared/01/05020200.xhp
index 52cb13c58d..8ca2f4b37c 100644
--- a/helpcontent2/source/text/shared/01/05020200.xhp
+++ b/helpcontent2/source/text/shared/01/05020200.xhp
@@ -151,7 +151,7 @@
<paragraph xml-lang="en-US" id="par_id3145662" role="paragraph" l10n="U" oldref="16"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_CHAR_EFFECTS_CB_BLINKING">Makes the selected characters blink. You cannot change the blink frequency.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_TriStateBox_RID_SVXPAGE_CHAR_EFFECTS_CB_CHARHIDDEN" id="bm_id0123200902180465" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN10B81" role="heading" level="3" l10n="NEW">Hidden</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10B85" role="paragraph" l10n="NEW"><ahelp hid="svx:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN">Hides the selected characters.</ahelp> To display the hidden text, ensure that <emph>Non-printing Characters</emph> is selected in the <emph>View</emph> menu. You can also choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph> and select <emph>Hidden text</emph>.</paragraph>
</case>
</switch>
<bookmark xml-lang="en-US" branch="hid/.uno:Overline" id="bm_id0123200902261777" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/05020301.xhp b/helpcontent2/source/text/shared/01/05020301.xhp
index 567c64a43b..5aa4c4c003 100644
--- a/helpcontent2/source/text/shared/01/05020301.xhp
+++ b/helpcontent2/source/text/shared/01/05020301.xhp
@@ -671,7 +671,7 @@
<paragraph role="heading" id="hd_id3149929" xml-lang="en-US" level="3" l10n="U" oldref="227">Entering Dates</paragraph>
<paragraph role="paragraph" id="par_id3148397" xml-lang="en-US" l10n="U" oldref="228">To enter a date in a cell, use the Gregorian calendar format. For example, in an English locale, enter 1/2/2002 for Jan 2, 2002.</paragraph>
-<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph>Tools - Options - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
+<paragraph role="paragraph" id="par_id3153274" xml-lang="en-US" l10n="U" oldref="137">All date formats are dependent on the locale that is set in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language settings - Languages</emph>. For example, if your locale is set to 'Japanese', then the Gengou calendar is used. The default date format in <item type="productname">%PRODUCTNAME</item> uses the Gregorian Calendar.</paragraph>
<paragraph role="paragraph" id="par_id3153795" xml-lang="en-US" l10n="U" oldref="216">To specify a calendar format that is independent of the locale, add a modifier in front of the date format. For example, to display a date using the Jewish calendar format in a non-Hebrew locale, enter: [~jewish]DD/MM/YYYY.</paragraph>
<table id="tbl_id3145133">
<tablerow>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 1a4145d727..97105ab067 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -49,7 +49,7 @@
<bookmark_value>paragraphs; Asian typography</bookmark_value>
<bookmark_value>typography; Asian</bookmark_value>
</bookmark><comment>MW changed "formats;" to "formatting;"</comment><paragraph role="heading" id="hd_id3155620" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05020700.xhp" name="Asian Typography">Asian Typography</link></paragraph>
-<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph>Tools - Options - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
+<paragraph role="paragraph" id="par_id3153124" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Set the typographic options for cells or paragraphs in Asian language files. To enable Asian language support, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and then select the <emph>Enabled</emph> box in the <emph>Asian language support </emph>area.</ahelp> The Asian typography options are ignored in HTML documents.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#asitypo"/>
diff --git a/helpcontent2/source/text/shared/01/05030100.xhp b/helpcontent2/source/text/shared/01/05030100.xhp
index d97976ba2c..a8fe4be2a5 100644
--- a/helpcontent2/source/text/shared/01/05030100.xhp
+++ b/helpcontent2/source/text/shared/01/05030100.xhp
@@ -55,7 +55,7 @@
<paragraph xml-lang="en-US" id="hd_id3154689" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030100.xhp" name="Indents and Spacing">Indents and Spacing</link></paragraph>
<paragraph xml-lang="en-US" id="par_id3155069" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_FORMAT_PARAGRAPH_STD">Sets the indenting and the spacing options for the paragraph.</ahelp></paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose Tools - Options - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153910" role="note" l10n="U" oldref="64">To change the measurement units used in this dialog, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General, and then select a new measurement unit in the Settings area. </paragraph>
<switch select="appl">
<case select="WRITER">
<paragraph xml-lang="en-US" id="par_id3154823" role="tip" l10n="CHG" oldref="11">You can also <link href="text/swriter/guide/ruler.xhp" name="ruler">set indents using the ruler</link>. To display the ruler, choose <emph>View - Ruler</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06010600.xhp b/helpcontent2/source/text/shared/01/06010600.xhp
index ecb63b58b6..4c5a8cb3e4 100755
--- a/helpcontent2/source/text/shared/01/06010600.xhp
+++ b/helpcontent2/source/text/shared/01/06010600.xhp
@@ -51,7 +51,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_CHINESE_CONVERSION" id="bm_id9033860" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChineseConversion" id="bm_id2549516" localize="false"/>
<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Translation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chinese"/>
diff --git a/helpcontent2/source/text/shared/01/06150120.xhp b/helpcontent2/source/text/shared/01/06150120.xhp
index 5dcbc78cba..7f210d17fe 100755
--- a/helpcontent2/source/text/shared/01/06150120.xhp
+++ b/helpcontent2/source/text/shared/01/06150120.xhp
@@ -72,6 +72,6 @@
<paragraph l10n="U" role="paragraph" id="par_id3147653" xml-lang="en-US" oldref="16"><ahelp hid="HID_XML_FILTER_IMPORT_XSLT" visibility="visible">If this is an import filter, enter the file name of the XSLT stylesheet that you want to use for importing.</ahelp></paragraph>
<bookmark branch="hid/HID_XML_FILTER_IMPORT_TEMPLATE" xml-lang="en-US" id="bm_id3155831"/><paragraph role="heading" level="2" id="hd_id3147242" l10n="U" xml-lang="en-US" oldref="17">Template for import</paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3153320" xml-lang="en-US" oldref="18"><ahelp hid="HID_XML_FILTER_IMPORT_TEMPLATE" visibility="visible">Enter the name of the template that you want to use for importing. In the template, styles are defined to display XML tags.</ahelp></paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph>Tools - Options - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
+ <paragraph xml-lang="en-US" role="paragraph" id="par_id3156330" l10n="U" oldref="19">The path to the directory that contains the template must be included in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>. When you open an XML file whose filter uses the template, the template opens first. In the template, you can map $[officename] styles to display XML tags in the XML document.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06200000.xhp b/helpcontent2/source/text/shared/01/06200000.xhp
index 1e694fea5a..dbbd91c77c 100644
--- a/helpcontent2/source/text/shared/01/06200000.xhp
+++ b/helpcontent2/source/text/shared/01/06200000.xhp
@@ -50,7 +50,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_HANGUL_HANJA_CONVERSION" id="bm_id7305797" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:HangulHanjaConversion" id="bm_id3150702" localize="false"/>
<paragraph role="heading" id="hd_id3155757" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06200000.xhp" name="Hangul/Hanja Conversion">Hangul/Hanja Conversion</link></paragraph>
-<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph>Tools - Options - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
+<paragraph role="paragraph" id="par_id3146060" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:HangulHanjaConversion">Converts the selected Korean text from Hangul to Hanja or from Hanja to Hangul.</ahelp> The menu command can only be called if you enable Asian language support under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>, and if a text formatted in Korean language is selected.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#hangul"/>
diff --git a/helpcontent2/source/text/shared/01/about_meta_tags.xhp b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
index 9bd1feeda9..f6d883cc12 100644
--- a/helpcontent2/source/text/shared/01/about_meta_tags.xhp
+++ b/helpcontent2/source/text/shared/01/about_meta_tags.xhp
@@ -100,7 +100,7 @@
<paragraph role="paragraph" id="par_id3155307" xml-lang="en-US" l10n="U" oldref="13">When you import an HTML document, following META tags are automatically converted to $[officename] fields: &lt;META HTTP-EQUIV="REFRESH"...&gt; and &lt;META NAME="..." ...&gt; , where NAME equals to AUTHOR, CREATED, CHANGED, CHANGEDBY, DESCRIPTION, KEYWORDS or CLASSIFICATION.</paragraph>
<paragraph role="paragraph" id="par_id3146146" xml-lang="en-US" l10n="U" oldref="15">Scripts, comments, and META tags that are positioned directly before a TABLE tag are inserted in the first cell of the table.</paragraph>
<paragraph role="paragraph" id="par_id3155366" xml-lang="en-US" l10n="U" oldref="16">Scripts and META tags in the header of an HTML document are imported and anchored to the first paragraph in the document.</paragraph>
-<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
+<paragraph role="paragraph" id="par_id3152885" xml-lang="en-US" l10n="U" oldref="14">To set the options for importing HTML tags, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>. A known META tag contains either "HTTP-EQUIV" or "NAME", and are imported as $[officename] comments. The only exception is &lt;META NAME="GENERATOR"...&gt;, which is ignored.</paragraph>
<paragraph role="heading" id="hd_id3163717" xml-lang="en-US" level="3" l10n="U" oldref="17">Export Tips</paragraph>
<paragraph role="paragraph" id="par_id3159180" xml-lang="en-US" l10n="U" oldref="19">Comments and script fields at the beginning of the first paragraph in a document are exported to the header of an HTML document. If the document begins with a table, the first paragraph in the first cell of the table is exported to the header of the HTML document.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/01/grid.xhp b/helpcontent2/source/text/shared/01/grid.xhp
index d56720daa0..dc1ec6034b 100755
--- a/helpcontent2/source/text/shared/01/grid.xhp
+++ b/helpcontent2/source/text/shared/01/grid.xhp
@@ -58,7 +58,7 @@
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US" l10n="NEW">Automatically aligns objects to vertical and horizontal grid lines. To override this feature, hold down the <switchinline select="sys"><caseinline select="MAC">Command key</caseinline><defaultinline>Ctrl key</defaultinline></switchinline> when you drag an object.<comment>UFI: copied from shared\optionen\01050100.xhp</comment></paragraph><comment>UFI removed GridFront help id</comment><paragraph role="heading" id="par_idN105C9" xml-lang="en-US" level="2" l10n="NEW">Grid to Front</paragraph>
<paragraph role="paragraph" id="par_idN105CD" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays the grid lines in front of the objects on the slide or page.</ahelp></paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+<paragraph role="paragraph" id="par_id4372692" xml-lang="en-US" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/mediaplayer.xhp b/helpcontent2/source/text/shared/01/mediaplayer.xhp
index 96bbda6e87..b2ef7c3658 100755
--- a/helpcontent2/source/text/shared/01/mediaplayer.xhp
+++ b/helpcontent2/source/text/shared/01/mediaplayer.xhp
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="par_idN10577" role="paragraph" l10n="NEW">The Media Player supports many different media formats. You can also insert media files from the Media Player into your document.<comment>UFI: add a list of keyboard shortcuts to /04/ file when available</comment></paragraph>
<switch select="sys">
<case select="UNIX">
-<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in Tools - Options - %PRODUCTNAME - Java.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN105EF" role="note" l10n="NEW">On Linux or Solaris systems, the Media Player requires the Java Media Framework API (JMF). Download and install the JMF files from http://java.sun.com/javase/technologies/desktop/media/jmf/index.jsp and add the path to the installed jmf.jar to the class path in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.</paragraph>
</case>
<case select="WIN">
<paragraph xml-lang="en-US" id="par_idN1064F" role="note" l10n="NEW">On Windows systems, the Media Player uses DirectShow, which should be installed on your system by default.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index 16f167c6dd..85290b0b35 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -54,7 +54,7 @@
<paragraph xml-lang="en-US" id="par_id6797082" role="paragraph" l10n="CHG"><ahelp hid=".">You can check for updates manually or automatically.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id4218878" role="note" l10n="NEW">Checking for updates will also look for updates of all installed extensions.</paragraph>
<paragraph xml-lang="en-US" id="par_id8132267" role="paragraph" l10n="NEW">Choose <item type="menuitem">Help - Check for Updates</item> to check manually.</paragraph>
- <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
@@ -66,7 +66,7 @@
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id9951780" role="paragraph" l10n="NEW">Enable an Internet connection for %PRODUCTNAME.</paragraph>
- <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in Tools - Options - Internet - Proxy.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6479384" role="paragraph" l10n="CHG">If you need a proxy server, enter the proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3639027" role="paragraph" l10n="NEW">Choose <item type="menuitem">Check for Updates</item> to check for the availability of a newer version of your office suite.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index e0a8bb8e59..8e15c1d231 100644
--- a/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -46,7 +46,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_DLG_CHECKFORONLINEUPDATE" id="bm_id2912686" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_CHECK_FOR_UPD_DLG" id="bm_id9766533" localize="false"/><paragraph role="heading" id="hd_id4959257" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/online_update_dialog.xhp">Check for Updates</link></paragraph><comment>UFI: this is the dialog</comment><paragraph role="paragraph" id="par_id1906491" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Checks for available updates to your version of %PRODUCTNAME. If a newer version is available, you can choose to download the update. After downloading, if you have write permissions for the installation directory, you can install the update.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id4799340" xml-lang="en-US" l10n="NEW">Once the download starts, you see a progress bar and three buttons on the dialog. You can pause and resume the download by clicking the Pause and Resume buttons. Click Cancel to abort the download and delete the partly downloaded file.</paragraph>
-<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in Tools - Options - %PRODUCTNAME - Online Update.</paragraph>
+<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Online Update.</paragraph>
<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">After the download is complete, you can click Install to start the installation of the update. You see a confirmation dialog, where you can choose to close %PRODUCTNAME.</paragraph>
<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
<paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
diff --git a/helpcontent2/source/text/shared/01/webhtml.xhp b/helpcontent2/source/text/shared/01/webhtml.xhp
index 1a632f39ff..176ca62e50 100644
--- a/helpcontent2/source/text/shared/01/webhtml.xhp
+++ b/helpcontent2/source/text/shared/01/webhtml.xhp
@@ -50,7 +50,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#webhtml"/>
</section>
-<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem">Tools - Options - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
-<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem">Tools - Options - Load/Save - HTML Compatibility</item>.</paragraph>
+<paragraph role="paragraph" id="par_id9186681" xml-lang="en-US" l10n="NEW">The HTML formatted copy is written to the temporary files folder that you can select in <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</item>. When you quit %PRODUCTNAME, the HTML file will be deleted.</paragraph>
+<paragraph role="paragraph" id="par_id5871150" xml-lang="en-US" l10n="NEW">You can set the HTML export filter options by choosing <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</item>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170000.xhp b/helpcontent2/source/text/shared/02/01170000.xhp
index 0932ade91b..be8b685c1a 100644
--- a/helpcontent2/source/text/shared/02/01170000.xhp
+++ b/helpcontent2/source/text/shared/02/01170000.xhp
@@ -89,7 +89,7 @@
<paragraph role="note" id="par_idN10B21" xml-lang="en-US" l10n="NEW"><link href="text/shared/guide/xforms.xhp">XML Form documents</link> (XForms) use the same controls.</paragraph>
<paragraph role="paragraph" id="par_id3152771" xml-lang="en-US" l10n="CHG" oldref="45">To create a form, open a document and use the Form Controls toolbar to add and define the form controls. If you want, you can also link the form to a database, so that you can use the controls to manipulate a database.</paragraph>
<paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="U" oldref="46">When you create a form in an HTML document, you can use the form to send data over the Internet.</paragraph>
-<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph>Tools - Options - Load/Save - HTML Compatibility</emph>.</paragraph>
+<paragraph role="note" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="47">%PRODUCTNAME only exports the form properties that are supported by the HTML version that you export to. To specify the HTML version, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>.</paragraph>
<paragraph role="heading" id="par_idN10C39" xml-lang="en-US" level="2" l10n="NEW">To add a control to a document</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index 7d98745f6b..e22f0e1953 100755
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -44,7 +44,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
- <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph>Tools - Options - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
+ <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
<paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
<embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
</body>
diff --git a/helpcontent2/source/text/shared/02/02020000.xhp b/helpcontent2/source/text/shared/02/02020000.xhp
index c798dee171..dbc69fef91 100644
--- a/helpcontent2/source/text/shared/02/02020000.xhp
+++ b/helpcontent2/source/text/shared/02/02020000.xhp
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="par_id3153750" role="paragraph" l10n="U" oldref="10">You can enter several fonts, separated by semicolons. $[officename] uses each named font in succession if the previous fonts are not available.</paragraph>
</section>
<paragraph xml-lang="en-US" id="par_id3153394" role="paragraph" l10n="U" oldref="11">Any font changes apply to the selected text or word in which the cursor is positioned. If no text has been selected, the font applies to text typed afterwards.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph>Tools - Options - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155941" role="paragraph" l10n="U" oldref="8">The last five font names that have been selected are shown in the top part of the combo box, if you have marked the <emph>Font history</emph> field in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - View</emph>. As soon as you close your document, the normal alphabetic numbering of the installed fonts will be recreated.</paragraph>
<section id="syschriftart">
<table id="tbl_id3159399">
<tablerow>
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 15eb8adf11..627aa85d26 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -224,8 +224,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10BC0" role="tablecontent" l10n="NEW"><switchinline select="sys"><caseinline select="MAC">Control</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+M</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_idN10BE8" role="tablecontent" l10n="NEW">Removes direct formatting from selected text or objects (as in <emph>Format - Default Formatting</emph>)</paragraph>
@@ -375,8 +374,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Y</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147095" role="tablecontent" l10n="U" oldref="351"><switchinline select="sys"><caseinline select="MAC">Command+Shift+Z</caseinline><defaultinline>Ctrl+Y</defaultinline></switchinline></paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id3150345" role="tablecontent" l10n="U" oldref="352">Redoes last action.</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index 7bc523b0cb..2f0c438f0b 100755
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.xhp
@@ -57,14 +57,14 @@ DEDR: Reviewed</lastedited>
<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
<paragraph role="tip" id="par_idN10634" xml-lang="en-US" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task.</paragraph>
-<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="3">Tips</paragraph>
<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
-<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
-<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
<section id="relatedtopics">
<embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
<embed href="text/shared/05/00000110.xhp#00000110"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/02010100.xhp b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
index 6f8bedd9dd..94808b2a6d 100755
--- a/helpcontent2/source/text/shared/explorer/database/02010100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/02010100.xhp
@@ -165,8 +165,7 @@
<paragraph role="paragraph" id="par_id3154585" xml-lang="en-US" l10n="U" oldref="36">Here you can enter one additional criterion for filtering in each line. Multiple criteria in one column will be connected by an OR link.</paragraph>
<paragraph role="paragraph" id="par_id3148800" xml-lang="en-US" l10n="U" oldref="150">You can also use the context menu of the line headers in the lower area of the query design to insert another line for functions:</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_QRYDGN_ROW_FUNCTION" id="bm_id3153275" localize="false"/><paragraph role="heading" id="hd_id3148419" xml-lang="en-US" level="3" l10n="U" oldref="151">Functions</paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
+<paragraph role="paragraph" id="par_id3153233" xml-lang="en-US" l10n="CHG" oldref="152"><ahelp hid="HID_QRYDGN_ROW_FUNCTION" visibility="hidden">Select a function to run in the query here.</ahelp> The functions you can run here depend on the database. </paragraph>
<paragraph role="paragraph" id="par_id8760818" xml-lang="en-US" l10n="CHG">If you are working with the HSQL database, the list box in the <emph>Function</emph> row offers you the following options:</paragraph>
<table id="tbl_id3148461">
<tablerow>
@@ -258,8 +257,6 @@
</tablecell>
</tablerow>
</table>
-</case>
-</switch>
<paragraph role="paragraph" id="par_id3156038" xml-lang="en-US" l10n="U" oldref="189">You can also enter function calls directly into the SQL statement. The syntax is:</paragraph>
<paragraph role="paragraph" id="par_id3156340" xml-lang="en-US" l10n="U" oldref="190">SELECT FUNCTION(column) FROM table.</paragraph>
<paragraph role="paragraph" id="par_id3155075" xml-lang="en-US" l10n="U" oldref="191">For example, the function call in SQL for calculating a sum is:</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/05030100.xhp b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
index 3a4584273f..e5fdaf3cca 100644
--- a/helpcontent2/source/text/shared/explorer/database/05030100.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/05030100.xhp
@@ -65,8 +65,7 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id3149164"><bookmark_value>primary keys; defining</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN" id="bm_id3148564" localize="false"/><paragraph role="heading" id="hd_id3149164" xml-lang="en-US" level="3" l10n="U" oldref="24">Create primary key</paragraph>
-<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN"> Automatically generates a primary key data field and fills it with values.</ahelp><switchinline select="distrib"><caseinline select="COMMERCIAL">You should use this field if you copy a dBASE table to the Adabas format, since in the Adabas format a primary key must always be available in order to edit the table.
-</caseinline></switchinline></paragraph>
+<paragraph role="paragraph" id="par_id3155922" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="DBACCESS_CHECKBOX_TAB_WIZ_COPYTABLE_CB_PRIMARY_COLUMN">Automatically generates a primary key data field and fills it with values.</ahelp> You should always use this field, since a primary key must always be available in order to edit the table.</paragraph>
<bookmark xml-lang="en-US" branch="hid/DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME" id="bm_id3147303" localize="false"/><paragraph role="heading" id="hd_id3146794" xml-lang="en-US" level="3" l10n="U" oldref="26">Name</paragraph>
<paragraph role="paragraph" id="par_id3156343" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="DBACCESS_EDIT_TAB_WIZ_COPYTABLE_ET_KEYNAME">Specifies a name for the primary key generated. This name is optional.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3151056" xml-lang="en-US" l10n="U" oldref="33"><link href="text/shared/explorer/database/05030200.xhp" name="Next page">Next page</link></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..e342a04932 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -44,11 +44,9 @@
</meta>
<body>
<paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
-<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
-<paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
+<paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">The Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
<paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
-<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The Adabas database that you may have installed together with $[officename] is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
+<paragraph role="paragraph" id="par_id3151111" xml-lang="en-US" l10n="CHG" oldref="4">The free available Adabas database is restricted to a size of 100 MB, and a maximum of three users on a network. See the "License.txt" file in the Adabas directory for more details. The Adabas database must be installed in a separate directory from $[officename].</paragraph>
<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="97">The name of an Adabas file cannot exceed 8 characters. The path to the Adabas file, including the file name, cannot exceed 30 characters, and must be compliant with the 7-bit ASCII code. Both the path and the file name cannot contain spaces.</paragraph>
<paragraph role="note" id="par_id3153254" xml-lang="en-US" l10n="U" oldref="6">Under Windows, the Adabas setup application adds the DBROOT environment variable that contains the path information for the database. If the setup application finds this variable, it does not install the database.</paragraph>
<paragraph role="heading" id="hd_id3154729" xml-lang="en-US" level="2" l10n="U" oldref="37">Create New Adabas Database</paragraph>
@@ -65,7 +63,7 @@
</listitem>
</list>
<paragraph role="heading" id="hd_id3154270" xml-lang="en-US" level="2" l10n="U" oldref="42">Deleting an Adabas Database</paragraph>
-<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph>Tools - Options - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3157869" xml-lang="en-US" l10n="CHG" oldref="43">To delete the reference to an Adabas database, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Base - Databases</emph>. Select the database, and then click <emph>Delete</emph>.</paragraph>
<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
index 4880d01ebc..08610b7580 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropadd.xhp
@@ -76,8 +76,7 @@
<paragraph role="tip" id="par_idN10718" xml-lang="en-US" l10n="NEW">To view changes that you make to the database, close the connection to the database, and then reconnect to the database.</paragraph>
<paragraph role="heading" id="par_idN1059D" xml-lang="en-US" level="2" l10n="NEW">Indexes<comment>UFI: seen for dBase</comment></paragraph>
<paragraph role="paragraph" id="par_idN10725" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Opens the Indexes dialog, where you can organize the table indexes in the current dBASE database.</ahelp><comment>UFI: removed link from extended help text</comment></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><comment>UFI: Commercial means Adabas</comment><paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
+<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Data buffer size (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10742" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size of the data buffer for the database. The setting takes effect after you restart the database.</ahelp><comment>copied from shared\explorer\database\11170000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105A5" xml-lang="en-US" level="2" l10n="NEW">Data increment (MB)</paragraph>
<paragraph role="paragraph" id="par_idN10761" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the size by which you want to automatically increment the database. The maximum increment size is 100 MB. The setting takes effect after you restart the database.</ahelp></paragraph>
@@ -89,8 +88,6 @@
<paragraph role="paragraph" id="par_idN10788" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Exits the Adabas database server when you exit $[officename]. This option is only available if you start the database server from $[officename] with a control user and password.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105B5" xml-lang="en-US" level="2" l10n="NEW">Extended</paragraph>
<paragraph role="paragraph" id="par_idN10795" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/11170100.xhp" name="Database Statistics">Database Statistics</link> dialog, where you can view statistics about the Adabas database.</ahelp></paragraph>
-</case>
-</switch>
<paragraph role="heading" id="par_idN105B9" xml-lang="en-US" level="2" l10n="NEW">Text contains headers<comment>UFI: the following found for a text file folder, but HELP Ids are somewhere else</comment></paragraph>
<paragraph role="paragraph" id="par_idN107B0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select this check box if the first line of the text file contains field names.</ahelp><comment>copied from shared\explorer\database\11040000.xhp</comment></paragraph>
<paragraph role="heading" id="par_idN105BD" xml-lang="en-US" level="2" l10n="NEW">Field separator</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
index 19a732b0b3..b16b97effd 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabapropgen.xhp
@@ -88,9 +88,5 @@
<paragraph role="paragraph" id="par_idN10609" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Tests the database connection through the JDBC driver class.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10613" xml-lang="en-US" level="3" l10n="NEW">Choose a database</paragraph>
<paragraph role="paragraph" id="par_idN10617" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a database from the list or click <emph>Create</emph> to create a new database.</ahelp></paragraph>
-<switch select="distrib">
-<case select="COMMERCIAL"><paragraph role="heading" id="par_idN1061E" xml-lang="en-US" level="3" l10n="NEW">Create</paragraph>
-<paragraph role="paragraph" id="par_idN10622" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/explorer/database/30100000.xhp">Create New Adabas D Database</link> dialog.</ahelp></paragraph>
-</case>
-</switch></body>
+</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
index 3c78b6b1d6..62dc482ef6 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp
@@ -51,7 +51,7 @@
<paragraph role="heading" id="par_idN10623" xml-lang="en-US" level="2" l10n="NEW">JDBC Examples</paragraph>
<paragraph role="paragraph" id="par_idN10627" xml-lang="en-US" l10n="NEW">
<item type="productname">You can use a JDBC driver class to connect to a JDBC database from %PRODUCTNAME</item>. The driver class is provided by the database manufacturer. Two examples of JDBC databases are Oracle and MySQL.</paragraph>
-<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in Tools - Options - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
+<paragraph role="note" id="par_idN1062D" xml-lang="en-US" l10n="CHG">The driver classes must be added to %PRODUCTNAME in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java.<comment>UFI: #i38525#</comment></paragraph>
<paragraph role="heading" id="par_idN10634" xml-lang="en-US" level="3" l10n="NEW">Oracle database</paragraph>
<paragraph role="paragraph" id="par_idN10638" xml-lang="en-US" l10n="NEW">You can use a JDBC driver to access an Oracle database from Solaris or Linux. To access the database from Windows, you need an ODBC driver.</paragraph>
<switch select="sys">
@@ -96,7 +96,7 @@
<bookmark xml-lang="en-US" branch="hid/852330580" id="bm_id7055879" localize="false"/><paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph>
<paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph>
<section id="classpath">
-<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph>Tools - Options - %PRODUCTNAME</emph>
+<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph>
<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/852251216" id="bm_id3968932" localize="false"/><paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index e98a063af7..0e8add313f 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -82,7 +82,7 @@
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4044312" role="paragraph" l10n="NEW">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/java.xhp">Java</link>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id1369060" role="paragraph" l10n="NEW">Wait up to one minute, while %PRODUCTNAME collects information on installed Java software on your system.</paragraph>
@@ -95,7 +95,7 @@
<paragraph xml-lang="en-US" id="par_id7730033" role="paragraph" l10n="NEW">Ensure that <emph>Use a Java runtime environment</emph> is enabled.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open Tools - Options - %PRODUCTNAME - Java again.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6317636" role="paragraph" l10n="NEW">If no JRE version is found on your system, open your web browser and download the JRE software from <link href="http://www.java.com">http://www.java.com</link>. Install the JRE software. Then restart %PRODUCTNAME and open <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java again.</paragraph>
<paragraph xml-lang="en-US" id="hd_id9759514" role="heading" level="2" l10n="NEW">To open the Report Builder</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..8386b205a7 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -59,7 +59,7 @@
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3146957" l10n="U" xml-lang="en-US" oldref="8">Zooming of on-screen user interface for menus, icons, and documents</paragraph>
- <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
+ <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
</listitem>
</list>
<paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
index 13c0439eed..d883000689 100755
--- a/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
+++ b/helpcontent2/source/text/shared/guide/active_help_on_off.xhp
@@ -58,7 +58,7 @@
<paragraph role="heading" id="hd_id3155339" xml-lang="en-US" level="3" l10n="U" oldref="3">To turn Extended Tips on and off:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph>Tools - Options - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154823" xml-lang="en-US" l10n="CHG" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>, and check <emph>Extended tips</emph>.</paragraph>
<paragraph role="listitem" id="par_id3149398" xml-lang="en-US" l10n="CHG" oldref="5">A check mark indicates that the extended tips are activated.</paragraph>
</listitem>
</list>
diff --git a/helpcontent2/source/text/shared/guide/collab.xhp b/helpcontent2/source/text/shared/guide/collab.xhp
index 928c7664c8..386f9e6a8e 100644
--- a/helpcontent2/source/text/shared/guide/collab.xhp
+++ b/helpcontent2/source/text/shared/guide/collab.xhp
@@ -62,7 +62,7 @@
<bookmark xml-lang="en-US" branch="hid/sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE" id="bm_id7900021" localize="false"/>
<paragraph xml-lang="en-US" id="par_id2519913" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable to share the current document with other users. Disable to use the document unshared. This will invalidate the not yet saved edits that other users applied in the time since you last opened or saved this document.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="hd_id6917020" role="heading" level="2" l10n="NEW">Collaboration in Calc</paragraph>
- <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph>Tools - Options - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id4411145" role="paragraph" l10n="NEW">In %PRODUCTNAME Calc, document sharing allows simultaneous write access for many users. Every user who wants to collaborate should enter a name on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph> tab page.</paragraph>
<paragraph xml-lang="en-US" id="par_id6799218" role="warning" l10n="NEW">Some commands are not available (grayed out) when change tracking or document sharing is activated. For a new spreadsheet you cannot apply or insert the grayed out elements. <comment>Spec Doc owner told me that this is work in progress and may change any time</comment></paragraph>
<paragraph xml-lang="en-US" id="hd_id3274941" role="heading" level="3" l10n="NEW">Creating a new spreadsheet</paragraph>
<paragraph xml-lang="en-US" id="par_id9804681" role="paragraph" l10n="NEW">User A creates a new spreadsheet document. The following conditions can apply:</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_autosave.xhp b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
index f98667aeb4..dc1ab1d09b 100755
--- a/helpcontent2/source/text/shared/guide/doc_autosave.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_autosave.xhp
@@ -71,7 +71,7 @@
<paragraph role="paragraph" id="par_id3149797" xml-lang="en-US" l10n="CHG" oldref="6">If the <emph>Always create backup copy</emph> option is selected, the old version of the file is saved to the backup directory whenever you save the current version of the file. </paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph>Tools - Options - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
+<paragraph role="listitem" id="par_id3148685" xml-lang="en-US" l10n="CHG" oldref="7">You can change the backup directory by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>, then change the <emph>Backups</emph> path in the dialog.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3149415" xml-lang="en-US" l10n="U" oldref="8">The backup copy has the same name as the document, but the extension is .BAK. If the backup folder already contains such a file, it will be overwritten without warning.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/doc_open.xhp b/helpcontent2/source/text/shared/guide/doc_open.xhp
index 745b7ebecf..b244b7e5ba 100644
--- a/helpcontent2/source/text/shared/guide/doc_open.xhp
+++ b/helpcontent2/source/text/shared/guide/doc_open.xhp
@@ -75,7 +75,7 @@
<paragraph role="paragraph" id="par_id3150985" xml-lang="en-US" l10n="CHG" oldref="14">To restrict the display of files in the <emph>Open</emph> dialog to a certain type select the corresponding <emph>File type</emph> from the list. Select <emph>All Files (*.*)</emph> to display all files.</paragraph>
<paragraph role="heading" id="hd_id4651326" xml-lang="en-US" level="3" l10n="NEW">Cursor Position</paragraph>
<paragraph role="paragraph" id="par_id5509201" xml-lang="en-US" l10n="NEW">In general, all documents open with the cursor at the start of the document. </paragraph>
-<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph>Tools - Options - %PRODUCTNAME - User Data</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id6594744" xml-lang="en-US" l10n="NEW">One exception appears when the author of a Writer text document saves and reopens a document: The cursor will be at the same position where it has been when the document was saved. This only works when the name of the author was entered in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - User Data</emph>.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="paragraph" id="par_id3422650" xml-lang="en-US" l10n="NEW">Press Shift+F5 to set the cursor to the last saved position.</paragraph>
@@ -88,7 +88,7 @@
<paragraph role="paragraph" id="par_id0820200803501356" xml-lang="en-US" l10n="NEW">On most operating systems, you can choose to use the system file dialogs or %PRODUCTNAME dialogs.</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
+<paragraph role="paragraph" id="par_id0820200803501429" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</item> to switch the type of open/save dialogs.</paragraph>
</listitem>
</list>
<paragraph role="paragraph" id="par_id0820200803501449" xml-lang="en-US" l10n="NEW">The %PRODUCTNAME dialogs support file download and upload using secure https connections.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/export_ms.xhp b/helpcontent2/source/text/shared/guide/export_ms.xhp
index 32f416c834..ff7cb4e1ae 100755
--- a/helpcontent2/source/text/shared/guide/export_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/export_ms.xhp
@@ -69,7 +69,7 @@
<paragraph role="listitem" id="par_id3150985" xml-lang="en-US" l10n="U" oldref="4">Enter a name in the <emph>File name</emph> box and click <emph>Save</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph>Tools - Options - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3153252" xml-lang="en-US" l10n="CHG" oldref="7">If you want the file dialogs to offer another file format as default, select that format in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> in the <emph>Default file format </emph>area.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/doc_save.xhp#doc_save"/>
diff --git a/helpcontent2/source/text/shared/guide/flat_icons.xhp b/helpcontent2/source/text/shared/guide/flat_icons.xhp
index b01bc6ebdc..642460bbd6 100755
--- a/helpcontent2/source/text/shared/guide/flat_icons.xhp
+++ b/helpcontent2/source/text/shared/guide/flat_icons.xhp
@@ -58,7 +58,7 @@ checked -yj</lastedited>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="CHG" oldref="4">You can change the icon view between small and large icons.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph>Tools - Options - $[officename]</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="5">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename]</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3163802" xml-lang="en-US" l10n="CHG" oldref="6">On the <emph>View</emph> tab page, select the <emph>Toolbar icon size</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index f10a2fcbb1..2a04b8347a 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -56,7 +56,7 @@
<paragraph role="listitem" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="47">Choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> and specify in the <emph>Save URLs relative to</emph> field if $[officename] creates <link href="text/shared/00/00000005.xhp#speichern" name="relative or absolute hyperlinks">relative or absolute hyperlinks</link>. Relative linking is only possible when the document you are working on and the link destination are on the same drive.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph>Tools - Options - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
+<paragraph role="listitem" id="par_id3145382" xml-lang="en-US" l10n="U" oldref="48">You should create the same directory structure on your hard disk as that which exists in the web space hosted by your Internet provider. Call the root directory for the homepage on your hard disk "homepage", for example. The start file is then "index.html", the full path being "C:\homepage\index.html" (assuming Windows operating system). The URL on your Internet provider's server might then be as follows: "http://www.myprovider.com/mypage/index.html". With relative addressing, you indicate the link relative to the location of the output document. For example, if you placed all the graphics for your homepage in a subfolder called "C:\homepage\images", you would need to give the following path to access the graphic "picture.gif": "images\picture.gif". This is the relative path, starting from the location of the file "index.html". On the provider's server, you would place the picture in the folder "mypage/images". When you transfer the document "index.html" to the provider's server through the <emph>File - Save As</emph> dialog, and if you have marked the option <emph>Copy local graphics to Internet</emph> under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - HTML Compatibility</emph>, $[officename] will automatically copy the graphic to the correct directory on the server.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index b4204c518e..8f5d9fb7cc 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -71,7 +71,7 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph" l10n="NEW">Use the icons in the ImageMap Editor to draw a hotspot shape, for example a rectangle, over the image at the background.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph>Tools - Options - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106A3" role="paragraph" l10n="NEW">You can see an extended help text on the functions of each icon when you enable Extended Help in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_idN106AB" role="paragraph" l10n="NEW">Enter the "Address" URL that will be shown in a Web browser when the user clicks the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index e61306daf5..e4b07cee04 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -73,7 +73,7 @@
<paragraph role="listitem" id="par_id3148491" xml-lang="en-US" l10n="U" oldref="6">Select a file name and click <emph>Open</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph>Tools - Options - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3159399" xml-lang="en-US" l10n="CHG" oldref="8">If you always want the file dialogs to show another format by default, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - General</emph> and select that format as <emph>Default file format</emph>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="9">Converting all documents of a folder</paragraph>
<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="CHG" oldref="10">Open the wizard, which guides you through the operation, to copy and convert all documents from Microsoft Word, Microsoft Excel or Microsoft PowerPoint into OpenDocument file format documents. You can select a source and target directory, specify whether to convert documents and/or templates, and more besides.</paragraph>
<list type="unordered">
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index b96480ce25..e266af1ca9 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -188,7 +188,7 @@
<list type="unordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3148405" role="listitem" l10n="U" oldref="56">Use the arrow keys to move the selected object by one grid resolution unit.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
diff --git a/helpcontent2/source/text/shared/guide/language_select.xhp b/helpcontent2/source/text/shared/guide/language_select.xhp
index 098ffc45c1..2e5b906d50 100755
--- a/helpcontent2/source/text/shared/guide/language_select.xhp
+++ b/helpcontent2/source/text/shared/guide/language_select.xhp
@@ -69,7 +69,7 @@
<paragraph xml-lang="en-US" id="hd_id3146121" role="heading" level="2" l10n="U" oldref="6">Selecting a language for the whole document</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph>Tools - Options</emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3083443" role="listitem" l10n="U" oldref="7">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>. Go to <link href="text/shared/optionen/01140000.xhp" name="Language Settings - Languages"><emph>Language Settings - Languages</emph></link>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149664" role="listitem" l10n="U" oldref="8">Under <emph>Default languages for documents</emph>, select the document language for all newly created documents. If you mark <emph>For the current document only</emph>, your choice will only apply to the current document. Close the dialog with <emph>OK</emph>.</paragraph>
@@ -151,7 +151,7 @@
<paragraph xml-lang="en-US" id="par_id3912778" role="paragraph" l10n="CHG">Most users download the American English version, which gives you English menu commands and English application help. If you want another language for the menus (and for the application help, if available in that language), change the UI language as follows.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem">Tools - Options - Language Settings - Languages</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163853" role="paragraph" l10n="NEW">Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</item>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id121158" role="paragraph" l10n="NEW">Select another UI language in the "User interface" listbox.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/measurement_units.xhp b/helpcontent2/source/text/shared/guide/measurement_units.xhp
index e0abf3e302..f8ea0a0e1a 100755
--- a/helpcontent2/source/text/shared/guide/measurement_units.xhp
+++ b/helpcontent2/source/text/shared/guide/measurement_units.xhp
@@ -59,7 +59,7 @@
<paragraph role="listitem" id="par_idN10674" xml-lang="en-US" l10n="NEW">Open a document of the type for which you want to change the measurement units.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph>Tools - Options</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3153345" xml-lang="en-US" l10n="U" oldref="3">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="4">In the left pane of the dialog, double-click the application for which you want to select the measurement unit.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
index f230251017..c5ccc9a5e6 100644
--- a/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_import_export_limitations.xhp
@@ -49,7 +49,7 @@
<paragraph role="heading" id="hd_id3152425" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="about"><link href="text/shared/guide/ms_import_export_limitations.xhp" name="About Converting Microsoft Office Documents">About Converting Microsoft Office Documents</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3147834" xml-lang="en-US" l10n="U" oldref="2">$[officename] can automatically open Microsoft Office 97/2000/XP documents. However, some layout features and formatting attributes in more complex Microsoft Office documents are handled differently in $[officename] or are unsupported. As a result, converted files require some degree of manual reformatting. The amount of reformatting that can be expected is proportional to the complexity of the structure and formatting of the source document. $[officename] cannot run Visual Basic Scripts, but can load them for you to analyze.</paragraph>
-<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804174819" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can load, but not save, the Microsoft Office Open XML document formats with the extensions docx, xlsx, and pptx. The same versions can also run some Excel Visual Basic scripts, if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3155934" xml-lang="en-US" l10n="U" oldref="3">The following lists provide a general overview of Microsoft Office features that may cause conversion challenges. These will not affect your ability to use or work with the content of the converted document.</paragraph>
<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="2" l10n="U" oldref="6">Microsoft Word</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/guide/ms_user.xhp b/helpcontent2/source/text/shared/guide/ms_user.xhp
index 0ba1818bd2..6e77f75d76 100755
--- a/helpcontent2/source/text/shared/guide/ms_user.xhp
+++ b/helpcontent2/source/text/shared/guide/ms_user.xhp
@@ -125,7 +125,7 @@
</list>
<paragraph role="heading" id="hd_id3154319" xml-lang="en-US" level="2" l10n="U" oldref="23">Macros in Microsoft Office and $[officename]</paragraph>
<paragraph role="paragraph" id="par_id3154921" xml-lang="en-US" l10n="U" oldref="24">With a few exceptions, Microsoft Office and $[officename] cannot run the same macro code. Microsoft Office uses VBA (Visual Basic for Applications) code, and $[officename] uses Basic code based on the $[officename] API (Application Program Interface) environment. Although the programming language is the same, the objects and methods are different.</paragraph>
-<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem">Tools - Options - Load/Save - VBA Properties</item>.</paragraph>
+<paragraph role="note" id="par_id0804200804173539" xml-lang="en-US" l10n="NEW">The most recent versions of %PRODUCTNAME can run some Excel Visual Basic scripts if you enable this feature at <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Load/Save - VBA Properties</item>.</paragraph>
<paragraph role="paragraph" id="par_id3152577" xml-lang="en-US" l10n="U" oldref="25">If you use macros in one of the applications and want to use the same functionality in the other application, you must edit the macros. $[officename] can load the macros that are contained within Microsoft Office files and you can then view and edit the macro code in the $[officename] <link href="text/shared/main0600.xhp" name="Basic IDE">Basic IDE</link> editor.</paragraph>
<paragraph role="heading" id="hd_id3152596" xml-lang="en-US" level="3" l10n="U" oldref="26">You can choose to preserve or delete VBA macros</paragraph>
<paragraph role="paragraph" id="par_id3153144" xml-lang="en-US" l10n="U" oldref="27">Open a Microsoft Office document that contains VBA macro code. Change only the normal contents (text, cells, graphics), and do not edit the macros. Save the document as a Microsoft Office file type. Open the file in Microsoft Office, and the VBA macros will run as before.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
index 6a430cb51f..d0316f3bdf 100755
--- a/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
+++ b/helpcontent2/source/text/shared/guide/print_blackwhite.xhp
@@ -69,15 +69,7 @@
<paragraph role="heading" id="hd_id3147653" xml-lang="en-US" level="2" l10n="U" oldref="9">Printing in black and white in <item type="productname">%PRODUCTNAME</item> Impress and <item type="productname">%PRODUCTNAME</item> Draw</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Impress </emph>or <emph>Tools - Options - </emph>
-<emph>
-<item type="productname">%PRODUCTNAME</item>
-</emph>
-<emph> Draw</emph>, as appropriate.</paragraph>
+<paragraph role="listitem" id="par_id3149233" xml-lang="en-US" l10n="CHG" oldref="10">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> Impress</emph>or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <item type="productname">%PRODUCTNAME</item> Draw</emph>, as appropriate.</paragraph>
</listitem>
<listitem>
<paragraph role="listitem" id="par_id3150275" xml-lang="en-US" l10n="U" oldref="11">Then choose <emph>Print</emph>.</paragraph>
@@ -96,11 +88,11 @@
<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="19">Printing all text documents with black and white text</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="listitem" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Tools - Options - </emph>
+<paragraph role="listitem" id="par_id3150541" xml-lang="en-US" l10n="U" oldref="20">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - </emph>
<emph>
<item type="productname">%PRODUCTNAME</item>
</emph>
-<emph> Writer </emph>or <emph>Tools - Options - </emph>
+<emph> Writer </emph>or <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - </emph>
<emph>
<item type="productname">%PRODUCTNAME</item>
</emph>
diff --git a/helpcontent2/source/text/shared/guide/print_faster.xhp b/helpcontent2/source/text/shared/guide/print_faster.xhp
index 6ae84df1a2..154cec9f17 100755
--- a/helpcontent2/source/text/shared/guide/print_faster.xhp
+++ b/helpcontent2/source/text/shared/guide/print_faster.xhp
@@ -60,7 +60,7 @@
<paragraph role="paragraph" id="par_idN106C8" xml-lang="en-US" l10n="NEW">You can decide to reduce the data necessary to print your document. The settings can be defined differently for printing directly to the printer or for printing to a file.</paragraph>
<list type="ordered">
<listitem>
-<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph>Tools - Options - $[officename] - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CE" xml-lang="en-US" l10n="NEW">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Print</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_idN106D6" xml-lang="en-US" l10n="NEW">Click one of the following settings options: </paragraph>
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index ba20ac7a54..0dbea570e8 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -85,7 +85,7 @@
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
<paragraph role="paragraph" id="par_id3153542" xml-lang="en-US" l10n="U" oldref="14">To stop recording changes, choose <emph>Edit - Changes - Record</emph> again. The check mark is removed and you can now save the document.</paragraph>
<paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="15">In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example.</paragraph>
-<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph>Tools - Options - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph>Tools - Options - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3147530" xml-lang="en-US" l10n="CHG" oldref="16">To change the settings for tracking changes, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer</emph> - <link href="text/shared/optionen/01040700.xhp" name="Changes"><emph>Changes</emph></link> or on the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc</emph> - <link href="text/shared/optionen/01060600.xhp" name="Changes"><emph>Changes</emph></link>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/shared/guide/redlining.xhp#redlining"/>
<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index bfcb8a69a3..7e25049336 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -207,7 +207,7 @@
<paragraph role="paragraph" id="par_id3147506" xml-lang="en-US" l10n="U" oldref="303">You can now send faxes by printing to the printer that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3148419" xml-lang="en-US" l10n="U" oldref="83">Enter the fax number as text in the document. You can also enter a field that takes the fax number from your active database. In any case, the fax number must start with the characters @@# and end with @@. A valid entry would have the form @@#1234567@@.</paragraph>
<paragraph role="paragraph" id="par_id3150826" xml-lang="en-US" l10n="U" oldref="304">If these characters including the telephone number are not printed, activate the <emph>Fax number is removed from the printout</emph> option under <emph>Properties</emph> on the <emph>Command</emph> tab page. If no telephone number is entered in the document, a dialog prompting you for it will appear after the printout.</paragraph>
-<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph>Tools - Options - %PRODUCTNAME Writer - Print</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="305">In $[officename] you can also activate an icon for sending faxes to a default fax. To do this, choose <emph>Tools - Customize - Toolbars</emph>, click <emph>Add Commands</emph> and add from "Documents" the <emph>Send Default Fax</emph> icon. You can set which fax is used when this button is pressed under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Print</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3150517" xml-lang="en-US" l10n="CHG" oldref="84">Remember to create one separate print job for each fax, otherwise, the first recipient will receive all the faxes. In the <emph>Tools - Mail Merge</emph> dialog select the <emph>Printer</emph> option and then select the <emph>Single print jobs</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3149490" xml-lang="en-US" l10n="E" oldref="344" localize="false"/>
<paragraph role="heading" id="hd_id3146929" xml-lang="en-US" level="2" l10n="U" oldref="306">Connecting a PostScript to PDF Converter</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/standard_template.xhp b/helpcontent2/source/text/shared/guide/standard_template.xhp
index fc267590f9..125819ac2d 100755
--- a/helpcontent2/source/text/shared/guide/standard_template.xhp
+++ b/helpcontent2/source/text/shared/guide/standard_template.xhp
@@ -72,7 +72,7 @@
<paragraph role="paragraph" id="par_id3154011" xml-lang="en-US" l10n="U" oldref="9">Choose <emph>File - Templates - Organize</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3145799" xml-lang="en-US" l10n="CHG" oldref="11">Double-click <emph>My Templates</emph> in the list on the left. You will see the user-defined templates in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>. Select the template you have just saved and open the context menu or open the submenu of the <emph>Commands</emph> button.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id3146901" xml-lang="en-US" l10n="U" oldref="26">Choose <emph>Set As Default Template</emph>. The next time you open a new text document, the new document will be based on the new default template.</paragraph>
@@ -91,7 +91,7 @@
<paragraph role="heading" id="hd_id3153764" xml-lang="en-US" level="2" l10n="U" oldref="13">Using Custom Templates</paragraph>
<paragraph role="paragraph" id="par_id3150386" xml-lang="en-US" l10n="CHG" oldref="14">There are several ways to make your work easier by using your own custom templates. </paragraph>
<paragraph role="heading" id="hd_id3149109" xml-lang="en-US" level="3" l10n="U" oldref="15">Templates in the Template Folder</paragraph>
-<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
+<paragraph role="paragraph" id="par_id3146918" xml-lang="en-US" l10n="CHG" oldref="16">You can save a new template with <emph>File - Templates - Save</emph> or by selecting "Template" file type in any Save dialog. Save the template in the user directory specified under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph> to be able to access the template from within the <emph>File - New - From Templates and Documents</emph> dialog.</paragraph>
<paragraph role="tip" id="par_id3155960" xml-lang="en-US" l10n="U" oldref="33">You may need to update the view of the templates in the dialog before you can see a newly created template. In this case, choose <emph>File - Templates - Organize</emph> and in the submenu of the <emph>Commands</emph> button, choose <emph>Update</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3147343" xml-lang="en-US" l10n="U" oldref="17">To open the template for editing, choose <emph>File - Templates - Edit</emph>.</paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/guide/tabs.xhp b/helpcontent2/source/text/shared/guide/tabs.xhp
index 942c37de11..8e588d8ff2 100644
--- a/helpcontent2/source/text/shared/guide/tabs.xhp
+++ b/helpcontent2/source/text/shared/guide/tabs.xhp
@@ -68,7 +68,7 @@ FPE: Deleted screenshot.</lastedited>
<paragraph role="paragraph" id="par_id1376079" xml-lang="en-US" l10n="NEW">On the horizontal ruler you can see the tab stops for the current paragraph. If you want to change the tab stops, you should first consider the scope to which you want to change tab stops as follows:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph>Tools - Options - %PRODUCTNAME Writer - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id9434492" xml-lang="en-US" l10n="NEW">Change the default tab stops for all documents: Use the menu <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - General</emph>.</paragraph>
</listitem>
<listitem>
<paragraph role="paragraph" id="par_id274971" xml-lang="en-US" l10n="NEW">Change the tab stops for all paragraphs using the current Paragraph Style: Right-click the paragraph to open the context menu, choose <emph>Edit Paragraph Style</emph>, click <emph>Tabs</emph>.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/workfolder.xhp b/helpcontent2/source/text/shared/guide/workfolder.xhp
index 85ee67bb38..aecbc43424 100755
--- a/helpcontent2/source/text/shared/guide/workfolder.xhp
+++ b/helpcontent2/source/text/shared/guide/workfolder.xhp
@@ -54,7 +54,7 @@
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="CHG" oldref="3">When you start a dialog to open or save a document, $[officename] initially displays your working directory. To change this directory:</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph>Tools - Options - $[officename] - Paths</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="listitem" l10n="U" oldref="4">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths</emph>.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3163802" role="listitem" l10n="U" oldref="5">Click <emph>My Documents </emph>and click the <emph>Edit</emph> button, or double-click on <emph>My Documents</emph>.</paragraph>
@@ -63,7 +63,7 @@
<paragraph xml-lang="en-US" id="par_id3153880" role="listitem" l10n="CHG" oldref="6">In the <emph>Select Path</emph> dialog, choose the working directory you want and click <emph>Select</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph>Tools - Options - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="7">You also use this procedure to change the directory displayed by $[officename] when you want to insert a graphic. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Paths - Graphics</emph>, then follow step 3.</paragraph>
</section>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph xml-lang="en-US" id="par_id3154286" role="paragraph" l10n="U" oldref="8"><link href="text/shared/optionen/01010300.xhp" name="Paths">Paths</link></paragraph>
diff --git a/helpcontent2/source/text/shared/main0108.xhp b/helpcontent2/source/text/shared/main0108.xhp
index 4a25d2414e..75ae5eaf17 100644
--- a/helpcontent2/source/text/shared/main0108.xhp
+++ b/helpcontent2/source/text/shared/main0108.xhp
@@ -73,7 +73,7 @@
<paragraph role="paragraph" id="par_id3157909" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".uno:HelpSupport">Shows information on how to get support.</ahelp></paragraph>
<embed href="text/shared/01/08060100.xhp#registrierung"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OnlineUpdate" id="bm_id2785119" localize="false"/><paragraph role="heading" id="hd_id2926419" xml-lang="en-US" level="2" l10n="CHG"><link href="text/shared/01/online_update.xhp">Check for Updates</link></paragraph>
-<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in Tools - Options - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id2783898" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Enable an Internet connection for %PRODUCTNAME. If you need a Proxy, check the %PRODUCTNAME Proxy settings in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet. Then choose Check for Updates to check for the availability of a newer version of your office suite.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/service:com.sun.star.tab.tabreg?purchase" id="bm_id584124" localize="false"/><paragraph role="paragraph" id="par_idN106A6" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">This menu command is visible for the evaluation version of %PRODUCTNAME. Choose to open the Purchase %PRODUCTNAME Wizard.</ahelp><comment>UFI: see spec doc "Unlocking_Evalversion_as_Fullversion.sxw" by BH</comment><comment>removed switch, changed to invisible help text</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_ABOUT" id="bm_id3757052" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:About" id="bm_id3151385" localize="false"/><paragraph role="heading" id="hd_id3153881" xml-lang="en-US" level="2" l10n="U" oldref="7">About $[officename]</paragraph>
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index b6c66f3997..2b85356a47 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -54,7 +54,7 @@
<paragraph role="listitem" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="5">Activate Java platform support by choosing <link href="text/shared/optionen/java.xhp" name="Tools - Options - $[officename] - Java"><emph>Tools - Options - $[officename] - Java</emph></link>.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose Tools - Options - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph>Tools - Options - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph>Tools - Options - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
+<paragraph role="note" id="par_id9116183" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME- Java, and click the Class Path button. After you add the path information, restart %PRODUCTNAME.</paragraph>
+<paragraph role="note" id="par_id3153822" xml-lang="en-US" l10n="U" oldref="11">Your modifications at the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Java</emph> tab page will be used even if the Java Virtual Machine (JVM, a virtual machine for the Java platform) already has been started. After modifications to the ClassPath you must restart $[officename]. The same is true for modifications under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</emph>. Only the two boxes "Http Proxy" and "Ftp Proxy" and their ports don't require a restart, they will be evaluated when you click <emph>OK</emph>.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index bf1eb94c7f..08b307cff1 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 01000000.xhp,v $
- * $Revision: 1.13 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,59 +32,66 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Options</title>
-<filename>/text/shared/optionen/01000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-06T16:27:32">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="optionen">
+ <topic id="textsharedoptionen01000000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Options</title>
+ <filename>/text/shared/optionen/01000000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="optionen">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153665"><bookmark_value>options; tools</bookmark_value>
-<bookmark_value>defaults; program configuration</bookmark_value>
-<bookmark_value>settings; program configuration</bookmark_value>
+ <bookmark_value>defaults; program configuration</bookmark_value>
+ <bookmark_value>settings; program configuration</bookmark_value>
</bookmark><comment>mw changed "settings;options" and "defaults;..."</comment>
<bookmark xml-lang="en-US" branch="hid/SID_OPTIONS_TREEDIALOG" id="bm_id8304653" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:OptionsTreeDialog" id="bm_id3147335" localize="false"/>
-<paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
-<paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153665" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151384" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156344" role="paragraph" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10607" role="note" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
-<paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#optionen"/>
-</section>
-<paragraph role="heading" id="hd_id3159149" xml-lang="en-US" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
-<embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
-<embed href="text/shared/optionen/01020000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
-<embed href="text/shared/optionen/01150000.xhp#typotext"/>
-<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="2" l10n="U" oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
-<embed href="text/shared/optionen/01030000.xhp#laden"/>
-<paragraph role="heading" id="hd_id3153188" xml-lang="en-US" level="2" l10n="CHG" oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
-<embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
-<paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="2" l10n="CHG" oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
-<embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
-<paragraph role="heading" id="hd_id3154918" xml-lang="en-US" level="2" l10n="CHG" oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
-<embed href="text/shared/optionen/01060000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3153142" xml-lang="en-US" level="2" l10n="CHG" oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
-<embed href="text/shared/optionen/01070000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3147434" xml-lang="en-US" level="2" l10n="CHG" oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
-<embed href="text/shared/optionen/01080000.xhp#allgemein"/>
-<paragraph role="heading" id="hd_id3154732" xml-lang="en-US" level="2" l10n="CHG" oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
-<embed href="text/shared/optionen/01090000.xhp#druckentext"/>
-<paragraph role="heading" id="hd_id3155418" xml-lang="en-US" level="2" l10n="CHG" oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
-<embed href="text/shared/optionen/01110000.xhp#farbe"/>
-<paragraph role="heading" id="hd_id3149420" xml-lang="en-US" level="2" l10n="CHG" oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
-<embed href="text/shared/optionen/01160000.xhp#daten"/>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3125863" role="paragraph" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#optionen"/>
+ <paragraph xml-lang="en-US" id="par_id1013200911280529" role="note" l10n="NEW">Note for Mac OS X users: The Help mentions the menu path Tools - Options at numerous places. Replace this path with %PRODUCTNAME - Preferences on your Mac OS X main menu.</paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3159149" role="heading" level="2" l10n="U" oldref="4"><link href="text/shared/optionen/01010000.xhp" name="$[officename]">%PRODUCTNAME</link></paragraph>
+ <embed href="text/shared/optionen/01010000.xhp#optionenallgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="U" oldref="3"><link href="text/shared/optionen/01020000.xhp" name="Load/Save">Load/Save</link></paragraph>
+ <embed href="text/shared/optionen/01020000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="2" l10n="U"
+ oldref="19"><link href="text/shared/optionen/01150000.xhp" name="Language Settings">Language Settings</link></paragraph>
+ <embed href="text/shared/optionen/01150000.xhp#typotext"/>
+ <paragraph xml-lang="en-US" id="hd_id3150872" role="heading" level="2" l10n="U"
+ oldref="20"><link href="text/shared/optionen/01030000.xhp" name="Internet">Internet</link></paragraph>
+ <embed href="text/shared/optionen/01030000.xhp#laden"/>
+ <paragraph xml-lang="en-US" id="hd_id3153188" role="heading" level="2" l10n="CHG"
+ oldref="6"><link href="text/shared/optionen/01040000.xhp" name="Text Document">%PRODUCTNAME Writer</link></paragraph>
+ <embed href="text/shared/optionen/01040000.xhp#optionentextdokument"/>
+ <paragraph xml-lang="en-US" id="hd_id3150104" role="heading" level="2" l10n="CHG"
+ oldref="5"><link href="text/shared/optionen/01050000.xhp" name="HTML Document">%PRODUCTNAME Writer/Web</link></paragraph>
+ <embed href="text/shared/optionen/01050000.xhp#webbrowser"/>
+ <paragraph xml-lang="en-US" id="hd_id3154918" role="heading" level="2" l10n="CHG"
+ oldref="7"><link href="text/shared/optionen/01060000.xhp" name="Spreadsheet">%PRODUCTNAME Calc</link></paragraph>
+ <embed href="text/shared/optionen/01060000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3153142" role="heading" level="2" l10n="CHG"
+ oldref="8"><link href="text/shared/optionen/01070000.xhp" name="Presentation">%PRODUCTNAME Impress</link></paragraph>
+ <embed href="text/shared/optionen/01070000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="2" l10n="CHG"
+ oldref="12"><link href="text/shared/optionen/01080000.xhp" name="Drawing">%PRODUCTNAME Draw</link></paragraph>
+ <embed href="text/shared/optionen/01080000.xhp#allgemein"/>
+ <paragraph xml-lang="en-US" id="hd_id3154732" role="heading" level="2" l10n="CHG"
+ oldref="9"><link href="text/shared/optionen/01090000.xhp" name="Formula">%PRODUCTNAME Math</link></paragraph>
+ <embed href="text/shared/optionen/01090000.xhp#druckentext"/>
+ <paragraph xml-lang="en-US" id="hd_id3155418" role="heading" level="2" l10n="CHG"
+ oldref="15"><link href="text/shared/optionen/01110000.xhp" name="Chart">Charts</link></paragraph>
+ <embed href="text/shared/optionen/01110000.xhp#farbe"/>
+ <paragraph xml-lang="en-US" id="hd_id3149420" role="heading" level="2" l10n="CHG"
+ oldref="21"><link href="text/shared/optionen/01160000.xhp" name="Data Sources">%PRODUCTNAME Database</link></paragraph>
+ <embed href="text/shared/optionen/01160000.xhp#daten"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 5af76c2f36..9837e84f6c 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -96,8 +96,7 @@
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP" id="bm_id3151380" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3145606" role="heading" level="3" l10n="U" oldref="7">Always create backup copy</paragraph>
<paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="8"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_BACKUP">Saves the previous version of a document as a backup copy whenever you save a document. Every time <item type="productname">%PRODUCTNAME</item> creates a backup copy, the previous backup copy is replaced. The backup copy gets the extension .BAK.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph>Tools - Options - %PRODUCTNAME</emph>
- <emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Paths</emph>, and then enter a new path for the backup file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01040000.xhp b/helpcontent2/source/text/shared/optionen/01040000.xhp
index ed4aee9c79..e16dc7b230 100644
--- a/helpcontent2/source/text/shared/optionen/01040000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040000.xhp
@@ -58,10 +58,10 @@
<paragraph role="heading" id="hd_id3159399" xml-lang="en-US" level="2" l10n="U" oldref="5"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Western)">Basic Fonts (Western)</link></paragraph>
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="U" oldref="3">Specifies the settings for the basic fonts.</paragraph>
<paragraph role="heading" id="hd_id3148563" xml-lang="en-US" level="2" l10n="U" oldref="6"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (Asian)">Basic Fonts (Asian)</link></paragraph>
-<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph>Tools - Options - Language Settings - Languages.</emph>
+<paragraph role="paragraph" id="par_id3147304" xml-lang="en-US" l10n="U" oldref="4">Specifies the settings for the basic Asian fonts if Asian language support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages.</emph>
</paragraph>
<paragraph role="heading" id="hd_id3149294" xml-lang="en-US" level="2" l10n="U" oldref="7"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts (CTL)">Basic Fonts (CTL)</link></paragraph>
-<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3150792" xml-lang="en-US" l10n="U" oldref="8">Specifies the settings for basic fonts for complex text layout languages if their support has been activated under <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<embed href="text/shared/optionen/01040400.xhp#drucken"/>
<embed href="text/shared/optionen/01040500.xhp#tabelle"/>
<embed href="text/shared/optionen/01040700.xhp#aenderungen"/>
diff --git a/helpcontent2/source/text/shared/optionen/01040300.xhp b/helpcontent2/source/text/shared/optionen/01040300.xhp
index 9706d7330c..79ef240ddd 100755
--- a/helpcontent2/source/text/shared/optionen/01040300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040300.xhp
@@ -58,7 +58,7 @@
<paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040300.xhp" name="Basic Fonts">Basic Fonts</link></paragraph>
<paragraph role="paragraph" id="par_id3149786" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_STD_FONT">Specifies the settings for the basic fonts in your documents.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="CHG" oldref="19">You can also change the basic fonts for Asian and complex text layout languages if their support is enabled in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3145609" xml-lang="en-US" l10n="U" oldref="18">These settings define the basic fonts for the predefined templates. You can also modify or customize the <link href="text/shared/optionen/01040301.xhp" name="default text templates">default text templates</link>.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#grundschriften"/>
diff --git a/helpcontent2/source/text/shared/optionen/01050100.xhp b/helpcontent2/source/text/shared/optionen/01050100.xhp
index 80c291b827..2df0f921c4 100644
--- a/helpcontent2/source/text/shared/optionen/01050100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01050100.xhp
@@ -122,7 +122,7 @@
</caseinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id1251869" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Sets the snap lines in front of all objects.</ahelp></paragraph>
<section id="relatedtopics">
- <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id984221" role="paragraph" l10n="NEW">Set the grid color on <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - <link href="text/shared/optionen/01012000.xhp">Appearance</link>.</paragraph>
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index a7787f91f5..f11be76f15 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -86,8 +86,7 @@
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
-<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph>Tools - Options - %PRODUCTNAME</emph>
-<emph>- Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
+<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01060700.xhp b/helpcontent2/source/text/shared/optionen/01060700.xhp
index 6014d46add..b1e7c63ead 100755
--- a/helpcontent2/source/text/shared/optionen/01060700.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060700.xhp
@@ -47,8 +47,7 @@
<paragraph role="heading" id="hd_id3153311" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060700.xhp" name="Print">Print</link></paragraph>
<paragraph role="paragraph" id="par_id3143267" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="">Determines the printer settings for spreadsheets.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3">
-<emph>Tools - Options - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
+<paragraph role="paragraph" id="par_id3155892" xml-lang="en-US" l10n="U" oldref="3"><emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print</emph> defines the settings for all spreadsheets. To define settings for the current document only, choose <emph>File - Print</emph>, then click the <emph>Options</emph> button.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#drucken2"/>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/01090000.xhp b/helpcontent2/source/text/shared/optionen/01090000.xhp
index 0c89a75233..597a3a2ced 100644
--- a/helpcontent2/source/text/shared/optionen/01090000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090000.xhp
@@ -47,7 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:SmEditOptions" id="bm_id3155338" localize="false"/>
<paragraph role="heading" id="hd_id3150040" xml-lang="en-US" level="1" l10n="U" oldref="1">%PRODUCTNAME Math Options</paragraph>
<paragraph role="paragraph" id="par_id3166460" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="druckentext"><ahelp hid=".uno:SmEditOptions">Defines the print format and print options for all new formula documents. These options apply when you print a formula directly from <item type="productname">%PRODUCTNAME</item> Math.</ahelp>
-</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph>Tools - Options</emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
+</variable> You can also call the dialog by clicking the <emph>Options</emph> button in the <emph>Print</emph> dialog. The settings you define in the <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline></emph> dialog will be permanent settings, whereas the settings in the Print dialog are only valid for the current document.</paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#etsodr"/>
</section>
diff --git a/helpcontent2/source/text/shared/optionen/improvement.xhp b/helpcontent2/source/text/shared/optionen/improvement.xhp
index 53bc948858..bfa6543942 100644
--- a/helpcontent2/source/text/shared/optionen/improvement.xhp
+++ b/helpcontent2/source/text/shared/optionen/improvement.xhp
@@ -65,7 +65,7 @@
<paragraph xml-lang="en-US" id="par_id0526200904094433" role="paragraph" l10n="NEW">If you deny to participate, no data will be sent and recording of data stops immediately.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem">Tools - Options - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0526200903594945" role="paragraph" l10n="NEW">At any time, you can enable or disable the recording of user interaction data and the sending of these data. Choose <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Improvement Program</item>. Click the <emph>Info</emph> icon to browse to a web page with more information.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_YES" id="bm_id0526200903272942" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0526200903594944" role="paragraph" l10n="NEW"><ahelp hid=".">Click <emph>Yes, I am willing to participate …</emph> to enable the automatic feedback.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_RadioButton_RID_SVXPAGE_IMPROVEMENT_RB_NO" id="bm_id0526200903274930" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/online_update.xhp b/helpcontent2/source/text/shared/optionen/online_update.xhp
index 29519ff604..313ec12501 100644
--- a/helpcontent2/source/text/shared/optionen/online_update.xhp
+++ b/helpcontent2/source/text/shared/optionen/online_update.xhp
@@ -57,7 +57,7 @@
</section>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXPAGE_ONLINEUPDATE_CB_AUTOCHECK" id="bm_id877101" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id2189397" role="heading" level="2" l10n="NEW">Check for updates automatically</paragraph>
- <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem">Tools - Options - Internet - Proxy</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7523728" role="paragraph" l10n="NEW"><ahelp hid=".">Mark to check for online updates periodically, then select the time interval how often %PRODUCTNAME will check for online updates.</ahelp> %PRODUCTNAME will check once a day, week, or month, as soon as a working Internet connection is detected. If you connect to the Internet by a proxy server, set the proxy on <item type="menuitem"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Internet - Proxy</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id8994109" role="paragraph" l10n="NEW">When an update is available, an icon in the menu bar displays some explaining text. Click the icon to proceed.</paragraph>
<paragraph xml-lang="en-US" id="par_id476699" role="paragraph" l10n="NEW">If you disable the check, the icon is removed from the menu bar.</paragraph>
<paragraph xml-lang="en-US" id="par_id4057130" role="note" l10n="CHG">Online Update is a module that can be selected or deselected to be installed. Choose the customized installation in the Setup of %PRODUCTNAME.</paragraph>