summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/optionen/01011000.xhp
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-12-01 15:57:49 +0000
committerRüdiger Timm <rt@openoffice.org>2006-12-01 15:57:49 +0000
commit7ac31d25055cbfb4946263898a39834926c0229f (patch)
treeba16ce80eea56027eac34bebce7ec81cf6dfdfca /helpcontent2/source/text/shared/optionen/01011000.xhp
parent33abbc60e3d92216f6aca9c1bbc5b74ee186c055 (diff)
INTEGRATION: CWS hcshared06 (1.5.56); FILE MERGED
2006/10/25 13:48:29 ufi 1.5.56.2: bugfixing 2006/10/13 11:50:26 ufi 1.5.56.1: some changes
Diffstat (limited to 'helpcontent2/source/text/shared/optionen/01011000.xhp')
-rwxr-xr-xhelpcontent2/source/text/shared/optionen/01011000.xhp24
1 files changed, 11 insertions, 13 deletions
diff --git a/helpcontent2/source/text/shared/optionen/01011000.xhp b/helpcontent2/source/text/shared/optionen/01011000.xhp
index 38307f5cef..f7d1d0738c 100755
--- a/helpcontent2/source/text/shared/optionen/01011000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01011000.xhp
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: 01011000.xhp,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: vg $ $Date: 2006-05-23 15:06:19 $
+ * last change: $Author: rt $ $Date: 2006-12-01 16:57:49 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -32,7 +33,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
- ************************************************************************-->
+ ************************************************************************
+ -->
<helpdocument version="1.0">
<meta>
@@ -42,7 +44,7 @@
</topic>
<history>
<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-03-01T14:23:10">converted from old format - fpe</lastedited>
+<lastedited date="2006-10-24T12:24:54">converted from old format - fpe</lastedited>
</history>
</meta>
<body>
@@ -80,15 +82,11 @@
<bookmark xml-lang="en-US" branch="hid/svx_NumericField_OFA_TP_MEMORY_NF_OLECACHE" id="bm_id5088045" localize="false"/>
<paragraph role="heading" id="hd_id3147085" xml-lang="en-US" level="3" l10n="U" oldref="19">Number of objects</paragraph>
<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="OFFMGR_NUMERICFIELD_OFA_TP_MEMORY_NF_OLECACHE">Choose the maximum number of OLE objects that are pooled in the cache.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="U" oldref="21"><switchinline select="sys"><caseinline select="WIN">$[officename] Quickstarter
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="CHG" oldref="21">$[officename] Quickstarter</paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id3153370" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_OFA_TP_MEMORY_CB_QUICKLAUNCH" id="bm_id4756004" localize="false"/>
-<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="U" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="U" oldref="23"><switchinline select="sys"><caseinline select="WIN"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH">Mark this check box if you want $[officename] to enable quickstart at system start-up.</ahelp>
-</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3150874" xml-lang="en-US" l10n="U" oldref="24"><switchinline select="sys"><caseinline select="WIN">If the Quickstarter is enabled, parts of $[officename] will already be loaded in the memory upon system start-up. In the system tray is an icon with a context menu.
-</caseinline></switchinline></paragraph>
+<paragraph role="heading" id="hd_id3155429" xml-lang="en-US" level="3" l10n="CHG" oldref="22"><switchinline select="sys"><caseinline select="WIN">Load $[officename] during system start-up
+</caseinline><defaultinline>Enable systray quickstarter</defaultinline></switchinline><comment>UFI: new text seen in m187, see CWS gtkquickstart</comment></paragraph>
+<paragraph role="paragraph" id="par_id3152940" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="OFFMGR_CHECKBOX_OFA_TP_MEMORY_CB_QUICKLAUNCH">Mark this check box if you want $[officename] to enable quickstart.</ahelp><comment>UFI: had to remove explanation because on Windows it is at start-up, while on Unix it is a user-systray feature only. Cannot have switches inside AHID text.</comment></paragraph>
</body>
</helpdocument>