diff --git a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp index d29be00ceb..d55eae9a6f 100755 --- a/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp +++ b/helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,12 +62,12 @@ UFI: Custom Greeting Line dialog in mail merge -DEDR: reviewed +DEDR: reviewed Custom Salutation -Specify the greeting line layout for mail merge or e-mail merge documents. The name of this dialog is different for female recipients and male recipients. +Specify the salutation layout for mail merge or e-mail merge documents. The name of this dialog is different for female recipients and male recipients. Salutation elements Select a field and drag the field to the other list. diff --git a/helpcontent2/source/text/swriter/01/mm_emabod.xhp b/helpcontent2/source/text/swriter/01/mm_emabod.xhp index f4823801f4..4bf8210e42 100755 --- a/helpcontent2/source/text/swriter/01/mm_emabod.xhp +++ b/helpcontent2/source/text/swriter/01/mm_emabod.xhp @@ -37,8 +37,8 @@ * License at http://www.openoffice.org/license.html. * * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. * See the License for the specific provisions governing your rights and * obligations concerning the Software. @@ -62,30 +62,30 @@ UFI: E-Mail Body dialog for mail merge -DEDR: reviewed +DEDR: reviewed E-Mail Message -Type the message and the greeting line for files that you send as e-mail attachments. +Type the message and the salutation for files that you send as e-mail attachments. This e-mail should contain a salutation -Adds a greeting line to the e-mail. +Adds a salutation to the e-mail. Insert personalized salutation -Adds a personalized greeting line. To use the default greeting line, clear this check box. +Adds a personalized salutation. To use the default salutation, clear this check box. Female Select the personalized greeting for a female recipient. New -Opens the Custom Greeting Line dialog for a female recipient. +Opens the Custom Salutation dialog for a female recipient. Male Select the personalized greeting for a male recipient. New -Opens the Custom Greeting Line dialog for a male recipient. +Opens the Custom Salutation dialog for a male recipient. Field name Select the field name of the address database field that contains the gender information. @@ -94,7 +94,7 @@ Select the field value that indicates the gender of the recipient. General salutation -Select the default greeting to use if a personalized greeting line cannot be created. +Select the default greeting to use if a personalized salutation cannot be created. Write your message here Enter the main text of the e-mail.