From 3aa724aaa531f0a48d05cf109cb9cd73368754c6 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Fri, 26 Mar 2010 15:54:27 +0100
Subject: native0: branding Help - transplanted from 9dbf1800d8b2@native0

---
 helpcontent2/source/text/shared/00/00000021.xhp    |  16 +-
 helpcontent2/source/text/shared/00/00000207.xhp    |   5 +-
 helpcontent2/source/text/shared/01/02220100.xhp    |  10 +-
 helpcontent2/source/text/shared/01/04050000.xhp    |  16 +-
 helpcontent2/source/text/shared/01/06050600.xhp    |  12 +-
 .../source/text/shared/01/online_update.xhp        |  12 +-
 .../source/text/shared/01/ref_pdf_export.xhp       |  12 +-
 helpcontent2/source/text/shared/02/01170003.xhp    |   4 +-
 helpcontent2/source/text/shared/02/01170101.xhp    |  14 +-
 helpcontent2/source/text/shared/02/01170103.xhp    |  10 +-
 helpcontent2/source/text/shared/05/00000001.xhp    |  16 +-
 helpcontent2/source/text/shared/05/00000110.xhp    |  10 +-
 .../source/text/shared/autopi/01130000.xhp         |  10 +-
 .../source/text/shared/autopi/01130100.xhp         |  12 +-
 .../text/shared/explorer/database/30000000.xhp     |   2 +-
 .../shared/explorer/database/migrate_macros.xhp    |  10 +-
 .../text/shared/explorer/database/rep_main.xhp     |  26 ++--
 .../source/text/shared/guide/accessibility.xhp     |   4 +-
 .../source/text/shared/guide/change_title.xhp      |   6 +-
 .../text/shared/guide/digital_signatures.xhp       |   9 +-
 .../source/text/shared/guide/error_report.xhp      |   9 +-
 .../text/shared/guide/insert_specialchar.xhp       |  10 +-
 .../source/text/shared/guide/protection.xhp        |  10 +-
 helpcontent2/source/text/shared/main0500.xhp       |  10 +-
 helpcontent2/source/text/shared/main0650.xhp       |   4 +-
 .../source/text/shared/optionen/01010200.xhp       |  16 +-
 .../source/text/shared/optionen/01010300.xhp       |  20 +--
 .../source/text/shared/optionen/01010600.xhp       |   6 +-
 .../source/text/shared/optionen/01010800.xhp       |  12 +-
 .../source/text/shared/optionen/01041000.xhp       | 161 +++++++++++----------
 30 files changed, 236 insertions(+), 238 deletions(-)
 mode change 100755 => 100644 helpcontent2/source/text/shared/00/00000021.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/00/00000207.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/01/02220100.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/02/01170003.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/02/01170103.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/05/00000001.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/autopi/01130000.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/autopi/01130100.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/guide/change_title.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/guide/digital_signatures.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/guide/insert_specialchar.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/main0500.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/optionen/01010300.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/optionen/01010600.xhp
 mode change 100755 => 100644 helpcontent2/source/text/shared/optionen/01041000.xhp

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
old mode 100755
new mode 100644
index c34678c63b..f06d503a88
--- a/helpcontent2/source/text/shared/00/00000021.xhp
+++ b/helpcontent2/source/text/shared/00/00000021.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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">XML File Formats</title>
@@ -56,7 +56,7 @@
       <paragraph xml-lang="en-US" id="par_idN10725" role="note" 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 xml-lang="en-US" id="hd_id3156324" role="heading" level="2" l10n="CHG"
                  oldref="4">OpenDocument file format names</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154926" role="paragraph" 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 xml-lang="en-US" id="par_id3154926" role="paragraph" l10n="CHG" oldref="5">%PRODUCTNAME %PRODUCTVERSION uses the following file formats:</paragraph>
 <table id="tbl_id3109850">
          <tablerow>
             <tablecell>
@@ -193,7 +193,7 @@
                <paragraph xml-lang="en-US" id="par_id0519200811530375" role="tablehead" l10n="NEW">Date of standard approval by OASIS<comment>intl. community wants intl iso standard date formats</comment></paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0519200811530491" role="tablehead" 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>
@@ -226,7 +226,7 @@
                <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">-</paragraph>
             </tablecell>
             <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0519200811530471" role="tablecontent" 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>
          <tablerow>
@@ -242,7 +242,7 @@
          </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"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - 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 <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010200.xhp" name="Load/Save - General">Load/Save - General</link></emph> 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
old mode 100755
new mode 100644
index 9ccccd092c..97e46e82e8
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -51,7 +51,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
old mode 100755
new mode 100644
index abb8eb7dae..682c7e1036
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0102220100xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Description</title>
@@ -61,7 +61,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 a901472727..7dcd2334fd 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0104050000xml" indexer="include">
          <title xml-lang="en-US" id="tit">Comment</title>
@@ -57,7 +57,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>
@@ -81,8 +81,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>
@@ -92,7 +92,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 027c72c38b..2503313c57 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textshared0106050600xml" indexer="include">
 <title id="tit" xml-lang="en-US">Position</title>
@@ -45,7 +45,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>
@@ -83,7 +83,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 69268250b3..729756201b 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared01online_updatexml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Check for Updates </title>
@@ -54,7 +54,7 @@
       <paragraph xml-lang="en-US" id="par_id702230" role="paragraph" l10n="NEW">You can disable or enable the automatic check in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %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>
@@ -82,7 +82,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 3f2a595398..075f8c4e61 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared01ref_pdf_exportxml" indexer="include">
          <title xml-lang="en-US" id="tit">Export as PDF</title>
