Use switches for Ctrl vs. Command on macOS

Change-Id: I03d2ee23802f1da02129f5f40852d231b94c16c0
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109163
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

11 files changed, 42 insertions, 42 deletions

diff --git a/source/text/shared/guide/fontwork.xhp b/source/text/shared/guide/fontwork.xhp
index d6be673c48..70fe8f9efa 100644
--- a/source/text/shared/guide/fontwork.xhp
+++ b/source/text/shared/guide/fontwork.xhp
@@ -58,7 +58,7 @@
          <listitem>
 
 	 <bookmark xml-lang="en-US" branch="hid/svx/ui/fontworkgallerydialog/ctlFavorites" id="bm_id3156415" localize="false"/>
-<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or Ctrl+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149761" xml-lang="en-US"><ahelp hid="." visibility="hidden">Select a Fontwork style and click OK to insert the Fontwork into your document. Double-click or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>+double-click the Fontwork in your document to enter text edit mode and change the text.</ahelp></paragraph>
 
             <paragraph xml-lang="en-US" id="par_idN106A0" role="paragraph">In the <emph>Fontwork Gallery</emph> dialog, select a Fontwork style and click OK.</paragraph>
             <paragraph xml-lang="en-US" id="par_idN10755" role="paragraph">The Fontwork object is inserted into your document. Fontwork objects are Custom Shapes. Using the 3D Settings toolbar, you can switch the view at any time from 2D to 3D and back.</paragraph>
@@ -76,7 +76,7 @@
       <paragraph xml-lang="en-US" id="par_idN106AE" role="heading" level="2">To edit a Fontwork object</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN106B5" role="paragraph">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key while you click.</paragraph>
             <paragraph xml-lang="en-US" id="par_idN106B8" role="paragraph">The <link href="text/shared/fontwork_toolbar.xhp"><emph>Fontwork</emph></link> toolbar is displayed. If you do not see the <emph>Fontwork</emph> toolbar, choose <emph>View - Toolbars - Fontwork</emph>.</paragraph>
          </listitem>
          <listitem>
@@ -104,7 +104,7 @@
       <paragraph xml-lang="en-US" id="par_idN108CA" role="heading" level="2">To edit more Fontwork attributes</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the Ctrl key while you click.</paragraph>
+            <paragraph xml-lang="en-US" id="par_idN108D1" role="paragraph">Click the Fontwork object. If the Fontwork object is inserted in the background, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key while you click.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_idN108D5" role="paragraph">Select the properties from the <emph>Drawing Object Properties</emph> toolbar. You can change the line width, line color, fill color, fill style, and more.</paragraph>
diff --git a/source/text/shared/guide/keyboard.xhp b/source/text/shared/guide/keyboard.xhp
index e052728508..4f1682ee72 100644
--- a/source/text/shared/guide/keyboard.xhp
+++ b/source/text/shared/guide/keyboard.xhp
@@ -52,7 +52,7 @@
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154514" role="listitem">document</paragraph>
          </listitem>
-      </list><comment>removed para about Ctrl+Tab</comment>
+      </list>
 <paragraph xml-lang="en-US" id="par_id3153252" role="paragraph">Press Shift+F6 to switch through objects in the opposite direction.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph">Press <switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
@@ -270,19 +270,19 @@
          <list type="unordered">
             <listitem>
                <paragraph xml-lang="en-US" id="par_id3159096" role="listitem">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
+                           </caseinline><defaultinline>Ctrl</defaultinline></switchinline><keycode>+Enter</keycode>, an object of the selected type is created in default size.</paragraph>
             </listitem>
             <listitem>
-               <paragraph xml-lang="en-US" id="par_id3156016" role="listitem">If you press Enter while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press Esc to set the focus back to the icons and input boxes.</paragraph>
+                <paragraph xml-lang="en-US" id="par_id3156016" role="listitem">If you press <keycode>Enter</keycode> while the icon <emph>Select</emph> is selected, the focus is set into the image window of the ImageMap Editor. Press <keycode>Esc</keycode> to set the focus back to the icons and input boxes.</paragraph>
             </listitem>
             <listitem>
