CWS-TOOLING: integrate CWS native0

3 files changed, 13 insertions, 12 deletions

diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index ccea435549..afea379883 100755
--- a/helpcontent2/source/text/shared/00/00000002.xhp
+++ b/helpcontent2/source/text/shared/00/00000002.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
@@ -115,7 +115,7 @@
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159125"><bookmark_value>Java; definition</bookmark_value>
 </bookmark>
 <paragraph role="heading" id="hd_id3159125" xml-lang="en-US" level="2" l10n="U" oldref="92">Java</paragraph>
-<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language developed by Sun Microsystems, Inc. (http://www.sun.com) that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
+<paragraph role="paragraph" id="par_id3153188" xml-lang="en-US" l10n="CHG" oldref="93">The Java programming language is a platform independent programming language that is especially suited for use in the Internet. Web pages and applications programmed with Java class files can be used on all modern operating systems. Programs using Java programming language are usually developed in a Java development environment and then compiled to a "byte code".</paragraph>
 </section>
 <section id="plugin">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3159153"><bookmark_value>plug-ins; definition</bookmark_value>
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">