@@ -50,7 +50,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">
@@ -130,7 +130,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
old mode 100755
new mode 100644
index 6162ebb864..14d2138244
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
 <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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[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 fef3049042..2ef5330ef3 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0201170101xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">General</title>
@@ -241,7 +241,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">
@@ -255,7 +255,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">
@@ -769,7 +769,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
old mode 100755
new mode 100644
index ce5c6b0a2e..93d7b59b45
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0201170103xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Events</title>
@@ -103,7 +103,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
old mode 100755
new mode 100644
index dafa9972bf..1f8baee8e8
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0500000001xml" indexer="include">
          <title xml-lang="en-US" id="tit">Getting Support</title>
@@ -46,16 +46,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 a292c6a815..20317efc8f 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textshared0500000110xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">The %PRODUCTNAME Help Window</title>
@@ -42,7 +42,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
old mode 100755
new mode 100644
index 36d06f67f4..c8d6694e69
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
 <topic id="textsharedautopi01130000xml" indexer="include">
 <title id="tit" xml-lang="en-US">Document Converter</title>
@@ -47,7 +47,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
old mode 100755
new mode 100644
index 984037c25b..4899ec6659
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -48,15 +48,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 b7aef69fba..9c02ce07a1 100644
--- a/helpcontent2/source/text/shared/explorer/database/30000000.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/30000000.xhp
@@ -3,7 +3,7 @@
  ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
diff --git a/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp b/helpcontent2/source/text/shared/explorer/database/migrate_macros.xhp
old mode 100755
new mode 100644
index eef3bd7450..99a8adc119
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedexplorerdatabasemigrate_macrosxml" indexer="include">
          <title xml-lang="en-US" id="tit">Migrate Macros</title>
@@ -52,7 +52,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 c221910ad0..a5dfb8c7c1 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedexplorerdatabaserep_mainxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Report Builder</title>
@@ -53,7 +53,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>
@@ -149,7 +149,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>
@@ -184,7 +184,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>
@@ -193,12 +193,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>
@@ -206,7 +206,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>
@@ -220,7 +220,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>
@@ -228,7 +228,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>
@@ -242,7 +242,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 1eddc2f818..45deab4bfe 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -52,7 +52,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><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <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"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link name="%PRODUCTNAME - View" href="text/shared/optionen/01010800.xhp"><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
old mode 100755
new mode 100644
index c6c2782107..58527f35a4
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textsharedguidechange_titlexml" indexer="include" status="PUBLISH">
@@ -48,7 +48,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
old mode 100755
new mode 100644
index 0557189ce8..9812393661
--- a/helpcontent2/source/text/shared/guide/digital_signatures.xhp
+++ b/helpcontent2/source/text/shared/guide/digital_signatures.xhp
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <helpdocument version="1.0">
-	
 <!--
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +28,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguidedigital_signaturesxhp" indexer="include">
          <title xml-lang="en-US" id="tit">About Digital Signatures</title>
@@ -82,7 +81,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 9b3a63da5a..2eb0204da4 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideerror_reportxml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Error Report Tool</title>
@@ -48,7 +48,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
old mode 100755
new mode 100644
index 8d8b3b212f..ad1e8063e0
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -61,13 +61,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 b7bad61a10..d211c9ca54 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedguideprotectionxml" indexer="include">
          <title xml-lang="en-US" id="tit">Protecting Content in %PRODUCTNAME</title>
@@ -96,7 +96,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
old mode 100755
new mode 100644
index 9812ea4a2b..09f4b86a92
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,14 +32,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 e5df15fd11..fff1a69dbb 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -44,7 +44,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 2ba2aad431..d08a5427e6 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01010200xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">General</title>
@@ -96,7 +96,7 @@
       <paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="37">To change the location of the backup copy, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - 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"
@@ -153,8 +153,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"/>
@@ -172,7 +172,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
old mode 100755
new mode 100644
index c0239e661e..604e193e2f
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -59,8 +59,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>
@@ -88,7 +88,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="">
@@ -100,7 +100,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="">
@@ -112,7 +112,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="">
@@ -124,7 +124,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="">
@@ -136,7 +136,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="">
@@ -148,7 +148,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="">
@@ -160,7 +160,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
old mode 100755
new mode 100644
index 5aef697b19..48d27ca9e4
--- 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
  ************************************************************************
  -->
  
-	
+
 <meta>
       <topic id="textsharedoptionen01010600xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">General</title>
@@ -43,7 +43,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><comment>removed index "Open/Save dialogs", see i105788</comment>
+</bookmark>
 <paragraph xml-lang="en-US" id="par_id3155450" role="paragraph" l10n="E" oldref="42"
                  localize="false"/>
       <section id="allg">
diff --git a/helpcontent2/source/text/shared/optionen/01010800.xhp b/helpcontent2/source/text/shared/optionen/01010800.xhp
index 32608e089b..8b1ebcb2bb 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
  *
  ************************************************************************
  -->
- 
-	
+
+
 <meta>
       <topic id="textsharedoptionen01010800xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">View</title>
@@ -70,7 +70,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"/>
@@ -106,7 +106,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
old mode 100755
new mode 100644
index bc610db524..f208ba6438
--- a/helpcontent2/source/text/shared/optionen/01041000.xhp
+++ b/helpcontent2/source/text/shared/optionen/01041000.xhp
@@ -5,7 +5,7 @@
 ***********************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -32,92 +32,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
-- 
cgit 


From 867156600fc6bbef83b395ece8713547a8c7b1ad Mon Sep 17 00:00:00 2001
From: Uwe Fischer <ufi@openoffice.org>
Date: Tue, 2 Feb 2010 11:39:39 +0100
Subject: ppp02: i108824 Help changes

---
 helpcontent2/source/text/shared/optionen/01040400.xhp | 10 +++++-----
 helpcontent2/source/text/shared/optionen/01070400.xhp |  6 +++---
 helpcontent2/source/text/shared/optionen/01090100.xhp |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index bde5bb2d63..8689113dd4 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.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="textsharedoptionen01040400xml" indexer="include" status="PUBLISH">
          <title xml-lang="en-US" id="tit">Print</title>
@@ -96,7 +96,7 @@
 <paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="1" l10n="NEW">Hidden text</paragraph>
       <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="1" l10n="NEW">Text placeholder</paragraph>
+<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="1" l10n="NEW">Text placeholders</paragraph>
       <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
       <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="1" l10n="U"
                  oldref="15">Pages</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index 7c06be8c39..2337124982 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.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
@@ -65,8 +65,8 @@
 <embed href="text/shared/00/00000406.xhp#etopdk"/>
 </section><comment>removed contents-to-print section for impress, i85723</comment><paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="13">Print</paragraph>
 <paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="14">Defines additional elements to be printed on the page margin.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Page name</paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name of a document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Document name</paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the name of the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
diff --git a/helpcontent2/source/text/shared/optionen/01090100.xhp b/helpcontent2/source/text/shared/optionen/01090100.xhp
index eee7100256..8d080dfec6 100755
--- a/helpcontent2/source/text/shared/optionen/01090100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01090100.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,12 +63,12 @@
   <embed href="text/shared/00/00000406.xhp#formeinst"/>
 </section>
 <paragraph role="heading" id="hd_id3159234" xml-lang="en-US" level="2" l10n="U" oldref="2">Print options</paragraph>
-<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title row</paragraph>
+<bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="3" l10n="U" oldref="4">Title</paragraph>
 <paragraph role="paragraph" id="par_id3156347" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_TITLEROW">Specifies whether you want the name of the document to be included in the printout.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT" id="bm_id3146798" localize="false"/><paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="6">Formula text</paragraph>
 <paragraph role="paragraph" id="par_id3155449" xml-lang="en-US" l10n="U" oldref="7"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_EQUATION_TEXT">Specifies whether to include the contents of the <emph>Commands</emph> window at the bottom of the printout.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME" id="bm_id3154515" localize="false"/><paragraph role="heading" id="hd_id3154046" xml-lang="en-US" level="3" l10n="U" oldref="8">Border</paragraph>
-<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="STARMATH_CHECKBOX_RID_PRINTOPTIONPAGE_CB_FRAME">Applies a thin border to the formula area in the printout.</ahelp><emph>Title row</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
+<paragraph role="paragraph" id="par_id3149516" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid=".">Applies a thin border to the formula area in the printout.</ahelp> <emph>Title</emph> and <emph>Formula text</emph> are only set down by a frame if the corresponding check box is active.</paragraph>
 <paragraph role="heading" id="hd_id3153822" xml-lang="en-US" level="2" l10n="U" oldref="10">Print format</paragraph>
 <bookmark xml-lang="en-US" branch="hid/STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE" id="bm_id3151246" localize="false"/><paragraph role="heading" id="hd_id3150503" xml-lang="en-US" level="3" l10n="U" oldref="12">Original size</paragraph>
 <paragraph role="paragraph" id="par_id3153627" xml-lang="en-US" l10n="U" oldref="13"><ahelp hid="STARMATH_RADIOBUTTON_RID_PRINTOPTIONPAGE_RB_ORIGINAL_SIZE">Prints the formula without adjusting the current font size.</ahelp> It is possible that with large formulas a part of the command text is cut off.</paragraph>
-- 
cgit 


From bebdc16b9bceb1bb9c2769ada03ee481ee7303bc Mon Sep 17 00:00:00 2001
From: Uwe Fischer <ufi@openoffice.org>
Date: Tue, 9 Feb 2010 09:47:04 +0100
Subject: ppp02: i108824 help file correction

---
 helpcontent2/source/text/shared/optionen/01070400.xhp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index 2337124982..bb53a01858 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.xhp
@@ -65,8 +65,8 @@
 <embed href="text/shared/00/00000406.xhp#etopdk"/>
 </section><comment>removed contents-to-print section for impress, i85723</comment><paragraph role="heading" id="hd_id3150486" xml-lang="en-US" level="2" l10n="U" oldref="13">Print</paragraph>
 <paragraph role="paragraph" id="par_id3153092" xml-lang="en-US" l10n="CHG" oldref="14">Defines additional elements to be printed on the page margin.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Document name</paragraph>
-<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the name of the document.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME" id="bm_id3148645" localize="false"/><paragraph role="heading" id="hd_id3150104" xml-lang="en-US" level="3" l10n="U" oldref="15">Page name</paragraph>
+<paragraph role="paragraph" id="par_id3154146" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_PAGENAME">Specifies whether to print the page name.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
-- 
cgit 


From c67b2db0f764eb9e5fca43884a838eadfa00b234 Mon Sep 17 00:00:00 2001
From: Uwe Fischer <ufi@openoffice.org>
Date: Tue, 9 Feb 2010 16:44:40 +0100
Subject: ppp02: some more help changes

---
 helpcontent2/source/text/shared/01/01130000.xhp    | 124 +++++++++----------
 .../source/text/shared/optionen/01040400.xhp       | 133 +++++++++------------
 .../source/text/shared/optionen/01070400.xhp       |   2 +-
 3 files changed, 116 insertions(+), 143 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/01/01130000.xhp b/helpcontent2/source/text/shared/01/01130000.xhp
index 5c93b60480..a1ae07e854 100644
--- a/helpcontent2/source/text/shared/01/01130000.xhp
+++ b/helpcontent2/source/text/shared/01/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="textshared0101130000xml" indexer="include">
          <title xml-lang="en-US" id="tit">Print</title>
@@ -42,77 +42,70 @@
    </meta>
    <body>
 <bookmark xml-lang="en-US" branch="index" id="bm_id3154621"><bookmark_value>printing; documents</bookmark_value>
-      <bookmark_value>documents; printing</bookmark_value>
-      <bookmark_value>text documents; printing</bookmark_value>
-      <bookmark_value>spreadsheets; printing</bookmark_value>
-      <bookmark_value>presentations; print menu</bookmark_value>
-      <bookmark_value>drawings; printing</bookmark_value>
-      <bookmark_value>choosing printers</bookmark_value>
-      <bookmark_value>printers; choosing</bookmark_value>
-      <bookmark_value>print area selection</bookmark_value>
-      <bookmark_value>selecting; print areas</bookmark_value>
-      <bookmark_value>pages; selecting one to print</bookmark_value>
-      <bookmark_value>printing; selections</bookmark_value>
-      <bookmark_value>printing; copies</bookmark_value>
-      <bookmark_value>copies; printing</bookmark_value>
-      <bookmark_value>spoolfiles with Xprinter</bookmark_value>
-</bookmark><comment>MW deleted "selections;"</comment>
+<bookmark_value>documents; printing</bookmark_value>
+<bookmark_value>text documents; printing</bookmark_value>
+<bookmark_value>spreadsheets; printing</bookmark_value>
+<bookmark_value>presentations; print menu</bookmark_value>
+<bookmark_value>drawings; printing</bookmark_value>
+<bookmark_value>choosing printers</bookmark_value>
+<bookmark_value>printers; choosing</bookmark_value>
+<bookmark_value>print area selection</bookmark_value>
+<bookmark_value>selecting; print areas</bookmark_value>
+<bookmark_value>pages; selecting one to print</bookmark_value>
+<bookmark_value>printing; selections</bookmark_value>
+<bookmark_value>printing; copies</bookmark_value>
+<bookmark_value>copies; printing</bookmark_value>
+<bookmark_value>spoolfiles with Xprinter</bookmark_value>
+</bookmark>
 <bookmark xml-lang="en-US" branch="hid/SID_PRINTDOC" id="bm_id1076258" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.uno:Print" id="bm_id3147273" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:OK" id="bm_id0818200912034231" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:TabPages" id="bm_id0818200901305445" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/HID_PRINTDLG" id="bm_id081820090410118" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3154621" role="heading" level="1" l10n="U" oldref="1">Print</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3146946" role="paragraph" l10n="U" oldref="2"><variable id="druckentext"><ahelp hid=".uno:Print">Prints the current document, selection, or the pages that you specify. You can also set the print options for the current document.</ahelp>
 </variable> The printing options can vary according to the printer and the operating system that you use.</paragraph>
       <section id="howtoget">
          <embed href="text/shared/00/00000401.xhp#drucken"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW">
-         <emph>Printing text documents:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912284853" role="paragraph" l10n="NEW">The Print dialog consists of three main parts: A preview with navigation buttons, several tab pages with control elements specific to the current document type, and the Print, Cancel, and Help buttons. </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200901193992" role="paragraph" l10n="NEW">If you just want to know how to print your document, click any of the following links.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531416" role="paragraph" l10n="NEW"><emph>Printing text documents:</emph></paragraph>
       <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
       <embed href="text/swriter/guide/print_preview.xhp#print_preview"/>
       <embed href="text/swriter/guide/print_small.xhp#print_small"/>
       <embed href="text/swriter/guide/printing_order.xhp#printing_order"/>
       <embed href="text/swriter/guide/printer_tray.xhp#printer_tray"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW">
-         <emph>Printing spreadsheets:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531487" role="paragraph" l10n="NEW"><emph>Printing spreadsheets:</emph></paragraph>
       <embed href="text/scalc/guide/printranges.xhp#printranges"/>
       <embed href="text/scalc/guide/print_details.xhp#print_details"/>
       <embed href="text/scalc/guide/print_exact.xhp#print_exact"/>
       <embed href="text/scalc/guide/print_landscape.xhp#print_landscape"/>
       <embed href="text/scalc/guide/print_title_row.xhp#print_title_row"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW">
-         <emph>Printing presentations:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531410" role="paragraph" l10n="NEW"><emph>Printing presentations:</emph></paragraph>
       <embed href="text/simpress/guide/printing.xhp#printing"/>
       <embed href="text/simpress/guide/print_tofit.xhp#print_tofit"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW">
-         <emph>General printing:</emph>
-      </paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912531449" role="paragraph" l10n="NEW"><emph>General printing:</emph></paragraph>
       <embed href="text/shared/guide/print_faster.xhp#print_faster"/>
       <embed href="text/shared/guide/print_blackwhite.xhp#print_blackwhite"/>
       <embed href="text/shared/guide/pageformat_max.xhp#pageformat_max"/>
-      <paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_id0818200912284952" role="note" l10n="NEW">The settings that you define in the Print dialog are valid only for the current print job that you start by clicking the Print button. <comment>is this true for Printer Settings, too?</comment>If you want to change some options permanently, open Tools - Options - %PRODUCTNAME (application name) - Print.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3156080" role="paragraph" l10n="CHG" oldref="41"><switchinline select="appl"><caseinline select="WRITER">To set the default <item type="productname">%PRODUCTNAME</item> printer options for text documents, choose <link href="text/shared/optionen/01040400.xhp" name="Tools - Options - Writer - Print"><emph>Tools - Options - %PRODUCTNAME Writer - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_idN1099E" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="CALC">To set the default <item type="productname">%PRODUCTNAME</item> printer options for spreadsheet documents, choose <link href="text/shared/optionen/01060700.xhp" name="Tools - Options - Calc - Print"><emph>Tools - Options - %PRODUCTNAME Calc - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>. 
+<paragraph xml-lang="en-US" id="par_idN109CD" role="paragraph" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">To set the default <item type="productname">%PRODUCTNAME</item>printer options for presentation documents, choose <link href="text/shared/optionen/01070400.xhp" name="Tools - Options - Impress - Print"><emph>Tools - Options - %PRODUCTNAME Impress - Print</emph></link>.
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
-      <paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
+<paragraph xml-lang="en-US" id="par_id0818200901194137" role="note" l10n="NEW">Press Shift+F1 or choose <item type="menuitem">Help - What's This?</item> and point to any control element in the Print dialog to see an extended help text.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912284914" role="heading" level="2" l10n="NEW">Preview</paragraph>
+<paragraph xml-lang="en-US" id="par_id081820091228505" role="paragraph" l10n="NEW">The preview shows how each sheet of paper will look. You can browse through all sheets of paper with the buttons below the preview.</paragraph><comment>insert controls with hidden help here</comment>
 <paragraph xml-lang="en-US" id="hd_id0818200912285056" role="heading" level="2" l10n="NEW">General</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285064" role="paragraph" l10n="NEW">On the General tab page, you find the most important control elements for printing. You can define which contents of your document are to be printed. You can select the printer and open the printer settings dialog.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES" id="bm_id3147143" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid="SVTOOLS_LISTBOX_DLG_SVT_PRNDLG_PRINTDLG_LB_NAMES">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_PUSHBUTTON_DLG_SVT_PRNDLG_PRINTDLG_BTN_PROPERTIES" id="bm_id3150693" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog.</ahelp>The printer properties vary according to the printer that you select.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:PrinterList" id="bm_id3147144" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3149511" role="paragraph" l10n="CHG" oldref="4"><ahelp hid=".">The list box shows the installed printers. Click the printer to use for the current print job. Click the Printer details button to see some information about the selected printer. Click the Properties button to change some of the printer properties.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Properties" id="bm_id3150693" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3156113" role="paragraph" l10n="CHG" oldref="16"><ahelp hid="." visibility="hidden">Opens the printer properties dialog. The printer properties vary according to the printer that you select.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL_SHEETS" id="bm_id5816827" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0909200810043691" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enables all sheets to be printed. In the "Print range" area of the dialog, you can restrict this output to some given pages.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/svtools_RadioButton_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTED_SHEETS" id="bm_id6644489" localize="false"/>
@@ -128,40 +121,41 @@
 <bookmark xml-lang="en-US" branch="hid/sd_RadioButton_DLG_PRINTDIALOG_RBT_VERTICAL" id="bm_id939359" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0909200810043750" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For handouts, enable to print in a vertical order first.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_ALL" id="bm_id3149956" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:0" id="bm_id3149957" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3149164" role="paragraph" l10n="U" oldref="25"><ahelp hid="." visibility="hidden">Prints the entire document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_PAGES" id="bm_id3148924" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages </emph>box.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:1" id="bm_id3148924" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3152944" role="paragraph" l10n="U" oldref="27"><ahelp hid="." visibility="hidden">Prints only the pages that you specify in the <emph>Pages</emph> box.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES" id="bm_id3155629" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PageRange:Edit" id="bm_id0818200903284799" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVTOOLS_EDIT_DLG_SVT_PRNDLG_PRINTDLG_EDT_PAGES">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_RADIOBUTTON_DLG_SVT_PRNDLG_PRINTDLG_RBT_SELECTION" id="bm_id3149902" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id3146848" role="paragraph" l10n="U" oldref="28"><ahelp hid=".">To print a range of pages, use a format like 3-6. To print single pages, use a format like 7;9;11. You can print a combination of page ranges and single pages, by using a format like 3-6;8;10;12.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintContent:RadioButton:2" id="bm_id3149902" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150244" role="paragraph" l10n="U" oldref="30"><ahelp hid="." visibility="hidden">Prints only the selected area(s) or object(s) in the current document.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_NUMERICFIELD_DLG_SVT_PRNDLG_PRINTDLG_NUM_COPIES" id="bm_id3154347" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Copies" id="bm_id3154347" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="U" oldref="34"><ahelp hid="." visibility="hidden">Enter the number of copies that you want to print.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_COLLATE" id="bm_id3148663" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:JobPage:Collate" id="bm_id3148663" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150865" role="paragraph" l10n="U" oldref="36"><ahelp hid="." visibility="hidden">Preserves the page order of the original document.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285074" role="heading" level="2" l10n="NEW">%PRODUCTNAME Writer / Calc / Impress / Draw / Math</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285019" role="paragraph" l10n="NEW">The tab page with the same name as the current application can be used to define the contents, color, size, and pages to be printed. You define settings that are specific to the current document type.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285112" role="heading" level="2" l10n="NEW">Page Layout</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285150" role="paragraph" l10n="NEW">The Page Layout tab page can be used to save some sheets of paper by printing several pages onto each sheet of paper. You define the arrangement and size of output pages on the physical paper.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904164735" role="paragraph" l10n="NEW">Change the arrangement of pages to be printed on every sheet of paper. The preview shows how every final sheet of paper will look.</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200904102987" role="paragraph" l10n="NEW">For some document types, you can choose to print a brochure.</paragraph>
       <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
 <bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox" id="bm_id0818200903241442" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id0818200904102910" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">For brochure printing, you can select a left-to-right order of pages or a right-to-left order.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0818200912285138" role="heading" level="2" l10n="NEW">Options</paragraph>
+<paragraph xml-lang="en-US" id="par_id0818200912285146" role="paragraph" l10n="NEW">On the Options tab page you can set some additional options for the current print job. Here you can specify to print to a file instead of printing on a printer.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVTOOLS_CHECKBOX_DLG_SVT_PRNDLG_PRINTDLG_CBX_FILEPRINT" id="bm_id3156955" localize="false"/>
 <paragraph xml-lang="en-US" id="par_id3150772" role="paragraph" l10n="CHG" oldref="18"><ahelp hid="." visibility="hidden">Prints to a file instead of to a printer. When this option is enabled, the Print button is renamed to Print to file...</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints 
+<paragraph xml-lang="en-US" id="hd_id0819200910481678" role="heading" level="2" l10n="NEW"><switchinline select="sys"><caseinline select="UNIX">Unix hints
 </caseinline></switchinline><comment>are these still needed?</comment></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example: 
+<paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="47"><switchinline select="sys"><caseinline select="UNIX">If you want, you can use the STAR_SPOOL_DIR environment variable to specify the directory where the Xprinter spoolfiles are saved. For example:
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or 
+<paragraph xml-lang="en-US" id="par_id3154330" role="paragraph" l10n="U" oldref="48"><switchinline select="sys"><caseinline select="UNIX">setenv STAR_SPOOL_DIR /usr/local/tmp (in the csh/tcsh) or
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash) 
+<paragraph xml-lang="en-US" id="par_id3150768" role="paragraph" l10n="U" oldref="49"><switchinline select="sys"><caseinline select="UNIX">export STAR_SPOOL_DIR=/usr/local/tmp (in the sh/bash)
 </caseinline></switchinline></paragraph>