-               <paragraph xml-lang="en-US" id="par_id3149587" role="listitem">If the <emph>Select</emph> icon is selected and you press Ctrl+Enter, the first object in the image window gets selected.</paragraph>
+                <paragraph xml-lang="en-US" id="par_id3149587" role="listitem">If the <emph>Select</emph> icon is selected and you press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Enter</keycode>, the first object in the image window gets selected.</paragraph>
             </listitem>
             <listitem>
                <paragraph xml-lang="en-US" id="par_id3154343" role="listitem">Use the icon <emph>Edit Points</emph> to switch into the point edit mode for polygons and back.</paragraph>
             </listitem>
             <listitem>
-               <paragraph xml-lang="en-US" id="par_id3147073" role="listitem">Use Ctrl+Tab in the image window to select the next point. Use Shift+Ctrl+Tab to select the previous point.</paragraph>
+                <paragraph xml-lang="en-US" id="par_id3147073" role="listitem">Use <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Tab</keycode> in the image window to select the next point. Use <keycode>Shift+</keycode><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Tab</keycode> to select the previous point.</paragraph>
             </listitem>
             <listitem>
                <paragraph xml-lang="en-US" id="par_id3153285" role="listitem">Use the Delete key with the focus in the image window to delete the selected object.</paragraph>
@@ -310,19 +310,19 @@
             <paragraph xml-lang="en-US" id="par_id3152869" role="listitem">Left or Right Arrow: go one position to the left or to the right</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3151000" role="listitem">Ctrl+Left Arrow or Ctrl+Right Arrow: jump to the previous or to the next split</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3151000" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Left Arrow</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Right Arrow</keycode>: jump to the previous or to the next split</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3159203" role="listitem">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: move a split one position to the left or to the right</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3159203" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+Left Arrow</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+Right Arrow</keycode>: move a split one position to the left or to the right</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154538" role="listitem">Home or End: jump to the first or the last possible position</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155382" role="listitem">Ctrl+Home or Ctrl+End: jump to the first or the last split</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155382" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Home</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+End</keycode>: jump to the first or the last split</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3155894" role="listitem">Shift+Ctrl+Home or Shift+Ctrl+End: move split to the first or to the last position</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3155894" role="listitem"><keycode>Shift+</keycode><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Home</keycode> or <keycode>Shift+</keycode><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+End</keycode>: move split to the first or to the last position</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3145195" role="listitem">Space key: insert or remove a split</paragraph>
@@ -352,31 +352,31 @@
             <paragraph xml-lang="en-US" id="par_id3155148" role="listitem">Left Arrow or Right Arrow: select left or right column and clear other selections</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150780" role="listitem">Ctrl+Left Arrow or Ctrl+Right Arrow: move focus to the left or to the right column (does not change selection)</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150780" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Left Arrow</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Right Arrow</keycode>: move focus to the left or to the right column (does not change selection)</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3153811" role="listitem">Shift+Left Arrow or Shift+Right Arrow: expand or shrink the selected range</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3146962" role="listitem">Ctrl+Shift+Left Arrow or Ctrl+Shift+Right Arrow: expand or shrink the selected range (does not change other selections)</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3146962" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+Left Arrow</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+Right Arrow</keycode>: expand or shrink the selected range (does not change other selections)</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3147512" role="listitem">Home or End: select the first or the last column (use Shift or Ctrl as with cursor keys)</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3147512" role="listitem"><keycode>Home</keycode> or <keycode>End</keycode>: select the first or the last column (use <keycode>Shift</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> as with cursor keys)</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3154733" role="listitem">Shift+Space key: select the range from the last selected column to the current column</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3154171" role="listitem">Ctrl+Shift+Space key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3154171" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+Space</keycode> key: select the range from the last selected column to the current column (does not change other selections)</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3156368" role="listitem">Ctrl+A: select all columns</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3156368" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode>: select all columns</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3151192" role="listitem">Shift+F10: open a context menu</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3150416" role="listitem">Ctrl+1 ... Ctrl+7: set the 1st ... 7th column type for the selected columns</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3150416" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+1</keycode> ... <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+7</keycode>: set the 1st ... 7th column type for the selected columns</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id3166442" role="listitem">Up Arrow or Down Arrow: scroll table down or up one row</paragraph>
