diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:16 +0100 |
| commit | bc131c1ceaca2a227d4827f765e83faa0754a3f1 (patch) | |
| tree | d275c8e57d62430153ca6ef21966f5033fd99cd9 /helpcontent2/source/text/shared/05 | |
| parent | d55766ce22ef3ed771938e5ad60f6b776bab38ad (diff) | |
| parent | 13e0998c215eb9419fce0ca6a4fc0d69a18356d5 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
helpcontent2/helpers/hid.lst
helpcontent2/source/text/scalc/01/04050000.xhp
helpcontent2/source/text/scalc/guide/text_rotate.xhp
helpcontent2/source/text/shared/01/04110000.xhp
helpcontent2/source/text/shared/01/06040000.xhp
helpcontent2/source/text/shared/02/01170202.xhp
helpcontent2/source/text/shared/main0108.xhp
helpcontent2/source/text/shared/optionen/01030000.xhp
helpcontent2/source/text/swriter/01/05150101.xhp
helpcontent2/util/target.pmk
Diffstat (limited to 'helpcontent2/source/text/shared/05')
| -rw-r--r-- | helpcontent2/source/text/shared/05/00000110.xhp | 22 | ||||
| -rw-r--r-- | helpcontent2/source/text/shared/05/00000150.xhp | 6 | ||||
| -rw-r--r-- | helpcontent2/source/text/shared/05/00000160.xhp | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/helpcontent2/source/text/shared/05/00000110.xhp b/helpcontent2/source/text/shared/05/00000110.xhp index 0ff57de8c9..2798e48b30 100644 --- a/helpcontent2/source/text/shared/05/00000110.xhp +++ b/helpcontent2/source/text/shared/05/00000110.xhp @@ -38,13 +38,13 @@ </topic> </meta> <body> -<bookmark xml-lang="en-US" branch="hid/SID_HELPONHELP" id="bm_id3706162" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3706162" localize="false"/> <bookmark xml-lang="en-US" branch="hid/.uno:HelpOnHelp" id="bm_id3153244" localize="false"/> <paragraph xml-lang="en-US" id="hd_id3153884" role="heading" level="1" l10n="U" oldref="1"><variable id="00000110"><link href="text/shared/05/00000110.xhp" name="The %PRODUCTNAME Help Window">The <item type="productname">%PRODUCTNAME</item> Help Window</link> </variable></paragraph> <paragraph xml-lang="en-US" id="par_id3156183" role="warning" l10n="CHG" oldref="25">The Help system for all versions of the software is based on the same source files. Some of the functions described in Help may not be included in this particular distribution. Some features specific to a distribution may not be mentioned in this Help.</paragraph> <paragraph xml-lang="en-US" id="par_id3147143" role="paragraph" l10n="U" oldref="2"><ahelp hid=".uno:HelpOnHelp" visibility="hidden">Provides an overview of the Help system</ahelp>The Help window shows the currently selected Help page.</paragraph> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOX" id="bm_id3153114" localize="false"/> <paragraph xml-lang="en-US" id="par_id3159201" role="paragraph" l10n="U" oldref="24"><ahelp hid="HID_HELP_TOOLBOX">The <emph>Toolbar</emph> contains important functions for controlling the Help system</ahelp>:</paragraph> <table id="tbl_id3155555"> <tablerow> @@ -54,7 +54,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_INDEX" id="bm_id3153748" localize="false"/> <paragraph xml-lang="en-US" id="par_id3147089" role="paragraph" l10n="U" oldref="3"><ahelp hid="HID_HELP_TOOLBOXITEM_INDEX">Hides and shows the <emph>navigation pane</emph></ahelp></paragraph> </tablecell> </tablerow> @@ -65,7 +65,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_BACKWARD" id="bm_id3148539" localize="false"/> <paragraph xml-lang="en-US" id="par_id3151111" role="paragraph" l10n="U" oldref="5"><ahelp hid="HID_HELP_TOOLBOXITEM_BACKWARD">Moves back to the <emph>previous</emph> page</ahelp></paragraph> </tablecell> </tablerow> @@ -76,7 +76,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_FORWARD" id="bm_id3154306" localize="false"/> <paragraph xml-lang="en-US" id="par_id3154514" role="paragraph" l10n="U" oldref="6"><ahelp hid="HID_HELP_TOOLBOXITEM_FORWARD">Moves forward to the <emph>next</emph> page</ahelp></paragraph> </tablecell> </tablerow> @@ -87,7 +87,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_START" id="bm_id3153698" localize="false"/> <paragraph xml-lang="en-US" id="par_id3154285" role="paragraph" l10n="U" oldref="4"><ahelp hid="HID_HELP_TOOLBOXITEM_START">Moves to the <emph>first page</emph> of the current Help topic</ahelp></paragraph> </tablecell> </tablerow> @@ -98,7 +98,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_PRINT" id="bm_id3147560" localize="false"/> <paragraph xml-lang="en-US" id="par_id3148563" role="paragraph" l10n="U" oldref="7"><ahelp hid="HID_HELP_TOOLBOXITEM_PRINT"><emph>Prints</emph> the current page</ahelp></paragraph> </tablecell> </tablerow> @@ -109,7 +109,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS" id="bm_id3150791" localize="false"/> <paragraph xml-lang="en-US" id="par_id3154939" role="paragraph" l10n="U" oldref="18"><ahelp hid="HID_HELP_TOOLBOXITEM_BOOKMARKS">Adds this page to your bookmarks</ahelp></paragraph> </tablecell> </tablerow> @@ -120,7 +120,7 @@ </image></paragraph> </tablecell> <tablecell> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG" id="bm_id5442670" localize="false"/> <paragraph xml-lang="en-US" id="par_idN108FE" role="paragraph" l10n="NEW"><ahelp hid="HID_HELP_TOOLBOXITEM_SEARCHDIALOG">Opens the <emph>Find on this page</emph> dialog.</ahelp></paragraph> </tablecell> </tablerow> @@ -170,9 +170,9 @@ <bookmark xml-lang="en-US" branch="hid/sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" id="bm_id5264137" localize="false"/> <paragraph xml-lang="en-US" id="par_idN109F5" role="paragraph" l10n="NEW"><ahelp hid="sfx2:PushButton:RID_DLG_SEARCH:PB_FIND" visibility="hidden">Finds the next occurrence of the search term.</ahelp></paragraph> <paragraph xml-lang="en-US" id="hd_id3149202" role="heading" level="2" l10n="U" oldref="8">Navigation Pane</paragraph> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TABCONTROL" id="bm_id3147229" localize="false"/> <paragraph xml-lang="en-US" id="par_id3148673" role="paragraph" l10n="U" oldref="9"><ahelp hid="HID_HELP_TABCONTROL">The navigation pane of the Help window contains the tab pages <emph>Contents</emph>, <emph>Index</emph>, <emph>Find</emph> and <emph>Bookmarks</emph>.</ahelp></paragraph> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_LISTBOX" id="bm_id3145421" localize="false"/> <paragraph xml-lang="en-US" id="par_id3159149" role="paragraph" l10n="U" oldref="19"><ahelp hid="HID_HELP_LISTBOX">The list box located at the very top is where you can select other <item type="productname">%PRODUCTNAME</item> Help modules.</ahelp> The <emph>Index</emph> and <emph>Find</emph> tab pages only contain the data for the selected <item type="productname">%PRODUCTNAME</item> module.</paragraph> <table id="tbl_id3144434"> <tablerow> diff --git a/helpcontent2/source/text/shared/05/00000150.xhp b/helpcontent2/source/text/shared/05/00000150.xhp index 8ddf83ac90..0a5db7b7c1 100644 --- a/helpcontent2/source/text/shared/05/00000150.xhp +++ b/helpcontent2/source/text/shared/05/00000150.xhp @@ -67,13 +67,13 @@ <paragraph role="paragraph" id="par_id3145382" l10n="U" xml-lang="en-US" oldref="6">The following commands are on the context menu of a bookmark:</paragraph> <list type="unordered"> <listitem> - <bookmark branch="hid/HID_HELP_BOOKMARKS_OPEN" xml-lang="en-US" id="bm_id3152909"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3147573" oldref="7"><emph>Display</emph> - <ahelp hid="HID_HELP_BOOKMARKS_OPEN" visibility="visible">displays the selected help subject</ahelp>.</paragraph> + <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_OPEN" xml-lang="en-US" id="bm_id3152909"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3147573" oldref="7"><emph>Display</emph> - <ahelp hid="HID_HELP_BOOKMARKS_OPEN" visibility="visible">displays the selected help subject</ahelp>.</paragraph> </listitem> <listitem> - <bookmark branch="hid/HID_HELP_BOOKMARKS_RENAME" xml-lang="en-US" id="bm_id3154380"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3150771" oldref="8"><emph>Rename</emph> - <ahelp hid="HID_HELP_BOOKMARKS_RENAME" visibility="visible">opens a dialog for entering another name for the bookmark</ahelp>.</paragraph> + <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_RENAME" xml-lang="en-US" id="bm_id3154380"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3150771" oldref="8"><emph>Rename</emph> - <ahelp hid="HID_HELP_BOOKMARKS_RENAME" visibility="visible">opens a dialog for entering another name for the bookmark</ahelp>.</paragraph> </listitem> <listitem> - <bookmark branch="hid/HID_HELP_BOOKMARKS_DELETE" xml-lang="en-US" id="bm_id3153665"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3153087" oldref="9"><emph>Delete</emph> - <ahelp hid="HID_HELP_BOOKMARKS_DELETE" visibility="visible">deletes the bookmark selected </ahelp>.</paragraph> + <bookmark branch="hid/SFX2_HID_HELP_BOOKMARKS_DELETE" xml-lang="en-US" id="bm_id3153665"/><paragraph l10n="U" xml-lang="en-US" role="listitem" id="par_id3153087" oldref="9"><emph>Delete</emph> - <ahelp hid="HID_HELP_BOOKMARKS_DELETE" visibility="visible">deletes the bookmark selected </ahelp>.</paragraph> </listitem> </list> <section id="relatedtopics"> diff --git a/helpcontent2/source/text/shared/05/00000160.xhp b/helpcontent2/source/text/shared/05/00000160.xhp index 88dd0a41a4..019439bab3 100644 --- a/helpcontent2/source/text/shared/05/00000160.xhp +++ b/helpcontent2/source/text/shared/05/00000160.xhp @@ -46,7 +46,7 @@ <bookmark_value>tree view of Help</bookmark_value> </bookmark> <paragraph role="paragraph" id="par_id3147090" xml-lang="en-US" l10n="E" oldref="1" localize="false"/> -<bookmark xml-lang="en-US" branch="hid/HID_HELP_TABPAGE_CONTENTS" id="bm_id3155354" localize="false"/> +<bookmark xml-lang="en-US" branch="hid/SFX2_HID_HELP_TABPAGE_CONTENTS" id="bm_id3155354" localize="false"/> <paragraph role="heading" id="hd_id3146856" xml-lang="en-US" level="1" l10n="U" oldref="2"><variable id="doc_title"><link href="text/shared/05/00000160.xhp" name="Contents - The Main Help Topics">Contents - The Main Help Topics</link> </variable></paragraph> <paragraph role="paragraph" id="par_id3147000" xml-lang="en-US" l10n="U" oldref="3"><ahelp hid="HID_HELP_TABPAGE_CONTENTS">Displays the main help themes, arranged in a similar way to folders in a file manager.</ahelp></paragraph> |