diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-07 16:36:05 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2009-01-07 16:36:05 +0000 |
commit | 0566fe1d60f5e764fea219e11683e8b0dbf498eb (patch) | |
tree | e123f871683b241d3446498f2c63674651ce3611 /helpcontent2/source/text/shared/00/00000406.xhp | |
parent | a0218ff4759f8197fd966af4d0396280f60b0695 (diff) |
CWS-TOOLING: integrate CWS menuchanges
2009-01-07 17:12:18 +0100 mod r265974 : throw out comment tracking accellerator
2009-01-07 16:23:35 +0100 mod r265972 : CWS-TOOLING: rebase CWS menuchanges to trunk@265758 (milestone: DEV300:m38)
2008-12-03 16:21:15 +0100 mod r264798 : menu shortcut fixes
2008-12-03 15:53:23 +0100 mod r264794 : some shortcut changes
2008-12-02 13:35:56 +0100 fredrikh r264696 : i96794
2008-12-01 20:09:07 +0100 fredrikh r264633 : i96768
2008-12-01 20:08:37 +0100 fredrikh r264632 : i96768
2008-12-01 16:40:18 +0100 fredrikh r264619 : i96762
2008-12-01 16:37:37 +0100 fredrikh r264618 : i96762
2008-12-01 16:37:09 +0100 fredrikh r264617 : i96762
2008-12-01 13:14:43 +0100 fredrikh r264595 : i90650
2008-11-28 18:26:38 +0100 fredrikh r264569 : i94758
2008-11-28 18:22:31 +0100 fredrikh r264568 : i94758
2008-11-28 12:46:26 +0100 fredrikh r264541 : i94758
2008-11-26 16:58:51 +0100 fredrikh r264423 : i96625
2008-11-26 16:14:10 +0100 fredrikh r264412 : i96623
2008-11-26 16:13:02 +0100 fredrikh r264410 : i96623
2008-11-25 19:46:42 +0100 fredrikh r264330 : i96359
2008-11-25 13:50:34 +0100 fredrikh r264307 : i96556
2008-11-25 13:49:46 +0100 fredrikh r264306 : i96556
2008-11-25 13:48:32 +0100 fredrikh r264305 : i96556
2008-11-25 13:46:55 +0100 fredrikh r264304 : i96556
2008-11-25 13:45:29 +0100 fredrikh r264303 : i96357
2008-11-25 13:42:11 +0100 fredrikh r264302 : i96556 & i94758
2008-11-25 13:34:54 +0100 fredrikh r264301 : i96556
2008-11-25 13:33:30 +0100 fredrikh r264300 : i96556
2008-11-25 13:32:31 +0100 fredrikh r264299 : i96556
2008-11-25 13:31:57 +0100 fredrikh r264298 : i96556
2008-11-25 13:31:27 +0100 fredrikh r264297 : i96556
2008-11-25 13:30:31 +0100 fredrikh r264295 : i96556
2008-11-25 13:29:29 +0100 fredrikh r264294 : i96556
2008-11-25 13:28:17 +0100 fredrikh r264292 : i96556
2008-11-25 13:27:44 +0100 fredrikh r264290 : i96556
2008-11-25 13:26:54 +0100 fredrikh r264288 : i96556
2008-11-25 13:25:03 +0100 fredrikh r264287 : i96556
2008-11-25 13:21:29 +0100 fredrikh r264286 : i96556
2008-11-19 16:14:07 +0100 fredrikh r264004 : i96359
2008-11-19 14:35:43 +0100 fredrikh r263995 : i96353
2008-11-19 14:05:58 +0100 fredrikh r263991 : i96347
2008-11-19 14:05:36 +0100 fredrikh r263990 : i96347
2008-11-19 14:05:07 +0100 fredrikh r263989 : i96347
2008-11-19 13:11:59 +0100 fredrikh r263983 : i96347
2008-11-19 13:00:09 +0100 fredrikh r263982 : i96347
2008-10-29 14:54:51 +0100 mod r262804 : 94633
2008-10-29 14:54:10 +0100 mod r262803 : #i94633#
2008-10-29 12:58:38 +0100 ufi r262787 : i94958,3rd
2008-10-29 12:42:41 +0100 ufi r262783 : i94958,2nd
2008-10-29 12:00:23 +0100 ufi r262777 : i94958
2008-10-28 23:45:34 +0100 mod r262766 : #i95457#
2008-10-18 19:09:38 +0200 mod r262295 : accelerator change
2008-10-17 15:45:11 +0200 mod r262289 : fix typo
2008-10-15 23:17:04 +0200 mod r262245 : menu fix
2008-10-15 22:58:30 +0200 mod r262244 : fix footnote setting dialog
2008-10-15 22:58:01 +0200 mod r262243 : further changes to menu
2008-10-14 10:27:46 +0200 mod r262195 : new accelerator and menu changes
2008-10-14 10:27:37 +0200 mod r262194 : new accelerator and menu changes
2008-10-07 14:23:26 +0200 mod r262081 : #i79329# #i85158# #i88351#
2008-10-02 10:31:52 +0200 mod r262026 : #i94551#
2008-10-02 10:23:57 +0200 mod r262025 : #i87347#
Diffstat (limited to 'helpcontent2/source/text/shared/00/00000406.xhp')
-rw-r--r-- | helpcontent2/source/text/shared/00/00000406.xhp | 31 |
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> |