diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 22:52:05 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 22:52:05 +0000 |
| commit | 2560467255b354f62b60e404b5ffe79540bd8df8 (patch) | |
| tree | 9489bb62b718db9d04a3582992ec27f0990aaa2e | |
| parent | 54b03c235616356e5fefb6297ee7070d7389e28c (diff) | |
INTEGRATION: CWS helpcontentbeta (1.1.2); FILE MERGED
2004/10/06 14:56:50 fpe 1.1.2.2: Regular Update
2004/09/16 11:48:51 fpe 1.1.2.1: Regular Update
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge00.xhp | 72 | ||||
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge01.xhp | 81 | ||||
| -rwxr-xr-x | helpcontent2/source/text/swriter/01/mailmerge02.xhp | 58 |
3 files changed, 115 insertions, 96 deletions
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp index 83c384dac1..5a5ab0ecbf 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,39 +52,43 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter01mailmerge00xml" indexer="include" status="DRAFT">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard</title>
-<filename>text/swriter/01/mailmerge00.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-07T11:49:32">UFI: new Mail Merge Wizard</created>
-<lastedited date="2004-07-07T17:16:53"/>
-</history>
-</meta>
-<body>
-<section id="mailmerge">
-<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
-<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="NEW">Writing mail merges or form letters requires multiple steps: editing a document, setting up a database, and merging them together. The Mail Merge Wizard helps in these steps.</paragraph>
-</section>
-<paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US" l10n="NEW"><link href="text/swriter/00/00000406.xhp#mmwizard"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
-<embed href="text/swriter/01/mailmerge01.xhp#startingdocument"/>
-<embed href="text/swriter/01/mailmerge02.xhp#documenttype"/>
-<embed href="text/swriter/01/mailmerge03.xhp#addresses"/>
-<embed href="text/swriter/01/mailmerge04.xhp#greetingline"/>
-<embed href="text/swriter/01/mailmerge05.xhp#layout"/>
-<embed href="text/swriter/01/mailmerge06.xhp#preparemerge"/>
-<embed href="text/swriter/01/mailmerge07.xhp#personalize"/>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textswriter01mailmerge00xml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">Mail Merge Wizard</title> +<filename>text/swriter/01/mailmerge00.xhp</filename> +</topic> +<history> +<created date="2004-07-07T11:49:32">UFI: new Mail Merge Wizard</created> +<lastedited date="2004-10-05T13:55:56">DEDR: Reviewed</lastedited> +</history> +</meta> +<body> +<section id="mailmerge"> +<bookmark xml-lang="en-US" branch="index" id="bm_id6415601"><bookmark_value>wizards;form letters</bookmark_value> +<bookmark_value>Mail Merge Wizard</bookmark_value> +</bookmark> +<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/> +<paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph> +<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph> +</section> +<paragraph role="paragraph" id="par_idN105A8" xml-lang="en-US" l10n="NEW"><link href="text/swriter/00/00000406.xhp#mmwizard"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph> +<embed href="text/swriter/01/mailmerge01.xhp#startingdocument"/> +<embed href="text/swriter/01/mailmerge02.xhp#documenttype"/> +<embed href="text/swriter/01/mailmerge03.xhp#addresses"/> +<embed href="text/swriter/01/mailmerge04.xhp#greetingline"/> +<embed href="text/swriter/01/mailmerge05.xhp#layout"/> +<embed href="text/swriter/01/mailmerge06.xhp#preparemerge"/> +<embed href="text/swriter/01/mailmerge07.xhp#personalize"/> <embed href="text/swriter/01/mailmerge08.xhp#saveprintsend"/> <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDCANCEL" id="bm_id3149177" localize="false"/><embed href="text/shared/00/00000001.xhp#abbrechen"/> <bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDPREV" id="bm_id3145346" localize="false"/><embed href="text/shared/00/00000001.xhp#zurueckautopi"/> -<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/>
-<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp" name="Mail Merge Wizard - Starting document">Mail Merge Wizard - Starting document</link></paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/>
-<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/01150000.xhp">Configurable Mail Merge dialog</link></paragraph>
-</body>
-</helpdocument>
+<bookmark xml-lang="en-US" branch="hid/HID_DLGFORM_CMDNEXT" id="bm_id3147576" localize="false"/><embed href="text/shared/00/00000001.xhp#weiterautopi"/> +<paragraph role="paragraph" id="par_idN105CC" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp" name="Mail Merge Wizard - Starting document">Mail Merge Wizard - Starting document</link></paragraph> +<embed href="text/shared/00/00000004.xhp#related"/> +<embed href="text/swriter/guide/form_letters_main.xhp#form_letters"/> +<paragraph role="paragraph" id="par_idN105F6" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/01150000.xhp">Configurable Mail Merge dialog</link></paragraph> +</body> +</helpdocument> diff --git a/helpcontent2/source/text/swriter/01/mailmerge01.xhp b/helpcontent2/source/text/swriter/01/mailmerge01.xhp index b2db2822ce..498015ae12 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge01.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge01.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,38 +52,47 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter01mailmerge01xml" indexer="include" status="DRAFT">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Starting Document</title>
-<filename>text/swriter/01/mailmerge01.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-07T12:01:37">UFI: Mail Merge Wizard page 1</created>
-<lastedited date="2004-07-07T12:16:20"/>
-</history>
-</meta>
-<body>
-<section id="startingdocument">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document to start the mail merge steps.</paragraph>
-</section>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph>
-<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW">Select to use the current document for the mail merge.</paragraph>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Create new document</paragraph>
-<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW">Select to open a new text document for the mail merge.</paragraph>
-<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Start from existing document</paragraph>
-<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW">Select to choose an existing text document in a file open dialog.</paragraph>
-<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
-<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW">Click to open the file open dialog.</paragraph>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Start from template</paragraph>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW">Select to choose a template and to open a new document based on that template.</paragraph>
-<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW">Click to open the <emph>Templates and Documents</emph> dialog.</paragraph>
-<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from recently saved starting document</paragraph>
-<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW">Select a mail merge document that was previously saved on the last page of the Wizard.</paragraph>
-<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph>
-</body>
-</helpdocument>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textswriter01mailmerge01xml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">Mail Merge Wizard - Starting Document</title> +<filename>text/swriter/01/mailmerge01.xhp</filename> +</topic> +<history> +<created date="2004-07-07T12:01:37">UFI: Mail Merge Wizard page 1</created> +<lastedited date="2004-10-04T16:40:19">DEDR: Reviewed</lastedited> +</history> +</meta> +<body> +<section id="startingdocument"> +<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge01.xhp">Mail Merge Wizard - Starting Document</link></paragraph> +<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the document that you want to use as a base for the mail merge document.</paragraph> +</section> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_CURRENTDOC" id="bm_id9740592.00000001" localize="false"/> +<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Use the current document</paragraph> +<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Uses the current Writer document as the base for the mail merge document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_NEWDOC" id="bm_id501724" localize="false"/> +<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">Create new document</paragraph> +<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a new Writer document to use for the mail merge.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADDOC" id="bm_id216986" localize="false"/> +<paragraph role="heading" id="par_idN10564" xml-lang="en-US" level="2" l10n="NEW">Start from existing document</paragraph> +<paragraph role="paragraph" id="par_idN10568" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select an existing Writer document to use as the base for the mail merge document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_LOADDOC" id="bm_id7658314" localize="false"/> +<paragraph role="heading" id="par_idN1056B" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph> +<paragraph role="paragraph" id="par_idN1056F" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Locate the Writer document that you want too use, and then click <emph>Open</emph>.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_LOADTEMPLATE" id="bm_id1717886" localize="false"/> +<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Start from template</paragraph> +<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the template that you want to create your mail merge document with.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_MM_DOCSELECT_PAGE_PB_BROWSETEMPLATE" id="bm_id3173619" localize="false"/> +<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Browse</paragraph> +<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <emph>Templates and Documents</emph> dialog.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_DOCSELECT_PAGE_RB_RECENTDOC" id="bm_id6065248" localize="false"/> +<paragraph role="heading" id="par_idN10584" xml-lang="en-US" level="2" l10n="NEW">Start from recently saved starting document</paragraph> +<paragraph role="paragraph" id="par_idN10588" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Use an existing mail merge document as the base for a new mail merge document.</ahelp></paragraph> +<bookmark xml-lang="en-US" branch="hid/sw_ListBox_DLG_MM_DOCSELECT_PAGE_LB_RECENTDOC" id="bm_id920133" localize="false"/> +<paragraph role="paragraph" id="par_idN106F6" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the document.</ahelp></paragraph> +<paragraph role="paragraph" id="par_idN1058B" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp" name="Mail Merge Wizard - Document type">Mail Merge Wizard - Document type</link></paragraph> +</body> +</helpdocument> diff --git a/helpcontent2/source/text/swriter/01/mailmerge02.xhp b/helpcontent2/source/text/swriter/01/mailmerge02.xhp index 326f9f8e18..3db7288553 100755 --- a/helpcontent2/source/text/swriter/01/mailmerge02.xhp +++ b/helpcontent2/source/text/swriter/01/mailmerge02.xhp @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?> <!--*********************************************************************** * * The Contents of this file are made available subject to the terms of @@ -52,28 +52,34 @@ * Contributor(s): _______________________________________ * * - ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textswriter01mailmerge02xml" indexer="include" status="DRAFT">
-<title id="tit" xml-lang="en-US">Mail Merge Wizard - Document Type</title>
-<filename>text/swriter/01/mailmerge02.xhp</filename>
-</topic>
-<history>
-<created date="2004-07-07T12:40:08">UFI: Mail Merge Wizard - page 2</created>
-<lastedited date="2004-07-07T12:49:01"/>
-</history>
-</meta>
-<body>
-<section id="documenttype">
-<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph>
-<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify whether to create a letter mail merge or an e-mail merge.</paragraph>
-</section>
-<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph>
-<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW">Select to create printed pages.</paragraph>
-<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph>
-<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="NEW">Select to send e-mails to recipients. Java Mail must be installed; see <link href="http://java.sun.com/products/javamail">http://java.sun.com/products/javamail</link>.</paragraph>
-<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph>
-</body>
-</helpdocument>
+ ************************************************************************--> + +<helpdocument version="1.0"> +<meta> +<topic id="textswriter01mailmerge02xml" indexer="include" status="PUBLISH"> +<title id="tit" xml-lang="en-US">Mail Merge Wizard - Document Type</title> +<filename>text/swriter/01/mailmerge02.xhp</filename> +</topic> +<history> +<created date="2004-07-07T12:40:08">UFI: Mail Merge Wizard - page 2</created> +<lastedited date="2004-10-04T16:51:29">DEDR: Reviewed</lastedited> +</history> +</meta> +<body> +<section id="documenttype"> +<paragraph role="heading" id="par_idN10543" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge02.xhp">Mail Merge Wizard - Document Type</link></paragraph> +<paragraph role="paragraph" id="par_idN10553" xml-lang="en-US" l10n="NEW">Specify the type of mail merge document to create. You can create an e-mail or letter mail merge document.</paragraph> +</section> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_LETTER" id="bm_id2589190" localize="false"/> +<paragraph role="heading" id="par_idN10556" xml-lang="en-US" level="2" l10n="NEW">Letter</paragraph> +<paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Creates a printable mail merge document.</ahelp></paragraph> +<switch select="distrib"> +<case select="COMMERCIAL"> +<bookmark xml-lang="en-US" branch="hid/sw_RadioButton_DLG_MM_OUTPUTTYPE_PAGE_RB_MAIL" id="bm_id3822443" localize="false"/> +<paragraph role="heading" id="par_idN1055D" xml-lang="en-US" level="2" l10n="NEW">E-mail message</paragraph> +<paragraph role="paragraph" id="par_idN10561" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Creates mail merge document that you can send as an e-mail message or an e-mail attachment.</ahelp> This feature needs Java Mail, which is installed with %PRODUCTNAME by default.</paragraph> +</case> +</switch> +<paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge Wizard - Addresses</link></paragraph> +</body> +</helpdocument> |