summaryrefslogtreecommitdiff
path: root/helpcontent2/source
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source')
-rw-r--r--helpcontent2/source/text/shared/01/05050000.xhp41
-rw-r--r--helpcontent2/source/text/shared/01/06020000.xhp45
-rw-r--r--helpcontent2/source/text/swriter/01/06030000.xhp37
-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
6 files changed, 95 insertions, 84 deletions
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/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/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"/>