summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/swriter/01
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-01-14 19:11:13 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Sun.COM>2010-01-14 19:11:13 +0100
commit958787b6131d22df2a4296eb2b48090634ec6535 (patch)
treebaead9ad0cca566f632b5621f8cceab4de85f390 /helpcontent2/source/text/swriter/01
parent5022855899ab820fbb5605c3a8574e7df0ee493d (diff)
parentffd5ba5683fe150293c48e7a4ae1007f9f5cf0c5 (diff)
rebase to DEV300_m69
Diffstat (limited to 'helpcontent2/source/text/swriter/01')
-rw-r--r--helpcontent2/source/text/swriter/01/02150000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/03050000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03090000.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/03100000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/03140000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04060000.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04090001.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04090003.xhp4
-rw-r--r--[-rwxr-xr-x]helpcontent2/source/text/swriter/01/04090200.xhp107
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04120211.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/04130100.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/04150000.xhp4
-rw-r--r--helpcontent2/source/text/swriter/01/04200000.xhp2
-rwxr-xr-xhelpcontent2/source/text/swriter/01/05040800.xhp6
-rw-r--r--helpcontent2/source/text/swriter/01/05090201.xhp2
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp6
-rwxr-xr-xhelpcontent2/source/text/swriter/01/mailmerge00.xhp3
17 files changed, 75 insertions, 87 deletions
diff --git a/helpcontent2/source/text/swriter/01/02150000.xhp b/helpcontent2/source/text/swriter/01/02150000.xhp
index f8dec4568e..da1a02785a 100644
--- a/helpcontent2/source/text/swriter/01/02150000.xhp
+++ b/helpcontent2/source/text/swriter/01/02150000.xhp
@@ -60,7 +60,7 @@
<embed href="text/swriter/01/04030000.xhp#bearbeitenzeichen"/>
<paragraph role="heading" id="hd_id3150113" xml-lang="en-US" level="3" l10n="U" oldref="14">...</paragraph>
<embed href="text/swriter/01/04030000.xhp#bearbeitensonderzeichen"/>
-<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press F11 to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
+<paragraph role="tip" id="par_id3149849" xml-lang="en-US" l10n="CHG" oldref="19">To change the format of a footnote or endnote anchor or text, select it, and then choose <emph>Format - Character</emph>. You can press <switchinline select="sys"><caseinline select="MAC">Command+T</caseinline><defaultinline>F11</defaultinline></switchinline> to open the <emph>Styles and Formatting</emph> window and modify the footnote or endnote paragraph style.</paragraph>
<paragraph role="heading" id="hd_id3153296" xml-lang="en-US" level="2" l10n="U" oldref="15">Type</paragraph>
<paragraph role="paragraph" id="par_id3153308" xml-lang="en-US" l10n="U" oldref="20">Select the type of note to insert, that is, footnote or endnote. A footnote is placed at the bottom of the current page, whereas an endnote is placed at the end of the document.</paragraph>
<paragraph role="heading" id="hd_id3156130" xml-lang="en-US" level="3" l10n="U" oldref="16">Footnote</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/03050000.xhp b/helpcontent2/source/text/swriter/01/03050000.xhp
index f87e6c1607..fee44c822d 100644
--- a/helpcontent2/source/text/swriter/01/03050000.xhp
+++ b/helpcontent2/source/text/swriter/01/03050000.xhp
@@ -37,17 +37,13 @@
<title id="tit" xml-lang="en-US">Ruler</title>
<filename>/text/swriter/01/03050000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-12-14T14:45:47">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="lineal">
<bookmark xml-lang="en-US" branch="hid/FN_RULER" id="bm_id8671021" localize="false"/><!-- HID added by script -->
<bookmark xml-lang="en-US" branch="hid/.uno:Ruler" id="bm_id3151170" localize="false"/>
<paragraph role="heading" id="hd_id3149287" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/03050000.xhp" name="Ruler">Ruler</link></paragraph>
-<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <link href="text/shared/optionen/01040200.xhp" name="Tools - Options - Writer - View"><emph>Tools - Options - %PRODUCTNAME Writer - View</emph></link>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3147514" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:Ruler">Shows or hides the horizontal ruler, that you can use to adjust page margins, tab stops, indents, borders, table cells, and to arrange objects on the page.</ahelp> To show the vertical ruler, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040200.xhp" name="Writer - View">%PRODUCTNAME Writer - View</link></emph>, and then select the <emph>Vertical ruler</emph> check box in the <emph>Ruler</emph> area.</paragraph>
</section>
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#lineal"/>
diff --git a/helpcontent2/source/text/swriter/01/03090000.xhp b/helpcontent2/source/text/swriter/01/03090000.xhp
index d868f450ee..626a76d574 100644
--- a/helpcontent2/source/text/swriter/01/03090000.xhp
+++ b/helpcontent2/source/text/swriter/01/03090000.xhp
@@ -37,10 +37,6 @@
<title id="tit" xml-lang="en-US">Fields</title>
<filename>/text/swriter/01/03090000.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-07-09T16:31:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="feldbefehle">
@@ -52,7 +48,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#feldbefehle"/>
</section>
-<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph>Tools - Options - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3149287" xml-lang="en-US" l10n="U" oldref="4">To change the default field display to field names instead of the field contents, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - View</emph>, and then select the<emph> Field codes </emph>checkbox in the <emph>Display</emph> area.</paragraph>
<paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="5">When you print a document with <emph>View - Field Names</emph> enabled, you are prompted to include the field names in the print out.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3145579" xml-lang="en-US" l10n="U" oldref="3"><link href="text/swriter/01/04090000.xhp" name="Insert - Fields">Insert - Fields</link>.</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/03100000.xhp b/helpcontent2/source/text/swriter/01/03100000.xhp
index 5c91b2e1b2..304d5bca8e 100644
--- a/helpcontent2/source/text/swriter/01/03100000.xhp
+++ b/helpcontent2/source/text/swriter/01/03100000.xhp
@@ -53,6 +53,6 @@
<embed href="text/swriter/00/00000403.xhp#steuerzeichen"/>
</section>
<paragraph role="paragraph" id="par_id3145410" xml-lang="en-US" l10n="U" oldref="5">When you delete a paragraph mark, the paragraph that is merged takes on the formatting of the paragraph that the cursor is in.</paragraph>
-<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then select the options that you want in the <emph>Display of </emph>area.</paragraph>
+<paragraph role="paragraph" id="par_id3147511" xml-lang="en-US" l10n="U" oldref="6">To specify which nonprinting characters are displayed, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and then select the options that you want in the <emph>Display of</emph> area.</paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/03140000.xhp b/helpcontent2/source/text/swriter/01/03140000.xhp
index 029f189312..4a07e9f1f1 100644
--- a/helpcontent2/source/text/swriter/01/03140000.xhp
+++ b/helpcontent2/source/text/swriter/01/03140000.xhp
@@ -52,7 +52,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000403.xhp#versteckteabs"/>
</section>
-<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Writer - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
+<paragraph role="note" id="par_id3157875" xml-lang="en-US" l10n="U" oldref="3">To enable this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040600.xhp" name="Writer - Formatting Aids">%PRODUCTNAME Writer - Formatting Aids</link></emph>, and ensure that the <emph>Hidden paragraphs</emph> check box in the <emph>Display of</emph> area is selected.</paragraph>
<paragraph role="paragraph" id="par_id3154501" xml-lang="en-US" l10n="U" oldref="4">Use the <link href="text/swriter/01/04090000.xhp" name="field command">field command</link> "Hidden Paragraph" to assign a <link href="text/swriter/01/04090200.xhp" name="condition">condition</link> that must be met to hide a paragraph. If the condition is not met, the paragraph is displayed.</paragraph>
<paragraph role="paragraph" id="par_id3083451" xml-lang="en-US" l10n="U" oldref="5">When you hide a paragraph, footnotes and frames that are anchored to characters in the paragraph are also hidden.</paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04060000.xhp b/helpcontent2/source/text/swriter/01/04060000.xhp
index 980f3fdf1a..f71392edc3 100644
--- a/helpcontent2/source/text/swriter/01/04060000.xhp
+++ b/helpcontent2/source/text/swriter/01/04060000.xhp
@@ -75,7 +75,7 @@
<embed href="text/swriter/01/04060100.xhp#optionentext"/>
<bookmark xml-lang="en-US" branch="hid/sw_PushButton_DLG_CAPTION_BTN_AUTOCAPTION" id="bm_id72939" localize="false"/>
<paragraph role="heading" id="par_idN10744" xml-lang="en-US" level="2" l10n="NEW">AutoCaption</paragraph>
-<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu Tools - Options - %PRODUCTNAME Writer - AutoCaption.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_idN1074A" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Opens the Caption dialog. It has the same information as the dialog you get by menu %PRODUCTNAME Writer - AutoCaption in the Options dialog box.</ahelp></paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/captions.xhp#captions"/>
<embed href="text/swriter/guide/captions_numbers.xhp#captions_numbers"/>
diff --git a/helpcontent2/source/text/swriter/01/04090001.xhp b/helpcontent2/source/text/swriter/01/04090001.xhp
index ad94508674..4a979bcf45 100644
--- a/helpcontent2/source/text/swriter/01/04090001.xhp
+++ b/helpcontent2/source/text/swriter/01/04090001.xhp
@@ -109,7 +109,7 @@
<paragraph xml-lang="en-US" id="par_id3150561" role="tablecontent" l10n="U" oldref="8">Sender</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing<link href="text/shared/optionen/01010100.xhp" name="Tools - Options - $[officename] - User Data"><emph>Tools - Options - $[officename] - User Data</emph></link>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146341" role="tablecontent" l10n="U" oldref="9">Inserts fields containing user data. You can change the user-data that is displayed by choosing <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01010100.xhp" name="$[officename] - User Data">$[officename] - User Data</link></emph>.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph xml-lang="en-US" id="par_id3148863" role="tablecontent" l10n="U" oldref="22">Statistics</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the<emph> Statistics tab. </emph>
+ <paragraph xml-lang="en-US" id="par_id3151091" role="tablecontent" l10n="U" oldref="23">Inserts document statistics, such as page and word counts, as a field. To view the statistics of a document, choose <emph>File - Properties</emph>, and then click the <emph>Statistics</emph> tab.
</paragraph>
</tablecell>
</tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04090003.xhp b/helpcontent2/source/text/swriter/01/04090003.xhp
index 5a0fbc53ff..d873080207 100644
--- a/helpcontent2/source/text/swriter/01/04090003.xhp
+++ b/helpcontent2/source/text/swriter/01/04090003.xhp
@@ -109,7 +109,7 @@
<paragraph role="tablecontent" id="par_id3150973" xml-lang="en-US" l10n="U" oldref="13">Hidden text</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3147524" xml-lang="en-US" l10n="CHG" oldref="14">Inserts a text field that is hidden when the condition that you specify is met. To use this function, 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 clear the <emph>Fields: Hidden text</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
@@ -117,7 +117,7 @@
<paragraph role="tablecontent" id="par_id3154480" xml-lang="en-US" l10n="U" oldref="15">Hidden Paragraph</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, choose <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link> and clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
+<paragraph role="tablecontent" id="par_id3153677" xml-lang="en-US" l10n="CHG" oldref="16">Hides a paragraph when the condition that you specify is met. To use this function, 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 clear the <emph>Fields: Hidden paragraph</emph> check box.</paragraph>
</tablecell>
</tablerow>
<tablerow>
diff --git a/helpcontent2/source/text/swriter/01/04090200.xhp b/helpcontent2/source/text/swriter/01/04090200.xhp
index 66da064bd8..cd67c4b698 100755..100644
--- a/helpcontent2/source/text/swriter/01/04090200.xhp
+++ b/helpcontent2/source/text/swriter/01/04090200.xhp
@@ -11,7 +11,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: soffice2xmlhelp.xsl,v $
- * $Revision: 1.8 $
+ * $Revision: 1.12 $
*
* This file is part of OpenOffice.org.
*
@@ -74,18 +74,18 @@
<table id="tbl_id3153537">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153677" role="paragraph" l10n="CHG" oldref="19">TRUE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153677" role="tablecontent" l10n="CHG" oldref="19">TRUE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3152960" role="paragraph" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3152960" role="tablecontent" l10n="U" oldref="20">The condition is always met. You can also enter any value not equal to 0 as the conditional text.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155900" role="paragraph" l10n="CHG" oldref="21">FALSE</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155900" role="tablecontent" l10n="CHG" oldref="21">FALSE</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154191" role="paragraph" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154191" role="tablecontent" l10n="U" oldref="22">The condition is not met. You can also enter the value 0.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -114,26 +114,26 @@
<table id="tbl_id3155867">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147417" role="paragraph" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147417" role="tablecontent" l10n="U" oldref="32">x == 1 or x EQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147500" role="paragraph" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147500" role="tablecontent" l10n="U" oldref="33">The condition is true if "x" is equal to 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145259" role="paragraph" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145259" role="tablecontent" l10n="U" oldref="34">x != 1 or x NEQ 1</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150551" role="paragraph" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150551" role="tablecontent" l10n="U" oldref="35">The condition is true if "x" does not equal 1.</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147749" role="paragraph" l10n="U" oldref="36">sinx == 0</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147749" role="tablecontent" l10n="U" oldref="36">sinx == 0</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146345" role="paragraph" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146345" role="tablecontent" l10n="U" oldref="37">The condition is true if "x" is a multiple of pi.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -142,20 +142,20 @@
<table id="tbl_id3148855">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3151078" role="paragraph" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3151078" role="tablecontent" l10n="U" oldref="39">x == "ABC" or x EQ "ABC"</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150162" role="paragraph" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150162" role="tablecontent" l10n="U" oldref="40">Checks if variable "x" contains (true) the "ABC" string, or not (false).</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153301" role="paragraph" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156120" role="paragraph" l10n="U" oldref="90">or</paragraph>
- <paragraph xml-lang="en-US" id="par_id3156133" role="paragraph" l10n="U" oldref="42">!x or NOT x</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153301" role="tablecontent" l10n="U" oldref="41">x == "" or x EQ ""</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156120" role="tablecontent" l10n="U" oldref="90">or</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156133" role="tablecontent" l10n="U" oldref="42">!x or NOT x</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156112" role="paragraph" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156112" role="tablecontent" l10n="U" oldref="44">Checks if the variable "x" contains an empty string.</paragraph>
</tablecell>
</tablerow>
</table>
@@ -163,135 +163,135 @@
<paragraph xml-lang="en-US" id="par_id3150097" role="note" l10n="CHG" oldref="45">The "equal" comparative operator must be represented by two equal signs (==) in a condition. For example, if you define a variable "x" with the value of 1, you can enter the condition as x==1.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3148791" role="heading" level="2" l10n="U"
oldref="95">User Data</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph>Tools - Options - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150028" role="paragraph" l10n="U" oldref="96">You can include user data when you define conditions. To change your user data, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - $[officename] - User data</emph>. User data must be entered in the form of strings. You can query the user data with "==" (EQ), "!=" (NEQ), or "!"(NOT).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153124" role="paragraph" l10n="U" oldref="97">The following table lists user data variables and their meanings:</paragraph>
<table id="tbl_id3153139">
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149632" role="paragraph" l10n="U" oldref="130">Variable</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149632" role="tablehead" l10n="U" oldref="130">Variable</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150662" role="paragraph" l10n="U" oldref="131">Meaning</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150662" role="tablehead" l10n="U" oldref="131">Meaning</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154026" role="paragraph" l10n="U" oldref="98">user_firstname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154026" role="tablecontent" l10n="U" oldref="98">user_firstname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149953" role="paragraph" l10n="U" oldref="99">First name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149953" role="tablecontent" l10n="U" oldref="99">First name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3147272" role="paragraph" l10n="U" oldref="100">user_lastname</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3147272" role="tablecontent" l10n="U" oldref="100">user_lastname</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149601" role="paragraph" l10n="U" oldref="101">Last name</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149601" role="tablecontent" l10n="U" oldref="101">Last name</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150770" role="paragraph" l10n="U" oldref="102">user_initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150770" role="tablecontent" l10n="U" oldref="102">user_initials</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155529" role="paragraph" l10n="U" oldref="103">Initials</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155529" role="tablecontent" l10n="U" oldref="103">Initials</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148705" role="paragraph" l10n="U" oldref="104">user_company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148705" role="tablecontent" l10n="U" oldref="104">user_company</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148728" role="paragraph" l10n="U" oldref="105">Company</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148728" role="tablecontent" l10n="U" oldref="105">Company</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155361" role="paragraph" l10n="U" oldref="106">user_street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155361" role="tablecontent" l10n="U" oldref="106">user_street</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154222" role="paragraph" l10n="U" oldref="107">Street</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154222" role="tablecontent" l10n="U" oldref="107">Street</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145108" role="paragraph" l10n="U" oldref="108">user_country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145108" role="tablecontent" l10n="U" oldref="108">user_country</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3146885" role="paragraph" l10n="U" oldref="109">Country</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146885" role="tablecontent" l10n="U" oldref="109">Country</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3149580" role="paragraph" l10n="U" oldref="110">user_zipcode</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149580" role="tablecontent" l10n="U" oldref="110">user_zipcode</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156241" role="paragraph" l10n="U" oldref="111">Zip code</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156241" role="tablecontent" l10n="U" oldref="111">Zip code</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148922" role="paragraph" l10n="U" oldref="112">user_city</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148922" role="tablecontent" l10n="U" oldref="112">user_city</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3148945" role="paragraph" l10n="U" oldref="113">City</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3148945" role="tablecontent" l10n="U" oldref="113">City</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156053" role="paragraph" l10n="U" oldref="114">user_title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156053" role="tablecontent" l10n="U" oldref="114">user_title</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3159219" role="paragraph" l10n="U" oldref="115">Title</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3159219" role="tablecontent" l10n="U" oldref="115">Title</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3156435" role="paragraph" l10n="U" oldref="116">user_position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156435" role="tablecontent" l10n="U" oldref="116">user_position</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145178" role="paragraph" l10n="U" oldref="117">Position</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145178" role="tablecontent" l10n="U" oldref="117">Position</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150797" role="paragraph" l10n="U" oldref="118">user_tel_work</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150797" role="tablecontent" l10n="U" oldref="118">user_tel_work</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150820" role="paragraph" l10n="U" oldref="119">Business telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150820" role="tablecontent" l10n="U" oldref="119">Business telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150894" role="paragraph" l10n="U" oldref="120">user_tel_home</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150894" role="tablecontent" l10n="U" oldref="120">user_tel_home</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3155320" role="paragraph" l10n="U" oldref="121">Home telephone number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3155320" role="tablecontent" l10n="U" oldref="121">Home telephone number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154400" role="paragraph" l10n="U" oldref="122">user_fax</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154400" role="tablecontent" l10n="U" oldref="122">user_fax</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153363" role="paragraph" l10n="U" oldref="123">Fax number</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153363" role="tablecontent" l10n="U" oldref="123">Fax number</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3153390" role="paragraph" l10n="U" oldref="124">user_email</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153390" role="tablecontent" l10n="U" oldref="124">user_email</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3154948" role="paragraph" l10n="U" oldref="125">E-mail address</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3154948" role="tablecontent" l10n="U" oldref="125">E-mail address</paragraph>
</tablecell>
</tablerow>
<tablerow>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3145603" role="paragraph" l10n="U" oldref="126">user_state</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3145603" role="tablecontent" l10n="U" oldref="126">user_state</paragraph>
</tablecell>
<tablecell>
- <paragraph xml-lang="en-US" id="par_id3150129" role="paragraph" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150129" role="tablecontent" l10n="U" oldref="127">State (not in all $[officename] versions)</paragraph>
</tablecell>
</tablerow>
</table>
@@ -351,13 +351,14 @@
<paragraph xml-lang="en-US" id="par_id3159247" role="note" l10n="U" oldref="53">Note the difference between the boolean NOT "!" and the comparative operator not equal "!=" (NEQ).</paragraph>
<paragraph xml-lang="en-US" id="par_id3153876" role="paragraph" l10n="CHG" oldref="54">When you refer to a database field in a condition, use the form Databasename.Tablename.Fieldname. If one of the names contains a character that is an operator, such as a minus sign (-), enclose the name in square brackets, for example, Databasename.[Table-name].Fieldname. Never use spaces inside field names.<comment>UFI: fixes bug #i25781# - but see #i25983#. Fixes also #i19571#</comment></paragraph>
- <paragraph xml-lang="en-US" id="par_id3153891" role="paragraph" l10n="U" oldref="55">Example: Hiding an Empty Database Field</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153891" role="heading" level="3" l10n="U"
+ oldref="55">Example: Hiding an Empty Database Field</paragraph>
<paragraph xml-lang="en-US" id="par_id3150051" role="paragraph" l10n="U" oldref="56">You may want to create a condition that hides an empty field, for example, if the COMPANY field is empty for some of the data records.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150067" role="paragraph" l10n="CHG" oldref="57">Select the <emph>Hidden Paragraph</emph> list entry, and type the following condition: Addressbook.Addresses.Company EQ ""</paragraph>
<paragraph xml-lang="en-US" id="par_id3147110" role="paragraph" l10n="U" oldref="150">or type the following</paragraph>
<paragraph xml-lang="en-US" id="par_id3147123" role="paragraph" l10n="U" oldref="151">NOT Addressbook.Addresses.Company</paragraph>
<paragraph xml-lang="en-US" id="par_id3147136" role="paragraph" l10n="U" oldref="152">If the COMPANY database field is empty, the condition is true and the paragraph is hidden.</paragraph>
- <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3150232" role="note" l10n="CHG" oldref="58">To display hidden paragraphs on the screen, you can choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and clear the <emph>Fields: Hidden paragraphs</emph> check box.</paragraph>
<paragraph xml-lang="en-US" id="hd_id3145218" role="heading" level="2" l10n="U"
oldref="59">Examples of Conditions in Fields</paragraph>
<paragraph xml-lang="en-US" id="par_id3145231" role="paragraph" l10n="U" oldref="60">The following examples use the Conditional text field, although they can be applied to any fields that can be linked to a condition. The syntax used for conditions is also used for the Hidden text, Hidden paragraph, Any record or Next record fields.</paragraph>
@@ -466,4 +467,4 @@
</listitem>
</list>
</body>
-</helpdocument> \ No newline at end of file
+</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04120211.xhp b/helpcontent2/source/text/swriter/01/04120211.xhp
index 2415e5a5b1..e409380deb 100755
--- a/helpcontent2/source/text/swriter/01/04120211.xhp
+++ b/helpcontent2/source/text/swriter/01/04120211.xhp
@@ -64,7 +64,7 @@
<paragraph xml-lang="en-US" id="par_id3153532" role="paragraph" l10n="U" oldref="8"><ahelp hid="SW:EDIT:TP_TOX_SELECT:ED_TITLE">Enter a title for the selected index.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY" id="bm_id3154477" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3151317" role="heading" level="3" l10n="U" oldref="9">Protected against manual changes</paragraph>
- <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3153665" role="paragraph" l10n="U" oldref="10"><ahelp hid="SW:CHECKBOX:TP_TOX_SELECT:CB_READONLY">Prevents the contents of the index from being changed.</ahelp> Manual changes that you make to an index are lost when the index is refreshed. If you want the cursor to scroll through a protected area, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Formatting Aids</emph>, and then select the <emph>Cursor in protected areas - Enabled </emph>check box.</paragraph>
</section>
<section id="verzfuer">
<bookmark xml-lang="en-US" branch="hid/SW:LISTBOX:TP_TOX_SELECT:LB_AREA" id="bm_id3155904" localize="false"/>
diff --git a/helpcontent2/source/text/swriter/01/04130100.xhp b/helpcontent2/source/text/swriter/01/04130100.xhp
index 25bd7255e4..1505a3c650 100755
--- a/helpcontent2/source/text/swriter/01/04130100.xhp
+++ b/helpcontent2/source/text/swriter/01/04130100.xhp
@@ -50,7 +50,7 @@
<paragraph role="paragraph" id="par_id3145248" xml-lang="en-US" l10n="U" oldref="2">You can resize and move selected frames and objects with the keyboard.</paragraph>
<paragraph role="paragraph" id="par_id3148771" xml-lang="en-US" l10n="U" oldref="4">To move a selected frame or object, press an arrow key. To move by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
<paragraph role="paragraph" id="par_id3150762" xml-lang="en-US" l10n="U" oldref="5">To resize a selected frame or object, first press Ctrl+Tab. Now one of the handles blinks to show that it is selected. To select another handle, press Ctrl+Tab again. Press an arrow key to resize the object by one grid unit. To resize by one pixel, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline>, and then press an arrow key.</paragraph>
-<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <link href="text/shared/optionen/01050100.xhp" name="Tools - Options - Text document - Grid"><emph>Tools - Options - %PRODUCTNAME Writer - Grid</emph></link>.</paragraph>
+<paragraph role="paragraph" id="par_id3149294" xml-lang="en-US" l10n="U" oldref="6">The increment by which you move an object with the keyboard is determined by the document grid. To change the properties of the document grid, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01050100.xhp" name="Text document - Grid">%PRODUCTNAME Writer - Grid</link></emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
</body>
diff --git a/helpcontent2/source/text/swriter/01/04150000.xhp b/helpcontent2/source/text/swriter/01/04150000.xhp
index 41b0d556a2..a6124cf2f0 100644
--- a/helpcontent2/source/text/swriter/01/04150000.xhp
+++ b/helpcontent2/source/text/swriter/01/04150000.xhp
@@ -65,7 +65,7 @@ dedr: reviewed</lastedited>
<paragraph role="paragraph" id="par_idN10642" xml-lang="en-US" l10n="NEW">To insert a table into a table, click in a cell in the table and choose <emph>Table - Insert - Table</emph>.</paragraph>
</listitem>
</list>
-<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph>Tools - Options - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
+<paragraph role="paragraph" id="par_id3154638" xml-lang="en-US" l10n="CHG" oldref="50">$[officename] can automatically format numbers that you enter in a table cell, for example, dates and times. To activate this feature, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer - Table</emph> and click the<emph> Number recognition </emph>check box in the <emph>Input in tables</emph> area.</paragraph>
<embed href="text/swriter/guide/calculate_intext2.xhp#calculate_intext2"/>
<bookmark xml-lang="en-US" branch="hid/SW:EDIT:DLG_INSERT_TABLE:ED_NAME" id="bm_id3147514" localize="false"/>
<paragraph role="heading" id="hd_id3145419" xml-lang="en-US" level="2" l10n="U" oldref="4">Name</paragraph>
@@ -107,6 +107,6 @@ dedr: reviewed</lastedited>
<embed href="text/swriter/guide/keyboard.xhp#keyboard"/>
<embed href="text/shared/guide/border_table.xhp#border_table"/>
<paragraph role="paragraph" id="par_id3155912" xml-lang="en-US" l10n="U" oldref="52"><link href="text/swriter/01/05090300.xhp" name="Format - Table - Text Flow">Table - Table Properties - Text Flow</link></paragraph>
-<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Writer - Table">Tools - Options - %PRODUCTNAME Writer - Table</link></paragraph>
+<paragraph role="paragraph" id="par_id3150688" xml-lang="en-US" l10n="U" oldref="53"><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Writer - Table">%PRODUCTNAME Writer - Table</link></paragraph>
</body>
</helpdocument>
diff --git a/helpcontent2/source/text/swriter/01/04200000.xhp b/helpcontent2/source/text/swriter/01/04200000.xhp
index 14b8304229..82048fd494 100644
--- a/helpcontent2/source/text/swriter/01/04200000.xhp
+++ b/helpcontent2/source/text/swriter/01/04200000.xhp
@@ -50,7 +50,7 @@
<section id="howtoget">
<embed href="text/swriter/00/00000404.xhp#einfscript"/>
</section>
- <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph>Tools - Options - %PRODUCTNAME Writer/Web - </emph><link href="text/shared/optionen/01040200.xhp" name="View"><emph>View</emph></link>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3149880" role="paragraph" l10n="CHG" oldref="4">An inserted script is indicated by a small green rectangle. If you do not see the rectangle, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME Writer/Web - <link href="text/shared/optionen/01040200.xhp" name="View">View</link></emph>, and select the <emph>Comments</emph> check box. To edit a script, double-click the green rectangle.</paragraph>
<paragraph xml-lang="en-US" id="par_id3150572" role="paragraph" l10n="U" oldref="5">If your document contains more than one script, the <emph>Edit Script</emph> dialog contains previous and next buttons to jump from script to script.</paragraph>
<bookmark xml-lang="en-US" branch="hid/SW:IMAGEBUTTON:DLG_JAVAEDIT:BTN_PREV" id="bm_id3149710" localize="false"/>
<paragraph xml-lang="en-US" id="par_id0903200802541668" role="paragraph" l10n="NEW"><ahelp hid="." visibility="hidden">Jump to Previous Script.</ahelp></paragraph>
diff --git a/helpcontent2/source/text/swriter/01/05040800.xhp b/helpcontent2/source/text/swriter/01/05040800.xhp
index bf75bf9aaa..15c0aa7e57 100755
--- a/helpcontent2/source/text/swriter/01/05040800.xhp
+++ b/helpcontent2/source/text/swriter/01/05040800.xhp
@@ -39,17 +39,13 @@
<title id="tit" xml-lang="en-US">Text Grid</title>
<filename>/text/swriter/01/05040800.xhp</filename>
</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2006-02-07T10:22:55">converted from old format - fpe</lastedited>
-</history>
</meta>
<body>
<section id="textraster">
<bookmark xml-lang="en-US" branch="index" id="bm_id3150760"><bookmark_value>text grid for Asian layout</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3150760" xml-lang="en-US" level="1" l10n="U" oldref="18"><link href="text/swriter/01/05040800.xhp" name="Text Grid">Text Grid</link></paragraph>
-<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Tools - Options - Language Settings - Languages</emph>.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3151171" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid=".">Adds a text grid to the current page style. This option is only available if Asian language support is enabled under <emph>Language Settings - Languages</emph> in the Options dialog box.</ahelp></paragraph>
</section>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
<section id="howtoget">
diff --git a/helpcontent2/source/text/swriter/01/05090201.xhp b/helpcontent2/source/text/swriter/01/05090201.xhp
index dbf511c3ae..d09e8ad9b8 100644
--- a/helpcontent2/source/text/swriter/01/05090201.xhp
+++ b/helpcontent2/source/text/swriter/01/05090201.xhp
@@ -78,7 +78,7 @@
<paragraph role="listitem" id="par_id3153531" xml-lang="en-US" l10n="U" oldref="15">To delete a row, place the cursor in the row that you want to delete, hold down <switchinline select="sys"><caseinline select="MAC">Option</caseinline><defaultinline>Alt</defaultinline></switchinline> and press Delete, release, and then press the up or the down arrow.</paragraph>
</listitem>
</list>
-<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <link href="text/shared/optionen/01040500.xhp" name="Tools - Options - Text Document - Table"><emph>Tools - Options - %PRODUCTNAME Writer - Table</emph></link>.</paragraph>
+<paragraph role="note" id="par_id3150983" xml-lang="en-US" l10n="U" oldref="10">To change the behavior of tables in a text document, choose <emph><switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - <link href="text/shared/optionen/01040500.xhp" name="Text Document - Table">%PRODUCTNAME Writer - Table</link></emph>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>
<paragraph role="paragraph" id="par_id3154196" xml-lang="en-US" l10n="CHG" oldref="16"><link href="text/swriter/main0204.xhp" name="Table Bar">Table Bar</link></paragraph>
</body>
diff --git a/helpcontent2/source/text/swriter/01/06030000.xhp b/helpcontent2/source/text/swriter/01/06030000.xhp
index 47259a6a3d..398ddbb768 100644
--- a/helpcontent2/source/text/swriter/01/06030000.xhp
+++ b/helpcontent2/source/text/swriter/01/06030000.xhp
@@ -67,13 +67,13 @@
<paragraph role="listitem" id="par_id3150017" xml-lang="en-US" l10n="U" oldref="38">To reject the suggestion, click <emph>Remove</emph>.</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 <link href="text/shared/optionen/01010400.xhp" name="Tools - Options - Language Settings - Writing Aids">Tools - Options - Language Settings - Writing Aids</link>, and select the <emph>Hyphenate without inquiry</emph> check box.</paragraph>
+<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
</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
</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 <link href="text/shared/optionen/01040600.xhp" name="Tools - Options - Text Document - Formatting Aids"><emph>Tools - Options - %PRODUCTNAME Writer - Formatting Aids</emph></link>, and then clear the <emph>Custom hyphens</emph> check box.</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>
<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXDLG_HYPHENATE:ED_WORD" id="bm_id3155903" localize="false"/>
<paragraph role="heading" id="hd_id3153676" xml-lang="en-US" level="3" l10n="U" oldref="21">Word</paragraph>
diff --git a/helpcontent2/source/text/swriter/01/mailmerge00.xhp b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
index 0b2f4eff8d..2f9ee0a09f 100755
--- a/helpcontent2/source/text/swriter/01/mailmerge00.xhp
+++ b/helpcontent2/source/text/swriter/01/mailmerge00.xhp
@@ -47,9 +47,8 @@
<bookmark xml-lang="en-US" branch="hid/20367" id="bm_id4642780" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_MAILMERGE_WIZARD" id="bm_id6627657" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/.uno:MailMergeWizard" id="bm_id5430463" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DSBFormLetter" id="bm_id5004119" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/FN_QRY_MERGE" id="bm_id9926450" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:MergeDialog" id="bm_id9926450" localize="false"/><comment>UFI: inserted help ids</comment><comment>UFI: moved DSBFormLetter ID to shared/main0212</comment><paragraph role="heading" id="par_idN10549" xml-lang="en-US" level="1" l10n="NEW"><link href="text/swriter/01/mailmerge00.xhp">Mail Merge Wizard</link></paragraph>
<paragraph role="paragraph" id="par_idN10559" xml-lang="en-US" l10n="CHG"><ahelp hid=".">Starts the Mail Merge Wizard to create form letters or send e-mail messages to many recipients.</ahelp></paragraph>
</section>
<section id="howtoget">