@@ -385,7 +385,7 @@
             <paragraph xml-lang="en-US" id="par_id3146103" role="listitem">Page Up or Page Down: scroll table down or up one page</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3145116" role="listitem">Ctrl+Home or Ctrl+End: scroll to the top or bottom of a table</paragraph>
+            <paragraph xml-lang="en-US" id="par_id3145116" role="listitem"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Home</keycode> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+End</keycode>: scroll to the top or bottom of a table</paragraph>
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="hd_id3153298" role="heading" level="2">Controlling the Insert - Special Character Dialog</paragraph>
diff --git a/source/text/shared/guide/space_hyphen.xhp b/source/text/shared/guide/space_hyphen.xhp
index 56f31d4015..e415a6f45f 100644
--- a/source/text/shared/guide/space_hyphen.xhp
+++ b/source/text/shared/guide/space_hyphen.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="textsharedguidespace_hyphenxml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Inserting Non-breaking Spaces, Hyphens and Soft Hyphens</title>
@@ -43,18 +43,18 @@
 <paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1"><variable id="space_hyphen"><link href="text/shared/guide/space_hyphen.xhp" name="Inserting Non-breaking Spaces, Hyphens and Soft Hyphens">Inserting Non-breaking Spaces, Hyphens and Soft Hyphens</link>
 </variable></paragraph>
 <paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2">Non-breaking spaces</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key 
+<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US">To prevent two words from being separated at the end of a line, hold down the <switchinline select="sys"><caseinline select="MAC">Command key
 </caseinline><defaultinline>Ctrl key</defaultinline></switchinline> and the Shift key when you type a space between the words.</paragraph>
 <paragraph role="note" id="par_id5749687" xml-lang="en-US">In Calc, you cannot insert non-breaking spaces.</paragraph>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="2">Non-breaking hyphen</paragraph>
-<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US">An example of a non-breaking hyphen is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press Shift+Ctrl+ minus sign. In other words, hold down the Shift and Ctrl keys and press the minus key.</paragraph>
+<paragraph role="paragraph" id="par_id3148538" xml-lang="en-US">An example of a non-breaking hyphen is a company name such as A-Z. Obviously you would not want A- to appear at the end of a line and Z at the beginning of the next line. To solve this problem, press <keycode>Shift+</keycode><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+ minus</keycode> sign. In other words, hold down the <keycode>Shift</keycode> and <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> keys and press the <keycode>minus</keycode> key.</paragraph>
 <paragraph role="heading" id="hd_id3163802" xml-lang="en-US" level="2">Replacing hyphens by dashes</paragraph>
 <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US">In order to enter dashes, you can find under <emph>Tools - AutoCorrect - AutoCorrect Options - Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two hyphens under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="AutoCorrect Options">AutoCorrect Options</link>).</paragraph>
 <paragraph role="paragraph" id="par_id3153561" xml-lang="en-US">For additional replacements see the replacements table under <emph>Tools - AutoCorrect - AutoCorrect Options</emph>
 <emph>- </emph><link href="text/shared/01/06040200.xhp" name="Replace"><emph>Replace</emph></link>. Here you can, among other things, replace a shortcut automatically by a dash, even in another font.</paragraph>
 <paragraph role="heading" id="hd_id3153825" xml-lang="en-US" level="2">Soft hyphen</paragraph>
