Refactor and fix merge/unmerge Help after translation round

- Remove embedvar'd text from sentence (break translation in some langs)
- Refactor formattings
- move bookmarks away from lists (breaks list formatting)
- update icon size.

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

1 files changed, 10 insertions, 14 deletions

diff --git a/source/text/scalc/01/05060000.xhp b/source/text/scalc/01/05060000.xhp
index 0d27c04689..246c420f2c 100644
--- a/source/text/scalc/01/05060000.xhp
+++ b/source/text/scalc/01/05060000.xhp
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
 <!--
  * This file is part of the LibreOffice project.
  *
@@ -18,7 +16,6 @@
  *   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="textscalc0105060000xml" indexer="include" status="PUBLISH">
@@ -37,23 +34,21 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:ToggleMergeCells" id="bm_id8030335" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/MergeCellsDialog" id="bm_id2745673" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/@@nowidget@@" id="bm_id2745673" localize="false"/>
-<paragraph role="heading" id="hd_id3149785" xml-lang="en-US" level="1"><variable id="togglemergecells"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></variable></paragraph>
+<h1 id="hd_id3149785"><variable id="togglemergecells"><link href="text/scalc/01/05060000.xhp" name="Merge and Center Cells">Merge and Center Cells</link></variable></h1>
 <paragraph role="paragraph" id="par_id3151246" xml-lang="en-US"><ahelp hid=".">This is a toggleable control that joins all cells in a rectangular selection into a single cell, or returns merged cells to the original individual cells. When merging it will format the merged cell as center aligned.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id541633057818950" xml-lang="en-US">The control is shown toggled-on whenever there are merged cells in the selection, indicating that clicking the control will unmerge those cells.</paragraph>
 </section>
 <section id="mergecells_warning">
-<paragraph role="warning" id="par_id3153718" xml-lang="en-US">Merging cells can lead to calculation errors in formulas in the table.</paragraph>
+<warning id="par_id3153718">Merging cells can lead to calculation errors in formulas in the table.</warning>
 </section>
 <section id="howtoget">
 <paragraph role="paragraph" id="par_id441632808439621" xml-lang="en-US">Do one of the following:</paragraph>
 <paragraph role="paragraph" id="par_id691632803588118" xml-lang="en-US">In the <emph>Formatting</emph> toolbar, click:</paragraph>
-
 <table id="tab_id451632804983642">
 <tablerow>
 <tablecell>
 <paragraph role="paragraph" id="par_id521632804983642" xml-lang="en-US">
-<image id="img_id811632804983642" src="cmd/sc_togglemergecells.png" width="0.2228in" height="0.2228in"><alt id="alt_id921632804983642" xml-lang="en-US">Icon</alt>
-    </image></paragraph>
+<image id="img_id811632804983642" src="cmd/sc_togglemergecells.png" width="1cm" height="1cm"><alt id="alt_id921632804983642" xml-lang="en-US">Icon Merge and Center Cells</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph role="paragraph" id="par_id491632804983642" xml-lang="en-US">Merge and Center Cells</paragraph>
@@ -64,31 +59,32 @@
 </section>
 <section id="mergenotes">
 <paragraph role="paragraph" id="par_id3149665" xml-lang="en-US">Cells cannot be merged again without first unmerging them.</paragraph>
-<paragraph role="note" id="par_id581632979766784" xml-lang="en-US">Merging a cell selection that partially includes merged cells is generally possible with <emph>Unmerge Cells</emph> followed by <emph>Merge Cells</emph>, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the <emph>Merge Cells Dialog</emph> options described below.</paragraph>
+<note id="par_id581632979766784">Merging a cell selection that partially includes merged cells is generally possible with <emph>Unmerge Cells</emph> followed by <emph>Merge Cells</emph>, without altering the initial selection. The result will be largely depend on previous choices when merging cells made with the <emph>Merge Cells Dialog</emph> options described below.</note>
 <paragraph role="paragraph" id="par_id3148552" xml-lang="en-US">Multiple selection is not supported, that is, the selection must be rectangular.</paragraph>
 <paragraph role="paragraph" id="par_id211632985508898">The merged cell receives the name and content of the first cell of the selection.</paragraph>
 <paragraph role="paragraph" id="par_id271632985709781">If more than one cell to be merged has content the <emph>Merge Cells</emph> dialog opens.</paragraph>
-<paragraph role="heading" id="par_id391632360383197" xml-lang="en-US" level="3">Merge Cells Dialog Options</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/move-cells-radio" id="bm_id274567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/keep-content-radio" id="bm_id274567" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/empty-cells-radio" id="bm_id274567" localize="false"/>
+<h3 id="par_id391632360383197">Merge Cells Dialog Options</h3>
 <paragraph role="paragraph" id="par_id1001240" xml-lang="en-US">Three options are available:</paragraph>
 <list type="unordered">
   <listitem>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/move-cells-radio" id="bm_id274567" localize="false"/>
     <paragraph id="par_id3155879" role="listitem" xml-lang="en-US"><emph>Move the contents of the hidden cells into the first cell</emph>: <ahelp hid=".">The actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated.</ahelp></paragraph>
   </listitem>
   <listitem>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/keep-content-radio" id="bm_id274567" localize="false"/>
     <paragraph id="par_id3155878" role="listitem" xml-lang="en-US"><emph>Keep the contents of the hidden cells</emph>: <ahelp hid=".">The contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change.</ahelp></paragraph>
   </listitem>
   <listitem>
-<bookmark xml-lang="en-US" branch="hid/modules/scalc/ui/mergecellsdialog/empty-cells-radio" id="bm_id274567" localize="false"/>
     <paragraph id="par_id3155877" role="listitem" xml-lang="en-US"><emph>Empty the contents of the hidden cells</emph>: <ahelp hid=".">The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated.</ahelp></paragraph>
   </listitem>
 </list>
 </section>
-<embed href="text/shared/00/00000004.xhp#related"/>
+<section id="relatedtopics">
 <embed href="text/shared/01/05100100.xhp#mergecells"/>
 <embed href="text/shared/01/05100200.xhp#unmergecells"/>
 <embed href="text/scalc/guide/table_cellmerge.xhp#table_cellmerge"/>
 <embed href="text/scalc/guide/cellreferences.xhp#cellreferences"/>
+</section>
 </body>
 </helpdocument>