[Libreoffice-commits] help.git: source/text

Seth Chaiklin (via logerrit) logerrit at kemper.freedesktop.org
Mon Jan 18 09:59:51 UTC 2021


 source/text/swriter/00/00000405.xhp       |    6 +++---
 source/text/swriter/00/stylesmenu.xhp     |    6 +++---
 source/text/swriter/01/05140000.xhp       |    4 ++--
 source/text/swriter/01/05170000.xhp       |   14 +++++++-------
 source/text/swriter/guide/load_styles.xhp |    6 ++----
 source/text/swriter/main0115.xhp          |    4 ++--
 6 files changed, 19 insertions(+), 21 deletions(-)

New commits:
commit 02621d694b83cc0fa710cbf110f8262967360402
Author:     Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Fri Jan 15 03:31:50 2021 +0100
Commit:     Seth Chaiklin <sdc.blanco at youmail.dk>
CommitDate: Mon Jan 18 10:59:31 2021 +0100

    update Load Styles and related help pages to "Load Styles from Template"
    
      https://gerrit.libreoffice.org/c/core/+/109006 changed the label of
      the command "Load Styles" to "Load Styles from Template" and changed
      the some labels in the dialog box. This patch updates all help pages
      that were affected by that change, and takes the opportunity to
      review these pages and make small improvements where needed.
    
       ( swriter/00/00000405.xhp )
        * update menu labels
        * replace German id "vorlagenladen" -> "loadstyles"
    
       ( swriter/00/stylesmenu.xhp )
        * update menu labels for "Load Styles", "Update Selecte Style"
          and "New Style from Selection"
        * update to <menuitem> and <keycode>, only for modified paragraphs
    
       ( swriter/01/05140000.xhp )
         * update menu labels
    
       ( swriter/01/05170000.xhp )
         * update menu labels
         * replace German id "vorlagenladen" -> "loadstyles"
           and "vorlagentext" -> "styles_text" (which does not seem
           to be used anywhere else)
    
       ( swriter/guide/load_styles.xhp )
         * update to <h1>
    
       ( swriter/main0115.xhp )
        * update menu labels
    
    
    Change-Id: I779b2644195f3f6cdc00743c7577875e3e198902
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/109289
    Tested-by: Jenkins
    Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>

diff --git a/source/text/swriter/00/00000405.xhp b/source/text/swriter/00/00000405.xhp
index 04a20c930..1882b93d9 100644
--- a/source/text/swriter/00/00000405.xhp
+++ b/source/text/swriter/00/00000405.xhp
@@ -39,9 +39,9 @@
          <paragraph xml-lang="en-US" id="par_idN10715" role="paragraph">Right-click a paragraph with style <item type="literal">Text body</item>. Choose <emph>Edit Paragraph Style - Condition</emph> tab.</paragraph>
          <paragraph role="paragraph" id="par_id651578069976376">Choose <menuitem>View - Styles</menuitem> (<switchinline select="sys"><caseinline select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline>). Right-click any paragraph style. Choose <menuitem>New - Condition</menuitem> tab.</paragraph>
      </section>
-      <section id="vorlagenladen">
-        <paragraph xml-lang="en-US" role="paragraph" id="par_id221579830516951">Choose <menuitem>Styles - Load Styles</menuitem></paragraph>
-        <paragraph xml-lang="en-US" role="paragraph" id="par_id655978063576">In the <emph>Styles</emph> window. Click the <emph>Styles action</emph> icon on the top right of the <emph>Styles</emph> window and keep the mouse button pressed. Choose <menuitem>Load Styles</menuitem> from the submenu.</paragraph>
+      <section id="loadstyles">
+        <paragraph xml-lang="en-US" role="paragraph" id="par_id221579830516951">Choose <menuitem>Styles - Load Styles from Template</menuitem></paragraph>
+        <paragraph xml-lang="en-US" role="paragraph" id="par_id655978063576">In the <emph>Styles</emph> window. Click the <emph>Styles action</emph> icon on the top right of the <emph>Styles</emph> window and keep the mouse button pressed. Choose <menuitem>Load Styles from Template</menuitem> from the submenu.</paragraph>
         <paragraph xml-lang="en-US" role="paragraph" id="par_idN10739">Different ways to open <emph>Styles</emph> window:</paragraph>
           <list type="unordered">
             <listitem><paragraph role="paragraph" xml-lang="en-US" id="par_id51579866880596">Press  <switchinline select="sys"><caseinline select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline></paragraph></listitem>