-<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US">To support automatic hyphenation by entering a soft hyphen inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+minus sign. The word is separated at this position when it is at the end of the line, even if automatic hyphenation for this paragraph is switched off.</paragraph>
+<paragraph role="paragraph" id="par_id3154306" xml-lang="en-US">To support automatic hyphenation by entering a soft hyphen inside a word yourself, use the keys <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline><keycode>+minus</keycode> sign. The word is separated at this position when it is at the end of the line, even if automatic hyphenation for this paragraph is switched off.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3151245" xml-lang="en-US"><link href="text/shared/01/04100000.xhp" name="Special characters">Special characters</link></paragraph>
 <embed href="text/shared/01/formatting_mark.xhp#formattingmark"/>
diff --git a/source/text/shared/guide/standard_template.xhp b/source/text/shared/guide/standard_template.xhp
index 5238df7991..74a7f95f41 100644
--- a/source/text/shared/guide/standard_template.xhp
+++ b/source/text/shared/guide/standard_template.xhp
@@ -55,7 +55,7 @@
 </listitem>
 </list>
 <h2 id="hd_id751605458425017">Modifying a Default Template</h2>
-<list type="ordered"> 
+<list type="ordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3154011" xml-lang="en-US"><variable id="edit_template">Choose <menuitem>File - Templates - Manage Templates</menuitem>.</variable></paragraph>
 </listitem>
@@ -107,7 +107,7 @@
 </list>
 
 <h2 id="hd_id311605475738848">Modifying a Custom Template</h2>
-<list type="ordered"> 
+<list type="ordered">
   <listitem>
   <paragraph id="par_id901605475822840" role="listitem"><embedvar href="text/shared/guide/standard_template.xhp#edit_template"/></paragraph>
    </listitem>
@@ -123,7 +123,7 @@
 <h2 id="hd_id3149109" xml-lang="en-US">Saving a Template in the Template Folder</h2>
 <paragraph role="paragraph" id="par_id3146918" xml-lang="en-US">You can save any document as a template by selecting "Template" file type in the Save dialog. To access the template from the Template Manager, save the template in the <emph>User Paths</emph> directory specified for <emph>Templates</emph> in <switchinline select="sys"><caseinline select="MAC"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><emph> - %PRODUCTNAME - Paths</emph>. It is often easier to save a document with <menuitem>File - Templates - Save As Template</menuitem>, because it automatically places the template in the appropriate directory.</paragraph>
 
-<tip id="par_id271605485719890">The <link href="text/shared/guide/template_manager.xhp" name="templatemanager">Template Manager</link> is the preferred method for working with templates. <menuitem>File - New - Templates</menuitem> and  <menuitem>File - Templates - Manage Templates</menuitem> are equivalent for opening the <emph>Template Manager</emph>. <keycode>Ctrl+Shift+N</keycode> is the predefined shortcut key.</tip>
+<tip id="par_id271605485719890">The <link href="text/shared/guide/template_manager.xhp" name="templatemanager">Template Manager</link> is the preferred method for working with templates. <menuitem>File - New - Templates</menuitem> and  <menuitem>File - Templates - Manage Templates</menuitem> are equivalent for opening the <emph>Template Manager</emph>. <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+N</keycode> is the predefined shortcut key.</tip>
 </section>
 <section id="relatedtopics">
 <switch select="appl">
diff --git a/source/text/shared/guide/template_manager.xhp b/source/text/shared/guide/template_manager.xhp
index 991e1b675a..61358219f0 100644
--- a/source/text/shared/guide/template_manager.xhp
+++ b/source/text/shared/guide/template_manager.xhp
@@ -116,11 +116,11 @@
 
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/templatedlg/move_btn" id="bm_id041620170649376940" localize="false"/>
 <h2 id="hd_id041620170723508845">Move</h2>
