source/text/swriter/01/mm_emabod.xhp | 18 +++++++++---------
source/text/swriter/01/mm_matfie.xhp | 12 ++++++++----
2 files changed, 17 insertions(+), 13 deletions(-)
New commits:
commit c891d9d6469d04a68ebc06a0a772244f1aacecc9
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 22:08:17 2017 +0200
tdf#102930 Mail Merge Wizard help: Match Field window
Sync with current UI, add bookmarks
Change-Id: I728668d4d11cf368a7bed46b6c680dc44731ccbd
Reviewed-on: https://gerrit.libreoffice.org/35942
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mm_matfie.xhp
b/source/text/swriter/01/mm_matfie.xhp
index b1f956a41..fdb50a084 100644
--- a/source/text/swriter/01/mm_matfie.xhp
+++ b/source/text/swriter/01/mm_matfie.xhp
@@ -32,10 +32,14 @@
<body>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/assignfieldsdialog/AssignFieldsDialog"
id="bm_id8489027" localize="false"/>
<paragraph role="heading" id="par_idN10539" xml-lang="en-US" level="1"
l10n="NEW">Match Fields</paragraph>
-<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US"
l10n="NEW">Matches the logical field names of the layout dialog to the field
names in your database when you create new <link
href="text/swriter/01/mailmerge03.xhp">address blocks</link> or <link
href="text/swriter/01/mailmerge04.xhp">salutations</link>.</paragraph>
-<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2"
l10n="NEW">Matches to:</paragraph>
-<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select a field name in your database for each logical
field element.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2"
l10n="NEW">Preview</paragraph>
+<paragraph role="paragraph" id="par_idN1053D" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Matches the logical field names of the layout dialog
to the field names in your database when you create new <link
href="text/swriter/01/mailmerge03.xhp">address blocks</link> or <link
href="text/swriter/01/mailmerge04.xhp">salutations</link>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/assignfieldsdialog/FIELDS" id="bm_id8489028"
localize="false"/>
+<paragraph role="heading" id="par_idN1054E" xml-lang="en-US" level="2"
l10n="NEW">Matches to field:</paragraph>
+<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select a field name in your database for each logical
address element.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/assignfieldsdialog/PREVIEW" id="bm_id8489029"
localize="false"/>
+<paragraph role="heading" id="par_idN10555" xml-lang="en-US" level="2"
l10n="NEW">Address block preview</paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Displays a preview of the values of the first data
record.</ahelp></paragraph>
</body>
</helpdocument>
commit b52dc2fc13f392ee22b81f9ce76001a76a51c2e8
Author: Gabor Kelemen <kelem...@gnome.hu>
Date: Thu Mar 30 22:06:39 2017 +0200
tdf#102930 Mail Merge Wizard: fix E-mail Message window page
Add missing bookmarks and ahelp
Change-Id: I1341200f32e586303b693494c2e45067457e760c
Reviewed-on: https://gerrit.libreoffice.org/35941
Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com>
Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
diff --git a/source/text/swriter/01/mm_emabod.xhp
b/source/text/swriter/01/mm_emabod.xhp
index 71c76fe15..33562ab33 100644
--- a/source/text/swriter/01/mm_emabod.xhp
+++ b/source/text/swriter/01/mm_emabod.xhp
@@ -32,32 +32,32 @@
<body>
<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/MailBodyDialog" id="bm_id495011"
localize="false"/>
<paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1"
l10n="NEW">E-Mail Message</paragraph>
-<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Type
the message and the salutation for files that you send as <link
href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</paragraph>
+<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Type the message and the salutation for files that
you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link>
attachments.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/greeting"
id="bm_id1831110" localize="false"/>
<paragraph role="heading" id="par_idN10554" xml-lang="en-US" level="2"
l10n="NEW">This e-mail should contain a salutation</paragraph>
<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph>
-<!-- removed HID 1435403266 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/personalized" id="bm_id1831111"
localize="false"/>
<paragraph role="heading" id="par_idN1055B" xml-lang="en-US" level="3"
l10n="NEW">Insert personalized salutation</paragraph>
<paragraph role="paragraph" id="par_idN1055F" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Adds a personalized salutation. To use the default
salutation, clear this check box.</ahelp></paragraph>
-<!-- removed HID 1435405827 -->
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/female"
id="bm_id1831112" localize="false"/>
<paragraph role="heading" id="par_idN10562" xml-lang="en-US" level="4"
l10n="NEW">Female</paragraph>
<paragraph role="paragraph" id="par_idN10566" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the personalized greeting for a female
recipient.</ahelp></paragraph>
-<!-- removed HID 1435406852 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/newfemale" id="bm_id1831113"
localize="false"/>
<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="4"
l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a
female recipient.</ahelp></paragraph>
-<!-- removed HID 1435405829 -->
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/male"
id="bm_id1831114" localize="false"/>
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="4"
l10n="NEW">Male</paragraph>
<paragraph role="paragraph" id="par_idN10582" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the personalized greeting for a male
recipient.</ahelp></paragraph>
-<!-- removed HID 1435406854 -->
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/newmale"
id="bm_id1831115" localize="false"/>
<paragraph role="heading" id="par_idN10585" xml-lang="en-US" level="4"
l10n="NEW">New</paragraph>
<paragraph role="paragraph" id="par_idN10589" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Opens the <link
href="text/swriter/01/mm_cusgrelin.xhp">Custom Salutation</link> dialog for a
male recipient.</ahelp></paragraph>
-<!-- removed HID 1435405833 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/femalecol" id="bm_id1831116"
localize="false"/>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="4"
l10n="NEW">Field name</paragraph>
<paragraph role="paragraph" id="par_idN1059E" 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 1435406347 -->
+<bookmark xml-lang="en-US"
branch="hid/modules/swriter/ui/mmmailbody/femalefield" id="bm_id1831117"
localize="false"/>
<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="4"
l10n="NEW">Field value</paragraph>
<paragraph role="paragraph" id="par_idN105A5" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the field value that indicates the gender of
the recipient.</ahelp></paragraph>
-<!-- removed HID 1435406350 -->
+<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/general"
id="bm_id1831118" localize="false"/>
<paragraph role="heading" id="par_idN105A8" xml-lang="en-US" level="3"
l10n="NEW">General salutation</paragraph>
<paragraph role="paragraph" id="par_idN105AC" xml-lang="en-US"
l10n="NEW"><ahelp hid=".">Select the default greeting to use if a personalized
salutation cannot be created.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/mmmailbody/bodymle"
id="bm_id495010" localize="false"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
