source/text/sbasic/shared/03030102.xhp               |    2 +-
 source/text/sbasic/shared/03100300.xhp               |    2 +-
 source/text/scalc/01/12050200.xhp                    |    4 ++--
 source/text/shared/00/00000021.xhp                   |    4 ++--
 source/text/shared/01/01130000.xhp                   |    8 ++++----
 source/text/shared/01/04050000.xhp                   |    4 ++--
 source/text/shared/01/06010600.xhp                   |    2 +-
 source/text/shared/guide/cmis-remote-files-setup.xhp |    2 +-
 source/text/shared/guide/digitalsign_send.xhp        |    2 +-
 source/text/shared/guide/print_blackwhite.xhp        |   12 ++++++------
 source/text/shared/guide/tabs.xhp                    |    8 ++++----
 source/text/simpress/guide/printing.xhp              |    4 ++--
 source/text/swriter/classificationbar.xhp            |    4 ++--
 source/text/swriter/librelogo/LibreLogo.xhp          |    2 +-
 14 files changed, 30 insertions(+), 30 deletions(-)

New commits:
commit 3a1a27c39efa889d26a4a337eede57b9dbd8db57
Author:     Olivier Hallot <olivier.hal...@libreoffice.org>
AuthorDate: Wed Jul 3 09:16:33 2019 -0300
Commit:     Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Fri Jul 5 11:52:25 2019 +0200

    Insert sys=MAC in some menu paths
    
    MAC often forgotten in menu path descriptions.
    
    Change-Id: Ib6e9062b06389063d6f8293a95cd3e07e1919161
    Reviewed-on: https://gerrit.libreoffice.org/75040
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>

diff --git a/source/text/sbasic/shared/03030102.xhp 
b/source/text/sbasic/shared/03030102.xhp
index 83a890976..b8332eba1 100644
--- a/source/text/sbasic/shared/03030102.xhp
+++ b/source/text/sbasic/shared/03030102.xhp
@@ -43,7 +43,7 @@
 <paragraph role="paragraph" id="par_id3153194" 
xml-lang="en-US">Date<comment>i66764</comment></paragraph>
 <paragraph role="heading" id="hd_id3153969" xml-lang="en-US" 
level="2">Parameters:</paragraph>
 <paragraph role="paragraph" id="par_id3153770" xml-lang="en-US">
-<emph>Date:</emph> String expression that contains the date that you want to 
calculate. In contrast to the DateSerial function that passes years, months and 
days as separate numeric values, the DateValue function requests the date 
string to be according to either one of the date acceptance patterns defined 
for your locale setting (see <item type="menuitem">Tools - Options - Language 
Settings - Languages</item>) or to ISO date format (momentarily, only the ISO 
format with hyphens, e.g. "2012-12-31" is accepted).</paragraph>
+    <emph>Date:</emph> String expression that contains the date that you want 
to calculate. In contrast to the DateSerial function that passes years, months 
and days as separate numeric values, the DateValue function requests the date 
string to be according to either one of the date acceptance patterns defined 
for your locale setting (see <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language Settings 
- Languages</menuitem>) or to ISO date format (momentarily, only the ISO format 
with hyphens, e.g. "2012-12-31" is accepted).</paragraph>
 <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
 <embed href="text/sbasic/shared/00000003.xhp#err5"/>
 <paragraph role="heading" id="hd_id3153142" xml-lang="en-US" 
level="2">Example:</paragraph>
diff --git a/source/text/sbasic/shared/03100300.xhp 
b/source/text/sbasic/shared/03100300.xhp
index 48ad01dce..e59c89351 100644
--- a/source/text/sbasic/shared/03100300.xhp
+++ b/source/text/sbasic/shared/03100300.xhp
@@ -48,7 +48,7 @@
 
 <paragraph id="hd_id3153525" role="heading" level="2" 