-      <paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options. 
+<paragraph xml-lang="en-US" id="par_id3150449" role="paragraph" l10n="U" oldref="50"><switchinline select="sys"><caseinline select="UNIX">You can also use the <link href="text/shared/guide/spadmin.xhp" name="spadmin printer setup program">spadmin printer setup program</link> to specify additional printer options.
 </caseinline></switchinline></paragraph>
-   </body>
+</body>
 </helpdocument>
diff --git a/helpcontent2/source/text/shared/optionen/01040400.xhp b/helpcontent2/source/text/shared/optionen/01040400.xhp
index 8689113dd4..da7d2ea6ee 100644
--- a/helpcontent2/source/text/shared/optionen/01040400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01040400.xhp
@@ -43,120 +43,99 @@
    <body>
       <section id="drucken">
 <bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>pictures; printing</bookmark_value>
-         <bookmark_value>tables in text; printing</bookmark_value>
-         <bookmark_value>drawings; printing in text documents </bookmark_value>
-         <bookmark_value>controls; printing</bookmark_value>
-         <bookmark_value>backgrounds; printing</bookmark_value>
-         <bookmark_value>printing; elements in text documents</bookmark_value>
-         <bookmark_value>text documents; print settings</bookmark_value>
-         <bookmark_value>printing; text always in black</bookmark_value>
-         <bookmark_value>black printing in Calc</bookmark_value>
-         <bookmark_value>printing; left/right pages</bookmark_value>
-         <bookmark_value>even/odd pages;printing</bookmark_value>
-         <bookmark_value>printing; text in reverse order</bookmark_value>
-         <bookmark_value>reversing printing order</bookmark_value>
-         <bookmark_value>brochures; printing several</bookmark_value>
-         <bookmark_value>printing; brochures</bookmark_value>
-         <bookmark_value>comments; printing in text</bookmark_value>
-         <bookmark_value>printing; creating individual jobs</bookmark_value>
-         <bookmark_value>faxes;selecting a fax machine</bookmark_value>
+<bookmark_value>tables in text; printing</bookmark_value>
+<bookmark_value>drawings; printing in text documents </bookmark_value>
+<bookmark_value>controls; printing</bookmark_value>
+<bookmark_value>backgrounds; printing</bookmark_value>
+<bookmark_value>printing; elements in text documents</bookmark_value>
+<bookmark_value>text documents; print settings</bookmark_value>
+<bookmark_value>printing; text always in black</bookmark_value>
+<bookmark_value>black printing in Calc</bookmark_value>
+<bookmark_value>printing; left/right pages</bookmark_value>
+<bookmark_value>even/odd pages;printing</bookmark_value>
+<bookmark_value>printing; text in reverse order</bookmark_value>
+<bookmark_value>reversing printing order</bookmark_value>
+<bookmark_value>brochures; printing several</bookmark_value>
+<bookmark_value>printing; brochures</bookmark_value>
+<bookmark_value>comments; printing in text</bookmark_value>
+<bookmark_value>printing; creating individual jobs</bookmark_value>
+<bookmark_value>faxes;selecting a fax machine</bookmark_value>
 </bookmark><comment>mw made "fax machine selection" a two level entry</comment>
 <bookmark xml-lang="en-US" branch="hid/HID_OPTPRINT_PAGE" id="bm_id3153750" localize="false"/>
 <paragraph xml-lang="en-US" id="hd_id3156414" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01040400.xhp" name="Print">Print</link></paragraph>
