summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lange [tl] <tl@openoffice.org>2010-06-18 13:09:52 +0200
committerThomas Lange [tl] <tl@openoffice.org>2010-06-18 13:09:52 +0200
commit41a71626c7d8046b63ec67d430b99aaba35fc80e (patch)
treef7870f4f06dd3fd53b7ac82519dafaa8b49bfe86
parentdd0b89d28397f8b16f7da9f4128cd98ae6e5195c (diff)
parentc15c65cbc8a35583026d7f5ef21973040825ad62 (diff)
cws tl79: merge with DEV300_m83
-rw-r--r--helpcontent2/helpers/hid.lst1
-rw-r--r--helpcontent2/source/text/scalc/01/02120100.xhp10
-rw-r--r--helpcontent2/source/text/scalc/01/02140500.xhp21
-rw-r--r--helpcontent2/source/text/scalc/01/04060109.xhp12
-rw-r--r--helpcontent2/source/text/scalc/01/05020600.xhp6
-rw-r--r--helpcontent2/source/text/scalc/01/05120000.xhp12
-rw-r--r--helpcontent2/source/text/scalc/01/06060100.xhp10
-rw-r--r--helpcontent2/source/text/scalc/01/06070000.xhp8
-rw-r--r--helpcontent2/source/text/scalc/01/06080000.xhp17
-rwxr-xr-xhelpcontent2/source/text/scalc/01/12120300.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp10
-rw-r--r--helpcontent2/source/text/scalc/guide/formulas.xhp11
-rw-r--r--helpcontent2/source/text/scalc/guide/line_fix.xhp6
-rwxr-xr-xhelpcontent2/source/text/scalc/guide/multioperation.xhp10
-rw-r--r--helpcontent2/source/text/shared/00/00000004.xhp11
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp2
-rw-r--r--helpcontent2/source/text/shared/01/02100000.xhp15
-rw-r--r--helpcontent2/source/text/shared/01/02230100.xhp9
-rw-r--r--helpcontent2/source/text/shared/01/05050000.xhp41
-rw-r--r--helpcontent2/source/text/shared/01/06020000.xhp45
-rwxr-xr-xhelpcontent2/source/text/shared/01/06140400.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000100.xhp9
-rwxr-xr-xhelpcontent2/source/text/shared/05/00000120.xhp87
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/01000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/02000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/03000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/04000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/05000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/06000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/07000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/08000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/09000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/10000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/12000000.xhp5
-rwxr-xr-xhelpcontent2/source/text/shared/autokorr/13000000.xhp7
-rwxr-xr-xhelpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp15
-rw-r--r--helpcontent2/source/text/shared/explorer/database/rep_main.xhp3
-rwxr-xr-xhelpcontent2/source/text/shared/guide/spadmin.xhp6
-rw-r--r--helpcontent2/source/text/simpress/01/03070000.xhp12
-rw-r--r--helpcontent2/source/text/simpress/01/03130000.xhp7
-rw-r--r--helpcontent2/source/text/simpress/01/04010000.xhp4
-rw-r--r--helpcontent2/source/text/simpress/01/05120000.xhp5
-rw-r--r--helpcontent2/source/text/simpress/01/05130000.xhp11
-rwxr-xr-xhelpcontent2/source/text/simpress/main0200.xhp8
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp37
-rwxr-xr-xhelpcontent2/source/text/swriter/guide/search_regexp.xhp8
-rw-r--r--helpcontent2/source/text/swriter/guide/using_hyphen.xhp18
-rw-r--r--helpcontent2/source/text/swriter/guide/using_thesaurus.xhp32
-rwxr-xr-xhelpcontent2/source/text/swriter/main0208.xhp6
-rw-r--r--helpcontent2/util/target.pmk4
50 files changed, 346 insertions, 278 deletions
diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 164fca1a1f..03883ce2e5 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -1570,6 +1570,7 @@ HID_DLG_WORDCOUNT 54987
HID_DOCINFODESC 33076
HID_DOCINFODOC 33077
HID_DOCINFORELOAD 33092
+HID_DOCINFOSECURITY 33079
HID_DOCINFOUSER 33078
HID_DOCINFO_EDT 33070
HID_DOCINFO_FRAME 33126
diff --git a/helpcontent2/source/text/scalc/01/02120100.xhp b/helpcontent2/source/text/scalc/01/02120100.xhp
index de354371ca..4aaf30bc72 100644
--- a/helpcontent2/source/text/scalc/01/02120100.xhp
+++ b/helpcontent2/source/text/scalc/01/02120100.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalc0102120100xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Header/Footer</title>
@@ -69,7 +69,7 @@
<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FRC" id="bm_id3145273" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FLC" id="bm_id3153951" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3148648" role="heading" level="2" l10n="U" oldref="5">Center Area</paragraph>
- <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_SC_HF_FLC">Enter the text to be displayed at the center of the header or footer</ahelp></paragraph>
+ <paragraph xml-lang="en-US" id="par_id3163710" role="paragraph" l10n="CHG" oldref="6"><ahelp hid=".">Enter the text to be displayed at the center of the header or footer.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HRR" id="bm_id3153159" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_HLR" id="bm_id3149413" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SC_HF_FRR" id="bm_id3148457" localize="false"/>
diff --git a/helpcontent2/source/text/scalc/01/02140500.xhp b/helpcontent2/source/text/scalc/01/02140500.xhp
index dac51ddbe1..33a41f5243 100644
--- a/helpcontent2/source/text/scalc/01/02140500.xhp
+++ b/helpcontent2/source/text/scalc/01/02140500.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -26,34 +26,31 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
- ************************************************************************--><helpdocument version="1.0">
+ ************************************************************************-->
+<helpdocument version="1.0">
<meta>
<topic id="textscalc0102140500xml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Fill Sheet</title>
<filename>/text/scalc/01/02140500.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2003-10-31T00:00:00">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
-
-
+
+
<bookmark xml-lang="en-US" branch="hid/FID_FILL_TAB" id="bm_id3912388" localize="false"/><!-- HID added by script -->
<bookmark branch="hid/.uno:FillTable" xml-lang="en-US" id="bm_id3148664"/><paragraph role="heading" level="1" id="hd_id3153897" l10n="U" xml-lang="en-US" oldref="1">Fill Sheet</paragraph>
- <paragraph l10n="U" role="paragraph" id="par_id3150791" xml-lang="en-US" oldref="2"><variable id="tabellenfuellentext"><ahelp hid=".uno:FillTable" visibility="visible">Specifies the options for transferring spreadsheets or ranges of a certain spreadsheet.</ahelp></variable></paragraph>
+ <paragraph l10n="CHG" role="paragraph" id="par_id3150791" xml-lang="en-US" oldref="2"><variable id="tabellenfuellentext"><ahelp hid=".uno:FillTable" visibility="visible">Specifies the options for transferring sheets or ranges of a certain sheet.</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000402.xhp#baustab"/>
</section>
<paragraph xml-lang="en-US" role="paragraph" id="par_id3150767" l10n="U" oldref="3">In contrast to copying an area to the clipboard, you can filter certain information and calculate values. This command is only visible if you have selected two sheets in the document. To select multiple sheets, click each sheet tab while pressing <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> or Shift.</paragraph>
- <paragraph role="heading" level="2" id="hd_id3155131" l10n="U" xml-lang="en-US" oldref="4">Filling a Spreadsheet</paragraph>
+ <paragraph role="heading" level="2" id="hd_id3155131" l10n="CHG" xml-lang="en-US" oldref="4">Filling a Sheet</paragraph>
<list type="unordered">
<listitem>
- <paragraph role="listitem" id="par_id3146119" l10n="U" xml-lang="en-US" oldref="5">Select the entire sheet by clicking the empty gray box in the upper left of the spreadsheet. You can also select an area of the sheet to be copied.</paragraph>
+ <paragraph role="listitem" id="par_id3146119" l10n="CHG" xml-lang="en-US" oldref="5">Select the entire sheet by clicking the empty gray box in the upper left of the sheet. You can also select an area of the sheet to be copied.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" role="listitem" id="par_id3153726" l10n="U" oldref="6">Press <switchinline select="sys"> <caseinline select="MAC">Command</caseinline> <defaultinline>Ctrl</defaultinline> </switchinline> and click the tab of the worksheet where you want to insert the contents.</paragraph>
+ <paragraph xml-lang="en-US" role="listitem" id="par_id3153726" l10n="U" oldref="6">Press <switchinline select="sys"> <caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> and click the tab of the sheet where you want to insert the contents.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" oldref="7" l10n="U" role="listitem" id="par_id3147436">Select the command <emph>Edit - Fill - Sheet</emph>. In the dialog which appears, the check box <emph>Numbers</emph> must be selected (or <emph>Paste All</emph>) if you want to combine operations with the values. You can also choose the desired operation here.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/04060109.xhp b/helpcontent2/source/text/scalc/01/04060109.xhp
index a09582435d..c7b3bc4227 100644
--- a/helpcontent2/source/text/scalc/01/04060109.xhp
+++ b/helpcontent2/source/text/scalc/01/04060109.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalc0104060109xml" indexer="include">
<title xml-lang="en-US" id="tit">Spreadsheet Functions</title>
@@ -43,7 +43,7 @@
<bookmark_value>functions; spreadsheets</bookmark_value>
</bookmark>
<paragraph xml-lang="en-US" id="hd_id3148522" role="heading" level="1" l10n="U" oldref="1">Spreadsheet Functions</paragraph>
- <paragraph xml-lang="en-US" id="par_id3144508" role="paragraph" l10n="U" oldref="2"><variable id="tabelletext">This section contains descriptions of the <emph>Spreadsheet</emph> functions together with an example.
+ <paragraph xml-lang="en-US" id="par_id3144508" role="paragraph" l10n="U" oldref="2"><variable id="tabelletext">This section contains descriptions of the <emph>Spreadsheet</emph> functions together with an example.
</variable></paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000404.xhp#efefft"/>
@@ -406,7 +406,7 @@
<emph>Height</emph> (optional) is the vertical height for an area that starts at the new reference position.</paragraph>
<paragraph xml-lang="en-US" id="par_id3147278" role="paragraph" l10n="CHG" oldref="119">
<emph>Width</emph> (optional) is the horizontal width for an area that starts at the new reference position.</paragraph>
- <paragraph xml-lang="en-US" id="par_id8662373" role="paragraph" l10n="NEW">Arguments <emph>Rows</emph> and <emph>Columns</emph> must not lead to zero or negative start row or column</paragraph>
+ <paragraph xml-lang="en-US" id="par_id8662373" role="paragraph" l10n="CHG">Arguments <emph>Rows</emph> and <emph>Columns</emph> must not lead to zero or negative start row or column.</paragraph>
<paragraph xml-lang="en-US" id="par_id9051484" role="paragraph" l10n="NEW">Arguments <emph>Height</emph> and <emph>Width</emph> must not lead to zero or negative count of rows or columns.</paragraph>
<paragraph xml-lang="en-US" id="par_idN1104B" role="paragraph" l10n="NEW">
<embedvar href="text/scalc/00/00000004.xhp#optional"/>
diff --git a/helpcontent2/source/text/scalc/01/05020600.xhp b/helpcontent2/source/text/scalc/01/05020600.xhp
index 9a98fa1201..313a0d4cc6 100644
--- a/helpcontent2/source/text/scalc/01/05020600.xhp
+++ b/helpcontent2/source/text/scalc/01/05020600.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalc0105020600xml" indexer="include" status="PUBLISH">
@@ -55,7 +55,7 @@
<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED" id="bm_id3149260" localize="false"/>
<paragraph role="heading" id="hd_id3153190" xml-lang="en-US" level="3" l10n="U" oldref="5">Protected</paragraph>
<paragraph role="paragraph" id="par_id3151119" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_PROTECTED">Prevents the selected cells from being modified.</ahelp></paragraph>
-<paragraph role="note" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="15">This cell protection only takes effect if you also protect the spreadsheet (<emph>Tools - Protect Document - Sheet</emph>).</paragraph>
+<paragraph role="note" id="par_id3156283" xml-lang="en-US" l10n="U" oldref="15">This cell protection only takes effect if you also protect the sheet (<emph>Tools - Protect Document - Sheet</emph>).</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR" id="bm_id3149958" localize="false"/>
<paragraph role="heading" id="hd_id3149377" xml-lang="en-US" level="3" l10n="U" oldref="7">Hide formula</paragraph>
<paragraph role="paragraph" id="par_id3154510" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SC:TRISTATEBOX:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR">Hides formulas in the selected cells.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/scalc/01/05120000.xhp b/helpcontent2/source/text/scalc/01/05120000.xhp
index 1f43e39bf2..2de8eb0f53 100644
--- a/helpcontent2/source/text/scalc/01/05120000.xhp
+++ b/helpcontent2/source/text/scalc/01/05120000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalc0105120000xml" indexer="include">
<title xml-lang="en-US" id="tit">Conditional Formatting</title>
@@ -86,8 +86,8 @@
<paragraph xml-lang="en-US" id="par_id3155114" role="paragraph" l10n="U" oldref="12"><ahelp hid="SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2" visibility="hidden">Enter a reference, value or formula.</ahelp> Enter a reference, value or formula in the parameter field, or in both parameter fields if you have selected a condition that requires two parameters. You can also enter formulas containing relative references.</paragraph>
<paragraph xml-lang="en-US" id="par_id3145257" role="paragraph" l10n="U" oldref="13">Once the parameters have been defined, the condition is complete. It may appear as:</paragraph>
<paragraph xml-lang="en-US" id="par_id3150784" role="paragraph" l10n="U" oldref="14">Cell value is equal 0: Cell style Null value (You must have already defined a cell style with this name before assigning it to a condition).</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150365" role="paragraph" l10n="U" oldref="15">Cell value is between $B$20 and $B$21: Cell style Result (The corresponding value limits must already exist in cells B20 and B21)</paragraph>
- <paragraph xml-lang="en-US" id="par_id3152992" role="paragraph" l10n="U" oldref="16">Formula is SUM($A$1:$A$5)=10: Cell style Result (The selected cells are formatted with the Result style if the sum of the contents in cells A1 to A5 is equal to 10.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150365" role="paragraph" l10n="CHG" oldref="15">Cell value is between $B$20 and $B$21: Cell style Result (The corresponding value limits must already exist in cells B20 and B21).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152992" role="paragraph" l10n="CHG" oldref="16">Formula is SUM($A$1:$A$5)=10: Cell style Result (The selected cells are formatted with the Result style if the sum of the contents in cells A1 to A5 is equal to 10).</paragraph>
<embed href="text/shared/00/00000001.xhp#eingabesymbol"/>
<section id="relatedtopics">
<paragraph xml-lang="en-US" id="par_idN107E1" role="paragraph" l10n="NEW">
diff --git a/helpcontent2/source/text/scalc/01/06060100.xhp b/helpcontent2/source/text/scalc/01/06060100.xhp
index 609ba99edd..ac2a61dd1b 100644
--- a/helpcontent2/source/text/scalc/01/06060100.xhp
+++ b/helpcontent2/source/text/scalc/01/06060100.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,17 +27,13 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalc0106060100xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Protecting Sheet</title>
<filename>/text/scalc/01/06060100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2005-01-05T13:57:21">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="hid/FN_TABLE_SET_READ_ONLY_CELLS" id="bm_id5349783" localize="false"/><!-- HID added by script -->
@@ -54,7 +50,7 @@
<paragraph role="tip" id="par_id3150329" xml-lang="en-US" l10n="U" oldref="17">Select <emph>Format - Cells - Cell Protection</emph>. Unmark the <emph>Protected</emph> box and click <emph>OK</emph>.</paragraph>
<paragraph role="tip" id="par_id3156384" xml-lang="en-US" l10n="U" oldref="18">On the <emph>Tools - Protect Document - Sheet</emph> menu, activate protection for the sheet. Effective immediately, only the cell range you selected in step 1 can be edited.</paragraph>
<paragraph role="tip" id="par_id3149566" xml-lang="en-US" l10n="U" oldref="9">To later change an unprotected area to a protected area, select the range. Next, on the <emph>Format - Cells - Cell Protection</emph> tab page, check the <emph>Protected</emph> box. Finally, choose the <emph>Tools - Protect Document - Sheet </emph>menu. The previously editable range is now protected.</paragraph>
-<paragraph role="tip" id="par_id3153964" xml-lang="en-US" l10n="U" oldref="10">Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The <emph>Delete</emph> and <emph>Move/Copy</emph> commands cannot be selected.</paragraph>
+<paragraph role="tip" id="par_id3153964" xml-lang="en-US" l10n="CHG" oldref="10">Sheet protection also affects the context menu of the sheet tabs at the bottom of the screen. The <emph>Delete</emph> and <emph>Rename</emph> commands cannot be selected.</paragraph>
<paragraph role="tip" id="par_id3150301" xml-lang="en-US" l10n="U" oldref="19">If a sheet is protected, you will not be able to modify or delete any Cell Styles.</paragraph>
<paragraph role="paragraph" id="par_id3154656" xml-lang="en-US" l10n="U" oldref="3">A protected sheet or cell range can no longer be modified until this protection is disabled. To disable the protection, choose the <emph>Tools - Protect Document - Sheet</emph> command. If no password was set, the sheet protection is immediately disabled. If the sheet was password protected, the <emph>Remove Protection</emph> dialog opens, where you must enter the password.</paragraph>
<paragraph role="paragraph" id="par_id3149815" xml-lang="en-US" l10n="U" oldref="11">Once saved, protected sheets can only be saved again by using the <emph>File - Save As</emph> command.</paragraph>
diff --git a/helpcontent2/source/text/scalc/01/06070000.xhp b/helpcontent2/source/text/scalc/01/06070000.xhp
index e36ec82470..73aa2a3693 100644
--- a/helpcontent2/source/text/scalc/01/06070000.xhp
+++ b/helpcontent2/source/text/scalc/01/06070000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalc0106070000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">AutoCalculate</title>
<filename>/text/scalc/01/06070000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T12:59:56">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="automatisch">
diff --git a/helpcontent2/source/text/scalc/01/06080000.xhp b/helpcontent2/source/text/scalc/01/06080000.xhp
index 7e2852f688..60a45b752c 100644
--- a/helpcontent2/source/text/scalc/01/06080000.xhp
+++ b/helpcontent2/source/text/scalc/01/06080000.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalc0106080000xml" indexer="include">
<title id="tit" xml-lang="en-US">Recalculate</title>
@@ -46,11 +46,16 @@
<bookmark xml-lang="en-US" branch="hid/FID_RECALC" id="bm_id2661876" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Calculate" id="bm_id3156329" localize="false"/>
<paragraph role="heading" id="hd_id3157909" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/06080000.xhp" name="Recalculate">Recalculate</link></paragraph>
-<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates the current sheet. Use <item type="menuitem">Tools - Cell Contents - Recalculate</item> or press F9 to recalculate all changed formulas in the current sheet. </ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154758" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Calculate">Recalculates all changed formulas. If AutoCalculate is enabled, the Recalculate command applies only to formulas like RAND or NOW.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/scalc/00/00000406.xhp#exnb"/>
</section>
-<paragraph role="paragraph" id="par_id3150793" xml-lang="en-US" l10n="U" oldref="5">After the document has been recalculated, the display is refreshed. Any charts contained in the sheet are also refreshed.</paragraph>
+<paragraph role="paragraph" id="par_id315475899" xml-lang="en-US" l10n="NEW">Press F9 to recalculate. Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9 to recalculate all formulas in the document.</paragraph>
+
+<paragraph role="paragraph" id="par_id3150793" xml-lang="en-US" l10n="U" oldref="5">After the document has been recalculated, the display is refreshed. All charts are also refreshed.</paragraph>
+
+<paragraph role="paragraph" id="par_id315475855" xml-lang="en-US" l10n="NEW">The Add-In functions like RANDBETWEEN currently cannot respond to the Recalculate command or F9. Press Shift+<switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F9 to recalculate all formulas, including the Add-In functions.</paragraph>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/scalc/01/12120300.xhp b/helpcontent2/source/text/scalc/01/12120300.xhp
index ff57fd6819..bb3e3d652c 100755
--- a/helpcontent2/source/text/scalc/01/12120300.xhp
+++ b/helpcontent2/source/text/scalc/01/12120300.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalc0112120300xml" indexer="include" status="PUBLISH">
@@ -51,7 +51,7 @@
</section>
<bookmark xml-lang="en-US" branch="hid/sc:TriStateBox:TP_VALIDATION_ERROR:TSB_SHOW" id="bm_id3154908" localize="false"/>
<paragraph role="heading" id="hd_id3156280" xml-lang="en-US" level="2" l10n="U" oldref="3">Show error message when invalid values are entered.</paragraph>
-<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid="SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW">Displays the error message that you enter in the <emph>Contents</emph> area when invalid data is entered in a cell.</ahelp> If unchecked, the message is displayed to prevent an invalid entry.</paragraph>
+<paragraph role="paragraph" id="par_id3150768" xml-lang="en-US" l10n="CHG" oldref="4"><ahelp hid=".">Displays the error message that you enter in the <emph>Contents</emph> area when invalid data is entered in a cell.</ahelp> If enabled, the message is displayed to prevent an invalid entry.</paragraph>
<paragraph role="paragraph" id="par_id3146984" xml-lang="en-US" l10n="U" oldref="5">In both cases, if you select "Stop", the invalid entry is deleted and the previous value is reentered in the cell. The same applies if you close the "Warning" and "Information" dialogs by clicking the <emph>Cancel </emph>button. If you close the dialogs with the <emph>OK</emph> button, the invalid entry is not deleted.</paragraph>
<paragraph role="heading" id="hd_id3152460" xml-lang="en-US" level="2" l10n="U" oldref="6">Contents</paragraph>
<bookmark xml-lang="en-US" branch="hid/sc:ListBox:TP_VALIDATION_ERROR:LB_ACTION" id="bm_id3154014" localize="false"/>
diff --git a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
index 810a9d2a55..c83c804d28 100755
--- a/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
+++ b/helpcontent2/source/text/scalc/guide/cellreference_dragdrop.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidecellreference_dragdropxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Referencing Cells by Drag-and-Drop</title>
@@ -46,7 +46,7 @@
<paragraph xml-lang="en-US" id="hd_id3154686" role="heading" level="1" l10n="U"
oldref="16"><variable id="cellreference_dragdrop"><link href="text/scalc/guide/cellreference_dragdrop.xhp" name="Referencing Cells by Drag-and-Drop">Referencing Cells by Drag-and-Drop</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="U" oldref="17">With the help of the Navigator you can reference cells from one spreadsheet to another sheet in the same document or in a different document. The cells can be inserted as a copy, link or hyperlink. The range to be inserted must be defined with a name in the original file so that it can be inserted in the target file.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156444" role="paragraph" l10n="CHG" oldref="17">With the help of the Navigator you can reference cells from one sheet to another sheet in the same document or in a different document. The cells can be inserted as a copy, link, or hyperlink. The range to be inserted must be defined with a name in the original file so that it can be inserted in the target file.</paragraph>
<list type="ordered">
<listitem>
<paragraph xml-lang="en-US" id="par_id3152576" role="listitem" l10n="U" oldref="25">Open the document that contains the source cells.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/formulas.xhp b/helpcontent2/source/text/scalc/guide/formulas.xhp
index 769f4c8595..47ee3ac0c3 100644
--- a/helpcontent2/source/text/scalc/guide/formulas.xhp
+++ b/helpcontent2/source/text/scalc/guide/formulas.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -106,14 +106,7 @@
<paragraph role="paragraph" id="par_id3159171" xml-lang="en-US" l10n="U" oldref="36">Calculates the sum of cells B10 to B14 and adds the value to B8.</paragraph>
</tablecell>
</tablerow>
-<tablerow>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3148604" xml-lang="en-US" l10n="CHG" oldref="50">=SUM(B1:B65536)</paragraph>
-</tablecell>
-<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3157982" xml-lang="en-US" l10n="U" oldref="51">Sums all numbers in column B.</paragraph>
-</tablecell>
-</tablerow>
+<comment>removed row with old row limit of 65536</comment>
</table>
<paragraph role="paragraph" id="par_id3150109" xml-lang="en-US" l10n="U" oldref="30">It is also possible to nest functions in formulas, as shown in the example. You can also nest functions within functions. The Function Wizard assists you with nested functions.</paragraph>
<section id="relatedtopics">
diff --git a/helpcontent2/source/text/scalc/guide/line_fix.xhp b/helpcontent2/source/text/scalc/guide/line_fix.xhp
index a8ec20cc59..d883cf22a9 100644
--- a/helpcontent2/source/text/scalc/guide/line_fix.xhp
+++ b/helpcontent2/source/text/scalc/guide/line_fix.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -27,7 +27,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textscalcguideline_fixxml" indexer="include" status="PUBLISH">
@@ -52,7 +52,7 @@
</bookmark>
<paragraph role="heading" id="hd_id3154684" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="line_fix"><link href="text/scalc/guide/line_fix.xhp" name="Freezing Rows or Columns as Headers">Freezing Rows or Columns as Headers</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="U" oldref="2">If you have long rows or columns of data that extend beyond the viewable area of the spreadsheet, you can freeze them, which allows you to see the columns or rows as you scroll through the rest of the data.</paragraph>
+<paragraph role="paragraph" id="par_id3148576" xml-lang="en-US" l10n="CHG" oldref="2">If you have long rows or columns of data that extend beyond the viewable area of the sheet, you can freeze some rows or columns, which allows you to see the frozen columns or rows as you scroll through the rest of the data.</paragraph>
<list type="ordered">
<listitem>
<paragraph role="listitem" id="par_id3156441" xml-lang="en-US" l10n="U" oldref="3">Select the row below, or the column to the right of the row or column that you want to be in the frozen region. All rows above, or all columns to the left of the selection are frozen.</paragraph>
diff --git a/helpcontent2/source/text/scalc/guide/multioperation.xhp b/helpcontent2/source/text/scalc/guide/multioperation.xhp
index 825f31e07e..3c821540ae 100755
--- a/helpcontent2/source/text/scalc/guide/multioperation.xhp
+++ b/helpcontent2/source/text/scalc/guide/multioperation.xhp
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -30,8 +30,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textscalcguidemultioperationxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Applying Multiple Operations</title>
@@ -48,7 +48,7 @@
<paragraph role="heading" id="hd_id3147559" xml-lang="en-US" level="1" l10n="U" oldref="5"><variable id="multioperation"><link href="text/scalc/guide/multioperation.xhp" name="Applying Multiple Operations">Applying Multiple Operations</link>
</variable></paragraph>
<paragraph role="heading" id="hd_id3145171" xml-lang="en-US" level="2" l10n="U" oldref="1">Multiple Operations in Columns or Rows</paragraph>
-<paragraph role="paragraph" id="par_id4123966" xml-lang="en-US" l10n="NEW">The <item type="menuitem">Data - Multiple Operations</item> command provides a planning tool for "what if" questions.In your spreadsheet, you enter a formula to calculate a result from values that are stored in other cells. Then, you set up a cell range where you enter some fixed values, and the Multiple Operations command will calculate the results depending on the formula.</paragraph>
+<paragraph role="paragraph" id="par_id4123966" xml-lang="en-US" l10n="NEW">The <item type="menuitem">Data - Multiple Operations</item> command provides a planning tool for "what if" questions. In your spreadsheet, you enter a formula to calculate a result from values that are stored in other cells. Then, you set up a cell range where you enter some fixed values, and the Multiple Operations command will calculate the results depending on the formula.</paragraph>
<paragraph role="paragraph" id="par_id3156424" xml-lang="en-US" l10n="CHG" oldref="2">In the <emph>Formula</emph> field, enter the cell reference to the formula that applies to the data range. In the <emph>Column input cell/Row input cell</emph> field, enter the cell reference to the corresponding cell that is part of the formula. This can be explained best by examples:</paragraph>
<paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="3" l10n="U" oldref="7">Examples</paragraph>
<paragraph role="paragraph" id="par_id3153189" xml-lang="en-US" l10n="U" oldref="8">You produce toys which you sell for $10 each. Each toy costs $2 to make, in addition to which you have fixed costs of $10,000 per year. How much profit will you make in a year if you sell a particular number of toys?</paragraph>
diff --git a/helpcontent2/source/text/shared/00/00000004.xhp b/helpcontent2/source/text/shared/00/00000004.xhp
index d330d17d62..80fbf4adeb 100644
--- a/helpcontent2/source/text/shared/00/00000004.xhp
+++ b/helpcontent2/source/text/shared/00/00000004.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0000000004xml" indexer="exclude" status="PUBLISH">
@@ -42,12 +42,17 @@
</history>
</meta>
<body>
-<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command...
+<paragraph role="heading" id="hd_id3160447" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="wie">To access this command...
</variable></paragraph>
<section id="related">
<paragraph role="related" id="par_id3147212" xml-lang="en-US" l10n="U" oldref="47"><variable id="related"><emph>Related Topics</emph>
</variable></paragraph>
</section>
+
+<section id="agentoff">
+<paragraph role="tip" id="par_id56935339" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
+</section>
+
<section id="sytextfarbe">
<table id="tbl_id3156421">
<tablerow>
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 3a3e7ec1d1..d16dda5565 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -136,7 +136,7 @@
</variable></paragraph>
<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 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
</variable></paragraph>
diff --git a/helpcontent2/source/text/shared/01/02100000.xhp b/helpcontent2/source/text/shared/01/02100000.xhp
index 7e202e95ad..6bdf31007c 100644
--- a/helpcontent2/source/text/shared/01/02100000.xhp
+++ b/helpcontent2/source/text/shared/01/02100000.xhp
@@ -51,8 +51,19 @@
<section id="howtoget">
<embed href="text/shared/00/00000402.xhp#suchen"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH" id="bm_id2687459" localize="false"/>
+
+<comment>Find Toolbar</comment>
+<bookmark xml-lang="en-US" branch="hid/.uno:FindText" id="bm_id001" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00001" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Type the text to search in the current document. Press Enter to search the text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:DownSearch" id="bm_id002" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00002" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in downward direction.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/.uno:UpSearch" id="bm_id003" localize="false"/>
+<paragraph xml-lang="en-US" id="par_id00003" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Click to search the next occurrence in upward direction.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH" id="bm_id3147572" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/svx_ComboBox_RID_SVXDLG_SEARCH_ED_SEARCH" id="bm_id2687459" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3152425" role="heading" level="2" l10n="U" oldref="3">Search For</paragraph>
<paragraph xml-lang="en-US" id="par_id3155805" role="paragraph" l10n="U" oldref="4"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_SEARCH:LB_SEARCH">Enter the text that you want to search for, or select a previous search from the list.</ahelp></paragraph>
<!-- removed HID SVX:MULTILINEEDIT:RID_SVXDLG_SEARCH:ED_SEARCH_FORMATS -->
diff --git a/helpcontent2/source/text/shared/01/02230100.xhp b/helpcontent2/source/text/shared/01/02230100.xhp
index 71a0611e0d..51e2f3ae23 100644
--- a/helpcontent2/source/text/shared/01/02230100.xhp
+++ b/helpcontent2/source/text/shared/01/02230100.xhp
@@ -4,7 +4,7 @@
<!--***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -113,11 +113,6 @@
</case>
</switch>
-<switch select="appl">
-<case select="WRITER">
-<paragraph role="note" id="par_id3154366" xml-lang="en-US" l10n="U" oldref="18">Changes made to formulas or numbers in tables are not recorded.</paragraph>
-
-</case>
-</switch>
+<comment>removed the note about no-tables-comparing in Writer</comment>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/05050000.xhp b/helpcontent2/source/text/shared/01/05050000.xhp
index 11ac32f5cf..e726cc306d 100644
--- a/helpcontent2/source/text/shared/01/05050000.xhp
+++ b/helpcontent2/source/text/shared/01/05050000.xhp
@@ -27,38 +27,49 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0105050000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Change Case</title>
<filename>/text/shared/01/05050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-17T14:40:09">converted from old format - fpe
-dedr: fixed #i30332#
-UFI: changed name, see spec Format Menu in Writer
-dedr: reviewed</lastedited>
-</history>
</meta>
<body>
<section id="grossklein">
<bookmark xml-lang="en-US" branch="hid/.uno:TransliterateMenu" id="bm_id668355" localize="false"/>
<paragraph role="heading" id="hd_id3152952" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/shared/01/05050000.xhp" name="Case/Characters">Change Case</link></paragraph>
-<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of the selected characters, or if the cursor is in a word, changes the case of all of the characters in the word.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151299" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".">Changes the case of characters in the selection. If the cursor is within a word and no text is selected, then the word is the selection.</ahelp></paragraph>
</section>
<section id="howtoget">
<embed href="text/shared/00/00040500.xhp#grossklein"/>
</section>
-<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
-<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">Uppercase</paragraph>
-<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to capital letters</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_SENTENCE" id="bm_id7402005" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToSentenceCase" id="bm_id3149347" localize="false"/>
+<paragraph role="heading" id="hd_id3147572" xml-lang="en-US" level="2" l10n="U" oldref="5">Sentence case</paragraph>
+<paragraph role="paragraph" id="par_id3150694" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first letter of the selected western characters to an uppercase character.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_LOWER" id="bm_id7402004" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToLower" id="bm_id3149346" localize="false"/>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Lowercase</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase letters.</ahelp></paragraph>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">lowercase</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".uno:ChangeCaseToLower">Changes the selected western characters to lowercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_UPPER" id="bm_id5342659" localize="false"/><!-- HID added by script -->
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToUpper" id="bm_id3149205" localize="false"/>
+<paragraph role="heading" id="hd_id3147143" xml-lang="en-US" level="2" l10n="U" oldref="3">UPPERCASE</paragraph>
+<paragraph role="paragraph" id="par_id3152372" xml-lang="en-US" l10n="U" oldref="4"><ahelp hid=".uno:ChangeCaseToUpper">Changes the selected western characters to uppercase characters.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_CAPITALIZE" id="bm_id7402014" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToTitleCase" id="bm_id3149316" localize="false"/>
+<paragraph role="heading" id="hd_id3147511" xml-lang="en-US" level="2" l10n="U" oldref="5">Capitalize Every Word</paragraph>
+<paragraph role="paragraph" id="par_id3150613" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Changes the first character of every word of the selected western characters to an uppercase character.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_TOGGLE" id="bm_id7402024" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToToggleCase" id="bm_id3149326" localize="false"/>
+<paragraph role="heading" id="hd_id3147521" xml-lang="en-US" level="2" l10n="U" oldref="5">tOGGLE cASE</paragraph>
+<paragraph role="paragraph" id="par_id3150623" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid=".">Toggles case of all selected western characters.</ahelp></paragraph>
+
<embed href="text/shared/00/00000007.xhp#asia"/>
<bookmark xml-lang="en-US" branch="hid/SID_TRANSLITERATE_HALFWIDTH" id="bm_id203258" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:ChangeCaseToHalfWidth" id="bm_id3154288" localize="false"/>
diff --git a/helpcontent2/source/text/shared/01/06020000.xhp b/helpcontent2/source/text/shared/01/06020000.xhp
index 49b7842425..ba393a72b6 100644
--- a/helpcontent2/source/text/shared/01/06020000.xhp
+++ b/helpcontent2/source/text/shared/01/06020000.xhp
@@ -31,8 +31,7 @@
************************************************************************
-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textshared0106020000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Thesaurus</title>
@@ -45,32 +44,36 @@
<bookmark xml-lang="en-US" branch="hid/.uno:ThesaurusDialog" id="bm_id3085157" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/SID_THESAURUS" id="bm_id1644684" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Thesaurus" id="bm_id3152427" localize="false"/><paragraph role="heading" id="hd_id3146946" xml-lang="en-US" level="1" l10n="U" oldref="1">Thesaurus</paragraph>
-<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Replaces the current word with a synonym, or a related term.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3147366" xml-lang="en-US" l10n="U" oldref="2"><variable id="thesaurustxt"><ahelp hid=".uno:Thesaurus">Opens a dialog box to replace the current word with a synonym, or a related term.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
- <embed href="text/shared/00/00000406.xhp#thesaurus"/>
+<embed href="text/shared/00/00000406.xhp#thesaurus"/>
</section>
<switch select="appl">
<case select="WRITER"><embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
</case>
</switch>
<paragraph role="warning" id="par_id3154184" xml-lang="en-US" l10n="U" oldref="19">Thesaurus support is not available for all languages.</paragraph>
-<paragraph role="heading" id="hd_id3153750" xml-lang="en-US" level="2" l10n="U" oldref="3">Variations</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="U" oldref="4">Lists the current word and the suggested replacement word.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_THESAURUS:LB_WORD" id="bm_id3155552" localize="false"/><paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Word</paragraph>
-<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_WORD">Displays the current selection, or the word that contains the cursor.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_THESAURUS:LB_MEAN" id="bm_id3153346" localize="false"/><paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Meaning</paragraph>
-<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_MEAN">Select the meaning that matches the context of the current word, and then select a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/><paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace</paragraph>
-<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid="SVX:EDIT:RID_SVXDLG_THESAURUS:ED_REPL">Displays a suggested replacement for the current word. You can also type a new word in this box, or click a word in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_THESAURUS:LB_SYNON" id="bm_id3147210" localize="false"/><paragraph role="heading" id="hd_id3150443" xml-lang="en-US" level="3" l10n="U" oldref="11">Synonym</paragraph>
-<paragraph role="paragraph" id="par_id3145383" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THESAURUS:LB_SYNON">Lists the words associated with the category that you selected in the <emph>Meaning</emph> list. Select the word that you want to use as a replacement, and then click <emph>OK</emph>.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LOOKUP" id="bm_id3153700" localize="false"/><paragraph role="heading" id="hd_id3149903" xml-lang="en-US" level="2" l10n="U" oldref="13">Search</paragraph>
-<paragraph role="paragraph" id="par_id3146847" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LOOKUP">Searches the thesaurus for the best match of the word selected in the <emph>Synonym</emph> list.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_THESAURUS:BTN_LANGUAGE" id="bm_id3149763" localize="false"/><paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
-<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_THESAURUS:BTN_LANGUAGE">Specifies the language to use for the thesaurus.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE" id="bm_id3154578" localize="false"/><paragraph role="heading" id="hd_id3151338" xml-lang="en-US" level="3" l10n="U" oldref="17">Selection</paragraph>
-<paragraph role="paragraph" id="par_id3145315" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="SVX:LISTBOX:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE">Select the language that you want to use for the thesaurus, and then click <emph>OK</emph>.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD" id="bm_id3155552" localize="false"/>
+<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="3" l10n="U" oldref="5">Current word</paragraph>
+<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Displays the current word, or the related term that you selected by double-clicking a line in the Alternatives list. You can also type text directly in this box to look up your text.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT" id="bm_id315752" localize="false"/>
+<paragraph role="heading" id="hd_id3647571" xml-lang="en-US" level="3" l10n="U" oldref="5">Arrow left</paragraph>
+<paragraph role="paragraph" id="par_id369233" xml-lang="en-US" l10n="CHG" oldref="6"><ahelp hid=".">Recalls the previous contents of the "Current word" text box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/HID_CT_THES_ALTERNATIVES" id="bm_id3153346" localize="false"/>
+<paragraph role="heading" id="hd_id3154983" xml-lang="en-US" level="3" l10n="U" oldref="7">Alternatives</paragraph>
+<paragraph role="paragraph" id="par_id3149182" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid=".">Click an entry in the Alternatives list to copy the related term to the "Replace with" text box. Double-click an entry to copy the related term to the "Current word" text box and to look up that term.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:Edit:RID_SVXDLG_THESAURUS:ED_REPL" id="bm_id3153528" localize="false"/>
+<paragraph role="heading" id="hd_id3155892" xml-lang="en-US" level="3" l10n="U" oldref="9">Replace with</paragraph>
+<paragraph role="paragraph" id="par_id3150693" xml-lang="en-US" l10n="U" oldref="10"><ahelp hid=".">The word or words in the "Replace with" text box will replace the original word in the document when you click the Replace button. You can also type text directly in this box.</ahelp></paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/svx:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE" id="bm_id3149763" localize="false"/>
+<paragraph role="heading" id="hd_id3146775" xml-lang="en-US" level="2" l10n="U" oldref="15">Language</paragraph>
+<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid=".">Select a language for the thesaurus.</ahelp> You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/06140400.xhp b/helpcontent2/source/text/shared/01/06140400.xhp
index 0089200579..a0041ebb6d 100755
--- a/helpcontent2/source/text/shared/01/06140400.xhp
+++ b/helpcontent2/source/text/shared/01/06140400.xhp
@@ -73,6 +73,13 @@
<paragraph role="paragraph" id="par_idN10658" xml-lang="en-US" l10n="NEW">Shows text only.</paragraph>
<paragraph role="heading" id="par_idN1065B" xml-lang="en-US" level="3" l10n="NEW">Icons &amp; Text</paragraph>
<paragraph role="paragraph" id="par_idN1065E" xml-lang="en-US" l10n="NEW">Shows icons and text.</paragraph>
+
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP" id="bm_id714743411" localize="false"/>
+<paragraph role="paragraph" id="par_idN1069AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item up in the list.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN" id="bm_id714743412" localize="false"/>
+<paragraph role="paragraph" id="par_idN1068AAA" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Moves the selected item down in the list.</ahelp></paragraph>
+
+
<paragraph role="heading" id="par_idN10661" xml-lang="en-US" level="2" l10n="NEW">Commands</paragraph>
<paragraph role="paragraph" id="par_idN10664" xml-lang="en-US" l10n="NEW">Displays a list of commands for the selected toolbar of the current application or document.</paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_SVX_NEW_TOOLBAR_ITEM" id="bm_id3407696" localize="false"/>
diff --git a/helpcontent2/source/text/shared/05/00000100.xhp b/helpcontent2/source/text/shared/05/00000100.xhp
index f3ff04d071..85464efbd6 100755
--- a/helpcontent2/source/text/shared/05/00000100.xhp
+++ b/helpcontent2/source/text/shared/05/00000100.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,20 +29,17 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textshared0500000100xml" indexer="exclude" status="PUBLISH">
<title id="tit" xml-lang="en-US"/>
<filename>/text/shared/05/00000100.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-14T14:08:39">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="neuehilfe"><comment>this section is displayed on all module main pages above the other "Help about Help" links.</comment>
+<paragraph role="paragraph" id="par_id3150699" xml-lang="en-US" l10n="NEW">The Help references the default settings of the program on a system that is set to defaults. Descriptions of colors, mouse actions, or other configurable items can be different for your program and system.</paragraph>
</section>
<paragraph role="paragraph" id="par_id3150618" xml-lang="en-US" l10n="U" oldref="1">The <emph>$[officename] Help system</emph> provides easy access to information and support. There are several ways to find what you are looking for in the <link href="text/shared/05/00000110.xhp" name="Help environment">Help environment</link>: You can search for a specific keyword in the <link href="text/shared/05/00000130.xhp" name="Index">Index</link>, carry out a full-text search under <link href="text/shared/05/00000140.xhp" name="Find">Find</link>, or look through a hierarchical list of the <link href="text/shared/05/00000160.xhp" name="Topics">Topics</link>.</paragraph>
</body>
diff --git a/helpcontent2/source/text/shared/05/00000120.xhp b/helpcontent2/source/text/shared/05/00000120.xhp
index fb97fbf6b4..f3dbbf6eaf 100755
--- a/helpcontent2/source/text/shared/05/00000120.xhp
+++ b/helpcontent2/source/text/shared/05/00000120.xhp
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
+<helpdocument version="1.0">
+
<!--
- ***********************************************************************
+***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,46 +32,46 @@
*
************************************************************************
-->
+
-<helpdocument version="1.0">
<meta>
-<topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Help Agent, Tips and Extended Tips</title>
-<filename>/text/shared/05/00000120.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2007-02-23T10:58:54">converted from old format - fpe
-DEDR: Reviewed</lastedited>
-</history>
-</meta>
-<body>
+ <topic id="textshared0500000120xml" indexer="include" status="PUBLISH">
+ <title xml-lang="en-US" id="tit">Help Agent, Tips and Extended Tips</title>
+ <filename>/text/shared/05/00000120.xhp</filename>
+ </topic>
+ </meta>
+ <body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3150672"><bookmark_value>Help; Help tips</bookmark_value>
-<bookmark_value>tooltips; help</bookmark_value>
-<bookmark_value>Help Agent; help</bookmark_value>
+ <bookmark_value>tooltips; help</bookmark_value>
+ <bookmark_value>Help Agent; help</bookmark_value>
+ <bookmark_value>Clippy, see Help Agent</bookmark_value>
</bookmark>
-<paragraph role="paragraph" id="par_id3150672" xml-lang="en-US" l10n="E" oldref="11" localize="false"/>
-<paragraph role="heading" id="hd_id3155599" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
+<paragraph xml-lang="en-US" id="par_id3150672" role="paragraph" l10n="E" oldref="11"
+ localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3155599" role="heading" level="1" l10n="U" oldref="1"><variable id="00000120"><link href="text/shared/05/00000120.xhp" name="Help Agent, Tips and Extended Tips">Help Agent, Tips and Extended Tips</link>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3148520" xml-lang="en-US" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
-<paragraph role="heading" id="hd_id3147285" xml-lang="en-US" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
-<paragraph role="paragraph" id="par_id3149716" xml-lang="en-US" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
-<paragraph role="tip" id="par_idN10634" xml-lang="en-US" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task.</paragraph>
-<paragraph role="tip" id="par_id5693533" xml-lang="en-US" l10n="NEW">Enable or disable the Help Agent on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3149140" xml-lang="en-US" level="2" l10n="U" oldref="3">Tips</paragraph>
-<paragraph role="paragraph" id="par_id3157896" xml-lang="en-US" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
-<paragraph role="paragraph" id="par_id3153910" xml-lang="en-US" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
-<paragraph role="tip" id="par_id992156" xml-lang="en-US" l10n="NEW">Enable or disable the tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
-<paragraph role="heading" id="hd_id3147571" xml-lang="en-US" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
-<paragraph role="paragraph" id="par_id3149346" xml-lang="en-US" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
-<paragraph role="tip" id="par_idN10666" xml-lang="en-US" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - General</emph>.</paragraph>
-<section id="relatedtopics">
-<embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
-<embed href="text/shared/05/00000110.xhp#00000110"/>
-<embed href="text/shared/05/00000160.xhp#doc_title"/>
-<embed href="text/shared/05/00000130.xhp#00000130"/>
-<embed href="text/shared/05/00000140.xhp#00000140"/>
-<embed href="text/shared/05/00000150.xhp#doc_title"/>
-</section>
-</body>
-</helpdocument>
+ <paragraph xml-lang="en-US" id="par_id3148520" role="paragraph" l10n="CHG" oldref="2">The Help Agent, Tips, and Extended Tips provide help while you work. </paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147285" role="heading" level="2" l10n="U" oldref="7">The Help Agent</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149716" role="paragraph" l10n="U" oldref="8">The <link href="text/shared/optionen/01010600.xhp" name="Help Agent">Help Agent</link> starts automatically when you are performing a task that might require some assistance. The Help Agent appears in a small window in a corner of the document. To view the help for the task, click inside the Help Agent window.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10634" role="tip" l10n="CHG">The Help Agent automatically closes after a short delay. If you ignore or close the Help Agent three times you perform a certain task, the Help Agent no longer opens for that task. To disable the Help Agent choose <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <embed href="text/shared/00/00000004.xhp#agentoff"/>
+ <paragraph xml-lang="en-US" id="hd_id3149140" role="heading" level="2" l10n="U" oldref="3">Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157896" role="paragraph" l10n="U" oldref="4">Tips provide you with the names of toolbar buttons. To display a tip, rest the pointer over a toolbar button until the name of the button appears.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153910" role="paragraph" l10n="U" oldref="9">Tips are also displayed for some elements in a document, such as chapter names when you scroll through a long document.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id992156" role="tip" l10n="NEW">Enable or disable the tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="hd_id3147571" role="heading" level="2" l10n="U" oldref="5">Extended Tips</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149346" role="paragraph" l10n="CHG" oldref="6">Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN10666" role="tip" l10n="NEW">If you always want extended tips instead of tips, enable the extended tips on <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph>
+</caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - %PRODUCTNAME - General</emph>.</paragraph>
+ <section id="relatedtopics">
+ <embed href="text/shared/guide/active_help_on_off.xhp#active_help_on_off"/>
+ <embed href="text/shared/05/00000110.xhp#00000110"/>
+ <embed href="text/shared/05/00000160.xhp#doc_title"/>
+ <embed href="text/shared/05/00000130.xhp#00000130"/>
+ <embed href="text/shared/05/00000140.xhp#00000140"/>
+ <embed href="text/shared/05/00000150.xhp#doc_title"/>
+ </section>
+ </body>
+</helpdocument> \ No newline at end of file
diff --git a/helpcontent2/source/text/shared/autokorr/01000000.xhp b/helpcontent2/source/text/shared/autokorr/01000000.xhp
index ee7c404ee0..0bb93c05ef 100755
--- a/helpcontent2/source/text/shared/autokorr/01000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/01000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr01000000xml" indexer="exclude" status="PUBLISH">
@@ -50,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/02000000.xhp b/helpcontent2/source/text/shared/autokorr/02000000.xhp
index bb04d5b99d..91993c59cf 100755
--- a/helpcontent2/source/text/shared/autokorr/02000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/02000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr02000000xml" indexer="exclude" status="PUBLISH">
@@ -50,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/03000000.xhp b/helpcontent2/source/text/shared/autokorr/03000000.xhp
index 3c43491bb4..de2e7abffe 100755
--- a/helpcontent2/source/text/shared/autokorr/03000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/03000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr03000000xml" indexer="exclude" status="PUBLISH">
@@ -50,6 +50,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/04000000.xhp b/helpcontent2/source/text/shared/autokorr/04000000.xhp
index 81298cd1b2..502e721253 100755
--- a/helpcontent2/source/text/shared/autokorr/04000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/04000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr04000000xml" indexer="exclude" status="PUBLISH">
@@ -51,6 +51,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/05000000.xhp b/helpcontent2/source/text/shared/autokorr/05000000.xhp
index afbc831d1d..a4eb3bfca8 100755
--- a/helpcontent2/source/text/shared/autokorr/05000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/05000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr05000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/06000000.xhp b/helpcontent2/source/text/shared/autokorr/06000000.xhp
index 1d47b5413f..70e0f75a37 100755
--- a/helpcontent2/source/text/shared/autokorr/06000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/06000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr06000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/07000000.xhp b/helpcontent2/source/text/shared/autokorr/07000000.xhp
index 6cc4e52114..45117e6ea5 100755
--- a/helpcontent2/source/text/shared/autokorr/07000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/07000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr07000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokotyafz"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/08000000.xhp b/helpcontent2/source/text/shared/autokorr/08000000.xhp
index 3ad7520fa4..7fd6245d6d 100755
--- a/helpcontent2/source/text/shared/autokorr/08000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/08000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr08000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/09000000.xhp b/helpcontent2/source/text/shared/autokorr/09000000.xhp
index ce4c7053ed..ff4af8ffe1 100755
--- a/helpcontent2/source/text/shared/autokorr/09000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/09000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr09000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/10000000.xhp b/helpcontent2/source/text/shared/autokorr/10000000.xhp
index 66c7f5d718..b3531239d6 100755
--- a/helpcontent2/source/text/shared/autokorr/10000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/10000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr10000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/12000000.xhp b/helpcontent2/source/text/shared/autokorr/12000000.xhp
index 7f52d2c259..53e18538ba 100755
--- a/helpcontent2/source/text/shared/autokorr/12000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/12000000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -46,6 +46,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/autokorr/13000000.xhp b/helpcontent2/source/text/shared/autokorr/13000000.xhp
index bccedc53bd..4abe69ef8e 100755
--- a/helpcontent2/source/text/shared/autokorr/13000000.xhp
+++ b/helpcontent2/source/text/shared/autokorr/13000000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsharedautokorr13000000xml" indexer="exclude" status="PUBLISH">
@@ -49,6 +49,9 @@
<section id="howtoget">
<embed href="text/shared/00/00000406.xhp#autokooptionen"/>
</section>
+
+<embed href="text/shared/00/00000004.xhp#agentoff"/>
+
<section id="relatedtopics">
<embed href="text/shared/guide/autocorr_url.xhp#autocorr_url"/>
<switch select="appl">
diff --git a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
index 2ed11ea686..6dd9b75476 100755
--- a/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/dabaadvpropdat.xhp
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textsharedexplorerdatabasedabaadvpropdatxml" indexer="include">
<title xml-lang="en-US" id="tit">Special Settings</title>
@@ -49,7 +49,12 @@
<paragraph xml-lang="en-US" id="par_id4572283" role="paragraph" l10n="NEW">The availability of the following controls depends on the type of database:</paragraph>
<paragraph xml-lang="en-US" id="par_idN10590" role="heading" level="2" l10n="NEW">Use SQL92 naming constraints<comment>UFI: found this for dBase and for text file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_idN10594" role="paragraph" l10n="NEW"><ahelp hid=".">Only allows characters that conform to the SQL92 naming convention in a name in a data source. All other characters are rejected. Each name must begin with a lowercase letter, an uppercase letter, or an underscore ( _ ). The remaining characters can be ASCII letters, numbers, and underscores.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
+
+ <paragraph xml-lang="en-US" id="par_idN105907" role="heading" level="2" l10n="NEW">Use keyword AS before table alias names</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN105947" role="paragraph" l10n="NEW"><ahelp hid=".">Some databases use the keyword "AS" between a name and its alias, while other databases use a whitespace. Enable this option to insert AS before the alias.</ahelp><comment>http://dba.openoffice.org/specifications/Data_Source_Property_Dialog.sxw</comment></paragraph>
+
+
+ <bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_DOSLINEENDS" id="bm_id6617328" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3534958" role="heading" level="2" l10n="NEW">End text lines with CR + LF<comment>UFI: found for dBase and text file folder</comment></paragraph>
<paragraph xml-lang="en-US" id="par_id6151921" role="paragraph" l10n="NEW"><ahelp hid=".">Select to use the CR + LF code pair to end every text line (preferred for DOS and Windows operating systems).</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/HID_DSADMIN_APPENDTABLEALIAS" id="bm_id9050569" localize="false"/>
diff --git a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
index 6db770f8e8..a154988d03 100644
--- a/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
+++ b/helpcontent2/source/text/shared/explorer/database/rep_main.xhp
@@ -74,6 +74,9 @@
<listitem>
<paragraph xml-lang="en-US" id="par_id208136" role="paragraph" l10n="NEW">Click Close to close the Extension Manager.</paragraph>
</listitem>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id20813699" role="paragraph" l10n="NEW">Restart %PRODUCTNAME. If the Quickstarter is running, also close the Quickstarter.</paragraph>
+ </listitem>
</list>
<paragraph xml-lang="en-US" id="hd_id556047" role="heading" level="2" l10n="NEW">To install the JRE software</paragraph>
<paragraph xml-lang="en-US" id="par_id4515823" role="paragraph" l10n="NEW">The Report Builder requires an installed Java Runtime Environment (JRE).</paragraph>
diff --git a/helpcontent2/source/text/shared/guide/spadmin.xhp b/helpcontent2/source/text/shared/guide/spadmin.xhp
index 79f667244f..23d61bb1e6 100755
--- a/helpcontent2/source/text/shared/guide/spadmin.xhp
+++ b/helpcontent2/source/text/shared/guide/spadmin.xhp
@@ -50,9 +50,11 @@
<bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
</bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
-<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
+<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer and Fax Under UNIX Based Platforms">Setting up Printer and Fax Under UNIX Based Platforms</link>
</variable></paragraph>
<section id="chapter_body">
+<paragraph role="paragraph" id="par_id3159876" xml-lang="en-US" l10n="NEW">%PRODUCTNAME uses the installed fonts of your system. In a text document you can select from all printable fonts. In an HTML document or in Web layout, only fonts that are visible on screen are offered. In spreadsheets and drawings you can select from all installed fonts.</paragraph>
+
<paragraph role="paragraph" id="par_id3159233" xml-lang="en-US" l10n="U" oldref="2">Under UNIX based platforms, the printer administration program <emph>spadmin</emph> is provided to help you set up printers and faxes for use with the $[officename] software.</paragraph>
<paragraph role="paragraph" id="par_id3156410" xml-lang="en-US" l10n="U" oldref="117">Call the printer administration program <emph>spadmin</emph> as follows:</paragraph>
<list type="unordered">
@@ -220,7 +222,7 @@
</listitem>
</list>
<paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
-<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
+
</section>
</section>
</body>
diff --git a/helpcontent2/source/text/simpress/01/03070000.xhp b/helpcontent2/source/text/simpress/01/03070000.xhp
index 0b7d6db524..4f1e6efd91 100644
--- a/helpcontent2/source/text/simpress/01/03070000.xhp
+++ b/helpcontent2/source/text/simpress/01/03070000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,22 +29,18 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103070000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Presentation Toolbar</title>
+<title id="tit" xml-lang="en-US">Presentation</title>
<filename>/text/simpress/01/03070000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-10T10:14:04">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="praesentation">
<bookmark xml-lang="en-US" branch="hid/.uno:CommonTaskBarVisible" id="bm_id3154013" localize="false"/>
-<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation Toolbar">Presentation Toolbar</link></paragraph>
+<paragraph role="heading" id="hd_id3153144" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03070000.xhp" name="Presentation">Presentation</link></paragraph>
<paragraph role="paragraph" id="par_id3146975" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid=".uno:CommonTaskBarVisible">Common commands for slides.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/03130000.xhp b/helpcontent2/source/text/simpress/01/03130000.xhp
index 14b0ac83ec..b0bc6424d2 100644
--- a/helpcontent2/source/text/simpress/01/03130000.xhp
+++ b/helpcontent2/source/text/simpress/01/03130000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0103130000xml" indexer="include" status="PUBLISH">
@@ -47,8 +47,7 @@
<bookmark xml-lang="en-US" branch="hid/.uno:Presentation" id="bm_id3150012" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/HID_SD_BTN_PRESENTATION" id="bm_id3151075" localize="false"/>
<paragraph role="heading" id="hd_id3159153" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/03130000.xhp" name="Slide Show">Slide Show</link></paragraph>
-<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3154016" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="bldpra"><ahelp hid="HID_SD_BTN_PRESENTATION">Starts your slide show.</ahelp></variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/simpress/00/00000403.xhp#asbsp"/>
diff --git a/helpcontent2/source/text/simpress/01/04010000.xhp b/helpcontent2/source/text/simpress/01/04010000.xhp
index 3784920070..ec8c1531b0 100644
--- a/helpcontent2/source/text/simpress/01/04010000.xhp
+++ b/helpcontent2/source/text/simpress/01/04010000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,7 +45,7 @@
</bookmark>
<bookmark xml-lang="en-US" branch="hid/SID_INSERTPAGE" id="bm_id8576712" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:InsertPage" id="bm_id3149666" localize="false"/><paragraph role="heading" id="hd_id3159155" xml-lang="en-US" level="1" l10n="CHG" oldref="1"><link href="text/simpress/01/04010000.xhp" name="Insert Slide / Page">Insert Slide / Page</link></paragraph>
-<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
+<paragraph role="paragraph" id="par_id3146119" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="seitetext"><ahelp hid=".uno:InsertPage"><switchinline select="appl"><caseinline select="IMPRESS">Inserts a slide after the currently selected slide.
</caseinline><defaultinline>Inserts a page after the currently selected page.</defaultinline></switchinline></ahelp>
</variable></paragraph>
<section id="howtoget">
diff --git a/helpcontent2/source/text/simpress/01/05120000.xhp b/helpcontent2/source/text/simpress/01/05120000.xhp
index 86a80df9da..7eb687a139 100644
--- a/helpcontent2/source/text/simpress/01/05120000.xhp
+++ b/helpcontent2/source/text/simpress/01/05120000.xhp
@@ -6,7 +6,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,8 +42,7 @@
<body>
<bookmark xml-lang="en-US" branch="hid/SID_PRESENTATION_LAYOUT" id="bm_id8828300" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:PresentationLayout" id="bm_id3155961" localize="false"/><paragraph role="heading" id="hd_id3154253" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/simpress/01/05120000.xhp" name="Slide Design">Slide Design</link></paragraph>
-<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp>
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148485" xml-lang="en-US" l10n="U" oldref="2"><variable id="seitenvorlagetext"><ahelp hid=".uno:PresentationLayout">Displays the <emph>Slide Design</emph> dialog, where you can select a layout scheme for the current slide. Any objects in the slide design are inserted behind objects in the current slide.</ahelp></variable></paragraph>
<section id="howtoget">
<embed href="text/simpress/00/00000405.xhp#seitenvorlage"/>
</section>
diff --git a/helpcontent2/source/text/simpress/01/05130000.xhp b/helpcontent2/source/text/simpress/01/05130000.xhp
index ae794d7f9a..6f4b07ca63 100644
--- a/helpcontent2/source/text/simpress/01/05130000.xhp
+++ b/helpcontent2/source/text/simpress/01/05130000.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,17 +29,13 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpress0105130000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Slide Layout</title>
<filename>/text/simpress/01/05130000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-12-04T11:37:02">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<bookmark xml-lang="en-US" branch="index" id="bm_id3154754"><bookmark_value>changing; slide layouts</bookmark_value>
@@ -53,6 +49,9 @@
<section id="howtoget">
<embed href="text/simpress/00/00000405.xhp#adnsei"/>
</section>
+
+<paragraph role="paragraph" id="par_id31469757" xml-lang="en-US" l10n="NEW"><switchinline select="appl"><caseinline select="IMPRESS">The icon in the Presentation toolbar opens a submenu. Select the slide layout for the slide.</caseinline></switchinline></paragraph>
+
<embed href="text/simpress/guide/masterpage.xhp#masterpage"/>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/simpress/main0200.xhp b/helpcontent2/source/text/simpress/main0200.xhp
index 05e05721fa..7f35cd873a 100755
--- a/helpcontent2/source/text/simpress/main0200.xhp
+++ b/helpcontent2/source/text/simpress/main0200.xhp
@@ -5,7 +5,7 @@
***********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
*
************************************************************************
-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textsimpressmain0200xml" indexer="include" status="PUBLISH">
@@ -51,6 +51,9 @@
<section id="Section1">
<embed href="text/shared/main0201.xhp#funktionsleiste"/>
</section>
+<section id="present">
+<embed href="text/simpress/01/03070000.xhp#praesentation"/>
+</section>
<section id="Section2">
<embed href="text/simpress/main0210.xhp#werkzeugleiste"/>
</section>
@@ -92,6 +95,7 @@
</section>
<section id="Section15">
<embed href="text/simpress/02/10110000.xhp#einfuegen"/>
+<paragraph role="paragraph" id="par_id31474099" xml-lang="en-US" l10n="NEW">Add objects, including charts, spreadsheets, and images, to your document.</paragraph>
</section>
</sort>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index de2956c2e6..92c65a05a8 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -27,48 +27,52 @@
* for a copy of the LGPLv3 License.
*
************************************************************************-->
-
+
<helpdocument version="1.0">
<meta>
<topic id="textswriter0106030000xml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Hyphenation</title>
<filename>/text/swriter/01/06030000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-21T12:50:13">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="hyphenation">
<bookmark xml-lang="en-US" branch="hid/SID_ENABLE_HYPHENATION" id="bm_id3267005" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Hyphenate" id="bm_id3152361" localize="false"/>
<paragraph role="heading" id="hd_id3154657" xml-lang="en-US" level="1" l10n="U" oldref="1">Hyphenation</paragraph>
-<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="2"><variable id="silben"><ahelp hid=".uno:Hyphenate">Inserts hyphens in words that are too long to fit at the end of a line.</ahelp> $[officename] searches the document and suggests hyphenation that you can accept or reject.
-</variable></paragraph>
+<paragraph role="paragraph" id="par_id3148572" xml-lang="en-US" l10n="U" oldref="2"><variable id="silben"><ahelp hid=".">Inserts hyphens in words that are too long to fit at the end of a line.</ahelp> $[officename] searches the document and suggests hyphenation that you can accept or reject. If text is selected, the Hyphenation dialog works on the selected text only. If no text is selected, the Hyphenation dialog works on the whole document.</variable></paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000406.xhp#silbentrennung"/>
</section>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
-<paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="3">To automatically hyphenate the current or selected paragraphs, choose <emph>Format - Paragraph</emph>, and then click the <link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link> tab. You can also apply automatic hyphenation to a paragraph style.</paragraph>
+<paragraph role="paragraph" id="par_id3153811" xml-lang="en-US" l10n="U" oldref="3">To automatically hyphenate the current or selected paragraphs, choose <emph>Format - Paragraph</emph>, and then click the <link href="text/swriter/01/05030200.xhp" name="Text Flow">Text Flow</link> tab. You can also apply automatic hyphenation to a paragraph style. In text where automatic hyphenation is enabled, the Hyphenation dialog will not find any word to hyphenate.</paragraph>
<paragraph role="paragraph" id="par_id3151389" xml-lang="en-US" l10n="U" oldref="5">When $[officename] finds a word that requires hyphenation, do one of the following options:</paragraph>
<list type="unordered">
<listitem>
-<paragraph role="listitem" id="par_id3155622" xml-lang="en-US" l10n="U" oldref="36">To accept the suggestion, click <emph>Hyphenate</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3155622" xml-lang="en-US" l10n="U" oldref="36">To accept the hyphenation of the displayed word, click <emph>Hyphenate</emph>.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="37">To accept one of the suggestions, click the hyphen, type an Equal sign (=), and then click <emph>Hyphenate</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3154558" xml-lang="en-US" l10n="U" oldref="37">To change the hyphenation of the displayed word, click the left or right arrow below the word, and then click <emph>Hyphenate</emph>. The left and right buttons are enabled for words with multiple hyphenation points.</paragraph>
</listitem>
<listitem>
-<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the suggestion, click <emph>Remove</emph>.</paragraph>
+<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the hyphenation of the displayed word, click <emph>Skip</emph>. This word will not be hyphenated.</paragraph>
</listitem>
+
+<listitem>
+<paragraph role="listitem" id="par_id3150018" xml-lang="en-US" l10n="U" oldref="38">To automatically hyphenate the remaining part of the selection or the document, click <emph>Hyphenate All</emph> and answer "Yes" to the following question.</paragraph>
+</listitem>
+
+<listitem>
+<paragraph role="listitem" id="par_id3150019" xml-lang="en-US" l10n="U" oldref="38">To end hyphenation, click <emph>Close</emph>. The hyphenation that is applied already will not be reverted. You can use <emph>Edit - Undo</emph> to undo all hyphenation that was applied while the Hyphenation dialog was open.</paragraph>
+</listitem>
+
</list>
-<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph, click the Text Flow</emph> tab, and then clear the <emph>Automatically</emph> check box in the <emph>Hyphenation</emph> area.</paragraph>
-<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To turn off the suggestion dialogs for hyphenation, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
-<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="tip" id="par_id3147562" xml-lang="en-US" l10n="U" oldref="19">To exclude paragraphs from the automatic hyphenation, select the paragraphs, choose <emph>Format - Paragraph</emph>, click the Text Flow tab, and then clear the <emph>Automatically</emph> check box in the Hyphenation area.</paragraph>
+<paragraph role="note" id="par_id3154276" xml-lang="en-US" l10n="U" oldref="18">To disable the Hyphenation dialog and always hyphenate automatically, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010400.xhp" name="Language Settings - Writing Aids">Language Settings - Writing Aids</link></emph>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
+<paragraph role="paragraph" id="par_id3152950" xml-lang="en-US" l10n="U" oldref="17">To manually enter a hyphen directly in the document, click in the word where you want to add the hyphen, and then press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+Minus sign (-).</paragraph>
-<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
+<paragraph role="paragraph" id="par_id3147523" xml-lang="en-US" l10n="U" oldref="32">To insert a non-breaking (protected) hyphen directly in the document, click in the word that you want to hyphenate, and then press Shift+<switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>+Ctrl </defaultinline></switchinline>+Minus sign(-).</paragraph>
<paragraph role="paragraph" id="par_id3154573" xml-lang="en-US" l10n="U" oldref="33">To hide custom hyphens, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Text Document - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then clear the <emph>Custom hyphens</emph> check box.</paragraph>
<paragraph role="heading" id="hd_id3150360" xml-lang="en-US" level="2" l10n="U" oldref="20">Word</paragraph>
@@ -78,6 +82,7 @@
<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT" id="bm_id3159192" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/svx:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT" id="bm_id3159196" localize="false"/>
<paragraph role="heading" id="hd_id3154195" xml-lang="en-US" level="3" l10n="U" oldref="23">Left / Right Arrow</paragraph>
+
<paragraph role="paragraph" id="par_id3155174" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX:IMAGEBUTTON:RID_SVXDLG_HYPHENATE:BTN_RIGHT">Set the position of the hyphen. This option is only available if more than one hyphenation suggestion is displayed.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE" id="bm_id3149299" localize="false"/>
<paragraph role="heading" id="hd_id3151327" xml-lang="en-US" level="2" l10n="U" oldref="25">Next</paragraph>
@@ -87,7 +92,7 @@
<paragraph role="paragraph" id="par_id3149096" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="HID_HYPHENATE">Inserts the hyphen at the indicated position.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/svx:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE" id="bm_id3149815" localize="false"/>
<paragraph role="heading" id="hd_id3154829" xml-lang="en-US" level="2" l10n="U" oldref="29">Remove</paragraph>
-<paragraph role="paragraph" id="par_id3149821" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE">Rejects the hyphenation suggestion.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3149821" xml-lang="en-US" l10n="U" oldref="30"><ahelp hid="SVX:PUSHBUTTON:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE">Removes the current hyphenation point from the displayed word.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
</body>
diff --git a/helpcontent2/source/text/swriter/guide/search_regexp.xhp b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
index a521603662..cdeeae9b62 100755
--- a/helpcontent2/source/text/swriter/guide/search_regexp.xhp
+++ b/helpcontent2/source/text/swriter/guide/search_regexp.xhp
@@ -6,10 +6,13 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
*
+ * $RCSfile: soffice2xmlhelp.xsl,v $
+ * $Revision: 1.12 $
+ *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,7 +47,8 @@
<bookmark_value>examples for regular expressions</bookmark_value>
<bookmark_value>characters;finding all</bookmark_value>
<bookmark_value>invisible characters;finding</bookmark_value>
-</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment>
+ <bookmark_value>paragraph marks;searching</bookmark_value>
+</bookmark><comment>mw deleted "wildcards;" and inserted wildcards crossreference</comment><comment>mw added "paragraph marks;"</comment>
<paragraph xml-lang="en-US" id="hd_id3150099" role="heading" level="1" l10n="U"
oldref="15"><variable id="search_regexp"><link href="text/swriter/guide/search_regexp.xhp">Using Wildcards in Text Searches</link>
</variable></paragraph>
diff --git a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
index fdd8ae035c..488ee7db0b 100644
--- a/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_hyphen.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguideusing_hyphenxml" indexer="include" status="PUBLISH">
<title xml-lang="en-US" id="tit">Hyphenation</title>
@@ -60,8 +60,7 @@
<paragraph xml-lang="en-US" id="par_id3156104" role="listitem" l10n="U" oldref="34">Click the <link href="text/swriter/01/05030200.xhp" name="Text Flow"><emph>Text Flow</emph></link> tab.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3150101" role="listitem" l10n="U" oldref="35">In the <item type="menuitem">Hyphenation</item>
- <emph/>area, select the <item type="menuitem">Automatically</item> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150101" role="listitem" l10n="U" oldref="35">In the Hyphenation area, select the Automatically check box.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3153121" role="listitem" l10n="U" oldref="52">Click <emph>OK</emph>.</paragraph>
@@ -79,8 +78,7 @@
<paragraph xml-lang="en-US" id="par_id3149867" role="listitem" l10n="U" oldref="55">Right-click the paragraph style that you want to hyphenate, and then choose <emph>Modify</emph>.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3145106" role="listitem" l10n="U" oldref="56">Click the <item type="menuitem">Text Flow</item>
- <emph/>tab.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145106" role="listitem" l10n="U" oldref="56">Click the Text Flow tab.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3149582" role="listitem" l10n="U" oldref="57">In the <emph>Hyphenation</emph> area, select the <emph>Automatically</emph> check box.</paragraph>
@@ -109,12 +107,6 @@
<paragraph xml-lang="en-US" id="par_id3155886" role="listitem" l10n="CHG" oldref="26">Choose <emph>Tools - Language - Hyphenation</emph>.</paragraph>
</listitem>
</list>
- <list type="ordered" startwith="3">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3155943" role="listitem" l10n="U" oldref="62">When $[officename] encounters a word to hyphenate, do one of the following:</paragraph>
- </listitem>
- </list>
- <list type="unordered"/>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<embed href="text/swriter/guide/using_thesaurus.xhp#using_thesaurus"/>
diff --git a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
index 43ab9d85ee..5471ba9df2 100644
--- a/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
+++ b/helpcontent2/source/text/swriter/guide/using_thesaurus.xhp
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--
***********************************************************************
*
@@ -29,8 +29,8 @@
*
************************************************************************
-->
-
-
+
+
<meta>
<topic id="textswriterguideusing_thesaurusxml" indexer="include">
<title xml-lang="en-US" id="tit">Thesaurus</title>
@@ -49,33 +49,31 @@
<paragraph xml-lang="en-US" id="hd_id3145576" role="heading" level="1" l10n="U"
oldref="15"><variable id="using_thesaurus"><link href="text/swriter/guide/using_thesaurus.xhp" name="Thesaurus">Thesaurus</link>
</variable></paragraph>
- <paragraph xml-lang="en-US" id="par_id3149820" role="paragraph" l10n="U" oldref="16">You can use the thesaurus to look up synonyms, and related words.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149820" role="paragraph" l10n="U" oldref="16">You can use the thesaurus to look up synonyms or related terms.</paragraph>
<list type="ordered">
<listitem>
- <paragraph xml-lang="en-US" id="par_id3155920" role="listitem" l10n="U" oldref="17">Click in the word that you want to look up.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155920" role="listitem" l10n="U" oldref="17">Click in the word that you want to look up or replace.</paragraph>
</listitem>
<listitem>
<paragraph xml-lang="en-US" id="par_id3155867" role="listitem" l10n="CHG" oldref="39">Choose <emph>Tools - Language - Thesaurus</emph>, or press <switchinline select="sys"><caseinline select="MAC">Command
</caseinline><defaultinline>Ctrl</defaultinline></switchinline>+F7.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="U" oldref="40">In the <item type="menuitem">Meaning</item>
- <emph/>list, select the definition that matches the context of the word.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149848" role="listitem" l10n="U" oldref="40">In the Alternatives list, click an entry to copy that related term to the "Replace with" text box.</paragraph>
</listitem>
- </list>
- <list type="ordered" startwith="4">
- <listitem>
- <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" l10n="U" oldref="45">Select the replacement word in the <item type="menuitem">Synonym</item>
- <emph/>list.</paragraph>
+ <listitem>
+ <paragraph xml-lang="en-US" id="par_id3153136" role="listitem" l10n="U" oldref="45">Optionally double-click an entry to look up related terms for that entry. On your keyboard, you can also press the arrow up or down keys to select an entry. Then press Return to replace, or press the spacebar to look up.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_id3149644" role="listitem" l10n="U" oldref="46">Click <emph>OK</emph>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149644" role="listitem" l10n="U" oldref="46">Click <emph>Replace</emph>.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click <item type="menuitem">Language</item>
- <emph/>in the<emph/>
- <item type="menuitem">Thesaurus</item> dialog, select one of the installed languages, and then click <item type="menuitem">OK</item>. In the <item type="menuitem">Thesaurus</item> dialog, click <item type="menuitem">Search</item>. The thesaurus may not be available for all installed languages.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="19">If you applied a different language setting to individual words, or paragraphs, the thesaurus for the applied language is used.</paragraph>
+
+
+
+ <paragraph xml-lang="en-US" id="par_id3156263" role="paragraph" l10n="U" oldref="19">Initially, the thesaurus uses the language of the selected word in the document, if a thesaurus library for that language is installed. The title bar of the Thesaurus dialog displays the language in use.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145113" role="note" l10n="U" oldref="18">To look up the word in a different language, click the Language button, and select one of the installed thesaurus languages. A thesaurus library may not be available for all installed languages. You can install languages with a thesaurus library from the <link href="http://extensions.services.openoffice.org/">Extensions</link> web page.</paragraph>
+<paragraph xml-lang="en-US" id="par_id3196263" role="paragraph" l10n="U" oldref="19">If a thesaurus library is installed for the language of a word, the context menu of the word shows a Synonyms submenu. Select any of the terms from the submenu to replace the word.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/spellcheck_dialog.xhp#spellcheck_dialog"/>
<embed href="text/swriter/guide/using_hyphen.xhp#using_hyphen"/>
diff --git a/helpcontent2/source/text/swriter/main0208.xhp b/helpcontent2/source/text/swriter/main0208.xhp
index 3e283cc101..30d6350e13 100755
--- a/helpcontent2/source/text/swriter/main0208.xhp
+++ b/helpcontent2/source/text/swriter/main0208.xhp
@@ -45,8 +45,10 @@
<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="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>
+
+<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="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 Reset to Default Language to re-apply the default language for the selection or the paragraph. <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"/>
<embed href="text/shared/02/20060000.xhp#dokumentveraenderung"/>
diff --git a/helpcontent2/util/target.pmk b/helpcontent2/util/target.pmk
index c5649de4dc..44b73709b4 100644
--- a/helpcontent2/util/target.pmk
+++ b/helpcontent2/util/target.pmk
@@ -37,7 +37,11 @@ JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
$(LINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKADDEDDEPS)) $(COMMONMISC)$/xhp_changed.flag $(PRJ)$/helpers$/hid.lst
$(HELPLINKER) @$(mktmp -mod $(LINKNAME) -hid $(PRJ)$/helpers$/hid.lst -src $(COMMONMISC) -sty $(PRJ)$/source$/auxiliary$/embed.xsl -zipdir $(MISC)$/ziptmp$(@:b) -idxcaption $(PRJ)$/source$/auxiliary$/idxcaption.xsl -idxcontent $(PRJ)$/source$/auxiliary$/idxcontent.xsl -lang {$(subst,$(LINKNAME)_, $(@:b))} $(subst,LANGUAGE,{$(subst,$(LINKNAME)_, $(@:b))} $(LINKADDEDFILES)) $(foreach,i,$(LINKLINKFILES) $(COMMONMISC)$/{$(subst,$(LINKNAME)_, $(@:b))}/$i) -o $@.$(INPATH))
.IF "$(SOLAR_JAVA)" == "TRUE"
+.IF "$(CHECK_LUCENCE_INDEXER_OUTPUT)" == ""
+ $(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH)
+.ELSE
$(JAVAI) $(JAVAIFLAGS) $(JAVA_LIBRARY_PATH) -cp "$(my_cp)" com.sun.star.help.HelpIndexerTool -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -zipdir $(MISC)$/ziptmp$(@:b) -o $@.$(INPATH) -checkcfsandsegname _0 _3
+.ENDIF
$(RENAME) $@.$(INPATH) $@
.ELSE
-$(RM) $(MISC)$/ziptmp$(@:b)$/content/*.*