INTEGRATION: CWS hcshared07 (1.7.32); FILE MERGED

2007/01/11 09:31:44 ufi 1.7.32.2: last commitment
2007/01/02 15:51:12 ufi 1.7.32.1: zwischenstand

1 files changed, 23 insertions, 45 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01140000.xhp b/helpcontent2/source/text/shared/optionen/01140000.xhp
index 720e6e2b64..1ac0a41df8 100755
--- a/helpcontent2/source/text/shared/optionen/01140000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01140000.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: 01140000.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.8 $
  *
- *  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: vg $ $Date: 2007-02-07 11:48:10 $
  *
- *  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-02-13T14:07:49">FPE: fixed #110170# and adjusted</lastedited>
+<lastedited date="2007-01-08T14:58:31">FPE: fixed #110170# and adjusted</lastedited>
 </history>
 </meta>
 <body>
@@ -73,15 +53,13 @@
 <bookmark_value>locale settings</bookmark_value>
 <bookmark_value>Asian languages; enabling</bookmark_value>
 <bookmark_value>languages; Asian support</bookmark_value>
-<bookmark_value>Asian languages; supporting</bookmark_value>
 <bookmark_value>complex text layout; enabling</bookmark_value>
 <bookmark_value>Arabic;language settings</bookmark_value>
 <bookmark_value>Hebrew;language settings</bookmark_value>
 <bookmark_value>Thai;language settings</bookmark_value>
 <bookmark_value>Hindi;language settings</bookmark_value>
-<bookmark_value>language settings;complex text layout</bookmark_value>
 <bookmark_value>decimal separator key</bookmark_value>
-</bookmark><comment>mw inserted "decimal separator key". Use this one level entry instead of a two level entry</comment>
+</bookmark><comment>mw deleted "language settings;" and "Asian languages;supporting"</comment>
 <paragraph role="heading" id="hd_id3151299" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01140000.xhp" name="Languages">Languages</link></paragraph>
 <paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".">Defines the default languages and some other locale settings for documents.</ahelp></paragraph>
 </section>