wangxin/help
1
0
Fork 0
forked from amazingfate/help
Code Pull Requests Activity

INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED

Browse Source 
2005/02/21 16:43:15 fpe 1.4.4.1: regular update
This commit is contained in:
Vladimir Glazounov
2005-03-08 16:44:59 +00:00
parent 09bace33ac
commit c124ab563c
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
helpcontent2/source/text/swriter/01/mm_cusgrelin.xhp
View File

@ -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 @@
</topic>
<history>
<created date="2004-07-08T12:27:42">UFI: Custom Greeting Line dialog in mail merge</created>
<lastedited date="2004-10-05T11:08:32">DEDR: reviewed</lastedited>
<lastedited date="2005-02-16T11:44:34">DEDR: reviewed</lastedited>
</history>
</meta>
<body>
<paragraph role="heading" id="par_idN1053C" xml-lang="en-US" level="1" l10n="NEW">Custom Salutation</paragraph>
<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Specify the greeting line layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph>
<paragraph role="paragraph" id="par_idN10540" xml-lang="en-US" l10n="NEW">Specify the salutation layout for <link href="text/swriter/01/mailmerge04.xhp">mail merge</link> or <link href="text/swriter/01/mm_emabod.xhp">e-mail merge</link> documents. The name of this dialog is different for female recipients and male recipients.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_MM_CUSTOMFIELDS" id="bm_id8578142" localize="false"/>
<paragraph role="heading" id="par_idN10551" xml-lang="en-US" level="2" l10n="NEW">Salutation elements</paragraph>
<paragraph role="paragraph" id="par_idN10555" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a field and drag the field to the other list.</ahelp></paragraph>

18
helpcontent2/source/text/swriter/01/mm_emabod.xhp
View File

@ -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>