xml-lang="en-US">Parameters:</paragraph>
 <paragraph id="par_id3150359" role="paragraph" xml-lang="en-US"> 
<emph>Expression:</emph> Any string or numeric expression that you want to 
convert.</paragraph>
-<paragraph id="par_id3125864" role="paragraph" xml-lang="en-US">When you 
convert a string expression, the date and time must be entered either in one of 
the date acceptance patterns defined for your locale setting (see <item 
type="menuitem">Tools - Options - Language Settings - Languages</item>) or in 
ISO date format (momentarily, only the ISO format with hyphens, e.g. 
"2012-12-31" is accepted). In numeric expressions, values to the left of the 
decimal represent the date, beginning from December 31, 1899. Values to the 
right of the decimal represent the time.</paragraph>
+<paragraph id="par_id3125864" role="paragraph" xml-lang="en-US">When you 
convert a string expression, the date and time must be entered either in one of 
the date acceptance patterns defined for your locale setting (see <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language Settings 
- Languages</menuitem>) or in ISO date format (momentarily, only the ISO format 
with hyphens, e.g. "2012-12-31" is accepted). In numeric expressions, values to 
the left of the decimal represent the date, beginning from December 31, 1899. 
Values to the right of the decimal represent the time.</paragraph>
 <embed href="text/sbasic/shared/00000003.xhp#errorcode"/>
 <embed href="text/sbasic/shared/00000003.xhp#err5"/>
 
diff --git a/source/text/scalc/01/12050200.xhp 
b/source/text/scalc/01/12050200.xhp
index 75d9a7bc1..6c178aa17 100644
--- a/source/text/scalc/01/12050200.xhp
+++ b/source/text/scalc/01/12050200.xhp
@@ -53,8 +53,8 @@
 <bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/subtotaloptionspage/lbuserdef" id="bm_id3153877" 
localize="false"/><paragraph role="heading" id="hd_id3155418" xml-lang="en-US" 
level="3">Custom sort order</paragraph>
 <paragraph role="paragraph" id="par_id3149400" xml-lang="en-US"><ahelp 
hid=".">Uses a custom sorting order that you defined in the Options dialog box 
at <emph>%PRODUCTNAME Calc - Sort Lists</emph>.</ahelp></paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/subtotaloptionspage/ascending" id="bm_id3150327" 
localize="false"/><paragraph role="heading" id="hd_id3149121" xml-lang="en-US" 
level="3">Ascending</paragraph>
-<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/subtotaloptionspage/ascending">Sorts beginning with the 
lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> 
You define the default on Tools - Options - Language settings - 
Languages.</paragraph>
+<paragraph role="paragraph" id="par_id3155068" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/subtotaloptionspage/ascending">Sorts beginning with the 
lowest value. You can define the sort rules on Data - Sort - Options.</ahelp> 
You define the default on <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language settings 
- Languages</menuitem>.</paragraph>
 <bookmark xml-lang="en-US" 
branch="hid/modules/scalc/ui/subtotaloptionspage/descending" id="bm_id3150324" 
localize="false"/><paragraph role="heading" id="hd_id3155443" xml-lang="en-US" 
level="3">Descending</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/subtotaloptionspage/descending">Sorts beginning with the 
highest value. You can define the sort rules on Data - Sort - Options.</ahelp> 
You define the default on Tools - Options - Language settings - 
Languages.</paragraph>
+<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US"><ahelp 
hid="modules/scalc/ui/subtotaloptionspage/descending">Sorts beginning with the 
highest value. You can define the sort rules on Data - Sort - Options.</ahelp> 
You define the default on <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language settings 
- Languages</menuitem>.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/00/00000021.xhp 
b/source/text/shared/00/00000021.xhp
index dd0a26d83..dae1427ef 100644
--- a/source/text/shared/00/00000021.xhp
+++ b/source/text/shared/00/00000021.xhp
@@ -229,9 +229,9 @@
             </tablecell>
          </tablerow>
       </table>
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US">In 
current versions, 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">In current versions, you can select to save your documents 
using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - 
General</menuitem> and select the ODF format version.</paragraph>
 <paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US">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">If you want to 
