summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text')
-rwxr-xr-xhelpcontent2/source/text/sbasic/shared/03120401.xhp2
-rw-r--r--helpcontent2/source/text/scalc/01/04090000.xhp74
-rwxr-xr-xhelpcontent2/source/text/scalc/01/06030000.xhp76
-rw-r--r--helpcontent2/source/text/scalc/02/06030000.xhp89
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/database_filter.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/dbase_files.xhp177
-rw-r--r--helpcontent2/source/text/scalc/guide/note_insert.xhp12
-rw-r--r--helpcontent2/source/text/schart/01/04050100.xhp12
-rw-r--r--helpcontent2/source/text/schart/01/choose_chart_type.xhp2
-rw-r--r--helpcontent2/source/text/schart/01/type_stock.xhp26
-rw-r--r--helpcontent2/source/text/schart/01/wiz_data_range.xhp2
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/schart/main0202.xhp0
-rwxr-xr-xhelpcontent2/source/text/sdraw/main0210.xhp10
-rw-r--r--helpcontent2/source/text/shared/00/00000021.xhp15
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp63
-rw-r--r--helpcontent2/source/text/shared/01/01020000.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/02180000.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/02220100.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/01/05020700.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/05030600.xhp142
-rw-r--r--helpcontent2/source/text/shared/01/05280000.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/06010000.xhp116
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010600.xhp30
-rwxr-xr-xhelpcontent2/source/text/shared/01/06010601.xhp10
-rw-r--r--helpcontent2/source/text/shared/01/06040100.xhp8
-rw-r--r--helpcontent2/source/text/shared/01/extensionupdate.xhp95
-rw-r--r--helpcontent2/source/text/shared/02/02130000.xhp8
-rw-r--r--helpcontent2/source/text/shared/02/02140000.xhp14
-rwxr-xr-xhelpcontent2/source/text/shared/04/01010000.xhp26
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/11000000.xhp63
-rw-r--r--helpcontent2/source/text/shared/autokorr/makefile.mk3
-rwxr-xr-xhelpcontent2/source/text/shared/autopi/webwizard01.xhp4
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp6
-rwxr-xr-xhelpcontent2/source/text/shared/guide/activex.xhp3
-rwxr-xr-xhelpcontent2/source/text/shared/guide/fontwork.xhp2
-rwxr-xr-xhelpcontent2/source/text/shared/guide/formfields.xhp148
-rwxr-xr-xhelpcontent2/source/text/shared/guide/imagemap.xhp42
-rwxr-xr-xhelpcontent2/source/text/shared/guide/import_ms.xhp104
-rw-r--r--helpcontent2/source/text/shared/guide/keyboard.xhp70
-rwxr-xr-xhelpcontent2/source/text/shared/guide/paintbrush.xhp17
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining.xhp73
-rwxr-xr-xhelpcontent2/source/text/shared/guide/redlining_enter.xhp96
-rw-r--r--helpcontent2/source/text/shared/guide/start_parameters.xhp5
-rw-r--r--helpcontent2/source/text/shared/optionen/01020400.xhp4
-rw-r--r--helpcontent2/source/text/shared/optionen/01060100.xhp213
-rwxr-xr-xhelpcontent2/source/text/simpress/00/00000405.xhp8
-rw-r--r--helpcontent2/source/text/simpress/02/10100000.xhp11
-rw-r--r--helpcontent2/source/text/simpress/02/10120000.xhp7
-rw-r--r--helpcontent2/source/text/simpress/guide/background.xhp162
-rwxr-xr-xhelpcontent2/source/text/simpress/main0210.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/04090200.xhp10
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05030800.xhp20
-rwxr-xr-xhelpcontent2/source/text/swriter/01/06040000.xhp55
-rw-r--r--helpcontent2/source/text/swriter/guide/background.xhp29
-rw-r--r--helpcontent2/source/text/swriter/guide/indices_form.xhp4
-rw-r--r--helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp9
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/text_capital.xhp8
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/words_count.xhp8
-rwxr-xr-xhelpcontent2/source/text/swriter/main0208.xhp6
59 files changed, 1067 insertions, 1170 deletions
diff --git a/helpcontent2/source/text/sbasic/shared/03120401.xhp b/helpcontent2/source/text/sbasic/shared/03120401.xhp
index fc2b6e0d79..f04e8de952 100755
--- a/helpcontent2/source/text/sbasic/shared/03120401.xhp
+++ b/helpcontent2/source/text/sbasic/shared/03120401.xhp
@@ -51,7 +51,7 @@ DEDR: Reviewed</lastedited>
<paragraph role="paragraph" id="par_id3153990" xml-lang="en-US" l10n="U" oldref="2">Returns the position of a string within another string.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3147303" xml-lang="en-US" l10n="U" oldref="3">The Instr function returns the position at which the match was found. If the string was not found, the function returns 0.</paragraph>
-<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="1" l10n="U" oldref="4">Syntax:</paragraph>
+<paragraph role="heading" id="hd_id3145090" xml-lang="en-US" level="2" l10n="U" oldref="4">Syntax:</paragraph>
<paragraph role="code" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">InStr ([Start As Long,] Text1 As String, Text2 As String[, Compare])</paragraph>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="2" l10n="U" oldref="6">Return value:</paragraph>
<paragraph role="paragraph" id="par_id3149763" xml-lang="en-US" l10n="U" oldref="7">Integer</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04090000.xhp b/helpcontent2/source/text/scalc/01/04090000.xhp
index 666c5a20fa..33d32d1017 100644
--- a/helpcontent2/source/text/scalc/01/04090000.xhp
+++ b/helpcontent2/source/text/scalc/01/04090000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 04090000.xhp,v $
- * $Revision: 1.8 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,44 +30,41 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0104090000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Link to External Data</title>
-<filename>/text/scalc/01/04090000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T13:51:02">UFI: changed name of menu (sc-features Calc: New menu entry "Sheet from File" in Insert menu)
-dedr: reviewed</lastedited>
-</history>
-</meta>
-<body>
-<section id="extdata">
-<paragraph role="paragraph" id="par_id3153361" xml-lang="en-US" l10n="E" oldref="1" localize="false"/>
+ <topic id="textscalc0104090000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Link to External Data</title>
+ <filename>/text/scalc/01/04090000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="extdata">
+ <paragraph xml-lang="en-US" id="par_id3153361" role="paragraph" l10n="E" oldref="1"
+ localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" id="bm_id3151041" localize="false"/>
-<paragraph role="paragraph" id="par_id3153192" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" visibility="hidden">Locate the file containing the data you want to insert.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SID_EXTERNAL_SOURCE" id="bm_id3748965" localize="false"/><!-- HID added by script -->
+<paragraph xml-lang="en-US" id="par_id3153192" role="paragraph" l10n="U" oldref="2"><ahelp hid="SC_PUSHBUTTON_RID_SCDLG_LINKAREA_BTN_BROWSE" visibility="hidden">Locate the file containing the data you want to insert.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/SID_EXTERNAL_SOURCE" id="bm_id3748965" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertExternalDataSource" id="bm_id3150441" localize="false"/>
-<paragraph role="heading" id="hd_id3145785" xml-lang="en-US" level="1" l10n="CHG" oldref="3"><link href="text/scalc/01/04090000.xhp" name="External Data">Link to External Data</link></paragraph>
-<paragraph role="paragraph" id="par_id3149262" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:InsertExternalDataSourc">Inserts data from an HTML, Calc, or Excel file into the current sheet as a link. The data must be located within a named range.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3146120" xml-lang="en-US" l10n="U" oldref="11">To import data from a <link href="text/scalc/guide/csv_formula.xhp" name="*.csv or *.txt">*.csv or *.txt</link> file, choose <emph>File - Open</emph> and then select the <emph>Files of type </emph>"Text CSV".</paragraph>
-<section id="howtoget">
- <embed href="text/scalc/00/00000404.xhp#eiextdata"/>
-</section>
-<embed href="text/scalc/guide/webquery.xhp#webquery"/>
+<paragraph xml-lang="en-US" id="hd_id3145785" role="heading" level="1" l10n="CHG"
+ oldref="3"><link href="text/scalc/01/04090000.xhp" name="External Data">Link to External Data</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149262" role="paragraph" l10n="U" oldref="4"><ahelp hid=".uno:InsertExternalDataSourc">Inserts data from an HTML, Calc, or Excel file into the current sheet as a link. The data must be located within a named range.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000404.xhp#eiextdata"/>
+ </section>
+ <embed href="text/scalc/guide/webquery.xhp#webquery"/>
<bookmark xml-lang="en-US" branch="hid/HID_SCDLG_LINKAREAURL" id="bm_id3148577" localize="false"/>
-<paragraph role="heading" id="hd_id3146984" xml-lang="en-US" level="2" l10n="U" oldref="5">URL of external data source.</paragraph>
-<paragraph role="paragraph" id="par_id3145366" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="HID_SCDLG_LINKAREAURL">Enter the URL or the file name that contains the data that you want to insert, and then press <item type="keycode">Enter</item>.</ahelp><comment>only after Enter the URL will be requested from the net.</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146984" role="heading" level="2" l10n="U" oldref="5">URL of external data source.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145366" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_SCDLG_LINKAREAURL">Enter the URL or the file name that contains the data that you want to insert, and then press Enter.</ahelp><comment>only after Enter the URL will be requested from the net.</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES" id="bm_id3153876" localize="false"/>
-<paragraph role="heading" id="hd_id3145251" xml-lang="en-US" level="2" l10n="U" oldref="7">Available tables/ranges</paragraph>
-<paragraph role="paragraph" id="par_id3147397" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES">Select the table or the data range that you want to insert.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145251" role="heading" level="2" l10n="U" oldref="7">Available tables/ranges</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147397" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC_MULTILISTBOX_RID_SCDLG_LINKAREA_LB_RANGES">Select the table or the data range that you want to insert.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCDLG_LINKAREA_BTN_RELOAD" id="bm_id3153418" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY" id="bm_id3150718" localize="false"/>
-<paragraph role="heading" id="hd_id3154492" xml-lang="en-US" level="2" l10n="U" oldref="9">Update every</paragraph>
-<paragraph role="paragraph" id="par_id3154017" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY">Enter the number of seconds to wait before the external data are reloaded into the current document.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id3154492" role="heading" level="2" l10n="U" oldref="9">Update every</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154017" role="paragraph" l10n="U" oldref="10"><ahelp hid="SC_NUMERICFIELD_RID_SCDLG_LINKAREA_NF_DELAY">Enter the number of seconds to wait before the external data are reloaded into the current document.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/01/06030000.xhp b/helpcontent2/source/text/scalc/01/06030000.xhp
index 625d7d8159..da46cee8a8 100755
--- a/helpcontent2/source/text/scalc/01/06030000.xhp
+++ b/helpcontent2/source/text/scalc/01/06030000.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,40 +32,38 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textscalc0106030000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Detective</title>
-<filename>/text/scalc/01/06030000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-03-21T12:43:49">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="detektiv">
+ <topic id="textscalc0106030000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Detective</title>
+ <filename>/text/scalc/01/06030000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="detektiv">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151245"><bookmark_value>cell links search</bookmark_value>
-<bookmark_value>searching; links in cells</bookmark_value>
-<bookmark_value>traces;precedents and dependents</bookmark_value>
-</bookmark><comment>mw made "searching..." a two level entry</comment>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06030000.xhp" name="Detective">Detective</link></paragraph>
-<paragraph role="paragraph" id="par_id3151211" xml-lang="en-US" l10n="U" oldref="2">This command activates the Spreadsheet Detective. With the Detective, you can trace the dependencies from the current formula cell to the cells in the spreadsheet.</paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/scalc/00/00000406.xhp#exdektv"/>
-</section>
-<paragraph role="paragraph" id="par_id3150447" xml-lang="en-US" l10n="U" oldref="3">Once you have defined a trace, you can point with the mouse cursor to the trace. The mouse cursor will change its shape. Double-click the trace with this cursor to select the referenced cell at the end of the trace. <comment>If you define an icon in the spreadsheet, you can put your cursor on it. It will change into a magnifying glass with reference arrows. Double-click the visible icon to select the cell at the furthest end of the icon.</comment></paragraph>
-<embed href="text/scalc/01/06030100.xhp#spurzumvorgaenger"/>
-<embed href="text/scalc/01/06030200.xhp#spurzumvorgaengerentfernen"/>
-<embed href="text/scalc/01/06030300.xhp#spurzumnachfolger"/>
-<embed href="text/scalc/01/06030400.xhp#spurzumnachfolgerentfernen"/>
-<embed href="text/scalc/01/06030500.xhp#allespurenentfernen"/>
-<embed href="text/scalc/01/06030600.xhp#spurzumfehler"/>
-<embed href="text/scalc/01/06030800.xhp#dateneinkreisen"/>
-<embed href="text/scalc/01/06030900.xhp#spurenaktualisieren"/>
-<embed href="text/scalc/01/06031000.xhp#autoaktu"/>
-<embed href="text/scalc/01/06030700.xhp#fuellmodus"/>
-</body>
-</helpdocument>
+ <bookmark_value>searching; links in cells</bookmark_value>
+ <bookmark_value>traces;precedents and dependents</bookmark_value>
+ <bookmark_value>Formula Auditing,see Detective</bookmark_value>
+ <bookmark_value>Detective</bookmark_value>
+</bookmark><comment>MW added "Detective" and a cross-reference</comment>
+<paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06030000.xhp" name="Detective">Detective</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151211" role="paragraph" l10n="U" oldref="2">This command activates the Spreadsheet Detective. With the Detective, you can trace the dependencies from the current formula cell to the cells in the spreadsheet.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/scalc/00/00000406.xhp#exdektv"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3150447" role="paragraph" l10n="U" oldref="3">Once you have defined a trace, you can point with the mouse cursor to the trace. The mouse cursor will change its shape. Double-click the trace with this cursor to select the referenced cell at the end of the trace. <comment>If you define an icon in the spreadsheet, you can put your cursor on it. It will change into a magnifying glass with reference arrows. Double-click the visible icon to select the cell at the furthest end of the icon.</comment></paragraph>
+ <embed href="text/scalc/01/06030100.xhp#spurzumvorgaenger"/>
+ <embed href="text/scalc/01/06030200.xhp#spurzumvorgaengerentfernen"/>
+ <embed href="text/scalc/01/06030300.xhp#spurzumnachfolger"/>
+ <embed href="text/scalc/01/06030400.xhp#spurzumnachfolgerentfernen"/>
+ <embed href="text/scalc/01/06030500.xhp#allespurenentfernen"/>
+ <embed href="text/scalc/01/06030600.xhp#spurzumfehler"/>
+ <embed href="text/scalc/01/06030800.xhp#dateneinkreisen"/>
+ <embed href="text/scalc/01/06030900.xhp#spurenaktualisieren"/>
+ <embed href="text/scalc/01/06031000.xhp#autoaktu"/>
+ <embed href="text/scalc/01/06030700.xhp#fuellmodus"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/02/06030000.xhp b/helpcontent2/source/text/scalc/02/06030000.xhp
index 169b590001..7170c23c2c 100644
--- a/helpcontent2/source/text/scalc/02/06030000.xhp
+++ b/helpcontent2/source/text/scalc/02/06030000.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06030000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,51 +32,41 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalc0206030000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Sum</title>
-<filename>/text/scalc/02/06030000.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
- <section id="summe">
-
-
+ <topic id="textscalc0206030000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Sum</title>
+ <filename>/text/scalc/02/06030000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="summe">
<bookmark xml-lang="en-US" branch="index" id="bm_id3157909"><bookmark_value>functions;sum function icon</bookmark_value>
-<bookmark_value>formula bar;sum function</bookmark_value>
-<bookmark_value>sum icon</bookmark_value>
+ <bookmark_value>formula bar;sum function</bookmark_value>
+ <bookmark_value>sum icon</bookmark_value>
+ <bookmark_value>AutoSum button, see sum icon</bookmark_value>
</bookmark>
-
-<bookmark xml-lang="en-US" branch="hid/HID_INSWIN_SUMME" id="bm_id3151384" localize="false"/>
- <comment>mw deleted "sum function..."</comment>
- <paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/02/06030000.xhp" name="Sum">Sum</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="CHG" oldref="2"><ahelp hid="HID_INSWIN_SUMME">Inserts the sum of a cell range into the current cell, or inserts sum values into selected cells. Click in a cell, click this icon, and optionally adjust the cell range. Or select some cells into which the sum values will be inserted, then click the icon.</ahelp></paragraph>
-
- </section>
- <section id="sysumme">
-
- <table id="tbl_id3150868">
-
-
- <tablerow>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="E">
-<image id="img_id3147434" src="res/commandimagelist/sc_autosum.png" width="0.222inch" height="0.222inch"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
+<bookmark xml-lang="en-US" branch="hid/HID_INSWIN_SUMME" id="bm_id3151384" localize="false"/><comment>MW inserted a cross-reference</comment>
+<paragraph xml-lang="en-US" id="hd_id3157909" role="heading" level="1" l10n="U" oldref="1"><link href="text/scalc/02/06030000.xhp" name="Sum">Sum</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150543" role="paragraph" l10n="CHG" oldref="2"><ahelp hid="HID_INSWIN_SUMME">Inserts the sum of a cell range into the current cell, or inserts sum values into selected cells. Click in a cell, click this icon, and optionally adjust the cell range. Or select some cells into which the sum values will be inserted, then click the icon.</ahelp></paragraph>
+ </section>
+ <section id="sysumme">
+ <table id="tbl_id3150868">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3153770" role="paragraph" l10n="E">
+<image id="img_id3147434" src="res/commandimagelist/sc_autosum.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id3147434">Icon</alt>
</image></paragraph>
- </tablecell>
- <tablecell>
- <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="15">Sum</paragraph>
- </tablecell>
- </tablerow>
- </table>
-
- </section>
- <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="U" oldref="16">$[officename] automatically suggests a cell range, provided that the spreadsheet contains data. If the cell range already contains a sum function, you can combine it with the new one to yield the total sum of the range. If the range contains filters, the Subtotal function is inserted instead of the Sum function.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153189" role="paragraph" l10n="U" oldref="3">Click the <emph>Accept</emph> icon (green check mark) to use the formula displayed in the input line.</paragraph>
- </body>
-</helpdocument>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152577" role="paragraph" l10n="U" oldref="15">Sum</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
+
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="U" oldref="16">$[officename] automatically suggests a cell range, provided that the spreadsheet contains data. If the cell range already contains a sum function, you can combine it with the new one to yield the total sum of the range. If the range contains filters, the Subtotal function is inserted instead of the Sum function.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153189" role="paragraph" l10n="U" oldref="3">Click the <emph>Accept</emph> icon (green check mark) to use the formula displayed in the input line.</paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/database_filter.xhp b/helpcontent2/source/text/scalc/guide/database_filter.xhp
index 2a008bbcb8..5ca87ae1ee 100755
--- a/helpcontent2/source/text/scalc/guide/database_filter.xhp
+++ b/helpcontent2/source/text/scalc/guide/database_filter.xhp
@@ -50,7 +50,7 @@
oldref="47"><variable id="database_filter"><link href="text/scalc/guide/database_filter.xhp" name="Filtering Cell Ranges">Filtering Cell Ranges</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3145069" role="paragraph" l10n="CHG" oldref="48">You can use several filters to filter cell ranges in spreadsheets. A standard filter uses the options that you specify to filter the data. An AutoFilter filters data according to a specific value or string. An advanced filter uses filter criteria from specified cells.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10682" role="heading" level="1" l10n="CHG">To Apply a Standard Filter to a Cell Range</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10682" role="heading" level="2" l10n="CHG">To Apply a Standard Filter to a Cell Range</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3150398" role="listitem" l10n="CHG" oldref="50">Click in a cell range.</paragraph>
@@ -66,7 +66,7 @@
<paragraph xml-lang="en-US" id="par_id3153143" role="paragraph" l10n="U" oldref="52">The records that match the filter options that you specified are shown.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3153728" role="heading" level="1" l10n="CHG"
+ <paragraph xml-lang="en-US" id="par_id3153728" role="heading" level="2" l10n="CHG"
oldref="53">To Apply an AutoFilter to a Cell Range</paragraph>
<list type="ordered">
<listitem>
@@ -85,7 +85,7 @@
<paragraph xml-lang="en-US" id="par_idN1074C" role="listitem" l10n="NEW">The records that match the filter criteria that you selected are shown.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_idN106E8" role="heading" level="1" l10n="CHG">To Remove a Filter From a Cell Range</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E8" role="heading" level="2" l10n="CHG">To Remove a Filter From a Cell Range</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_idN1075C" role="paragraph" l10n="CHG">Click in a filtered cell range.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/dbase_files.xhp b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
index ec3ee09e85..afa716e021 100755
--- a/helpcontent2/source/text/scalc/guide/dbase_files.xhp
+++ b/helpcontent2/source/text/scalc/guide/dbase_files.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: dbase_files.xhp,v $
- * $Revision: 1.13 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,89 +32,89 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textscalcguidedbase_filesxhp" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Importing and Exporting dBASE Files </title>
-<filename>/text/scalc/guide/dbase_files.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textscalcguidedbase_filesxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Importing and Exporting dBASE Files </title>
+ <filename>/text/scalc/guide/dbase_files.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id1226844"><bookmark_value>exporting;spreadsheets to dBASE</bookmark_value>
-<bookmark_value>importing;dBASE files</bookmark_value>
-<bookmark_value>dBASE import/export</bookmark_value>
-<bookmark_value>spreadsheets; importing from/exporting to dBASE files</bookmark_value>
-<bookmark_value>tables in databases;importing dBASE files</bookmark_value>
-</bookmark><comment>mw changed "database tables;" to "tables in databases;" and reduced "spreadsheets;" from two to one entry</comment><paragraph role="heading" id="par_idN10738" xml-lang="en-US" level="1" l10n="NEW"><variable id="dbase_files"><link href="text/scalc/guide/dbase_files.xhp">Importing and Exporting dBASE Files</link>
+ <bookmark_value>importing;dBASE files</bookmark_value>
+ <bookmark_value>dBASE import/export</bookmark_value>
+ <bookmark_value>spreadsheets; importing from/exporting to dBASE files</bookmark_value>
+ <bookmark_value>tables in databases;importing dBASE files</bookmark_value>
+</bookmark><comment>mw changed "database tables;" to "tables in databases;" and reduced "spreadsheets;" from two to one entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10738" role="heading" level="1" l10n="NEW"><variable id="dbase_files"><link href="text/scalc/guide/dbase_files.xhp">Importing and Exporting dBASE Files</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_idN10756" xml-lang="en-US" l10n="CHG">You can open and save data in the dBASE file format (*.dbf file extension) in $[officename] Base or a spreadsheet. In %PRODUCTNAME Base, a dBASE database is a folder that contains files with the .dbf file extension. Each file corresponds to a table in the database. Formulas and formatting are lost when you open and save a dBASE file from %PRODUCTNAME.</paragraph>
-<paragraph role="heading" id="par_idN10759" xml-lang="en-US" level="2" l10n="NEW">To Import a dBASE File Into a Spreadsheet</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10760" xml-lang="en-US" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1071F" xml-lang="en-US" l10n="NEW">Locate the *.dbf file that you want to import. </paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10768" xml-lang="en-US" l10n="NEW">Click <emph>Open</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10730" xml-lang="en-US" l10n="NEW">The <emph>Import dBASE files</emph> dialog opens.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10774" xml-lang="en-US" l10n="NEW">Click <emph>OK</emph>.</paragraph>
-<paragraph role="paragraph" id="par_idN10777" xml-lang="en-US" l10n="NEW">The dBASE file opens as a new Calc spreadsheet.</paragraph>
-<paragraph role="warning" id="par_idN1074E" xml-lang="en-US" l10n="NEW">If you want to save the spreadsheet as a dBASE file, do not alter or delete the first row in the imported file. This row contains information that is required by a dBASE database.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN1077A" xml-lang="en-US" level="2" l10n="NEW">To Import a dBASE File Into a Database Table</paragraph>
-<paragraph role="paragraph" id="par_idN1076C" xml-lang="en-US" l10n="NEW">A %PRODUCTNAME Base database table is actually a link to an existing database.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10796" xml-lang="en-US" l10n="NEW">Choose <item type="menuitem">File - New - Database</item>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10786" xml-lang="en-US" l10n="NEW">In the <emph>File name</emph> box of the <emph>Save As</emph> dialog, enter a name for the database.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10792" xml-lang="en-US" l10n="NEW">Click <emph>Save</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1079A" xml-lang="en-US" l10n="NEW">In the <emph>Database type </emph>box of the <emph>Database Properties</emph> dialog, select "dBASE".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107A6" xml-lang="en-US" l10n="NEW">Click <emph>Next</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107AE" xml-lang="en-US" l10n="NEW">Click <emph>Browse</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107B6" xml-lang="en-US" l10n="NEW">Locate the directory that contains the dBASE file, and click <emph>OK</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107BE" xml-lang="en-US" l10n="NEW">Click <emph>Create</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="par_idN107F1" xml-lang="en-US" level="2" l10n="NEW">To Export a Spreadsheet to a dBASE File</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN107F8" xml-lang="en-US" l10n="NEW">Choose <emph>File - Export</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10800" xml-lang="en-US" l10n="NEW">In the <emph>File format</emph> box, select "dBASE file".</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN107F9" xml-lang="en-US" l10n="NEW">In the <emph>File name</emph> box, type a name for the dBASE file.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10801" xml-lang="en-US" l10n="NEW">Click <emph>Export</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="note" id="par_idN10808" xml-lang="en-US" l10n="NEW">Only the data on the current sheet is exported.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
-<embed href="text/shared/guide/data_dbase2office.xhp#data_dbase2office"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10756" role="paragraph" l10n="CHG">You can open and save data in the dBASE file format (*.dbf file extension) in $[officename] Base or a spreadsheet. In %PRODUCTNAME Base, a dBASE database is a folder that contains files with the .dbf file extension. Each file corresponds to a table in the database. Formulas and formatting are lost when you open and save a dBASE file from %PRODUCTNAME.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10759" role="heading" level="2" l10n="NEW">To Import a dBASE File Into a Spreadsheet</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10760" role="paragraph" l10n="NEW">Choose <emph>File - Open</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1071F" role="paragraph" l10n="NEW">Locate the *.dbf file that you want to import. </paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10768" role="paragraph" l10n="NEW">Click <emph>Open</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10730" role="paragraph" l10n="NEW">The <emph>Import dBASE files</emph> dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10774" role="paragraph" l10n="NEW">Click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10777" role="paragraph" l10n="NEW">The dBASE file opens as a new Calc spreadsheet.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1074E" role="warning" l10n="NEW">If you want to save the spreadsheet as a dBASE file, do not alter or delete the first row in the imported file. This row contains information that is required by a dBASE database.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1077A" role="heading" level="2" l10n="NEW">To Import a dBASE File Into a Database Table</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1076C" role="paragraph" l10n="NEW">A %PRODUCTNAME Base database table is actually a link to an existing database.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10796" role="paragraph" l10n="NEW">Choose <item type="menuitem">File - New - Database</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10786" role="paragraph" l10n="NEW">In the <emph>File name</emph> box of the <emph>Save As</emph> dialog, enter a name for the database.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10792" role="paragraph" l10n="NEW">Click <emph>Save</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1079A" role="paragraph" l10n="NEW">In the <emph>Database type </emph>box of the <emph>Database Properties</emph> dialog, select "dBASE".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107A6" role="paragraph" l10n="NEW">Click <emph>Next</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107AE" role="paragraph" l10n="NEW">Click <emph>Browse</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B6" role="paragraph" l10n="NEW">Locate the directory that contains the dBASE file, and click <emph>OK</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107BE" role="paragraph" l10n="NEW">Click <emph>Create</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN107F1" role="heading" level="2" l10n="NEW">To Save a Spreadsheet as a dBASE File</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107F8" role="paragraph" l10n="NEW">Choose <emph>File - Save As</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10800" role="paragraph" l10n="NEW">In the <emph>File format</emph> box, select "dBASE file".</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107F9" role="paragraph" l10n="NEW">In the <emph>File name</emph> box, type a name for the dBASE file.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10801" role="paragraph" l10n="NEW">Click <emph>Save</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN10808" role="note" l10n="NEW">Only the data on the current sheet is exported.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/data_im_export.xhp#data_im_export"/>
+ <embed href="text/shared/guide/data_dbase2office.xhp#data_dbase2office"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/scalc/guide/note_insert.xhp b/helpcontent2/source/text/scalc/guide/note_insert.xhp
index 9b79cc472f..e42ad03860 100644
--- a/helpcontent2/source/text/scalc/guide/note_insert.xhp
+++ b/helpcontent2/source/text/scalc/guide/note_insert.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="textscalcguidenote_insertxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Inserting and Editing Comments</title>
@@ -43,11 +43,11 @@
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3153968"><bookmark_value>comments; on cells</bookmark_value>
<bookmark_value>cells;comments</bookmark_value>
- <bookmark_value>comments; on cells</bookmark_value>
<bookmark_value>remarks on cells</bookmark_value>
<bookmark_value>formatting;comments on cells</bookmark_value>
<bookmark_value>viewing;comments on cells</bookmark_value>
-</bookmark>
+ <bookmark_value>displaying; comments</bookmark_value>
+</bookmark><comment>MW deleted double index "comments;on cells" and copied "displaying;comments" from shared/optionen/01060100.xhp</comment>
<paragraph xml-lang="en-US" id="hd_id3153968" role="heading" level="1" l10n="U"
oldref="31"><variable id="note_insert"><link href="text/scalc/guide/note_insert.xhp" name="Inserting and Editing Comments">Inserting and Editing Comments</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/schart/01/04050100.xhp b/helpcontent2/source/text/schart/01/04050100.xhp
index 37a65ed1d8..849c4182fd 100644
--- a/helpcontent2/source/text/schart/01/04050100.xhp
+++ b/helpcontent2/source/text/schart/01/04050100.xhp
@@ -97,19 +97,19 @@
<paragraph xml-lang="en-US" id="par_id7971434" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Enable Show equation to see the equation of the regression curve.</ahelp></paragraph><comment>hid</comment>
<paragraph xml-lang="en-US" id="par_id558793" role="paragraph" l10n="CHG"><ahelp hid="." visibility="hidden">Enable Show Coefficient of Determination to see the determination coefficient of the regression curve.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_id7735221" role="paragraph" l10n="NEW">You can also calculate the parameters using Calc functions as follows.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id5744193" role="heading" level="1" l10n="NEW">The linear regression equation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5744193" role="heading" level="2" l10n="NEW">The linear regression equation</paragraph>
<paragraph xml-lang="en-US" id="par_id9251991" role="paragraph" l10n="NEW">The <emph>linear regression</emph> follows the equation <item type="literal">y=m*x+b</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id7951902" role="code" l10n="NEW">m = SLOPE(Data_Y;Data_X) </paragraph>
<paragraph xml-lang="en-US" id="par_id6637165" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;Data_X) </paragraph>
<paragraph xml-lang="en-US" id="par_id7879268" role="paragraph" l10n="NEW">Calculate the coefficient of determination by</paragraph>
<paragraph xml-lang="en-US" id="par_id9244361" role="code" l10n="NEW">r² = RSQ(Data_Y;Data_X) </paragraph>
<paragraph xml-lang="en-US" id="par_id2083498" role="paragraph" l10n="NEW">Besides m, b and r² the array function <emph>LINEST</emph> provides additional statistics for a regression analysis.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id2538834" role="heading" level="1" l10n="NEW">The logarithm regression equation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2538834" role="heading" level="2" l10n="NEW">The logarithm regression equation</paragraph>
<paragraph xml-lang="en-US" id="par_id394299" role="paragraph" l10n="NEW">The <emph>logarithm regression</emph> follows the equation <item type="literal">y=a*ln(x)+b</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id2134159" role="code" l10n="NEW">a = SLOPE(Data_Y;LN(Data_X)) </paragraph>
<paragraph xml-lang="en-US" id="par_id5946531" role="code" l10n="NEW">b = INTERCEPT(Data_Y ;LN(Data_X)) </paragraph>
<paragraph xml-lang="en-US" id="par_id5649281" role="code" l10n="NEW">r² = RSQ(Data_Y;LN(Data_X)) </paragraph>
- <paragraph xml-lang="en-US" id="hd_id7874080" role="heading" level="1" l10n="NEW">The exponential regression equation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id7874080" role="heading" level="2" l10n="NEW">The exponential regression equation</paragraph>
<paragraph xml-lang="en-US" id="par_id4679097" role="paragraph" l10n="NEW"> For exponential regression curves a transformation to a linear model takes place. The optimal curve fitting is related to the linear model and the results are interpreted accordingly. </paragraph>
<paragraph xml-lang="en-US" id="par_id9112216" role="paragraph" l10n="NEW">The exponential regression follows the equation <item type="literal">y=b*exp(a*x)</item> or <item type="literal">y=b*m^x</item>, which is transformed to <item type="literal">ln(y)=ln(b)+a*x</item> or <item type="literal">ln(y)=ln(b)+ln(m)*x</item> respectively.</paragraph>
<paragraph xml-lang="en-US" id="par_id4416638" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);Data_X) </paragraph>
@@ -119,12 +119,12 @@
<paragraph xml-lang="en-US" id="par_id7127292" role="paragraph" l10n="NEW">Calculate the coefficient of determination by</paragraph>
<paragraph xml-lang="en-US" id="par_id5437177" role="code" l10n="NEW">r² = RSQ(LN(Data_Y);Data_X) </paragraph>
<paragraph xml-lang="en-US" id="par_id6946317" role="paragraph" l10n="NEW">Besides m, b and r² the array function LOGEST provides additional statistics for a regression analysis.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id6349375" role="heading" level="1" l10n="NEW">The power regression equation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id6349375" role="heading" level="2" l10n="NEW">The power regression equation</paragraph>
<paragraph xml-lang="en-US" id="par_id1857661" role="paragraph" l10n="NEW"> For <emph>power regression</emph> curves a transformation to a linear model takes place. The power regression follows the equation <item type="literal">y=b*x^a</item> , which is transformed to <item type="literal">ln(y)=ln(b)+a*ln(x)</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_id8517105" role="code" l10n="NEW">a = SLOPE(LN(Data_Y);LN(Data_X)) </paragraph>
<paragraph xml-lang="en-US" id="par_id9827265" role="code" l10n="NEW">b = EXP(INTERCEPT(LN(Data_Y);LN(Data_X)) </paragraph>
<paragraph xml-lang="en-US" id="par_id2357249" role="code" l10n="NEW">r² = RSQ(LN(Data_Y);LN(Data_X)) </paragraph>
- <paragraph xml-lang="en-US" id="hd_id9204077" role="heading" level="1" l10n="NEW">Constraints<comment>UFI: is this still so?</comment></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9204077" role="heading" level="2" l10n="NEW">Constraints<comment>UFI: is this still so?</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id7393719" role="paragraph" l10n="CHG"> The calculation of the trend line considers only data pairs with the following values:</paragraph>
<list type="ordered">
<listitem>
@@ -138,7 +138,7 @@
</listitem>
</list>
<paragraph xml-lang="en-US" id="par_id181279" role="paragraph" l10n="NEW">You should transform your data accordingly; it is best to work on a copy of the original data and transform the copied data.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id7907040" role="heading" level="1" l10n="NEW">The polynomial regression equation</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id7907040" role="heading" level="2" l10n="NEW">The polynomial regression equation</paragraph>
<paragraph xml-lang="en-US" id="par_id8918729" role="paragraph" l10n="NEW">A <emph>polynomial regression</emph> curve cannot be added automatically. You must calculate this curve manually. </paragraph>
<paragraph xml-lang="en-US" id="par_id33875" role="paragraph" l10n="NEW">Create a table with the columns x, x², x³, … , xⁿ, y up to the desired degree n. </paragraph>
<paragraph xml-lang="en-US" id="par_id8720053" role="paragraph" l10n="NEW">Use the formula <item type="literal">=LINEST(Data_Y,Data_X)</item> with the complete range x to xⁿ (without headings) as Data_X. </paragraph>
diff --git a/helpcontent2/source/text/schart/01/choose_chart_type.xhp b/helpcontent2/source/text/schart/01/choose_chart_type.xhp
index 9a72c4d7be..b9a2613c0e 100644
--- a/helpcontent2/source/text/schart/01/choose_chart_type.xhp
+++ b/helpcontent2/source/text/schart/01/choose_chart_type.xhp
@@ -47,7 +47,7 @@
<section id="howtoget">
<embed href="text/schart/00/00000004.xhp#wiz"/>
</section>
- <paragraph xml-lang="en-US" id="hd_id6820886" role="heading" level="1" l10n="NEW">The available chart types</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id6820886" role="heading" level="2" l10n="NEW">The available chart types</paragraph>
<paragraph xml-lang="en-US" id="par_id7309488" role="paragraph" l10n="CHG">Choose from the following chart types, depending on data type and intended presentation effect.</paragraph>
<table id="tbl_id2579119">
<tablerow>
diff --git a/helpcontent2/source/text/schart/01/type_stock.xhp b/helpcontent2/source/text/schart/01/type_stock.xhp
index 3290c9a0ce..0d639870f5 100644
--- a/helpcontent2/source/text/schart/01/type_stock.xhp
+++ b/helpcontent2/source/text/schart/01/type_stock.xhp
@@ -51,7 +51,7 @@
<section id="howtoget">
<embed href="text/schart/00/00000004.xhp#wiz"/>
</section>
- <paragraph xml-lang="en-US" id="hd_id5268410" role="heading" level="1" l10n="NEW">Stock</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5268410" role="heading" level="2" l10n="NEW">Stock</paragraph>
<paragraph xml-lang="en-US" id="par_id61342" role="paragraph" l10n="NEW">A Stock chart illustrates the market trend given by opening price, bottom price, top price and closing price. The transaction volume can also be shown.<comment>UFI: should we show example charts for every type?</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id2131412" role="paragraph" l10n="NEW">For a Stock chart the order of the data series is important. The data should be arranged as shown in the example table below.</paragraph>
<table id="tbl_id1370586">
@@ -218,28 +218,28 @@
<paragraph xml-lang="en-US" id="par_id3004547" role="paragraph" l10n="NEW">The open, low, high, and closing values of a row build together one data unit in the chart. A stock price data series consists of several rows containing such data units. The column containing the transaction volume builds an optional second data series.</paragraph>
<paragraph xml-lang="en-US" id="par_id6401867" role="paragraph" l10n="NEW">Depending on the chosen variant, you do not need all columns.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id18616" role="heading" level="1" l10n="NEW">Stock Chart Variants</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id18616" role="heading" level="2" l10n="NEW">Stock Chart Variants</paragraph>
<paragraph xml-lang="en-US" id="par_id6138492" role="paragraph" l10n="NEW">Choose the <emph>Stock</emph> chart type on the first page of the <link href="text/schart/01/wiz_chart_type.xhp">Chart wizard</link>. Then select one of the four variants.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id4569231" role="heading" level="1" l10n="NEW">Type 1</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4569231" role="heading" level="2" l10n="NEW">Type 1</paragraph>
<paragraph xml-lang="en-US" id="par_id291451" role="paragraph" l10n="NEW">Based on<emph> low</emph>
<emph>and high </emph>column the Type 1 shows the distance between bottom price (low) and top price (high) by a vertical line.</paragraph>
<paragraph xml-lang="en-US" id="par_id3341776" role="paragraph" l10n="NEW">Based on<emph> low, high,</emph> and <emph>close</emph> column Type 1 shows an additional horizontal mark <emph>for</emph> the closing price.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id5947141" role="heading" level="1" l10n="NEW">Type 2</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5947141" role="heading" level="2" l10n="NEW">Type 2</paragraph>
<paragraph xml-lang="en-US" id="par_id1911679" role="paragraph" l10n="CHG">Based on <emph>open, low, high</emph>, and <emph>close</emph> column Type 2 generates the traditional "candle stick" chart. Type 2 draws the vertical line between the bottom and top price and adds a rectangle in front, which visualizes the range between the opening and closing price. If you click on the rectangle you see more information in the status bar. %PRODUCTNAME uses different fill colors for rising values (the opening price is lower than the closing price) and falling values.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="1" l10n="NEW">Type 3</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id9364909" role="heading" level="2" l10n="NEW">Type 3</paragraph>
<paragraph xml-lang="en-US" id="par_id4473403" role="paragraph" l10n="CHG">Based on <emph>volume, low, high</emph>, and <emph>close</emph> column chart Type 3 draws a chart like Type 1, with additional columns for the transaction volume.<comment>i80596</comment></paragraph>
- <paragraph xml-lang="en-US" id="hd_id4313791" role="heading" level="1" l10n="NEW">Type 4</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4313791" role="heading" level="2" l10n="NEW">Type 4</paragraph>
<paragraph xml-lang="en-US" id="par_id4331797" role="paragraph" l10n="CHG">Based on all five data columns <emph>volume, open, low, high</emph>, and <emph>close</emph>, Type 4 combines a chart of Type 2 with a column chart for the transaction volume.</paragraph>
<paragraph xml-lang="en-US" id="par_id4191717" role="paragraph" l10n="NEW">Because measurement for transaction volume might be "units", a second y axis is introduced in chart Type 3 and Type 4. The price axis is shown on the right side and the volume axis on the left side.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id2318796" role="heading" level="1" l10n="NEW">Setting the Data Source</paragraph>
- <paragraph xml-lang="en-US" id="hd_id399182" role="heading" level="1" l10n="NEW">Charts based on its own data</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id2318796" role="heading" level="2" l10n="NEW">Setting the Data Source</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id399182" role="heading" level="2" l10n="NEW">Charts based on its own data</paragraph>
<paragraph xml-lang="en-US" id="par_id5298318" role="paragraph" l10n="NEW">To change the data series of a chart having its own data, choose <link href="text/schart/01/03010000.xhp">Chart Data Table</link> from the View menu or from the context menu of the chart in edit mode.</paragraph>
<paragraph xml-lang="en-US" id="par_id7588732" role="paragraph" l10n="NEW">In an embedded chart data table, the data series are always organized in columns.</paragraph>
<paragraph xml-lang="en-US" id="par_id95828" role="paragraph" l10n="CHG">For a new stock chart first use a column chart. Add the columns you need and enter your data in the order which is shown in the example, omitting any columns not required for the desired variant. Use Move Series Right to change the column order. Close the chart data table. Now use the Chart Type dialog to change to the stock chart variant. </paragraph>
<paragraph xml-lang="en-US" id="par_id6182744" role="paragraph" l10n="NEW">If you have already got a stock chart and you want to change the variant, then first change the chart type to a column chart, add or remove columns so that it fits to the variant, and then change the chart type back to a stock chart.<comment>Watch issue 72433 to see whether a change in the handling is done.</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id3496200" role="paragraph" l10n="NEW">Do not write the name of a data series in a row. Write the name into the field above the role name.</paragraph>
<paragraph xml-lang="en-US" id="par_id7599108" role="paragraph" l10n="CHG">The order of the rows determines how the categories are arranged in the chart. Use Move Row Down to change the order.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="1" l10n="NEW">Charts based on Calc or Writer tables</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id888698" role="heading" level="2" l10n="NEW">Charts based on Calc or Writer tables</paragraph>
<paragraph xml-lang="en-US" id="par_id3394573" role="paragraph" l10n="NEW">You can choose or alter a data range on the second page of the Chart wizard or in the <link href="text/schart/01/wiz_data_range.xhp">Data Range</link> dialog. For fine tuning use the <link href="text/schart/01/wiz_data_series.xhp">Data Series</link> dialog.</paragraph>
<paragraph xml-lang="en-US" id="par_id7594225" role="paragraph" l10n="NEW">To specify a data range do one of the following:</paragraph>
<list type="ordered">
@@ -257,19 +257,19 @@
</list>
<paragraph xml-lang="en-US" id="par_id8746910" role="paragraph" l10n="NEW">Click one of the options for data series in rows or in columns. </paragraph>
<paragraph xml-lang="en-US" id="par_id9636524" role="paragraph" l10n="NEW">Your stock chart data are "in columns", if the information in a row belongs to the same "candle stick".<comment>I don't know whether copying a table based chart to draw or impress needs chart data arranged in columns, and I cannot test it, because the clipboard is broken.</comment></paragraph>
- <paragraph xml-lang="en-US" id="hd_id5675527" role="heading" level="1" l10n="NEW">Fine Tuning the Data Ranges of Table Based Stock Charts</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id5675527" role="heading" level="2" l10n="NEW">Fine Tuning the Data Ranges of Table Based Stock Charts</paragraph>
<paragraph xml-lang="en-US" id="par_id3486434" role="paragraph" l10n="NEW">You can organize data series and edit the source for parts of single data series on the third page of the Chart wizard or on the page Data Series in the Data Range dialog.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="1" l10n="NEW">Organize Data Series</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3068636" role="heading" level="2" l10n="NEW">Organize Data Series</paragraph>
<paragraph xml-lang="en-US" id="par_id2480849" role="paragraph" l10n="NEW">In the <emph>data series</emph> area on the left side of the dialog, you can organize the data series of the actual chart. A stock chart has at least one data series containing the prices. It might have a second data series for transaction volume.</paragraph>
<paragraph xml-lang="en-US" id="par_id4181951" role="paragraph" l10n="CHG">If you have got more than one price data series, use the Up and Down arrow buttons to order them. The order determines the arrangement in the chart. Do the same for volume data series. You cannot switch price and volume data series.</paragraph>
<paragraph xml-lang="en-US" id="par_id2927335" role="paragraph" l10n="NEW">To remove a data series, select the data series in the list and click <emph>Remove</emph>.</paragraph>
<paragraph xml-lang="en-US" id="par_id2107303" role="paragraph" l10n="NEW">To add a data series, select one of the existing data series and click <emph>Add</emph>. You get an empty entry below the selected one, which has the same type. If you have no price data series or no volume data series, you must first select a range for these series in the <emph>Data Range</emph> dialog.<comment>Regina: The behavior is odd, but I don't know a better solution. Therefore I have not written an issue.</comment></paragraph>
- <paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="1" l10n="NEW">Setting Data Ranges</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id4071779" role="heading" level="2" l10n="NEW">Setting Data Ranges</paragraph>
<paragraph xml-lang="en-US" id="par_id7844477" role="paragraph" l10n="NEW">In the <emph>Data Ranges</emph> dialog you can set or change the data range of each component of the selected data series.</paragraph>
<paragraph xml-lang="en-US" id="par_id6478469" role="paragraph" l10n="NEW">In the upper list you see the role name of the components and the current values. When you have selected a role, you can change the value in the text box below the list. The label shows the selected role.</paragraph><comment>deleted a para, see i80596</comment>
<paragraph xml-lang="en-US" id="par_id9038972" role="paragraph" l10n="NEW">Enter the range into the text box or click on <emph>Select data range</emph> to minimize the dialog and select the range with the mouse.</paragraph>
<paragraph xml-lang="en-US" id="par_id7985168" role="paragraph" l10n="NEW">Select Open Values, Close Values, High Values, and Low Values in any order. Specify only the ranges for those roles which you need for the chosen variant of the stock chart. The ranges need not be next to each other in the table.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="1" l10n="NEW">Legend</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id876186" role="heading" level="2" l10n="NEW">Legend</paragraph>
<paragraph xml-lang="en-US" id="par_id3939634" role="paragraph" l10n="NEW">The legend displays the labels from the first row or column or from the special range that you have set in the <emph>Data Series</emph> dialog. If your chart does not contain labels, the legend displays text like "Row 1, Row 2, ...", or "Column A, Column B, ..." according to the row number or column letter of the chart data.</paragraph><comment>deleted 3 paras</comment>
<paragraph xml-lang="en-US" id="par_id2377697" role="paragraph" l10n="NEW">The legend shows the value from the range, which you entered in the <emph>Range for Name</emph> field in the <emph>Data Range</emph> dialog. The default entry is the column header of the closing price column.</paragraph>
<paragraph xml-lang="en-US" id="par_id2188787" role="paragraph" l10n="NEW">Select one of the position options. When the chart is finished, you can specify other positions using the Format menu.</paragraph>
diff --git a/helpcontent2/source/text/schart/01/wiz_data_range.xhp b/helpcontent2/source/text/schart/01/wiz_data_range.xhp
index 33178e454c..e30ac7b5e0 100644
--- a/helpcontent2/source/text/schart/01/wiz_data_range.xhp
+++ b/helpcontent2/source/text/schart/01/wiz_data_range.xhp
@@ -54,7 +54,7 @@
</section>
<paragraph xml-lang="en-US" id="par_id8466139" role="paragraph" l10n="NEW">This dialog is only available for charts based on a Calc or Writer table.</paragraph>
<embed href="text/shared/00/00000001.xhp#ShiftF1"/>
- <paragraph xml-lang="en-US" id="hd_id1877193" role="heading" level="1" l10n="NEW">To specify a data range</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id1877193" role="heading" level="2" l10n="NEW">To specify a data range</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id5924863" role="paragraph" l10n="NEW">Select the data range. Do one of the following:</paragraph>
diff --git a/helpcontent2/source/text/schart/main0202.xhp b/helpcontent2/source/text/schart/main0202.xhp
index 01fa2c3699..01fa2c3699 100755..100644
--- a/helpcontent2/source/text/schart/main0202.xhp
+++ b/helpcontent2/source/text/schart/main0202.xhp
diff --git a/helpcontent2/source/text/sdraw/main0210.xhp b/helpcontent2/source/text/sdraw/main0210.xhp
index e4176b3116..1d033b76a2 100755
--- a/helpcontent2/source/text/sdraw/main0210.xhp
+++ b/helpcontent2/source/text/sdraw/main0210.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,17 +30,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsdrawmain0210xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Drawing Bar</title>
<filename>/text/sdraw/main0210.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-04-08T12:46:35">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="werkzeugleiste">
@@ -61,6 +57,8 @@
<embed href="text/simpress/02/10080000.xhp#kurve"/>
<embed href="text/simpress/00/00000004.xhp#sykurve"/>
<embed href="text/simpress/02/10100000.xhp#verbinder"/>
+<paragraph role="heading" id="par_idN107C8" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/02/10120000.xhp" name="Lines and Arrows">Lines and Arrows</link></paragraph>
+<paragraph role="paragraph" id="par_idN126D7" xml-lang="en-US" l10n="NEW">Opens the Arrows toolbar to insert lines and arrows.</paragraph>
<embed href="text/simpress/02/10090000.xhp#objekte"/>
<embed href="text/simpress/02/10090000.xhp#syobjekte"/>
<embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/shared/00/00000021.xhp b/helpcontent2/source/text/shared/00/00000021.xhp
index cee4e1e4d0..1b42b188f7 100644
--- 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 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textshared0000000021xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">XML File Formats</title>
@@ -51,7 +51,7 @@
<bookmark_value>file formats;OpenDocument/XML</bookmark_value>
<bookmark_value>OpenDocument file formats</bookmark_value>
<bookmark_value>ODF file formats</bookmark_value>
-</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment>
+</bookmark><comment>mw changed "file formats;OpenDocument." entry and deleted "file formats;XML". MW made "document types;..." a one level entry</comment><comment>mw changed "defaults;..."</comment>
<bookmark xml-lang="en-US" branch="hid/HID_DID_SAVE_PACKED_XML" id="bm_id3159242" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154408" role="heading" level="1" l10n="U" oldref="2"><variable id="xmlformat"><link href="text/shared/00/00000021.xhp" name="XML File Formats">XML File Formats</link>
</variable></paragraph>
@@ -103,7 +103,7 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="CHG">ODF HTML Document Template</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1078E" role="tablecontent" l10n="NEW">HTML Document Template</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_idN10793" role="tablecontent" l10n="NEW">*.oth</paragraph>
@@ -226,7 +226,7 @@
<paragraph xml-lang="en-US" id="par_id0514200811565762" role="tablecontent" l10n="NEW">ODF 1.2</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">-</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0519200811530440" role="tablecontent" l10n="NEW">to be announced</paragraph>
</tablecell>
<tablecell>
<paragraph xml-lang="en-US" id="par_id0519200811530471" role="tablecontent" l10n="NEW">OpenOffice.org 3 or StarOffice 9</paragraph>
@@ -244,7 +244,6 @@
</tablecell>
</tablerow>
</table>
-
<paragraph role="paragraph" id="par_id0514200811525591" xml-lang="en-US" l10n="NEW">In OpenOffice.org 3 and StarOffice 9, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <item type="menuitem"><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_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>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index fd988fb6e1..0c22fcbfeb 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.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="textshared0000000406xml" indexer="exclude">
<title id="tit" xml-lang="en-US">Tools Menu</title>
@@ -60,7 +60,7 @@
</section>
</section>
- <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="130"><variable id="galleryregisterdateien">Choose <emph>Tools - Gallery</emph> or click the <emph>Gallery </emph>icon on the <emph>Standard</emph> Bar - <emph>New Theme</emph> button - <emph>Files</emph> tab
</variable></paragraph>
<section id="rechtschreibung">
<paragraph role="paragraph" id="par_id3166411" xml-lang="en-US" l10n="CHG" oldref="2">Choose <emph>Tools - Spelling and Grammar</emph>
@@ -83,11 +83,11 @@
</section>
</section>
- <paragraph xml-lang="en-US" id="par_id3156326" role="paragraph" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
+ <paragraph xml-lang="en-US" id="par_id3156326" role="paragraph" l10n="CHG" oldref="164"><variable id="hangul">Choose <emph>Tools - Language - Hangul/Hanja Conversion</emph> (Asian language support must be enabled)
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10705" role="paragraph" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled)
+ <paragraph xml-lang="en-US" id="par_idN10705" role="paragraph" l10n="NEW"><variable id="chinese">Choose <emph>Tools - Language - Chinese Conversion</emph> (Asian language support must be enabled)
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN1071E" role="paragraph" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Translation</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button
+ <paragraph xml-lang="en-US" id="par_idN1071E" role="paragraph" l10n="NEW"><variable id="chineseedit">Choose <emph>Tools - Language - Chinese Conversion</emph> (Asian language support must be enabled) - <emph>Edit terms</emph> button
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3155419" role="paragraph" l10n="U" oldref="5"><variable id="rechtschreibungmenue">Choose <emph>Tools - Spelling and Grammar</emph>
</variable></paragraph>
@@ -96,7 +96,7 @@
<section id="thesaurus">
<paragraph xml-lang="en-US" id="par_id3151338" role="paragraph" l10n="CHG" oldref="8">Choose <emph>Tools - Language - Thesaurus</emph>
</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3149884" role="paragraph" l10n="U" oldref="70"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7</paragraph>
</section>
<section id="etpip">
@@ -104,18 +104,18 @@
</section>
<paragraph xml-lang="en-US" id="par_idN107E9" role="paragraph" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
+ <paragraph xml-lang="en-US" id="par_id3151385" role="paragraph" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
</variable></paragraph>
<section id="recordmacro">
<paragraph xml-lang="en-US" id="par_id3149456" role="paragraph" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button
+ <paragraph xml-lang="en-US" id="par_id3150398" role="paragraph" l10n="CHG" oldref="14"><variable id="passwort">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, click the <emph>Organizer</emph> button, click the <emph>Libraries</emph> tab, and then click the <emph>Password</emph> button
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN10843" role="paragraph" l10n="CHG"><variable id="packagemanager">Choose <emph>Tools - Extension Manager</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id9988402" role="paragraph" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button
+ <paragraph xml-lang="en-US" id="par_id9988402" role="paragraph" l10n="NEW"><variable id="packagemanager_eu">Choose <emph>Tools - Extension Manager</emph>, click <emph>Updates</emph> button
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3151106" role="paragraph" l10n="U" oldref="161"><variable id="xmlfilter">Choose <emph>Tools - XML Filter Settings</emph>
</variable></paragraph>
@@ -125,41 +125,31 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3148672" role="paragraph" l10n="CHG" oldref="15"><variable id="anpassen">Choose <emph>Tools - Customize</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3147230" role="paragraph" l10n="CHG" oldref="16"><variable id="menue">Choose <emph>Tools - Customize - Menu</emph> tab
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN108E9" role="paragraph" l10n="NEW"><variable id="menuenew">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>New</emph>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN10919" role="paragraph" l10n="NEW"><variable id="menuemove">Choose <emph>Tools - Customize - Menu</emph> tab, click <emph>Menu - Move</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3145171" role="paragraph" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened)
+ <paragraph xml-lang="en-US" id="par_id3145171" role="paragraph" l10n="CHG" oldref="129"><variable id="tastatur">Choose <emph>Tools - Customize - Keyboard</emph> tab (a document must be opened)
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3153968" role="paragraph" l10n="CHG" oldref="19"><variable id="symbole">Choose <emph>Tools - Customize - Toolbars</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
+ <paragraph xml-lang="en-US" id="par_id3157895" role="paragraph" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect - Options</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph>
-<emph>- Options</emph>tab
+ <paragraph xml-lang="en-US" id="par_id3153768" role="paragraph" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect - Options</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab
+ <paragraph xml-lang="en-US" id="par_id1978514" role="paragraph" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155368" role="paragraph" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Replace</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3155368" role="paragraph" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect - Options - Replace</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3155860" role="paragraph" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Exceptions</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3155860" role="paragraph" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect- Options - Exceptions</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153094" role="paragraph" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph>- Custom Quotes</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3153094" role="paragraph" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect - Options - Custom Quotes</emph> tab
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153945" role="paragraph" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect</emph>
-<emph> Options</emph>
-<emph> - Word Completion</emph> tab
+ <paragraph xml-lang="en-US" id="par_id3153945" role="paragraph" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect - Options - Word Completion</emph> tab
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3151352" role="paragraph" l10n="U" oldref="80"><variable id="exopas">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
@@ -214,7 +204,6 @@
</tablecell>
</tablerow>
</table>
-
</section>
</section>
<paragraph xml-lang="en-US" id="par_id3149403" role="paragraph" l10n="U" oldref="72"><variable id="schriers">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - Fonts</emph>
@@ -291,7 +280,7 @@
</section>
<paragraph xml-lang="en-US" id="par_id3155607" role="paragraph" l10n="CHG" oldref="98"><variable id="drucken1">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/ %PRODUCTNAME Writer/Web </emph>- <emph>Print</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print
+ <paragraph xml-lang="en-US" id="par_id3988769" role="paragraph" l10n="NEW"><variable id="drucken2">Choose <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Print
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3145769" role="paragraph" l10n="U" oldref="99"><variable id="registertabelle">Choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/%PRODUCTNAME Writer/Web - Table</emph>
</variable></paragraph>
@@ -311,7 +300,7 @@
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3152494" role="paragraph" l10n="U" oldref="82"><variable id="exopso">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists</emph>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
+ <paragraph xml-lang="en-US" id="par_id3149527" role="paragraph" l10n="U" oldref="83"><variable id="listekopieren">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Sort Lists - Copy</emph> button
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3154903" role="paragraph" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/01/01020000.xhp b/helpcontent2/source/text/shared/01/01020000.xhp
index 7c24ca731e..c4023ce60f 100644
--- a/helpcontent2/source/text/shared/01/01020000.xhp
+++ b/helpcontent2/source/text/shared/01/01020000.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="textshared0101020000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Open</title>
@@ -160,7 +160,7 @@
<paragraph xml-lang="en-US" id="par_id3151292" role="listitem" l10n="CHG" oldref="120">the shared template directory<comment>removed path</comment></paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
+ <paragraph xml-lang="en-US" id="par_id3144442" role="listitem" l10n="CHG" oldref="121">the user template directory <switchinline select="sys"><caseinline select="UNIX">in the home directory
</caseinline><defaultinline>in the Documents and Settings directory</defaultinline></switchinline></paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/01/02180000.xhp b/helpcontent2/source/text/shared/01/02180000.xhp
index 0250e6b564..126741bc8e 100644
--- a/helpcontent2/source/text/shared/01/02180000.xhp
+++ b/helpcontent2/source/text/shared/01/02180000.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,11 +48,11 @@
<bookmark xml-lang="en-US" branch="hid/.uno:EditLinks" id="bm_id3154926" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_MANAGE_LINKS" id="bm_id4013242" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:ManageLinks" id="bm_id3147588" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening; files with links</bookmark_value>
+<bookmark xml-lang="en-US" branch="index" id="bm_id3156156"><bookmark_value>opening;documents with links</bookmark_value>
<bookmark_value>links; updating specific links</bookmark_value>
<bookmark_value>updating; links, on opening</bookmark_value>
<bookmark_value>links; opening files with</bookmark_value>
-</bookmark>
+</bookmark><comment>MW changed "opening;..."</comment>
<paragraph xml-lang="en-US" id="hd_id3150279" role="heading" level="1" l10n="U" oldref="1">Edit Links</paragraph>
<paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="2"><variable id="verknuepfungentext"><ahelp hid=".uno:ManageLinks">Lets you edit the properties of each link in the current document, including the path to the source file. This command is not available if the current document does not contain links to other files.</ahelp>
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02220100.xhp b/helpcontent2/source/text/shared/01/02220100.xhp
index 234d297759..173fd4a69d 100755
--- a/helpcontent2/source/text/shared/01/02220100.xhp
+++ b/helpcontent2/source/text/shared/01/02220100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -41,6 +41,10 @@
</topic>
</meta>
<body>
+<bookmark xml-lang="en-US" branch="index" id="bm_id1202200909085990"><bookmark_value>hotspots;properties</bookmark_value>
+ <bookmark_value>properties;hotspots</bookmark_value>
+ <bookmark_value>ImageMap;hotspot properties</bookmark_value>
+</bookmark><comment>MW inserted index entries</comment>
<bookmark xml-lang="en-US" branch="hid/SVX:MODALDIALOG:RID_SVXDLG_IMAPURL" id="bm_id3145416" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154810" role="heading" level="1" l10n="U" oldref="1">Description</paragraph>
<paragraph xml-lang="en-US" id="par_id3152910" role="paragraph" l10n="U" oldref="2"><ahelp hid="SVX:MODALDIALOG:RID_SVXDLG_IMAPURL">Lists the properties for the selected hotspot.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/shared/01/05020700.xhp b/helpcontent2/source/text/shared/01/05020700.xhp
index 450693896e..6bc44350c9 100755
--- a/helpcontent2/source/text/shared/01/05020700.xhp
+++ b/helpcontent2/source/text/shared/01/05020700.xhp
@@ -65,7 +65,7 @@
</paragraph>
<paragraph role="paragraph" id="par_id3148539" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_TRISTATEBOX_RID_SVXPAGE_PARA_ASIAN_CB_AS_SCRIPT_SPACE">Inserts a space between Asian, Latin and complex characters.</ahelp></paragraph>
<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/01/05020700.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
+<paragraph role="paragraph" id="par_id3153665" xml-lang="en-US" l10n="C"><link href="text/shared/optionen/01140000.xhp" name="Enabling Asian language support">Enabling Asian language support</link></paragraph>
</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05030600.xhp b/helpcontent2/source/text/shared/01/05030600.xhp
index 4648a08ede..29e5e88d77 100644
--- a/helpcontent2/source/text/shared/01/05030600.xhp
+++ b/helpcontent2/source/text/shared/01/05030600.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 05030600.xhp,v $
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,23 +30,18 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Background</title>
-<filename>/text/shared/01/05030600.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-12-05T13:47:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hintergrund">
+ <topic id="textshared0105030600xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Background</title>
+ <filename>/text/shared/01/05030600.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="hintergrund">
<bookmark xml-lang="en-US" branch="index" id="bm_id3151097"><bookmark_value>frames; backgrounds</bookmark_value>
<bookmark_value>backgrounds; frames/sections/indexes</bookmark_value>
<bookmark_value>sections; backgrounds</bookmark_value>
@@ -54,77 +50,89 @@
<bookmark_value>headers;backgrounds</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND" id="bm_id3147000" localize="false"/>
-<paragraph role="heading" id="hd_id3151097" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
-<paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
-</section>
-<paragraph role="paragraph" id="par_id3147653" xml-lang="en-US" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
+<paragraph xml-lang="en-US" id="hd_id3151097" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/05030600.xhp" name="Background">Background</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153748" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_BACKGROUND">Set the background color or graphic.</ahelp></paragraph>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id3147653" role="paragraph" l10n="U" oldref="34">You can specify the background for <switchinline select="appl"><caseinline select="WRITER">paragraphs, pages, headers, footers, text frames, tables, table cells, sections, and indexes.
</caseinline><caseinline select="CALC">cells and pages.
</caseinline></switchinline></paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00040500.xhp#hintergrund"/>
-</section>
-<embed href="text/shared/guide/background.xhp#background"/>
+ <section id="howtoget">
+ <embed href="text/shared/00/00040500.xhp#hintergrund"/>
+ </section>
+ <embed href="text/shared/guide/background.xhp#background"/>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR" id="bm_id3153321" localize="false"/>
-<paragraph role="heading" id="hd_id3154514" xml-lang="en-US" level="2" l10n="U" oldref="4">As</paragraph>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154514" role="heading" level="2" l10n="U" oldref="4">As</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154380" role="paragraph" l10n="U" oldref="5"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_SELECTOR">Select the type of background that you want to apply.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3151245" role="heading" level="2" l10n="U" oldref="7">Using a Color as a Background</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_BGDCOLORSET" id="bm_id3159414" localize="false"/>
-<paragraph role="heading" id="hd_id3148946" xml-lang="en-US" level="2" l10n="U" oldref="8">Color Background</paragraph>
-<paragraph role="paragraph" id="par_id3152361" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-<embed href="text/shared/00/00000007.xhp#objektleiste"/>
-<embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
-<embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
-<embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+<paragraph xml-lang="en-US" id="hd_id3148946" role="heading" level="3" l10n="U" oldref="8">Color Background</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152361" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_BACKGROUND_CTL_BGDCOLORSET">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
+ <embed href="text/shared/00/00000007.xhp#objektleiste"/>
+ <embed href="text/shared/02/02160000.xhp#syzeichenhintergrund"/>
+ <embed href="text/shared/02/02170000.xhp#syabsatzhintergrund"/>
+ <embed href="text/shared/02/02160000.xhp#zeichenhintergrundtext"/>
<bookmark xml-lang="en-US" branch="hid/SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS" id="bm_id3150400" localize="false"/>
-<paragraph role="heading" id="hd_id3153524" xml-lang="en-US" level="2" l10n="U" oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency
+<paragraph xml-lang="en-US" id="hd_id3153524" role="heading" level="3" l10n="U"
+ oldref="37"><switchinline select="appl"><caseinline select="WRITER">Transparency
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_idN107A4" xml-lang="en-US" l10n="NEW">Background transparency can be set only for frames.</paragraph>
+<paragraph xml-lang="en-US" id="par_idN107A4" role="note" l10n="NEW">Background transparency can be set only for frames.</paragraph>
</case>
</switch>
-<paragraph role="paragraph" id="par_id3150358" xml-lang="en-US" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
+<paragraph xml-lang="en-US" id="par_id3150358" role="paragraph" l10n="U" oldref="38"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_METRICFIELD_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS">Set the transparency for the background color or graphic of a frame, where 100% is completely transparent and 0% is opaque. When you increase the transparency of the background, the underlying text or objects become visible through the background of the frame.</ahelp>
</caseinline></switchinline></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX" id="bm_id3147228" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX" id="bm_id3153352" localize="false"/>
-<paragraph role="heading" id="hd_id3154216" xml-lang="en-US" level="2" l10n="U" oldref="11"><switchinline select="appl"><caseinline select="WRITER">For
+<paragraph xml-lang="en-US" id="hd_id3154216" role="heading" level="3" l10n="U"
+ oldref="11"><switchinline select="appl"><caseinline select="WRITER">For
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3145419" xml-lang="en-US" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column.
+ <paragraph xml-lang="en-US" id="par_id3145419" role="paragraph" l10n="U" oldref="12"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX">Select the area that you want to apply the background color to.</ahelp> For example, when you define the background color for a table, you can choose to apply it to the table, the active cell, the row, or the column.
</caseinline></switchinline></paragraph>
<switch select="appl">
<case select="WRITER">
-<paragraph role="note" id="par_id3150497" xml-lang="en-US" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150497" role="note" l10n="U" oldref="13">This option is only available when you edit the background of a table or a paragraph style.</paragraph>
</case>
</switch>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="U" oldref="14">Using a Graphic as a Background</paragraph>
-<paragraph role="heading" id="hd_id3149983" xml-lang="en-US" level="2" l10n="U" oldref="15">File</paragraph>
-<paragraph role="paragraph" id="par_id3152462" xml-lang="en-US" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
-<paragraph role="heading" id="hd_id3145592" xml-lang="en-US" level="3" l10n="U" oldref="17">Display field</paragraph>
-<paragraph role="paragraph" id="par_id3154920" xml-lang="en-US" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="U"
+ oldref="14">Using a Graphic as a Background</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3149983" role="heading" level="3" l10n="U"
+ oldref="15">File</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152462" role="paragraph" l10n="U" oldref="16">Contains information about the graphic file.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3145592" role="heading" level="3" l10n="U"
+ oldref="17">Display field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154920" role="paragraph" l10n="U" oldref="18">Shows the path for the graphic file.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK" id="bm_id3145264" localize="false"/>
-<paragraph role="heading" id="hd_id3145272" xml-lang="en-US" level="3" l10n="U" oldref="19">Link</paragraph>
-<paragraph role="paragraph" id="par_id3154150" xml-lang="en-US" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145272" role="heading" level="3" l10n="U"
+ oldref="19">Link</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154150" role="paragraph" l10n="CHG" oldref="20"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_LINK">Links to or embeds the graphic file in the current file.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW" id="bm_id3159196" localize="false"/>
-<paragraph role="heading" id="hd_id3155366" xml-lang="en-US" level="3" l10n="U" oldref="21">Preview</paragraph>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155366" role="heading" level="3" l10n="U"
+ oldref="21">Preview</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="U" oldref="22"><ahelp hid="SVX:CHECKBOX:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW">Displays or hides a preview of the selected graphic.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE" id="bm_id3153095" localize="false"/>
-<paragraph role="heading" id="hd_id3154472" xml-lang="en-US" level="3" l10n="U" oldref="23">Browse</paragraph>
-<paragraph role="paragraph" id="par_id3153951" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153726" xml-lang="en-US" level="2" l10n="U" oldref="25">Type</paragraph>
-<paragraph role="paragraph" id="par_id3147442" xml-lang="en-US" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154472" role="heading" level="3" l10n="U"
+ oldref="23">Browse</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153951" role="paragraph" l10n="U" oldref="24"><ahelp hid="SVX:PUSHBUTTON:RID_SVXPAGE_BACKGROUND:BTN_BROWSE">Locate the graphic file that you want to use as a background, and then click <emph>Open</emph>.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153726" role="heading" level="3" l10n="U"
+ oldref="25">Type</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147442" role="paragraph" l10n="U" oldref="26">Specify the way that you want to display the background graphic.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_BACKGROUND_CTL_POSITION" id="bm_id3083445" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION" id="bm_id3156062" localize="false"/>
-<paragraph role="heading" id="hd_id3153366" xml-lang="en-US" level="3" l10n="U" oldref="27">Position</paragraph>
-<paragraph role="paragraph" id="par_id3153741" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153366" role="heading" level="3" l10n="U"
+ oldref="27">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153741" role="paragraph" l10n="U" oldref="28"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_POSITION">Select this option, and then click a location in the position grid.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA" id="bm_id3146146" localize="false"/>
-<paragraph role="heading" id="hd_id3156005" xml-lang="en-US" level="3" l10n="U" oldref="29">Area</paragraph>
-<paragraph role="paragraph" id="par_id3152596" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3156005" role="heading" level="3" l10n="U"
+ oldref="29">Area</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152596" role="paragraph" l10n="U" oldref="30"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_AREA">Stretches the graphic to fill the entire background of the selected object.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE" id="bm_id3153138" localize="false"/>
-<paragraph role="heading" id="hd_id3145663" xml-lang="en-US" level="3" l10n="U" oldref="32">Tile</paragraph>
-<paragraph role="paragraph" id="par_id3149481" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
-<embed href="text/shared/00/00000001.xhp#vorschau"/>
+<paragraph xml-lang="en-US" id="hd_id3145663" role="heading" level="3" l10n="U"
+ oldref="32">Tile</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149481" role="paragraph" l10n="U" oldref="33"><ahelp hid="SVX:RADIOBUTTON:RID_SVXPAGE_BACKGROUND:BTN_TILE">Repeats the graphic so that it covers the entire background of the selected object.</ahelp></paragraph>
+ <embed href="text/shared/00/00000001.xhp#vorschau"/>
<bookmark xml-lang="en-US" branch="hid/HID_POPUP_COLOR_CTRL" id="bm_id3151075" localize="false"/>
-<paragraph role="paragraph" id="par_id3151114" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="HID_POPUP_COLOR_CTRL" visibility="hidden">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_id3151114" role="paragraph" l10n="U" oldref="35"><ahelp hid="HID_POPUP_COLOR_CTRL" visibility="hidden">Click the color that you want to use as a background. To remove a background color, click <emph>No Fill</emph>.</ahelp></paragraph>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/05280000.xhp b/helpcontent2/source/text/shared/01/05280000.xhp
index 9c3d9b361e..9d8d78057a 100644
--- a/helpcontent2/source/text/shared/01/05280000.xhp
+++ b/helpcontent2/source/text/shared/01/05280000.xhp
@@ -47,7 +47,7 @@ UFI: exclude from indexing</lastedited>
<section id="fontwork">
<bookmark xml-lang="en-US" branch="hid/SID_FONTWORK" id="bm_id8473091" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:FontWork" id="bm_id3155620" localize="false"/>
-<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></paragraph>
+<paragraph role="heading" id="hd_id3146959" xml-lang="en-US" level="1" l10n="U" oldref="51"><variable id="fntwrk"><link href="text/shared/01/05280000.xhp" name="FontWork">Fontwork Dialog (Previous Version)</link></variable></paragraph>
<paragraph role="paragraph" id="par_id3151097" xml-lang="en-US" l10n="CHG" oldref="52"><ahelp hid=".uno:FontWork">Edits Fontwork effects of the selected object that has been created with the previous Fontwork dialog.</ahelp><comment>UFI: this old dialog is still available to edit old docs containing old Fontwork objects. See "Fontwork_ui" spec doc.</comment></paragraph>
<paragraph role="note" id="par_id3155934" xml-lang="en-US" l10n="CHG" oldref="53">This <emph>Fontwork</emph> dialog is only available for Fontwork in old Writer text documents that were created prior to %PRODUCTNAME %PRODUCTVERSION. You must first call <emph>Tools - Customize</emph> to add a menu command or an icon to open this dialog.<comment>UFI: the command is in Customize dialog at Format-Fontwork</comment></paragraph>
</section>
diff --git a/helpcontent2/source/text/shared/01/06010000.xhp b/helpcontent2/source/text/shared/01/06010000.xhp
index e0f179ee50..d36dcd86ad 100644
--- a/helpcontent2/source/text/shared/01/06010000.xhp
+++ b/helpcontent2/source/text/shared/01/06010000.xhp
@@ -10,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06010000.xhp,v $
- * $Revision: 1.13.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,82 +35,92 @@
<meta>
-<topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Spelling and Grammar</title>
-<filename>/text/shared/01/06010000.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="rechtschreibung">
+ <topic id="textshared0106010000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Spelling and Grammar</title>
+ <filename>/text/shared/01/06010000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="rechtschreibung">
<bookmark xml-lang="en-US" branch="index" id="bm_id3149047"><bookmark_value>dictionaries; spellcheck</bookmark_value>
-<bookmark_value>spellcheck; dialog</bookmark_value>
-<bookmark_value>languages; spellcheck</bookmark_value>
+ <bookmark_value>spellcheck; dialog</bookmark_value>
+ <bookmark_value>languages; spellcheck</bookmark_value>
</bookmark><comment>mw changes "spellcheck;languages"</comment>
<bookmark xml-lang="en-US" branch="hid/.uno:Spelling" id="bm_id3150702" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:SpellingAndGrammarDialog" id="bm_id1022200801253693" localize="false"/>
-<paragraph role="heading" id="hd_id3153882" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
-<paragraph role="paragraph" id="par_id3154682" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
+<paragraph xml-lang="en-US" id="hd_id3153882" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/01/06010000.xhp" name="Spellcheck">Spelling and Grammar</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154682" role="paragraph" l10n="CHG" oldref="2"><variable id="recht"><ahelp hid=".uno:Spelling">Checks the document or the current selection for spelling errors. If a grammar checking extension is installed, the dialog also checks for grammar errors.</ahelp>
</variable></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
-</section>
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<paragraph role="paragraph" id="par_idN1064B" xml-lang="en-US" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
-<paragraph role="paragraph" id="par_id3166445" xml-lang="en-US" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
-<paragraph role="paragraph" id="par_id1022200801300654" xml-lang="en-US" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#rechtschreibung"/>
+ </section>
+ <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+ <paragraph xml-lang="en-US" id="par_idN1064B" role="paragraph" l10n="NEW">The spellcheck starts at the current cursor position and advances to the end of the document or selection. You can then choose to continue the spellcheck from the beginning of the document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3166445" role="paragraph" l10n="U" oldref="3">Spellcheck looks for misspelled words and gives you the option of adding an unknown word to a user dictionary. When the first misspelled word is found, the <emph>Spellcheck</emph> dialog opens.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1022200801300654" role="paragraph" l10n="NEW">If a grammar checking extension is installed, this dialog is called <emph>Spelling and Grammar</emph>. Spelling errors are underlined in red, grammar errors in blue. First the dialog presents all spelling errors, then all grammar errors.</paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR" id="bm_id1024200804045685" localize="false"/>
-<paragraph role="paragraph" id="par_id1022200801354366" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id1022200801354366" role="paragraph" l10n="NEW"><ahelp hid=".">Enable <emph>Check grammar</emph> to work first on all spellcheck errors, then on all grammar errors.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_MultiLineEdit_RID_SVXDLG_SPELLCHECK_ED_NEWWORD" id="bm_id756859" localize="false"/>
-<paragraph role="heading" id="hd_id3149511" xml-lang="en-US" level="2" l10n="CHG" oldref="6">Not in dictionary</paragraph>
-<paragraph role="paragraph" id="par_id3149798" xml-lang="en-US" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149511" role="heading" level="2" l10n="CHG"
+ oldref="6">Not in dictionary</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="7"><ahelp hid=".">Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD" id="bm_id3149416" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_ListBox_RID_SVXDLG_SPELLCHECK_LB_SUGGESTION" id="bm_id9300210" localize="false"/>
-<paragraph role="heading" id="hd_id3149885" xml-lang="en-US" level="2" l10n="U" oldref="10">Suggestions</paragraph>
-<paragraph role="paragraph" id="par_id3155628" xml-lang="en-US" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149885" role="heading" level="2" l10n="U"
+ oldref="10">Suggestions</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155628" role="paragraph" l10n="CHG" oldref="11"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_NEWWORD">Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click <emph>Change</emph> or <emph>Change All</emph>.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE" id="bm_id3150822" localize="false"/>
-<paragraph role="heading" id="hd_id3145087" xml-lang="en-US" level="2" l10n="CHG" oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
-<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
-<embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
+<paragraph xml-lang="en-US" id="hd_id3145087" role="heading" level="2" l10n="CHG"
+ oldref="12">Text Language<comment>spec doc Spelling_and_Grammar.odt</comment></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144422" role="paragraph" l10n="CHG" oldref="13"><ahelp hid="SVX_LISTBOX_RID_SVXDLG_SPELLCHECK_LB_LANGUAGE">Specifies the language to use to check the spelling.</ahelp></paragraph>
+ <embed href="text/shared/optionen/01010401.xhp#sprachenfeld"/>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR" id="bm_id3148798" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_AUTOCORR" id="bm_id9182103" localize="false"/>
-<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="2" l10n="U" oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect
+<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U"
+ oldref="52"><switchinline select="appl"><caseinline select="WRITER">AutoCorrect
</caseinline></switchinline></paragraph>
-<paragraph role="paragraph" id="par_id3153798" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
+ <paragraph xml-lang="en-US" id="par_id3153798" role="paragraph" l10n="U" oldref="53"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_AUTOCORR">Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacements table.</ahelp>
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS" id="bm_id3157960" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_OPTIONS" id="bm_id9094821" localize="false"/>
-<paragraph role="heading" id="hd_id3151382" xml-lang="en-US" level="2" l10n="U" oldref="56">Options</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151382" role="heading" level="2" l10n="U"
+ oldref="56">Options</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="CHG" oldref="57"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_OPTIONS">Opens a dialog, where you can select the user-defined dictionaries, and set the rules for the spellchecking.</ahelp><comment>UFI: dialog has no name at all in 680m104</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD" id="bm_id3150767" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_MenuButton_RID_SVXDLG_SPELLCHECK_MB_ADDTODICT" id="bm_id5068819" localize="false"/>
-<paragraph role="heading" id="hd_id3153353" xml-lang="en-US" level="2" l10n="U" oldref="24">Add</paragraph>
-<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153353" role="heading" level="2" l10n="U"
+ oldref="24">Add</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144432" role="paragraph" l10n="CHG" oldref="25"><ahelp hid="SVX_PUSHBUTTON_RID_SVXDLG_SPELLCHECK_BTN_ADD">Adds the unknown word to a user-defined dictionary.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE" id="bm_id3147228" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNORE" id="bm_id7157811" localize="false"/>
-<paragraph role="heading" id="hd_id3155994" xml-lang="en-US" level="2" l10n="CHG" oldref="22">Ignore Once</paragraph>
-<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
-<paragraph role="note" id="par_idN107CB" xml-lang="en-US" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
+<paragraph xml-lang="en-US" id="hd_id3155994" role="heading" level="2" l10n="CHG"
+ oldref="22">Ignore Once</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148920" role="paragraph" l10n="U" oldref="23"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNORE">Skips the unknown word and continues with the spellcheck.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107CB" role="note" l10n="NEW">This label of this button changes to <emph>Resume</emph> if you leave the Spellcheck dialog open when you return to your document. To continue the spellcheck from the current position of the cursor, click <emph>Resume</emph>.</paragraph><comment>Ignore Rule button</comment>
<bookmark xml-lang="en-US" branch="hid/40076" id="bm_id1024200804072166" localize="false"/>
-<paragraph role="paragraph" id="par_id1024200804091149" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id1024200804091149" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">While performing a grammar check, click Ignore Rule to ignore the rule that is currently flagged as a grammar error.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL" id="bm_id3145171" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_IGNOREALL" id="bm_id4155705" localize="false"/>
-<paragraph role="heading" id="hd_id3150740" xml-lang="en-US" level="2" l10n="CHG" oldref="20">Ignore All</paragraph>
-<paragraph role="paragraph" id="par_id3145318" xml-lang="en-US" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150740" role="heading" level="2" l10n="CHG"
+ oldref="20">Ignore All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145318" role="paragraph" l10n="U" oldref="21"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_IGNOREALL">Skips all occurrences of the unknown word in the entire document and continues with the spellcheck.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE" id="bm_id3152884" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGE" id="bm_id2069765" localize="false"/>
-<paragraph role="heading" id="hd_id3153056" xml-lang="en-US" level="2" l10n="CHG" oldref="18">Change</paragraph>
-<paragraph role="paragraph" id="par_id3148559" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3153056" role="heading" level="2" l10n="CHG"
+ oldref="18">Change</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148559" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGE">Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL" id="bm_id3157895" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SPLDLG_BUTTON_CHANGEALL" id="bm_id9187902" localize="false"/>
-<paragraph role="heading" id="hd_id3145787" xml-lang="en-US" level="2" l10n="CHG" oldref="16">Change All</paragraph>
-<paragraph role="paragraph" id="par_id3144446" xml-lang="en-US" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3145787" role="heading" level="2" l10n="CHG"
+ oldref="16">Change All</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3144446" role="paragraph" l10n="CHG" oldref="17"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_SPELLCHECK:BTN_CHANGEALL">Replaces all occurrences of the unknown word with the current suggestion.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_SVXDLG_SPELLCHECK_PB_UNDO" id="bm_id9617297" localize="false"/>
-<paragraph role="heading" id="par_idN10850" xml-lang="en-US" level="2" l10n="NEW">Undo</paragraph>
-<paragraph role="paragraph" id="par_idN10854" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Click to undo the last step of your spellcheck session. Click again to undo the previous step, and so on.</ahelp></paragraph>
-<section id="relatedtopics">
-<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
-<paragraph role="paragraph" id="par_id3147426" xml-lang="en-US" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="par_idN10850" role="heading" level="2" l10n="NEW">Undo</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10854" role="paragraph" l10n="CHG"><ahelp hid=".">Click to undo the last change in the current sentence. Click again to undo the previous change in the same sentence.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
+ <paragraph xml-lang="en-US" id="par_id3147426" role="paragraph" l10n="C"><link href="text/shared/01/06020000.xhp" name="Thesaurus">Thesaurus</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/01/06010600.xhp b/helpcontent2/source/text/shared/01/06010600.xhp
index 4c5a8cb3e4..79ee3ef43a 100755
--- a/helpcontent2/source/text/shared/01/06010600.xhp
+++ b/helpcontent2/source/text/shared/01/06010600.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,43 +30,43 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0106010600xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Chinese Translation</title>
+<title id="tit" xml-lang="en-US">Chinese Conversion</title>
<filename>/text/shared/01/06010600.xhp</filename>
</topic>
<history>
-<created date="2004-07-21T12:24:22">UFI: Chinese Translation dialog</created>
+<created date="2004-07-21T12:24:22">UFI: former Chinese Translation dialog, issue 58212</created>
<lastedited date="2004-12-16T12:54:32">DEDR: reviewed</lastedited>
</history>
</meta>
<body>
<section id="chinese">
<bookmark xml-lang="en-US" branch="index" id="bm_id49745"><bookmark_value>Chinese writing systems</bookmark_value>
-<bookmark_value>simplified Chinese;translating to traditional Chinese</bookmark_value>
-<bookmark_value>traditional Chinese;translating to simplified chinese</bookmark_value>
+<bookmark_value>simplified Chinese;conversion to traditional Chinese</bookmark_value>
+<bookmark_value>traditional Chinese;conversion to simplified Chinese</bookmark_value>
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_CHINESE_CONVERSION" id="bm_id9033860" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChineseConversion" id="bm_id2549516" localize="false"/>
-<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Translation</link></paragraph>
-<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is translated.</ahelp> You can only use this command if you enable Asian language support in <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - Language Settings - Languages</emph>.</paragraph>
+<paragraph role="heading" id="par_idN10547" xml-lang="en-US" level="1" l10n="NEW"><link href="text/shared/01/06010600.xhp">Chinese Conversion</link></paragraph>
+<paragraph role="paragraph" id="par_idN10557" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts the selected Chinese text from one Chinese writing system to the other. If no text is selected, the entire document is converted.</ahelp> You can only use this command if you enable Asian language support in <emph>Tools - Options - Language Settings - Languages</emph>.</paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chinese"/>
</section>
-<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Translation direction</paragraph>
-<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the translation direction.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10572" xml-lang="en-US" level="2" l10n="NEW">Conversion direction</paragraph>
+<paragraph role="paragraph" id="par_idN10576" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Select the conversion direction.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10579" xml-lang="en-US" level="3" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1057D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese text characters to simplified Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10580" xml-lang="en-US" level="3" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to translate the selected text. If no text is selected, the whole document is translated.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10584" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese text characters to traditional Chinese text characters. Click <emph>OK</emph> to convert the selected text. If no text is selected, the whole document is converted.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1058E" xml-lang="en-US" level="2" l10n="NEW">Common terms</paragraph>
<paragraph role="paragraph" id="par_idN10592" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Common terms are words that have the same meaning in traditional and simplified Chinese but are written with different characters.</ahelp></paragraph>
-<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Translate Common Terms</paragraph>
-<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is translated character by character.</ahelp></paragraph>
+<paragraph role="heading" id="par_idN10595" xml-lang="en-US" level="3" l10n="NEW">Convert Common Terms</paragraph>
+<paragraph role="paragraph" id="par_idN10599" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts words with two or more characters that are in the list of common terms. After the list is scanned, the remaining text is converted character by character.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059C" xml-lang="en-US" level="3" l10n="NEW">Edit terms</paragraph>
-<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of translation terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN105A0" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the <link href="text/shared/01/06010601.xhp">Edit Dictionary</link> dialog where you can edit the list of conversion terms.</ahelp></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06010601.xhp b/helpcontent2/source/text/shared/01/06010601.xhp
index 941ac96e9a..cde8e1c2bb 100755
--- a/helpcontent2/source/text/shared/01/06010601.xhp
+++ b/helpcontent2/source/text/shared/01/06010601.xhp
@@ -47,15 +47,15 @@
<bookmark_value>dictionaries;common terms in simplified and traditional chinese</bookmark_value>
</bookmark>
<paragraph role="heading" id="par_idN1053D" xml-lang="en-US" level="1" l10n="NEW">Edit Dictionary</paragraph>
-<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese translation</link> terms.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10541" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Edit the <link href="text/shared/01/06010600.xhp">Chinese conversion</link> terms.</ahelp></paragraph>
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#chineseedit"/>
</section>
-<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the translation dictionary. The file path name for the translation dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
+<paragraph role="note" id="par_idN10566" xml-lang="en-US" l10n="NEW">You can use this dialog to edit, to add, or to delete entries from the conversion dictionary. The file path name for the conversion dictionary is user/wordbook/commonterms.ctd. You cannot delete the default entries in this file.</paragraph>
<paragraph role="heading" id="par_idN10569" xml-lang="en-US" level="2" l10n="NEW">Traditional Chinese to Simplified Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates traditional Chinese to simplified Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1056D" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts traditional Chinese to simplified Chinese.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10570" xml-lang="en-US" level="2" l10n="NEW">Simplified Chinese to Traditional Chinese</paragraph>
-<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Translates simplified Chinese to traditional Chinese.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10574" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Converts simplified Chinese to traditional Chinese.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10577" xml-lang="en-US" level="2" l10n="NEW">Reverse Mapping</paragraph>
<paragraph role="paragraph" id="par_idN1057B" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Automatically adds the reverse mapping direction to the list for each modification that you enter.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1057E" xml-lang="en-US" level="2" l10n="NEW">Term</paragraph>
@@ -65,7 +65,7 @@
<paragraph role="heading" id="par_idN1058C" xml-lang="en-US" level="2" l10n="NEW">Property</paragraph>
<paragraph role="paragraph" id="par_idN10590" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Defines the class of the selected term.</ahelp></paragraph>
<paragraph role="heading" id="par_idN10593" xml-lang="en-US" level="2" l10n="NEW">Add</paragraph>
-<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the translation dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN10597" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Adds the term to the conversion dictionary. If the term is already in the dictionary, the new term receives precedence.</ahelp></paragraph>
<paragraph role="heading" id="par_idN1059A" xml-lang="en-US" level="2" l10n="NEW">Modify</paragraph>
<paragraph role="paragraph" id="par_idN1059E" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Saves the modified entry to the database file.</ahelp></paragraph>
<paragraph role="heading" id="par_idN105A1" xml-lang="en-US" level="2" l10n="NEW">Delete</paragraph>
diff --git a/helpcontent2/source/text/shared/01/06040100.xhp b/helpcontent2/source/text/shared/01/06040100.xhp
index f2fb333c30..42561aa8e7 100644
--- a/helpcontent2/source/text/shared/01/06040100.xhp
+++ b/helpcontent2/source/text/shared/01/06040100.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -99,9 +99,6 @@
<paragraph xml-lang="en-US" id="hd_id3150275" role="heading" level="3" l10n="U"
oldref="17">URL Recognition</paragraph>
<paragraph xml-lang="en-US" id="par_id3158430" role="paragraph" l10n="U" oldref="18">Automatically creates a hyperlink when you type a <link href="text/shared/00/00000002.xhp#url" name="URL">URL</link>.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3151338" role="heading" level="3" l10n="U"
- oldref="15">Replace 1/2 ... with ½ ...</paragraph>
- <paragraph xml-lang="en-US" id="par_id3149235" role="paragraph" l10n="U" oldref="16">Replaces 1/2, 1/4, 3/4 with the corresponding fraction characters.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3159400" role="heading" level="3" l10n="U"
oldref="25">Replace 1st ... with 1^st ...</paragraph>
<paragraph xml-lang="en-US" id="par_id3154173" role="paragraph" l10n="U" oldref="27">Displays the text characters of ordinals, such as 1st, 2nd, or 3rd, as superscripts.</paragraph>
@@ -294,7 +291,8 @@
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT" id="bm_id3156334" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx_PushButton_RID_OFAPAGE_AUTOFMT_APPLY_PB_EDIT" id="bm_id9193700" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3144749" role="heading" level="2" l10n="U"
+<paragraph xml-lang="en-US" id="par_id1218200910244459" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Modifies the selected AutoCorrect option.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3144749" role="heading" level="2" l10n="U"
oldref="75"><switchinline select="appl"><caseinline select="WRITER">Edit
</caseinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id3153841" role="paragraph" l10n="U" oldref="76"><switchinline select="appl"><caseinline select="WRITER"><ahelp hid="OFFMGR:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT">Modifies the selected AutoCorrect option.</ahelp>
diff --git a/helpcontent2/source/text/shared/01/extensionupdate.xhp b/helpcontent2/source/text/shared/01/extensionupdate.xhp
index a3bb03e138..2024679fdc 100644
--- a/helpcontent2/source/text/shared/01/extensionupdate.xhp
+++ b/helpcontent2/source/text/shared/01/extensionupdate.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<helpdocument version="1.0">
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,9 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: extensionupdate.xhp,v $
- *
- * $Revision: 1.10 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -37,61 +35,40 @@
<meta>
-<topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Extension Update</title>
-<filename>/text/shared/01/extensionupdate.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textshared01extensionupdatexml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Extension Update</title>
+ <filename>/text/shared/01/extensionupdate.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATE" id="bm_id5684377" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/><paragraph role="heading" id="hd_id9688100" xml-lang="en-US" level="1" l10n="NEW">Extension Update</paragraph>
-<paragraph role="paragraph" id="par_id5084688" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
-</section>
-<paragraph role="paragraph" id="par_id6401257" xml-lang="en-US" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/HID_DEPLOYMENT_GUI_UPDATEINSTALL" id="bm_id7576525" localize="false"/>
+<paragraph xml-lang="en-US" id="hd_id9688100" role="heading" level="1" l10n="NEW">Extension Update</paragraph>
+ <paragraph xml-lang="en-US" id="par_id5084688" role="paragraph" l10n="CHG"><ahelp hid=".">Click the <emph>Check for Updates</emph> button in the <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> to check for online updates for all installed extensions. To check for online updates for only the selected extension, right-click to open the context menu, then choose <emph>Update</emph>.</ahelp></paragraph>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#packagemanager_eu"/>
+ </section>
+ <paragraph xml-lang="en-US" id="par_id6401257" role="paragraph" l10n="NEW">When you click the Check for Updates button or choose the Update command, the Extension Update dialog is displayed and the check for availability of updates starts immediately.</paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_MultiLineEdit_RID_DLG_UPDATE_RID_DLG_UPDATE_DESCRIPTIONS" id="bm_id7764824" localize="false"/>
-<paragraph role="paragraph" id="par_id5841242" xml-lang="en-US" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id6794030" xml-lang="en-US" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
-<paragraph role="paragraph" id="par_id7096774" xml-lang="en-US" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6420484" xml-lang="en-US" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
-</listitem>
-</list>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_id6986602" xml-lang="en-US" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id616779" xml-lang="en-US" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id791039" xml-lang="en-US" l10n="NEW">A manual update is necessary.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="par_id5841242" role="paragraph" l10n="NEW"><ahelp hid=".">While checking for updates, you see a progress indicator. Wait for some messages to show up in the dialog, or click Cancel to abort the update check.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id6794030" role="paragraph" l10n="NEW">If no updates are available, the message in the dialog tells you there are no updates. Close the dialog.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7096774" role="paragraph" l10n="NEW">If updates are available, the updates can either be installed automatically, or you must respond with some action:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6420484" role="paragraph" l10n="NEW">The Extension Update dialog may contain entries which are not selectable and hence no automatic update can be performed. </paragraph>
+ <paragraph xml-lang="en-US" id="par_id6986602" role="paragraph" l10n="NEW">Dependencies are not fulfilled (the update needs some more or newer files to be installed).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id616779" role="paragraph" l10n="NEW">Insufficient user rights (the Extension Manager was started from the menu, but shared extensions can only be modified when %PRODUCTNAME does not run, and only by a user with appropriate rights). See <link href="text/shared/01/packagemanager.xhp">Extension Manager</link> for details.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id791039" role="paragraph" l10n="NEW">A manual update is necessary.</paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_PushButton_RID_DLG_UPDATE_RID_DLG_UPDATE_OK" id="bm_id4799645" localize="false"/>
-<list type="ordered" startwith="2">
-<listitem>
-<paragraph role="paragraph" id="par_id757469" xml-lang="en-US" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id5189062" xml-lang="en-US" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
-<paragraph role="paragraph" id="par_id3949095" xml-lang="en-US" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
-<paragraph role="paragraph" id="par_id3729056" xml-lang="en-US" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id6854457" xml-lang="en-US" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3372295" xml-lang="en-US" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
-</listitem>
-</list>
+<paragraph xml-lang="en-US" id="par_id757469" role="paragraph" l10n="NEW"><ahelp hid=".">When you click the Install button the Download and Installation dialog is displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id5189062" role="paragraph" l10n="NEW">All extensions which can be directly downloaded are downloaded now. The progress is shown in the Download and Installation dialog. If an extension cannot be downloaded, a message is displayed. The operation continues for the remaining extensions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3949095" role="paragraph" l10n="NEW">Some extensions may be marked with the phrase "browser based update". These extensions cannot be downloaded by the Extension Manager. A web browser must be opened to download the extension update from a particular web site. That site may require several more user interaction to download the extension. After downloading you must install the extension manually, for example by double-clicking the extension's icon in a file browser.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3729056" role="paragraph" l10n="NEW">For extensions marked as "browser based update", the Extension Manager will open your web browser on the respective web site. This happens when you close the dialog, after downloading any other extension updates. If there are no extensions which can be directly downloaded then the web browser is started immediately.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id6854457" role="paragraph" l10n="NEW">After the last extension has been downloaded, the installation begins. First all installed extensions for which an update could be downloaded successfully, are removed. Then the updated extensions are installed. If an error occurs, a message that the installation failed is displayed, but the operation proceeds.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3372295" role="paragraph" l10n="NEW">If all updates have been processed the Download and Installation dialog shows that it has finished. You can abort the download and installation process by clicking the <emph>Abort Update</emph> button.</paragraph>
<bookmark xml-lang="en-US" branch="hid/desktop_CheckBox_RID_DLG_UPDATE_RID_DLG_UPDATE_ALL" id="bm_id3114108" localize="false"/>
-<paragraph role="heading" id="hd_id5699942" xml-lang="en-US" level="2" l10n="NEW">Show all Updates</paragraph>
-<paragraph role="paragraph" id="par_id641193" xml-lang="en-US" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id7634510" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
-</section>
-</body>
-</helpdocument>
+<paragraph xml-lang="en-US" id="hd_id5699942" role="heading" level="2" l10n="NEW">Show all Updates</paragraph>
+ <paragraph xml-lang="en-US" id="par_id641193" role="paragraph" l10n="NEW"><ahelp hid=".">By default, only the downloadable extensions are shown in the dialog. Mark <emph>Show all Updates</emph> to see also other extensions and error messages.</ahelp></paragraph>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_id7634510" role="paragraph" l10n="NEW"><link href="text/shared/01/packagemanager.xhp">Extension Manager</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/02/02130000.xhp b/helpcontent2/source/text/shared/02/02130000.xhp
index f1d582e7b0..751b83923e 100644
--- a/helpcontent2/source/text/shared/02/02130000.xhp
+++ b/helpcontent2/source/text/shared/02/02130000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,10 +46,10 @@
<section id="einzvermindern">
<bookmark xml-lang="en-US" branch="hid/SID_DEC_INDENT" id="bm_id8935294" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:DecrementIndent" id="bm_id3153089" localize="false"/><paragraph role="heading" id="hd_id3154228" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/02/02130000.xhp" name="Decrease Indent">Decrease Indent</link></paragraph>
-<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the<emph> Decrease Indent </emph>icon to reduce the left indent of the current paragraph or cell content and set it to the previous tab position.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3150247" xml-lang="en-US" l10n="CHG" oldref="5"><ahelp hid=".uno:DecrementIndent">Click the <emph>Decrease Indent</emph> icon to reduce the left indent of the current paragraph or cell content and set it to the previous default tab position.</ahelp></paragraph>
</section>
-<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs.
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
+<paragraph role="paragraph" id="par_id3154186" xml-lang="en-US" l10n="CHG" oldref="7"><switchinline select="appl"><caseinline select="WRITER">If you previously increased the indentation for several collectively selected paragraphs, this command can decrease the indentation for all of the selected paragraphs.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
<section id="syeinzvermindern">
<table id="tbl_id3147576">
diff --git a/helpcontent2/source/text/shared/02/02140000.xhp b/helpcontent2/source/text/shared/02/02140000.xhp
index 67949a1e71..bc4ce60320 100644
--- a/helpcontent2/source/text/shared/02/02140000.xhp
+++ b/helpcontent2/source/text/shared/02/02140000.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="textshared0202140000xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Increase Indent</title>
@@ -46,10 +46,10 @@
<bookmark xml-lang="en-US" branch="hid/SID_INC_INDENT" id="bm_id636827" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:IncrementIndent" id="bm_id3151100" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148520" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/02/02140000.xhp" name="Increase Indent">Increase Indent</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next tab position.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151330" role="paragraph" l10n="CHG" oldref="2"><ahelp hid=".">Click the Increase Indent icon to increase the left indent of the current paragraph or cell content and set it to the next default tab position.</ahelp></paragraph>
</section>
-<paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
-</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
+ <paragraph xml-lang="en-US" id="par_id3149798" role="paragraph" l10n="CHG" oldref="17"><switchinline select="appl"><caseinline select="WRITER">If several paragraphs are selected, the indentation of all selected paragraphs is increased.
+</caseinline><caseinline select="CALC">The cell content refers to the current value under <link href="text/shared/01/05340300.xhp" name="Format - Cell - Alignment"><emph>Format - Cell - Alignment</emph></link>.
</caseinline></switchinline></paragraph>
<section id="syeinzerhoehen">
<table id="tbl_id3155535">
diff --git a/helpcontent2/source/text/shared/04/01010000.xhp b/helpcontent2/source/text/shared/04/01010000.xhp
index 627aa85d26..50a26f77b2 100755
--- a/helpcontent2/source/text/shared/04/01010000.xhp
+++ b/helpcontent2/source/text/shared/04/01010000.xhp
@@ -52,26 +52,26 @@
</variable></paragraph>
</section>
<embed href="text/shared/00/00000099.xhp#keys"/>
- <paragraph xml-lang="en-US" id="hd_id3150702" role="heading" level="1" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150702" role="heading" level="2" l10n="U" oldref="3">Using Shortcut Keys</paragraph>
<paragraph xml-lang="en-US" id="par_id3151299" role="paragraph" l10n="U" oldref="4">A great deal of your application's functionality can be called up by using shortcut keys. For example, the <switchinline select="sys"><caseinline select="MAC">Command+O
</caseinline><defaultinline>Ctrl+O</defaultinline></switchinline> shortcut keys are shown next to the <emph>Open</emph> entry in the <emph>File</emph> menu. If you want to access this function by using the shortcut keys, press and hold down <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and then press the O key. Release both keys after the dialog appears.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153894" role="paragraph" l10n="U" oldref="5">When operating your application, you can choose between using the mouse or the keyboard for almost all of the operations available.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="1" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
+ <paragraph xml-lang="en-US" id="hd_id3154186" role="heading" level="2" l10n="U" oldref="6"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Calling Menus With Shortcut Keys</defaultinline></switchinline></paragraph>
<paragraph xml-lang="en-US" id="par_id3152425" role="paragraph" l10n="U" oldref="7"><switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>Some of the characters shown on the menu bar are underlined. You can access these menus directly by pressing the underlined character together with the ALT key. Once the menu is opened, you will again find underlined characters. You can access these menu items directly by simply pressing the underlined character key.</defaultinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="1" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3156410" role="heading" level="2" l10n="U" oldref="9">Using Shortcut Keys to Control Dialogs</paragraph>
<paragraph xml-lang="en-US" id="par_id3154288" role="paragraph" l10n="U" oldref="10">There is always one element highlighted in any given dialog - usually shown by a broken frame. This element, which can be either a button, an option field, an entry in a list box or a check box, is said to have the focus on it. If the focal point is a button, pressing Enter runs it as if you had clicked it. A check box is toggled by pressing the spacebar. If an option field has the focus, use the arrow keys to change the activated option field in that area. Use the Tab key to go from one element or area to the next one, use Shift + Tab to go in the reverse direction.</paragraph>
<paragraph xml-lang="en-US" id="par_id3149177" role="paragraph" l10n="U" oldref="11">Pressing ESC closes the dialog without saving changes. <switchinline select="sys"><caseinline select="MAC">
</caseinline><defaultinline>If you place the focus on a button, not only will you see the dotted line framing the name of the button, but also a thicker shadow under the button selected. This indicates that if you exit the dialog by pressing the Enter key, it is the equivalent of pressing that button itself.</defaultinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3147209" role="heading" level="2" l10n="U"
oldref="105">Shortcut Keys for Mouse Actions</paragraph>
<paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="106">If you are using drag-and-drop, selecting with the mouse or clicking objects and names, you can use the keys Shift, <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and occasionally <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> to access additional functionality. The modified functions available when holding down keys during drag-and-drop are indicated by the mouse pointer changing form. When selecting files or other objects, the modifier keys can extend the selection - the functions are explained where applicable. <switchinline select="sys"><caseinline select="UNIX"><embedvar href="text/shared/00/00000099.xhp#winmanager"/>
</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3154046" role="heading" level="2" l10n="U"
oldref="127">Practical Text Input Fields</paragraph>
<list type="ordered">
<listitem>
@@ -122,11 +122,11 @@
</listitem>
</list>
</section>
- <paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3150767" role="heading" level="2" l10n="U"
oldref="163">Interrupting Macros</paragraph>
<paragraph xml-lang="en-US" id="par_id3159150" role="paragraph" l10n="U" oldref="164">If you want to terminate a macro that is currently running, press Shift+ <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Q.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3154123" role="heading" level="2" l10n="U"
oldref="12">List of General Shortcut Keys in $[officename]</paragraph>
<paragraph xml-lang="en-US" id="par_id3145421" role="paragraph" l10n="U" oldref="13">The shortcut keys are shown on the right hand side of the menu lists next to the corresponding menu command. <switchinline select="sys"><caseinline select="MAC">(Not all of the mentioned keys for controlling dialogs are available on the Macintosh.)
</caseinline></switchinline></paragraph>
@@ -464,7 +464,7 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="hd_id3152891" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3152891" role="heading" level="2" l10n="U"
oldref="60">Shortcut Keys Using the Function Keys</paragraph>
<paragraph xml-lang="en-US" id="par_id3152457" role="paragraph" l10n="U" oldref="59"><switchinline select="sys"><caseinline select="MAC">Not all of the function shortcut keys are available on the Mac.
</caseinline></switchinline></paragraph>
@@ -552,7 +552,7 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="hd_id3153288" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3153288" role="heading" level="2" l10n="U"
oldref="287">Shortcut keys in the Gallery</paragraph>
<table id="tbl_id310678">
<tablerow>
@@ -581,7 +581,7 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="hd_id3152368" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3152368" role="heading" level="2" l10n="U"
oldref="280">Shortcut keys in the New Theme area of the Gallery:</paragraph>
<table id="tbl_id8934598">
<tablerow>
@@ -662,7 +662,7 @@
</tablerow>
</table>
- <paragraph xml-lang="en-US" id="hd_id3150633" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3150633" role="heading" level="2" l10n="U"
oldref="263">Shortcut keys in the Gallery preview area:</paragraph>
<table id="tbl_id9288308">
<tablerow>
@@ -800,7 +800,7 @@
</table>
<section id="dbtable">
- <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="1" l10n="CHG"
+ <paragraph xml-lang="en-US" id="hd_id3149722" role="heading" level="2" l10n="CHG"
oldref="330">Selecting Rows and Columns in a Database Table (opened by F4)</paragraph>
<table id="tbl_id1178319">
<tablerow>
@@ -858,7 +858,7 @@
</section>
<section id="zeichenobjekte">
- <paragraph xml-lang="en-US" id="hd_id3147411" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3147411" role="heading" level="2" l10n="U"
oldref="230">Shortcut Keys for Drawing Objects</paragraph>
<table id="tbl_id1152073">
<tablerow>
diff --git a/helpcontent2/source/text/shared/autokorr/11000000.xhp b/helpcontent2/source/text/shared/autokorr/11000000.xhp
deleted file mode 100755
index cbb2cc6fa2..0000000000
--- a/helpcontent2/source/text/shared/autokorr/11000000.xhp
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--
- ***********************************************************************
- *
- * 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
- *
- * $RCSfile: 11000000.xhp,v $
- * $Revision: 1.9 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************
- -->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textsharedautokorr11000000xml" indexer="exclude" status="PUBLISH">
-<title id="tit" xml-lang="en-US">AutoCorrect has been activated</title>
-<filename>/text/shared/autokorr/11000000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-09-26T12:44:54">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<bookmark xml-lang="en-US" branch="hid/HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL" id="bm_id3149989" localize="false"/>
-<paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="1">AutoCorrect has been activated</paragraph>
-<paragraph role="heading" id="hd_id3155271" xml-lang="en-US" level="3" l10n="U" oldref="2">1/2 ... has been replaced with ½ ...</paragraph>
-<paragraph role="paragraph" id="par_id3153220" xml-lang="en-US" l10n="U" oldref="3"><link href="text/shared/01/06040000.xhp" name="AutoCorrect">AutoCorrect</link> has replaced text and character combinations that are found in the font as a single character, such as 1/2, with the appropriate character.</paragraph>
-<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#autokooptionen"/>
-</section>
-<section id="relatedtopics">
-<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
-<switch select="appl">
-<case select="WRITER"><embed href="text/swriter/guide/auto_off.xhp#auto_off"/>
-</case>
-</switch>
-</section>
-</body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/autokorr/makefile.mk b/helpcontent2/source/text/shared/autokorr/makefile.mk
index 2390d5a85d..b2c3a4a246 100644
--- a/helpcontent2/source/text/shared/autokorr/makefile.mk
+++ b/helpcontent2/source/text/shared/autokorr/makefile.mk
@@ -58,10 +58,9 @@ XHPFILES = \
08000000.xhp \
09000000.xhp \
10000000.xhp \
- 11000000.xhp \
12000000.xhp \
13000000.xhp
-
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
diff --git a/helpcontent2/source/text/shared/autopi/webwizard01.xhp b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
index 0813d45a5a..aca6283935 100755
--- a/helpcontent2/source/text/shared/autopi/webwizard01.xhp
+++ b/helpcontent2/source/text/shared/autopi/webwizard01.xhp
@@ -46,10 +46,10 @@
<paragraph xml-lang="en-US" id="par_idN10554" role="paragraph" l10n="CHG"><ahelp hid=".">You can use the Web Wizard to maintain web pages on a server.</ahelp> You can also load previously saved Web Wizard settings to maintain an existing web page. These settings include information about the local folder and the FTP server.</paragraph>
</section>
<bookmark xml-lang="en-US" branch="hid/HID1_LST_SESSIONS" id="bm_id2904751" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN10557" role="heading" level="1" l10n="NEW">Choose Web Wizard settings</paragraph>
+<paragraph xml-lang="en-US" id="par_idN10557" role="heading" level="2" l10n="NEW">Choose Web Wizard settings</paragraph>
<paragraph xml-lang="en-US" id="par_idN1055B" role="paragraph" l10n="CHG"><ahelp hid="34207">Select the settings that you want to load and then click <emph>Load</emph>. To start the wizard with the default settings, select "default".</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID1_BTN_DEL_SES" id="bm_id5166783" localize="false"/>
-<paragraph xml-lang="en-US" id="par_idN1055E" role="heading" level="1" l10n="NEW">Delete</paragraph>
+<paragraph xml-lang="en-US" id="par_idN1055E" role="heading" level="2" l10n="NEW">Delete</paragraph>
<paragraph xml-lang="en-US" id="par_idN10562" role="paragraph" l10n="NEW"><ahelp hid="34209">Deletes the selected settings.</ahelp></paragraph>
<paragraph xml-lang="en-US" id="par_idN10565" role="paragraph" l10n="NEW"><link href="text/shared/autopi/webwizard02.xhp">Web Wizard - Documents</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
index 71321aab36..bbbda9e129 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabawiz02ldap.xhp
@@ -38,10 +38,6 @@
<title id="tit" xml-lang="en-US">LDAP Connection</title>
<filename>/text/shared/explorer/database/dabawiz02ldap.xhp</filename>
</topic>
-<history>
-<created date="2004-07-28T15:24:27">UFI: Database Wizard LDAP page</created>
-<lastedited date="2006-04-28T12:20:09">YJ: checked</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id22583"><bookmark_value>LDAP server; address books (Base)</bookmark_value>
@@ -66,7 +62,9 @@
<bookmark xml-lang="en-US" branch="hid/HID_PAGE_DBWIZARD_LDAP_CB_USESSL" id="bm_id9989623" localize="false"/>
<paragraph role="heading" id="par_idN105CA" xml-lang="en-US" level="3" l10n="NEW">Use secure connection (SSL)</paragraph>
<paragraph role="paragraph" id="par_idN105CE" xml-lang="en-US" l10n="NEW"><ahelp hid="HID_DSADMIN_USESSL_LDAP">Creates a secure connection to the LDAP server through the Secure Sockets Layer (SSL).</ahelp> By default, an SSL connection uses port 636. A regular connection uses port 389.</paragraph>
+<section id="relatedtopics">
<paragraph role="paragraph" id="par_idN105DE" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz03auth.xhp">Authentication</link></paragraph>
<paragraph role="paragraph" id="par_idN105F5" xml-lang="en-US" l10n="NEW"><link href="text/shared/explorer/database/dabawiz00.xhp">Database Wizard</link></paragraph>
+</section>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/guide/activex.xhp b/helpcontent2/source/text/shared/guide/activex.xhp
index dd57b5e942..3fa0c68c8d 100755
--- a/helpcontent2/source/text/shared/guide/activex.xhp
+++ b/helpcontent2/source/text/shared/guide/activex.xhp
@@ -97,7 +97,8 @@
<paragraph role="listitem" id="par_id3144760" xml-lang="en-US" l10n="U" oldref="16">Edit the copy of the document.</paragraph>
</listitem>
</list>
-<section id="relatedtopics"><comment>replaced embedvar by embed. Embedvar doesnt work</comment><embed href="text/shared/optionen/01020400.xhp#mozilla"/>
+<section id="relatedtopics">
+<embed href="text/shared/optionen/01020400.xhp#mozilla"/>
<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
<embed href="text/shared/guide/doc_open.xhp#doc_open"/>
<embed href="text/shared/guide/import_ms.xhp#import_ms"/>
diff --git a/helpcontent2/source/text/shared/guide/fontwork.xhp b/helpcontent2/source/text/shared/guide/fontwork.xhp
index 3cdaf2c2d4..0daad408aa 100755
--- a/helpcontent2/source/text/shared/guide/fontwork.xhp
+++ b/helpcontent2/source/text/shared/guide/fontwork.xhp
@@ -120,7 +120,7 @@
</list>
<section id="relatedtopics">
<paragraph xml-lang="en-US" id="par_idN108E7" role="paragraph" l10n="NEW"><link href="text/shared/fontwork_toolbar.xhp">Fontwork toolbar</link></paragraph>
- <embed href="text/shared/01/05280000.xhp#hd_id3146959"/>
+ <embed href="text/shared/01/05280000.xhp#fntwrk"/>
</section>
</body>
</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/formfields.xhp b/helpcontent2/source/text/shared/guide/formfields.xhp
index 9644516874..2cb4368fe5 100755
--- a/helpcontent2/source/text/shared/guide/formfields.xhp
+++ b/helpcontent2/source/text/shared/guide/formfields.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: formfields.xhp,v $
- * $Revision: 1.11 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,81 +32,68 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
-<filename>/text/shared/guide/formfields.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideformfieldsxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Inserting and Editing Buttons</title>
+ <filename>/text/shared/guide/formfields.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149798"><bookmark_value>command buttons, see push buttons</bookmark_value>
-<bookmark_value>controls;adding to documents</bookmark_value>
-<bookmark_value>inserting;push buttons</bookmark_value>
-<bookmark_value>keys;adding push buttons</bookmark_value>
-<bookmark_value>buttons;adding push buttons</bookmark_value>
-<bookmark_value>press buttons, see push buttons</bookmark_value>
-<bookmark_value>push buttons;adding to documents</bookmark_value>
-</bookmark>
- <comment>MW changed "adding;" to "inserting;"</comment>
- <paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
+ <bookmark_value>controls;adding to documents</bookmark_value>
+ <bookmark_value>inserting;push buttons</bookmark_value>
+ <bookmark_value>keys;adding push buttons</bookmark_value>
+ <bookmark_value>buttons;adding push buttons</bookmark_value>
+ <bookmark_value>press buttons, see push buttons</bookmark_value>
+ <bookmark_value>push buttons;adding to documents</bookmark_value>
+</bookmark><comment>MW changed "adding;" to "inserting;"</comment>
+<paragraph xml-lang="en-US" id="hd_id3149798" role="heading" level="1" l10n="U" oldref="5"><variable id="formfields"><link href="text/shared/guide/formfields.xhp" name="Inserting and Editing Buttons">Adding a Command Button to a Document</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
- <list type="ordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="2">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
- </listitem>
- </list>
- <list type="ordered" startwith="3">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
- </listitem>
- </list>
- <list type="unordered">
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
- </listitem>
- <listitem>
- <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
- </listitem>
- </list>
- <section id="relatedtopics">
-
- <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
-
- </section>
- </body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10731" role="paragraph" l10n="CHG">You can use the Form Controls toolbar to add checkboxes, buttons, tables showing data records, and other controls to a document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1077F" role="heading" level="2" l10n="NEW">To Add a Button to a Document </paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154751" role="listitem" l10n="CHG" oldref="6">Choose <item type="menuitem">View - Toolbars - Form Controls</item>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145345" role="listitem" l10n="CHG" oldref="7">On the Form Controls toolbar, click the <emph>Push Button</emph> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN107A4" role="listitem" l10n="NEW">The mouse pointer changes to a cross-hair.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3159233" role="listitem" l10n="U" oldref="8">In the document, drag to draw the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107B2" role="listitem" l10n="NEW">Right-click the button and choose <emph>Control</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN107CD" role="listitem" l10n="NEW">Specify the properties of the button.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154923" role="listitem" l10n="CHG" oldref="11">To change the button label, click the <emph>General</emph> tab, and edit the text in the <emph>Label</emph> box.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147303" role="listitem" l10n="U" oldref="12">To attach a macro to the button, click the <emph>Events</emph> tab, and click the <emph>... </emph>button beside the button action that you want to run the macro. In the <emph>Assign Macro</emph> dialog, locate the macro that you want to use, and then click <emph>OK</emph>.<comment>UFI: see #i34509#</comment></paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10814" role="listitem" l10n="NEW">Close the <emph>Properties</emph> dialog.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3147350" role="listitem" l10n="CHG" oldref="76">(Optional) Specify the properties of the form that the button belongs to.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10828" role="listitem" l10n="NEW">Right-click the button and choose <emph>Form</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1082F" role="listitem" l10n="NEW">The <emph>Form Properties</emph> dialog opens.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10837" role="listitem" l10n="NEW">Specify the properties for the form and then close the dialog.</paragraph>
+ </listitem>
+ </list>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/data_addressbook.xhp#data_addressbook"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/imagemap.xhp b/helpcontent2/source/text/shared/guide/imagemap.xhp
index 8f5d9fb7cc..3aaadb8f6d 100755
--- a/helpcontent2/source/text/shared/guide/imagemap.xhp
+++ b/helpcontent2/source/text/shared/guide/imagemap.xhp
@@ -1,18 +1,17 @@
<?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
*
- * $RCSfile: imagemap.xhp,v $
- * $Revision: 1.11 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,26 +34,21 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
-<filename>/text/shared/guide/imagemap.xhp</filename>
-</topic>
-</meta>
-<body>
-
-
-
+ <topic id="textsharedguideimagemapxhp" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Adding Clickable Hotspots to Images</title>
+ <filename>/text/shared/guide/imagemap.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150502"><bookmark_value>ImageMap; editor</bookmark_value>
-<bookmark_value>editors; ImageMap editor</bookmark_value>
-<bookmark_value>images; ImageMap</bookmark_value>
-<bookmark_value>pictures; ImageMap</bookmark_value>
-<bookmark_value>hotspots</bookmark_value>
-<bookmark_value>URL;in pictures</bookmark_value>
-</bookmark>
- <comment>mw added 2 index entries</comment>
- <paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
+ <bookmark_value>editors; ImageMap editor</bookmark_value>
+ <bookmark_value>images; ImageMap</bookmark_value>
+ <bookmark_value>pictures; ImageMap</bookmark_value>
+ <bookmark_value>hotspots;adding to images</bookmark_value>
+ <bookmark_value>URL;in pictures</bookmark_value>
+</bookmark><comment>mw added 2 index entries</comment><comment>MW made "hotspots" a two level entry</comment>
+<paragraph xml-lang="en-US" id="par_idN10631" role="heading" level="1" l10n="NEW"><variable id="imagemap"><link href="text/shared/guide/imagemap.xhp">Adding Clickable Hotspots to Images</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN1064F" role="paragraph" l10n="NEW">An ImageMap allows you to attach URLs to specific areas, called hotspots, on a picture in your document. An image map is a group of one or more hotspots.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1066C" role="paragraph" l10n="NEW">You can draw three types of hotspots: rectangles, ellipses, and polygons. When you click a hotspot, the URL is opened in the browser window or frame that you specify. You can also specify the text that appears when your mouse rests on the hotspot.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/import_ms.xhp b/helpcontent2/source/text/shared/guide/import_ms.xhp
index e4b07cee04..0618ec04d6 100755
--- a/helpcontent2/source/text/shared/guide/import_ms.xhp
+++ b/helpcontent2/source/text/shared/guide/import_ms.xhp
@@ -1,18 +1,17 @@
<?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
*
- * $RCSfile: import_ms.xhp,v $
- * $Revision: 1.14 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -35,31 +34,32 @@
-->
- <helpdocument version="1.0">
<meta>
-<topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Opening documents saved in other formats</title>
-<filename>/text/shared/guide/import_ms.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="chapter_all">
+ <topic id="textsharedguideimport_msxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Opening documents saved in other formats</title>
+ <filename>/text/shared/guide/import_ms.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="chapter_all">
<bookmark xml-lang="en-US" branch="index" id="bm_id3153988"><bookmark_value>Microsoft Office;opening Microsoft documents</bookmark_value>
-<bookmark_value>documents; importing</bookmark_value>
-<bookmark_value>importing; documents in other formats</bookmark_value>
-<bookmark_value>opening; documents from other formats</bookmark_value>
-<bookmark_value>loading; documents from other formats</bookmark_value>
-<bookmark_value>converting;Microsoft documents</bookmark_value>
-<bookmark_value>saving; default file formats</bookmark_value>
-<bookmark_value>defaults; file formats in file dialogs</bookmark_value>
-<bookmark_value>file formats; saving always in other formats</bookmark_value>
-<bookmark_value>Microsoft Office; as default file format</bookmark_value>
-<bookmark_value>files;importing</bookmark_value>
-<bookmark_value>XML converters</bookmark_value>
-<bookmark_value>converters; XML</bookmark_value>
-<bookmark_value>Document Converter Wizard</bookmark_value>
-<bookmark_value>wizards; document converter</bookmark_value>
-</bookmark><comment>MW made file import a two level entry ("files;importing")</comment><paragraph role="heading" id="hd_id3145313" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
+ <bookmark_value>documents; importing</bookmark_value>
+ <bookmark_value>importing; documents in other formats</bookmark_value>
+ <bookmark_value>opening; documents from other formats</bookmark_value>
+ <bookmark_value>loading; documents from other formats</bookmark_value>
+ <bookmark_value>converting;Microsoft documents</bookmark_value>
+ <bookmark_value>saving; default file formats</bookmark_value>
+ <bookmark_value>defaults;document formats in file dialogs</bookmark_value>
+ <bookmark_value>file formats; saving always in other formats</bookmark_value>
+ <bookmark_value>Microsoft Office; as default file format</bookmark_value>
+ <bookmark_value>files;importing</bookmark_value>
+ <bookmark_value>XML converters</bookmark_value>
+ <bookmark_value>converters; XML</bookmark_value>
+ <bookmark_value>Document Converter Wizard</bookmark_value>
+ <bookmark_value>wizards; document converter</bookmark_value>
+ <bookmark_value>files, see also documents</bookmark_value>
+</bookmark><comment>MW inserted cross-reference "files, see also documents"</comment><comment>MW changed "defaults;..."</comment>
+<paragraph xml-lang="en-US" id="hd_id3145313" role="heading" level="1" l10n="U" oldref="2"><variable id="import_ms"><link href="text/shared/guide/import_ms.xhp" name="Opening documents saved in other formats">Opening documents saved in other formats</link>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="3">You can open a document saved in another format by using the following procedure:</paragraph>
<list type="ordered">
@@ -82,27 +82,29 @@
</listitem>
</list>
<switch select="appl">
-<case select="WRITER"><paragraph role="heading" id="hd_id4563127" xml-lang="en-US" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
-<list type="unordered">
-<listitem>
-<paragraph role="listitem" id="par_id9207434" xml-lang="en-US" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
-<paragraph role="listitem" id="par_id7215491" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id2299874" xml-lang="en-US" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
-<paragraph role="listitem" id="par_id1727347" xml-lang="en-US" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
-</listitem>
-</list>
+<case select="WRITER">
+<paragraph xml-lang="en-US" id="hd_id4563127" role="heading" level="2" l10n="NEW">Opening HTML files in Writer</paragraph>
+ <list type="unordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id9207434" role="listitem" l10n="NEW">Choose the file type "HTML Document" to open in <item type="productname">%PRODUCTNAME</item> Writer/Web. This is the default for HTML documents in <item type="productname">%PRODUCTNAME</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id7215491" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer/Web are now available to you, such as <emph>Show HTML source</emph>.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id2299874" role="listitem" l10n="NEW">Choose "HTML Document (<item type="productname">%PRODUCTNAME</item> Writer)" to open in <item type="productname">%PRODUCTNAME</item> Writer.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1727347" role="listitem" l10n="NEW">All the options of <item type="productname">%PRODUCTNAME</item> Writer are now available to you. Not all options that <item type="productname">%PRODUCTNAME</item> Writer offers for editing of documents can be saved in HTML format.</paragraph>
+ </listitem>
+ </list>
</case>
-</switch></section>
-<section id="relatedtopics">
-<embed href="text/shared/00/00000021.xhp#xmlformat"/>
-<embed href="text/shared/guide/export_ms.xhp#export_ms"/>
-<embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
-<embed href="text/shared/guide/ms_user.xhp#ms_user"/>
-<paragraph role="paragraph" id="par_id3148944" xml-lang="en-US" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
-<paragraph role="paragraph" id="par_id3147264" xml-lang="en-US" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
-<embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+</switch>
</section>
-</body>
-</helpdocument>
+ <section id="relatedtopics">
+ <embed href="text/shared/00/00000021.xhp#xmlformat"/>
+ <embed href="text/shared/guide/export_ms.xhp#export_ms"/>
+ <embed href="text/shared/guide/ms_import_export_limitations.xhp#about"/>
+ <embed href="text/shared/guide/ms_user.xhp#ms_user"/>
+ <paragraph xml-lang="en-US" id="par_id3148944" role="paragraph" l10n="U" oldref="12"><link href="text/shared/optionen/01130100.xhp" name="Working with VBA code">Working with VBA code</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147264" role="paragraph" l10n="U" oldref="13"><link href="text/shared/optionen/01010200.xhp" name="Setting the default file format">Setting the default file format</link></paragraph>
+ <embed href="text/shared/guide/ms_doctypes.xhp#ms_doctypes"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/keyboard.xhp b/helpcontent2/source/text/shared/guide/keyboard.xhp
index e266af1ca9..45fbb21369 100644
--- a/helpcontent2/source/text/shared/guide/keyboard.xhp
+++ b/helpcontent2/source/text/shared/guide/keyboard.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -69,35 +69,31 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id3154514" role="listitem" l10n="U" oldref="34">document</paragraph>
</listitem>
- </list>
- <paragraph xml-lang="en-US" id="par_id3153824" role="paragraph" l10n="U" oldref="33">If the focus is on a menu bar or a toolbar, and you press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab, you switch through the previously mentioned objects just as with F6, but without switching through to the document. <switchinline select="sys"><caseinline select="UNIX">Some X Window Managers evaluate this shortcut themselves, in which case you cannot use the shortcut for <item type="productname">%PRODUCTNAME</item>.
-</caseinline></switchinline></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 or Shift+<switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to switch through objects in the opposite direction.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command
+ </list><comment>removed para about Ctrl+Tab</comment>
+<paragraph xml-lang="en-US" id="par_id3153252" role="paragraph" l10n="U" oldref="32">Press Shift+F6 to switch through objects in the opposite direction.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152473" role="paragraph" l10n="U" oldref="31">Press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to switch to the document.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152360" role="paragraph" l10n="U" oldref="30">Press F10 to switch to the menu bar and back.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153896" role="paragraph" l10n="U" oldref="29">Escape closes an open submenu, a toolbar, or the current free window.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3161656" role="heading" level="3" l10n="U"
oldref="21">Calling a menu command</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151056" role="paragraph" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3151056" role="paragraph" l10n="U" oldref="20">Press <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> or F6 or F10 to select the first menu (the <emph>File</emph> menu). With right arrow, the next menu to the right is selected; with left arrow, the previous menu.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153381" role="paragraph" l10n="U" oldref="19">Arrow down opens a selected menu. Any additional arrow down and up arrow move the selection through the menu commands. With right arrow you open any existing submenus.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148798" role="paragraph" l10n="U" oldref="18">Press Enter to execute the selected menu command.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3147086" role="heading" level="3" l10n="U"
oldref="17">Executing an icon command</paragraph>
<paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="16">Press F6 repeatedly until the first icon on the toolbar is selected. Use the right and left arrows to select an icon on a horizontal toolbar. Similarly, use the up and down arrows to select an icon on a vertical toolbar. The Home key selects the first icon on a toolbar and the End key, the last.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144433" role="paragraph" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3144433" role="paragraph" l10n="U" oldref="15">Press Enter to execute the selected icon. If the selected icon normally demands a consecutive mouse action, such as inserting a rectangle, then pressing the Enter key is not sufficient: in these cases press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter.</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3153968" role="listitem" l10n="U" oldref="28">Pressing <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on an icon for creating a draw object. A draw object will be placed into the middle of the view, with a predefined size.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150449" role="listitem" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3150449" role="listitem" l10n="U" oldref="27">Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter on the Selection tool to select the first draw object in the document. If you want to edit, size, or move the selected draw object, first use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6 to set the focus into the document.</paragraph>
</listitem>
</list>
@@ -131,28 +127,28 @@
<paragraph xml-lang="en-US" id="par_id3154014" role="listitem" l10n="U" oldref="43">Spacebar: switches from selection of the current row and cancellation of any selection, but not if the current cell is in edit mode.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147396" role="listitem" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3147396" role="listitem" l10n="U" oldref="44"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+spacebar: switches between selection of the current row and cancellation of this selection.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149488" role="listitem" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3149488" role="listitem" l10n="U" oldref="45"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+spacebar: switches between selection of the current column and cancellation of this selection.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3156286" role="listitem" l10n="U" oldref="73"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up Arrow or <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow: moves the window separator between table and form, for instance in the bibliography database.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3145251" role="listitem" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3145251" role="listitem" l10n="U" oldref="147">In a table control or in the data source view, the Tab key moves to the next column. To move to the next control, press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab. To move to the previous control, press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3150592" role="heading" level="3" l10n="U" oldref="7">Size and Position of Windows and Dialogs</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153221" role="listitem" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3153221" role="listitem" l10n="U" oldref="6">First press <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+spacebar.</paragraph>
<paragraph xml-lang="en-US" id="par_id3148456" role="listitem" l10n="U" oldref="5">A system menu opens with menu commands like <emph>Move</emph>, <emph>Resize</emph> and <emph>Close</emph>.</paragraph>
</listitem>
@@ -173,13 +169,13 @@
<paragraph xml-lang="en-US" id="par_id3147176" role="listitem" l10n="U" oldref="151">Press F6 until the window or toolbar is selected.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153707" role="listitem" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3153707" role="listitem" l10n="U" oldref="152">Press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+F10.</paragraph>
</listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id3154479" role="heading" level="3" l10n="U"
oldref="148">Selecting objects</paragraph>
- <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press <item type="keycode">Shift+F4</item> to select the first object in the current document. When an object is selected, press <item type="keycode">Tab</item> to select the next object, or press <item type="keycode">Esc</item> to go back to the text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148993" role="paragraph" l10n="CHG" oldref="149">Press Shift+F4 to select the first object in the current document. When an object is selected, press Tab to select the next object, or press Esc to go back to the text.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3152962" role="heading" level="3" l10n="U"
oldref="54">Edit Objects</paragraph>
<paragraph xml-lang="en-US" id="par_id3156379" role="paragraph" l10n="U" oldref="53">A selected OLE object can be activated with the Enter key.</paragraph>
@@ -191,12 +187,12 @@
<paragraph xml-lang="en-US" id="par_id3145619" role="listitem" l10n="U" oldref="57">Set the grid resolution unit with <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Grid</emph> in the <emph>Resolution</emph> area. If you enter a number greater than 1 in the <emph>Subdivision</emph> area, you must press the arrow key as often as the number states to move the selected object by one grid resolution unit.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3166450" role="listitem" l10n="U" oldref="58">Use the <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline> and arrow keys to move the selected object by one pixel.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147345" role="listitem" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3147345" role="listitem" l10n="U" oldref="59">Use <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to enter the handle edit mode. The upper left handle is the active handle, it starts blinking. Use <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab to select the next handle. Press Escape to exit the handle edit mode.</paragraph>
</listitem>
<listitem>
@@ -211,12 +207,12 @@
<paragraph xml-lang="en-US" id="par_id3163808" role="listitem" l10n="U" oldref="63">Select the object.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150646" role="listitem" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3150646" role="listitem" l10n="U" oldref="64">Enter the handle edit mode with <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150940" role="listitem" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command
-</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3150940" role="listitem" l10n="U" oldref="65">The upper left handle starts blinking. Press <switchinline select="sys"><caseinline select="MAC">Command
+</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Tab several times, until no handle blinks. This signals that now the anchor of the object is activated. <switchinline select="appl"><caseinline select="WRITER">In text documents you can press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+A to activate the anchor directly.
</caseinline></switchinline></paragraph>
</listitem>
@@ -247,7 +243,7 @@
<paragraph xml-lang="en-US" id="par_id3158413" role="paragraph" l10n="U" oldref="134">Documents of <item type="productname">%PRODUCTNAME</item> Calc, <item type="productname">%PRODUCTNAME</item> Draw, and <item type="productname">%PRODUCTNAME</item> Impress can be split horizontally and vertically into separate views. Each view can show other parts of the document. Using the mouse, you can drag a dividing line from the scrollbar into the document.</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149814" role="listitem" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3149814" role="listitem" l10n="U" oldref="135">Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F6: shows the dividing lines at default positions and focus a line.</paragraph>
</listitem>
<listitem>
@@ -276,19 +272,19 @@
<paragraph xml-lang="en-US" id="par_id3159109" role="paragraph" l10n="U" oldref="114">F6: switches between document and toolbars.</paragraph>
<paragraph xml-lang="en-US" id="par_id3153229" role="paragraph" l10n="U" oldref="115">+ (plus key): expands the selected entry in the data source explorer.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150312" role="paragraph" l10n="U" oldref="116">- (minus key): collapses the selected entry in the data source explorer.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3154368" role="paragraph" l10n="U" oldref="117"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+E: switches between data source explorer and table.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3147171" role="heading" level="3" l10n="U"
oldref="118">Shortcuts in the Query Design Window</paragraph>
<paragraph xml-lang="en-US" id="par_id3152455" role="paragraph" l10n="U" oldref="119">F6: switches between object bar, table view, and selection area.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3151180" role="paragraph" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option
-</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3151180" role="paragraph" l10n="U" oldref="120"><switchinline select="sys"><caseinline select="MAC">Option
+</caseinline><defaultinline>Alt</defaultinline></switchinline>+Up arrow or <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down arrow: moves the border between table view and selection area up or down.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3156288" role="heading" level="3" l10n="U"
oldref="121">Keys in the Table View (upper area of the query design) and in the Relations window</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3156166" role="paragraph" l10n="U" oldref="122"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Arrow key: moves the selected table in the direction of the arrow.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3147310" role="paragraph" l10n="U" oldref="123"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Shift+Arrow key: resizes the selected table in the table view.</paragraph>
<paragraph xml-lang="en-US" id="par_id3152986" role="paragraph" l10n="U" oldref="124">Del: removes the selected table or connection from the table view.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145384" role="paragraph" l10n="U" oldref="125">Tab: switches between tables and connections in the table view.</paragraph>
@@ -296,7 +292,7 @@
<paragraph xml-lang="en-US" id="par_id3159624" role="paragraph" l10n="U" oldref="127">Enter: when a table is selected, the Enter key enters the first data field from the list box into the selection area.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3153816" role="heading" level="3" l10n="U"
oldref="128">Keys in the Selection Area (bottom area of the query design)</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152896" role="paragraph" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3152896" role="paragraph" l10n="U" oldref="146"><switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Left Arrow or Right Arrow: moves the selected column to the left or to the right.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3146152" role="heading" level="3" l10n="U"
oldref="131">Keys in the Table Design Window</paragraph>
@@ -307,7 +303,7 @@
oldref="74">Controlling the ImageMap Editor</paragraph>
<list type="unordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3159096" role="listitem" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command
+ <paragraph xml-lang="en-US" id="par_id3159096" role="listitem" l10n="U" oldref="75">Press Tab to select an icon. If you selected one of the icons from <emph>Rectangle</emph> to <emph>Freeform Polygon</emph> and you press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Enter, an object of the selected type is created in default size.</paragraph>
</listitem>
<listitem>
@@ -438,7 +434,7 @@
<paragraph xml-lang="en-US" id="par_id3153073" role="listitem" l10n="U" oldref="143">Tab switches through all controls in the dialog.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3153295" role="listitem" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option
+ <paragraph xml-lang="en-US" id="par_id3153295" role="listitem" l10n="U" oldref="144"><switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+Down Arrow opens a combo box. Enter selects the current entry in the combo box.</paragraph>
</listitem>
<listitem>
diff --git a/helpcontent2/source/text/shared/guide/paintbrush.xhp b/helpcontent2/source/text/shared/guide/paintbrush.xhp
index f930114343..0b3278cb16 100755
--- a/helpcontent2/source/text/shared/guide/paintbrush.xhp
+++ b/helpcontent2/source/text/shared/guide/paintbrush.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="textsharedguidepaintbrushxml" indexer="include">
<title xml-lang="en-US" id="tit">Copying Attributes With the Format Paintbrush</title>
@@ -45,7 +45,8 @@
<bookmark xml-lang="en-US" branch="index" id="bm_id380260"><bookmark_value>Format Paintbrush</bookmark_value>
<bookmark_value>formatting;copying</bookmark_value>
<bookmark_value>copying;formatting</bookmark_value>
-</bookmark>
+ <bookmark_value>Paintbrush</bookmark_value>
+</bookmark><comment>MW added "Paintbrush"</comment>
<paragraph xml-lang="en-US" id="par_idN1053A" role="heading" level="1" l10n="NEW"><variable id="formatpaintbrush"><link href="text/shared/guide/paintbrush.xhp">Copying Formatting With the Format Paintbrush</link>
</variable></paragraph>
</section>
@@ -60,7 +61,7 @@
<listitem>
<paragraph xml-lang="en-US" id="par_idN10667" role="paragraph" l10n="NEW">On the <emph>Standard Bar</emph>, click the <emph>Format Paintbrush</emph> icon.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10660" role="paragraph" l10n="NEW">The cursor changes to a paint bucket.</paragraph>
- <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
+ <paragraph xml-lang="en-US" id="par_idN10663" role="tip" l10n="CHG">If you want to apply the formatting to more than one selection, double-click the <emph>Format Paintbrush</emph> icon
<image id="img_id209967" src="res/commandimagelist/sc_formatpaintbrush.png" width="0.1665in" height="0.1665in"><alt xml-lang="en-US" id="alt_id209967">Icon</alt>
</image>. After you apply all the formatting, click the icon again.</paragraph>
</listitem>
@@ -123,10 +124,10 @@
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Text within drawing object is selected</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106DF" role="tablecontent" l10n="NEW">Drawing object is selected</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">In Impress and Draw, paragraph and character formatting can be copied from and to text selections. Not Supported in Calc and Writer</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106E5" role="tablecontent" l10n="NEW">Copies all formatting attributes. In Impress and Draw, the text contents of the object is also copied.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/shared/guide/redlining.xhp b/helpcontent2/source/text/shared/guide/redlining.xhp
index 0b50937dcf..a0f47dd890 100755
--- a/helpcontent2/source/text/shared/guide/redlining.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: redlining.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,39 +30,37 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
-
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording and Displaying Changes</title>
-<filename>/text/shared/guide/redlining.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-13T15:41:19">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredliningxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording and Displaying Changes</title>
+ <filename>/text/shared/guide/redlining.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150499"><bookmark_value>marking changes</bookmark_value>
-<bookmark_value>changes; review function</bookmark_value>
-<bookmark_value>review function; recording changes example</bookmark_value>
-</bookmark>
-<paragraph role="heading" id="hd_id3150499" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
+ <bookmark_value>highlighting changes</bookmark_value>
+ <bookmark_value>changes; review function</bookmark_value>
+ <bookmark_value>review function; recording changes example</bookmark_value>
+ <bookmark_value>Track Changes, see review function</bookmark_value>
+</bookmark><comment>MW addes a cross-reference</comment><comment>MW added "highlighting changes"</comment>
+<paragraph xml-lang="en-US" id="hd_id3150499" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining"><link href="text/shared/guide/redlining.xhp" name="Recording and Displaying Changes">Recording and Displaying Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id4013794" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3153681" xml-lang="en-US" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
-<paragraph role="paragraph" id="par_id3147008" xml-lang="en-US" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
-<paragraph role="paragraph" id="par_id3150774" xml-lang="en-US" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
-<paragraph role="paragraph" id="par_id3146957" xml-lang="en-US" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
-<embed href="text/shared/00/00000004.xhp#related"/>
-<embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
-<embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
-<embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
-<embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
-<embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
-<embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id4013794" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153681" role="paragraph" l10n="U" oldref="2">When several authors are working on the same text or spreadsheet, the review function records and displays who made the various changes. On the final edit of the document, it is then possible to look at each individual change and decide whether it should be accepted or rejected.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147008" role="paragraph" l10n="U" oldref="3">For example: You are an editor and are delivering your latest report. But before publication the report must be read by the senior editor and the proofreader, and both will add their changes. The senior editor writes "clarify" after one paragraph and crosses out another entirely. The proofreader corrects the spelling of your document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150774" role="paragraph" l10n="U" oldref="4">The edited document comes back to you, and you can incorporate or ignore the suggestions of the two reviewers.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146957" role="paragraph" l10n="U" oldref="5">Let's say you also e-mailed a copy of the report to a good friend and colleague who has done research on a similar topic in the past. You asked for a few suggestions, and the document is now returned by e-mail with your colleague's suggestions.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="6">As all your colleagues and the managers in your company work with $[officename], you can produce a final version of the document from the results you get back.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#related"/>
+ <embed href="text/shared/guide/redlining_enter.xhp#redlining_enter"/>
+ <embed href="text/shared/guide/redlining_accept.xhp#redlining_accept"/>
+ <embed href="text/shared/guide/redlining_doccompare.xhp#redlining_doccompare"/>
+ <embed href="text/shared/guide/redlining_docmerge.xhp#redlining_docmerge"/>
+ <embed href="text/shared/guide/redlining_versions.xhp#redlining_versions"/>
+ <embed href="text/shared/guide/redlining_protect.xhp#redlining_protect"/>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/guide/redlining_enter.xhp b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
index 0dbea570e8..21ad4d919a 100755
--- a/helpcontent2/source/text/shared/guide/redlining_enter.xhp
+++ b/helpcontent2/source/text/shared/guide/redlining_enter.xhp
@@ -1,17 +1,17 @@
<?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
*
- * $RCSfile: redlining_enter.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,54 +32,50 @@
*
************************************************************************
-->
-
-<helpdocument version="1.0">
+
+
<meta>
-<topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Recording Changes</title>
-<filename>/text/shared/guide/redlining_enter.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-24T12:53:47">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textsharedguideredlining_enterxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Recording Changes</title>
+ <filename>/text/shared/guide/redlining_enter.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3155364"><bookmark_value>changes; recording</bookmark_value>
-<bookmark_value>recording; changes</bookmark_value>
-<bookmark_value>comments; on changes</bookmark_value>
-<bookmark_value>settings;tracking changes</bookmark_value>
-</bookmark><comment>UFI: deleted index review function;recording changes</comment>
-<paragraph role="heading" id="hd_id3155364" xml-lang="en-US" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
+ <bookmark_value>recording; changes</bookmark_value>
+ <bookmark_value>comments; on changes</bookmark_value>
+ <bookmark_value>review function;tracking changes</bookmark_value>
+</bookmark><comment>UFI: deleted index review function;recording changes</comment><comment>MW changed "settings;tracking changes" </comment>
+<paragraph xml-lang="en-US" id="hd_id3155364" role="heading" level="1" l10n="U" oldref="7"><variable id="redlining_enter"><link href="text/shared/guide/redlining_enter.xhp" name="Recording Changes">Recording Changes</link>
</variable></paragraph>
-<paragraph role="note" id="par_id7271645" xml-lang="en-US" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
-<paragraph role="paragraph" id="par_id3145669" xml-lang="en-US" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
-<table id="tbl_id3147399">
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3147088" xml-lang="en-US" l10n="U" oldref="17">1.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149095" xml-lang="en-US" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3154749" xml-lang="en-US" l10n="U" oldref="18">2.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3163802" xml-lang="en-US" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
-</tablecell>
-</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="19">3.</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149578" xml-lang="en-US" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
-</tablecell>
-</tablerow>
-</table>
+ <paragraph xml-lang="en-US" id="par_id7271645" role="note" l10n="NEW">The review function is available in %PRODUCTNAME for text documents and spreadsheet documents.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145669" role="paragraph" l10n="CHG" oldref="8">Not all changes are recorded. For example, the changing of a tab stop from align left to align right is not recorded. However, all usual changes made by a proofreader are recorded, such as additions, deletions, text alterations, and usual formatting.</paragraph>
+ <table id="tbl_id3147399">
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3147088" role="paragraph" l10n="U" oldref="17">1.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149095" role="paragraph" l10n="U" oldref="9">To start recording changes, open the document to be edited and choose <link href="text/shared/01/02230000.xhp" name="Edit - Changes"><emph>Edit - Changes</emph></link> and then choose <emph>Record</emph>.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3154749" role="paragraph" l10n="U" oldref="18">2.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3163802" role="paragraph" l10n="U" oldref="10">Now start making your changes. You will note that all new text passages that you enter are underlined in color, while all text that you delete remains visible but is crossed out and shown in color.</paragraph>
+ </tablecell>
+ </tablerow>
+ <tablerow>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3152349" role="paragraph" l10n="U" oldref="19">3.</paragraph>
+ </tablecell>
+ <tablecell>
+ <paragraph xml-lang="en-US" id="par_id3149578" role="paragraph" l10n="CHG" oldref="11">If you move to a marked change with the mouse pointer, you will see a reference to the type of change, the author, date and time of day for the change in the Help Tip. If the Extended Tips are also enabled, you will also see any available comments on this change.</paragraph>
+ </tablecell>
+ </tablerow>
+ </table>
<paragraph role="paragraph" id="par_id3156119" xml-lang="en-US" l10n="U" oldref="12">Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip.</paragraph>
<paragraph role="paragraph" id="par_id3148473" xml-lang="en-US" l10n="U" oldref="13">You can enter a comment on each recorded change by placing the cursor in the area of the change and then choosing <emph>Edit - Changes - Comment</emph>. In addition to Extended Tips, the comment is also displayed in the list in the <link href="text/shared/01/02230400.xhp" name="Accept or Reject Changes"><emph>Accept or Reject Changes</emph></link> dialog.</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/start_parameters.xhp b/helpcontent2/source/text/shared/guide/start_parameters.xhp
index ec91bcb068..5d34741609 100644
--- a/helpcontent2/source/text/shared/guide/start_parameters.xhp
+++ b/helpcontent2/source/text/shared/guide/start_parameters.xhp
@@ -39,10 +39,6 @@
<title id="tit" xml-lang="en-US">Starting the $[officename] Software With Parameters</title>
<filename>/text/shared/guide/start_parameters.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-01-25T12:22:48">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="start_parameters">
@@ -54,7 +50,6 @@
<paragraph role="heading" id="hd_id3156410" xml-lang="en-US" level="1" l10n="U" oldref="52">Starting the $[officename] Software With Parameters</paragraph>
<paragraph role="paragraph" id="par_id3147009" xml-lang="en-US" l10n="U" oldref="1">By starting the $[officename] software from the command line you can assign various parameters, with which you can influence the performance. The use of command line parameters is only recommended for experienced users.</paragraph>
<paragraph role="note" id="par_id3147618" xml-lang="en-US" l10n="U" oldref="2">For normal handling, the use of command line parameters is not necessary. A few of the parameters require a deeper knowledge of the technical background of the $[officename] software technology.</paragraph>
-<paragraph role="note" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="3">More information on this topic can be found at <link href="http://www.openoffice.org" name="www.openoffice.org">www.openoffice.org</link>.</paragraph>
<paragraph role="heading" id="hd_id3154898" xml-lang="en-US" level="2" l10n="U" oldref="4">Starting the $[officename] Software From the Command Line</paragraph>
<list type="ordered">
<listitem>
diff --git a/helpcontent2/source/text/shared/optionen/01020400.xhp b/helpcontent2/source/text/shared/optionen/01020400.xhp
index 1d3343ac2c..5a3487cf39 100644
--- a/helpcontent2/source/text/shared/optionen/01020400.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020400.xhp
@@ -41,9 +41,7 @@
</topic>
</meta>
<body>
- <section id="mozilla">
- <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><link href="text/shared/optionen/01020400.xhp">Browser Plug-in</link></paragraph>
- </section>
+ <paragraph xml-lang="en-US" id="par_idN105B7" role="heading" level="1" l10n="CHG"><variable id="mozilla"><link href="text/shared/optionen/01020400.xhp" name="Browser Plugin">Browser Plug-in</link></variable></paragraph>
<paragraph xml-lang="en-US" id="par_idN105D5" role="paragraph" l10n="NEW">Specifies to use the Mozilla plug-in to show %PRODUCTNAME documents.</paragraph>
<paragraph xml-lang="en-US" id="par_idN105D8" role="paragraph" l10n="CHG">When you click any %PRODUCTNAME document hyperlink in your Mozilla or Netscape browser, one of the following can happen:</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/shared/optionen/01060100.xhp b/helpcontent2/source/text/shared/optionen/01060100.xhp
index 39f750d3f2..7030cefe86 100644
--- a/helpcontent2/source/text/shared/optionen/01060100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01060100.xhp
@@ -1,17 +1,17 @@
<?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
*
- * $RCSfile: 01060100.xhp,v $
- * $Revision: 1.15.4.1 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,134 +32,151 @@
*
************************************************************************
-->
-
-
+
+
<meta>
-<topic id="textsharedoptionen01060100xml" indexer="include">
-<title id="tit" xml-lang="en-US">View</title>
-<filename>/text/shared/optionen/01060100.xhp</filename>
-</topic>
-</meta>
-<body>
-<section id="inhalte">
+ <topic id="textsharedoptionen01060100xml" indexer="include">
+ <title xml-lang="en-US" id="tit">View</title>
+ <filename>/text/shared/optionen/01060100.xhp</filename>
+ </topic>
+ </meta>
+ <body>
+ <section id="inhalte">
<bookmark xml-lang="en-US" branch="index" id="bm_id3147242"><bookmark_value>cells; showing grid lines (Calc)</bookmark_value>
-<bookmark_value>borders; cells on screen (Calc)</bookmark_value>
-<bookmark_value>grids; displaying lines (Calc)</bookmark_value>
-<bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
-<bookmark_value>page breaks; displaying (Calc)</bookmark_value>
-<bookmark_value>guides; showing (Calc)</bookmark_value>
-<bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
-<bookmark_value>displaying; zero values (Calc)</bookmark_value>
-<bookmark_value>zero values; displaying (Calc)</bookmark_value>
-<bookmark_value>displaying; comments (Calc)</bookmark_value>
-<bookmark_value>comments; displaying (Calc)</bookmark_value>
-<bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
-<bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
-<bookmark_value>cells; coloring (Calc)</bookmark_value>
-<bookmark_value>anchors; displaying (Calc)</bookmark_value>
-<bookmark_value>colors;restriction (Calc)</bookmark_value>
-<bookmark_value>text overflow in spreadsheet cells</bookmark_value>
-<bookmark_value>references; displaying in color (Calc)</bookmark_value>
-<bookmark_value>objects; displaying in spreadsheets</bookmark_value>
-<bookmark_value>pictures; displaying in Calc</bookmark_value>
-<bookmark_value>charts; displaying (Calc)</bookmark_value>
-<bookmark_value>draw objects; displaying (Calc)</bookmark_value>
-<bookmark_value>row headers; displaying (Calc)</bookmark_value>
-<bookmark_value>column headers; displaying (Calc)</bookmark_value>
-<bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
-<bookmark_value>sheet tabs; displaying</bookmark_value>
-<bookmark_value>tabs; displaying sheet tabs</bookmark_value>
-<bookmark_value>outlines;outline symbols</bookmark_value>
-</bookmark><comment>mw deleted "formulas;..." and copied "displaying; formulas..." to Calc guide formula_value.xhp and changed "sheets;.." into "sheet tabs;..."</comment><comment>MW made "outline..." a two level entry</comment>
+ <bookmark_value>borders; cells on screen (Calc)</bookmark_value>
+ <bookmark_value>grids; displaying lines (Calc)</bookmark_value>
+ <bookmark_value>colors; grid lines and cells (Calc)</bookmark_value>
+ <bookmark_value>page breaks; displaying (Calc)</bookmark_value>
+ <bookmark_value>guides; showing (Calc)</bookmark_value>
+ <bookmark_value>handles; showing simple/large handles (Calc)</bookmark_value>
+ <bookmark_value>displaying; zero values (Calc)</bookmark_value>
+ <bookmark_value>zero values; displaying (Calc)</bookmark_value>
+ <bookmark_value>tables in spreadsheets; value highlighting</bookmark_value>
+ <bookmark_value>cells; formatting without effect (Calc)</bookmark_value>
+ <bookmark_value>cells; coloring (Calc)</bookmark_value>
+ <bookmark_value>anchors; displaying (Calc)</bookmark_value>
+ <bookmark_value>colors;restriction (Calc)</bookmark_value>
+ <bookmark_value>text overflow in spreadsheet cells</bookmark_value>
+ <bookmark_value>references; displaying in color (Calc)</bookmark_value>
+ <bookmark_value>objects; displaying in spreadsheets</bookmark_value>
+ <bookmark_value>pictures; displaying in Calc</bookmark_value>
+ <bookmark_value>charts; displaying (Calc)</bookmark_value>
+ <bookmark_value>draw objects; displaying (Calc)</bookmark_value>
+ <bookmark_value>row headers; displaying (Calc)</bookmark_value>
+ <bookmark_value>column headers; displaying (Calc)</bookmark_value>
+ <bookmark_value>scrollbars; displaying (Calc)</bookmark_value>
+ <bookmark_value>sheet tabs; displaying</bookmark_value>
+ <bookmark_value>tabs; displaying sheet tabs</bookmark_value>
+ <bookmark_value>outlines;outline symbols</bookmark_value>
+</bookmark><comment>MW copied "displaying;comments" over to Calc guide note_insert.xhp and deleted "comments;displaying"</comment>
<bookmark xml-lang="en-US" branch="hid/HID_SCPAGE_CONTENT" id="bm_id3157898" localize="false"/>
-<paragraph role="heading" id="hd_id3150445" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
-<paragraph role="paragraph" id="par_id3153988" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
-</section>
-<section id="howtoget">
-<embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
-</section>
-<paragraph role="heading" id="hd_id3153682" xml-lang="en-US" level="2" l10n="U" oldref="28">Visual aids</paragraph>
-<paragraph role="paragraph" id="par_id3153311" xml-lang="en-US" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150445" role="heading" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01060100.xhp" name="View">View</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153988" role="paragraph" l10n="U" oldref="2"><ahelp hid="HID_SCPAGE_CONTENT">Defines which elements of the <item type="productname">%PRODUCTNAME</item> Calc main window are displayed. You can also show or hide highlighting of values in tables.</ahelp></paragraph>
+ </section>
+ <section id="howtoget">
+ <embed href="text/shared/00/00000406.xhp#tabelleinhalte"/>
+ </section>
+ <paragraph xml-lang="en-US" id="hd_id3153682" role="heading" level="2" l10n="U"
+ oldref="28">Visual aids</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153311" role="paragraph" l10n="U" oldref="29">Specifies which lines are displayed.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID" id="bm_id3148538" localize="false"/>
-<paragraph role="heading" id="hd_id3147242" xml-lang="en-US" level="3" l10n="U" oldref="30">Grid lines</paragraph>
-<paragraph role="paragraph" id="par_id3153088" xml-lang="en-US" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
+<paragraph xml-lang="en-US" id="hd_id3147242" role="heading" level="3" l10n="U"
+ oldref="30">Grid lines</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153088" role="paragraph" l10n="U" oldref="31"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GRID">Specifies whether to display grid lines between the cells.</ahelp><switchinline select="appl"><caseinline select="CALC">For printing, choose <emph>Format - Page - </emph><link href="text/scalc/01/05070500.xhp" name="Sheet"><emph>Sheet</emph></link> and mark the <emph>Grid</emph> check box.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR" id="bm_id3150504" localize="false"/>
<paragraph role="heading" id="hd_id3156326" xml-lang="en-US" level="3" l10n="U" oldref="32">Color</paragraph>
<paragraph role="paragraph" id="par_id3154286" xml-lang="en-US" l10n="U" oldref="33"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_COLOR">Specifies a color for the grid lines in the current document.</ahelp> To see the grid line color that was saved with the document, go to <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Appearance</emph>, under <emph>Scheme</emph> find the entry <emph>Spreadsheet - Grid lines</emph> and set the color to "Automatic".</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS" id="bm_id3148563" localize="false"/>
-<paragraph role="heading" id="hd_id3152349" xml-lang="en-US" level="3" l10n="U" oldref="34">Page breaks</paragraph>
-<paragraph role="paragraph" id="par_id3151245" xml-lang="en-US" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3152349" role="heading" level="3" l10n="U"
+ oldref="34">Page breaks</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151245" role="paragraph" l10n="U" oldref="35"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_PAGEBREAKS">Specifies whether to view the page breaks within a defined print area.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE" id="bm_id3148946" localize="false"/>
-<paragraph role="heading" id="hd_id3149669" xml-lang="en-US" level="3" l10n="U" oldref="36">Guides while moving</paragraph>
-<paragraph role="paragraph" id="par_id3148550" xml-lang="en-US" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149669" role="heading" level="3" l10n="U"
+ oldref="36">Guides while moving</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148550" role="paragraph" l10n="U" oldref="37"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_GUIDELINE">Specifies whether to view guides when moving drawings, frames, graphics and other objects.</ahelp> These guides help you align objects.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES" id="bm_id3153380" localize="false"/>
-<paragraph role="heading" id="hd_id3150358" xml-lang="en-US" level="3" l10n="U" oldref="38">Simple handles</paragraph>
-<paragraph role="paragraph" id="par_id3154140" xml-lang="en-US" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150358" role="heading" level="3" l10n="U"
+ oldref="38">Simple handles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154140" role="paragraph" l10n="U" oldref="39"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HANDLES">Specifies whether to display the handles (the eight points on a selection box) as simple squares without 3D effect.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES" id="bm_id3151176" localize="false"/>
-<paragraph role="heading" id="hd_id3149202" xml-lang="en-US" level="3" l10n="U" oldref="40">Large handles</paragraph>
-<paragraph role="paragraph" id="par_id3154123" xml-lang="en-US" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3152920" xml-lang="en-US" level="2" l10n="U" oldref="3">Display</paragraph>
-<paragraph role="paragraph" id="par_id3125864" xml-lang="en-US" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="3" l10n="U"
+ oldref="40">Large handles</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154123" role="paragraph" l10n="U" oldref="41"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_BIGHANDLES">Specifies that larger than normal handles (the eight points on a selection box) are displayed.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3152920" role="heading" level="2" l10n="U" oldref="3">Display</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3125864" role="paragraph" l10n="U" oldref="4">Select various options for the screen display.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA" id="bm_id3150767" localize="false"/>
-<paragraph role="heading" id="hd_id3154218" xml-lang="en-US" level="3" l10n="U" oldref="5">Formulas</paragraph>
-<paragraph role="paragraph" id="par_id3150440" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154218" role="heading" level="3" l10n="U" oldref="5">Formulas</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150440" role="paragraph" l10n="U" oldref="6"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_FORMULA">Specifies whether to show formulas instead of results in the cells.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL" id="bm_id3146146" localize="false"/>
-<paragraph role="heading" id="hd_id3155132" xml-lang="en-US" level="3" l10n="U" oldref="7">Zero values</paragraph>
-<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3155132" role="heading" level="3" l10n="U" oldref="7">Zero values</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147318" role="paragraph" l10n="U" oldref="8"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_NIL">Specifies whether to show numbers with the value of 0.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT" id="bm_id3163711" localize="false"/>
<paragraph role="heading" id="hd_id3147348" xml-lang="en-US" level="3" l10n="U" oldref="9">Comment indicator</paragraph>
<paragraph role="paragraph" id="par_id3146974" xml-lang="en-US" l10n="CHG" oldref="10"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANNOT">Specifies that a small rectangle in the top right corner of the cell indicates that a comment exists. The comment will be shown only when you enable tips under <emph>%PRODUCTNAME - General</emph> in the Options dialog box.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/FID_NOTE_VISIBLE" id="bm_id2862651" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:NoteVisible" id="bm_id3153574" localize="false"/>
-<paragraph role="paragraph" id="par_id3150487" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
-<paragraph role="paragraph" id="par_id3149667" xml-lang="en-US" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3150487" role="paragraph" l10n="U" oldref="24"><ahelp hid=".uno:NoteVisible">To display a comment permanently, select the <emph>Show comment</emph> command from the cell's context menu.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149667" role="paragraph" l10n="CHG" oldref="25">You can type and edit comments with the <link href="text/shared/01/04050000.xhp" name="Insert - Comment"><emph>Insert - Comment</emph></link> command. Comments that are permanently displayed can be edited by clicking the comment box. Click the Navigator and under the <emph>Comments</emph> entry you can view all comments in the current document. By double clicking a comment in Navigator, the cursor will jump to the corresponding cell containing the comment.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE" id="bm_id3155306" localize="false"/>
<paragraph role="heading" id="hd_id3150872" xml-lang="en-US" level="3" l10n="U" oldref="11">Value highlighting</paragraph>
<paragraph role="paragraph" id="par_id3154792" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VALUE">Mark the <emph>Value highlighting</emph> box to show the cell contents in different colors, depending on type. Text cells are formatted in black, formulas in green, and number cells in blue, no matter how their display is formatted.</ahelp></paragraph>
<paragraph role="warning" id="par_id3151319" xml-lang="en-US" l10n="U" oldref="13">When this command is active, any colors assigned in the document will not be displayed until the function is deactivated.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR" id="bm_id3146972" localize="false"/>
-<paragraph role="heading" id="hd_id3157846" xml-lang="en-US" level="3" l10n="U" oldref="14">Anchor</paragraph>
-<paragraph role="paragraph" id="par_id3147494" xml-lang="en-US" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3157846" role="heading" level="3" l10n="U"
+ oldref="14">Anchor</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147494" role="paragraph" l10n="U" oldref="15"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ANCHOR">Specifies whether the anchor icon is displayed when an inserted object, such as a graphic, is selected.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP" id="bm_id3146789" localize="false"/>
-<paragraph role="heading" id="hd_id3146898" xml-lang="en-US" level="3" l10n="U" oldref="26">Text overflow</paragraph>
-<paragraph role="paragraph" id="par_id3153707" xml-lang="en-US" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3146898" role="heading" level="3" l10n="U"
+ oldref="26">Text overflow</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153707" role="paragraph" l10n="CHG" oldref="27"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_CLIP">If a cell contains text that is wider than the width of the cell, the text is displayed over empty neighboring cells in the same row. If there is no empty neighboring cell, a small triangle at the cell border indicates that the text continues.</ahelp><comment>UFI: sc.features "Alignment of text that is larger than a cell"</comment></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND" id="bm_id3153927" localize="false"/>
-<paragraph role="heading" id="hd_id3150327" xml-lang="en-US" level="3" l10n="U" oldref="54">Show references in color</paragraph>
-<paragraph role="paragraph" id="par_id3153766" xml-lang="en-US" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3155444" xml-lang="en-US" level="2" l10n="U" oldref="16">Objects</paragraph>
-<paragraph role="paragraph" id="par_id3148405" xml-lang="en-US" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
+<paragraph xml-lang="en-US" id="hd_id3150327" role="heading" level="3" l10n="U"
+ oldref="54">Show references in color</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153766" role="paragraph" l10n="U" oldref="55"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_RFIND">Specifies that each reference is highlighted in color in the formula. The cell range is also enclosed by a colored border as soon as the cell containing the reference is selected for editing.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3155444" role="heading" level="2" l10n="U"
+ oldref="16">Objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148405" role="paragraph" l10n="CHG" oldref="17">Defines whether to display or hide objects for up to three object groups.</paragraph><comment>removed "placeholder" text, see i81634</comment>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF" id="bm_id3154256" localize="false"/>
-<paragraph role="heading" id="hd_id3150043" xml-lang="en-US" level="3" l10n="U" oldref="18">Objects/Graphics</paragraph>
-<paragraph role="paragraph" id="par_id3163549" xml-lang="en-US" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3150043" role="heading" level="3" l10n="U"
+ oldref="18">Objects/Graphics</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163549" role="paragraph" l10n="CHG" oldref="19"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_OBJGRF">Defines if objects and graphics are shown or hidden.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM" id="bm_id3147344" localize="false"/>
-<paragraph role="heading" id="hd_id3151249" xml-lang="en-US" level="3" l10n="U" oldref="20">Charts</paragraph>
-<paragraph role="paragraph" id="par_id3149106" xml-lang="en-US" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151249" role="heading" level="3" l10n="U"
+ oldref="20">Charts</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="CHG" oldref="21"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DIAGRAM">Defines if charts in your document are shown or hidden.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW" id="bm_id3155334" localize="false"/>
-<paragraph role="heading" id="hd_id3154703" xml-lang="en-US" level="3" l10n="U" oldref="22">Drawing objects</paragraph>
-<paragraph role="paragraph" id="par_id3155959" xml-lang="en-US" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id0909200810585828" xml-lang="en-US" level="2" l10n="NEW">Zoom</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154703" role="heading" level="3" l10n="U"
+ oldref="22">Drawing objects</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155959" role="paragraph" l10n="CHG" oldref="23"><ahelp hid="SC_LISTBOX_RID_SCPAGE_CONTENT_LB_DRAW">Defines if drawing objects in your document are shown or hidden.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id0909200810585828" role="heading" level="2" l10n="NEW">Zoom</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc_CheckBox_RID_SCPAGE_CONTENT_CB_SYNCZOOM" id="bm_id0909200810584462" localize="false"/>
-<paragraph role="heading" id="hd_id0909200810585881" xml-lang="en-US" level="3" l10n="NEW">Synchronize sheets</paragraph>
-<paragraph role="paragraph" id="par_id0909200810585870" xml-lang="en-US" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
-<paragraph role="heading" id="hd_id3153920" xml-lang="en-US" level="2" l10n="U" oldref="42">Window</paragraph>
-<paragraph role="paragraph" id="par_id3154661" xml-lang="en-US" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id0909200810585881" role="heading" level="3" l10n="NEW">Synchronize sheets</paragraph>
+ <paragraph xml-lang="en-US" id="par_id0909200810585870" role="paragraph" l10n="NEW"><ahelp hid=".">If checked, all sheets are shown with the same zoom factor. If not checked, each sheet can have its own zoom factor.</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3153920" role="heading" level="2" l10n="U"
+ oldref="42">Window</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154661" role="paragraph" l10n="U" oldref="43">Specifies whether some Help elements will or will not appear in the table.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER" id="bm_id3145791" localize="false"/>
-<paragraph role="heading" id="hd_id3149923" xml-lang="en-US" level="3" l10n="U" oldref="44">Column/Row headers</paragraph>
-<paragraph role="paragraph" id="par_id3149816" xml-lang="en-US" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3149923" role="heading" level="3" l10n="U"
+ oldref="44">Column/Row headers</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149816" role="paragraph" l10n="U" oldref="45"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_ROWCOLHEADER">Specifies whether to display row and column headers.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL" id="bm_id3154120" localize="false"/>
-<paragraph role="heading" id="hd_id3154205" xml-lang="en-US" level="3" l10n="U" oldref="46">Horizontal scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3155578" xml-lang="en-US" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3154205" role="heading" level="3" l10n="U"
+ oldref="46">Horizontal scrollbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155578" role="paragraph" l10n="U" oldref="47"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_HSCROLL">Specifies whether to display a horizontal scrollbar at the bottom of the document window.</ahelp> Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL" id="bm_id3158413" localize="false"/>
-<paragraph role="heading" id="hd_id3148422" xml-lang="en-US" level="3" l10n="U" oldref="48">Vertical scrollbar</paragraph>
-<paragraph role="paragraph" id="par_id3147128" xml-lang="en-US" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="hd_id3148422" role="heading" level="3" l10n="U"
+ oldref="48">Vertical scrollbar</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147128" role="paragraph" l10n="U" oldref="49"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_VSCROLL">Specifies whether to display a vertical scrollbar at the right of the document window.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG" id="bm_id3158214" localize="false"/>
-<paragraph role="heading" id="hd_id3150826" xml-lang="en-US" level="3" l10n="U" oldref="50">Sheet tabs</paragraph>
-<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
+<paragraph xml-lang="en-US" id="hd_id3150826" role="heading" level="3" l10n="U"
+ oldref="50">Sheet tabs</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154658" role="paragraph" l10n="U" oldref="51"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_TBLREG">Specifies whether to display the sheet tabs at the bottom of the spreadsheet document.</ahelp> If this box is not checked, you will only be able to switch between the sheets through the <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/02110000.xhp" name="Navigator">Navigator</link>
</caseinline><defaultinline>Navigator</defaultinline></switchinline>. Note that there is a slider between the horizontal scrollbar and the sheet tabs that may be set to one end.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE" id="bm_id3154199" localize="false"/>
-<paragraph role="heading" id="hd_id3152584" xml-lang="en-US" level="3" l10n="U" oldref="52">Outline symbols</paragraph>
-<paragraph role="paragraph" id="par_id3145135" xml-lang="en-US" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
+<paragraph xml-lang="en-US" id="hd_id3152584" role="heading" level="3" l10n="U"
+ oldref="52">Outline symbols</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145135" role="paragraph" l10n="U" oldref="53"><ahelp hid="SC_CHECKBOX_RID_SCPAGE_CONTENT_CB_OUTLINE">If you have defined an <switchinline select="appl"><caseinline select="CALC"><link href="text/scalc/01/12080000.xhp" name="outline">outline</link>
</caseinline><defaultinline>outline</defaultinline></switchinline>, the <emph>Outline symbols</emph> option specifies whether to view the outline symbols at the border of the sheet.</ahelp></paragraph>
-</body>
-</helpdocument>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/00/00000405.xhp b/helpcontent2/source/text/simpress/00/00000405.xhp
index 422cabbfb0..bca3645e78 100755
--- a/helpcontent2/source/text/simpress/00/00000405.xhp
+++ b/helpcontent2/source/text/simpress/00/00000405.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,13 +46,13 @@
<paragraph role="heading" id="hd_id3147001" xml-lang="en-US" level="1" l10n="U" oldref="1">Format Menu</paragraph>
<section id="bemaszung">
<paragraph role="paragraph" id="par_id3148489" xml-lang="en-US" l10n="CHG" oldref="2">In the context menu of a dimension line, choose <emph>Dimensions</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="CHG" oldref="15">On the <emph>Lines and Arrows </emph>toolbar, click the <emph>Dimension Line</emph> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3150207" xml-lang="en-US" l10n="CHG" oldref="15">On the <emph>Lines and Arrows</emph> toolbar, click the <emph>Dimension Line</emph> icon.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3155530" xml-lang="en-US" l10n="U" oldref="9"><variable id="frtite">Choose <emph>Format - Page</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="13"><variable id="frtites">Choose <emph>Format - Page </emph>and then click the <emph>Page </emph>tab
+<paragraph role="paragraph" id="par_id3145386" xml-lang="en-US" l10n="U" oldref="13"><variable id="frtites">Choose <emph>Format - Page</emph> and then click the <emph>Page</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148866" xml-lang="en-US" l10n="U" oldref="14"><variable id="frtiteh">Choose <emph>Format - Page</emph> and then click the <emph>Background</emph> tab
+<paragraph role="paragraph" id="par_id3148866" xml-lang="en-US" l10n="U" oldref="14"><variable id="frtiteh">Choose <emph>Format - Page</emph> and then click the <emph>Background</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155266" xml-lang="en-US" l10n="CHG" oldref="10"><variable id="adnsei">Choose <emph>Format - Slide Layout</emph>
</variable></paragraph>
diff --git a/helpcontent2/source/text/simpress/02/10100000.xhp b/helpcontent2/source/text/simpress/02/10100000.xhp
index c74e939d70..950e96d0e5 100644
--- a/helpcontent2/source/text/simpress/02/10100000.xhp
+++ b/helpcontent2/source/text/simpress/02/10100000.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="textsimpress0210100000xml" indexer="include">
<title id="tit" xml-lang="en-US">Connectors</title>
@@ -59,6 +59,7 @@
</table>
<paragraph role="paragraph" id="par_id3148488" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:ConnectorToolbox">Open the <emph>Connectors</emph> toolbar, where you can add connectors to objects in the current slide. A connector is a line that joins objects, and remains attached when the objects are moved. If you copy an object with a connector, the connector is also copied.</ahelp></paragraph>
+</section>
<paragraph role="paragraph" id="par_id3154658" xml-lang="en-US" l10n="U" oldref="122">There are four types of connector lines:</paragraph>
<list type="ordered">
<listitem>
@@ -74,7 +75,7 @@
<paragraph role="listitem" id="par_id3149943" xml-lang="en-US" l10n="U" oldref="126">Curved</paragraph>
</listitem>
</list>
-</section>
+
<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="U" oldref="4">When you click a connector and move your mouse pointer over a filled object, or the edge of an unfilled object, gluepoints appear. A gluepoint is a fixed point where you can attach a connector line. You can add custom <link href="text/simpress/02/10030200.xhp" name="glue point">gluepoints</link> to an object.</paragraph>
<paragraph role="paragraph" id="par_id3154762" xml-lang="en-US" l10n="U" oldref="5">To draw a connector line, click a gluepoint on an object, drag to a gluepoint on another object, and then release. You can also drag to an empty part of you document and click. The unattached end of the connector is locked in place, until you drag the end to a different location. To detach a connector, drag either end of the connector line to a different location.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SID_TOOL_CONNECTOR" id="bm_id9771135" localize="false"/>
diff --git a/helpcontent2/source/text/simpress/02/10120000.xhp b/helpcontent2/source/text/simpress/02/10120000.xhp
index a0eaf1ee41..3838714591 100644
--- a/helpcontent2/source/text/simpress/02/10120000.xhp
+++ b/helpcontent2/source/text/simpress/02/10120000.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
@@ -34,8 +34,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textsimpress0210120000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Arrows</title>
@@ -177,7 +176,7 @@
<bookmark xml-lang="en-US" branch="hid/SID_DRAW_MEASURELINE" id="bm_id8363048" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MeasureLine" id="bm_id3153777" localize="false"/><paragraph role="heading" id="hd_id3154477" xml-lang="en-US" level="2" l10n="U" oldref="35">Dimension Line</paragraph>
<paragraph role="paragraph" id="par_id3146124" xml-lang="en-US" l10n="CHG" oldref="36"><ahelp hid=".uno:MeasureLine">Draws a line that displays the dimension length bounded by guides.</ahelp> Dimension lines automatically calculate and display linear dimensions. To draw a dimension line, open the <emph>Arrows</emph> toolbar, and click the <emph>Dimension Line</emph> icon. Move your pointer to where you want the line to start and drag to draw the dimension line. Release when finished.</paragraph>
-<paragraph role="tip" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="37">If you want the dimension line to be the same length as the side of a nearby object, hold down the <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3148407" xml-lang="en-US" l10n="U" oldref="37">If you want the dimension line to be the same length as the side of a nearby object, hold down the <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key while dragging. To constrain the dimension line to 45 degrees, hold down the Shift key while dragging.</paragraph>
<paragraph role="paragraph" id="par_id3148986" xml-lang="en-US" l10n="CHG" oldref="53">In %PRODUCTNAME Draw, a dimension line is always inserted on the <link href="text/simpress/guide/layer_tipps.xhp" name="layer">layer</link> called <emph>Dimension Lines</emph>. If you set that layer to invisible, you will not see any dimension line in your drawing.</paragraph>
<section id="symasslinie">
diff --git a/helpcontent2/source/text/simpress/guide/background.xhp b/helpcontent2/source/text/simpress/guide/background.xhp
index e57f989b5b..07b74f4551 100644
--- a/helpcontent2/source/text/simpress/guide/background.xhp
+++ b/helpcontent2/source/text/simpress/guide/background.xhp
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -11,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: background.xhp,v $
- * $Revision: 1.9 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -33,81 +32,84 @@
*
************************************************************************
-->
-
-
- <helpdocument version="1.0">
+
+
<meta>
-<topic id="textsimpressguidebackgroundxml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Changing the Slide Background Fill</title>
-<filename>/text/simpress/guide/background.xhp</filename>
-</topic>
-</meta>
-<body>
+ <topic id="textsimpressguidebackgroundxml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Changing the Slide Background Fill</title>
+ <filename>/text/simpress/guide/background.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150199"><bookmark_value>backgrounds; changing</bookmark_value>
-<bookmark_value>slide masters; changing backgrounds</bookmark_value>
-<bookmark_value>slides;changing backgrounds</bookmark_value>
+ <bookmark_value>slide masters; changing backgrounds</bookmark_value>
+ <bookmark_value>slides;changing backgrounds</bookmark_value>
</bookmark>
-<paragraph role="heading" id="hd_id3150199" xml-lang="en-US" level="1" l10n="U" oldref="33"><variable id="background"><link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link>
+<paragraph xml-lang="en-US" id="hd_id3150199" role="heading" level="1" l10n="U"
+ oldref="33"><variable id="background"><link href="text/simpress/guide/background.xhp" name="Changing the Slide Background Fill">Changing the Slide Background Fill</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3155067" xml-lang="en-US" l10n="U" oldref="34">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
-<paragraph role="paragraph" id="par_id3148701" xml-lang="en-US" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph><comment>insert help id when available</comment><paragraph role="paragraph" id="par_id624713" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Click Set Background Picture for Slide in the context menu of a slide in Normal view to select a bitmap file. This file is used as a background picture.</ahelp><comment>see http://specs.openoffice.org/impress/sd.insertbackground.odt</comment></paragraph><comment>removed a para, #63970</comment><paragraph role="heading" id="hd_id3150534" xml-lang="en-US" level="3" l10n="U" oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3149942" xml-lang="en-US" l10n="U" oldref="50">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3148725" xml-lang="en-US" l10n="U" oldref="51">In the <emph>Fill </emph>area, do one of the following:</paragraph>
-<paragraph role="listitem" id="par_id3153040" xml-lang="en-US" l10n="U" oldref="52">Select <emph>Color</emph>, and then click a color in the list.</paragraph>
-<paragraph role="listitem" id="par_id3150866" xml-lang="en-US" l10n="U" oldref="53">Select <emph>Gradient</emph>, and then click a gradient style in the list.</paragraph>
-<paragraph role="listitem" id="par_id3150338" xml-lang="en-US" l10n="U" oldref="54">Select <emph>Hatching</emph>, and then click a hatching style in the list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3150021" xml-lang="en-US" l10n="U" oldref="55">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="heading" id="hd_id3145244" xml-lang="en-US" level="3" l10n="U" oldref="56">To use an image for the slide background</paragraph>
-<paragraph role="paragraph" id="par_id3148394" xml-lang="en-US" l10n="U" oldref="57">You can display an entire image as a slide background, or you can tile the image to produce a patterned background.</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="listitem" id="par_id3156064" xml-lang="en-US" l10n="U" oldref="58">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="listitem" id="par_id3145356" xml-lang="en-US" l10n="U" oldref="59">In the <emph>Fill </emph>area, select <emph>Bitmap</emph>, and then click an image in the list.</paragraph>
-<paragraph role="note" id="par_id3150757" xml-lang="en-US" l10n="U" oldref="60">If you want to use a custom image for the slide background, close the <emph>Page Setup </emph>dialog, and then choose <emph>Format - Area</emph>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <emph>Open</emph>. When you return to the <emph>Background </emph>tab, the image you imported will be in the <emph>Bitmap </emph>list.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3153151" xml-lang="en-US" l10n="U" oldref="61">Do one of the following:</paragraph>
-<paragraph role="paragraph" id="par_id3150263" xml-lang="en-US" l10n="U" oldref="62">To display the entire image as the background, clear the <emph>Tile </emph>check box in the <emph>Position </emph>area, and then select <emph>AutoFit</emph>.</paragraph>
-<paragraph role="paragraph" id="par_id3149756" xml-lang="en-US" l10n="U" oldref="63">To tile the image on the background, select <emph>Tile</emph>, and set the <emph>Size</emph>, <emph>Position</emph>, and <emph>Offset</emph> options for the image.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_id3154934" xml-lang="en-US" l10n="U" oldref="64">Click <emph>OK</emph>.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_id3158403" xml-lang="en-US" l10n="U" oldref="47">This modification is only valid for the current presentation document.</paragraph>
-<paragraph role="heading" id="par_idN10820" xml-lang="en-US" level="3" l10n="NEW">To save a new slide master as a template</paragraph>
-<list type="ordered">
-<listitem>
-<paragraph role="paragraph" id="par_idN10827" xml-lang="en-US" l10n="NEW">Choose <emph>View - Master - Slide Master</emph> to change to the slide master.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1082F" xml-lang="en-US" l10n="CHG">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this slide master.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10837" xml-lang="en-US" l10n="NEW">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN1083F" xml-lang="en-US" l10n="NEW">Choose <emph>File - Templates - Save</emph> to save the document as a template.</paragraph>
-</listitem>
-<listitem>
-<paragraph role="paragraph" id="par_idN10847" xml-lang="en-US" l10n="NEW">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph>
-</listitem>
-</list>
-<paragraph role="paragraph" id="par_idN1084A" xml-lang="en-US" l10n="NEW">Now you can use the Presentation Wizard to open a new presentation based on your new template.</paragraph>
-<section id="relatedtopics">
-<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
-<embed href="text/simpress/guide/layers.xhp#layers"/>
-<embed href="text/simpress/guide/footer.xhp#footer"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3155067" role="paragraph" l10n="U" oldref="34">You can change the background color or the background fill of the current slide or all of the slides in your document. For a background fill, you can use hatching, a gradient, or a bitmap image.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148701" role="paragraph" l10n="CHG" oldref="36">If you want to change the background fill for all of the slides, choose <emph>View - Master - Slide Master</emph>. To change the background fill of a single slide, choose <emph>View - Normal</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3150534" role="heading" level="3" l10n="U"
+ oldref="49">To use a color, gradient, or hatching pattern for the slide background</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3149942" role="listitem" l10n="U" oldref="50">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3148725" role="listitem" l10n="U" oldref="51">In the <emph>Fill </emph>area, do one of the following:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153040" role="listitem" l10n="U" oldref="52">Select <emph>Color</emph>, and then click a color in the list.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150866" role="listitem" l10n="U" oldref="53">Select <emph>Gradient</emph>, and then click a gradient style in the list.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150338" role="listitem" l10n="U" oldref="54">Select <emph>Hatching</emph>, and then click a hatching style in the list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3150021" role="listitem" l10n="U" oldref="55">Click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="hd_id3145244" role="heading" level="3" l10n="U"
+ oldref="56">To use an image for the slide background</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148394" role="paragraph" l10n="U" oldref="57">You can display an entire image as a slide background, or you can tile the image to produce a patterned background.</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3156064" role="listitem" l10n="U" oldref="58">Choose <emph>Format - Page</emph>, and then click on the <emph>Background</emph> tab.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3145356" role="listitem" l10n="U" oldref="59">In the <emph>Fill </emph>area, select <emph>Bitmap</emph>, and then click an image in the list.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150757" role="note" l10n="U" oldref="60">If you want to use a custom image for the slide background, close the <emph>Page Setup </emph>dialog, and then choose <emph>Format - Area</emph>. Click the <emph>Bitmaps </emph>tab, and then click <emph>Import</emph>. Locate the image you want to import and click <emph>Open</emph>. When you return to the <emph>Background </emph>tab, the image you imported will be in the <emph>Bitmap </emph>list.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153151" role="paragraph" l10n="U" oldref="61">Do one of the following:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150263" role="paragraph" l10n="U" oldref="62">To display the entire image as the background, clear the <emph>Tile </emph>check box in the <emph>Position </emph>area, and then select <emph>AutoFit</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149756" role="paragraph" l10n="U" oldref="63">To tile the image on the background, select <emph>Tile</emph>, and set the <emph>Size</emph>, <emph>Position</emph>, and <emph>Offset</emph> options for the image.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3154934" role="paragraph" l10n="U" oldref="64">Click <emph>OK</emph>.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_id3158403" role="paragraph" l10n="U" oldref="47">This modification is only valid for the current presentation document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10820" role="heading" level="3" l10n="NEW">To save a new slide master as a template</paragraph>
+ <list type="ordered">
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10827" role="paragraph" l10n="NEW">Choose <emph>View - Master - Slide Master</emph> to change to the slide master.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1082F" role="paragraph" l10n="CHG">Choose <emph>Format - Page</emph> to change the slide background, or choose other formatting commands. Objects that you add here will be visible on all slides that are based on this slide master.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10837" role="paragraph" l10n="NEW">Choose <emph>View - Normal</emph> to close the master view.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN1083F" role="paragraph" l10n="NEW">Choose <emph>File - Templates - Save</emph> to save the document as a template.</paragraph>
+ </listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_idN10847" role="paragraph" l10n="NEW">Enter a name for the template. Do not change the category from "My Templates". Click OK.</paragraph>
+ </listitem>
+ </list>
+ <paragraph xml-lang="en-US" id="par_idN1084A" role="paragraph" l10n="NEW">Now you can use the Presentation Wizard to open a new presentation based on your new template.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
+ <embed href="text/simpress/guide/layers.xhp#layers"/>
+ <embed href="text/simpress/guide/footer.xhp#footer"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/simpress/main0210.xhp b/helpcontent2/source/text/simpress/main0210.xhp
index ca35e20a8b..d5e0bdde16 100755
--- a/helpcontent2/source/text/simpress/main0210.xhp
+++ b/helpcontent2/source/text/simpress/main0210.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,7 +30,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpressmain0210xml" indexer="include" status="PUBLISH">
@@ -71,6 +71,8 @@
<embed href="text/simpress/02/10080000.xhp#kurve"/>
<embed href="text/simpress/00/00000004.xhp#sykurve"/>
<embed href="text/simpress/02/10100000.xhp#verbinder"/>
+<paragraph role="heading" id="par_idN107C8" xml-lang="en-US" level="2" l10n="NEW"><link href="text/simpress/02/10120000.xhp" name="Lines and Arrows">Lines and Arrows</link></paragraph>
+<paragraph role="paragraph" id="par_idN126D7" xml-lang="en-US" l10n="NEW">Opens the Arrows toolbar to insert lines and arrows.</paragraph>
<embed href="text/simpress/02/10090000.xhp#objekte"/>
<embed href="text/simpress/02/10090000.xhp#syobjekte"/>
<embed href="text/shared/02/basicshapes.xhp#basicshapes"/>
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index cd67c4b698..223d5be4f9 100644
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriter0104090200xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Defining Conditions</title>
@@ -336,7 +336,7 @@
<paragraph xml-lang="en-US" id="par_id3153016" role="paragraph" l10n="U" oldref="149">Database.Table.Company NEQ "Sun Microsystems"</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153040" role="paragraph" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is "Sun Microsystems".</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153040" role="paragraph" l10n="U" oldref="6">Returns TRUE if the current entry in the COMPANY field is not "Sun Microsystems".</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/01/05030800.xhp b/helpcontent2/source/text/swriter/01/05030800.xhp
index 88cc1c36c3..a86f45e876 100755
--- a/helpcontent2/source/text/swriter/01/05030800.xhp
+++ b/helpcontent2/source/text/swriter/01/05030800.xhp
@@ -59,38 +59,38 @@
</listitem>
</list>
<bookmark xml-lang="en-US" branch="hid/878857741" id="bm_id1209200804144764" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="1" l10n="NEW">Outline level</paragraph>
+<paragraph xml-lang="en-US" id="hd_id1209200804371034" role="heading" level="2" l10n="NEW">Outline level</paragraph>
<paragraph xml-lang="en-US" id="par_id1209200804371097" role="paragraph" l10n="NEW"><ahelp hid=".">Assigns an outline level from 1 to 10 to the selected paragraphs or Paragraph Style.</ahelp> Select <emph>Body text</emph> to reset the outline level.</paragraph><comment>removed two old paras</comment>
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE" id="bm_id3154200" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="1" l10n="CHG"
+<paragraph xml-lang="en-US" id="hd_id3154188" role="heading" level="2" l10n="CHG"
oldref="3">Numbering Style</paragraph>
<paragraph xml-lang="en-US" id="par_id3155178" role="paragraph" l10n="U" oldref="4"><ahelp hid="SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE">Select the <link href="text/swriter/01/05130004.xhp" name="Numbering Style">Numbering Style</link> that you want to apply to the paragraph.</ahelp> These styles are also listed in the <link href="text/swriter/01/05140000.xhp" name="Styles and Formatting">Styles and Formatting</link> window if you click the <emph>Numbering Style</emph> icon.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="1" l10n="U" oldref="5">Numbering</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3143283" role="heading" level="2" l10n="U" oldref="5">Numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3149106" role="paragraph" l10n="U" oldref="7">This section only appears when you edit the properties of the current paragraph by choosing <emph>Format - Paragraph</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START" id="bm_id3151262" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="1" l10n="U" oldref="8">Restart at this paragraph</paragraph>
+<paragraph xml-lang="en-US" id="hd_id3151250" role="heading" level="2" l10n="U" oldref="8">Restart at this paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id3154831" role="paragraph" l10n="U" oldref="9"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START">Restarts the numbering at the current paragraph.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START" id="bm_id3148973" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="1" l10n="U"
+<paragraph xml-lang="en-US" id="hd_id3147096" role="heading" level="2" l10n="U"
oldref="24">Start with</paragraph>
<paragraph xml-lang="en-US" id="par_id3148979" role="paragraph" l10n="U" oldref="25"><ahelp hid="SW_TRISTATEBOX_TP_NUMPARA_CB_NUMBER_NEW_START">Select this check box, and then enter the number that you want to assign to the paragraph.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START" id="bm_id3149043" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="1" l10n="U"
+<paragraph xml-lang="en-US" id="hd_id3147226" role="heading" level="2" l10n="U"
oldref="10">"Start with" spin button</paragraph>
<paragraph xml-lang="en-US" id="par_id3153632" role="paragraph" l10n="U" oldref="11"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START">Enter the number that you want to assign to the paragraph.</ahelp> The following paragraphs are numbered consecutively from the number that you enter here.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3147581" role="heading" level="2" l10n="U"
oldref="15">Line numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3152771" role="paragraph" l10n="U" oldref="16">Specify the <link href="text/swriter/01/06180000.xhp" name="Line numbering">Line numbering</link> options. To add line numbers to your document, choose <emph>Tools - Line Numbering</emph>.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA" id="bm_id3153357" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="1" l10n="U"
+<paragraph xml-lang="en-US" id="hd_id3153345" role="heading" level="2" l10n="U"
oldref="17">Include this paragraph in line numbering</paragraph>
<paragraph xml-lang="en-US" id="par_id3156267" role="paragraph" l10n="U" oldref="18"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA">Includes the current paragraph in the line numbering.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT" id="bm_id3151038" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="1" l10n="U"
+<paragraph xml-lang="en-US" id="hd_id3151026" role="heading" level="2" l10n="U"
oldref="19">Restart at this paragraph</paragraph>
<paragraph xml-lang="en-US" id="par_id3149168" role="paragraph" l10n="U" oldref="20"><ahelp hid="SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT">Restarts the line numbering at the current paragraph, or at the number that you enter.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA" id="bm_id3155906" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="1" l10n="U"
+<paragraph xml-lang="en-US" id="hd_id3145775" role="heading" level="2" l10n="U"
oldref="21">Start with</paragraph>
<paragraph xml-lang="en-US" id="par_id3149355" role="paragraph" l10n="U" oldref="22"><ahelp hid="SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA">Enter the number at which to restart the line numbering</ahelp></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06040000.xhp b/helpcontent2/source/text/swriter/01/06040000.xhp
index 617bfaf093..0fab8faa39 100755
--- a/helpcontent2/source/text/swriter/01/06040000.xhp
+++ b/helpcontent2/source/text/swriter/01/06040000.xhp
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
+<helpdocument version="1.0">
+
+<!--
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -9,8 +10,8 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: 06040000.xhp,v $
- * $Revision: 1.7 $
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -29,32 +30,30 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************-->
+ ************************************************************************
+ -->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Word Count</title>
-<filename>/text/swriter/01/06040000.xhp</filename>
-</topic>
-<history>
-<created date="2004-05-24T16:24:52">UFI: new Writer menu entry Word Count</created>
-<lastedited date="2004-12-16T13:06:22">yj: checked</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textswriter0106040000xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Word Count</title>
+ <filename>/text/swriter/01/06040000.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="hid/FN_WORDCOUNT_DIALOG" id="bm_id3698232" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_DLG_WORDCOUNT" id="bm_id6469313" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:WordCountDialog" id="bm_id1483504" localize="false"/>
<section id="wordcount">
-<paragraph role="heading" id="par_idN10542" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
-<paragraph role="paragraph" id="par_idN10552" xml-lang="en-US" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/swriter/00/00000406.xhp#wordcount"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_idN1062D" xml-lang="en-US" l10n="NEW"><link href="text/shared/01/01100400.xhp">Statistics</link></paragraph>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_idN10542" role="heading" level="1" l10n="NEW"><link href="text/swriter/01/06040000.xhp">Word Count</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10552" role="paragraph" l10n="NEW"><ahelp hid="FN_WORDCOUNT_DIALOG">Counts the words and characters in the current selection and in the whole document.</ahelp></paragraph>
+ <embed href="text/swriter/guide/words_count.xhp#how"/>
+ </section>
+ <section id="howtoget">
+ <embed href="text/swriter/00/00000406.xhp#wordcount"/>
+ </section>
+ <section id="relatedtopics">
+ <paragraph xml-lang="en-US" id="par_idN1062D" role="paragraph" l10n="CHG"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/swriter/guide/background.xhp b/helpcontent2/source/text/swriter/guide/background.xhp
index c3e1ae9da7..253ecd9d64 100644
--- a/helpcontent2/source/text/swriter/guide/background.xhp
+++ b/helpcontent2/source/text/swriter/guide/background.xhp
@@ -1,17 +1,17 @@
<?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
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -32,8 +32,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguidebackgroundxhp" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Defining Background Colors or Background Graphics</title>
@@ -42,13 +42,14 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149346"><bookmark_value>backgrounds;text objects</bookmark_value>
- <bookmark_value>words;backgrounds</bookmark_value>
- <bookmark_value>paragraphs; backgrounds</bookmark_value>
- <bookmark_value>text; backgrounds</bookmark_value>
- <bookmark_value>tables; backgrounds</bookmark_value>
- <bookmark_value>cells; backgrounds</bookmark_value>
+<bookmark_value>words;backgrounds</bookmark_value>
+<bookmark_value>paragraphs; backgrounds</bookmark_value>
+<bookmark_value>text;backgrounds</bookmark_value>
+<bookmark_value>tables; backgrounds</bookmark_value>
+<bookmark_value>cells; backgrounds</bookmark_value>
+<bookmark_value>backgrounds;selecting</bookmark_value>
</bookmark><comment>MW transferred 4 index entries from shared/guide/background.xhp and added 3 new entries</comment>
-<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/swriter/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
+<paragraph xml-lang="en-US" id="hd_id3149346" role="heading" level="1" l10n="U" oldref="1"><variable id="background"><link href="text/swriter/guide/background.xhp" name="Defining Background Colors or Background Graphics">Defining Background Colors or Background Graphics</link>
</variable></paragraph><comment>MW built this file from splitting shared/guide/background.xhp</comment>
<paragraph xml-lang="en-US" id="par_id7355265" role="paragraph" l10n="NEW">You can define a background color or use a graphic as a background for various objects in $[officename] Writer.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3147653" role="heading" level="2" l10n="U" oldref="3">To Apply a Background To Text Characters</paragraph>
@@ -75,6 +76,7 @@
<paragraph xml-lang="en-US" id="par_id3151245" role="listitem" l10n="U" oldref="10">On the <emph>Background</emph> tab page, select the background color or a background graphic.</paragraph>
</listitem>
</list>
+ <paragraph xml-lang="en-US" id="par_id0104201010554939" role="tip" l10n="NEW">To select an object in the background, hold down the <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> key and click the object. Alternatively, use the Navigator to select the object.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3149294" role="heading" level="2" l10n="U"
oldref="11">To Apply a Background To All or Part of a Table</paragraph>
<list type="ordered">
@@ -97,8 +99,7 @@
<paragraph xml-lang="en-US" id="par_id3150767" role="tip" l10n="U" oldref="32">To apply a background color to cells, select the cells and click the color on the <emph>Background Color</emph> toolbar.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3147084" role="tip" l10n="U" oldref="33">To apply a background color to a text paragraph within a cell, place the cursor into the text paragraph, then click the color on the <item type="menuitem">Background Color</item>
- <emph/>toolbar.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147084" role="tip" l10n="U" oldref="33">To apply a background color to a text paragraph within a cell, place the cursor into the text paragraph, then click the color on the <item type="menuitem">Background Color</item> toolbar.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
@@ -107,7 +108,7 @@
</case>
</switch>
<paragraph xml-lang="en-US" id="par_idN10A56" role="paragraph" l10n="NEW"><link href="text/shared/02/02160000.xhp">Highlighting icon</link></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page"><emph>Background</emph> tab page</link></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156180" role="paragraph" l10n="U" oldref="30"><link href="text/shared/01/05030600.xhp" name="Background tab page">Background tab page</link></paragraph>
<paragraph xml-lang="en-US" id="par_id4922025" role="paragraph" l10n="NEW"><link href="text/shared/guide/background.xhp">Watermarks</link></paragraph>
<paragraph xml-lang="en-US" id="par_id478530" role="paragraph" l10n="NEW"><link href="text/swriter/guide/pagebackground.xhp">Page Backgrounds as Page Styles</link></paragraph>
</section>
diff --git a/helpcontent2/source/text/swriter/guide/indices_form.xhp b/helpcontent2/source/text/swriter/guide/indices_form.xhp
index 5bbe3ae58a..063c4a845c 100644
--- a/helpcontent2/source/text/swriter/guide/indices_form.xhp
+++ b/helpcontent2/source/text/swriter/guide/indices_form.xhp
@@ -53,7 +53,7 @@
oldref="38"><variable id="indices_form"><link href="text/swriter/guide/indices_form.xhp" name="Formatting an Index or a Table of Contents">Formatting an Index or a Table of Contents</link>
</variable></paragraph>
<paragraph xml-lang="en-US" id="par_id3154259" role="paragraph" l10n="U" oldref="39">You can apply different paragraph styles, assign hyperlinks to entries, change the layout of indexes, and change the background color of indexes in the <emph>Insert Index</emph> dialog.</paragraph>
- <paragraph xml-lang="en-US" id="hd_id3155888" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3155888" role="heading" level="2" l10n="U"
oldref="44">To Apply a Different Paragraph Style to an Index Level</paragraph>
<list type="ordered">
<listitem>
@@ -75,7 +75,7 @@
<paragraph xml-lang="en-US" id="par_id3150516" role="listitem" l10n="U" oldref="49">Click <emph>OK</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="hd_id3146878" role="heading" level="1" l10n="U"
+ <paragraph xml-lang="en-US" id="hd_id3146878" role="heading" level="2" l10n="U"
oldref="40">To Assign Hyperlinks to Entries in a Table of Contents</paragraph>
<paragraph xml-lang="en-US" id="par_id3146890" role="paragraph" l10n="U" oldref="50">You can assign a cross-reference as a hyperlink to entries in a table of contents.</paragraph>
<list type="ordered">
diff --git a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
index 9b41f96748..2b0b16f80e 100644
--- a/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
+++ b/helpcontent2/source/text/swriter/guide/removing_line_breaks.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -42,11 +42,11 @@
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3149687"><bookmark_value>hard returns in pasted text</bookmark_value>
- <bookmark_value>paragraph marks;finding &amp; replacing</bookmark_value>
<bookmark_value>line breaks;removing</bookmark_value>
<bookmark_value>deleting; line breaks</bookmark_value>
<bookmark_value>copies;removing line breaks</bookmark_value>
-</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment>
+ <bookmark_value>paragraph marks;removing</bookmark_value>
+</bookmark><comment>MW changed "removing;..." to "deleting;...".</comment><comment>MW changed "paragraph marks;..."</comment>
<paragraph xml-lang="en-US" id="hd_id3155916" role="heading" level="1" l10n="CHG"
oldref="1"><variable id="removing_line_breaks"><link href="text/swriter/guide/removing_line_breaks.xhp">Removing Line Breaks</link>
</variable></paragraph>
@@ -68,8 +68,7 @@
<paragraph xml-lang="en-US" id="par_id3145118" role="listitem" l10n="U" oldref="7">Select the text containing the line breaks that you want to remove.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3156253" role="listitem" l10n="CHG" oldref="8">In the <item type="menuitem">Apply Style</item>
- <emph/>box on the <item type="menuitem">Formatting</item> bar, choose “Default”.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156253" role="listitem" l10n="CHG" oldref="8">In the <item type="menuitem">Apply Style</item> box on the <item type="menuitem">Formatting</item> bar, choose “Default”.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153388" role="listitem" l10n="U" oldref="9">Choose <emph>Format - AutoCorrect - Apply</emph>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/text_capital.xhp b/helpcontent2/source/text/swriter/guide/text_capital.xhp
index fc15a72f82..d8430571f4 100755
--- a/helpcontent2/source/text/swriter/guide/text_capital.xhp
+++ b/helpcontent2/source/text/swriter/guide/text_capital.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -61,9 +61,10 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149841" role="listitem" l10n="U" oldref="10">Do one of the following:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1120200910485778" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Change Case - Uppercase</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1120200910485775" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Character</item>, click the Font Effects tab, then select the type of capitalization in the Effects box. "Capitals" capitalizes all letters. "Title" capitalizes the first letter of each word. "Small capitals" capitalizes all letters, but in a reduced font size.</paragraph>
</listitem>
</list>
- <list type="unordered"/>
<paragraph xml-lang="en-US" id="hd_id3149644" role="heading" level="2" l10n="U"
oldref="11">To Change Text to Lowercase</paragraph>
<list type="ordered">
@@ -72,9 +73,10 @@
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149606" role="listitem" l10n="U" oldref="13">Do one of the following:</paragraph>
+ <paragraph xml-lang="en-US" id="par_id112020091049000" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Change Case - Lowercase</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1120200910490034" role="listitem" l10n="NEW">Choose <item type="menuitem">Format - Character</item>, click the Font Effects tab, then select "Lowercase" in the Effects box.</paragraph>
</listitem>
</list>
- <list type="unordered"/>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/text_emphasize.xhp#text_emphasize"/>
</body>
diff --git a/helpcontent2/source/text/swriter/guide/words_count.xhp b/helpcontent2/source/text/swriter/guide/words_count.xhp
index 2ccd09e0a6..099e28cddc 100755
--- a/helpcontent2/source/text/swriter/guide/words_count.xhp
+++ b/helpcontent2/source/text/swriter/guide/words_count.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.10 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -60,6 +60,12 @@
<paragraph xml-lang="en-US" id="par_id3149821" role="listitem" l10n="CHG" oldref="5">Choose <emph>Tools - Word Count</emph>.</paragraph>
</listitem>
</list>
+ <section id="how">
+ <paragraph xml-lang="en-US" id="hd_id1116200901133957" role="heading" level="2" l10n="NEW">How does $PRODUCTNAME count words?</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1116200901133998" role="paragraph" l10n="NEW">In general, every string of characters between two spaces is a word. Tabs, line breaks, and paragraph breaks are word limits, too.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id1116200901133985" role="paragraph" l10n="NEW">Words with dashes or always visible hyphens, as in plug-in, add-on, user/config, are counted as one word each.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id111620090113399" role="paragraph" l10n="NEW">The words can be a mix of letters, numbers, and special characters. So the following text counts as four words: abc123 1.23 "$" http://www.example.com.</paragraph>
+ </section>
<paragraph xml-lang="en-US" id="par_idN106E2" role="tip" l10n="NEW">To get some more statistics about the document, choose <emph>File - Properties - Statistics</emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph xml-lang="en-US" id="par_id3147418" role="paragraph" l10n="U" oldref="4"><link href="text/shared/01/01100400.xhp" name="File - Properties - Statistics">File - Properties - Statistics</link></paragraph>
diff --git a/helpcontent2/source/text/swriter/main0208.xhp b/helpcontent2/source/text/swriter/main0208.xhp
index d564e00791..a0cc745948 100755
--- a/helpcontent2/source/text/swriter/main0208.xhp
+++ b/helpcontent2/source/text/swriter/main0208.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -48,7 +48,7 @@
<embed href="text/swriter/02/08010000.xhp#seitennummer"/>
<embed href="text/shared/02/20020000.xhp#aktuelleseitenvorlage"/>
<bookmark xml-lang="en-US" branch="hid/.uno:LanguageStatus" id="bm_id8360850" localize="false"/>
-<paragraph xml-lang="en-US" id="hd_id9648731" role="heading" level="1" l10n="NEW">Language<comment>i80434</comment></paragraph>
+<paragraph xml-lang="en-US" id="hd_id9648731" role="heading" level="2" l10n="NEW">Language<comment>i80434</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id8193914" role="paragraph" l10n="NEW"><ahelp hid=".">Displays the language for the selected text. <br/>Click to open a menu where you can choose another language for the selected text or for the current paragraph. <br/>Choose None to exclude the text from spellchecking and hyphenation. <br/>Choose More to open a dialog with more options.</ahelp></paragraph>
<embed href="text/shared/02/20040000.xhp#einfuegemodus"/>
<embed href="text/shared/02/20050000.xhp#selektionsmodus"/>
@@ -56,7 +56,7 @@
<paragraph xml-lang="en-US" id="hd_id0821200911015962" role="heading" level="2" l10n="NEW">Digital Signature</paragraph>
<paragraph xml-lang="en-US" id="par_id0821200911015941" role="paragraph" l10n="NEW">See also <link href="text/shared/guide/digital_signatures.xhp">Digital Signatures</link>.</paragraph>
<embed href="text/swriter/02/08080000.xhp#kombinierteanzeige"/>
- <paragraph xml-lang="en-US" id="hd_id8070314" role="heading" level="1" l10n="NEW">Zoom &amp; View Layout</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id8070314" role="heading" level="2" l10n="NEW">Zoom &amp; View Layout</paragraph>
<paragraph xml-lang="en-US" id="par_id7723929" role="paragraph" l10n="NEW">Three controls on the Writer Status Bar allow to change the zoom and view layout of your text documents. </paragraph>
<bookmark xml-lang="en-US" branch="hid/.uno:ViewLayout" id="bm_id5961180" localize="false"/>
<paragraph xml-lang="en-US" id="par_id3666188" role="paragraph" l10n="NEW"><ahelp hid=".">The View Layout icons show from left to right: Single column mode. View mode with pages side by side. Book mode with two pages as in an open book.</ahelp></paragraph>