-<paragraph id="par_id041620170723518776" role="paragraph" xml-lang="en-US"><ahelp hid=".">If you want to move templates to a different category, then choose a template, or use <keycode>Ctrl+click</keycode> to select additional templates, then press the <widget>Move</widget> button at the bottom right to open a dialog box, where you can choose to move your selection to a different category or to a new category. Default templates cannot be moved, but copies can be created in other categories.</ahelp></paragraph>
+<paragraph id="par_id041620170723518776" role="paragraph" xml-lang="en-US"><ahelp hid=".">If you want to move templates to a different category, then choose a template, or use <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>+click to select additional templates, then press the <widget>Move</widget> button at the bottom right to open a dialog box, where you can choose to move your selection to a different category or to a new category. Default templates cannot be moved, but copies can be created in other categories.</ahelp></paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/templatedlg/export_btn" id="bm_id041620170649376941" localize="false"/>
 <h2 id="hd_id041620170723516791">Export</h2>
-<paragraph id="par_id041620170723513192" role="paragraph" xml-lang="en-US"><ahelp hid=".">Choose a template in the main window, or use <keycode>Ctrl+click</keycode> to select additional templates, and then press the <widget>Export</widget> button at the bottom right to export your selection to a folder on your computer.</ahelp></paragraph>
+<paragraph id="par_id041620170723513192" role="paragraph" xml-lang="en-US"><ahelp hid=".">Choose a template in the main window, or use <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>+click to select additional templates, and then press the <widget>Export</widget> button at the bottom right to export your selection to a folder on your computer.</ahelp></paragraph>
 <table id="tab_id31607689509896">
     <tablerow>
         <tablecell>
diff --git a/source/text/shared/optionen/01010800.xhp b/source/text/shared/optionen/01010800.xhp
index 2849884b7d..47e94d7ed1 100644
--- a/source/text/shared/optionen/01010800.xhp
+++ b/source/text/shared/optionen/01010800.xhp
@@ -57,7 +57,7 @@
 <embed href="text/shared/00/00000406.xhp#view"/>
 </section>
 <embed href="text/shared/06/optionen_screenshots.xhp#optionviewdialog"/>
-  
+
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optviewpage/iconstyle" id="bm_id5482039" localize="false"/>
 <h2 id="hd_id310720161555238963">Icon style</h2>
 <paragraph id="par_id310720161555341027" role="paragraph" xml-lang="en-US"><ahelp hid="cui/ui/optviewpage/iconstyle">Specifies the icon style for icons in toolbars and dialogs.</ahelp></paragraph>
@@ -120,7 +120,7 @@
       <paragraph id="par_id3156030" role="tablecontent" xml-lang="en-US"> <emph>Copy content</emph> </paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3150110" role="tablecontent" xml-lang="en-US">Edit - Copy Ctrl+C.</paragraph>
+        <paragraph id="par_id3150110" role="tablecontent" xml-lang="en-US"><menuitem>Edit - Copy</menuitem> <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+C</keycode>.</paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3149588" role="tablecontent" xml-lang="en-US">Select text, table, object.</paragraph>
@@ -131,7 +131,7 @@
       <paragraph id="par_id3149331" role="tablecontent" xml-lang="en-US"> <emph>Paste content</emph> </paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3156337" role="tablecontent" xml-lang="en-US">Edit - Paste Ctrl+V pastes at the cursor position.</paragraph>
+      <paragraph id="par_id3156337" role="tablecontent" xml-lang="en-US"><menuitem>Edit - Paste</menuitem> <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+V</keycode> pastes at the cursor position.</paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3151127" role="tablecontent" xml-lang="en-US">Clicking the middle mouse button pastes at the mouse pointer position.</paragraph>
@@ -150,7 +150,7 @@
   </tablerow>
 </table>
 
-<tip id="par_idN10A1D"><ahelp hid="20201">Press Shift+Ctrl+R to restore or refresh the view of the current document.</ahelp></tip>
+<tip id="par_idN10A1D"><ahelp hid="20201">Press <keycode>Shift+</keycode><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+R</keycode> to restore or refresh the view of the current document.</ahelp></tip>
 <h2 id="par_idN10AC8">Graphics Output</h2>
 <bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id6835216" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/cui/ui/optviewpage/useaccel" id="bm_id4084902" localize="false"/>