define another file format as the default, choose <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - </emph><link 
href="text/shared/optionen/01010200.xhp" name="Load/Save - 
General"><emph>Load/Save - General</emph></link> to find alternative file 
formats for each $[officename] document type.</paragraph>
+<paragraph role="tip" id="par_id3146907" xml-lang="en-US">If you want to 
define another file format as the default, choose <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - </menuitem><link 
href="text/shared/optionen/01010200.xhp" name="Load/Save - 
General"><menuitem>Load/Save - General</menuitem></link> to find alternative 
file formats for each $[officename] document type.</paragraph>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2">XML 
file structure</paragraph>
 <paragraph role="paragraph" id="par_id3149649" xml-lang="en-US">Documents in 
OpenDocument file format are stored as compressed zip archives that contain XML 
files. To view these XML files, you can open the OpenDocument file with an 
unzip program. The following files and directories are contained within the 
OpenDocument files:</paragraph>
 <list type="ordered">
diff --git a/source/text/shared/01/01130000.xhp 
b/source/text/shared/01/01130000.xhp
index 4689b1594..2ebcdb9e0 100644
--- a/source/text/shared/01/01130000.xhp
+++ b/source/text/shared/01/01130000.xhp
@@ -73,10 +73,10 @@
       <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
       <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
       <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
-<paragraph xml-lang="en-US" id="par_id0818200912284952" role="note">The 
settings that you define in the <emph>Print</emph> dialog are valid 
<emph>only</emph> for the current print job that you start by clicking the 
<emph>Print</emph> button. <comment>is this true for Printer Settings, 
too?</comment>If you want to change some options permanently, open <emph>Tools 
- Options - %PRODUCTNAME (application name) - Print</emph>.</paragraph>
-<paragraph xml-lang="en-US" id="par_id3156080" role="paragraph"><switchinline 
select="appl"><caseinline select="WRITER">To set the default <item 
type="productname">%PRODUCTNAME</item> printer options for text documents, 
choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - 
Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - 
Print</emph></link>.</caseinline></switchinline></paragraph>
-<paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph"><switchinline 
select="appl"><caseinline select="CALC">To set the default <item 
type="productname">%PRODUCTNAME</item> printer options for spreadsheet 
documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - 
Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - 
Print</emph></link>.</caseinline></switchinline></paragraph>
-<paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph"><switchinline 
select="appl"><caseinline select="IMPRESS">To set the default <item 
type="productname">%PRODUCTNAME</item> printer options for presentation 
documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - 
Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - 
Print</emph></link>.</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0818200912284952" role="note">The 
settings that you define in the <emph>Print</emph> dialog are valid 
<emph>only</emph> for the current print job that you start by clicking the 
<emph>Print</emph> button. <comment>is this true for Printer Settings, 
too?</comment>If you want to change some options permanently, open 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
(application name) - Print</menuitem>.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156080" 
role="paragraph"><switchinline select="appl"><caseinline select="WRITER">To set 
the default <item type="productname">%PRODUCTNAME</item> printer options for 
text documents, choose <link href="text/shared/optionen/01040400.xhp" 
name="Tools - Options - Writer - Print"><switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Writer - Print</menuitem></link>.</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1099E" 
role="paragraph"><switchinline select="appl"><caseinline select="CALC">To set 
the default <item type="productname">%PRODUCTNAME</item> printer options for 
spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" 
name="Tools - Options - Calc - Print"><switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME Calc 
- Print</menuitem></link>.</caseinline></switchinline></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN109CD" 
role="paragraph"><switchinline select="appl"><caseinline select="IMPRESS">To 
set the default <item type="productname">%PRODUCTNAME</item> printer options 
for presentation documents, choose <link 
href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - 
Print"><switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Impress - Print</menuitem></link>.</caseinline></switchinline></paragraph>
   <paragraph xml-lang="en-US" id="par_id0818200901194137" role="note">Press 