-         <paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
-      </section>
+<paragraph xml-lang="en-US" id="par_id3152801" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_OPTPRINT_PAGE">Specifies print settings within a text or HTML document.</ahelp></paragraph>
+</section>
       <section id="howtoget">
          <embed href="text/shared/00/00000406.xhp#drucken1"/>
       </section>
-      <paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="1" l10n="U" oldref="3">Contents</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
+<paragraph xml-lang="en-US" id="par_id3153542" role="note" l10n="CHG" oldref="44">The print settings defined on this tab page apply to all subsequent print jobs, until you change the settings again. If you want to change the settings for the current print job only, use the <emph>File - Print</emph> dialog.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156330" role="heading" level="2" l10n="U" oldref="3">Contents</paragraph>
+<paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="U" oldref="4">Specifies which document contents are to be printed. </paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF" id="bm_id3145674" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="1" l10n="U" oldref="5">Graphics</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox" id="bm_id3145675" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3156156" role="heading" level="2" l10n="U" oldref="5">Graphics</paragraph>
+<paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="6"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF">Specifies whether the graphics of your text document are printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB" id="bm_id3148564" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="1" l10n="U" oldref="7">Tables</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150771" role="heading" level="2" l10n="U" oldref="7">Tables</paragraph>
+<paragraph xml-lang="en-US" id="par_id3148943" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PTAB">Specifies whether the tables of the text document are printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW" id="bm_id3154923" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="1" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U" oldref="9">Drawings (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="par_id3149457" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PDRAW">Specifies whether graphics created with $[officename] drawing functions are printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD" id="bm_id3151210" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="1" l10n="U"
-                 oldref="11">Controls</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND" id="bm_id3154684" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
-                 oldref="13">Background</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintControls:CheckBox" id="bm_id3151211" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153525" role="heading" level="2" l10n="U" oldref="11">Controls</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3158408" role="paragraph" l10n="CHG" oldref="12"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD">Specifies whether the form control fields of the text document are printed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox" id="bm_id3154684" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="2" l10n="U" oldref="13">Background</paragraph>
+      <paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="CHG" oldref="14"><ahelp hid=".">Specifies whether to include colors and objects that are inserted to the background of the page (Format - Page - Background) in the printed document.</ahelp><comment>UFI: fixes #i21977#</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT" id="bm_id3144760" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="1" l10n="U"
-                 oldref="40">Print black</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox" id="bm_id3144761" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id3150868" role="heading" level="2" l10n="U" oldref="40">Print black</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149562" role="paragraph" l10n="U" oldref="42"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT">Specifies whether to always print text in black.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_HIDDEN_TEXT" id="bm_id342722" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="1" l10n="NEW">Hidden text</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox" id="bm_id342723" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id8004394" role="heading" level="2" l10n="NEW">Hidden text</paragraph>
       <paragraph xml-lang="en-US" id="par_id2021546" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text that is marked as hidden.</ahelp> The following hidden text is printed: text that is formatted as hidden by <link href="text/shared/01/05020200.xhp">Format - Character - Font Effects - Hidden</link>, and the text fields <link href="text/swriter/01/04090003.xhp">Hidden text and Hidden paragraphs</link>.<comment>UFI: sorry, due to a bug no links allowed in extended help text</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_TEXT_PLACEHOLDER" id="bm_id5788750" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="1" l10n="NEW">Text placeholders</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox" id="bm_id5788750" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id2623981" role="heading" level="2" l10n="NEW">Text placeholder</paragraph>
       <paragraph xml-lang="en-US" id="par_id7242042" role="paragraph" l10n="NEW"><ahelp hid=".">Enable this option to print text placeholders. Disable this option to leave the text placeholders blank in the printout.</ahelp><link href="text/swriter/01/04090003.xhp">Text placeholders</link> are fields.</paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="1" l10n="U"
