summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/autopi
diff options
context:
space:
mode:
authorUwe Fischer <ufi@openoffice.org>2010-01-07 12:33:30 +0100
committerUwe Fischer <ufi@openoffice.org>2010-01-07 12:33:30 +0100
commita78cb8e2bae64ab327c8f6a4021b4bb854526f43 (patch)
tree29fa99da89c61b7b8a9fd525fd30f95d25bd49cc /helpcontent2/source/text/shared/autopi
parent17ae85786dd0dc06a23b08cb9e37812824391e48 (diff)
parent487ffc9d2eafc571a7cabdfffc2541608f3c74b1 (diff)
hcshared25: merge with DEV300_m68
Diffstat (limited to 'helpcontent2/source/text/shared/autopi')
-rw-r--r--helpcontent2/source/text/shared/autopi/01010400.xhp2
-rw-r--r--helpcontent2/source/text/shared/autopi/01050000.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/01050100.xhp4
3 files changed, 5 insertions, 10 deletions
diff --git a/helpcontent2/source/text/shared/autopi/01010400.xhp b/helpcontent2/source/text/shared/autopi/01010400.xhp
index 70057ed3d4..9462bd50f3 100644
--- a/helpcontent2/source/text/shared/autopi/01010400.xhp
+++ b/helpcontent2/source/text/shared/autopi/01010400.xhp
@@ -58,7 +58,7 @@ YJ: checked</lastedited>
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies your address information.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERPLACEHOLDER" id="bm_id1062044" localize="false"/>
<paragraph role="heading" id="par_idN105E9" xml-lang="en-US" level="3" l10n="NEW">Use user data for return address</paragraph>
-<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from Tools - Options - %PRODUCTNAME - User data.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105EC" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERPLACEHOLDER">Use the address data from %PRODUCTNAME - User Data in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_LTRWIZ_OPTSENDERDEFINE" id="bm_id1482589" localize="false"/>
<paragraph role="heading" id="par_idN10603" xml-lang="en-US" level="3" l10n="NEW">New sender address</paragraph>
<paragraph role="paragraph" id="par_idN10606" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_LTRWIZ_OPTSENDERDEFINE">Use the address data from the following text boxes.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01050000.xhp b/helpcontent2/source/text/shared/autopi/01050000.xhp
index 9aa087918d..364bbd9abc 100644
--- a/helpcontent2/source/text/shared/autopi/01050000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050000.xhp
@@ -37,15 +37,10 @@
<title id="tit" xml-lang="en-US">Presentation Wizard</title>
<filename>/text/shared/autopi/01050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-07-05T11:02:05">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3159224"><bookmark_value>wizards; presentations</bookmark_value>
-<bookmark_value>presentations; wizards</bookmark_value>
-</bookmark>
+<bookmark_value>presentations; wizards</bookmark_value></bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_AUTOPILOT" id="bm_id3154894" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/slot:10425" id="bm_id7406537" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:AutoPilotPresentations" id="bm_id3928952" localize="false"/>
@@ -56,7 +51,7 @@
<section id="howtoget">
<embed href="text/shared/00/00000401.xhp#dtapt"/>
</section>
-<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
+<paragraph role="tip" id="par_id3154289" xml-lang="en-US" l10n="U" oldref="11">The Presentation Wizard starts automatically when you open a new presentation. You can deactivate this function if you choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General">%PRODUCTNAME Impress - General</link></emph> and deselect the <emph>Start with Wizard</emph> check box.</paragraph>
<paragraph role="paragraph" id="par_id3166410" xml-lang="en-US" l10n="U" oldref="3">Within each wizard page, you can undo, modify, or skip altogether the editing steps. If you decide to skip over one of the pages, the wizard uses the default settings.</paragraph>
<embed href="text/shared/autopi/01050100.xhp#autopilotseite1"/>
<embed href="text/shared/autopi/01050200.xhp#autopilotseite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01050100.xhp b/helpcontent2/source/text/shared/autopi/01050100.xhp
index 8880d6792d..5bb187918a 100755
--- a/helpcontent2/source/text/shared/autopi/01050100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01050100.xhp
@@ -71,13 +71,13 @@ dedr: fixed #i31165#</lastedited>
<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="27"><ahelp hid="HID_SD_AUTOPILOT_TEMPLATES">Lists the available template categories for presentations.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SD_AUTOPILOT_OPEN" id="bm_id3153665" localize="false"/>
<paragraph role="heading" id="hd_id3153349" xml-lang="en-US" level="3" l10n="U" oldref="20">List of existing presentations (only available when you select the Open existing presentation option)</paragraph>
-<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>Tools - Options - %PRODUCTNAME - Paths</emph>. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145317" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_SD_AUTOPILOT_OPEN">Lists the presentations that you created and saved to the Templates directory that is specified under <emph>%PRODUCTNAME - Paths</emph> in the Options dialog box. To edit the layout and formatting of a presentation with the wizard, select the presentation, and then click <emph>Next</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_PREVIEW" id="bm_id3156192" localize="false"/>
<paragraph role="heading" id="hd_id3155388" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
<paragraph role="paragraph" id="par_id3150256" xml-lang="en-US" l10n="U" oldref="29"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_PREVIEW">Specifies that templates appear in the preview window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_ASS:CB_STARTWITH" id="bm_id3145609" localize="false"/>
<paragraph role="heading" id="hd_id3153561" xml-lang="en-US" level="3" l10n="U" oldref="22">Do not show this dialog again</paragraph>
-<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153061" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SD:CHECKBOX:DLG_ASS:CB_STARTWITH">Specifies that you only want the Wizard to start when you expressly request it with <emph>File - Wizard - Presentation</emph>.</ahelp> This field is only visible when you create a presentation by choosing <emph>File - New - Presentation</emph>. You can also specify whether to show the dialog with the <emph>Start with Wizard</emph> check box in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3159414" xml-lang="en-US" l10n="U" oldref="13">Continue here to <link href="text/shared/autopi/01050200.xhp" name="Wizard Page 2">Wizard Page 2</link>.</paragraph>
</body>
</helpdocument>