<emph>Shift+F1</emph> or choose <item type="menuitem">Help - What's 
This?</item> and point to any control element in the <emph>Print</emph> dialog 
to see an extended help text.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" 
level="2">Preview</paragraph>
 <paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph">The 
preview shows how each sheet of paper will look. You can browse through all 
sheets of paper with the buttons below the preview.</paragraph><comment>insert 
controls with hidden help here</comment>
diff --git a/source/text/shared/01/04050000.xhp 
b/source/text/shared/01/04050000.xhp
index 3eeadb822..619f5ac2e 100644
--- a/source/text/shared/01/04050000.xhp
+++ b/source/text/shared/01/04050000.xhp
@@ -48,7 +48,7 @@
   <paragraph id="par_id1830500" role="paragraph" xml-lang="en-US">In Writer, 
the command <item type="menuitem">Insert - Comment</item> or the <switchinline 
select="sys"><caseinline 
select="MAC"><emph>Command</emph>+<emph>Option</emph></caseinline><defaultinline><emph>Ctrl</emph>+<emph>Alt</emph></defaultinline></switchinline>+<emph>C</emph>
 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. If a text range is selected, 
the comment is attached to the text range.</paragraph>
   <paragraph id="par_id0915200910571516" role="paragraph" xml-lang="en-US">In 
Calc, Draw, and Impress, the command <item type="menuitem">Insert - 
Comment</item> inserts a comment.</paragraph>
   <paragraph id="par_id1831" role="paragraph" xml-lang="en-US">The author name 
and the date and time of creating this comment is shown at the bottom of the 
comment box.</paragraph>
-  <paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments 
by different authors get different colors. Choose <switchinline 
select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - 
Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - 
Options</item></defaultinline></switchinline><item type="menuitem"> - 
%PRODUCTNAME - User Data</item> to enter your name so that it can show up as 
the comment author.</paragraph>
+  <paragraph id="par_id6718649" role="paragraph" xml-lang="en-US">The comments 
by different authors get different colors. Choose <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - 
User Data</menuitem> to enter your name so that it can show up as the comment 
author.</paragraph>
 <paragraph id="hd_id2929166" role="heading" level="2" xml-lang="en-US">Editing 
comments</paragraph>
   <paragraph id="par_id5201879" role="paragraph" xml-lang="en-US">Every user 
with write permission to the document can edit and delete comments of all 
authors.</paragraph>
   <paragraph id="par_id2571794" role="paragraph" xml-lang="en-US">The comment 
box contains an icon with a down arrow. Click the icon to open a menu with some 
commands to delete comments.</paragraph>
@@ -74,7 +74,7 @@
   <paragraph id="par_id2116153" role="paragraph" xml-lang="en-US">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 
<emph>Navigation</emph> window below the vertical scrollbar to jump from one 
comment anchor to the next comment anchor.</paragraph>
   <paragraph id="par_id5381328" role="tip" xml-lang="en-US">You can also open 
the <emph>Navigator</emph> to see a list of all comments. Right-click a comment 
name in the Navigator to edit or delete the comment.</paragraph>
 <paragraph id="hd_id5664235" role="heading" level="2" 
xml-lang="en-US">Printing comments</paragraph>
-  <paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change 
the printing option for comments for all your text documents, choose <item 
type="menuitem">Tools - Options - %PRODUCTNAME Writer - 
Print</item>.</paragraph>
+<paragraph id="par_id2254402" role="paragraph" xml-lang="en-US">To change the 
printing option for comments for all your text documents, choose <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Writer - Print</menuitem>.</paragraph>
 <paragraph id="hd_id0915200910571612" role="heading" level="2" 
