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

Sun Apr 2 20:34:18 UTC 2017

source/text/swriter/01/mailmerge01.xhp |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 2c3f721d7dd152efbe6261ea697643c84ce11b12
Author: Gabor Kelemen <kelemeng at gnome.hu>
Date:   Thu Mar 30 20:57:18 2017 +0200

    tdf#102930 Update Mail Merge Wizard Page 1 help
    
    Sync to current UI
    
    Change-Id: Id53cae534a152ab68df9bf02ed5bebfe4d26b139
    Reviewed-on: https://gerrit.libreoffice.org/35933
    Reviewed-by: Gabor Kelemen <kelemeng at ubuntu.com>
    Tested-by: Gabor Kelemen <kelemeng at ubuntu.com>

diff --git a/source/text/swriter/01/mailmerge01.xhp b/source/text/swriter/01/mailmerge01.xhp
index 28b879ed1..27dc765f2 100644
--- a/source/text/swriter/01/mailmerge01.xhp
+++ b/source/text/swriter/01/mailmerge01.xhp
@@ -22,7 +22,7 @@
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter01mailmerge01xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Starting Document</title>
+<title id="tit" xml-lang="en-US">Mail Merge Wizard - Select starting Document</title>
 <filename>/text/swriter/01/mailmerge01.xhp</filename>
 </topic>
 <history>
@@ -32,8 +32,8 @@
 <body>
 <section id="startingdocument">
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/MMSelectPage" id="bm_id9740592.00000000" localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document that you want to use as a base for the mail merge document.</paragraph>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Select starting document</link></paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specify the document that you want to use as a base for the mail merge document.</ahelp></paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/currentdoc" id="bm_id9740592.00000001" localize="false"/>
 <paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph>
@@ -52,12 +52,15 @@
 <paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/browsetemplate" id="bm_id3173619" localize="false"/>
 <paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Templates and Documents</emph> dialog.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens a template selector dialog.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/recentdoc" id="bm_id6065248" localize="false"/>
 <paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from a recently saved starting document</paragraph>
 <paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmselectpage/recentdoclb" id="bm_id920133" localize="false"/>
 <paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the document.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph>
+<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW">Next step: <link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Select document type</link></paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_idN10567" xml-lang="en-US"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link> overview</paragraph>
+</section>
 </body>
 </helpdocument>
