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

Sat Oct 2 16:57:28 UTC 2021

source/text/simpress/00/00000413.xhp |    2 +-
 source/text/simpress/01/13180000.xhp |    2 +-
 source/text/simpress/01/13180100.xhp |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 5c03bc3060b78b29a3fccfd5f7fb96ef51f17a64
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sat Oct 2 12:01:56 2021 +0200
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Sat Oct 2 18:57:08 2021 +0200

    tdf#132643 Translate German section IDs
    
    Change-Id: I3ecac778917b0cc505f2e0dcc1506034061866ba
    Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122982
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/source/text/simpress/00/00000413.xhp b/source/text/simpress/00/00000413.xhp
index c1b73eeb2..95abb4d7e 100644
--- a/source/text/simpress/00/00000413.xhp
+++ b/source/text/simpress/00/00000413.xhp
@@ -149,7 +149,7 @@
 <paragraph role="paragraph" id="par_id3145615" xml-lang="en-US">Select two or more objects, open the context menu and choose <emph>Shapes</emph>
 </paragraph>
 </section>
-<section id="verschm">
+<section id="merge">
 <paragraph role="paragraph" id="par_id3163822" xml-lang="en-US">Choose <emph>Shape - Merge</emph> (<item type="productname">%PRODUCTNAME</item> Draw only)</paragraph>
 <paragraph role="paragraph" id="par_id3156309" xml-lang="en-US">Select two or more objects, open the context menu and choose <emph>Shapes - Merge</emph>
 </paragraph>
diff --git a/source/text/simpress/01/13180000.xhp b/source/text/simpress/01/13180000.xhp
index 1cce7aa09..5041466a3 100644
--- a/source/text/simpress/01/13180000.xhp
+++ b/source/text/simpress/01/13180000.xhp
@@ -40,7 +40,7 @@
   <embed href="text/simpress/00/00000413.xhp#formen"/>
 </section>
   <paragraph role="paragraph" id="par_id3156286" xml-lang="en-US">Shapes take on the properties of the lowermost object in the stacking order.</paragraph>
-  <embed href="text/simpress/01/13180100.xhp#verschmelzen"/>
+  <embed href="text/simpress/01/13180100.xhp#merge"/>
   <embed href="text/simpress/01/13180200.xhp#sub"/>
   <embed href="text/simpress/01/13180300.xhp#intersect"/>
  </body>
diff --git a/source/text/simpress/01/13180100.xhp b/source/text/simpress/01/13180100.xhp
index 3d144c533..0858919a1 100644
--- a/source/text/simpress/01/13180100.xhp
+++ b/source/text/simpress/01/13180100.xhp
@@ -32,13 +32,13 @@
 <body>
   
   
-  <section id="verschmelzen">
+  <section id="merge">
 <bookmark branch="hid/.uno:Merge" xml-lang="en-US" id="bm_id3150441" localize="false"/>
 <paragraph id="hd_id3150870" role="heading" level="1" xml-lang="en-US"><link href="text/simpress/01/13180100.xhp" name="Merge">Merge</link></paragraph>
   <paragraph role="paragraph" id="par_id3150012" xml-lang="en-US"><ahelp hid=".uno:Merge" visibility="visible">Adds the area of the selected objects to the area of the lowermost object in the selection. This command is best used with overlapping objects.</ahelp></paragraph>
   </section>
   <section id="howtoget">
-  <embed href="text/simpress/00/00000413.xhp#verschm"/>
+  <embed href="text/simpress/00/00000413.xhp#merge"/>
 </section>
   <paragraph role="paragraph" id="par_id3152578" xml-lang="en-US">Any spaces that are visible between the objects are preserved.</paragraph>
   <embed href="text/shared/00/00000004.xhp#related"/>