xml-lang="en-US">Comments in spreadsheets</paragraph>
   <paragraph id="par_id3166460" role="paragraph" xml-lang="en-US">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 id="par_id8336741" role="paragraph" xml-lang="en-US">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 
<emph>not</emph> double-click the text!</paragraph>
diff --git a/source/text/shared/01/06010600.xhp 
b/source/text/shared/01/06010600.xhp
index 9ea5e4771..be6f78a9e 100644
--- a/source/text/shared/01/06010600.xhp
+++ b/source/text/shared/01/06010600.xhp
@@ -39,7 +39,7 @@
 <bookmark xml-lang="en-US" 
branch="hid/svx/ui/chineseconversiondialog/ChineseConversionDialog" 
id="bm_id2549516" localize="false"/>
 <bookmark xml-lang="en-US" 
branch="hid/svx/ui/chineseconversiondialog/@@nowidget@@" id="bm_@@nowidget@@" 
localize="false"/>
 <paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1"><link 
href="text/shared/01/06010600.xhp">Chinese Conversion</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US"><ahelp 
hid=".">Converts the selected Chinese text from one Chinese writing system to 
the other. If no text is selected, the entire document is converted.</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"><ahelp 
hid=".">Converts the selected Chinese text from one Chinese writing system to 
the other. If no text is selected, the entire document is converted.</ahelp> 
You can only use this command if you enable Asian language support in 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language Settings 
- Languages</menuitem>.</paragraph>
 </section>
 <section id="howtoget">
   <embed href="text/shared/00/00000406.xhp#chinese"/>
diff --git a/source/text/shared/guide/cmis-remote-files-setup.xhp 
b/source/text/shared/guide/cmis-remote-files-setup.xhp
index c1c028c96..4cca9f743 100644
--- a/source/text/shared/guide/cmis-remote-files-setup.xhp
+++ b/source/text/shared/guide/cmis-remote-files-setup.xhp
@@ -95,7 +95,7 @@
     <paragraph id="par_id150820161816041989" role="ul_item" 
xml-lang="en-US"><emph>User, Password</emph>: the username and password of the 
FTP service.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id150820161816047387" role="ul_item" 
xml-lang="en-US"><variable id="rememberpw"><emph>Remember password</emph>: 
Check to store the password in %PRODUCTNAME’s user profile. The password will 
be secured by the master password in <item type="menuitem">Tools - Options - 
%PRODUCTNAME - Security - Internet passwords</item>.</variable></paragraph>
+      <paragraph id="par_id150820161816047387" role="ul_item" 
xml-lang="en-US"><variable id="rememberpw"><emph>Remember password</emph>: 
Check to store the password in %PRODUCTNAME’s user profile. The password will 
be secured by the master password in <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - 
Security - Internet passwords</menuitem>.</variable></paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id150820161816045167" role="ul_item" xml-lang="en-US" 
localize="false"><embedvar 
href="text/shared/guide/cmis-remote-files-setup.xhp#labelpar" 
markup="keep"/></paragraph>
diff --git a/source/text/shared/guide/digitalsign_send.xhp 
b/source/text/shared/guide/digitalsign_send.xhp
index 9c732a4bb..18fdad9f3 100644
--- a/source/text/shared/guide/digitalsign_send.xhp
+++ b/source/text/shared/guide/digitalsign_send.xhp
@@ -38,7 +38,7 @@
 <switch select="sys">
 <case select="UNIX">
     <paragraph xml-lang="en-US" id="par_idN1071D" role="paragraph">If you are 