diff --git a/source/text/swriter/00/stylesmenu.xhp b/source/text/swriter/00/stylesmenu.xhp
index 22db328cb..20d0852bf 100644
--- a/source/text/swriter/00/stylesmenu.xhp
+++ b/source/text/swriter/00/stylesmenu.xhp
@@ -17,9 +17,9 @@
     </meta>
     <body>
     <paragraph role="paragraph" id="par_id941529884998705" xml-lang="en-US"><variable id="ses">Choose <emph>Styles - Edit Styles...</emph></variable>.</paragraph>
-    <paragraph role="paragraph" id="par_id511529885005747" xml-lang="en-US"><variable id="sus">Choose <emph>Styles - Update Style</emph> or <switchinline select="sys"><caseinline select="MAC"><emph>Command</emph></caseinline><defaultinline><emph>Ctrl</emph></defaultinline></switchinline><emph>+ Shift + F11</emph></variable>.</paragraph>
-    <paragraph role="paragraph" id="par_id411529885010612" xml-lang="en-US"><variable id="sns">Choose <emph>Styles - New Style</emph> or <emph>Shift + F11</emph></variable>.</paragraph>
-    <paragraph role="paragraph" id="par_id221529885015598" xml-lang="en-US"><variable id="sls">Choose <emph>Styles - Load Styles</emph></variable>.</paragraph>
+    <paragraph role="paragraph" id="par_id511529885005747" xml-lang="en-US"><variable id="sus">Choose <menuitem>Styles - Update Selected Style</menuitem> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline><keycode>+ Shift+F11</keycode></variable>.</paragraph>
+    <paragraph role="paragraph" id="par_id411529885010612" xml-lang="en-US"><variable id="sns">Choose <menuitem>Styles - New Style from Selection</menuitem> or <keycode>Shift+F11</keycode></variable>.</paragraph>
+    <paragraph role="paragraph" id="par_id221529885015598" xml-lang="en-US"><variable id="sls">Choose <menuitem>Styles - Load Styles from Template</menuitem></variable>.</paragraph>
     <paragraph role="paragraph" id="par_id391529885020996" xml-lang="en-US"><variable id="sms">Choose <emph>Styles - Manage Styles</emph> or <switchinline select="sys"><caseinline select="MAC"><keycode>Command+T</keycode></caseinline><defaultinline><keycode>F11</keycode></defaultinline></switchinline></variable>.</paragraph>
 </body>
 </helpdocument>
diff --git a/source/text/swriter/01/05140000.xhp b/source/text/swriter/01/05140000.xhp
index 0285ab4dd..afd402009 100644
--- a/source/text/swriter/01/05140000.xhp
+++ b/source/text/swriter/01/05140000.xhp
@@ -174,8 +174,8 @@
       <paragraph id="par_idN10A04" role="paragraph" xml-lang="en-US"><link href="text/swriter/guide/stylist_update.xhp" name="updatestyle"><menuitem>Update Selected Style</menuitem></link> </paragraph>
       <paragraph id="par_id3146333" role="paragraph" xml-lang="en-US"><ahelp hid=".">The manually formatted attributes of the text at the cursor position in the document will be added to the style that is selected in the Styles window.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:LoadStyles" id="bm_id7425975" localize="false"/>
