This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 5e4370c95e Clean up formatting 5e4370c95e is described below commit 5e4370c95e211216a82970122c77bea2e6595e8e Author: mseidel <msei...@apache.org> AuthorDate: Sat Aug 17 01:26:32 2024 +0200 Clean up formatting --- main/helpcontent2/source/text/shared/00/00000401.xhp | 3 +-- .../source/text/shared/explorer/database/dabawiz02jdbc.xhp | 3 +-- main/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp | 9 +++------ main/helpcontent2/source/text/shared/guide/space_hyphen.xhp | 3 +-- main/helpcontent2/source/text/swriter/00/00000404.xhp | 2 +- main/helpcontent2/source/text/swriter/01/05150000.xhp | 3 +-- main/helpcontent2/source/text/swriter/01/05150200.xhp | 3 +-- main/helpcontent2/source/text/swriter/01/06060000.xhp | 3 +-- main/helpcontent2/source/text/swriter/guide/table_sizing.xhp | 2 +- 9 files changed, 11 insertions(+), 20 deletions(-) diff --git a/main/helpcontent2/source/text/shared/00/00000401.xhp b/main/helpcontent2/source/text/shared/00/00000401.xhp index 99d1959cea..9fef17ba30 100644 --- a/main/helpcontent2/source/text/shared/00/00000401.xhp +++ b/main/helpcontent2/source/text/shared/00/00000401.xhp @@ -54,8 +54,7 @@ <paragraph role="paragraph" id="par_id3154894" xml-lang="en-US" l10n="U" oldref="179">Key <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph> </section> <section id="neuvundd"> -<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="82">Menu <emph>File - New</emph> -<emph>- Templates and Documents</emph>.</paragraph> +<paragraph role="paragraph" id="par_id3157898" xml-lang="en-US" l10n="U" oldref="82">Menu <emph>File - New - Templates and Documents</emph>.</paragraph> <paragraph role="paragraph" id="par_id3149140" xml-lang="en-US" l10n="U" oldref="187">Key Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+N</paragraph> </section> <paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="U" oldref="160"><variable id="etiketten">Choose <emph>File - New - Labels</emph> diff --git a/main/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp b/main/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp index d9de3c2059..0d9188111d 100644 --- a/main/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp +++ b/main/helpcontent2/source/text/shared/explorer/database/dabawiz02jdbc.xhp @@ -88,8 +88,7 @@ <paragraph role="heading" id="par_idN106BB" xml-lang="en-US" level="2" l10n="NEW">JDBC Driver Class</paragraph> <paragraph role="paragraph" id="par_idN106BF" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_DRIVERCLASS">Enter the name of the JDBC driver.</ahelp></paragraph> <section id="classpath"> -<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME</emph> -<emph>- Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph> +<paragraph role="warning" id="par_id7953733" xml-lang="en-US" l10n="NEW">Before you can use a JDBC driver, you need to add its class path. Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Java</emph>, and click the <emph>Class Path</emph> button. After you add the path information, restart <item type="productname">%PRODUCTNAME</item>.</paragraph> </section> <!-- removed HID 852251216 --> <paragraph role="heading" id="par_idN106CE" xml-lang="en-US" level="2" l10n="NEW">Test Class<comment>UFI: may be Test Connection - both strings are in spec</comment></paragraph> diff --git a/main/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp b/main/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp index 3186e76292..abbb36a8c6 100644 --- a/main/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp +++ b/main/helpcontent2/source/text/shared/guide/hyperlink_insert.xhp @@ -39,12 +39,10 @@ <paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="5">You can insert hyperlinks in two ways: as text or as a button. In both cases, the visible text can be different from the URL.</paragraph> <list type="ordered"> <listitem> -<paragraph role="listitem" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="7">Display the <emph>Hyperlink</emph> -<emph>Bar</emph> by choosing <emph>View - Toolbars - Hyperlink Bar</emph>. Type the visible text in the left field and the full URL in the right field, including http:// or file://.</paragraph> +<paragraph role="listitem" id="par_id3153527" xml-lang="en-US" l10n="U" oldref="7">Display the <emph>Hyperlink Bar</emph> by choosing <emph>View - Toolbars - Hyperlink Bar</emph>. Type the visible text in the left field and the full URL in the right field, including http:// or file://.</paragraph> </listitem> <listitem> -<paragraph role="listitem" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="8">Place the text cursor in the document at the point where you want to insert the hyperlink. Click the <emph>Hyperlink</emph> icon on the <emph>Hyperlink</emph> -<emph>Bar</emph>. The hyperlink is inserted as text.</paragraph> +<paragraph role="listitem" id="par_id3149811" xml-lang="en-US" l10n="U" oldref="8">Place the text cursor in the document at the point where you want to insert the hyperlink. Click the <emph>Hyperlink</emph> icon on the <emph>Hyperlink Bar</emph>. The hyperlink is inserted as text.</paragraph> </listitem> <listitem> <paragraph role="listitem" id="par_id3155421" xml-lang="en-US" l10n="U" oldref="31">If you want to insert the hyperlink as a button, click and hold the <emph>Hyperlink</emph> icon and select <emph>As Button</emph> from the sub-menu.</paragraph> @@ -58,8 +56,7 @@ </image></paragraph> </tablecell> <tablecell colspan="" rowspan=""> -<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="30">To use the <link href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink dialog</link> instead of the <emph>Hyperlink</emph> -<emph>Bar</emph> to define the hyperlink, click the icon on the <emph>Standard</emph> bar.</paragraph> +<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="30">To use the <link href="text/shared/02/09070000.xhp" name="Hyperlink dialog">Hyperlink dialog</link> instead of the <emph>Hyperlink Bar</emph> to define the hyperlink, click the icon on the <emph>Standard</emph> bar.</paragraph> </tablecell> </tablerow> </table> diff --git a/main/helpcontent2/source/text/shared/guide/space_hyphen.xhp b/main/helpcontent2/source/text/shared/guide/space_hyphen.xhp index 8cbd8c0af3..595dcef1d3 100644 --- a/main/helpcontent2/source/text/shared/guide/space_hyphen.xhp +++ b/main/helpcontent2/source/text/shared/guide/space_hyphen.xhp @@ -51,8 +51,7 @@ <paragraph role="paragraph" id="par_id3148538" xml-lang="en-US" l10n="U" oldref="32">An example of a non-breaking dash 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="heading" id="hd_id3163802" xml-lang="en-US" level="2" l10n="U" oldref="65">Hyphen, dash</paragraph> <paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="CHG" oldref="66">In order to enter longer dashes, you can find under <emph>Tools - AutoCorrect Options - Options</emph> the <emph>Replace dashes</emph> option. This option replaces one or two minus signs under certain conditions with an en-dash or an em-dash (see <link href="text/shared/01/06040100.xhp" name="$[officename] Help">$[officename] Help</link>).</paragraph> -<paragraph role="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - 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="paragraph" id="par_id3153561" xml-lang="en-US" l10n="U" oldref="67">For additional replacements see the replacements table under <emph>Tools - AutoCorrect Options - </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" l10n="U" oldref="63">Definite separator</paragraph> <paragraph role="paragraph" id="par_id3154306" xml-lang="en-US" l10n="U" oldref="60">To support automatic hyphenation by entering a separator 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> diff --git a/main/helpcontent2/source/text/swriter/00/00000404.xhp b/main/helpcontent2/source/text/swriter/00/00000404.xhp index 3d0c4c136a..c029848ef2 100644 --- a/main/helpcontent2/source/text/swriter/00/00000404.xhp +++ b/main/helpcontent2/source/text/swriter/00/00000404.xhp @@ -234,7 +234,7 @@ </variable></paragraph> <paragraph role="paragraph" id="par_id3145625" xml-lang="en-US" l10n="U" oldref="88"><variable id="verz37">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Entries</emph> tab (when Bibliography is the selected type) </variable></paragraph> -<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - </emph><emph>Bibliography Entry</emph> and click <emph>Edit</emph> +<paragraph role="paragraph" id="par_id3149767" xml-lang="en-US" l10n="U" oldref="89"><variable id="litdef">Choose <emph>Insert - Indexes and Tables - Bibliography Entry</emph> and click <emph>Edit</emph> </variable></paragraph> <paragraph role="paragraph" id="par_id3150918" xml-lang="en-US" l10n="U" oldref="68"><variable id="stichwortverzeichnisverz3">Choose <emph>Insert - Indexes and Tables - Indexes and Tables - Styles</emph> tab </variable></paragraph> diff --git a/main/helpcontent2/source/text/swriter/01/05150000.xhp b/main/helpcontent2/source/text/swriter/01/05150000.xhp index 461cd7d7f4..11c013aa01 100644 --- a/main/helpcontent2/source/text/swriter/01/05150000.xhp +++ b/main/helpcontent2/source/text/swriter/01/05150000.xhp @@ -34,8 +34,7 @@ <bookmark_value>AutoCorrect function;text documents</bookmark_value> </bookmark><comment>MW changed AutoFormat to AutoCorrect</comment> <paragraph xml-lang="en-US" id="hd_id3153925" role="heading" level="1" l10n="U"><link href="text/swriter/01/05150000.xhp" name="AutoFormat">AutoCorrect</link></paragraph> -<paragraph xml-lang="en-US" id="par_id3151182" role="paragraph" l10n="U">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect</emph> -<emph>Options</emph></link>.</paragraph> +<paragraph xml-lang="en-US" id="par_id3151182" role="paragraph" l10n="U">Automatically formats the file according to the options that you set under <link href="text/shared/01/06040000.xhp" name="Tools - AutoCorrect"><emph>Tools - AutoCorrect Options</emph></link>.</paragraph> </section> <section id="howtoget"> <embed href="text/swriter/00/00000405.xhp#autoformat1"/> diff --git a/main/helpcontent2/source/text/swriter/01/05150200.xhp b/main/helpcontent2/source/text/swriter/01/05150200.xhp index 0ce5149244..01db04b186 100644 --- a/main/helpcontent2/source/text/swriter/01/05150200.xhp +++ b/main/helpcontent2/source/text/swriter/01/05150200.xhp @@ -41,8 +41,7 @@ <bookmark_value>separator lines;AutoCorrect function</bookmark_value> </bookmark><comment>MW replaced AutoFormat by AutoCorrect (2 times)</comment> <paragraph xml-lang="en-US" id="hd_id3155962" role="heading" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05150200.xhp" name="Apply">Apply</link></paragraph> -<paragraph xml-lang="en-US" id="par_id3149871" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect</emph> -<emph>Options</emph>.</ahelp></paragraph> +<paragraph xml-lang="en-US" id="par_id3149871" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".uno:AutoFormatApply">Automatically formats the file according to the options that you set under <emph>Tools - AutoCorrect Options</emph>.</ahelp></paragraph> </section> <section id="howtoget"> <embed href="text/swriter/00/00000405.xhp#autoformat2"/> diff --git a/main/helpcontent2/source/text/swriter/01/06060000.xhp b/main/helpcontent2/source/text/swriter/01/06060000.xhp index cceb23bdc0..bceb781fb4 100644 --- a/main/helpcontent2/source/text/swriter/01/06060000.xhp +++ b/main/helpcontent2/source/text/swriter/01/06060000.xhp @@ -39,8 +39,7 @@ </section> <paragraph role="paragraph" id="par_id3150934" xml-lang="en-US" l10n="U" oldref="54">Outline numbering is linked to paragraph styles. By default, the "Heading" paragraph styles (1-10) are assigned to the corresponding outline number levels (1-10). If you want, you can assign different paragraph styles to the outline number level.</paragraph> <paragraph role="tip" id="par_id8237250" xml-lang="en-US" l10n="NEW">If you want numbered headings, use the <emph>Tools - Outline Numbering</emph> menu command to assign numbering to a paragraph style. Do not use the Numbering icon on the Formatting toolbar.</paragraph> -<paragraph role="note" id="par_id3147567" xml-lang="en-US" l10n="U" oldref="55">To highlight the screen display of outline numbers, choose <emph>View -</emph> -<emph>Field Shadings</emph>.</paragraph> +<paragraph role="note" id="par_id3147567" xml-lang="en-US" l10n="U" oldref="55">To highlight the screen display of outline numbers, choose <emph>View - Field Shadings</emph>.</paragraph> <embed href="text/swriter/01/06060100.xhp#numerierung"/> <embed href="text/shared/01/06050600.xhp#position_s"/> <bookmark xml-lang="en-US" branch="hid/SW_HID_OUTLINE_FORM" id="bm_id3147506" localize="false"/> diff --git a/main/helpcontent2/source/text/swriter/guide/table_sizing.xhp b/main/helpcontent2/source/text/swriter/guide/table_sizing.xhp index c240bf125f..66bee61138 100644 --- a/main/helpcontent2/source/text/swriter/guide/table_sizing.xhp +++ b/main/helpcontent2/source/text/swriter/guide/table_sizing.xhp @@ -81,7 +81,7 @@ </caseinline><defaultinline>Alt</defaultinline></switchinline>+Shift, and then press the right arrow key.</paragraph> </listitem></list> <paragraph id="par_id3155891" role="note" xml-lang="en-US">You can specify the behavior for the arrow keys by choosing <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph> -</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - </emph><emph>%PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph> +</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME Writer - Table</emph>, and selecting the options that you want in the <emph>Keyboard handling</emph> area.</paragraph> <paragraph id="hd_id3149993" role="heading" xml-lang="en-US" level="3">To Change the Width of a Cell</paragraph> <paragraph id="par_id3148676" role="listitem" xml-lang="en-US">Hold down <switchinline select="sys"><caseinline select="MAC">Option+Command </caseinline><defaultinline>Alt+Ctrl</defaultinline></switchinline>, and then press the left or the right arrow key</paragraph>