[Libreoffice-commits] help.git: Branch 'libreoffice-5-4' - source/text

Tue Jun 6 21:02:35 UTC 2017

source/text/swriter/01/mm_newaddblo.xhp |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit 54706094543d7fcc54bc8d9d3789c40be78decc2
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Thu Jun 1 07:00:12 2017 +0200

    tdf#102930 Update New Address Block / Edit Address Block page
    
    Add missing bookmarks
    Sync with UI
    Make it have two window names in the title
    
    Change-Id: I99d424919d3792e3c1a0ff4c2427cb335e74fad3
    Reviewed-on: https://gerrit.libreoffice.org/38326
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>
    (cherry picked from commit 4ee7e6ef7170ae862b93d89badf5b512c60f0863)
    Reviewed-on: https://gerrit.libreoffice.org/38466

diff --git a/source/text/swriter/01/mm_newaddblo.xhp b/source/text/swriter/01/mm_newaddblo.xhp
index bff07f6c8..1c8782f72 100644
--- a/source/text/swriter/01/mm_newaddblo.xhp
+++ b/source/text/swriter/01/mm_newaddblo.xhp
@@ -22,7 +22,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter01mm_newaddbloxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">New Address Block</title>
+<title id="tit" xml-lang="en-US">New Address Block / Edit Address Block</title>
 <filename>/text/swriter/01/mm_newaddblo.xhp</filename>
 </topic>
 <history>
@@ -30,18 +30,24 @@
 </history>
 </meta>
 <body>
-<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">New Address Block</paragraph>
+<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1">New Address Block or Edit Address Block</paragraph>
 <paragraph role="paragraph" id="par_idN10546" xml-lang="en-US">Specify the placement of address data fields in an address block in <link href="text/swriter/01/mm_seladdblo.xhp">mail merge</link> documents.</paragraph>
-<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2">Address Elements</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_ELEMENTS" id="bm_id5275740" localize="false"/>
+<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2">Address elements</paragraph>
 <paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US"><ahelp hid=".">Select an address field and drag the field to the other list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_INSERT" id="bm_id5275741" localize="false"/>
 <paragraph role="heading" id="par_idN10570" xml-lang="en-US" level="2">></paragraph>
 <paragraph role="paragraph" id="par_idN10574" xml-lang="en-US"><ahelp hid=".">Adds the selected field from the Address Elements list to the other list.</ahelp> You can add the same field more than once.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_REMOVE" id="bm_id5275742" localize="false"/>
 <paragraph role="heading" id="par_idN10577" xml-lang="en-US" level="2"><</paragraph>
 <paragraph role="paragraph" id="par_idN1057B" xml-lang="en-US"><ahelp hid=".">Removes the selected field from the other list.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2">Drag address element to the field below</paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_DRAG" id="bm_id5275743" localize="false"/>
+<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2">Drag address elements here</paragraph>
 <paragraph role="paragraph" id="par_idN10582" xml-lang="en-US"><ahelp hid=".">Arrange the fields with drag-and-drop or use the arrow buttons.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_PREVIEW" id="bm_id5275744" localize="false"/>
 <paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="2">Preview</paragraph>
 <paragraph role="paragraph" id="par_idN10589" xml-lang="en-US"><ahelp hid=".">Displays a preview of the first database record with the current address block layout.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SW_HID_MM_ADDBLOCK_MOVEBUTTONS" id="bm_id5275745" localize="false"/>
 <paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2">(Arrow Buttons)</paragraph>
 <paragraph role="paragraph" id="par_idN10590" xml-lang="en-US"><ahelp hid=".">Select an item in the list and click an arrow button to move the entry.</ahelp></paragraph>
 </body>