diff --git a/source/text/shared/optionen/01060700.xhp b/source/text/shared/optionen/01060700.xhp
index 8c9d7d3479..e18eeec8ef 100644
--- a/source/text/shared/optionen/01060700.xhp
+++ b/source/text/shared/optionen/01060700.xhp
@@ -44,6 +44,6 @@
 <paragraph role="heading" id="hd_id3150275" xml-lang="en-US" level="2">Sheets</paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/optdlg/printCB" id="bm_id3145316" localize="false"/><paragraph role="heading" id="hd_id3149784" xml-lang="en-US" level="3">Print only selected sheets</paragraph>
 <paragraph role="paragraph" id="par_id3152349" xml-lang="en-US"><ahelp hid="modules/scalc/ui/optdlg/printCB">Specifies that only contents from selected sheets are printed, even if you specify a wider range in the <emph>File - Print</emph> dialog or in the <emph>Format - Print Ranges</emph> dialog. Contents from sheets that are not selected will not be printed.</ahelp></paragraph>
-<paragraph role="tip" id="par_id3153349" xml-lang="en-US">To select multiple sheets, click on the sheet names on the bottom margin of the workspace while keeping the Ctrl key pressed.</paragraph>
+<paragraph role="tip" id="par_id3153349" xml-lang="en-US">To select multiple sheets, click on the sheet names on the bottom margin of the workspace while keeping the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key pressed.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/shared/optionen/securityoptionsdialog.xhp b/source/text/shared/optionen/securityoptionsdialog.xhp
index 1d06d48307..e9d1e36309 100644
--- a/source/text/shared/optionen/securityoptionsdialog.xhp
+++ b/source/text/shared/optionen/securityoptionsdialog.xhp
@@ -63,8 +63,8 @@
 <bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/password" id="bm_id7186498" localize="false"/><paragraph role="heading" id="par_idN1067C" xml-lang="en-US" level="3">Recommend password protection on saving</paragraph>
 <paragraph role="paragraph" id="par_idN10680" xml-lang="en-US"><ahelp hid="cui/ui/securityoptionsdialog/password">Select to always enable the <emph>Save with password</emph> option in the file save dialogs. Deselect the option to save files by default without password.</ahelp></paragraph>
 
-<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3">Ctrl-click required to follow hyperlinks</paragraph>
-<paragraph role="paragraph" id="par_id79042" xml-lang="en-US"><ahelp hid="cui/ui/securityoptionsdialog/ctrlclick">If enabled, you must hold down the Ctrl key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/ctrlclick" id="bm_id5288857" localize="false"/><paragraph role="heading" id="hd_id1972106" xml-lang="en-US" level="3"><switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline>-click required to follow hyperlinks</paragraph>
+<paragraph role="paragraph" id="par_id79042" xml-lang="en-US"><ahelp hid="cui/ui/securityoptionsdialog/ctrlclick">If enabled, you must hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key while clicking a hyperlink to follow that link. If not enabled, a click opens the hyperlink.</ahelp></paragraph>
 
 <bookmark xml-lang="en-US" branch="hid/cui/ui/securityoptionsdialog/blockuntrusted" id="bm_id5288858" localize="false"/><paragraph role="heading" id="hd_id1972107" xml-lang="en-US" level="3">Block any links from documents not among the trusted locations (see Macro Security)</paragraph>
 <paragraph role="paragraph" id="par_id79043" xml-lang="en-US"><ahelp hid="cui/ui/securityoptionsdialog/blockuntrusted">Blocks the use of linked images by documents not in the trusted locations defined on the <link href="text/shared/optionen/macrosecurity_ts.xhp" name="Trusted Sources">Trusted Sources</link> tab of the Macro Security dialog.</ahelp> This can increase security in case you work with documents from untrusted sources (e.g. the internet) and are worried about vulnerabilities in image processing software components. Blocking the use of links means that images are not loaded in untrusted documents, only a placeholder frame is visible.</paragraph>