using Linux, macOS or Solaris, you must install a recent version of Thunderbird 
or Firefox. %PRODUCTNAME will then access their certificate storage.</paragraph>
-    <paragraph xml-lang="en-US" id="par_idN10720" role="tip">If you have 
created different profiles in Thunderbird or Firefox and you want to use 
certificates from one specific user profile, select the profile in <emph>Tools 
- Options - Security - Certificate Path</emph>. Alternatively, you can set the 
environment variable MOZILLA_CERTIFICATE_FOLDER to point to the folder 
containing that profile.</paragraph>
+    <paragraph xml-lang="en-US" id="par_idN10720" role="tip">If you have 
created different profiles in Thunderbird or Firefox and you want to use 
certificates from one specific user profile, select the profile in 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Security - 
Certificate Path</menuitem>. Alternatively, you can set the environment 
variable MOZILLA_CERTIFICATE_FOLDER to point to the folder containing that 
profile.</paragraph>
     <list type="ordered">
         <listitem>
             <paragraph xml-lang="en-US" id="par_id944242" 
role="paragraph">Open your web browser’s preferences, select the 
<emph>Advanced</emph> section, click on the <emph>Certificates</emph> tab, and 
then choose <emph>View Certificates</emph>. The <emph>Certificate 
Manager</emph> dialog will appear.</paragraph>
diff --git a/source/text/shared/guide/print_blackwhite.xhp 
b/source/text/shared/guide/print_blackwhite.xhp
index 34071a44a..f8eadbb21 100644
--- a/source/text/shared/guide/print_blackwhite.xhp
+++ b/source/text/shared/guide/print_blackwhite.xhp
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-       
+
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,8 +18,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
- 
-       
+
+
 <meta>
       <topic id="textsharedguideprint_blackwhitexml" indexer="include" 
status="PUBLISH">
          <title xml-lang="en-US" id="tit">Printing in Black and White</title>
@@ -53,7 +53,7 @@
       <paragraph xml-lang="en-US" id="hd_id3147653" role="heading" 
level="2">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 xml-lang="en-US" id="par_id3149233" 
role="listitem">Choose Tools - Options - %PRODUCTNAME Impress or Tools - 
Options - %PRODUCTNAME Draw, as appropriate.</paragraph>
+             <paragraph xml-lang="en-US" id="par_id3149233" 
role="listitem">Choose <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Impress</menuitem> or <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Draw</menuitem>, as appropriate.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3150275" 
role="listitem">Then choose <emph>Print</emph>.</paragraph>
@@ -72,7 +72,7 @@
       <paragraph xml-lang="en-US" id="hd_id3150358" role="heading" 
level="2">Printing All Text Documents with Black and White Text</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150541" 
role="listitem">Choose Tools - Options - %PRODUCTNAME Writer or Tools - Options 
- %PRODUCTNAME Writer/Web.</paragraph>
+             <paragraph xml-lang="en-US" id="par_id3150541" 
role="listitem">Choose <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Writer</menuitem> or <switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Writer/Web</menuitem>.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3147084" 
role="listitem">Then choose <emph>Print</emph>.</paragraph>
@@ -95,6 +95,6 @@
 </list>
       <embed href="text/shared/00/00000004.xhp#related"/>
       <paragraph xml-lang="en-US" id="par_id3153726" role="paragraph"><link 
href="text/shared/01/01130000.xhp" name="Printing dialogs">Printing 
dialogs</link></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154146" role="paragraph"><link 
href="text/shared/optionen/01000000.xhp" name="Tools - Options dialog">Tools - 
Options dialog</link></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3154146" role="paragraph"><link 
href="text/shared/optionen/01000000.xhp" name="Tools - Options 
dialog"><switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline> dialog</link></paragraph>
    </body>
 </helpdocument>
diff --git a/source/text/shared/guide/tabs.xhp 
b/source/text/shared/guide/tabs.xhp
index d481894f6..548589061 100644
--- a/source/text/shared/guide/tabs.xhp
+++ b/source/text/shared/guide/tabs.xhp
@@ -18,7 +18,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
-       
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidetabsxml" indexer="include" status="PUBLISH">
@@ -51,7 +51,7 @@
 <paragraph role="paragraph" id="par_id1376079" xml-lang="en-US">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">Change the 