-                 oldref="15">Pages</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3151115" role="heading" level="2" l10n="U" oldref="15">Pages</paragraph>
       <paragraph xml-lang="en-US" id="par_id3145365" role="paragraph" l10n="U" oldref="16">Defines the print order for $[officename] Writer documents with multiple pages.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP" id="bm_id3148618" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="1" l10n="U"
-                 oldref="17">Left pages (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150874" role="heading" level="2" l10n="U" oldref="17">Left pages (not for HTML documents)</paragraph>
       <paragraph xml-lang="en-US" id="par_id3149665" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_LEFTP">Specifies whether to print all left (even numbered) pages of the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP" id="bm_id3147213" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="1" l10n="U"
-                 oldref="19">Right pages (not for HTML documents)</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152885" role="heading" level="2" l10n="U" oldref="19">Right pages (not for HTML documents)</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150103" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_RIGHTP">Specifies whether to print all right (odd numbered) pages of the document.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE" id="bm_id3153142" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="1" l10n="U"
-                 oldref="21">Reversed</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148577" role="heading" level="2" l10n="U" oldref="21">Reversed</paragraph>
       <paragraph xml-lang="en-US" id="par_id3150486" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_REVERSE">Specifies whether to reverse the printing order. The last page of the document will then be the first one printed.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT" id="bm_id3155306" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="1" l10n="U"
-                 oldref="23">Brochure</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147318" role="heading" level="2" l10n="U" oldref="23">Brochure</paragraph>
       <paragraph xml-lang="en-US" id="par_id3155417" role="paragraph" l10n="U" oldref="24"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT">Select the<emph> Brochure </emph>option to print your document in brochure format.</ahelp> The brochure format is as follows in $[officename] Writer:</paragraph>
       <section id="brochure">
          <paragraph xml-lang="en-US" id="par_id3149410" role="paragraph" l10n="CHG" oldref="25">If you print a document in portrait on a landscape page, two opposing sides in a brochure will be printed next to each other. If you have a printer with double-sided printing capability, you can create an entire brochure from your document without having to collate the pages later. If you have a printer that only has single-sided printing capability, you can achieve this effect by first printing the front pages with the "Front sides / right pages /odd pages" option marked, then re-inserting the entire paper stack in your printer and printing all the back pages with the "Back pages / left pages / even pages" option marked.</paragraph>
       </section>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PROSPECT_RTL" id="bm_id8632770" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="1" l10n="NEW">Right to left</paragraph>
+<paragraph xml-lang="en-US" id="hd_id9475386" role="heading" level="2" l10n="NEW">Right to left</paragraph>
       <paragraph xml-lang="en-US" id="par_id7894222" role="paragraph" l10n="NEW"><ahelp hid=".">Check to print the pages of the brochure in the correct order for a right-to-left script.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U"
-                 oldref="26">Comments</paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3149300" role="heading" level="2" l10n="U" oldref="26">Comments</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO" id="bm_id3157847" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3150095" role="heading" level="1" l10n="U"
-                 oldref="28">None</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO">Specifies that comments in your document are not printed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY" id="bm_id3153948" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3155601" role="heading" level="3" l10n="U"
-                 oldref="30">Comments only</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146988" role="paragraph" l10n="U" oldref="31"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY">Specifies that comments in your document are printed, but not the actual text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END" id="bm_id3154272" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153839" role="heading" level="1" l10n="U"
-                 oldref="32">End of document</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3146789" role="paragraph" l10n="U" oldref="33"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END">Specifies that comments are printed at the end of the document, after the actual text. </ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND" id="bm_id3157868" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3155066" role="heading" level="1" l10n="U"
-                 oldref="34">End of page</paragraph>
-      <paragraph xml-lang="en-US" id="par_id3154360" role="paragraph" l10n="U" oldref="35"><ahelp hid="SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND">Specifies that comments are printed on an extra page that follows each page containing comments.</ahelp></paragraph>
-      <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U"
-                 oldref="45">Other</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox" id="bm_id3157848" localize="false"/>
+      <paragraph xml-lang="en-US" id="par_id3151320" role="paragraph" l10n="U" oldref="29"><ahelp hid=".">Specifies whether comments in your document are printed.</ahelp></paragraph>
+      <paragraph xml-lang="en-US" id="hd_id3148916" role="heading" level="2" l10n="U" oldref="45">Other</paragraph>
 <bookmark xml-lang="en-US" branch="hid/sw_CheckBox_TP_OPTPRINT_PAGE_CB_PRINTEMPTYPAGES" id="bm_id2646870" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="1" l10n="NEW">Print automatically inserted blank pages</paragraph>
+<bookmark xml-lang="en-US" branch="hid/.HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox" id="bm_id2646871" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id4188055" role="heading" level="2" l10n="NEW">Print automatically inserted blank pages</paragraph>
       <paragraph xml-lang="en-US" id="par_id8295541" role="paragraph" l10n="CHG"><ahelp hid=".">If this option is enabled, automatically-inserted blank pages are being printed. This is best if you are printing double-sided. For example, in a book, a "chapter" paragraph style has been set to always start with an odd numbered page. If the previous chapter ends on an odd page, %PRODUCTNAME inserts an even numbered blank page. This option controls whether to print that even numbered page or not.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS" id="bm_id3153713" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="1" l10n="CHG"
-                 oldref="47">Create single print jobs</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145642" role="heading" level="2" l10n="CHG" oldref="47">Create single print jobs</paragraph>
       <paragraph xml-lang="en-US" id="par_id3147338" role="paragraph" l10n="U" oldref="48"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_SINGLEJOBS">Specifies that each new print job will begin on a new page even if you are using a duplex printer.</ahelp> If this field is not checked then it is possible that the first page of the second copy is printed on the reverse side of the last page of the first copy, especially if there are an odd number of pages.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP" id="bm_id3149107" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="1" l10n="U"
-                 oldref="41">Paper tray from printer settings</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156384" role="heading" level="2" l10n="U" oldref="41">Paper tray from printer settings</paragraph>
       <paragraph xml-lang="en-US" id="par_id3146316" role="paragraph" l10n="U" oldref="37"><ahelp hid="SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP">For printers with multiple trays, the "Paper tray from printer settings" option specifies whether the paper tray used is specified by the system settings of the printer.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX" id="bm_id3155336" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="1" l10n="U"
-                 oldref="38">Fax</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3147362" role="heading" level="2" l10n="U" oldref="38">Fax</paragraph>
       <paragraph xml-lang="en-US" id="par_id3154703" role="paragraph" l10n="U" oldref="39"><ahelp hid="SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX">If you have installed fax software on your computer and wish to fax directly from the text document, select the desired fax machine.</ahelp></paragraph>
       <section id="relatedtopics">
          <embed href="text/swriter/guide/print_brochure.xhp#print_brochure"/>
diff --git a/helpcontent2/source/text/shared/optionen/01070400.xhp b/helpcontent2/source/text/shared/optionen/01070400.xhp
index bb53a01858..6462863997 100755
--- a/helpcontent2/source/text/shared/optionen/01070400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01070400.xhp
@@ -70,7 +70,7 @@
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE" id="bm_id3152598" localize="false"/><paragraph role="heading" id="hd_id3147214" xml-lang="en-US" level="3" l10n="U" oldref="17">Date</paragraph>
 <paragraph role="paragraph" id="par_id3152938" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_DATE">Specifies whether to print the current date.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME" id="bm_id3159345" localize="false"/><paragraph role="heading" id="hd_id3149301" xml-lang="en-US" level="3" l10n="U" oldref="19">Time</paragraph>
-<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies wither to print the current time.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3156285" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_TIME">Specifies whether to print the current time.</ahelp></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES" id="bm_id3148457" localize="false"/><paragraph role="heading" id="hd_id3154097" xml-lang="en-US" level="3" l10n="U" oldref="23">Hidden pages</paragraph>
 <paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SD:CHECKBOX:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES">Specifies whether to print the pages that are currently hidden from the presentation.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3154686" xml-lang="en-US" level="2" l10n="U" oldref="43">Quality</paragraph>
-- 
cgit 


From 62cd454460b7212fd695dde32f9f99029ed10727 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Fri, 26 Mar 2010 16:32:15 +0100
Subject: native0: some last changes to Help content - transplanted from
 c7b5a24b2dcf@native0

---
 helpcontent2/source/text/shared/00/00000002.xhp                | 4 ++--
 helpcontent2/source/text/shared/05/00000110.xhp                | 4 ++--
 helpcontent2/source/text/shared/explorer/database/rep_main.xhp | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/00/00000002.xhp b/helpcontent2/source/text/shared/00/00000002.xhp
index 55ee485e80..25ddb8c548 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 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -112,7 +112,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/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp
index 20317efc8f..0ff57de8c9 100644
--- a/helpcontent2/source/text/shared/05/00000110.xhp
+++ b/helpcontent2/source/text/shared/05/00000110.xhp
@@ -42,8 +42,8 @@
 <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 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>
+<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 in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help.</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>
       <table id="tbl_id3155555">
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index a5dfb8c7c1..05116569b5 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -56,7 +56,7 @@
             <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>
+            <paragraph xml-lang="en-US" id="par_id973540" role="paragraph" l10n="NEW">Click the "Get it!" icon. The file "report-builder.oxt" will be downloaded to your computer.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id4680928" role="paragraph" l10n="NEW">Switch back from your web browser to the %PRODUCTNAME window. The Extension Manager should still be visible.</paragraph>
@@ -65,8 +65,8 @@
             <paragraph xml-lang="en-US" id="par_id9014252" role="paragraph" l10n="NEW">In the Extension Manager, click Add to open the Add extensions dialog.</paragraph>
          </listitem>
          <listitem>
-            <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the "sun-report-builder.oxt" file that you downloaded. Click Open.</paragraph>
-            <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Sun Report Builder extension.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id6011841" role="paragraph" l10n="NEW">Select the "report-builder.oxt" file that you downloaded. Click Open.</paragraph>
+            <paragraph xml-lang="en-US" id="par_id2591326" role="paragraph" l10n="NEW">This starts the installation of the Report Builder extension.</paragraph>
          </listitem>
          <listitem>
             <paragraph xml-lang="en-US" id="par_id6201666" role="paragraph" l10n="NEW">Read the license. If you accept the license, click Accept to continue the installation.</paragraph>
-- 
cgit 


From 1f2d13b88f289a78f8ada4cbb67f8e4d8656b961 Mon Sep 17 00:00:00 2001
From: Uwe Fischer <ufi@openoffice.org>
Date: Thu, 18 Mar 2010 11:57:39 +0100
Subject: native0: Help changes

---
 helpcontent2/source/text/shared/05/00000001.xhp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/05/00000001.xhp b/helpcontent2/source/text/shared/05/00000001.xhp
index 1f8baee8e8..84d2171457 100644
--- a/helpcontent2/source/text/shared/05/00000001.xhp
+++ b/helpcontent2/source/text/shared/05/00000001.xhp
@@ -48,14 +48,14 @@
 </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 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"><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.<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="par_id0915200811081778" role="paragraph" l10n="NEW">You can access web forums to ask and answer questions about OpenOffice.org.</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>
-- 
cgit 


From b492d602f513df442570b122b39439a469a0a488 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 31 Mar 2010 12:39:18 +0200
Subject: native0: Help changes - transplanted from d7d1b083c28bf@native0

---
 helpcontent2/source/text/shared/optionen/01020100.xhp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/optionen/01020100.xhp b/helpcontent2/source/text/shared/optionen/01020100.xhp
index 8a64e3b04b..3405f64a6b 100644
--- a/helpcontent2/source/text/shared/optionen/01020100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020100.xhp
@@ -58,7 +58,7 @@
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="11">Accesses the Internet without a proxy server. Allows you to set up a connection directly on your computer to an Internet provider that does not use a proxy.</paragraph>
 <paragraph role="heading" id="hd_id3150984" xml-lang="en-US" level="4" l10n="U" oldref="14">Manual</paragraph>
 <paragraph role="paragraph" id="par_id3156155" xml-lang="en-US" l10n="U" oldref="15">Lets you enter the proxy server manually. Specify the proxy servers in accordance with your Internet service. Ask your system administrator for the proxies and ports to enter.</paragraph>
-<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.sun.com, not http://www.sun.com.</paragraph>
+<paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.example.com, not http://www.example.com.</paragraph>
 <paragraph role="heading" id="par_idN10684" xml-lang="en-US" level="4" l10n="NEW">System</paragraph>
 <paragraph role="paragraph" id="par_idN10688" xml-lang="en-US" l10n="NEW">On Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to use the system settings. You must restart %PRODUCTNAME to initiate this setting.<comment>UFI: see spec "System-Settings"</comment></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
-- 
cgit 


From b8c8bb11b416ff6e8b7bfae919328fcd60838306 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 31 Mar 2010 12:42:44 +0200
Subject: native0: Help changes - transplanted from eebd7b934c4b@native0

---
 helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
index 48d1ffaf79..f94ada5bef 100644
--- a/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
+++ b/helpcontent2/source/text/shared/guide/hyperlink_rel_abs.xhp
@@ -59,7 +59,7 @@
 <paragraph role="listitem" id="par_id3159158" xml-lang="en-US" l10n="U" oldref="49">An absolute path such as "C:\homepage\graphics\picture.gif" would no longer function on the provider server. Neither a server nor the computer of a reader needs to have a C hard drive: operating systems such as Unix or MacOS do not recognize drive letters, and even if the folder homepage\graphics existed, your picture would not be available. It is better to use relative addressing for file links.</paragraph>
 </listitem>
 <listitem>
-<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.sun.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
+<paragraph role="listitem" id="par_id3154046" xml-lang="en-US" l10n="U" oldref="50">A link to a web page, for example, "www.example.com" or "www.myprovider.com/mypage/index.html" is an absolute link.</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3155450" xml-lang="en-US" l10n="U" oldref="51">$[officename] also reacts differently, depending on whether the file referred to in the link exists, and where it is located. $[officename] checks every new link and sets a target and protocol automatically. The result can be seen in the generated HTML code after saving the source document.</paragraph>
-- 
cgit 


From 90f1ab229c0877820548f22493d2167d46f6da91 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 31 Mar 2010 12:45:12 +0200
Subject: native0: Help changes - transplanted from ecc84915e9cb@native0

---
 helpcontent2/source/text/shared/01/02210101.xhp | 2 +-
 helpcontent2/source/text/shared/01/05020400.xhp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'helpcontent2/source/text/shared')

