CWS-TOOLING: integrate CWS hcmac02

8 files changed, 11 insertions, 19 deletions

diff --git a/helpcontent2/source/text/simpress/01/03130000.xhp b/helpcontent2/source/text/simpress/01/03130000.xhp
index 9675a39e8b..ea8f58d71e 100644
--- a/helpcontent2/source/text/simpress/01/03130000.xhp
+++ b/helpcontent2/source/text/simpress/01/03130000.xhp
@@ -57,7 +57,7 @@
   <embed href="text/simpress/00/00000403.xhp#asbsp"/>
 </section>
 <paragraph role="paragraph" id="par_id3155066" xml-lang="en-US" l10n="U" oldref="4">You can specify settings for running a slide show in <link href="text/simpress/01/06080000.xhp" name="Slide Show - Slide Show Settings"><emph>Slide Show - Slide Show Settings</emph></link>.</paragraph>
-<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="paragraph" id="par_idN106CF" xml-lang="en-US" l10n="NEW">Specify whether a slide show starts with the current slide or with the first slide on <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_id3155960" xml-lang="en-US" l10n="U" oldref="3">To start a slide show, do one of the following:</paragraph>
 <list type="unordered">
 <listitem>
diff --git a/helpcontent2/source/text/simpress/01/04030000.xhp b/helpcontent2/source/text/simpress/01/04030000.xhp
index b1c62cfe92..d75ca2b623 100644
--- a/helpcontent2/source/text/simpress/01/04030000.xhp
+++ b/helpcontent2/source/text/simpress/01/04030000.xhp
@@ -57,8 +57,8 @@
 </section>
 <paragraph role="tip" id="par_id3145388" xml-lang="en-US" l10n="U" oldref="19">You can drag a snap line from the rulers and drop them on the page. To delete a snap line, drag it back to the ruler.</paragraph>
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="3">Draw or move an object near a snap point or snap line to snap it in place.</paragraph>
-<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Drawing - Grid"><emph>Tools - Options - %PRODUCTNAME Draw - Grid</emph></link>
-</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Tools - Options - Presentation - Grid"><emph>Tools - Options - %PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline>.</paragraph>
+<paragraph role="paragraph" id="par_id3157978" xml-lang="en-US" l10n="U" oldref="4">To set the snap range, choose <switchinline select="appl"><caseinline select="DRAW"><link href="text/shared/optionen/01070300.xhp" name="Drawing - Grid"><emph>%PRODUCTNAME Draw - Grid</emph></link>
+</caseinline><defaultinline><link href="text/shared/optionen/01070300.xhp" name="Presentation - Grid"><emph>%PRODUCTNAME Impress - Grid</emph></link></defaultinline></switchinline> in the Options dialog box.</paragraph>
 <paragraph role="heading" id="hd_id3147402" xml-lang="en-US" level="2" l10n="U" oldref="5">Position</paragraph>
 <paragraph role="paragraph" id="par_id3150533" xml-lang="en-US" l10n="U" oldref="6">Sets the position of a selected snap point or line relative to the top left corner of the page. </paragraph>
 <paragraph role="note" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="24">You can also drag a snap point or snap line to a new position.</paragraph>
diff --git a/helpcontent2/source/text/simpress/01/04990600.xhp b/helpcontent2/source/text/simpress/01/04990600.xhp
index a3b0bb7d20..7d17ae864f 100644
--- a/helpcontent2/source/text/simpress/01/04990600.xhp
+++ b/helpcontent2/source/text/simpress/01/04990600.xhp
@@ -30,17 +30,13 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0104990600xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Author  </title>
 <filename>/text/simpress/01/04990600.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-23T15:30:35">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="autor">
@@ -52,7 +48,7 @@
 <paragraph role="heading" id="hd_id3146974" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/04990600.xhp" name="Author">Author</link></paragraph>
 <paragraph role="paragraph" id="par_id3153876" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:InsertAuthorField">Inserts the first and last names listed in the $[officename] user data into the active slide.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154512" xml-lang="en-US" l10n="U" oldref="3">To edit the name, choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data"><emph>$[officename] - User Data</emph></link>.</paragraph>
 <section id="howtoget">
   <embed href="text/simpress/00/00000404.xhp#feldbf6"/>
 </section>
diff --git a/helpcontent2/source/text/simpress/02/08020000.xhp b/helpcontent2/source/text/simpress/02/08020000.xhp
index 9a23b6f41e..207f14ea13 100644
--- a/helpcontent2/source/text/simpress/02/08020000.xhp
+++ b/helpcontent2/source/text/simpress/02/08020000.xhp
@@ -37,10 +37,6 @@
 <title id="tit" xml-lang="en-US">Current Size</title>
 <filename>/text/simpress/02/08020000.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-27T09:25:51">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
 <section id="aktuellegroesse">
