INTEGRATION: CWS hcshared05 (1.10.38); FILE MERGED

2006/09/26 14:38:14 ufi 1.10.38.1: ready

1 files changed, 29 insertions, 50 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01010400.xhp b/helpcontent2/source/text/shared/optionen/01010400.xhp
index 1b7337620f..37f495ed38 100644
--- a/helpcontent2/source/text/shared/optionen/01010400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010400.xhp
@@ -1,58 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
+<!--
+ ***********************************************************************
  *
- *  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: 01010400.xhp,v $
  *
- *  Sun Microsystems Inc., October, 2000
+ *  $Revision: 1.11 $
  *
- *  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: 2006-11-01 17:17:49 $
  *
- *  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.
+ *    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.
  *
- *  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.
+ *    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
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
- *
- ************************************************************************-->
+ ************************************************************************
+ -->
 	
 <helpdocument version="1.0">
 <meta>
@@ -62,7 +44,7 @@
 </topic>
 <history>
 <created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-01-23T15:21:48">FPE: Added missing section
+<lastedited date="2006-09-05T10:53:35">FPE: Added missing section
 UFI: fixed #i39353#</lastedited>
 </history>
 </meta>
@@ -138,11 +120,9 @@ UFI: fixed #i39353#</lastedited>
 <paragraph role="heading" id="hd_id3147361" xml-lang="en-US" level="3" l10n="U" oldref="88">New</paragraph>
 <paragraph role="paragraph" id="par_id3163808" xml-lang="en-US" l10n="U" oldref="89"><ahelp hid="SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE">Adds the word in the <emph>Word </emph>text field to your current custom dictionary. The word in the <emph>Suggestion </emph>field is also added when working with exception dictionaries.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE" id="bm_id3153790" localize="false"/>
-<paragraph role="heading" id="hd_id3147003" xml-lang="en-US" level="3" l10n="U" oldref="90">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="SVX:PUSHBUTTON:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145790" xml-lang="en-US" l10n="U" oldref="91"><ahelp hid="." visibility="hidden">Removes the marked word from the current custom dictionary.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC" id="bm_id3150787" localize="false"/>
-<paragraph role="heading" id="hd_id3155580" xml-lang="en-US" level="3" l10n="U" oldref="92">Delete</paragraph>
-<paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="SVX_PUSHBUTTON_RID_SFXPAGE_LINGU_PB_LINGU_DICS_DEL_DIC">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151277" xml-lang="en-US" l10n="U" oldref="93"><ahelp hid="." visibility="hidden">Deletes the selected dictionary after a confirmation, provided it is not write-protected.</ahelp></paragraph>
 </section>
 <section id="optionen">
 <bookmark xml-lang="en-US" branch="hid/HID_CLB_LINGU_OPTIONS" id="bm_id3153703" localize="false"/>
@@ -167,8 +147,7 @@ UFI: fixed #i39353#</lastedited>
 <paragraph role="paragraph" id="par_id3155531" xml-lang="en-US" l10n="U" oldref="6"><variable id="automatisch"><ahelp hid=".uno:SpellOnline">Automatically checks spelling as you type, and underlines errors.</ahelp>
 </variable></paragraph>
 <section id="automatischweiter">
-<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="U" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of suggested corrections. Select a suggested correction to replace the suspect word with the suggestion. If you make the same mistake again while editing the document, it will be corrected automatically.</paragraph>
-<paragraph role="note" id="par_id3148658" xml-lang="en-US" l10n="U" oldref="22">These automatic replacements are only made during the current $[officename] session.</paragraph>
+<paragraph role="paragraph" id="par_id3156291" xml-lang="en-US" l10n="CHG" oldref="32">Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again.</paragraph><comment>UFI: changed para, removed note, see i60431</comment>
 <paragraph role="paragraph" id="par_id3153815" xml-lang="en-US" l10n="U" oldref="23">To place the word pair in the <link href="text/shared/01/06040200.xhp" name="AutoCorrect replacement table">AutoCorrect replacement table</link>, open the <link href="text/shared/01/06040500.xhp" name="AutoCorrect context menu">AutoCorrect context menu</link> and choose <emph>AutoCorrect</emph>. Make your selection from the submenu. The word is replaced and at the same time the word pair is placed in the replacement table.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3153912" xml-lang="en-US" level="3" l10n="U" oldref="7">Do not mark errors</paragraph>