diff --git a/helpcontent2/source/text/shared/01/02210101.xhp b/helpcontent2/source/text/shared/01/02210101.xhp
index 2ed842d901..4fe85239c3 100755
--- a/helpcontent2/source/text/shared/01/02210101.xhp
+++ b/helpcontent2/source/text/shared/01/02210101.xhp
@@ -53,7 +53,7 @@
 <paragraph role="paragraph" id="par_id3156414" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SFX2:EDIT:TP_FRAMEPROPERTIES:ED_URL">Enter the path and the name of the file that you want to display in the floating frame. You can also click the <emph>...</emph> button and locate the file that you want to display.</ahelp> For example, you can enter:</paragraph>
 <list type="unordered">
 <listitem>
-<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.sun.com</paragraph>
+<paragraph role="listitem" id="par_id3147399" xml-lang="en-US" l10n="U" oldref="7">http://www.example.com</paragraph>
 </listitem>
 <listitem>
 <paragraph role="listitem" id="par_id3153683" xml-lang="en-US" l10n="U" oldref="8">file:///c|/Readme.txt </paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020400.xhp b/helpcontent2/source/text/shared/01/05020400.xhp
index ce926e5ebb..8a38474ff4 100644
--- a/helpcontent2/source/text/shared/01/05020400.xhp
+++ b/helpcontent2/source/text/shared/01/05020400.xhp
@@ -27,7 +27,7 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************-->
-	
+
 <helpdocument version="1.0">
 <meta>
 <topic id="textshared0105020400xml" indexer="include" status="PUBLISH">
