From 24ee28c876dd40cc35294bf779b85569206e064f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 26 Nov 2004 20:35:12 +0000 Subject: [PATCH] INTEGRATION: CWS helpcontentbeta (1.2.2); FILE MERGED 2004/10/06 14:56:02 fpe 1.2.2.1: Regular Update --- .../source/text/shared/autopi/01010300.xhp | 23 ++++++------- .../source/text/shared/autopi/01010400.xhp | 33 ++++++++++--------- .../source/text/shared/autopi/01010500.xhp | 7 ++-- .../source/text/shared/autopi/01010600.xhp | 11 ++++--- 4 files changed, 39 insertions(+), 35 deletions(-) diff --git a/helpcontent2/source/text/shared/autopi/01010300.xhp b/helpcontent2/source/text/shared/autopi/01010300.xhp index ee5cb99ea7..9597a78a89 100644 --- a/helpcontent2/source/text/shared/autopi/01010300.xhp +++ b/helpcontent2/source/text/shared/autopi/01010300.xhp @@ -56,13 +56,14 @@ - + Letter Wizard - Page 3 /text/shared/autopi/01010300.xhp Sun Microsystems, Inc. -UFI: new Wizard +UFI: new Wizard +YJ: checked @@ -74,33 +75,33 @@ Use a typical letter format for this country -Select a country to use a typical letter layout from that country. +Select a country in order to use a typical letter layout from that country. Logo -Include a logo on the letter template. +Includes a logo on the letter template. Return address in envelope window -Include a small size return address on the letter template. +Includes a small size return address on the letter template. Letter signs -Include a line with references to a business letter on the letter template. +Includes a line with references to a business letter on the letter template. Subject line -Include a subject line on the letter template. +Includes a subject line on the letter template. Salutation -Include a salutation on the letter template. Select the salutation from the list box. +Includes a salutation on the letter template. Select the salutation from the list box. Fold marks -Include fold marks on the letter template. +Includes fold marks on the letter template. Complimentary close -Include a complimentary close on the letter template. Select the text from the list box. +Includes a complimentary close on the letter template. Select the text from the list box. Footer -Include a footer on the letter template. +Includes a footer on the letter template. Go to Letter Wizard - Recipient and sender diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp index b881ca6724..fbab0eb70e 100644 --- a/helpcontent2/source/text/shared/autopi/01010400.xhp +++ b/helpcontent2/source/text/shared/autopi/01010400.xhp @@ -56,48 +56,49 @@ - + Letter Wizard - Page 4 /text/shared/autopi/01010400.xhp Sun Microsystems, Inc. -UFI: new Wizard +UFI: new Wizard +YJ: checked
Letter Wizard - Recipient and sender -Specify the sender and recipient information. +Specifies the sender and recipient information.
Sender's address -Enter your own address information. +Specifies your address information. -Use user data for return address +Use user data for return address Use the address data from Tools - Options - %PRODUCTNAME - User data. -New sender address +New sender address Use the address data from the following text boxes. -Name -Enter the name of the sender. +Name +Specifies the name of the sender. -Street -Enter the street address of the sender. +Street +Specifies the street address of the sender. -Postcode/State/City -Enter the address data of the sender. +Postcode/State/City +Specifies the address data of the sender. Recipient's address -Enter the address information where to send the letter to. +Specifies the recipient's address information. -Use placeholders for recipient's address -Placeholder fields are inserted into the letter template. +Use placeholders for recipient's address +Specifies that placeholder fields are inserted into the letter template. -Use address database for mail merge +Use address database for mail merge Address database fields are inserted into the letter template. Go to Letter Wizard - Footer diff --git a/helpcontent2/source/text/shared/autopi/01010500.xhp b/helpcontent2/source/text/shared/autopi/01010500.xhp index b80b5c1e97..2192442a3f 100644 --- a/helpcontent2/source/text/shared/autopi/01010500.xhp +++ b/helpcontent2/source/text/shared/autopi/01010500.xhp @@ -56,13 +56,14 @@ - + Letter Wizard - Page 5 /text/shared/autopi/01010500.xhp Sun Microsystems, Inc. -converted from old format - fpe +converted from old format - fpe +YJ: checked @@ -77,7 +78,7 @@ Enter the text for the footer lines. Include only on second and following pages -Select to suppress the footer on the first page. +Select to suppress the footer on the first page. Include page numbers Includes page numbers in your letter template. diff --git a/helpcontent2/source/text/shared/autopi/01010600.xhp b/helpcontent2/source/text/shared/autopi/01010600.xhp index f10a204f1b..2802c9dfcc 100644 --- a/helpcontent2/source/text/shared/autopi/01010600.xhp +++ b/helpcontent2/source/text/shared/autopi/01010600.xhp @@ -56,13 +56,14 @@ - + Letter Wizard - Page 6 /text/shared/autopi/01010600.xhp Sun Microsystems, Inc. -converted from old format - fpe +converted from old format - fpe +YJ: checked @@ -78,13 +79,13 @@ Path -Enter the path and file name for the template or click the ... button to select the path and file name. +Enter the path and file name for the template, or click the ... button to select the path and file name. Create a letter from this template -Select to save and close the template and open a new untitled document based on the template. +Saves and closes the template, and then opens a new untitled document based on the template. Make manual changes to this letter template -Select to save the template and keep it open for editing. +Saves the template and keeps it open for editing. Letter Wizard overview