tdf#92825 Rearrange Writer's insert menu

fix merge conflict

Change-Id: I8c67b61fdc6042291890bf80b47d762dd89d76d4
Reviewed-on: https://gerrit.libreoffice.org/22972
Reviewed-by: Olivier Hallot <ohallot@collabora.co.uk>
Tested-by: Olivier Hallot <ohallot@collabora.co.uk>

2 files changed, 26 insertions, 30 deletions

diff --git a/source/text/shared/02/01140000.xhp b/source/text/shared/02/01140000.xhp
index 7ec05b7126..2496689bfc 100644
--- a/source/text/shared/02/01140000.xhp
+++ b/source/text/shared/02/01140000.xhp
@@ -87,9 +87,7 @@
       </table>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id9304767" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:Line" id="bm_id3155449" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U"
-                 oldref="13">Line</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3143270" role="heading" level="2" l10n="U" oldref="13"><variable id="line_title">Line</variable></paragraph>
       <table id="tbl_id3150275">
          <tablerow>
             <tablecell>
@@ -98,7 +96,7 @@
 	</image></paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></paragraph>
+               <paragraph xml-lang="en-US" id="par_id3155922" role="paragraph" l10n="U" oldref="64"><variable id="line_text"><ahelp hid=".uno:Line">Draws a straight line where you drag in the current document. To constrain the line to 45 degrees, hold down Shift while you drag.</ahelp></variable></paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -249,9 +247,7 @@
       </table>
 
 <bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id8730699" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DrawText" id="bm_id3147321" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U"
-                 oldref="36">Text</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145150" role="heading" level="2" l10n="U" oldref="36"><variable id="textbox_title">Text Box</variable></paragraph>
       <table id="tbl_id3150297">
          <tablerow>
             <tablecell>
@@ -260,7 +256,7 @@
 	</image></paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></paragraph>
+               <paragraph xml-lang="en-US" id="par_id3154657" role="paragraph" l10n="CHG" oldref="69"><variable id="textbox_text"><ahelp hid=".uno:DrawText">Draws a text box with horizontal text direction where you drag in the current document. Drag a text box to the size you want anywhere in the document, and then type or paste your text. Rotate the text box to get rotated text.</ahelp></variable></paragraph>
             </tablecell>
          </tablerow>
       </table>
@@ -363,4 +359,4 @@
          <paragraph xml-lang="en-US" id="par_id3155555" role="paragraph" l10n="CHG" oldref="74"><link href="text/shared/guide/insert_graphic_drawit.xhp" name="Tips">Tips for working with the <emph>Drawing </emph>bar.</link></paragraph>
       </section>
    </body>
-</helpdocument>
\ No newline at end of file
+</helpdocument>
diff --git a/source/text/shared/02/fontwork.xhp b/source/text/shared/02/fontwork.xhp
index 027cc0ce52..86d8d54166 100644
--- a/source/text/shared/02/fontwork.xhp
+++ b/source/text/shared/02/fontwork.xhp
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -17,35 +16,36 @@
  *   License, Version 2.0 (the "License"); you may not use this file
  *   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="textshared02fontworkxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Fontwork Gallery</title>
-<filename>/text/shared/02/fontwork.xhp</filename>
-</topic>
-<history>
-<created date="2004-09-28T09:26:19">UFI: Fontwork Gallery icon</created>
-</history>
+  <topic id="textshared02fontworkxhp" indexer="include" status="PUBLISH">
+    <title id="tit" xml-lang="en-US">Fontwork</title>
+    <filename>/text/shared/02/fontwork.xhp</filename>
+  </topic>
 </meta>
+
 <body>
+
+
 <section id="fontwork">
 <bookmark xml-lang="en-US" branch="hid/.uno:FontworkGalleryFloater" id="bm_id7113864" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:FontworkGalleryFloater" id="bm_id4359569" localize="false"/>
-<paragraph role="heading" id="par_idN10557" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/02/fontwork.xhp">Fontwork Gallery</link></paragraph>
-<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The icon opens the Fontwork Gallery from which you can insert graphical text art into your document.</ahelp></paragraph>
+
+<paragraph id="par_idN10557" role="heading" level="1" xml-lang="en-US"><link href="text/shared/02/fontwork.xhp">Fontwork</link></paragraph>
+<paragraph id="par_idN10567" role="paragraph" xml-lang="en-US"><ahelp hid=".">Opens the Fontwork dialog from which you can insert styled text not possible through standard font formatting into your document.</ahelp></paragraph>
 </section>
+
 <section id="howtoget">
 <embed href="text/shared/00/00000404.xhp#syfontworkgallery"/>
 </section>
-<paragraph role="heading" id="par_idN10591" xml-lang="en-US" level="2" l10n="NEW">Fontwork Gallery</paragraph>
-<paragraph role="paragraph" id="par_idN10595" xml-lang="en-US" l10n="NEW"><ahelp hid=".">The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK.</ahelp></paragraph>
+
+<paragraph id="par_idN10591" role="heading" level="2" xml-lang="en-US">Fontwork Gallery</paragraph>
+<paragraph id="par_idN10595" role="paragraph" xml-lang="en-US"><ahelp hid=".">The Fontwork Gallery displays previews of Fontwork objects. To insert an object into your document, select the object, and then click OK.</ahelp></paragraph>
+
 <section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN105AF" xml-lang="en-US" l10n="NEW" localize="false" >
-	<embedvar href="text/shared/guide/fontwork.xhp#fontwork"/>
-</paragraph>
-<paragraph role="paragraph" id="par_idN10623" xml-lang="en-US" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
+<paragraph id="par_idN105AF" role="paragraph" localize="false" xml-lang="en-US"> <embedvar href="text/shared/guide/fontwork.xhp#fontwork"/> </paragraph>
+<paragraph id="par_idN10623" role="paragraph" xml-lang="en-US"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
 </section>
 </body>
+
 </helpdocument>