INTEGRATION: CWS hcshared08 (1.9.46); FILE MERGED

2007/02/09 08:19:50 ufi 1.9.46.1: before resync to 203

1 files changed, 24 insertions, 44 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01000000.xhp b/helpcontent2/source/text/shared/optionen/01000000.xhp
index f104238edd..548d944782 100644
--- a/helpcontent2/source/text/shared/optionen/01000000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01000000.xhp
@@ -2,56 +2,36 @@
 <!--
  ***********************************************************************
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
+ *  $RCSfile: 01000000.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.10 $
  *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *  last change: $Author: rt $ $Date: 2007-04-02 15:35:42 $
  *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
  *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************
  -->
@@ -64,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T13:00:14">converted from old format - fpe</lastedited>
+<lastedited date="2007-02-06T16:27:32">converted from old format - fpe</lastedited>
 </history>
 </meta>
 <body>
@@ -78,8 +58,8 @@
 <paragraph role="heading" id="hd_id3153665" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01000000.xhp" name="Options">Options</link></paragraph>
 <paragraph role="paragraph" id="par_id3151384" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:OptionsTreeDialog">This command opens a dialog for a customized program configuration.</ahelp></paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings will be automatically saved. To open an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
-<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="NEW">You will only see the entries that are applicable to the current document. If the current document is a text document, you will see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
+<paragraph role="paragraph" id="par_id3156344" xml-lang="en-US" l10n="CHG" oldref="18">All your settings are saved automatically. To expand an entry either double click this entry or click the plus sign. To collapse the entry, click the minus sign or double click the entry.</paragraph>
+<paragraph role="note" id="par_idN10607" xml-lang="en-US" l10n="CHG">You see only the entries that are applicable to the current document. If the current document is a text document, you see the %PRODUCTNAME Writer entry, and so on for all modules of %PRODUCTNAME. %PRODUCTNAME Impress and %PRODUCTNAME Draw are treated as the same in this dialog. The common entries are always visible.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_OFADLG_TREELISTBOX" id="bm_id3158409" localize="false"/>
 <paragraph role="paragraph" id="par_id3125863" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="HID_OFADLG_TREELISTBOX" visibility="hidden">Select an entry to edit.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3149809" xml-lang="en-US" l10n="E" localize="false"><link href="text/shared/00/00000406.xhp#optionen"><embedvar href="text/shared/00/00000004.xhp#wie"/></link></paragraph>