default tab stops for all documents: Use the menu <switchinline 
select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - 
Preferences</emph></caseinline><defaultinline><emph>Tools - 
Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - 
General</emph>.</paragraph>
+    <paragraph role="paragraph" id="par_id9434492" xml-lang="en-US">Change the 
default tab stops for all documents: Use the menu <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Writer - General</menuitem>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="paragraph" id="par_id274971" xml-lang="en-US">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>
@@ -126,7 +126,7 @@
 <paragraph role="listitem" id="par_id3159156" xml-lang="en-US">To move several 
tab stops on the ruler, press the Shift key before you click a tab. Drag one 
tab while continuing to press Shift to move that tab as well as all the tabs to 
the right of it. The spacing between those tabs remains the same.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3147349" xml-lang="en-US">Press 
<switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph role="listitem" id="par_id3147349" xml-lang="en-US">Press 
<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline> when you drag 
a tab on the ruler to move that tab and all the tabs to the right of it. This 
results in the spacing between those tabs changing proportionally to their 
distance from the margin.</paragraph>
 </listitem>
 </list>
@@ -146,7 +146,7 @@
 <case select="CALC">
 </case>
 <default>
-<paragraph role="paragraph" id="par_id3146972" xml-lang="en-US">The <link 
href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context 
menu</link> of the ruler allows you to change the displayed units of 
measurement. These changes are only valid until you exit $[officename], and 
they only apply to the ruler on whose context menu you made the change. If you 
want to change the ruler measurement units permanently, choose <emph>Tools - 
Options - [Document type] - View</emph> and change the measurement unit 
there.</paragraph>
+    <paragraph role="paragraph" id="par_id3146972" xml-lang="en-US">The <link 
href="text/shared/00/00000001.xhp#kontextmenue" name="context menu">context 
menu</link> of the ruler allows you to change the displayed units of 
measurement. These changes are only valid until you exit $[officename], and 
they only apply to the ruler on whose context menu you made the change. If you 
want to change the ruler measurement units permanently, choose <switchinline 
select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - [Document type] - 
View</menuitem> and change the measurement unit there.</paragraph>
 </default>
 </switch>
 <switch select="appl">
diff --git a/source/text/simpress/guide/printing.xhp 
b/source/text/simpress/guide/printing.xhp
index 63027a46a..e1620ade0 100644
--- a/source/text/simpress/guide/printing.xhp
+++ b/source/text/simpress/guide/printing.xhp
@@ -42,7 +42,7 @@
       <paragraph xml-lang="en-US" id="hd_id3154486" role="heading" 
level="1">Default printer settings</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3156385" role="listitem">To 
set the default printing options for $[officename] Impress, choose <emph>Tools 
- Options - %PRODUCTNAME Impress - Print</emph>.</paragraph>
+             <paragraph xml-lang="en-US" id="par_id3156385" role="listitem">To 
set the default printing options for $[officename] Impress, choose 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Impress - Print</menuitem>.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id3153914" role="heading" 
level="1">Setting printer options for the current presentation</paragraph>
@@ -52,7 +52,7 @@
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3149870" 
role="listitem">Click the <emph>%PRODUCTNAME Impress</emph> or the 
<emph>Options</emph> tab page, and then select the printer options.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id3150431" 
role="listitem">These settings override the default printer options in 
<emph>Tools - Options - %PRODUCTNAME Impress - Print</emph> for the current 
print job only.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150431" 
role="listitem">These settings override the default printer options in 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME 
Impress - Print</menuitem> for the current print job only.</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id4555192" role="heading" 
level="1">Choosing a print layout for handouts</paragraph>
diff --git a/source/text/swriter/classificationbar.xhp 
b/source/text/swriter/classificationbar.xhp
index d9a2a1aa1..d4b086779 100644
--- a/source/text/swriter/classificationbar.xhp
+++ b/source/text/swriter/classificationbar.xhp
@@ -89,9 +89,9 @@
   <bookmark_value>classification levels;customizing</bookmark_value>
 </bookmark>
 