-      <paragraph id="par_idN10A31" role="paragraph" xml-lang="en-US"><link href="text/swriter/01/05170000.xhp" name="loadstyles"><menuitem>Load Styles</menuitem></link></paragraph>
-      <paragraph id="par_idN10A36" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the Load Styles dialog to import styles from another document.</ahelp></paragraph>
+      <paragraph id="par_idN10A31" role="paragraph" xml-lang="en-US"><link href="text/swriter/01/05170000.xhp" name="loadstyles"><menuitem>Load Styles from Template</menuitem></link></paragraph>
+      <paragraph id="par_idN10A36" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the Load Styles from Template dialog to import styles from another document.</ahelp></paragraph>
     </tablecell>
   </tablerow>
 </table>
diff --git a/source/text/swriter/01/05170000.xhp b/source/text/swriter/01/05170000.xhp
index 61c3e0c67..b15b4b32c 100644
--- a/source/text/swriter/01/05170000.xhp
+++ b/source/text/swriter/01/05170000.xhp
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -17,7 +17,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="textswriter0105170000xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Load Styles</title>
@@ -33,10 +33,10 @@
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/LoadTemplateDialog" id="bm_id3154764" localize="false"/>
 <h1 id="hd_id3151242" xml-lang="en-US"><variable id="load_styles_header"><link href="text/swriter/01/05170000.xhp" name="Load Styles">Load Styles</link></variable></h1>
 <paragraph role="paragraph" id="par_id3083446" xml-lang="en-US">
-<variable id="vorlagentext"><ahelp hid=".">Imports formatting styles from another document or template into the current document.</ahelp>
+<variable id="styles_text"><ahelp hid=".">Imports formatting styles from another document or template into the current document.</ahelp>
 </variable></paragraph>
 <section id="howtoget">
-  <embed href="text/swriter/00/00000405.xhp#vorlagenladen"/>
+  <embed href="text/swriter/00/00000405.xhp#loadstyles"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/categories" id="bm_id3154555" localize="false"/>
 <h2 id="hd_id3149354" xml-lang="en-US">Categories</h2>
@@ -45,16 +45,16 @@
 <h2 id="hd_id3149885" xml-lang="en-US">Templates</h2>
 <paragraph role="paragraph" id="par_id3145249" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/templates">Lists the available templates for the selected category.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/text" id="bm_id3148772" localize="false"/>
-<h2 id="hd_id3148392" xml-lang="en-US">Text</h2>
+<h2 id="hd_id3148392" xml-lang="en-US">Paragraph and Character</h2>
 <paragraph role="paragraph" id="par_id3149026" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/text">Loads the paragraph and the character styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/frame" id="bm_id3147174" localize="false"/>
 <h2 id="hd_id3153717" xml-lang="en-US">Frame</h2>
 <paragraph role="paragraph" id="par_id3156320" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/frame">Loads the frame styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/pages" id="bm_id3151271" localize="false"/>
-<h2 id="hd_id3147565" xml-lang="en-US">Pages</h2>
+<h2 id="hd_id3147565" xml-lang="en-US">Page</h2>
 <paragraph role="paragraph" id="par_id3154642" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/pages">Loads the page styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/numbering" id="bm_id3149756" localize="false"/>
-<h2 id="hd_id3153147" xml-lang="en-US">Numbering</h2>
+<h2 id="hd_id3153147" xml-lang="en-US">List</h2>
 <paragraph role="paragraph" id="par_id3152587" xml-lang="en-US"><ahelp hid="sfx/ui/loadtemplatedialog/numbering">Loads the numbering styles from the selected document into the current document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sfx/ui/loadtemplatedialog/overwrite" id="bm_id3147507" localize="false"/>
 <h2 id="hd_id3151176" xml-lang="en-US">Overwrite</h2>
diff --git a/source/text/swriter/guide/load_styles.xhp b/source/text/swriter/guide/load_styles.xhp
index 71577df13..efd09edcc 100644
--- a/source/text/swriter/guide/load_styles.xhp
+++ b/source/text/swriter/guide/load_styles.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -19,7 +18,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  -->
 
