native0: branding Help

author: Uwe Fischer <ufi@openoffice.org> 2009-12-07 12:35:04 +0100
committer: Uwe Fischer <ufi@openoffice.org> 2009-12-07 12:35:04 +0100
commit: 5ce821dd59435366c5d8d3ca8a200f99a7fe3670 (patch)
tree: 8ece5f32b62a1f71615f76e32a7402606648152b /helpcontent2
parent: 60379d840d0dbb63dfe646c0ffe2c2b3457febc6 (diff)
46 files changed, 336 insertions, 343 deletions
diff --git a/helpcontent2/source/text/sbasic/shared/01170101.xhp b/helpcontent2/source/text/sbasic/shared/01170101.xhp
index fe1b244344..58d2ec05c1 100755
--- a/helpcontent2/source/text/sbasic/shared/01170101.xhp
+++ b/helpcontent2/source/text/sbasic/shared/01170101.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -101,7 +101,7 @@
 <paragraph role="paragraph" id="par_id3154200" xml-lang="en-US" l10n="CHG" oldref="145"><ahelp hid=".">Select "Yes" to make the current button control the default selection. Pressing <emph>Return</emph> in the dialog activates the default button.</ahelp></paragraph>
 </section>
 <section id="Section66">
-<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="par_idN108BA" xml-lang="en-US" level="2" l10n="NEW">Delay<comment>UFI: see http://dba.openoffice.org/specifications/forms/scrollbar_form_control.sxw</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/><paragraph role="heading" id="par_idN108BA" xml-lang="en-US" level="2" l10n="NEW">Delay</paragraph>
 <paragraph role="paragraph" id="par_idN108D0" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Specifies the delay in milliseconds between scrollbar trigger events.</ahelp> A trigger event occurs when you click a scrollbar arrow or click the background area in a scrollbar. Repeated trigger events occur if you keep the mouse button pressed when you click a scrollbar arrow or background area in a scrollbar. If you want, you can include valid time units with the number that you enter, for example, 2 s or 500 ms.</paragraph>
 </section>
 <section id="Section51"><comment>UFI: removed help id</comment><paragraph role="heading" id="hd_id3151278" xml-lang="en-US" level="2" l10n="U" oldref="19">Dropdown</paragraph>
@@ -315,7 +315,7 @@
 <paragraph role="paragraph" id="par_idN11128" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Repeats trigger events when you keep the mouse button pressed on a control such as a spin button.</ahelp></paragraph>
 </section>
 <section id="Section71">
-<bookmark xml-lang="en-US" branch="hid/38022" id="bm_id1578722" localize="false"/><paragraph role="heading" id="hd_id9579149" xml-lang="en-US" level="2" l10n="NEW">Root displayed<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/38022" id="bm_id1578722" localize="false"/><paragraph role="heading" id="hd_id9579149" xml-lang="en-US" level="2" l10n="NEW">Root displayed</paragraph>
 <paragraph role="paragraph" id="par_id7126987" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies if the root node of the tree control is displayed.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id9174779" xml-lang="en-US" l10n="NEW">If Root displayed is set to FALSE, the root node of a model is no longer a valid node for the tree control and can't be used with any method of XTreeControl.</paragraph>
 <paragraph role="paragraph" id="par_id594195" xml-lang="en-US" l10n="NEW">The default value is TRUE.</paragraph>
@@ -366,7 +366,7 @@
 <paragraph role="paragraph" id="par_idN10F0A" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click the item or items that you want to select. To select more than one item, ensure that the Multiselection option is selected.</ahelp></paragraph>
 </section>
 <section id="Section68">
-<bookmark xml-lang="en-US" branch="hid/38021" id="bm_id2208929" localize="false"/><paragraph role="heading" id="hd_id5026093" xml-lang="en-US" level="2" l10n="NEW">Selection type<comment>see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/38021" id="bm_id2208929" localize="false"/><paragraph role="heading" id="hd_id5026093" xml-lang="en-US" level="2" l10n="NEW">Selection type</paragraph>
 <paragraph role="paragraph" id="par_id1134067" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Specifies the selection mode that is enabled for this tree control.</ahelp></paragraph>
 </section>
 <section id="Section16"><comment>UFI: removed help id</comment><paragraph role="heading" id="hd_id3154193" xml-lang="en-US" level="2" l10n="U" oldref="87">Spin Button</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
index c2d09090e7..aa7e5b8847 100644
--- a/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
+++ b/helpcontent2/source/text/sbasic/shared/02/20000000.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -443,5 +443,5 @@
 <paragraph role="paragraph" id="par_id9961851" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds a tree control that can show a hierarchical list. You can populate the list by your program, using API calls (XtreeControl).</ahelp></paragraph>
 </tablecell>
 </tablerow>
-</table><comment>tree control see http://specs.openoffice.org/appwide/dialog_ide/New_Tree_Control_in_IDE.odt</comment></body>
+</table></body>
 </helpdocument>
diff --git a/helpcontent2/source/text/sbasic/shared/03104500.xhp b/helpcontent2/source/text/sbasic/shared/03104500.xhp
index a4b980f53c..fd9c878fd9 100755
--- a/helpcontent2/source/text/sbasic/shared/03104500.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03104500.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsbasicshared03104500xml" indexer="include" status="PUBLISH">
@@ -55,7 +55,7 @@
 <paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="6">Bool</paragraph>
 <paragraph role="heading" id="hd_id3145609" xml-lang="en-US" level="2" l10n="U" oldref="7">Parameters:</paragraph>
 <paragraph role="paragraph" id="par_id3148947" xml-lang="en-US" l10n="CHG" oldref="8">Uno type : A UnoObject</paragraph>
-<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:<comment>UFI: copied from dev guide http://api.openoffice.org/docs/DevelopersGuide/ProfUNO/ProfUNO.htm#1+4+3+OpenOffice.org+Basic</comment></paragraph>
+<paragraph role="heading" id="hd_id3156343" xml-lang="en-US" level="2" l10n="U" oldref="9">Example:</paragraph>
 <paragraph role="code" id="par_idN10632" xml-lang="en-US" l10n="NEW">Sub Main</paragraph>
 <paragraph role="code" id="par_idN10635" xml-lang="en-US" l10n="NEW">Dim bIsStruct</paragraph>
 <paragraph role="code" id="par_idN10638" xml-lang="en-US" l10n="NEW">' Instantiate a service</paragraph>
diff --git a/helpcontent2/source/text/sbasic/shared/main0601.xhp b/helpcontent2/source/text/sbasic/shared/main0601.xhp
index 31ff313cfa..4da3add1ad 100755
--- a/helpcontent2/source/text/sbasic/shared/main0601.xhp
+++ b/helpcontent2/source/text/sbasic/shared/main0601.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
  *
  ************************************************************************-->
 
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsbasicsharedmain0601xml" indexer="include" status="PUBLISH">
@@ -48,7 +48,6 @@
 <paragraph role="heading" id="hd_id3154232" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/sbasic/shared/main0601.xhp" name="$[officename] Basic Help">%PRODUCTNAME Basic Help</link></paragraph>
 <section id="basicalt">
 <paragraph role="paragraph" id="par_id3153894" xml-lang="en-US" l10n="U" oldref="4">%PRODUCTNAME %PRODUCTVERSION provides an Application Programming Interface (API) that allows controlling the $[officename] components with different programming languages by using the $[officename] Software Development Kit (SDK). For more information about the $[officename] API and the Software Development Kit, visit <link href="http://api.openoffice.org/" name="http://api.openoffice.org">http://api.openoffice.org</link></paragraph>
-<paragraph role="paragraph" id="par_id3150713" xml-lang="en-US" l10n="CHG" oldref="6">Due to changes to the API, any macros created with StarOffice 5.2 or before are no longer supported by later versions.</paragraph>
 <paragraph role="paragraph" id="par_id3147226" xml-lang="en-US" l10n="CHG" oldref="10">This help section explains the most common runtime functions of %PRODUCTNAME Basic. For more in-depth information please refer to the <link href="http://wiki.services.openoffice.org/wiki/Documentation/BASIC_Guide">OpenOffice.org BASIC Programming Guide</link> on the OpenOffice.org Wiki.</paragraph>
 </section>
 <paragraph role="heading" id="hd_id3146957" xml-lang="en-US" level="3" l10n="U" oldref="9">Working with %PRODUCTNAME Basic</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060110.xhp b/helpcontent2/source/text/scalc/01/04060110.xhp
index 94801039de..e2b1cd1f4a 100644
--- a/helpcontent2/source/text/scalc/01/04060110.xhp
+++ b/helpcontent2/source/text/scalc/01/04060110.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textscalc0104060110xml" indexer="include">
          <title xml-lang="en-US" id="tit">Text Functions</title>
@@ -46,7 +46,7 @@
       <bookmark_value>Function Wizard;text</bookmark_value>
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id3145389" role="heading" level="1" l10n="U" oldref="1">Text Functions</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="CHG" oldref="2"><variable id="texttext">This section contains descriptions of the <emph>Text</emph> functions. 
+      <paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="CHG" oldref="2"><variable id="texttext">This section contains descriptions of the <emph>Text</emph> functions.
 </variable></paragraph>
       <section id="howtoget">
          <embed href="text/scalc/00/00000404.xhp#eikatext"/>
@@ -257,7 +257,7 @@
          <paragraph xml-lang="en-US" id="hd_id3149777" role="heading" level="3" l10n="U"
                     oldref="84">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="85">
-            <item type="input">=EXACT("Sun microsystems";"Sun Microsystems")</item> returns FALSE.</paragraph>
+            <item type="input">=EXACT("microsystems";"Microsystems")</item> returns FALSE.</paragraph>
       </section>
       <section id="find">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3152589"><bookmark_value>FIND function</bookmark_value>
@@ -390,7 +390,7 @@
          <paragraph xml-lang="en-US" id="hd_id3150509" role="heading" level="3" l10n="U"
                     oldref="155">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3158407" role="paragraph" l10n="U" oldref="156">
-            <item type="input">=MID("Sun Microsystems";5;5)</item> returns Micro.</paragraph>
+            <item type="input">=MID("office";2;2)</item> returns ff.</paragraph>
       </section>
       <section id="proper">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159143"><bookmark_value>PROPER function</bookmark_value>
@@ -407,7 +407,7 @@
          <paragraph xml-lang="en-US" id="hd_id3147529" role="heading" level="3" l10n="U"
                     oldref="75">Example</paragraph>
          <paragraph xml-lang="en-US" id="par_id3155364" role="paragraph" l10n="U" oldref="76">
-            <item type="input">=PROPER("sun microsystems")</item> returns Sun Microsystems.</paragraph>
+            <item type="input">=PROPER("open office")</item> returns Open Office.</paragraph>
       </section>
       <section id="replace">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3149171"><bookmark_value>REPLACE function</bookmark_value>
diff --git a/helpcontent2/source/text/scalc/01/04060199.xhp b/helpcontent2/source/text/scalc/01/04060199.xhp
index 931f123877..3226988959 100755
--- a/helpcontent2/source/text/scalc/01/04060199.xhp
+++ b/helpcontent2/source/text/scalc/01/04060199.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -308,6 +308,6 @@
 </tablecell>
 </tablerow>
 </table>
-<paragraph role="note" id="par_id181890" xml-lang="en-US" l10n="NEW">Reference concatenation using a tilde character is a new operator, available starting with OpenOffice.org 3.0 and StarOffice 9. When a formula with the tilde operator exists in a document that is opened in previous versions of the software, an error is returned. A reference list is not allowed inside an array expression.</paragraph>
+<paragraph role="note" id="par_id181890" xml-lang="en-US" l10n="NEW">Reference concatenation using a tilde character was implemented lately. When a formula with the tilde operator exists in a document that is opened in old versions of the software, an error is returned. A reference list is not allowed inside an array expression.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12080700.xhp b/helpcontent2/source/text/scalc/01/12080700.xhp
index 301b586922..d147901766 100644
--- a/helpcontent2/source/text/scalc/01/12080700.xhp
+++ b/helpcontent2/source/text/scalc/01/12080700.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -49,7 +49,6 @@
 </section>
 <section id="howtoget">
   <embed href="text/scalc/00/00000412.xhp#dngdrill"/>
-</section><comment>see http://wiki.services.openoffice.org/wiki/Calc/Features/DataPilot_drill-down_on_data_field</comment><comment>For instance, when the data field function is selected to be SUM, then the number that is shown in the data field cell must be identical to the sum of all the data field values in the constituent rows displayed in the inserted sheet. 
-UFI: this text from spec doc looks like a remark to the developer who implements this feature rather than something for the user</comment><paragraph role="note" id="par_id7132480" xml-lang="en-US" l10n="NEW">Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for DataPilot tables that are based on cell ranges or database data.</paragraph>
+</section><paragraph role="note" id="par_id7132480" xml-lang="en-US" l10n="NEW">Hidden items are not evaluated, the rows for the hidden items are included. Show Details is available only for DataPilot tables that are based on cell ranges or database data.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/func_weeknum.xhp b/helpcontent2/source/text/scalc/01/func_weeknum.xhp
index 284f873c60..298ee81519 100644
--- a/helpcontent2/source/text/scalc/01/func_weeknum.xhp
+++ b/helpcontent2/source/text/scalc/01/func_weeknum.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,7 +48,7 @@
 <bookmark xml-lang="en-US" branch="hid/HID_FUNC_KALENDERWOCHE" id="bm_id3158403" localize="false"/><paragraph role="heading" id="hd_id3159161" xml-lang="en-US" level="2" l10n="U" oldref="54"><variable id="weeknum"><link href="text/scalc/01/func_weeknum.xhp">WEEKNUM</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3149770" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="HID_FUNC_KALENDERWOCHE">WEEKNUM calculates the week number of the year for the internal date value.</ahelp></paragraph>
-<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.<comment>UFI: see http://www.openoffice.org/issues/show_bug.cgi?id=33709</comment></paragraph>
+<paragraph role="note" id="par_idN105E4" xml-lang="en-US" l10n="NEW">The International Standard ISO 8601 has decreed that Monday shall be the first day of the week. A week that lies partly in one year and partly in another is assigned a number in the year in which most of its days lie. That means that week number 1 of any year is the week that contains the January 4th.</paragraph>
 <paragraph role="heading" id="hd_id3153055" xml-lang="en-US" level="3" l10n="U" oldref="56">Syntax</paragraph>
 <paragraph role="code" id="par_id3147236" xml-lang="en-US" l10n="U" oldref="57">WEEKNUM(Number; Mode)</paragraph>
 <paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="58">
