source/text/swriter/01/mailmerge02.xhp | 11 +++++++----
source/text/swriter/01/mailmerge03.xhp | 17 ++++++++++++-----
2 files changed, 19 insertions(+), 9 deletions(-)
New commits:
commit 854375b6e711cd114e537215b55c6bfdd8d654b0
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 21:01:02 2017 +0200
tdf#102930 Update Mail Merge Wizard Page 3 help
Sync to current UI, improve readability
Change-Id: I03807f06cc2dc99aa4999bad94ebbe3c81c356d3
Reviewed-on: https://gerrit.libreoffice.org/35935
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mailmerge03.xhp
b/source/text/swriter/01/mailmerge03.xhp
index 36326ffd9..2f408bf28 100644
--- a/source/text/swriter/01/mailmerge03.xhp
+++ b/source/text/swriter/01/mailmerge03.xhp
@@ -33,17 +33,18 @@
<section id="addresses">
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage"
id="bm_id8489027" localize="false"/>
<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp">Mail Merge Wizard -
Addresses</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW">Specify the recipients for the mail merge document as well as the
layout of the address block.</paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Specify the recipients for the mail merge document as
well as the layout of the address block.</ahelp></paragraph>
</section>
-<paragraph role="note" id="par_idN10561" xml-lang="en-US" l10n="NEW">The Mail
Merge wizard opens to this page if you start the wizard in a text document that
already contains address database fields. If the wizard opens directly to this
page, the <emph>Select address list</emph> button is called <emph>Select
different address list</emph>.</paragraph>
-<paragraph role="note" id="par_idN10556" xml-lang="en-US" l10n="NEW">The title
of this page is <emph>Address block</emph> for letters and <emph>Address
list</emph> for e-mail messages.</paragraph>
+<paragraph role="note" id="par_idN10561" xml-lang="en-US" l10n="NEW">The Mail
Merge wizard opens to this page if you start the wizard in a text document that
already contains address database fields. If the wizard opens directly to this
page, the <emph>Select Address List</emph> button is called <emph>Select
Different Address List</emph>.</paragraph>
+<paragraph role="note" id="par_idN10556" xml-lang="en-US" l10n="NEW">The title
of this page is <emph>Insert address block</emph> for letters and <emph>Select
address list</emph> for e-mail messages.</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/addresslist"
id="bm_id8489028" localize="false"/>
-<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2"
l10n="NEW">Select address list</paragraph>
+<paragraph role="heading" id="par_idN10568" xml-lang="en-US" level="2"
l10n="NEW">Select Address List</paragraph>
<paragraph role="paragraph" id="par_idN1056C" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_seladdlis.xhp">Select Address List</link> dialog,
where you can choose a data source for the addresses, add new addresses, or
type in a new address list.</ahelp></paragraph>
<paragraph role="warning" id="par_id7805413" xml-lang="en-US" l10n="NEW">When
you edit some records in a Calc spreadsheet data source that is currently in
use for a mail merge, those changes are not visible in the mail
merge.<comment>ufi: see i9899</comment></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/address" id="bm_id934476"
localize="false"/>
<paragraph role="heading" id="par_idN1057D" xml-lang="en-US" level="2"
l10n="NEW">This document shall contain an address block</paragraph>
<paragraph role="paragraph" id="par_idN10581" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds an address block to the mail merge
document.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/settingspreview"
id="bm_id934477" localize="false"/>
<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the address block layout that you want to
use.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/hideempty" id="bm_id59205"
localize="false"/>
<paragraph role="heading" id="hd_id9355754" xml-lang="en-US" level="3"
l10n="NEW">Suppress lines with just empty fields</paragraph>
@@ -54,10 +55,16 @@
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/assign" id="bm_id8653523"
localize="false"/>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3"
l10n="NEW">Match fields</paragraph>
<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_matfie.xhp">Match Fields</link>
dialog.</ahelp></paragraph>
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/addresspreview"
id="bm_id8653524" localize="false"/>
+<paragraph role="paragraph" id="par_idN105A1" xml-lang="en-US"><ahelp hid="."
visibility="hidden">Shows a preview of the address block template filled with
data.</ahelp></paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/prev" id="bm_id2950224"
localize="false"/>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmaddressblockpage/next" id="bm_id8050477"
localize="false"/>
<paragraph role="heading" id="par_idN105B1" xml-lang="en-US" level="3"
l10n="NEW">(Browse buttons)</paragraph>
<paragraph role="paragraph" id="par_idN105B5" 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_idN105B8" xml-lang="en-US"
l10n="CHG"><link href="text/swriter/01/mailmerge04.xhp" name="Mail Merge Wizard
- Create a salutation">Mail Merge Wizard - Create a
salutation</link></paragraph>
+<paragraph role="paragraph" id="par_idN105B8" xml-lang="en-US" l10n="CHG">Next
step: <link href="text/swriter/01/mailmerge04.xhp" name="Mail Merge Wizard -
Create salutation">Mail Merge Wizard - Create salutation</link></paragraph>
+<paragraph id="hd_idN105834" 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_idN10569" xml-lang="en-US"><link
href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link>
overview</paragraph>
+</section>
</body>
</helpdocument>
commit dd49e9fa8338f442e30fc78afea7cac0e8831540
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 21:00:02 2017 +0200
tdf#102930 Update Mail Merge Wizard Page 2 help
Sync to current UI
Change-Id: I390c0676d07b543e7c6ee56c5046e4aa0be55549
Reviewed-on: https://gerrit.libreoffice.org/35934
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mailmerge02.xhp
b/source/text/swriter/01/mailmerge02.xhp
index 4dfe070ac..bbe2fac26 100644
--- a/source/text/swriter/01/mailmerge02.xhp
+++ b/source/text/swriter/01/mailmerge02.xhp
@@ -24,20 +24,23 @@
<helpdocument version="1.0">
<meta>
<topic id="textswriter01mailmerge02xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Document Type</title>
+<title id="tit" xml-lang="en-US">Mail Merge Wizard - Select document
type</title>
<filename>/text/swriter/01/mailmerge02.xhp</filename>
</topic>
</meta>
<body>
<section id="documenttype">
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmoutputtypepage/MMOutputTypePage"
id="bm_id2589191" localize="false"/>
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard -
Document Type</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="CHG">Specify the type of mail merge document to create. </paragraph>
+<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1"
l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard -
Select document type</link></paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US"
l10n="CHG"><ahelp hid=".">Specify the type of mail merge document to
create.</ahelp></paragraph>
</section>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmoutputtypepage/letter" id="bm_id2589190"
localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US"
level="2" l10n="NEW">Letter</paragraph>
<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Creates a printable mail merge
document.</ahelp></paragraph>
<paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2"
l10n="NEW">E-mail message</paragraph>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmoutputtypepage/email" id="bm_id3822443"
localize="false"/><paragraph role="paragraph" id="par_idN10561"
xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge documents that
you can send as an e-mail message or an e-mail attachment.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US"
l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard
- Addresses">Mail Merge Wizard - Addresses</link></paragraph>
+<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW">Next
step: <link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard -
Addresses">Mail Merge Wizard - Addresses</link></paragraph>
+<section id="relatedtopics">
+<paragraph role="paragraph" id="par_idN10568" 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