diff --git a/source/text/simpress/01/13050300.xhp b/source/text/simpress/01/13050300.xhp
index d7ed615aa6..e6d9fe7d79 100644
--- a/source/text/simpress/01/13050300.xhp
+++ b/source/text/simpress/01/13050300.xhp
@@ -48,7 +48,7 @@
 </caseinline><defaultinline>
 <emph>Format - Group - Exit Group</emph></defaultinline></switchinline> when you are finished.</paragraph>
 <paragraph role="note" id="par_id3151242" xml-lang="en-US">Converting a group of objects to 3D does not change the stacking order of the individual objects.</paragraph>
-<paragraph role="tip" id="par_id3146965" xml-lang="en-US">Press F3 to quickly enter a group and Ctrl+F3 to leave the group.</paragraph>
+<paragraph role="tip" id="par_id3146965" xml-lang="en-US">Press F3 to quickly enter a group and <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+F3</keycode> to leave the group.</paragraph>
 <paragraph role="paragraph" id="par_id3145114" xml-lang="en-US">You can also convert bitmap images and vector graphics, including clipart, to 3D objects. $[officename] treats bitmaps as rectangles and vector graphics as a group of polygons when converting to 3D.</paragraph>
 <paragraph role="paragraph" id="par_id3149876" xml-lang="en-US">Even drawing objects that contain text can be converted.</paragraph>
 <paragraph role="paragraph" id="par_id3153960" xml-lang="en-US">If you want, you can also apply a <link href="text/shared/01/05350000.xhp" name="3D Effect">3D Effect</link> to the converted object.</paragraph>
diff --git a/source/text/simpress/guide/arrange_slides.xhp b/source/text/simpress/guide/arrange_slides.xhp
index c665121beb..59d7b362cb 100644
--- a/source/text/simpress/guide/arrange_slides.xhp
+++ b/source/text/simpress/guide/arrange_slides.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="textsimpressguidearrange_slidesxml" indexer="include" status="PUBLISH">
@@ -41,7 +41,7 @@
 <paragraph role="paragraph" id="par_id3151242" xml-lang="en-US">Do one of the following:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3143233" xml-lang="en-US">Choose <emph>View - Slide Sorter</emph>, select one or more slides, and then drag the slides to another location. To select multiple slides, hold down shift and click on the slides. To create a copy of a selected slide, hold down Ctrl while you drag. The mouse pointer changes to a plus sign. You can also drag a copy of a slide into another open $[officename] Impress document.</paragraph>
+<paragraph role="listitem" id="par_id3143233" xml-lang="en-US">Choose <menuitem>View - Slide Sorter</menuitem>, select one or more slides, and then drag the slides to another location. To select multiple slides, hold down shift and click on the slides. To create a copy of a selected slide, hold down <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> while you drag. The mouse pointer changes to a plus sign. You can also drag a copy of a slide into another open $[officename] Impress document.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153072" xml-lang="en-US">Choose <emph>View - Outline</emph>, select a slide, and then drag the slide to another location.</paragraph>
diff --git a/source/text/simpress/guide/change_scale.xhp b/source/text/simpress/guide/change_scale.xhp
index 08bc00466a..77ef6bccaa 100644
--- a/source/text/simpress/guide/change_scale.xhp
+++ b/source/text/simpress/guide/change_scale.xhp
@@ -43,7 +43,7 @@
 <paragraph role="listitem" id="par_id3148837" xml-lang="en-US">To zoom out, press the Minus Sign.</paragraph>
 </listitem>
 </list>
-<paragraph role="tip" id="par_id7954954" xml-lang="en-US">If you are using a mouse with a scroll wheel, you can hold down Ctrl and turn the wheel to change the zoom factor in all main modules of %PRODUCTNAME.</paragraph>
+<paragraph role="tip" id="par_id7954954" xml-lang="en-US">If you are using a mouse with a scroll wheel, you can hold down <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> and turn the wheel to change the zoom factor in all main modules of %PRODUCTNAME.</paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3145116" xml-lang="en-US"><link href="text/simpress/04/01020000.xhp" name="Shortcut keys for presentations">Shortcut keys for presentations</link></paragraph>
 </body>