diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:44:59 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-08 16:44:59 +0000 |
| commit | c124ab563ceb035acfaf6549a32f16ef2607c227 (patch) | |
| tree | b25be4aca6c7e866b7f043b1aae67b11011c5440 /helpcontent2/source/text/swriter/01/mm_emabod.xhp | |
| parent | INTEGRATION: CWS hc680pb2 (1.3.4); FILE MERGED (diff) | |
| download | help-c124ab563ceb035acfaf6549a32f16ef2607c227.tar.gz help-c124ab563ceb035acfaf6549a32f16ef2607c227.zip | |
INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED
2005/02/21 16:43:15 fpe 1.4.4.1: regular update
Diffstat (limited to 'helpcontent2/source/text/swriter/01/mm_emabod.xhp')
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mm_emabod.xhp | 18 |
1 files changed, 9 insertions, 9 deletions
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 @@ </topic> <history> <created date="2004-07-08T12:55:00">UFI: E-Mail Body dialog for mail merge</created> -<lastedited date="2004-10-05T10:50:31">DEDR: reviewed</lastedited> +<lastedited date="2005-02-16T11:43:37">DEDR: reviewed</lastedited> </history> </meta> <body> <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 greeting line 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">Type the message and the salutation for files that you send as <link href="text/swriter/01/mailmerge08.xhp">e-mail</link> attachments.</paragraph> <bookmark xml-lang="en-US" branch="hid/1435403279" 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 greeting line to the e-mail.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN10558" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation to the e-mail.</ahelp></paragraph> <bookmark xml-lang="en-US" branch="hid/1435403266" id="bm_id6255073" 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 greeting line. To use the default greeting line, clear this check box.</ahelp></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> <bookmark xml-lang="en-US" branch="hid/1435405827" id="bm_id8216193" 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> <bookmark xml-lang="en-US" branch="hid/1435406852" id="bm_id8684957" 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 Greeting Line</link> dialog for a female recipient.</ahelp></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> <bookmark xml-lang="en-US" branch="hid/1435405829" id="bm_id3004547" 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> <bookmark xml-lang="en-US" branch="hid/1435406854" id="bm_id1132847" 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 Greeting Line</link> dialog for a male recipient.</ahelp></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> <bookmark xml-lang="en-US" branch="hid/1435405833" id="bm_id6285897" 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> @@ -94,7 +94,7 @@ <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> <bookmark xml-lang="en-US" branch="hid/1435406350" id="bm_id4054994" 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 greeting line cannot be created.</ahelp></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/1435404831" id="bm_id495010" localize="false"/> <paragraph role="heading" id="par_idN105AF" xml-lang="en-US" level="3" l10n="NEW">Write your message here</paragraph> <paragraph role="paragraph" id="par_idN105B3" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the main text of the e-mail.</ahelp></paragraph> |