source/text/swriter/01/mailmerge04.xhp | 27 ++++++++++++++++-----------
source/text/swriter/01/mailmerge05.xhp | 33 ++++++++++++++++++++++-----------
2 files changed, 38 insertions(+), 22 deletions(-)
New commits:
commit f819eb227c337fc59416649218be6354d287de37
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 21:04:01 2017 +0200
tdf#102930 Update Mail Merge Wizard Page 5 help
Sync to current UI, improve readability
Change-Id: Ib756f8998ed88a63b8f2927677638dd6110a86f4
Reviewed-on: https://gerrit.libreoffice.org/35937
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mailmerge05.xhp
b/source/text/swriter/01/mailmerge05.xhp
index 441b7a459..6ea99d0dd 100644
--- a/source/text/swriter/01/mailmerge05.xhp
+++ b/source/text/swriter/01/mailmerge05.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter01mailmerge05xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Layout</title>
+<title id="tit" xml-lang="en-US">Mail Merge Wizard - Adjust Layout</title>
<filename>/text/swriter/01/mailmerge05.xhp</filename>
</topic>
<history>
@@ -32,28 +32,39 @@
<body>
<section id="layout">
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmlayoutpage/MMLayoutPage" id="bm_id8489030"
localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard -
Adjust Layout</link></paragraph>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge05.xhp">Mail Merge Wizard -
Adjust layout</link></paragraph>
<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Specify the position of the address blocks and
salutations on the documents.</ahelp></paragraph>
</section>
+<paragraph role="heading" id="par_idN10544" xml-lang="en-US" level="2">Address
Block Position</paragraph>
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/top"
id="bm_id1113010" localize="false"/>
+<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="3"
l10n="NEW">From top</paragraph>
+<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top
edge of the page and the top edge of the address block.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/align"
id="bm_id7631458" localize="false"/>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2"
l10n="NEW">Align to text body</paragraph>
+<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="3"
l10n="NEW">Align to text body</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Aligns the frame that contains the address block to
the left page margin.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/left"
id="bm_id7862483" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2"
l10n="NEW">From left</paragraph>
+<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3"
l10n="NEW">From left</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the left
edge of the page and the left edge of the address block.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/top"
id="bm_id1113010" localize="false"/>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2"
l10n="NEW">From top</paragraph>
-<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top
edge of the page and the top edge of the address block.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10545" xml-lang="en-US"
level="2">Salutation Position</paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/up"
id="bm_id656758" localize="false"/>
-<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2"
l10n="NEW">Up</paragraph>
+<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3"
l10n="NEW">Up</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/down"
id="bm_id3112582" localize="false"/>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2"
l10n="NEW">Down</paragraph>
+<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="3"
l10n="NEW">Down</paragraph>
<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmlayoutpage/example" id="bm_id3112585"
localize="false"/>
+<paragraph role="heading" id="par_idN10573" xml-lang="en-US" level="3"
l10n="NEW">Preview area</paragraph>
+<paragraph role="paragraph" id="par_idN10577" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Provides a preview of the salutation positioning on
the page.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmlayoutpage/zoom"
id="bm_id628070" localize="false"/>
-<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2"
l10n="NEW">Zoom</paragraph>
+<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3"
l10n="NEW">Zoom</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select a magnification for the print
preview.</ahelp></paragraph>
<paragraph role="paragraph" id="par_idN106AF" xml-lang="en-US" l10n="NEW">Use
the commands in the context menu of the preview to move the view up and
down.</paragraph>
-<paragraph role="paragraph" id="par_idN10580" xml-lang="en-US"
l10n="CHG"><link href="text/swriter/01/mailmerge06.xhp" name="Mail Merge Wizard
- Edit document">Mail Merge Wizard - Edit document</link></paragraph>
+<paragraph id="hd_idN10584" role="paragraph" xml-lang="en-US">Press the
<emph>Finish</emph> button and use the <link
href="text/swriter/mailmergetoolbar.xhp">Mail Merge Toolbar</link> to finish
the mail merge process.</paragraph>
+
</body>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_idN10571" xml-lang="en-US"><link
href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link>
overview</paragraph>
+</section>
</helpdocument>
commit a5b29c05af7c8cc038f953bda2995f8d99be5e04
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 21:02:47 2017 +0200
tdf#102930 Update Mail Merge Wizard Page 4 help
Add missing bookmarks, improve readability
Change-Id: If8f2afcfb049d01beceb788dc4beb21dbfcb6032
Reviewed-on: https://gerrit.libreoffice.org/35936
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mailmerge04.xhp
b/source/text/swriter/01/mailmerge04.xhp
index 7f7e14c94..0803df5a5 100644
--- a/source/text/swriter/01/mailmerge04.xhp
+++ b/source/text/swriter/01/mailmerge04.xhp
@@ -32,36 +32,37 @@
<body>
<section id="greetingline">
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/MMSalutationPage"
id="bm_id8489029" localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard -
Create a Salutation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Specify the properties for the salutation. If the
mail merge database contains gender information, you can specify different
salutations based on the gender of the recipient.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge04.xhp">Mail Merge Wizard -
Create salutation</link></paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Specify the properties for the salutation.</ahelp> If
the mail merge database contains gender information, you can specify different
salutations based on the gender of the recipient.</paragraph>
</section>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/greeting" id="bm_id274666"
localize="false"/>
<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2"
l10n="NEW">This document should contain a salutation</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds a salutation.</ahelp></paragraph>
-<!-- removed HID 898253826 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/personalized" id="bm_id274667"
localize="false"/>
<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3"
l10n="NEW">Insert personalized salutation</paragraph>
<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds a personalized salutation to the mail merge
document. To use the default salutation, clear this check
box.</ahelp></paragraph>
-<!-- removed HID 898256387 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/female" id="bm_id274668"
localize="false"/>
<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="4"
l10n="NEW">Female</paragraph>
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female
recipient.</ahelp></paragraph>
-<!-- removed HID 898257412 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/newfemale" id="bm_id274669"
localize="false"/>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="4"
l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Female
recipient) dialog.</ahelp></paragraph>
-<!-- removed HID 898256389 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/male" id="bm_id274670"
localize="false"/>
<paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="4"
l10n="NEW">Male</paragraph>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male
recipient.</ahelp></paragraph>
-<!-- removed HID 898257414 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/newmale" id="bm_id274671"
localize="false"/>
<paragraph role="heading" id="par_idN10587" xml-lang="en-US" level="4"
l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> (Male
recipient) dialog.</ahelp></paragraph>
-<!-- removed HID 898256393 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/femalecol" id="bm_id274672"
localize="false"/>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="4"
l10n="NEW">Field name</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the field name of the address database field
that contains the gender information.</ahelp></paragraph>
-<!-- removed HID 898256907 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/femalefield" id="bm_id274673"
localize="false"/>
<paragraph role="heading" id="par_idN105A3" xml-lang="en-US" level="4"
l10n="NEW">Field value</paragraph>
<paragraph role="paragraph" id="par_idN105A7" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of
the recipient.</ahelp></paragraph>
-<!-- removed HID 898256910 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/general" id="bm_id274674"
localize="false"/>
<paragraph role="heading" id="par_idN105AA" xml-lang="en-US" level="3"
l10n="NEW">General salutation</paragraph>
<paragraph role="paragraph" id="par_idN105AE" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the default salutation that is used when you
do not specify a personalized salutation.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/preview" id="bm_id274675"
localize="false"/>
<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3"
l10n="NEW">Preview</paragraph>
<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Displays a preview of the
salutation.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/assign" id="bm_id9288918"
localize="false"/>
@@ -71,6 +72,10 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmsalutationpage/next" id="bm_id991546"
localize="false"/>
<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="4"
l10n="NEW">(Browse buttons)</paragraph>
<paragraph role="paragraph" id="par_idN105D1" xml-lang="en-US"
l10n="CHG"><ahelp hid=".">Use the browse buttons to preview the information
from the previous or next data record.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US"
l10n="CHG"><link href="text/swriter/01/mailmerge05.xhp" name="Mail Merge Wizard
- Adjust layout">Mail Merge Wizard - Adjust layout</link></paragraph>
+<paragraph role="paragraph" id="par_idN105D4" xml-lang="en-US" l10n="CHG">Next
step: <link href="text/swriter/01/mailmerge05.xhp" name="Mail Merge Wizard -
Adjust layout">Mail Merge Wizard - Adjust layout</link></paragraph>
+<paragraph id="hd_idN10584" role="paragraph" xml-lang="en-US">Alternatively
you can press the <emph>Finish</emph> button and use the <link
href="text/swriter/mailmergetoolbar.xhp">Mail Merge Toolbar</link> to finish
the mail merge process.</paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_idN10570" xml-lang="en-US"><link
href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link>
overview</paragraph>
+</section>
</body>
</helpdocument>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