diff --git a/helpcontent2/source/text/scalc/05/empty_cells.xhp b/helpcontent2/source/text/scalc/05/empty_cells.xhp
index 0141b2ecd5..fbabb037b7 100644
--- a/helpcontent2/source/text/scalc/05/empty_cells.xhp
+++ b/helpcontent2/source/text/scalc/05/empty_cells.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -46,8 +46,8 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3146799"><bookmark_value>empty cells;handling of</bookmark_value>
 </bookmark><comment>i86303</comment><paragraph role="heading" id="hd_id1502121" xml-lang="en-US" level="1" l10n="NEW"><variable id="empty_cells"><link href="text/scalc/05/empty_cells.xhp">Handling of Empty Cells</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id2871181" xml-lang="en-US" l10n="NEW">Starting with OpenOffice.org 3.0 and StarOffice 9, the handling of empty cells got changed.</paragraph>
-<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">Previously, empty cells were forced to numeric 0 in some contexts and to empty string in others, except in direct comparison where =A1=0 and =A1="" both resulted in TRUE if A1 was empty. Emptiness now is inherited until used, so both =VLOOKUP(...)=0 and =VLOOKUP(...)="" give TRUE if the lookup resulted in an empty cell being returned. </paragraph>
+
+<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">In older versions of the software, empty cells were forced to numeric 0 in some contexts and to empty string in others, except in direct comparison where =A1=0 and =A1="" both resulted in TRUE if A1 was empty. Emptiness now is inherited until used, so both =VLOOKUP(...)=0 and =VLOOKUP(...)="" give TRUE if the lookup resulted in an empty cell being returned. </paragraph>
 <paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">A simple reference to an empty cell is still displayed as numeric 0 but is not necessarily of type numeric anymore, so also comparisons with the referencing cell work as expected. </paragraph>
 <paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW">For the following examples, A1 contains a number, B1 is empty, C1 contains the reference to B1:</paragraph>
 <paragraph role="code" id="par_id8277230" xml-lang="en-US" l10n="NEW">A1: 1 B1: &lt;empty&gt; C1: =B1 (displays 0)</paragraph>
diff --git a/helpcontent2/source/text/schart/00/00000004.xhp b/helpcontent2/source/text/schart/00/00000004.xhp
index 9a3f58ca6a..73647f59d3 100644
--- a/helpcontent2/source/text/schart/00/00000004.xhp
+++ b/helpcontent2/source/text/schart/00/00000004.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textschart0000000004xml" indexer="exclude">
 <title id="tit" xml-lang="en-US">To access this function...</title>
@@ -41,7 +41,7 @@
 </topic>
 </meta>
 <body>
-<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function... 
+<paragraph role="heading" id="hd_id3156023" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this function...
 </variable></paragraph>
 <section id="astdgd">
 <paragraph role="paragraph" id="par_id3150791" xml-lang="en-US" l10n="CHG" oldref="9">Choose <emph>View - Chart Data Table</emph> (Charts)</paragraph>
@@ -62,7 +62,7 @@
 
 </section>
 </section>
-<paragraph role="paragraph" id="par_id3153160" xml-lang="en-US" l10n="CHG" oldref="12"><variable id="efgttl">Choose <emph>Insert - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153160" xml-lang="en-US" l10n="CHG" oldref="12"><variable id="efgttl">Choose <emph>Insert - Title </emph>(Charts)
 </variable></paragraph>
 <section id="efglgd">
 <paragraph role="paragraph" id="par_id3149121" xml-lang="en-US" l10n="CHG" oldref="13">Choose <emph>Insert - Legend </emph>(Charts)</paragraph>
@@ -72,7 +72,7 @@
 <paragraph role="paragraph" id="par_id3156385" xml-lang="en-US" l10n="CHG" oldref="16">Choose <emph>Insert - Data Labels </emph>(Charts)</paragraph>
 <paragraph role="paragraph" id="par_id3147341" xml-lang="en-US" l10n="CHG" oldref="68">Choose <emph>Format - Format Selection - Data Point/Data Series - Data Labels</emph> tab (for data series and data point) (Charts)</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="CHG" oldref="69"><variable id="efgaug">Choose <emph>Insert - Axes </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3149565" xml-lang="en-US" l10n="CHG" oldref="69"><variable id="efgaug">Choose <emph>Insert - Axes </emph>(Charts)
 </variable></paragraph>
 <section id="efgaugg">
 <paragraph role="paragraph" id="par_id3150297" xml-lang="en-US" l10n="CHG" oldref="17">Choose <emph>Insert - Grids </emph>(Charts)</paragraph>
@@ -101,51 +101,51 @@
 </table>
 
 </section>