-<paragraph id="par_id030820161747133280" role="paragraph" 
xml-lang="en-US">%PRODUCTNAME allows customization of the levels of 
classification for your business. To customize the number and the name of the 
levels, copy the file <item type="literal">example.xml</item> located in <item 
type="menuitem">Tools - Options - LibreOffice - Paths - Classification</item> 
into a local folder and edit the contents.</paragraph>
+<paragraph id="par_id030820161747133280" role="paragraph" 
xml-lang="en-US">%PRODUCTNAME allows customization of the levels of 
classification for your business. To customize the number and the name of the 
levels, copy the file <item type="literal">example.xml</item> located in 
<switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - LibreOffice - 
Paths - Classification</menuitem> into a local folder and edit the 
contents.</paragraph>
 <paragraph id="par_id03082016174713477" role="tip" xml-lang="en-US">Use the 
file with your %PRODUCTNAME locale in the name as example.</paragraph>
-<paragraph id="par_id030820161747137522" role="paragraph" 
xml-lang="en-US">Save the file and make the adequate changes to the 
classification 
+<paragraph id="par_id030820161747137522" role="paragraph" 
xml-lang="en-US">Save the file and make the adequate changes to the 
classification
 path above to access the file.</paragraph>
 <paragraph id="par_id030820161747135133" role="tip" xml-lang="en-US">Your 
system administrator can place the file in a network folder and make all users 
access the classification settings file.</paragraph>
 
diff --git a/source/text/swriter/librelogo/LibreLogo.xhp 
b/source/text/swriter/librelogo/LibreLogo.xhp
index 5c156cfe2..e4b390769 100644
--- a/source/text/swriter/librelogo/LibreLogo.xhp
+++ b/source/text/swriter/librelogo/LibreLogo.xhp
@@ -38,7 +38,7 @@
 <paragraph role="heading" level="2" xml-lang="en-US" id="hd_330">Clear 
screen</paragraph>
 <paragraph role="paragraph" xml-lang="en-US" id="par_340">Click on the icon 
“Clear screen” to remove the drawing objects of the document.</paragraph>
 <paragraph role="heading" level="2" xml-lang="en-US" id="hd_344">Program 
editor/Syntax highlighting/Translating</paragraph>
-<paragraph role="paragraph" xml-lang="en-US" id="par_345">The “magic wand” 
icon sets 2-page layout for program editing, expands and converts to uppercase 
the abbreviated, lowercase Logo commands in the Writer document. Change the 
language of the document (<item type="menuitem">Tools - Options - Language 
Settings - Languages - Western</item>) and click on this icon to translate the 
Logo program to the selected language.</paragraph>
+<paragraph role="paragraph" xml-lang="en-US" id="par_345">The “magic wand” 
icon sets 2-page layout for program editing, expands and converts to uppercase 
the abbreviated, lowercase Logo commands in the Writer document. Change the 
language of the document (<switchinline select="sys"><caseinline 
select="MAC"><menuitem>%PRODUCTNAME - 
Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - 
Options</menuitem></defaultinline></switchinline><menuitem> - Language Settings 
- Languages - Western</menuitem>) and click on this icon to translate the Logo 
program to the selected language.</paragraph>
 <paragraph role="heading" level="2" xml-lang="en-US" id="hd_350">Command 
line</paragraph>
 <paragraph role="paragraph" xml-lang="en-US" id="par_360">Hit Enter in the 
command line to execute its content. To stop the program use the icon 
“Stop”.</paragraph>
 <paragraph role="paragraph" xml-lang="en-US" id="par_370">Hold down the Enter 
to repeat the command line, for example, on the following command 
sequence:</paragraph>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to