source/text/shared/guide/undo_formatting.xhp | 8 ++++---- source/text/simpress/01/02110000.xhp | 2 +- source/text/simpress/guide/keyboard.xhp | 16 ++++++++-------- source/text/swriter/guide/insert_graphic_fromdraw.xhp | 4 ++-- source/text/swriter/guide/pageorientation.xhp | 2 +- source/text/swriter/guide/resize_navigator.xhp | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-)
New commits: commit 91413eacbe8790505dfd4cc452b0fa2e5589ac33 Author: Ilmari Lauhakangas <[email protected]> AuthorDate: Sat Jan 16 16:21:07 2021 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Sat Jan 16 16:35:09 2021 +0100 Use switches for Ctrl vs. Command on macOS Change-Id: I13829b216081021ae321a5c7111de0e11e65a7ee Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109440 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/source/text/shared/guide/undo_formatting.xhp b/source/text/shared/guide/undo_formatting.xhp index faea762d9..7c295dd1b 100644 --- a/source/text/shared/guide/undo_formatting.xhp +++ b/source/text/shared/guide/undo_formatting.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="textsharedguideundo_formattingxml" indexer="include" status="PUBLISH"> @@ -44,7 +44,7 @@ <paragraph role="heading" id="par_idN10639" xml-lang="en-US" level="2">Removing all Direct Formatting in a $[officename] Writer Document</paragraph> <list type="ordered"> <listitem> -<paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph> + <paragraph role="paragraph" id="par_idN1063F" xml-lang="en-US">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode> to select the whole text.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_idN10643" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph> @@ -56,7 +56,7 @@ <paragraph role="paragraph" id="par_idN10650" xml-lang="en-US">While pressing the Shift key click the first and then the last sheet tab to select all sheets.</paragraph> </listitem> <listitem> -<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph> +<paragraph role="paragraph" id="par_idN106DD" xml-lang="en-US">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode> to select the whole text.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_idN106F0" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph> @@ -68,7 +68,7 @@ <paragraph role="paragraph" id="par_idN10665" xml-lang="en-US">Click the <emph>Outline</emph> tab to open outline view.</paragraph> </listitem> <listitem> -<paragraph role="paragraph" id="par_id3906674" xml-lang="en-US">Press <item type="keycode">Ctrl+A</item> to select the whole text.</paragraph> +<paragraph role="paragraph" id="par_id3906674" xml-lang="en-US">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+A</keycode> to select the whole text.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_idN1075E" xml-lang="en-US">Choose <emph>Format - Clear Direct Formatting</emph>.</paragraph> diff --git a/source/text/simpress/01/02110000.xhp b/source/text/simpress/01/02110000.xhp index 71f018635..fba514458 100644 --- a/source/text/simpress/01/02110000.xhp +++ b/source/text/simpress/01/02110000.xhp @@ -43,7 +43,7 @@ <section id="howtoget"> <embed href="text/shared/00/edit_menu.xhp#navigator"/> </section> -<paragraph role="tip" id="par_id3156448" xml-lang="en-US">Press <item type="keycode">Ctrl+Shift+F5</item> to open the Navigator when you are editing a presentation.</paragraph> +<paragraph role="tip" id="par_id3156448" xml-lang="en-US">Press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+F5</keycode> to open the Navigator when you are editing a presentation.</paragraph> <bookmark xml-lang="en-US" branch="hid/SD_HID_SD_NAVIGATOR_TBI_PEN" id="bm_id3150538" localize="false"/><paragraph role="heading" id="hd_id3145235" xml-lang="en-US" level="2">Pointer</paragraph> <paragraph role="paragraph" id="par_id3157874" xml-lang="en-US"><ahelp hid="HID_SD_NAVIGATOR_TBI_PEN">Switches the mouse pointer to a pen that you can use to write on slides during a slide show.</ahelp> You cannot change the color of the pen.</paragraph> diff --git a/source/text/simpress/guide/keyboard.xhp b/source/text/simpress/guide/keyboard.xhp index 553b88e4b..54fe3f6bb 100644 --- a/source/text/simpress/guide/keyboard.xhp +++ b/source/text/simpress/guide/keyboard.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="textsimpressguidekeyboardxml" indexer="include" status="PUBLISH"> @@ -37,11 +37,11 @@ <embed href="text/shared/00/00000099.xhp#keys"/> <paragraph role="paragraph" id="par_id3148610" xml-lang="en-US">You can use the keyboard to access $[officename] Impress commands as well as to navigate through the workspace. $[officename] Impress uses the same shortcut keys as $[officename] Draw to create <link href="text/sdraw/guide/keyboard.xhp" name="drawing objects">drawing objects</link>.</paragraph> <paragraph role="heading" id="hd_id3149602" xml-lang="en-US" level="2">Selecting placeholders</paragraph> -<paragraph role="paragraph" id="par_id3150212" xml-lang="en-US">$[officename] Impress <emph>AutoLayouts</emph> use placeholders for slide titles, text, and objects. To select a placeholder, press <item type="keycode">Ctrl+Enter</item>. To move to the next placeholder, press <item type="keycode">Ctrl+Enter</item> again.</paragraph> -<paragraph role="note" id="par_id3166467" xml-lang="en-US">If you press <item type="keycode">Ctrl+Enter</item> after you reach the last placeholder in a slide, a new slide is inserted after the current slide. The new slide uses the same layout as the current slide.</paragraph> +<paragraph role="paragraph" id="par_id3150212" xml-lang="en-US">$[officename] Impress <emph>AutoLayouts</emph> use placeholders for slide titles, text, and objects. To select a placeholder, press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Enter</keycode>. To move to the next placeholder, press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Enter</keycode> again.</paragraph> +<paragraph role="note" id="par_id3166467" xml-lang="en-US">If you press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Enter</keycode> after you reach the last placeholder in a slide, a new slide is inserted after the current slide. The new slide uses the same layout as the current slide.</paragraph> <embed href="text/sdraw/guide/keyboard.xhp#all"/> <paragraph role="heading" id="hd_id3157871" xml-lang="en-US" level="2">During a Slide Show</paragraph> -<paragraph role="paragraph" id="par_id3150650" xml-lang="en-US">To start a slide show, press <item type="keycode">Ctrl+F2</item> or <item type="keycode">F5</item>.</paragraph> +<paragraph role="paragraph" id="par_id3150650" xml-lang="en-US">To start a slide show, press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+F2</keycode> or <keycode>F5</keycode>.</paragraph> <paragraph role="heading" id="hd_id3149354" xml-lang="en-US" level="3">Advance to the next slide or to the next animation effect</paragraph> <paragraph role="paragraph" id="par_id3148728" xml-lang="en-US"> <item type="keycode">Spacebar</item> @@ -65,19 +65,19 @@ <paragraph role="heading" id="hd_id3145248" xml-lang="en-US" level="3">Copying a slide:</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3156060" xml-lang="en-US">Use the arrow keys to navigate to the slide that you want to copy, and then press <item type="keycode">Ctrl+C</item>.</paragraph> +<paragraph role="listitem" id="par_id3156060" xml-lang="en-US">Use the arrow keys to navigate to the slide that you want to copy, and then press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+C</keycode>.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3148769" xml-lang="en-US">Move to the slide where you want to paste the copied slide, and then press <item type="keycode">Ctrl+V</item>.</paragraph> +<paragraph role="listitem" id="par_id3148769" xml-lang="en-US">Move to the slide where you want to paste the copied slide, and then press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+V</keycode>.</paragraph> </listitem> </list> <paragraph role="heading" id="hd_id3155367" xml-lang="en-US" level="3">Moving a slide:</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3155987" xml-lang="en-US">Use the arrow keys to navigate to the slide that you want to move, and then press <item type="keycode">Ctrl+X</item>.</paragraph> +<paragraph role="listitem" id="par_id3155987" xml-lang="en-US">Use the arrow keys to navigate to the slide that you want to move, and then press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+X</keycode>.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3147171" xml-lang="en-US">Navigate to the slide where you want to move the slide, and then press <item type="keycode">Ctrl+V</item>.</paragraph> +<paragraph role="listitem" id="par_id3147171" xml-lang="en-US">Navigate to the slide where you want to move the slide, and then press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+V</keycode>.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3083282" xml-lang="en-US">Select <emph>Before </emph>or <emph>After</emph> the current slide, and then click <emph>OK</emph>.</paragraph> diff --git a/source/text/swriter/guide/insert_graphic_fromdraw.xhp b/source/text/swriter/guide/insert_graphic_fromdraw.xhp index c5232ec7c..faa7d2892 100644 --- a/source/text/swriter/guide/insert_graphic_fromdraw.xhp +++ b/source/text/swriter/guide/insert_graphic_fromdraw.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="textswriterguideinsert_graphic_fromdrawxml" indexer="include" status="PUBLISH"> @@ -43,7 +43,7 @@ <paragraph role="listitem" id="par_id3149640" xml-lang="en-US">Open the Draw or Impress document containing the object that you want to copy.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3145098" xml-lang="en-US">Hold down <item type="keycode">Ctrl</item> and click and hold the object for a moment.<comment>see i70967</comment></paragraph> +<paragraph role="listitem" id="par_id3145098" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> and click and hold the object for a moment.<comment>see i70967</comment></paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3156250" xml-lang="en-US">Drag to the document where you want to insert the object.</paragraph> diff --git a/source/text/swriter/guide/pageorientation.xhp b/source/text/swriter/guide/pageorientation.xhp index fefe50738..281cb0dd4 100644 --- a/source/text/swriter/guide/pageorientation.xhp +++ b/source/text/swriter/guide/pageorientation.xhp @@ -97,7 +97,7 @@ <h3 id="hd_id3278603">One Page Long Styles</h3> <paragraph xml-lang="en-US" id="par_id5169225" role="paragraph">A page style can be defined to span one page only. The “First Page” style is an example. You set this property by defining another page style to be the "next style", on the <menuitem>Format - Page Style - Organizer</menuitem> tab page.</paragraph> <paragraph xml-lang="en-US" id="par_id6670125" role="paragraph">A one page long style starts from the lower border of the current page style range up to the next page break. The next page break appears automatically when the text flows to the next page, which is sometimes called a "soft page break". Alternatively, you can insert a manual page break.</paragraph> - <paragraph xml-lang="en-US" id="par_id2118594" role="paragraph">To insert a manual page break at the cursor position, press <item type="keycode">Ctrl+Enter</item> or choose <item type="menuitem">Insert - Manual Break</item> and just click OK.</paragraph> + <paragraph xml-lang="en-US" id="par_id2118594" role="paragraph">To insert a manual page break at the cursor position, press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Enter</keycode> or choose <menuitem>Insert - Manual Break</menuitem> and just click OK.</paragraph> <h3 id="hd_id166020">Manually Defined Range of a Page style</h3> <paragraph xml-lang="en-US" id="par_id6386913" role="paragraph">The “Default” page style does not set a different "next style" on the <menuitem>Format - Page Style - Organizer</menuitem> tab page. Instead, the "next style" is set also to be “Default”. All page styles that are followed by the same page style can span multiple pages. The lower and upper borders of the page style range are defined by "page breaks with style". All the pages between any two "page breaks with style" use the same page style.</paragraph> <paragraph xml-lang="en-US" id="par_id6062196" role="paragraph">You can insert a "page break with style" directly at the cursor position. Alternatively, you can apply the "page break with style" property to a paragraph or to a paragraph style.</paragraph> diff --git a/source/text/swriter/guide/resize_navigator.xhp b/source/text/swriter/guide/resize_navigator.xhp index 520a22114..b49105552 100644 --- a/source/text/swriter/guide/resize_navigator.xhp +++ b/source/text/swriter/guide/resize_navigator.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="textswriterguideresize_navigatorxml" indexer="include" status="PUBLISH"> @@ -41,7 +41,7 @@ <paragraph role="paragraph" id="par_id3155916" xml-lang="en-US">You can dock, undock and resize most $[officename] program windows such as the Navigator or the Styles window.</paragraph> <list type="unordered"> <listitem> -<paragraph role="paragraph" id="par_id3155861" xml-lang="en-US">To dock or undock the Navigator or the Styles window, hold down the <item type="keycode">Ctrl</item> key and double-click on a gray area in the window. Alternatively, press <item type="keycode">Ctrl+Shift+F10</item>.</paragraph> +<paragraph role="paragraph" id="par_id3155861" xml-lang="en-US">To dock or undock the Navigator or the Styles window, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key and double-click on a gray area in the window. Alternatively, press <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+Shift+F10</keycode>.</paragraph> </listitem> <listitem> <paragraph role="paragraph" id="par_id3156096" xml-lang="en-US">To resize the window, drag a corner or an edge of the window.</paragraph> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