@@ -64,7 +64,7 @@
 <paragraph role="paragraph" id="par_id3156113" xml-lang="en-US" l10n="U" oldref="13">Specify the properties for the hyperlink.</paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:EDIT:TP_CHAR_URL:ED_URL" id="bm_id3148685" localize="false"/>
 <paragraph role="heading" id="hd_id3166410" xml-lang="en-US" level="3" l10n="U" oldref="14">URL</paragraph>
-<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame. 
+<paragraph role="paragraph" id="par_id3153332" xml-lang="en-US" l10n="U" oldref="15"><variable id="texturl"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_URL">Enter a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link> for the file that you want to open when you click the hyperlink.</ahelp> If you do not specify a target frame, the file opens in the current document or frame.
 </variable></paragraph>
 <bookmark xml-lang="en-US" branch="hid/SW:PUSHBUTTON:TP_CHAR_URL:PB_URL" id="bm_id3150771" localize="false"/>
 <paragraph role="heading" id="hd_id3153716" xml-lang="en-US" level="3" l10n="U" oldref="16">Browse</paragraph>
@@ -79,12 +79,12 @@
 <paragraph role="heading" id="hd_id3153348" xml-lang="en-US" level="3" l10n="U" oldref="30">Name</paragraph>
 <section id="textname">
 <paragraph role="paragraph" id="par_id3156023" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SW:EDIT:TP_CHAR_URL:ED_NAME">Enter a name for the hyperlink.</ahelp> $[officename] inserts a NAME tag in the hyperlink:</paragraph>
-<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.sun.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
+<paragraph role="paragraph" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="34">&lt;A HREF="http://www.example.com/" NAME="Nametext" TARGET="_blank"&gt;Note&lt;/A&gt;</paragraph>
 </section>
 <bookmark xml-lang="en-US" branch="hid/SW:COMBOBOX:TP_CHAR_URL:LB_TARGET" id="bm_id3146795" localize="false"/>
 <paragraph role="heading" id="hd_id3155923" xml-lang="en-US" level="3" l10n="U" oldref="20">Frame</paragraph>
 <section id="textframe2">
-<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window. 
+<paragraph role="paragraph" id="par_id3147559" xml-lang="en-US" l10n="U" oldref="21"><variable id="textframe"><ahelp hid="SW:COMBOBOX:TP_CHAR_URL:LB_TARGET">Enter the name of the frame that you want the linked file to open in, or select a predefined frame from the list.</ahelp> If you leave this box blank, the linked file opens in the current browser window.
 </variable></paragraph>
 </section>
 <paragraph role="heading" id="hd_id3149656" xml-lang="en-US" level="2" l10n="U" oldref="22">Character Styles</paragraph>
-- 
cgit