-<paragraph role="paragraph" id="par_id3148869" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="efgsta">Choose <emph>Insert - Y Error Bars </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3148869" xml-lang="en-US" l10n="CHG" oldref="21"><variable id="efgsta">Choose <emph>Insert - Y Error Bars </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1061738" xml-lang="en-US" l10n="NEW"><variable id="trendlines">Choose Insert - Trend Lines (Charts) 
+<paragraph role="paragraph" id="par_id1061738" xml-lang="en-US" l10n="NEW"><variable id="trendlines">Choose Insert - Trend Lines (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154532" xml-lang="en-US" l10n="CHG" oldref="67"><variable id="sonderz">Choose <emph>Insert - Special Character </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3154532" xml-lang="en-US" l10n="CHG" oldref="67"><variable id="sonderz">Choose <emph>Insert - Special Character </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153246" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="frtoes">Choose <emph>Format - Format Selection </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153246" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="frtoes">Choose <emph>Format - Format Selection </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="CHG" oldref="23"><variable id="frtodd">Choose <emph>Format - Format Selection - Data Point</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3150214" xml-lang="en-US" l10n="CHG" oldref="23"><variable id="frtodd">Choose <emph>Format - Format Selection - Data Point</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154765" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="frtodr">Choose <emph>Format - Format Selection - Data Series</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3154765" xml-lang="en-US" l10n="CHG" oldref="24"><variable id="frtodr">Choose <emph>Format - Format Selection - Data Series</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="optionen">Choose <emph>Format - Format Selection - Data Series - Options</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id3153009" xml-lang="en-US" l10n="CHG" oldref="66"><variable id="optionen">Choose <emph>Format - Format Selection - Data Series - Options</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3154707" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="frtttl">Choose <emph>Format - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3154707" xml-lang="en-US" l10n="CHG" oldref="25"><variable id="frtttl">Choose <emph>Format - Title </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3155758" xml-lang="en-US" l10n="CHG" oldref="26"><variable id="frtoe">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3155758" xml-lang="en-US" l10n="CHG" oldref="26"><variable id="frtoe">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="CHG" oldref="27"><variable id="frtegt">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3153075" xml-lang="en-US" l10n="CHG" oldref="27"><variable id="frtegt">Choose <emph>Format - Format Selection - Title</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="frttya">Choose <emph>Format - Title </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3149048" xml-lang="en-US" l10n="CHG" oldref="28"><variable id="frttya">Choose <emph>Format - Title </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147402" xml-lang="en-US" l10n="CHG" oldref="70"><variable id="frttyab">Choose <emph>Format - Axis </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3147402" xml-lang="en-US" l10n="CHG" oldref="70"><variable id="frttyab">Choose <emph>Format - Axis </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="CHG" oldref="29"><variable id="frtlgd">Choose <emph>Format - Legend, or Format - Format Selection</emph> - <emph>Legend </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3147297" xml-lang="en-US" l10n="CHG" oldref="29"><variable id="frtlgd">Choose <emph>Format - Legend, or Format - Format Selection</emph> - <emph>Legend </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="frtaa">Choose <emph>Format - Axis - X Axis/Secondary X Axis/Z Axis/All Axes </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3157876" xml-lang="en-US" l10n="CHG" oldref="31"><variable id="frtaa">Choose <emph>Format - Axis - X Axis/Secondary X Axis/Z Axis/All Axes </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="frtyas">Choose <emph>Format - Axis - Y Axis/Secondary Y Axis </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3146883" xml-lang="en-US" l10n="CHG" oldref="32"><variable id="frtyas">Choose <emph>Format - Axis - Y Axis/Secondary Y Axis </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="frtysk">Choose <emph>Format - Axis - Y Axis - Scale</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id3149349" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="frtysk">Choose <emph>Format - Axis - Y Axis - Scale</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id1006200812385491" xml-lang="en-US" l10n="NEW"><variable id="positioning">Choose <emph>Format - Axis - X Axis - Positioning</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id1006200812385491" xml-lang="en-US" l10n="NEW"><variable id="positioning">Choose <emph>Format - Axis - X Axis - Positioning</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id31493459" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="positioningy">Choose <emph>Format - Axis - Y Axis - Positioning</emph> tab (Charts) 
+<paragraph role="paragraph" id="par_id31493459" xml-lang="en-US" l10n="CHG" oldref="33"><variable id="positioningy">Choose <emph>Format - Axis - Y Axis - Positioning</emph> tab (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="frtgt">Choose <emph>Format - Grid </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150477" xml-lang="en-US" l10n="CHG" oldref="34"><variable id="frtgt">Choose <emph>Format - Grid </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150746" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="frtgtr">Choose <emph>Format - Grid - X, Y, Z Axis Major Grid/ X, Y, Z Minor Grid/ All Axis Grids </emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150746" xml-lang="en-US" l10n="CHG" oldref="35"><variable id="frtgtr">Choose <emph>Format - Grid - X, Y, Z Axis Major Grid/ X, Y, Z Minor Grid/ All Axis Grids </emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="frtdgw">Choose <emph>Format - Chart Wall - Chart</emph> dialog (Charts) 
+<paragraph role="paragraph" id="par_id3145828" xml-lang="en-US" l10n="CHG" oldref="36"><variable id="frtdgw">Choose <emph>Format - Chart Wall - Chart</emph> dialog (Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3153039" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="frtdgb">Choose <emph>Format - Chart Floor</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3153039" xml-lang="en-US" l10n="CHG" oldref="37"><variable id="frtdgb">Choose <emph>Format - Chart Floor</emph>(Charts)
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3150141" xml-lang="en-US" l10n="CHG" oldref="38"><variable id="frtdgf">Choose <emph>Format - Chart Area</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3150141" xml-lang="en-US" l10n="CHG" oldref="38"><variable id="frtdgf">Choose <emph>Format - Chart Area</emph>(Charts)
 </variable></paragraph>
 <section id="frtdgty">
 <paragraph role="paragraph" id="par_id3155830" xml-lang="en-US" l10n="CHG" oldref="39">Choose <emph>Format - Chart Type </emph>(Charts)</paragraph>
@@ -166,7 +166,7 @@
 
 </section>
 </section><comment>removed frtaft autoformat section</comment>
-<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="frtdda">Choose <emph>Format - 3D View</emph>(Charts) 
+<paragraph role="paragraph" id="par_id3155621" xml-lang="en-US" l10n="CHG" oldref="45"><variable id="frtdda">Choose <emph>Format - 3D View</emph>(Charts)
 </variable></paragraph>
 <section id="anordnung">
 <paragraph role="paragraph" id="par_id3150661" xml-lang="en-US" l10n="CHG" oldref="61">Choose <emph>Format - Arrangement </emph>(Charts)</paragraph>
@@ -248,15 +248,15 @@
 
 </section>
 <section id="wiz">
-<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object - 
-</caseinline></switchinline> Chart <comment>UFI: may be unified for Writer in 2.3, see http://specs.openoffice.org/appwide/toolbars/Toolbar_content_spec.odt</comment></paragraph>
+<paragraph role="paragraph" id="par_id9631641" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object -
+</caseinline></switchinline> Chart </paragraph>
 </section>
 <section id="wiz_ranges">
-<paragraph role="paragraph" id="par_id2985320" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object - 
+<paragraph role="paragraph" id="par_id2985320" xml-lang="en-US" l10n="NEW">Choose Insert - <switchinline select="appl"><caseinline select="WRITER"> Object -
 </caseinline></switchinline> Chart </paragraph>
 <paragraph role="paragraph" id="par_id1096530" xml-lang="en-US" l10n="NEW">Double-click a chart, then choose Format - Data Ranges</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In a chart of Line type or XY type which displays lines, mark Smooth lines and click the Properties button 
+<paragraph role="paragraph" id="par_id733359" xml-lang="en-US" l10n="NEW"><variable id="slp">In a chart of Line type or XY type which displays lines, mark Smooth lines and click the Properties button
 </variable></paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/schart/01/04050100.xhp b/helpcontent2/source/text/schart/01/04050100.xhp
index 37a65ed1d8..6bcbd08393 100644
--- a/helpcontent2/source/text/schart/01/04050100.xhp
+++ b/helpcontent2/source/text/schart/01/04050100.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textschart0104050100xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Trend Lines </title>
@@ -93,7 +93,7 @@
 <paragraph xml-lang="en-US" id="par_id846888" role="paragraph" l10n="NEW"><ahelp hid=".">To show the trend line equation, select the trend line in the chart, right-click to open the context menu, and choose <emph>Insert Trend Line Equation</emph>.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id8962065" role="paragraph" l10n="CHG">When the chart is in edit mode, %PRODUCTNAME gives you the equation of the trend line and the coefficient of determination R². Click on the trend line to see the information in the status bar.</paragraph>
       <paragraph xml-lang="en-US" id="par_id1328470" role="note" l10n="NEW">For a category chart (for example a line chart), the regression information is calculated using numbers 1, 2, 3, … as x-values. This is also true if your data series uses other numbers as names for the x-values. For such charts the XY chart type might be more suitable.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the regression curve and choose <item type="menuitem">Format - Format Selection - Equation</item>. <comment>see http://specs.openoffice.org/chart/DisplayTrendLineEquations.odt</comment></paragraph><comment>hid</comment>
+      <paragraph xml-lang="en-US" id="par_id8092593" role="paragraph" l10n="CHG">To show the equation and the coefficient of determination, select the regression curve and choose <item type="menuitem">Format - Format Selection - Equation</item>.</paragraph>
 <paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment>
 <paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the regression curve.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id7735221" role="paragraph" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph>
diff --git a/helpcontent2/source/text/schart/01/05040201.xhp b/helpcontent2/source/text/schart/01/05040201.xhp
index 801d22d5cc..f3c38b0e0e 100644
--- a/helpcontent2/source/text/schart/01/05040201.xhp
+++ b/helpcontent2/source/text/schart/01/05040201.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textschart0105040201xml" indexer="include">
 <title id="tit" xml-lang="en-US">Scale</title>
@@ -104,6 +104,6 @@
 <bookmark xml-lang="en-US" branch="hid/chart2_CheckBox_TP_SCALE_CBX_REVERSE" id="bm_id4007080" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/chart2:CheckBox:TP_SCALE:CBX_REVERSE" id="bm_id1024200803164240" localize="false"/>
 <paragraph role="heading" id="hd_id9941404" xml-lang="en-US" level="3" l10n="NEW">Reverse direction</paragraph>
-<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.<comment>http://specs.openoffice.org/chart/Chart_Scales_and_Intervals.odt</comment></paragraph>
+<paragraph role="paragraph" id="par_id5581835" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</ahelp> That means for Cartesian coordinate systems that the x-axis shows the lower values on the left and the y-axis shows the lower values at the bottom. For polar coordinate systems the mathematical angle axis direction is counterclockwise and the radial axis is from inner to outer.</paragraph>
 </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index 77d406e68e..fb3cc9034c 100755
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.xhp
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <helpdocument version="1.0">
-	
+
 <!--
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">XML File Formats</title>
@@ -60,7 +60,7 @@
 <paragraph role="paragraph" id="par_id3148919" xml-lang="en-US" l10n="CHG" oldref="3"><ahelp hid="HID_DID_SAVE_PACKED_XML">By default, $[officename] loads and saves files in the OpenDocument file format.</ahelp></paragraph>
 <paragraph role="note" id="par_idN10725" xml-lang="en-US" l10n="NEW">The OpenDocument file format (ODF) is a standardized file format used by many software applications. You can find more information at the Wikipedia site: <link href="http://en.wikipedia.org/wiki/OpenDocument">wikipedia.org/wiki/OpenDocument</link>.</paragraph>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="2" l10n="CHG" oldref="4">OpenDocument file format names</paragraph>
-<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph><comment>replaced OpenDocument by ODF in filter names, see http://specs.openoffice.org/appwide/fileIO/FileFormatNames.sxw</comment>
+<paragraph role="paragraph" id="par_id3154926" xml-lang="en-US" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph>
 <table id="tbl_id3109850">
 <tablerow>
 <tablecell>
@@ -197,7 +197,7 @@
 <paragraph role="tablehead" id="par_id0519200811530375" xml-lang="en-US" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of OpenOffice.org / StarOffice</paragraph>
+<paragraph role="tablehead" id="par_id0519200811530491" xml-lang="en-US" l10n="NEW">First supporting version of the software</paragraph>
 </tablecell>
 </tablerow>
 <tablerow>
@@ -230,12 +230,12 @@
 <paragraph role="tablecontent" id="par_id0519200811530440" xml-lang="en-US" l10n="NEW">to be announced</paragraph>
 </tablecell>
 <tablecell>
-<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
+<paragraph role="tablecontent" id="par_id0519200811530471" xml-lang="en-US" l10n="NEW">OpenOffice.org 3, StarOffice 9, Oracle Open Office</paragraph>
 </tablecell>
 </tablerow>
 </table>
 
-<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
+<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem">Tools - Options - Load/Save - General</item> and select the ODF format version.</paragraph>
 <paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="CHG">If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox.</paragraph>
 <paragraph role="tip" id="par_id3146907" xml-lang="en-US" l10n="CHG" oldref="1">If you want to define another file format as the default, choose <link href="text/shared/optionen/01010200.xhp" name="Tools - Options - Load/Save - General"><emph>Tools - Options - Load/Save - General</emph></link> to find alternative file formats for each $[officename] document type.</paragraph>
 <paragraph role="heading" id="hd_id3150398" xml-lang="en-US" level="2" l10n="U" oldref="28">XML file structure</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000207.xhp b/helpcontent2/source/text/shared/00/00000207.xhp
index dd2c198338..f7ae119b51 100755
--- a/helpcontent2/source/text/shared/00/00000207.xhp
+++ b/helpcontent2/source/text/shared/00/00000207.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -54,7 +54,8 @@
 <bookmark xml-lang="en-US" branch="hid/SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP" id="bm_id3146938" localize="false"/><paragraph role="heading" id="hd_id3154682" xml-lang="en-US" level="3" l10n="U" oldref="4">Text delimiter</paragraph>
 <paragraph role="paragraph" id="par_id3154863" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC:COMBOBOX:RID_SCDLG_IMPORTOPT:ED_TEXTSEP">Choose or enter the text delimiter, which encloses every data field.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCDLG_IMPORTOPT_CB_SAVESHOWN" id="bm_id7735831" localize="false"/><paragraph role="heading" id="hd_id7145298" xml-lang="en-US" level="3" l10n="NEW">Save cell content as shown</paragraph>
-<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of %PRODUCTNAME.</ahelp></paragraph><comment>i76507, see http://specs.openoffice.org/calc/filters/csv/save-to-csv.odt</comment><paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
+<paragraph role="paragraph" id="par_id5719779" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enabled by default, data will be saved as displayed, including applied number formats. If this checkbox is not marked, raw data content will be saved, as in older versions of the software.</ahelp></paragraph>
+<paragraph role="warning" id="par_id3541062" xml-lang="en-US" l10n="NEW">Depending on the number format, saving cell content as shown may write values that during an import cannot be interpreted as numerical values anymore.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH" id="bm_id3143281" localize="false"/><paragraph role="heading" id="hd_id3149793" xml-lang="en-US" level="3" l10n="U" oldref="12">Fixed column width</paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="SC_CHECKBOX_RID_SCDLG_IMPORTOPT_CB_FIXEDWIDTH">Exports all data fields with a fixed width.</ahelp></paragraph>
 <list type="unordered">
diff --git a/helpcontent2/source/text/shared/01/02220100.xhp b/helpcontent2/source/text/shared/01/02220100.xhp
index 234d297759..897bb50840 100755
--- a/helpcontent2/source/text/shared/01/02220100.xhp
+++ b/helpcontent2/source/text/shared/01/02220100.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Description</title>
@@ -64,7 +64,7 @@
       <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="12"><ahelp hid="SVX:EDIT:RID_SVXDLG_IMAPURL:EDT_NAME">Enter a name for the image.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/1244989956" id="bm_id3190710" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id7557298" role="heading" level="2" l10n="NEW">Description</paragraph>
-      <paragraph xml-lang="en-US" id="par_id5057222" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp><comment>see http://specs.openoffice.org/appwide/drawing_layer/imagemapdialog.odt</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id5057222" role="paragraph" l10n="NEW"><ahelp hid=".">Enter a description for the hotspot.</ahelp></paragraph>
       <section id="relatedtopics">
          <paragraph xml-lang="en-US" id="par_id3147559" role="paragraph" l10n="C"><link href="text/shared/01/01100500.xhp" name="Priority Table">Priority Table</link></paragraph>
       </section>
diff --git a/helpcontent2/source/text/shared/01/04050000.xhp b/helpcontent2/source/text/shared/01/04050000.xhp
index 50fdbe184f..6cfd681162 100644
--- a/helpcontent2/source/text/shared/01/04050000.xhp
+++ b/helpcontent2/source/text/shared/01/04050000.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0104050000xml" indexer="include">
          <title xml-lang="en-US" id="tit">Comment</title>
@@ -60,7 +60,7 @@
          <embed href="text/shared/00/00000404.xhp#notiz"/>
       </section>
       <paragraph xml-lang="en-US" id="hd_id9851680" role="heading" level="2" l10n="NEW">Inserting comments</paragraph>
-      <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option 
+      <paragraph xml-lang="en-US" id="par_id1830500" role="paragraph" l10n="NEW">In Writer, the command <item type="menuitem">Insert - Comment</item> or the <switchinline select="sys"><caseinline select="MAC">Command+Option
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+N key combination inserts a comment anchor at the current cursor position. A comment box is shown at the page margin, where you can enter the text of your comment. A line connects anchor and comment box.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0915200910571516" role="paragraph" l10n="NEW">In Calc, Draw, and Impress, the command <item type="menuitem">Insert - Comment</item> inserts a comment.</paragraph>
       <paragraph xml-lang="en-US" id="par_id1831" role="paragraph" l10n="NEW">The author name and the date and time of creating this comment is shown at the bottom of the comment box.</paragraph>
@@ -84,8 +84,8 @@
 <paragraph xml-lang="en-US" id="par_id0804200803435883" role="paragraph" l10n="NEW"><ahelp hid=".">Use <item type="menuitem">View - Comments</item> to show or hide all comments (not available in Calc).</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="par_id0302200901430918" role="paragraph" l10n="NEW">In the Find &amp; Replace dialog of text documents, you can select to include the comments texts in your searches.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3445539" role="heading" level="2" l10n="NEW">Navigating from comment to comment in text documents</paragraph>
-      <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option 
-</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option 
+      <paragraph xml-lang="en-US" id="par_id4271370" role="paragraph" l10n="NEW">When the cursor is inside a comment, you can press <switchinline select="sys"><caseinline select="MAC">Command+Option
+</caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Down to jump to the next comment, or press <switchinline select="sys"><caseinline select="MAC">Command+Option
 </caseinline><defaultinline>Ctrl+Alt</defaultinline></switchinline>+Page Up to jump to the previous comment.</paragraph>
       <paragraph xml-lang="en-US" id="par_id2116153" role="paragraph" l10n="NEW">When the cursor is inside the normal text, press the above mentioned keys to jump to the next or previous comment anchor. You can also use the small Navigation window below the vertical scrollbar to jump from one comment anchor to the next comment anchor.</paragraph>
       <paragraph xml-lang="en-US" id="par_id5381328" role="tip" l10n="NEW">You can also open the Navigator to see a list of all comments. Right-click a comment name in the Navigator to edit or delete the comment.</paragraph>
@@ -95,7 +95,7 @@
       <paragraph xml-lang="en-US" id="par_id3166460" role="paragraph" l10n="CHG" oldref="6">When you attach a comment to a cell, a callout appears where you can enter your text. A small square in the upper right corner of a cell marks the position of a comment. To display the comment permanently, right-click the cell, and choose <emph>Show Comment</emph>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id8336741" role="paragraph" l10n="NEW">To change the object properties of a comment, for example the background color, choose <emph>Show Comment</emph> as above, then right-click the comment (do not double-click the text).</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155390" role="paragraph" l10n="CHG" oldref="7">To edit a shown comment, double-click the comment text. To edit a comment that is not shown permanently, click in the cell that contains the comment, and then choose <emph>Insert - Comment</emph>. To specify the formatting of the comment text, right-click the comment text in edit mode.</paragraph>
-      <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment. <comment>UFI: see specs.openoffice.org/calc/compatibility/AnnotationPosition.sxw</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107A1" role="paragraph" l10n="NEW">To change the position or size of a comment, drag a border or corner of the comment.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9499496" role="paragraph" l10n="NEW">To delete a comment, right-click the cell, then choose <emph>Delete Comment</emph>.</paragraph>
       <paragraph xml-lang="en-US" id="par_id2036805" role="paragraph" l10n="NEW">You can also right-click a comment name in the Navigator window to choose some editing commands.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153716" role="paragraph" l10n="U" oldref="8">To set the printing options for comments in your spreadsheet, choose <emph>Format - Page</emph>, and then click the <emph>Sheet</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06050600.xhp b/helpcontent2/source/text/shared/01/06050600.xhp
index 76afba376d..a7c776ce51 100644
--- a/helpcontent2/source/text/shared/01/06050600.xhp
+++ b/helpcontent2/source/text/shared/01/06050600.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106050600xml" indexer="include">
 <title id="tit" xml-lang="en-US">Position</title>
@@ -48,7 +48,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00040500.xhp#numposition"/>
 </section>
-<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".<comment>see http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt</comment></paragraph>
+<paragraph role="note" id="par_id5004119" xml-lang="en-US" l10n="NEW">The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0, or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls "Numbering followed by", "Numbering alignment", "Aligned at", and "Indent at". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls "Indent", "Width of numbering", "Minimum space numbering &lt;-&gt; text", and "Numbering alignment".</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL" id="bm_id3149119" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SW:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL" id="bm_id3153323" localize="false"/>
 <paragraph role="heading" id="hd_id3149031" xml-lang="en-US" level="2" l10n="U" oldref="3">Level</paragraph>
@@ -86,7 +86,7 @@
 <paragraph role="paragraph" id="par_id3150129" xml-lang="en-US" l10n="CHG" oldref="29"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_INDENT">Enter the amount of space to leave between the left edge of the numbering symbol and the left edge of the text.</ahelp><comment>UFI: fixed #i31282#</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST" id="bm_id3149237" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST" id="bm_id3149235" localize="false"/>
-<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text 
+<paragraph role="heading" id="hd_id3156194" xml-lang="en-US" level="2" l10n="U" oldref="8"><switchinline select="appl"><caseinline select="WRITER">Minimum space numbering &lt;-&gt; text
 </caseinline></switchinline></paragraph>
 <paragraph role="paragraph" id="par_id3147574" xml-lang="en-US" l10n="CHG" oldref="18"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SW:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST">Enter the minimum amount of space to leave between the right edge of the numbering symbol and the left edge of the text.</ahelp>
 </caseinline></switchinline></paragraph>
diff --git a/helpcontent2/source/text/shared/01/online_update.xhp b/helpcontent2/source/text/shared/01/online_update.xhp
index 16f167c6dd..72a5f6407f 100644
--- a/helpcontent2/source/text/shared/01/online_update.xhp
+++ b/helpcontent2/source/text/shared/01/online_update.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Check for Updates </title>
@@ -57,7 +57,7 @@
       <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in Tools - Options - %PRODUCTNAME - <link href="text/shared/optionen/online_update.xhp">Online Update</link>.</paragraph>
       <list type="unordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon 
+            <paragraph xml-lang="en-US" id="par_id3422345" role="paragraph" l10n="NEW">If an update is available, an icon
 <image id="img_id3155415" src="extensions/source/update/ui/onlineupdate_16.png" width="0.4583in" height="0.1354in"><alt xml-lang="en-US" id="alt_id3155415">Icon</alt>
 	</image> on the menu bar will notify you of the update. Click the icon to open a dialog with more information.</paragraph>
          </listitem>
@@ -85,7 +85,7 @@
          </listitem>
       </list>
       <paragraph xml-lang="en-US" id="par_id9766533" role="paragraph" l10n="NEW">If %PRODUCTNAME is configured to download the files automatically, the download starts immediately. A download continues even when you minimize the dialog.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id927152" role="paragraph" l10n="NEW">For StarOffice, automatic downloads are currently disabled. Start the download manually.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id927152" role="paragraph" l10n="NEW">If automatic downloads are disabled, start the download manually.</paragraph>
       <paragraph xml-lang="en-US" id="par_id6081728" role="paragraph" l10n="NEW">If no update was found, you can close the dialog.</paragraph>
       <paragraph xml-lang="en-US" id="par_id9219641" role="warning" l10n="NEW">You need Administrator rights to update %PRODUCTNAME.</paragraph>
    </body>
diff --git a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
index 5d47d0c2a8..37b34038aa 100644
--- a/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
+++ b/helpcontent2/source/text/shared/01/ref_pdf_export.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared01ref_pdf_exportxml" indexer="include">
          <title xml-lang="en-US" id="tit">Export as PDF</title>
@@ -53,7 +53,7 @@
                     oldref="52"><variable id="export_as_pdf"><variable id="ref_pdf_export"><link href="text/shared/01/ref_pdf_export.xhp" name="Export as PDF">Export as PDF</link>
 </variable>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed. 
+         <paragraph xml-lang="en-US" id="par_id3154044" role="paragraph" l10n="CHG" oldref="1"><variable id="export"><ahelp hid="FILTER_EDIT_RID_PDF_EXPORT_DLG_ED_PAGES">Saves the current file to Portable Document Format (PDF) version 1.4.</ahelp> A PDF file can be viewed and printed on any platform with the original formatting intact, provided that supporting software is installed.
 </variable></paragraph>
       </section>
       <section id="howtoget">
@@ -131,7 +131,7 @@
       <paragraph xml-lang="en-US" id="par_id8551896" role="paragraph" l10n="NEW"><ahelp hid=".">If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/filter_CheckBox_RID_PDF_TAB_GENER_CB_ADDSTREAM" id="bm_id0804200803552411" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id080420080355360" role="heading" level="2" l10n="NEW">Create hybrid file</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">Sun PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_id0804200803553767" role="paragraph" l10n="NEW"><ahelp hid=".">When the <link href="http://extensions.services.openoffice.org/project/pdfimport">PDF Import Extension</link> is installed, this setting enables you to export the document as a .pdf file containing two file formats: PDF and ODF.</ahelp></paragraph>
       <paragraph xml-lang="en-US" id="hd_id9796441" role="heading" level="2" l10n="NEW">Initial View</paragraph>
       <paragraph xml-lang="en-US" id="hd_id1218604" role="heading" level="2" l10n="NEW">Panes</paragraph>
 <bookmark xml-lang="en-US" branch="hid/filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY" id="bm_id4472792" localize="false"/>
diff --git a/helpcontent2/source/text/shared/02/01170003.xhp b/helpcontent2/source/text/shared/02/01170003.xhp
index 7d98745f6b..18e2709cef 100755
--- a/helpcontent2/source/text/shared/02/01170003.xhp
+++ b/helpcontent2/source/text/shared/02/01170003.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -41,11 +41,11 @@
 </history>
 </meta>
 <body>
-  
-  
+
+
   <bookmark xml-lang="en-US" branch="index" id="bm_id3150445"><bookmark_value>date fields; properties</bookmark_value></bookmark><paragraph role="heading" level="1" id="hd_id3150445" l10n="U" xml-lang="en-US" oldref="77">Special Tips for Date Fields</paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3154230" l10n="U" oldref="75">When you enter a year using two digits, the corresponding four digit value is determined by a setting in <emph>Tools - Options - $[officename] - General</emph>. For example, if 1935 is set as the lower limiting value and you enter 34 as a date value, then the result is 2034 instead of 1934.</paragraph>
-  <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document. If you want to open a document in an older version of StarOffice, in which the limit of 1930 could not be changed, then you must also select the limit value 1930 in your current version of $[officename].</paragraph>
+  <paragraph role="paragraph" id="par_id3149205" l10n="U" xml-lang="en-US" oldref="76">The pre-set limit value will be saved for each document.</paragraph>
   <embed href="text/shared/optionen/01010600.xhp#jahreszahlen"/>
  </body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/02/01170101.xhp b/helpcontent2/source/text/shared/02/01170101.xhp
index e1a7b514a9..1c13ab7690 100644
--- a/helpcontent2/source/text/shared/02/01170101.xhp
+++ b/helpcontent2/source/text/shared/02/01170101.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">General</title>
@@ -244,7 +244,7 @@
       </section>
       <section id="Section55">
 <bookmark xml-lang="en-US" branch="hid/HID_PROP_REPEAT_DELAY" id="bm_id1620227" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id9827875" role="heading" level="2" l10n="NEW">Delay<comment>UFI: see http://dba.openoffice.org/specifications/forms/scrollbar_form_control.sxw</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9827875" role="heading" level="2" l10n="NEW">Delay</paragraph>
          <paragraph xml-lang="en-US" id="par_id6092715" role="paragraph" l10n="CHG"><ahelp hid="HID_PROP_REPEAT_DELAY">Specifies the delay in milliseconds between repeating events.</ahelp> A repeating event occurs when you click an arrow button or the background of a scrollbar, or one of the record navigation buttons of a Navigation Bar, and you keep the mouse button pressed for some time. You can enter a value followed by a valid time unit, for example, 2 s or 500 ms.</paragraph>
       </section>
       <section id="Section54">
@@ -258,7 +258,7 @@
 <paragraph xml-lang="en-US" id="hd_id3151019" role="heading" level="2" l10n="U"
                     oldref="82">Date format</paragraph>
          <paragraph xml-lang="en-US" id="par_id3152971" role="paragraph" l10n="U" oldref="83"><ahelp hid="HID_PROP_DATEFORMAT" visibility="hidden">Here, you can determine the format you want for the date readout.</ahelp>With date fields you can determine the format for the date readout.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3151356" role="note" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input. 
+         <paragraph xml-lang="en-US" id="par_id3151356" role="note" l10n="U" oldref="84"><variable id="hinweis">All format fields (date, time, currency, numeric) are formatted automatically in the selected format as soon as you leave them regardless of how you entered the input.
 </variable></paragraph>
       </section>
       <section id="Section52">
@@ -772,7 +772,7 @@
          <bookmark_value>names; multi-line titles</bookmark_value>
          <bookmark_value>controls; multi-line titles</bookmark_value>
 </bookmark>
-<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command 
+<paragraph xml-lang="en-US" id="par_id3163820" role="paragraph" l10n="U" oldref="223">To create a multi-line title, open the combo box using the arrow button. You can enter a line break by pressing Shift+<switchinline select="sys"><caseinline select="MAC">Command
 </caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3159407" role="note" l10n="U" oldref="55">The <emph>Title</emph> property is only used for labeling a form element in the interface visible to the user. If you work with macros, note that at runtime, a control is always addressed through the <emph>Name</emph> property.</paragraph>
       </section>
diff --git a/helpcontent2/source/text/shared/02/01170103.xhp b/helpcontent2/source/text/shared/02/01170103.xhp
index 5c596f944e..b9cadfa255 100755
--- a/helpcontent2/source/text/shared/02/01170103.xhp
+++ b/helpcontent2/source/text/shared/02/01170103.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Events</title>
@@ -106,7 +106,7 @@
 <paragraph xml-lang="en-US" id="hd_id3159197" role="heading" level="2" l10n="U"
                  oldref="22">Mouse button pressed</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145271" role="paragraph" l10n="U" oldref="23"><ahelp hid="HID_EVT_MOUSEPRESSED">The<emph> Mouse button pressed </emph>event occurs if the mouse button is pressed while the mouse pointer is on the control.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN108BD" role="note" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control. If you are using this event by a program macro, you find more information in the "StarOffice 8 Programming Guide for BASIC".<comment>UFI: see #i40558#</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN108BD" role="note" l10n="NEW">Note that this event is also used for notifying requests for a popup context menu on the control.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_EVT_MOUSERELEASED" id="bm_id3144766" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3148880" role="heading" level="2" l10n="U"
                  oldref="24">Mouse button released</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index 86a5d47629..eae3149d6e 100755
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0500000001xml" indexer="include">
          <title xml-lang="en-US" id="tit">Getting Support</title>
@@ -49,16 +49,16 @@
 </bookmark>
 <paragraph xml-lang="en-US" id="hd_id3146873" role="heading" level="1" l10n="U" oldref="1"><variable id="00000001"><link href="text/shared/05/00000001.xhp" name="Getting Support">Getting Support</link>
 </variable></paragraph>
-         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial StarOffice or StarSuite software by Sun Microsystems, Inc. </paragraph>
+         <paragraph xml-lang="en-US" id="par_id9173253" role="paragraph" l10n="NEW">Many questions and answers are the same for OpenOffice.org software and for the commercial office software.</paragraph>
          <paragraph xml-lang="en-US" id="par_id3150667" role="paragraph" l10n="CHG" oldref="8">You can find support on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3149140" role="paragraph" l10n="CHG" oldref="4">Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</paragraph>
-         <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph><comment>some new paras from i61933</comment>
+         <paragraph xml-lang="en-US" id="par_id3149140" role="paragraph" l10n="CHG" oldref="4"><comment>Visit <link href="http://www.sun.com/star/support">www.sun.com/star/support</link> to get an overview of additional support offerings by Sun Microsystems and other parties.</comment></paragraph>
+         <paragraph xml-lang="en-US" id="par_id3154230" role="paragraph" l10n="U" oldref="3">For a summary of the current support services refer to the <emph>Readme</emph> file in the <item type="productname">%PRODUCTNAME</item> folder.</paragraph>
 <paragraph xml-lang="en-US" id="hd_id26327" role="heading" level="2" l10n="NEW">Local language support pages</paragraph>
          <paragraph xml-lang="en-US" id="par_id1318380" role="paragraph" l10n="CHG">The OpenOffice.org localization projects offer support pages in local languages. Find an overview of the native language projects at <link href="http://projects.openoffice.org/native-lang.html">projects.openoffice.org/native-lang.html</link>. You can find help and support in English language on the OpenOffice.org website at <link href="http://support.openoffice.org">support.openoffice.org</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id2611386" role="heading" level="2" l10n="NEW">Mailing lists</paragraph>
          <paragraph xml-lang="en-US" id="par_id3166335" role="paragraph" l10n="NEW">Ask about OpenOffice.org, find help by volunteers, and discuss topics on the public mailing lists. You can find many general and specialized mailing lists on the OpenOffice.org website at <link href="http://www.openoffice.org/mail_list.html">www.openoffice.org/mail_list.html</link>.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id0915200811081722" role="heading" level="2" l10n="NEW">Forum</paragraph>
-         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org. A web forum hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/">http://user.services.openoffice.org/en/forum/</link>.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.<comment> A web forum hosted by Sun Microsystems can be found at <link href="http://user.services.openoffice.org/en/forum/">http://user.services.openoffice.org/en/forum/</link>.</comment></paragraph>
          <paragraph xml-lang="en-US" id="hd_id0804200803314150" role="heading" level="2" l10n="NEW">Security</paragraph>
          <paragraph xml-lang="en-US" id="par_id0804200803314235" role="paragraph" l10n="NEW">In case you are concerned about any security issue with using this software, you can contact the developers on the public mail list dev@openoffice.org. If you want to discuss any issue with other users, send an email to the public mail list discuss@openoffice.org.</paragraph>
          <paragraph xml-lang="en-US" id="hd_id3168534" role="heading" level="2" l10n="NEW">Downloads</paragraph>
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 6c22308e07..d63fd9706e 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">The %PRODUCTNAME Help Window</title>
@@ -45,7 +45,7 @@
 <bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link>
 </variable></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for OpenOffice.org and StarOffice/StarSuite software from Sun Microsystems, Inc. is based on the same source files. Some of the functions described here may not be included in this particular <item type="productname">%PRODUCTNAME</item> distribution.<comment>removed "OpenSource" switch</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described here may not be included in this particular <item type="productname">%PRODUCTNAME</item> distribution.</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph>
diff --git a/helpcontent2/source/text/shared/autopi/01130000.xhp b/helpcontent2/source/text/shared/autopi/01130000.xhp
index 12227de0d4..20bcef6353 100755
--- a/helpcontent2/source/text/shared/autopi/01130000.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130000.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01130000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Document Converter</title>
@@ -50,7 +50,7 @@
 <section id="howtoget">
 <embed href="text/shared/00/00000401.xhp#autopilotmsimport"/>
 </section>
-<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from the binary format from previous $[officename] versions (StarOffice 5.2 and before), as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
+<paragraph role="paragraph" id="par_id3150775" xml-lang="en-US" l10n="U" oldref="3">The wizard converts documents and templates from older versions, as well as documents from Microsoft Word, Excel and PowerPoint. The source files are only read, not edited. New target files are written with the new file name extension in the same or a new folder.</paragraph>
 <paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="4">The Document Converter Wizard contains the following pages:</paragraph>
 <embed href="text/shared/autopi/01130100.xhp#seite1"/>
 <embed href="text/shared/autopi/01130200.xhp#seite2"/>
diff --git a/helpcontent2/source/text/shared/autopi/01130100.xhp b/helpcontent2/source/text/shared/autopi/01130100.xhp
index cd1f9d1d44..9206fb40fa 100755
--- a/helpcontent2/source/text/shared/autopi/01130100.xhp
+++ b/helpcontent2/source/text/shared/autopi/01130100.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,15 +51,15 @@
   <embed href="text/shared/00/00000401.xhp#autopilotmsimport1"/>
 </section>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTSODOCUMENTS" id="bm_id3150808" localize="false"/><paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="2" l10n="U" oldref="27">$[officename]</paragraph>
-<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts binary $[officename] documents (StarOffice 5.2 and before) into the OpenDocument format used by $[officename].</ahelp><comment>UFI: dont use a variable!</comment></paragraph>
+<paragraph role="paragraph" id="par_id3149205" xml-lang="en-US" l10n="CHG" oldref="28"><ahelp hid="HID_DLGIMPORT_0_OPTSODOCUMENTS">Converts old binary documents into the OpenDocument format used by $[officename].</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKWRITER" id="bm_id3153394" localize="false"/><paragraph role="heading" id="hd_id3153049" xml-lang="en-US" level="3" l10n="U" oldref="29">Text documents</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of $[officename] Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="HID_DLGIMPORT_0_CHKWRITER">Converts documents in the old format of Writer *.sdw into OpenDocument *.odt documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKCALC" id="bm_id3149095" localize="false"/><paragraph role="heading" id="hd_id3151226" xml-lang="en-US" level="3" l10n="U" oldref="31">Spreadsheets</paragraph>
-<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of $[officename] Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3155391" xml-lang="en-US" l10n="CHG" oldref="32"><ahelp hid="HID_DLGIMPORT_0_CHKCALC">Converts documents in the old format of Calc *.sdc into OpenDocument *.ods documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKIMPRESS" id="bm_id3153683" localize="false"/><paragraph role="heading" id="hd_id3145211" xml-lang="en-US" level="3" l10n="U" oldref="33">Drawing/presentation documents</paragraph>
-<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of $[officename] Draw *.sda into OpenDocument *.odg documents, and $[officename] Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154289" xml-lang="en-US" l10n="CHG" oldref="34"><ahelp hid="HID_DLGIMPORT_0_CHKIMPRESS">Converts documents in the old format of Draw *.sda into OpenDocument *.odg documents, and Impress *.sdd into OpenDocument *.odp documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_CHKMATHGLOBAL" id="bm_id3156346" localize="false"/><paragraph role="heading" id="hd_id3143267" xml-lang="en-US" level="3" l10n="U" oldref="35">Master documents/formulas</paragraph>
-<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of $[officename] Writer master documents *.sgl into OpenDocument *.odm documents, and $[officename] Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156114" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid="HID_DLGIMPORT_0_CHKMATHGLOBAL">Converts documents in the old format of Writer master documents *.sgl into OpenDocument *.odm documents, and Math *.smf into OpenDocument *.odf documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_0_OPTMSDOCUMENTS" id="bm_id3147209" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="2" l10n="U" oldref="37">Microsoft Office</paragraph>
 <paragraph role="paragraph" id="par_id3150771" xml-lang="en-US" l10n="CHG" oldref="38">Converts Microsoft Office documents into the OpenDocument format.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_DLGIMPORT_2_CHKWORD" id="bm_id3148685" localize="false"/><paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="3" l10n="U" oldref="3">Word documents</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/30000000.xhp b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
index 194cbc1abb..5ca08e739a 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,7 @@
 </meta>
 <body>
 <paragraph role="heading" id="hd_id3151262" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/explorer/database/30000000.xhp" name="Adabas D Database">Adabas D Database</link></paragraph>
-<paragraph role="paragraph" id="par_id842310" xml-lang="en-US" l10n="NEW">Adabas D by Software AG is installed when you install the commercial office software by Sun Microsystems, Inc.</paragraph>
+
 <paragraph role="paragraph" id="par_id3479720" xml-lang="en-US" l10n="NEW">If you are using OpenOffice.org software, the Adabas D software package can be downloaded and installed separately (see www.adabas.com).</paragraph>
 <paragraph role="paragraph" id="par_id3150499" xml-lang="en-US" l10n="CHG" oldref="2">The Adabas D database that you may have installed together with $[officename] is a limited version of the database. For more information on Adabas, visit the Software AG Web site at http://www.softwareag.com/adabas/.</paragraph>
 <paragraph role="heading" id="hd_id3152997" xml-lang="en-US" level="2" l10n="CHG" oldref="3">About Adabas</paragraph>
@@ -69,8 +69,8 @@
 <paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="103">To delete an Adabas database:</paragraph>
 <list type="ordered">
 <listitem>
-<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file. 
-</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script. 
+<paragraph role="listitem" id="par_id3153927" xml-lang="en-US" l10n="CHG" oldref="45">Determine which directories are referred to by the system variables DBCONFIG and DBWORK. <switchinline select="sys"><caseinline select="WIN">Under Windows these variables are defined in the system settings or in the c:\Autoexec.bat file.
+</caseinline></switchinline><switchinline select="sys"><caseinline select="UNIX"> Under Unix these variables are defined in a startup script.
 </caseinline></switchinline></paragraph>
 </listitem>
 <listitem>
@@ -121,7 +121,7 @@
 <paragraph role="listitem" id="par_id3149210" xml-lang="en-US" l10n="U" oldref="83">Under Windows, start the xtcpupd.exe support program on both the client and the server, and ensure that "Remote SQL via TCP/IP" is selected in the xtcpupd.exe dialog.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin 
+<paragraph role="listitem" id="par_id3146135" xml-lang="en-US" l10n="U" oldref="84">On the server, start the x_server program in <switchinline select="sys"><caseinline select="UNIX">adabas\bin
 </caseinline><defaultinline>Adabas\bin</defaultinline></switchinline> directory.</paragraph>
 </listitem>
 <listitem>
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
index b90fc54ea4..179e7d55f5 100755
--- a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
          <title xml-lang="en-US" id="tit">Migrate Macros</title>
@@ -55,7 +55,7 @@
 <paragraph xml-lang="en-US" id="par_id0224200911454780" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Choose a location and file name to save the new database file. By default, the new file gets the same name as the old file, while the old file gets renamed with the string "backup" in the name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/dbaccess_MultiLineEdit_TP_SUMMARY_ED_CHANGES" id="bm_id0224200911450172" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id022420091145472" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">The list shows all changes that were applied to the database file.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Starting with OpenOffice.org 3.1 or StarOffice 9.1, macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id0112200902353542" role="paragraph" l10n="NEW">Previously, macros have been allowed to reside only in the text sub-documents of forms and reports. Now macros can also be stored in the Base file itself. This means that macros in Base files can be called now from any of its sub-components: forms, reports, table design, query design, relation design, table data view.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0112200903075865" role="paragraph" l10n="NEW">However, it is technically not possible to store macros both in a Base file and in its sub-documents at the same time. So, if you want to attach some new macros to the Base file, while retaining any existing old macros that were stored in the sub-documents, you must move the existing old macros up to the Base file's macro storage area. </paragraph>
       <paragraph xml-lang="en-US" id="par_id0112200903075830" role="paragraph" l10n="NEW">The Database Document Macro Migration Wizard can move the macros up into the Base file's storage area. You can then examine the macros and edit them as needed. </paragraph>
       <paragraph xml-lang="en-US" id="par_id0112200903075951" role="paragraph" l10n="NEW">For example, it is possible that macros from the sub-documents had the same module names and macro names. After you moved the macros into one common macro storage area, you must edit the macros to make the names unique. The wizard cannot do this.</paragraph>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index e98a063af7..daf29c1167 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Report Builder</title>
@@ -56,7 +56,7 @@
             <paragraph xml-lang="en-US" id="par_id4494766" role="paragraph" l10n="NEW">Click the link "Get more extensions here". This opens your web browser at the address <link href="http://extensions.services.openoffice.org">http://extensions.services.openoffice.org</link> and shows a list of available extensions.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Sun Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id7858516" role="paragraph" l10n="NEW">Find the Report Builder extension. Click at the icon or the "click here" text link. This opens the download page for the extension.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The file "sun-report-builder.oxt" will be downloaded to your computer.</paragraph>
@@ -152,7 +152,7 @@
             <paragraph xml-lang="en-US" id="par_id3397320" role="paragraph" l10n="NEW">It is not possible to overlap the fields. If you drop a table field on the Detail area, then a label and a text box are inserted.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id3059785" role="paragraph" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon 
+            <paragraph xml-lang="en-US" id="par_id3059785" role="paragraph" l10n="NEW">You can also insert text that should be the same on every page of the report. Click the Label Field icon
 <image id="img_id5605334" src="res/commandimagelist/sc_label.png" width="0.566cm" height="0.566cm" localize="true"><alt xml-lang="en-US" id="alt_id5605334">Icon</alt>
 	</image>, then drag a rectangle in the Page Header or Page Footer area. Edit the Label property to show the text you want.</paragraph>
          </listitem>
@@ -187,7 +187,7 @@
       <paragraph xml-lang="en-US" id="par_id4881740" role="heading" level="2" l10n="NEW">To execute a report</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph" l10n="NEW">Click the Execute Report icon 
+            <paragraph xml-lang="en-US" id="par_id8286385" role="paragraph" l10n="NEW">Click the Execute Report icon
 <image id="img_id3380230" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3380230">Icon</alt>
 	</image> on the toolbar.</paragraph>
          </listitem>
@@ -196,12 +196,12 @@
       <paragraph xml-lang="en-US" id="par_id2485122" role="paragraph" l10n="NEW">If the database contents did change, execute the report again to update the result report.<comment>automatic? message?</comment></paragraph>
       <paragraph xml-lang="en-US" id="hd_id8746910" role="heading" level="2" l10n="NEW">To edit a report</paragraph>
       <paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">First decide if you want to edit the generated report, which is a static Writer document, or if you want to edit the Report Builder view and then generate a new report based on the new design.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id5941648" role="paragraph" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File 
+      <paragraph xml-lang="en-US" id="par_id5941648" role="paragraph" l10n="NEW">The Writer document is opened read-only. To edit the Writer document, click Edit File
 <image id="img_id8237556" src="res/commandimagelist/sc_editdoc.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id8237556">Icon</alt>
 	</image> on the Standard toolbar.<comment>saved automatically with the Base file?</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id8307138" role="paragraph" l10n="CHG">If you want to edit the Report Builder view, you can change some of its properties.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7138889" role="paragraph" l10n="NEW">Click in the Details area. Then in the Properties window, change some properties, for example the background color.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph" l10n="NEW">After finishing, click the Execute Report icon 
+      <paragraph xml-lang="en-US" id="par_id9869380" role="paragraph" l10n="NEW">After finishing, click the Execute Report icon
 <image id="Graphic2" src="res/commandimagelist/sc_executereport.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to create a new report.</paragraph>
       <paragraph xml-lang="en-US" id="par_id12512" role="paragraph" l10n="NEW">If you close the Report Builder, you will be asked if the report should be saved. Click Yes, give the report a name, and click OK.<comment>report part of Base file?</comment></paragraph>
@@ -209,7 +209,7 @@
       <paragraph xml-lang="en-US" id="par_id2626422" role="paragraph" l10n="NEW">Without sorting or grouping, the records will be inserted into the report in the order in which they are retrieved from the database.</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon 
+            <paragraph xml-lang="en-US" id="par_id1743827" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
 <image id="img_id9557786" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id9557786">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
@@ -223,7 +223,7 @@
       <paragraph xml-lang="en-US" id="par_id2318796" role="heading" level="2" l10n="NEW">Grouping</paragraph>
       <list type="ordered">
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon 
+            <paragraph xml-lang="en-US" id="par_id399182" role="paragraph" l10n="NEW">Open the Report Builder view and click the Sorting and Grouping icon
 <image id="Graphic21" src="res/commandimagelist/sc_dbsortingandgrouping.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> on the toolbar. You see the <link href="text/shared/explorer/database/rep_sort.xhp">Sorting and Grouping</link> dialog.</paragraph>
          </listitem>
@@ -231,7 +231,7 @@
             <paragraph xml-lang="en-US" id="par_id7588732" role="paragraph" l10n="NEW">In the Groups box, open the Group Header list box and select to show a group header.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW">Click the Add Field icon 
+            <paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="NEW">Click the Add Field icon
 <image id="Graphic3" src="res/commandimagelist/sc_addfield.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_">Icon</alt>
 	</image> to open the Add Field window.</paragraph>
          </listitem>
@@ -245,7 +245,7 @@
       <paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="NEW">If you like to sort and group, open the Report Builder view, then open the Sorting and Grouping dialog. Select to show a Group Header for the fields that you want to group, and select to hide the Group Header for the fields that you want to be sorted. Close the Sorting and Grouping window and execute the report.</paragraph>
       <paragraph xml-lang="en-US" id="par_id888698" role="heading" level="2" l10n="NEW">Updating and printing your data</paragraph>
       <paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">When you insert some new data or edit data in the table, a new report will show the updated data.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Click the Reports icon 
+      <paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">Click the Reports icon
 <image id="img_id4678487" src="dbaccess/res/reports_32.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4678487">Icon</alt>
 	</image> and double-click your last saved report. A new Writer document will be created which shows the new data.</paragraph>
       <paragraph xml-lang="en-US" id="par_id8147221" role="paragraph" l10n="NEW">To print a report, choose <item type="menuitem">File - Print</item> from the Writer document.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/accessibility.xhp b/helpcontent2/source/text/shared/guide/accessibility.xhp
index 8e7a282fc3..c77afec957 100644
--- a/helpcontent2/source/text/shared/guide/accessibility.xhp
+++ b/helpcontent2/source/text/shared/guide/accessibility.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -42,9 +42,9 @@
 </history>
 </meta>
 <body>
-  
-  
-  
+
+
+
   <bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>accessibility; %PRODUCTNAME features</bookmark_value></bookmark><paragraph id="hd_id3150502" role="heading" level="1" oldref="7" l10n="U" xml-lang="en-US"><variable id="accessibility"><link name="Accessibility in %PRODUCTNAME" href="text/shared/guide/accessibility.xhp">Accessibility in <item type="productname">%PRODUCTNAME</item></link></variable></paragraph>
   <paragraph xml-lang="en-US" role="paragraph" id="par_id3154894" l10n="U" oldref="6">The following accessibility features are part of <item type="productname">%PRODUCTNAME</item>:</paragraph>
   <list type="unordered">
@@ -62,7 +62,7 @@
     <paragraph xml-lang="en-US" oldref="12" l10n="U" role="listitem" id="par_id3145071">The user interface is scalable through your <switchinline select="sys"><caseinline select="UNIX">Window Manager</caseinline><defaultinline>operating system</defaultinline></switchinline> settings. The default font size for dialogs is 12pt, corresponding to a scale of 100%. You can also change the font size for dialogs in <emph>Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</emph>. The zoom factor of a document can be changed in <emph>View - Zoom</emph>, or by double-clicking the zoom factor displayed in the Status Bar.</paragraph>
    </listitem>
   </list>
-  <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Sun Microsystems Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
+  <paragraph role="note" id="par_id3152349" l10n="U" xml-lang="en-US" oldref="2">Please note that accessibility support relies on Java technology for communications with assistive technology tools. This means that the first program startup may take a few seconds longer, because the Java runtime environment has to be started as well.</paragraph>
   <section id="relatedtopics">
   <embed href="text/shared/guide/assistive.xhp#assistive"/>
   <paragraph l10n="U" role="paragraph" id="par_id3149578" xml-lang="en-US" oldref="9"><link name="Tools - Options - %PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp">Tools - Options - <item type="productname">%PRODUCTNAME</item> - View</link></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/change_title.xhp b/helpcontent2/source/text/shared/guide/change_title.xhp
index 290dabe1d7..1a6040cd98 100755
--- a/helpcontent2/source/text/shared/guide/change_title.xhp
+++ b/helpcontent2/source/text/shared/guide/change_title.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidechange_titlexml" indexer="include" status="PUBLISH">
@@ -51,7 +51,7 @@ YJ: checked</lastedited>
 </bookmark>
 <paragraph role="heading" id="hd_id3156324" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="change_title"><link href="text/shared/guide/change_title.xhp" name="Changing the Title of a Document">Changing the Title of a Document</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.<comment>UFI: we don't show the title any more on the title bar - see http://specs.openoffice.org/appwide/module_name_in_caption_bar/module_name_in_caption_bar.sxw</comment></paragraph>
+<paragraph role="paragraph" id="par_id3152801" xml-lang="en-US" l10n="CHG" oldref="3">You can specify a title for your document. Some file manager utilities can display the titles next to the filenames of your documents.</paragraph>
 <paragraph role="heading" id="hd_id3156136" xml-lang="en-US" level="2" l10n="U" oldref="4">How to change the title of the current document</paragraph>
 <list type="ordered">
 <listitem>
diff --git a/helpcontent2/source/text/shared/guide/digital_signatures.xhp b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
index f7d56606a1..8a9757732f 100755
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
          <title xml-lang="en-US" id="tit">About Digital Signatures</title>
@@ -85,7 +85,7 @@
             </tablecell>
             <tablecell>
                <paragraph xml-lang="en-US" id="par_id0821200912504133" role="tablecontent" l10n="NEW">The signature is OK, but the certificates could not be validated.</paragraph>
-               <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with OpenOffice.org prior to 3.2 or StarOffice prior to 9.2, see note below.)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id0821200912504165" role="tablecontent" l10n="NEW">The signature and the certificate are OK, but not all parts of the document are signed. (For documents that were signed with old versions of the software, see note below.)</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/helpcontent2/source/text/shared/guide/error_report.xhp b/helpcontent2/source/text/shared/guide/error_report.xhp
index 490d56a38c..d591df5a3e 100644
--- a/helpcontent2/source/text/shared/guide/error_report.xhp
+++ b/helpcontent2/source/text/shared/guide/error_report.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Error Report Tool</title>
@@ -51,7 +51,6 @@
 </variable></paragraph>
       <paragraph xml-lang="en-US" id="par_id3153345" role="paragraph" l10n="U" oldref="1">The Error Report Tool starts automatically when a program crash occurs.<comment>removed sentene about manually - i96770</comment></paragraph>
       <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="2">The Error Report Tool gathers all necessary information that can help the program developers to improve the code, so that in later versions this error can possibly be avoided. Please help us to improve the software and send the generated error report.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="3">Sun Microsystems is committed to respecting your online privacy and recognizes your need for appropriate protection and management of any personally identifiable information you share with us. See the statement at http://www.sun.com/privacy/ on your online data privacy at Sun Microsystems.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3148538" role="heading" level="2" l10n="U" oldref="4">Starting the Error Report Tool</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149811" role="paragraph" l10n="U" oldref="5">With most program crashes the Error Report Tool will start automatically.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U" oldref="7">Completing the Report</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
index eed0aeebac..d39fdf50b4 100755
--- a/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
+++ b/helpcontent2/source/text/shared/guide/insert_specialchar.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,13 +64,13 @@
 <paragraph role="listitem" id="par_id3153031" xml-lang="en-US" l10n="CHG" oldref="4">In any text input field (such as the input fields in the <emph>Find &amp; Replace</emph> dialog) you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+S to open the <emph>Special Characters</emph> dialog.</paragraph>
 </listitem>
 </list>
-<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard. 
+<paragraph role="paragraph" id="par_id3155630" xml-lang="en-US" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="UNIX">At present there are three ways of entering letters with accents directly from the keyboard.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Sun Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers. 
+<paragraph role="paragraph" id="par_id3154897" xml-lang="en-US" l10n="U" oldref="8"><switchinline select="sys"><caseinline select="UNIX"><emph>Solaris:</emph> Using a Sun keyboard. First press the Compose key to the right of the space bar, then enter the first and second modifiers.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys. 
+<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="9"><switchinline select="sys"><caseinline select="UNIX"><emph>Linux / NetBSD:</emph> Using the dead-keys. In an xterm window first press the (´) or (`) key. The character should not appear on the screen. Now press a letter, such as "e". The e is given an accent, é or è. If not, then check in the XF86Config file if a "nodeadkeys" XkbdVariant has been loaded there and replace it. You may also have set the environment variable SAL_NO_DEADKEYS, which deactivates the dead-keys.
 </caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h. 
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="10"><switchinline select="sys"><caseinline select="UNIX"><emph>All Unix systems:</emph> (Alt Graph) as additional compose key. The (Alt Graph) key can work in $[officename] like the Compose key, if you set the environment variable SAL_ALTGR_COMPOSE. The (Alt Graph) key must trigger a mode_switch, so, for example, xmodmap -e "keysym Alt_R = Mode_switch" must be set. First press (Alt Graph), then the first modifier, then the second modifier. The characters are combined as described on a Solaris system in the file /usr/openwin/include/X11/Suncompose.h.
 </caseinline></switchinline></paragraph>
 <embed href="text/shared/00/00000004.xhp#related"/>
 <paragraph role="paragraph" id="par_id3149047" xml-lang="en-US" l10n="U" oldref="5"><link href="text/shared/01/04100000.xhp" name="Special Characters">Special Characters</link></paragraph>
diff --git a/helpcontent2/source/text/shared/guide/protection.xhp b/helpcontent2/source/text/shared/guide/protection.xhp
index dbc30c2161..173ffdc8bf 100644
--- a/helpcontent2/source/text/shared/guide/protection.xhp
+++ b/helpcontent2/source/text/shared/guide/protection.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideprotectionxml" indexer="include">
          <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
@@ -99,7 +99,7 @@
             </tablecell>
          </tablerow>
       </table>
-<comment>MW moved contents of "Protecting Cell Ranges in StarOffice Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
+<comment>MW moved contents of "Protecting Cell Ranges in Calc" to the Calc guides cell_protect.xhp and cell_unprotect.xhp.</comment><comment>MW moved Writer specific contents to the new writer guide protection.xhp</comment>
 <paragraph xml-lang="en-US" id="hd_id3155113" role="heading" level="2" l10n="U"
                  oldref="52">Protecting Frames, Graphics, and OLE Objects</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153703" role="paragraph" l10n="U" oldref="53">You can protect the content, position and size of inserted graphics. The same applies to frames (in Writer) and OLE objects.</paragraph>
diff --git a/helpcontent2/source/text/shared/main0500.xhp b/helpcontent2/source/text/shared/main0500.xhp
index a9740c8180..ba5ef7e863 100755
--- a/helpcontent2/source/text/shared/main0500.xhp
+++ b/helpcontent2/source/text/shared/main0500.xhp
@@ -4,7 +4,7 @@
 <!--***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -35,14 +35,10 @@
 <title xml-lang="en-US" id="tit">Glossaries</title>
 <filename>/text/shared/main0500.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
 </meta>
 <body>
-  
-  
+
+
   <section id="allghinweise">
   <paragraph id="hd_id3156183" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/main0500.xhp" name="Glossaries">Glossaries</link></paragraph>
   <paragraph role="paragraph" id="par_id3157898" l10n="U" xml-lang="en-US" oldref="2">This section provides a general glossary of technical terms used in $[officename], along with a list of Internet terms.</paragraph>
diff --git a/helpcontent2/source/text/shared/main0650.xhp b/helpcontent2/source/text/shared/main0650.xhp
index b6c66f3997..748d91f0f0 100644
--- a/helpcontent2/source/text/shared/main0650.xhp
+++ b/helpcontent2/source/text/shared/main0650.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -47,7 +47,7 @@
 <paragraph role="heading" id="hd_id3153089" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/main0650.xhp" name="Java Platform Support">Java Platform Support</link></paragraph>
 <paragraph role="paragraph" id="par_id3152363" xml-lang="en-US" l10n="CHG" oldref="2">$[officename] supports the Java platform for running applications and components based on the JavaBeans architecture.</paragraph>
 </section>
-<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software from Sun Microsystems. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required. The executable setup file is located in the $[officename]/program folder and on the $[officename] CD.</paragraph>
+<paragraph role="paragraph" id="par_id3154751" xml-lang="en-US" l10n="U" oldref="3">For $[officename] to support the Java platform, you must install the Java 2 Runtime Environment software. When you installed $[officename], you automatically received the option to install these files if they were not yet installed. You can also install these files now if required.</paragraph>
 <paragraph role="paragraph" id="par_id3155338" xml-lang="en-US" l10n="U" oldref="4">The Java platform support needs to be activated under $[officename] to run Java applications.</paragraph>
 <list type="unordered">
 <listitem>
diff --git a/helpcontent2/source/text/shared/optionen/01010200.xhp b/helpcontent2/source/text/shared/optionen/01010200.xhp
index 5af76c2f36..d54900b5e3 100644
--- a/helpcontent2/source/text/shared/optionen/01010200.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010200.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">General</title>
@@ -100,7 +100,7 @@
          <emph>- Paths</emph>, and then enter a new path for the backup file.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE" id="bm_id3159252" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154908" role="heading" level="3" l10n="CHG"
-                 oldref="9">Save AutoRecovery information every<comment>UFI: see http://specs.openoffice.org/appwide/recovery/Autorecovery.sxw</comment><comment>UFI: write guide "Auto backup and recovery"</comment></paragraph>
+                 oldref="9">Save AutoRecovery information every</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149560" role="paragraph" l10n="CHG" oldref="10"><ahelp hid="SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_AUTOSAVE">Specifies that <item type="productname">%PRODUCTNAME</item> saves the information needed to restore all open documents in case of a crash. You can specify the saving time interval.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_NUMERICFIELD_RID_SFXPAGE_SAVE_ED_AUTOSAVE" id="bm_id3155855" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3146147" role="heading" level="3" l10n="U"
@@ -157,8 +157,8 @@
 <bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SFXPAGE_SAVE_LB_ODF_VERSION" id="bm_id810266" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id2659077" role="heading" level="3" l10n="NEW">ODF format version</paragraph>
       <paragraph xml-lang="en-US" id="par_id6944181" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 introduce new features which have to be saved using the <link href="http://en.wikipedia.org/wiki/OpenDocument">OpenDocument</link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id886257" role="paragraph" l10n="NEW">OpenOffice.org 3 and StarOffice 9 can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph" l10n="NEW">When you save a document in OpenOffice.org 3 or StarOffice 9, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id886257" role="paragraph" l10n="NEW">Current versions can open documents in ODF formats 1.0/1.1 and 1.2.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8892483" role="paragraph" l10n="NEW">When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1.</paragraph>
       <paragraph xml-lang="en-US" id="par_id0915200911205367" role="note" l10n="NEW">Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type="menuitem">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version.</paragraph>
       <paragraph xml-lang="en-US" id="par_id7198400" role="paragraph" l10n="CHG"><ahelp hid=".">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_CHECKBOX_RID_SFXPAGE_SAVE_BTN_NOPRETTYPRINTING" id="bm_id3155414" localize="false"/>
@@ -176,7 +176,7 @@
       <paragraph xml-lang="en-US" id="par_id3150828" role="paragraph" l10n="U" oldref="63"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_APP">Specifies the document type for which you want to define the default file format.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER" id="bm_id3152775" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149527" role="heading" level="3" l10n="CHG"
-                 oldref="51">Always save as<comment>UFI: changed in #i46895</comment><comment>again many changes in specs.openoffice.org/appwide/odf/odf_1-2_migration.odt</comment></paragraph>
+                 oldref="51">Always save as</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149035" role="paragraph" l10n="U" oldref="64"><ahelp hid="SVX_LISTBOX_RID_SFXPAGE_SAVE_LB_FILTER">Specifies how documents of the type selected on the left will always be saved as this file type. You may select another file type for the current document in the <emph>Save as</emph> dialog.</ahelp></paragraph>
    </body>
 </helpdocument>
 \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/optionen/01010300.xhp b/helpcontent2/source/text/shared/optionen/01010300.xhp
index e502a6d45b..8234cc9dac 100755
--- a/helpcontent2/source/text/shared/optionen/01010300.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010300.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -63,8 +63,8 @@
 <bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH" id="bm_id3150448" localize="false"/><paragraph role="heading" id="hd_id3147229" xml-lang="en-US" level="2" l10n="U" oldref="6">Edit</paragraph>
 <paragraph role="paragraph" id="par_id3151177" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid="SVX:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH">Click to display the <emph>Select Path</emph> or <emph>Edit Paths</emph> dialog.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_id3153193" xml-lang="en-US" l10n="U" oldref="162">You can change the sequence of entries by clicking the bar in the <emph>Type</emph> column. The column width can be changed by moving the separator between the columns with the mouse.</paragraph>
-<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home 
-</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><comment>removed "mehrpfad" section. See http://specs.openoffice.org/appwide/options_settings/OOoPaths.odt</comment><comment>removed two rows from table that crept in by a resync.</comment><table id="tbl_id3145364">
+<paragraph role="paragraph" id="par_id3150439" xml-lang="en-US" l10n="CHG" oldref="190">In the following list of paths, the paths for the shared folders in the directory where %PRODUCTNAME is installed, are not shown. The user data for each user is stored in the {user} directory, which is located in the user's <switchinline select="sys"><caseinline select="UNIX">home
+</caseinline><defaultinline>Documents and Settings</defaultinline></switchinline> directory.</paragraph><table id="tbl_id3145364">
 <tablerow>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablehead" id="par_id3149260" xml-lang="en-US" l10n="CHG" oldref="14">Type</paragraph>
@@ -92,7 +92,7 @@
 <paragraph role="tablecontent" id="par_id8316599" xml-lang="en-US" l10n="NEW">AutoCorrect</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr 
+<paragraph role="tablecontent" id="par_id3753776" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autocorr
 </caseinline><defaultinline>{user}\user\autocorr</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -104,7 +104,7 @@
 <paragraph role="tablecontent" id="par_id4494766" xml-lang="en-US" l10n="NEW">AutoText</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext 
+<paragraph role="tablecontent" id="par_id7858516" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/autotext
 </caseinline><defaultinline>{user}\user\autotext</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -116,7 +116,7 @@
 <paragraph role="tablecontent" id="par_id3154493" xml-lang="en-US" l10n="U" oldref="68">Gallery</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery 
+<paragraph role="tablecontent" id="par_id3154484" xml-lang="en-US" l10n="CHG" oldref="69"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
 </caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -128,7 +128,7 @@
 <paragraph role="tablecontent" id="par_id3151333" xml-lang="en-US" l10n="U" oldref="26">Graphics</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery 
+<paragraph role="tablecontent" id="par_id3152890" xml-lang="en-US" l10n="CHG" oldref="27"><switchinline select="sys"><caseinline select="UNIX">{user}/user/gallery
 </caseinline><defaultinline>{user}\user\gallery</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -140,7 +140,7 @@
 <paragraph role="tablecontent" id="par_id3146891" xml-lang="en-US" l10n="U" oldref="41">Backups</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup 
+<paragraph role="tablecontent" id="par_id3154915" xml-lang="en-US" l10n="CHG" oldref="42"><switchinline select="sys"><caseinline select="UNIX">{user}/user/backup
 </caseinline><defaultinline>{user}\user\backup</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -152,7 +152,7 @@
 <paragraph role="tablecontent" id="par_id4680928" xml-lang="en-US" l10n="NEW">Templates</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template 
+<paragraph role="tablecontent" id="par_id9014252" xml-lang="en-US" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">{user}/user/template
 </caseinline><defaultinline>{user}\user\template</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
@@ -164,7 +164,7 @@
 <paragraph role="tablecontent" id="par_id3154606" xml-lang="en-US" l10n="U" oldref="195">Temporary files</paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp 
+<paragraph role="tablecontent" id="par_id3149343" xml-lang="en-US" l10n="CHG" oldref="196"><switchinline select="sys"><caseinline select="UNIX">{user}/user/temp
 </caseinline><defaultinline>{user}\user\temp</defaultinline></switchinline></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
diff --git a/helpcontent2/source/text/shared/optionen/01010600.xhp b/helpcontent2/source/text/shared/optionen/01010600.xhp
index 8a7fe55cdb..eacba4effa 100755
--- a/helpcontent2/source/text/shared/optionen/01010600.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010600.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
@@ -51,7 +51,7 @@
 <bookmark_value>years; 2-digit options</bookmark_value>
 <bookmark_value>Help Agent;options</bookmark_value>
 <bookmark_value>Help;style sheets</bookmark_value>
-</bookmark><comment>mw changed "StarOffice Open/Save dialogs" to "Open/Save dialogs"</comment>
+</bookmark>
 <paragraph role="paragraph" id="par_id3155450" xml-lang="en-US" l10n="E" oldref="42" localize="false"/>
 <section id="allg">
 <paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="1" l10n="U" oldref="8"><link href="text/shared/optionen/01010600.xhp" name="General">General</link></paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index d584516981..2eb61da209 100644
--- a/helpcontent2/source/text/shared/optionen/01010800.xhp
+++ b/helpcontent2/source/text/shared/optionen/01010800.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01010800xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">View</title>
@@ -73,7 +73,7 @@
 <bookmark xml-lang="en-US" branch="hid/810520118" id="bm_id0525200903212046" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3149123" role="heading" level="3" l10n="CHG"
                  oldref="112">Icon size and style</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus. 
+      <paragraph xml-lang="en-US" id="par_id3153947" role="paragraph" l10n="U" oldref="113"><ahelp hid="OFFMGR_LISTBOX_OFA_TP_VIEW_LB_BIG">Specifies the display size of toolbar icons.</ahelp><switchinline select="sys"><caseinline select="WIN">The <emph>Automatic</emph> option uses the font size settings of your operating system for menus.
 </caseinline></switchinline></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svx_ListBox_OFA_TP_VIEW_LB_ICONSTYLE" id="bm_id5482039" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/810520120" id="bm_id0525200903230259" localize="false"/>
@@ -109,7 +109,7 @@
                  oldref="68">Show font history</paragraph>
       <paragraph xml-lang="en-US" id="par_id3153513" role="paragraph" l10n="CHG" oldref="69"><ahelp hid="OFFMGR:CHECKBOX:OFA_TP_VIEW:CB_FONT_HISTORY">Lists the last five fonts that you used in the current document at the top of the list in the <emph>Font Name</emph> box on the <emph>Formatting</emph> bar.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/.uno:RestoreEditingView" id="bm_id555742" localize="false"/><comment>UFI: i53104. This is still in Customize dialog</comment>
-<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph><comment>removed "Open windows" control, see http://specs.openoffice.org/appwide/options_settings/HardwareAcceleration.odt</comment>
+<paragraph xml-lang="en-US" id="par_idN10962" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Specifies whether to restore the last used document view. Many view properties valid when the document was last saved will be restored.</ahelp></paragraph>
 <paragraph xml-lang="en-US" id="par_idN10AC8" role="heading" level="2" l10n="NEW">Graphics output</paragraph>
 <bookmark xml-lang="en-US" branch="hid/FN_REFRESH_VIEW" id="bm_id6835216" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:RefreshView" id="bm_id9305703" localize="false"/>
diff --git a/helpcontent2/source/text/shared/optionen/01041000.xhp b/helpcontent2/source/text/shared/optionen/01041000.xhp
index e4bd7d8df6..7c41e73bbf 100755
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -10,8 +10,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: 01041000.xhp,v $
- * $Revision: 1.16.4.2 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -35,92 +35,95 @@
  
 	
 <meta>
-<topic id="textsharedoptionen01041000xml" indexer="include">
-<title id="tit" xml-lang="en-US">Compatibility</title>
-<filename>/text/shared/optionen/01041000.xhp</filename>
-</topic>
-</meta>
-<body>
+      <topic id="textsharedoptionen01041000xml" indexer="include">
+         <title xml-lang="en-US" id="tit">Compatibility</title>
+         <filename>/text/shared/optionen/01041000.xhp</filename>
+      </topic>
+   </meta>
+   <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3577990"><bookmark_value>Word documents;compatibility</bookmark_value>
-<bookmark_value>importing;compatibility settings for text import</bookmark_value>
-<bookmark_value>options;compatibility (Writer)</bookmark_value>
-<bookmark_value>compatibility settings for MS Word import</bookmark_value>
-<bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
-<bookmark_value>layout;importing Word documents</bookmark_value>
-<bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
-<bookmark_value>metrics;document formatting (Writer)</bookmark_value>
-<bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
+      <bookmark_value>importing;compatibility settings for text import</bookmark_value>
+      <bookmark_value>options;compatibility (Writer)</bookmark_value>
+      <bookmark_value>compatibility settings for MS Word import</bookmark_value>
+      <bookmark_value>Microsoft Office;importing Word documents</bookmark_value>
+      <bookmark_value>layout;importing Word documents</bookmark_value>
+      <bookmark_value>formatting;printer metrics (Writer)</bookmark_value>
+      <bookmark_value>metrics;document formatting (Writer)</bookmark_value>
+      <bookmark_value>printer metrics for document formatting (Writer)</bookmark_value>
 </bookmark>
 <section id="compatibility">
 <bookmark xml-lang="en-US" branch="hid/HID_OPTCOMPATIBILITY_PAGE" id="bm_id2023987" localize="false"/>
-<paragraph role="heading" id="par_idN10607" xml-lang="en-US" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
+<paragraph xml-lang="en-US" id="par_idN10607" role="heading" level="1" l10n="NEW"><variable id="compatibility_var"><link href="text/shared/optionen/01041000.xhp">Compatibility</link>
 </variable></paragraph>
-<paragraph role="paragraph" id="par_idN10625" xml-lang="en-US" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#compatibility"/>
-</section>
-<paragraph role="note" id="par_id3153876" xml-lang="en-US" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
-<section id="printermetrics">
+         <paragraph xml-lang="en-US" id="par_idN10625" role="paragraph" l10n="NEW"><ahelp hid="53251">Specifies compatibility settings for text documents. These options help in fine-tuning %PRODUCTNAME when importing Microsoft Word documents.</ahelp></paragraph>
+      </section>
+      <section id="howtoget">
+         <embed href="text/shared/00/00000406.xhp#compatibility"/>
+      </section>
+      <paragraph xml-lang="en-US" id="par_id3153876" role="note" l10n="CHG" oldref="17">Some of the settings defined here are only valid for the current document and must be defined separately for each document.</paragraph>
+      <section id="printermetrics">
 <bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS" id="bm_id3157844" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/SD_CHECKBOX_TP_OPTIONS_MISC_CB_USE_PRINTER_METRICS" id="bm_id3149922" localize="false"/><comment>UFI: added bookmarks due to bug #i24216#</comment><comment>UFI: this one called also from Impress options</comment>
-<paragraph role="heading" id="hd_id3149400" xml-lang="en-US" level="3" l10n="U" oldref="47">Use printer metrics for document formatting</paragraph>
-<paragraph role="paragraph" id="par_id3155602" xml-lang="en-US" l10n="U" oldref="48"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
-<paragraph role="note" id="par_id3155768" xml-lang="en-US" l10n="U" oldref="49">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
-</section>
+<paragraph xml-lang="en-US" id="hd_id3149400" role="heading" level="3" l10n="U"
+                    oldref="47">Use printer metrics for document formatting</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155602" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_PRINTER_METRICS">Specifies that printer metrics are applied for printing and also for formatting the display on the screen.</ahelp> If this box is not checked, a printer independent layout will be used for screen display and printing.</paragraph>
+         <paragraph xml-lang="en-US" id="par_id3155768" role="note" l10n="U" oldref="49">If you set this option for the current document and then save the document, for example, in an older binary format, this option will not be saved. If you later open the file from the older format, this option will be set by default.</paragraph>
+      </section>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST" id="bm_id3159268" localize="false"/>
-<paragraph role="heading" id="hd_id3145640" xml-lang="en-US" level="3" l10n="CHG" oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
-<paragraph role="paragraph" id="par_id3147339" xml-lang="en-US" l10n="U" oldref="18">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph>
-<paragraph role="paragraph" id="par_id3151250" xml-lang="en-US" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145640" role="heading" level="3" l10n="CHG"
+                 oldref="9">Add spacing between paragraphs and tables (in current document)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3147339" role="paragraph" l10n="U" oldref="18">In $[officename] Writer, paragraph spacing is defined differently than in MS Word documents. If you have defined spacing between two paragraphs or tables, spacing is also added in the corresponding MS Word documents.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3151250" role="paragraph" l10n="U" oldref="19"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST">Specifies whether to add MS Word-compatible spacing between paragraphs and tables in $[officename] Writer text documents.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART" id="bm_id3163806" localize="false"/>
-<paragraph role="heading" id="hd_id3146317" xml-lang="en-US" level="3" l10n="CHG" oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
-<paragraph role="paragraph" id="par_id3155333" xml-lang="en-US" l10n="CHG" oldref="30"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document.</ahelp> The same applies for a page break.</paragraph>
-<paragraph role="note" id="par_id3145789" xml-lang="en-US" l10n="U" oldref="20">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146317" role="heading" level="3" l10n="CHG"
+                 oldref="29">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3155333" role="paragraph" l10n="CHG" oldref="30"><ahelp hid="SW:CHECKBOX:TP_OPTLOAD_PAGE:CB_MERGE_PARA_DIST_PAGESTART">Specifies whether paragraph spacing at the top of a page will also be effective at the beginning of a page or column if the paragraph is positioned on the first page of the document.</ahelp> The same applies for a page break.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3145789" role="note" l10n="U" oldref="20">If you import an MS Word document, the spaces are automatically added during the conversion.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT" id="bm_id3155112" localize="false"/>
-<paragraph role="heading" id="hd_id3149964" xml-lang="en-US" level="3" l10n="CHG" oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
-<paragraph role="paragraph" id="par_id3152777" xml-lang="en-US" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break.</ahelp> If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph>
-<paragraph role="paragraph" id="par_idN10810" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph>
-<paragraph role="heading" id="par_idN107F9" xml-lang="en-US" level="3" l10n="NEW">Do not add leading (extra space) between lines of text<comment>UFI: spec external_leading</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10806" xml-lang="en-US" l10n="NEW">Specifies that additional leading (extra space) between lines of text is not added, even if the font in use contains the additional leading attribute.</paragraph>
-<paragraph role="paragraph" id="par_idN10809" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer, the additional leading is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the additional leading is not used.</paragraph>
-<paragraph role="heading" id="par_idN107FF" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 line spacing<comment>UFI: spec spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of text lines with proportional line spacing"</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10815" xml-lang="en-US" l10n="NEW">If the option is off, a new process for formatting text lines with proportional line spacing will be applied. If the option is on, the previous method of formatting of text lines with proportional line spacing will be applied.</paragraph>
-<paragraph role="paragraph" id="par_idN10818" xml-lang="en-US" l10n="NEW">In text documents created by your current version of Writer and in Microsoft Word documents of recent versions, the new process is used. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the previous process is used.</paragraph>
-<paragraph role="heading" id="par_idN1081B" xml-lang="en-US" level="3" l10n="NEW">Add paragraph and table spacing at bottom of table cells<comment>UFI: spec spec-formatting-table-cells</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10846" xml-lang="en-US" l10n="NEW">Specifies that the bottom spacing is added to a paragraph, even when it is the last paragraph in a table cell.</paragraph>
-<paragraph role="paragraph" id="par_idN10849" xml-lang="en-US" l10n="NEW">If the option is off, table cells will be formatted as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with %PRODUCTNAME %PRODUCTVERSION and for documents imported from Microsoft Word format.</paragraph>
-<paragraph role="heading" id="par_idN1084C" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 object positioning<comment>UFI: spec spec-adjust-object-positioning</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10864" xml-lang="en-US" l10n="NEW">Specifies how to calculate the position of floating objects anchored to a character or paragraph with respect to the top and bottom paragraph spacing.</paragraph>
-<paragraph role="paragraph" id="par_idN10867" xml-lang="en-US" l10n="NEW">If the option is on, the floating objects are positioned as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is off, the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
-<paragraph role="paragraph" id="par_idN1086A" xml-lang="en-US" l10n="NEW">The option will be set to off for new documents. For Writer documents created by a version prior to %PRODUCTNAME %PRODUCTVERSION the option is on.</paragraph>
-<paragraph role="heading" id="par_idN10821" xml-lang="en-US" level="3" l10n="NEW">Use StarOffice 6.0/7 text wrapping around objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></paragraph>
-<paragraph role="paragraph" id="par_id4016541" xml-lang="en-US" l10n="NEW">MS Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in MS Word.</paragraph>
-<paragraph role="paragraph" id="par_id7280190" xml-lang="en-US" l10n="NEW">In MS Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
-<paragraph role="paragraph" id="par_id2782982" xml-lang="en-US" l10n="NEW">In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true.</paragraph>
-<paragraph role="paragraph" id="par_idN10892" xml-lang="en-US" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, the former text wrapping will be applied. </paragraph>
-<paragraph role="heading" id="par_idN1092A" xml-lang="en-US" level="3" l10n="NEW">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, an iterative process was used, while in current versions a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
-<paragraph role="paragraph" id="par_idN10943" xml-lang="en-US" l10n="NEW">If the option is off, the old %PRODUCTNAME iterative process of object positioning is used. If the option is on, the new straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
-<paragraph role="heading" id="hd_id5240028" xml-lang="en-US" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
-<paragraph role="paragraph" id="par_id8599810" xml-lang="en-US" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>
-<paragraph role="paragraph" id="par_id8012634" xml-lang="en-US" l10n="NEW">This setting is on by default for .odt text documents. It will be saved and loaded with the document in the .odt text document format. This setting cannot be saved in old .sxw text documents, so this setting is off for .sxw text documents.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149964" role="heading" level="3" l10n="CHG"
+                 oldref="42">Use StarOffice 6.0/7 tab stop formatting<comment>UFI: spec "Tab Stop Compatibility"</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id3152777" role="paragraph" l10n="CHG" oldref="43"><ahelp hid="SW_CHECKBOX_TP_OPTLOAD_PAGE_CB_TAB_ALIGNMENT">Specifies how to align text at tab stops beyond the right margin, how to handle decimal tab stops, and how to handle tab stops close to a line break.</ahelp> If this check box is not selected, tab stops are handled in the same way as in other Office applications.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10810" role="paragraph" l10n="NEW">In text documents created by your current version of Writer, the new tab stop handling is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the old tab stop handling is applied.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107F9" role="heading" level="3" l10n="NEW">Do not add leading (extra space) between lines of text<comment>UFI: spec external_leading</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10806" role="paragraph" l10n="NEW">Specifies that additional leading (extra space) between lines of text is not added, even if the font in use contains the additional leading attribute.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10809" role="paragraph" l10n="NEW">In text documents created by your current version of Writer, the additional leading is used by default. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the additional leading is not used.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN107FF" role="heading" level="3" l10n="NEW">Use StarOffice 6.0/7 line spacing<comment>UFI: spec spec-line-spacing</comment><comment>UFI: api.feature "Adjusted formatting of text lines with proportional line spacing"</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10815" role="paragraph" l10n="NEW">If the option is off, a new process for formatting text lines with proportional line spacing will be applied. If the option is on, the previous method of formatting of text lines with proportional line spacing will be applied.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10818" role="paragraph" l10n="NEW">In text documents created by your current version of Writer and in Microsoft Word documents of recent versions, the new process is used. In text documents created by Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the previous process is used.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1081B" role="heading" level="3" l10n="NEW">Add paragraph and table spacing at bottom of table cells<comment>UFI: spec spec-formatting-table-cells</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10846" role="paragraph" l10n="NEW">Specifies that the bottom spacing is added to a paragraph, even when it is the last paragraph in a table cell.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10849" role="paragraph" l10n="NEW">If the option is off, table cells will be formatted as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is on, an alternative method of formatting table cells will be applied. The option is on by default for new documents created with your current version and for documents imported from Microsoft Word format.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1084C" role="heading" level="3" l10n="NEW">Use StarOffice 6.0/7 object positioning<comment>UFI: spec spec-adjust-object-positioning</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10864" role="paragraph" l10n="NEW">Specifies how to calculate the position of floating objects anchored to a character or paragraph with respect to the top and bottom paragraph spacing.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10867" role="paragraph" l10n="NEW">If the option is on, the floating objects are positioned as in Writer versions prior to StarOffice 8 or OpenOffice.org 2.0. If the option is off (default), the floating objects are positioned using an alternative method that is similar to the method used by Microsoft Word. </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10821" role="heading" level="3" l10n="NEW">Use StarOffice 6.0/7 text wrapping around objects<comment>UFI: spec doc adjust-text-wrapping.sxw</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id4016541" role="paragraph" l10n="NEW">MS Word and Writer have different approaches on wrapping text around floating screen objects. Floating screen object are Writer frames and drawing objects, and the objects 'text box', 'graphic', 'frame', 'picture' etc. in MS Word.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id7280190" role="paragraph" l10n="NEW">In MS Word and in current versions of Writer, page header/footer content and footnote/endnote content does not wrap around floating screen objects. Text body content wraps around floating screen objects which are anchored in the page header. </paragraph>
+      <paragraph xml-lang="en-US" id="par_id2782982" role="paragraph" l10n="NEW">In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, the opposite was true.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10892" role="paragraph" l10n="NEW">If the option is off, which is the default setting, the new text wrapping will be applied. If the option is on, the former text wrapping will be applied. </paragraph>
+      <paragraph xml-lang="en-US" id="par_idN1092A" role="heading" level="3" l10n="NEW">Consider wrapping style when positioning objects<comment>UFI: spec obj-pos-without-wrapping</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10837" role="paragraph" l10n="CHG">Specifies how the complex process of positioning floating objects that are anchored to a character or paragraph should work. In Writer versions prior to StarOffice 8 or OpenOffice.org 2.0, an iterative process was used, while in current versions a straightforward process is used, which is similar to the same process in Microsoft Word.</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10943" role="paragraph" l10n="NEW">If the option is off, the old iterative process of object positioning is used. If the option is on, the new straightforward process is used to ensure compatibility with Microsoft Word documents.</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id5240028" role="heading" level="3" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs<comment>UFI: i79041</comment></paragraph>
+      <paragraph xml-lang="en-US" id="par_id8599810" role="paragraph" l10n="NEW">If enabled, Writer adds spacing between words, in lines that end with Shift+Enter in justified paragraphs. If disabled, spacing between words will not be expanded to justify the lines.</paragraph>
+      <paragraph xml-lang="en-US" id="par_id8012634" role="paragraph" l10n="NEW">This setting is on by default for .odt text documents. It will be saved and loaded with the document in the .odt text document format. This setting cannot be saved in old .sxw text documents, so this setting is off for .sxw text documents.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT" id="bm_id4321726" localize="false"/>
-<paragraph role="heading" id="par_idN10845" xml-lang="en-US" level="2" l10n="NEW">Use as Default</paragraph>
-<paragraph role="paragraph" id="par_idN10848" xml-lang="en-US" l10n="NEW"><ahelp hid="879350288">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_idN10977" xml-lang="en-US" l10n="NEW">The factory defaults are set as follows. Enabled are the following options, while all other options are disabled:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN1097D" xml-lang="en-US" l10n="NEW">Add spacing between paragraphs and tables (in current document)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10981" xml-lang="en-US" l10n="NEW">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10985" xml-lang="en-US" l10n="NEW">Add paragraph and table spacing at bottom of table cells</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id4653767" xml-lang="en-US" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs</paragraph>
-</listitem>
-</list>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10845" role="heading" level="2" l10n="NEW">Use as Default</paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10848" role="paragraph" l10n="NEW"><ahelp hid="879350288">Click to use the current settings on this tab page as the default for further sessions with %PRODUCTNAME.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="par_idN10977" role="paragraph" l10n="NEW">The factory defaults are set as follows. Enabled are the following options, while all other options are disabled:</paragraph>
+      <list type="ordered">
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN1097D" role="paragraph" l10n="NEW">Add spacing between paragraphs and tables (in current document)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10981" role="paragraph" l10n="NEW">Add paragraph and table spacing at tops of pages (in current document)</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_idN10985" role="paragraph" l10n="NEW">Add paragraph and table spacing at bottom of table cells</paragraph>
+         </listitem>
+         <listitem>
+            <paragraph xml-lang="en-US" id="par_id4653767" role="paragraph" l10n="NEW">Expand word space on lines with manual line breaks in justified paragraphs</paragraph>
+         </listitem>
+      </list>
+   </body>
+</helpdocument>
+\ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/01/06080000.xhp b/helpcontent2/source/text/simpress/01/06080000.xhp
index a284143e74..e5dac2a3b8 100644
--- a/helpcontent2/source/text/simpress/01/06080000.xhp
+++ b/helpcontent2/source/text/simpress/01/06080000.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,7 +32,7 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsimpress0106080000xml" indexer="include" status="PUBLISH">
@@ -110,7 +110,7 @@
 <paragraph role="paragraph" id="par_id3156305" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE">Advances to the next slide when you click on the background of a slide.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP" id="bm_id3150758" localize="false"/>
 <paragraph role="heading" id="hd_id3150960" xml-lang="en-US" level="3" l10n="U" oldref="24">Presentation always on top</paragraph>
-<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP">The $[officename] window remains on top during the presentation. No other program will show its window in front of your presentation.</ahelp></paragraph><comment>see http://qa.openoffice.org/issues/show_bug.cgi?id=12719</comment>
+<paragraph role="paragraph" id="par_id3150764" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SD:CHECKBOX:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP">The $[officename] window remains on top during the presentation. No other program will show its window in front of your presentation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6086611" xml-lang="en-US" level="2" l10n="NEW">Multiple Monitors</paragraph>
 <paragraph role="paragraph" id="par_id5446943" xml-lang="en-US" l10n="NEW">By default the primary monitor is used for slide show mode. If the current desktop is displayed on more than one monitor, you can select which monitor to use for full screen slide show mode. If the current desktop spans only one monitor, or if the multi monitor feature is not supported on the current system, you cannot select another monitor.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/HID_SD_SLIDESHOW_DISPLAY" id="bm_id6976836" localize="false"/>
diff --git a/helpcontent2/source/text/simpress/guide/background.xhp b/helpcontent2/source/text/simpress/guide/background.xhp
index e57f989b5b..4b9b6325dd 100644
--- a/helpcontent2/source/text/simpress/guide/background.xhp
+++ b/helpcontent2/source/text/simpress/guide/background.xhp
@@ -6,7 +6,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -50,7 +50,8 @@
 <paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="background"><link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link>
 </variable></paragraph>
 <paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="34">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
-<paragraph role="paragraph" id="par_id3148701" xml-lang="en-US" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph><comment>insert help id when available</comment><paragraph role="paragraph" id="par_id624713" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp><comment>see http://specs.openoffice.org/impress/sd.insertbackground.odt</comment></paragraph><comment>removed a para, #63970</comment><paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3" l10n="U" oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
+<paragraph role="paragraph" id="par_id3148701" xml-lang="en-US" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph><comment>insert help id when available</comment><paragraph role="paragraph" id="par_id624713" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp>
+<paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3" l10n="U" oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
 <list type="ordered">
 <listitem>
 <paragraph role="listitem" id="par_id3149942" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 66da064bd8..8a0905780a 100755
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
+
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textswriter0104090200xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Defining Conditions</title>
@@ -327,16 +327,16 @@
                <paragraph xml-lang="en-US" id="par_id3146911" role="paragraph" l10n="U" oldref="9">Database.Table.Company ==""</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148733" role="paragraph" l10n="U" oldref="8">Returns TRUE if the COMPANY field is empty. (Exclamation sign represents a logical NOT.)</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148733" role="paragraph" l10n="U" oldref="8">Returns TRUE if the COMPANY field is empty.</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3148762" role="paragraph" l10n="U" oldref="5">Database.Table.Company !="Sun Microsystems"</paragraph>
-               <paragraph xml-lang="en-US" id="par_id3153016" role="paragraph" l10n="U" oldref="149">Database.Table.Company NEQ "Sun Microsystems"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3148762" role="paragraph" l10n="U" oldref="5">Database.Table.Company !="Sun"</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153016" role="paragraph" l10n="U" oldref="149">Database.Table.Company NEQ "Sun"</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id3153040" role="paragraph" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is "Sun Microsystems".</paragraph>
+               <paragraph xml-lang="en-US" id="par_id3153040" role="paragraph" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is not "Sun". (Exclamation sign represents a logical NOT.)</paragraph>
             </tablecell>
          </tablerow>
          <tablerow>
diff --git a/helpcontent2/source/text/swriter/01/05060100.xhp b/helpcontent2/source/text/swriter/01/05060100.xhp
index 8136edad04..5d3229fa81 100644
--- a/helpcontent2/source/text/swriter/01/05060100.xhp
+++ b/helpcontent2/source/text/swriter/01/05060100.xhp
@@ -5,7 +5,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2008 by Sun Microsystems, Inc.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,18 +32,13 @@
  *
  ************************************************************************
  -->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textswriter0105060100xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Type</title>
 <filename>/text/swriter/01/05060100.xhp</filename>
 </topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-06-26T15:24:37">UFI: sw.feature "Enhanced Writer fly frame positioning and alignment"   news://staroffice-news:119/openoffice.sw.features-6195447.1075794225974.JavaMail.root@so; dedr: reviewed
-YJ:checked</lastedited>
-</history>
 </meta>
 <body>
 <section id="typ">
author	Uwe Fischer <ufi@openoffice.org>	2009-12-07 12:35:04 +0100
committer	Uwe Fischer <ufi@openoffice.org>	2009-12-07 12:35:04 +0100
commit	5ce821dd59435366c5d8d3ca8a200f99a7fe3670 (patch)
tree	8ece5f32b62a1f71615f76e32a7402606648152b /helpcontent2
parent	60379d840d0dbb63dfe646c0ffe2c2b3457febc6 (diff)