summaryrefslogtreecommitdiff
path: root/helpcontent2/source/text/shared/00/00000406.xhp
diff options
context:
space:
mode:
Diffstat (limited to 'helpcontent2/source/text/shared/00/00000406.xhp')
-rw-r--r--helpcontent2/source/text/shared/00/00000406.xhp31
1 files changed, 28 insertions, 3 deletions
diff --git a/helpcontent2/source/text/shared/00/00000406.xhp b/helpcontent2/source/text/shared/00/00000406.xhp
index 1416163299..bd190df209 100644
--- a/helpcontent2/source/text/shared/00/00000406.xhp
+++ b/helpcontent2/source/text/shared/00/00000406.xhp
@@ -49,7 +49,11 @@
<tablerow>
<tablecell>
<paragraph role="paragraph" id="par_id3153323" xml-lang="en-US" l10n="E">
+<<<<<<< .working
+<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.2228in" height="0.2228in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+=======
<image id="img_id3154894" src="res/commandimagelist/sc_gallery.png" width="0.1665in" height="0.1665in"><alt id="alt_id3154894" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
+>>>>>>> .merge-right.r265757
</image></paragraph>
</tablecell>
<tablecell>
@@ -75,8 +79,13 @@
<image id="img_id3153665" src="res/commandimagelist/sc_spelling.png" width="0.2228in" height="0.2228in"><alt id="alt_id3153665" xml-lang="en-US">{ENTER ALTERNATE DESCRIPTION HERE}</alt>
</image></paragraph>
</tablecell>
+<<<<<<< .working
+<tablecell>
+<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spellcheck</paragraph>
+=======
<tablecell>
<paragraph role="paragraph" id="par_id3157809" xml-lang="en-US" l10n="U" oldref="4">Spelling and Grammar</paragraph>
+>>>>>>> .merge-right.r265757
</tablecell>
</tablerow>
</table>
@@ -104,8 +113,12 @@
</section>
<paragraph role="paragraph" id="par_idN107E9" xml-lang="en-US" l10n="NEW"><variable id="mediaplayer">Choose <emph>Tools - Media Player</emph>
</variable></paragraph>
+<<<<<<< .working
+<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press Alt+F11 (if not assigned by your system)
+=======
<paragraph role="paragraph" id="par_id3151385" xml-lang="en-US" l10n="CHG" oldref="13"><variable id="makro">Choose <emph>Tools - Macros - Organize Macros - %PRODUCTNAME Basic</emph>, or press <switchinline select="sys"><caseinline select="MAC">Option
</caseinline><defaultinline>Alt</defaultinline></switchinline>+F11 (if not assigned by your system)
+>>>>>>> .merge-right.r265757
</variable></paragraph>
<section id="recordmacro">
<paragraph role="paragraph" id="par_id3149456" xml-lang="en-US" l10n="U" oldref="155">Choose <emph>Tools - Macros - Record Macro</emph>
@@ -138,22 +151,33 @@
<paragraph role="paragraph" id="par_id3144432" xml-lang="en-US" l10n="CHG" oldref="22"><variable id="events">Choose <emph>Tools - Customize - Events</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3157895" xml-lang="en-US" l10n="U" oldref="50"><variable id="autokorr">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153768" xml-lang="en-US" l10n="U" oldref="51"><variable id="autokooptionen">Choose <emph>Tools - AutoCorrect</emph>
+<<<<<<< .working
+<emph> Options</emph>
+<emph>- Options</emph> tab
+=======
<emph>- Options</emph>tab
+>>>>>>> .merge-right.r265757
</variable></paragraph>
-<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose Tools - AutoCorrect- Smart Tags tab
+<paragraph role="paragraph" id="par_id1978514" xml-lang="en-US" l10n="NEW"><variable id="autokosmarttags">Choose <emph>Tools - AutoCorrect Options- Smart Tags</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155368" xml-lang="en-US" l10n="U" oldref="52"><variable id="autokoersetzung">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Replace</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3155860" xml-lang="en-US" l10n="U" oldref="53"><variable id="autokoausnahmen">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Exceptions</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3153094" xml-lang="en-US" l10n="U" oldref="58"><variable id="autokotyafz">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
<emph>- Custom Quotes</emph> tab
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect - Word Completion</emph> tab
+<paragraph role="paragraph" id="par_id3153945" xml-lang="en-US" l10n="U" oldref="114"><variable id="autokoworterg">Choose <emph>Tools - AutoCorrect</emph>
+<emph> Options</emph>
+<emph> - Word Completion</emph> tab
</variable></paragraph>
<paragraph role="paragraph" id="par_id3151352" xml-lang="en-US" l10n="U" oldref="80"><variable id="exopas">Choose <emph>Tools - Options - %PRODUCTNAME Calc - View</emph>
</variable></paragraph>
@@ -310,7 +334,8 @@
<paragraph role="paragraph" id="par_id3154903" xml-lang="en-US" l10n="U" oldref="85"><variable id="exopaen">Open a spreadsheet document, choose <emph>Tools - </emph>
<emph>Options - %PRODUCTNAME Calc - Changes</emph>
</variable></paragraph>
-<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress</emph>
+<paragraph role="paragraph" id="par_id3152582" xml-lang="en-US" l10n="U" oldref="140"><variable id="etotall">Open a presentation document, choose <emph>Tools </emph>
+<emph>- Options - %PRODUCTNAME Impress</emph>
</variable></paragraph>
<paragraph role="paragraph" id="par_id3148418" xml-lang="en-US" l10n="CHG" oldref="91"><variable id="etopsonstiges">Open a presentation document, choose <emph>Tools - Options - %PRODUCTNAME Impress/%PRODUCTNAME Draw - General</emph>
</variable></paragraph>