summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-08 16:44:02 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-08 16:44:02 +0000
commit99c8168d48d8be6cbf21feb8dd878cdc6bbf5da0 (patch)
tree117ec6406b211cfa88d4f4b8aa6683bfab57ef27 /helpcontent2/source/text
parent12ae7a49c8175b38a882cbe5095bffea4fb6df64 (diff)
INTEGRATION: CWS hc680pb2 (1.4.4); FILE MERGED
2005/02/21 16:43:14 fpe 1.4.4.1: regular update
Diffstat (limited to 'helpcontent2/source/text')
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge04.xhp22
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge05.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge08.xhp4
3 files changed, 18 insertions, 18 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge04.xhp b/helpcontent2/source/text/swriter/01/mailmerge04.xhp
index 683eb0c76d..c2dd5555f7 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge04.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge04.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,32 +62,32 @@
</topic>
<history>
<created date="2004-07-07T13:13:31">UFI: Mail Merge Wizard page 4</created>
-<lastedited date="2004-10-05T09:16:23">DEDR: Reviewed</lastedited>
+<lastedited date="2005-02-16T11:47:02">DEDR: Reviewed</lastedited>
</history>
</meta>
<body>
<section id="greetingline">
<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">Specify the properties for the greeting line. If the mail merge database contains gender information, you can specify different greeting lines based on the gender of the recipient.</paragraph>
+<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">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.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/898253839" 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 greeting line.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a salutation.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/898253826" id="bm_id7168492" localize="false"/>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="3" l10n="NEW">Insert personalized greeting line</paragraph>
-<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a personalized greeting line to the mail merge document. To use the default greeting line, clear this check box.</ahelp></paragraph>
+<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>
<bookmark xml-lang="en-US" branch="hid/898256387" id="bm_id1347392" 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>
<bookmark xml-lang="en-US" branch="hid/898257412" id="bm_id7285073" 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 Greeting Line</link> (Female recipient) dialog.</ahelp></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>
<bookmark xml-lang="en-US" branch="hid/898256389" id="bm_id3386333" 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>
<bookmark xml-lang="en-US" branch="hid/898257414" id="bm_id1029084" 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 Greeting Line</link> (Male recipient) dialog.</ahelp></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>
<bookmark xml-lang="en-US" branch="hid/898256393" id="bm_id4558244" 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>
@@ -96,9 +96,9 @@
<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>
<bookmark xml-lang="en-US" branch="hid/898256910" id="bm_id4571672" 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 greeting line that is used when you do not specify a personalized greeting line.</ahelp></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>
<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 greeting line.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105B5" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Displays a preview of the salutation.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105B8" xml-lang="en-US" level="4" l10n="NEW">Match fields</paragraph>
<paragraph role="paragraph" id="par_idN105BC" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/swriter/01/mm_matfie.xhp">Match Fields</link> dialog.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105CD" xml-lang="en-US" level="4" l10n="NEW">(Browse buttons)</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge05.xhp b/helpcontent2/source/text/swriter/01/mailmerge05.xhp
index 16925d7c5d..9ddeb8a867 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge05.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge05.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,7 +62,7 @@
</topic>
<history>
<created date="2004-07-07T13:57:01">UFI: Mail Merge Wizard page 5</created>
-<lastedited date="2004-10-05T09:26:38">DEDR: Reviewed</lastedited>
+<lastedited date="2005-02-16T11:45:11">DEDR: Reviewed</lastedited>
</history>
</meta>
<body>
@@ -81,10 +81,10 @@
<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enter the amount of space to leave between the top edge of the page and the top edge of the address block.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_MF_UP" id="bm_id656758" localize="false"/>
<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="2" l10n="NEW">Up</paragraph>
-<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the greeting line up.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation up.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_LAYOUT_PAGE_PB_DOWN" id="bm_id3112582" localize="false"/>
<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Down</paragraph>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the greeting line down.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Moves the salutation down.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_LAYOUT_PAGE_LB_ZOOM" id="bm_id628070" localize="false"/>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select a magnification for the page preview.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge08.xhp b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
index a4a34c07f9..6386f1ca14 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge08.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge08.xhp
@@ -62,7 +62,7 @@
</topic>
<history>
<created date="2004-07-07T14:35:12">UFI: Mail Merge Wizard page 8</created>
-<lastedited date="2004-12-10T12:50:39">DEDR: Reviewed</lastedited>
+<lastedited date="2005-02-16T11:10:27">DEDR: Reviewed</lastedited>
</history>
</meta>
<body>
@@ -136,7 +136,7 @@
<paragraph role="heading" id="par_idN10626" xml-lang="en-US" level="3" l10n="NEW">Name of the attachment</paragraph>
<paragraph role="paragraph" id="par_idN1062A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Shows the name of the attachment.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUT_PAGE_RB_SENDALL" id="bm_id8163090" localize="false"/>
-<paragraph role="heading" id="par_idN1062D" xml-lang="en-US" level="3" l10n="NEW">Send all records</paragraph>
+<paragraph role="heading" id="par_idN1062D" xml-lang="en-US" level="3" l10n="NEW">Send all documents</paragraph>
<paragraph role="paragraph" id="par_idN10631" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select to send e-mails to all recipients.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_OUTPUT_PAGE_PB_SENDDOCUMENTS" id="bm_id425122" localize="false"/>
<paragraph role="heading" id="par_idN10642" xml-lang="en-US" level="3" l10n="NEW">Send Documents</paragraph>
generated by cgit (git 2.34.1) at 2024-08-17 02:09:45 +0000