@@ -49,6 +45,6 @@
 <paragraph role="heading" id="hd_id3154011" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/02/08020000.xhp" name="Current Size">Current Size</link></paragraph>
 <paragraph role="paragraph" id="par_id3154321" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:Position">Displays the X and Y position of the cursor and the size of the selected object.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <link href="text/shared/optionen/01070500.xhp" name="Tools - Options - Presentation - General"><emph>Tools - Options - %PRODUCTNAME Impress - General</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="3">This Status bar field uses the same measurement units as the rulers. You can define the units by choosing <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01070500.xhp" name="Presentation - General"><emph>%PRODUCTNAME Impress - General</emph></link>.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/simpress/04/01020000.xhp b/helpcontent2/source/text/simpress/04/01020000.xhp
index 5d9230ca60..558dc86ac3 100755
--- a/helpcontent2/source/text/simpress/04/01020000.xhp
+++ b/helpcontent2/source/text/simpress/04/01020000.xhp
@@ -159,7 +159,7 @@
 </tablerow>
 <tablerow>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29">F11</paragraph>
+<paragraph role="tablecontent" id="hd_id3155373" xml-lang="en-US" l10n="U" oldref="29"><switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3150470" xml-lang="en-US" l10n="U" oldref="30">Styles and Formatting</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/individual.xhp b/helpcontent2/source/text/simpress/guide/individual.xhp
index 8758f6fe5b..3a6de769a6 100755
--- a/helpcontent2/source/text/simpress/guide/individual.xhp
+++ b/helpcontent2/source/text/simpress/guide/individual.xhp
@@ -86,7 +86,7 @@
 <paragraph role="heading" id="hd_id3150335" xml-lang="en-US" level="3" l10n="U" oldref="65">To always start a slide show from the current slide:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150014" xml-lang="en-US" l10n="U" oldref="66">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph>.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155932" xml-lang="en-US" l10n="U" oldref="67">In the <emph>Start presentation</emph> area, select the <emph>Always with current page</emph> check box.</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/printing.xhp b/helpcontent2/source/text/simpress/guide/printing.xhp
index 7db7eb0a52..5ac202d6ac 100755
--- a/helpcontent2/source/text/simpress/guide/printing.xhp
+++ b/helpcontent2/source/text/simpress/guide/printing.xhp
@@ -57,7 +57,7 @@
 <paragraph role="heading" id="hd_id3154486" xml-lang="en-US" level="2" l10n="U" oldref="2">Default printer settings</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="3">To set the default printing options for $[officename] Impress, choose <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3156385" xml-lang="en-US" l10n="U" oldref="3">To set the default printing options for $[officename] Impress, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - Print</emph>.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id3153914" xml-lang="en-US" level="2" l10n="U" oldref="5">Setting printer options for the current presentation</paragraph>
@@ -67,7 +67,7 @@
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3149870" xml-lang="en-US" l10n="U" oldref="7">Click <emph>Options</emph>, and then select the printer options.</paragraph>
-<paragraph role="listitem" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="8">These settings override the default printer options in <emph>Tools - Options - %PRODUCTNAME Impress - Print</emph> for the current print job only.</paragraph>
+<paragraph role="listitem" id="par_id3150431" xml-lang="en-US" l10n="U" oldref="8">These settings override the default printer options in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - Print</emph> for the current print job only.</paragraph>
 </listitem>
 </list>
 <paragraph role="heading" id="hd_id4555192" xml-lang="en-US" level="2" l10n="NEW">Choosing a print layout for handouts</paragraph>
diff --git a/helpcontent2/source/text/simpress/guide/show.xhp b/helpcontent2/source/text/simpress/guide/show.xhp
index ba2375bcbb..a818076384 100644
--- a/helpcontent2/source/text/simpress/guide/show.xhp
+++ b/helpcontent2/source/text/simpress/guide/show.xhp
@@ -64,7 +64,7 @@
 <paragraph role="paragraph" id="par_id6860255" xml-lang="en-US" l10n="NEW">Choose <emph>Slide Show - Slide Show</emph> to run the show.</paragraph>
 </listitem>
 </list>
-<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph>Tools - Options - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
+<paragraph role="tip" id="par_id4199957" xml-lang="en-US" l10n="NEW">If you want all shows to start from the current slide instead of the first slide, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Impress - General</emph> and click <emph>Always with current page</emph>.</paragraph>
 <list type="unordered">
 <listitem>
 <paragraph role="paragraph" id="par_id3209936" xml-lang="en-US" l10n="NEW">Click to advance to the next effect or to the next slide.</paragraph>