INTEGRATION: CWS hc680pp1 (1.4.14); FILE MERGED

2005/09/30 20:15:47 ufi 1.4.14.2: RESYNC: (1.4-1.5); FILE MERGED
2005/04/29 14:11:29 fpe 1.4.14.1: Regular Update

1 files changed, 6 insertions, 7 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01070500.xhp b/helpcontent2/source/text/shared/optionen/01070500.xhp
index 78585b6da5..d5a3ea95d2 100644
--- a/helpcontent2/source/text/shared/optionen/01070500.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070500.xhp
@@ -5,9 +5,9 @@
  *
  *  $RCSfile: 01070500.xhp,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 23:40:53 $
+ *  last change: $Author: kz $ $Date: 2005-10-05 14:03:10 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -42,7 +42,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-09-14T12:52:53">converted from old format - fpe
+<lastedited date="2005-04-29T11:51:56">converted from old format - fpe
 dedr: fixed #i30842#</lastedited>
 </history>
 </meta>
@@ -62,7 +62,7 @@ dedr: fixed #i30842#</lastedited>
 <paragraph role="paragraph" id="par_id3153880" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000406.xhp#etopsonstiges"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>
 <paragraph role="heading" id="hd_id3144511" xml-lang="en-US" level="2" l10n="U" oldref="3">Text objects</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT" id="bm_id3156343" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_QUICKEDIT" id="bm_id7033098" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_QUICKEDIT" id="bm_id7033098" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:QuickEdit" id="bm_id3147264" localize="false"/>
 <paragraph role="heading" id="hd_id3149295" xml-lang="en-US" level="3" l10n="U" oldref="5">Allow quick editing</paragraph>
 <paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="U" oldref="6"><variable id="schnellbearb"><ahelp hid=".uno:QuickEdit">Specifies whether to immediately switch to the text editing mode when clicking a text object.</ahelp>
@@ -73,7 +73,7 @@ dedr: fixed #i30842#</lastedited>
 </caseinline><caseinline select="MATH">
 </caseinline><defaultinline>In a presentation or drawing document, you can also activate the text editing mode through the<emph> Allow Quick Editing </emph><link href="text/simpress/02/13180000.xhp" name="icon">icon</link> in the <emph>Option</emph> bar.</defaultinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH" id="bm_id3148920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SID_PICK_THROUGH" id="bm_id1003023" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/SID_PICK_THROUGH" id="bm_id1003023" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:PickThrough" id="bm_id3153969" localize="false"/>
 <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="3" l10n="U" oldref="7">Only text area selectable</paragraph>
 <paragraph role="paragraph" id="par_id3149808" xml-lang="en-US" l10n="U" oldref="8"><variable id="textbereich"><ahelp hid=".uno:PickThrough">Specifies whether to select a text frame by clicking the text.</ahelp>
@@ -95,8 +95,7 @@ dedr: fixed #i30842#</lastedited>
 <paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE">Specifies whether to use the cache for displaying objects on the master page.</ahelp> This speeds up the display. Unmark the <emph>Use background cache</emph> option if you want to display changing contents on the master page.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY" id="bm_id3150094" localize="false"/>
 <paragraph role="heading" id="hd_id3147428" xml-lang="en-US" level="3" l10n="U" oldref="17">Copy when moving</paragraph>
-<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY">Specifies whether to automatically create a copy when you move an object while holding down the <switchinline select="sys"><caseinline select="MAC">Control 
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph>
+<paragraph role="paragraph" id="par_id3154730" xml-lang="en-US" l10n="CHG" oldref="18"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY">Specifies whether to automatically create a copy when you move an object while holding down the Ctrl key.</ahelp> The same will apply for rotating and resizing the object. The original object will remain in its current position and size.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS" id="bm_id3150592" localize="false"/>
 <paragraph role="heading" id="hd_id3148457" xml-lang="en-US" level="3" l10n="U" oldref="19">Objects always moveable</paragraph>
 <paragraph role="paragraph" id="par_id3149413" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS">Specifies that you want to move an object with the <emph>Rotate</emph> tool enabled. If<emph> Object always moveable </emph>is not marked, the <emph>Rotate</emph> tool can only be used to rotate an object.</ahelp></paragraph>