-
 <meta>
       <topic id="textswriterguideload_stylesxml" indexer="include">
          <title xml-lang="en-US" id="tit">Using Styles From Another Document or Template</title>
@@ -32,8 +30,8 @@
       <bookmark_value>importing;styles from other files</bookmark_value>
       <bookmark_value>loading;styles from other files</bookmark_value>
 </bookmark>
-<paragraph xml-lang="en-US" id="hd_id3145086" role="heading" level="1"><variable id="load_styles"><link href="text/swriter/guide/load_styles.xhp" name="Using Styles From Another Document or Template">Using Styles From Another Document or Template</link>
-</variable></paragraph>
+<h1 xml-lang="en-US" id="hd_id3145086"><variable id="load_styles"><link href="text/swriter/guide/load_styles.xhp" name="Using Styles From Another Document or Template">Using Styles From Another Document or Template</link>
+</variable></h1>
       <paragraph xml-lang="en-US" id="par_id3154491" role="paragraph">You can import styles from another document or template into the current document.</paragraph>
               <paragraph id="par_id731529889382463" role="listitem" xml-lang="en-US">Open the <link href="text/swriter/01/05170000.xhp" name="load_styles_link"><emph>Load Styles</emph></link> dialog box by either</paragraph>
               <list type="unordered">
diff --git a/source/text/swriter/main0115.xhp b/source/text/swriter/main0115.xhp
index 82a064a18..b68aac9af 100644
--- a/source/text/swriter/main0115.xhp
+++ b/source/text/swriter/main0115.xhp
@@ -35,11 +35,11 @@
  <tip id="par_id451529878529005" xml-lang="en-US">You can customize the list of styles entries using menu <link href="text/shared/01/06140100.xhp" name="customize menu"><emph>Tools - Customize</emph></link>. Because custom styles belongs to the actual document, remember to store the customized menu in the document scope.</tip>
  <h2 id="hd_id991529881414793" xml-lang="en-US">Edit Style</h2>
  <paragraph role="paragraph" id="par_id111529881420452" xml-lang="en-US">Opens the Paragraph Style dialog box of the current paragraph.</paragraph>
- <paragraph role="heading" id="hd_id111529881431158" level="2" xml-lang="en-US">Update Selected Style</paragraph>
+ <h2 id="hd_id111529881431158" xml-lang="en-US">Update Selected Style</h2>
  <paragraph role="paragraph" id="par_id971529881437377" xml-lang="en-US">Update the paragraph style with the <link href="text/shared/00/00000005.xhp#Section7" name="direct formatting">direct formatting</link> applied to the current paragraph.</paragraph>
  <h2 id="hd_id191529881446409" xml-lang="en-US">New Style from Selection</h2>
  <paragraph role="paragraph" id="par_id331529881457275" xml-lang="en-US">Adds a paragraph style with the settings of the current selection. You will be prompted to enter the style name.</paragraph>
- <h2 id="hd_id351529881470044" xml-lang="en-US"><link href="text/swriter/01/05170000.xhp" name="Load Styles">Load Styles</link></h2>
+ <h2 id="hd_id351529881470044" xml-lang="en-US"><link href="text/swriter/01/05170000.xhp" name="Load Styles">Load Styles from Template</link></h2>
  <paragraph role="paragraph" id="par_id551529883682302" xml-lang="en-US"><link href="text/swriter/guide/load_styles.xhp" name="import style">Import styles</link> from another document or template into the current document.</paragraph>
   <h2 id="hd_id361529881482828" xml-lang="en-US">Manage Styles</h2>
   <paragraph role="paragraph" id="par_id901529883673111" xml-lang="en-US">Opens the <link href="text/swriter/01/05140000.xhp" name="linkname">Styles deck</link> in the sidebar.</paragraph>


More information about the Libreoffice-commits mailing list