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

Sun Apr 2 20:53:47 UTC 2017

source/text/swriter/01/mm_seladdblo.xhp |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 4164e519b7b4008de321da83e3e30c22576a603b
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Thu Mar 30 22:16:28 2017 +0200

    tdf#102930 Mail Merge Wizard: Select Address Block dialog
    
    Sync to current UI, add missing ahelp
    
    Change-Id: Icb4b25c0787fc157ed7506597999297e312341a9
    Reviewed-on: https://gerrit.libreoffice.org/35944
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>

diff --git a/source/text/swriter/01/mm_seladdblo.xhp b/source/text/swriter/01/mm_seladdblo.xhp
index a32840138..12b2818d7 100644
--- a/source/text/swriter/01/mm_seladdblo.xhp
+++ b/source/text/swriter/01/mm_seladdblo.xhp
@@ -32,26 +32,35 @@
 <body>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/SelectBlockDialog" id="bm_id6604815" localize="false"/>
 <paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1" l10n="NEW">Select Address Block</paragraph>
-<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</paragraph>
-<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select the address block which you want to use</paragraph>
+<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select, edit, or delete an address block layout for <link href="text/swriter/01/mailmerge03.xhp">mail merge</link>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/preview" id="bm_id6604816" localize="false"/>
+<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2" l10n="NEW">Select your preferred address block</paragraph>
 <paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the block in the list that you want to use for mail merge addresses, and click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/never" id="bm_id6604815" localize="false"/>
+
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/never" id="bm_id6604817" localize="false"/>
 <paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2" l10n="NEW">Never include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Excludes country or regional information from the address block.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/always" id="bm_id2571184" localize="false"/>
 <paragraph role="heading" id="par_idN1055C" xml-lang="en-US" level="2" l10n="NEW">Always include country/region</paragraph>
 <paragraph role="paragraph" id="par_idN10560" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Includes country or regional information in the address block.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/dependent" id="bm_id6947538" localize="false"/>
 <paragraph role="heading" id="par_idN10563" xml-lang="en-US" level="2" l10n="NEW">Only include country/region if it is not:</paragraph>
 <paragraph role="paragraph" id="par_idN10567" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Only includes country or regional information in the address block if the value differs from the value that you enter in the text box.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/country" id="bm_id7257606" localize="false"/>
 <paragraph role="paragraph" id="par_idN10651" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the country/region string that shall not be printed.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/new" id="bm_id1533249" localize="false"/>
 <paragraph role="heading" id="par_idN1056A" xml-lang="en-US" level="2" l10n="NEW">New</paragraph>
 <paragraph role="paragraph" id="par_idN1056E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can define a new address block layout.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/edit" id="bm_id1784112" localize="false"/>
 <paragraph role="heading" id="par_idN1057F" xml-lang="en-US" level="2" l10n="NEW">Edit</paragraph>
-<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">New Address Block</link> dialog where you can edit the selected address block layout.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10583" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_newaddblo.xhp">Edit Address Block</link> dialog where you can edit the selected address block layout.</ahelp></paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/selectblockdialog/delete" id="bm_id2646565" localize="false"/>
 <paragraph role="heading" id="par_idN10594" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
 <paragraph role="paragraph" id="par_idN10598" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Deletes the selected address block layout.</ahelp></paragraph>
