diff options
| author | Gabor Kelemen <kelemeng@gnome.hu> | 2017-03-30 21:02:47 +0200 |
|---|---|---|
| committer | Gabor Kelemen <kelemeng@ubuntu.com> | 2017-04-02 20:37:22 +0000 |
| commit | a5b29c05af7c8cc038f953bda2995f8d99be5e04 (patch) | |
| tree | 76d6b5753a2363af1fcba3f29c1c3b837e679cc2 | |
| parent | 854375b6e711cd114e537215b55c6bfdd8d654b0 (diff) | |
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 <kelemeng@ubuntu.com>
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
| -rw-r--r-- | source/text/swriter/01/mailmerge04.xhp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/source/text/swriter/01/mailmerge04.xhp b/source/text/swriter/01/mailmerge04.xhp index 7f7e14c94f..0803df5a55 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> |