tdf#149301 Update Navigator terminology

+ Refactor, simplification of <switch>
+ Removed duplicated hid bookmark for Contents
+ Update icons and <alt> text
+ added some of the comments of tdf#178755

Change-Id: Ifaba80d212828e47d99275a9b0a1681eb3bc3430
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136105
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

2 files changed, 22 insertions, 20 deletions

diff --git a/source/text/swriter/01/02110000.xhp b/source/text/swriter/01/02110000.xhp
index 0cc884faf7..ce0153ae9b 100644
--- a/source/text/swriter/01/02110000.xhp
+++ b/source/text/swriter/01/02110000.xhp
@@ -39,9 +39,11 @@
 <embed href="text/shared/00/edit_menu.xhp#navigator"/>
 </section>
 <paragraph id="par_id3154475" role="paragraph" xml-lang="en-US">To open the Navigator, choose <menuitem>View - Navigator</menuitem> (<keycode>F5</keycode>). To move the Navigator, drag its title bar. To dock the Navigator, drag its title bar to the left, right or bottom edge of the workspace. To undock the Navigator, hold down the <switchinline select="sys"><caseinline select="MAC"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> key and double-click on a grey area of the Navigator.</paragraph>
-<paragraph id="par_id3149490" role="paragraph" xml-lang="en-US">Click the plus sign (<widget>+</widget>) (or arrow) next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
+<paragraph id="par_id3149490" role="paragraph" xml-lang="en-US">Click the expander icon next to a category in the Navigator to view the items in the category. To view the number of items in a category, rest your mouse pointer over the category in the Navigator. To jump to an item in the document, double-click the item in the Navigator.</paragraph>
 <paragraph id="par_id3149106" role="paragraph" xml-lang="en-US">To jump to the next or previous item in a document, use the <emph>Navigate by</emph> box to select the item category, and then click the up or down arrows.</paragraph>
 
+<paragraph role="paragraph" id="par_id571655653825780">The navigator shows what corresponds to the editing location in the navigator view. This can be according to different categories: Headings, Tables, Hyperlinks and so on. When the "Content Navigation View" button is pressed and headings are selected, the heading belonging to the current editing position is displayed and highlighted in the Navigator. When tables are selected, the associated table is displayed, and so on. If the element is located in a collapsed layer, the required layers above it are automatically expanded and remain expanded afterwards.</paragraph>
+
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/contenttoggle" id="bm_id3155911" localize="false"/>
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/globaltoggle" id="bm_id3155912" localize="false"/>
 
@@ -52,12 +54,12 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/back" id="bm_id3148779" localize="false"/>
 
 <h2 id="hd_id3150096">Previous</h2>
-<paragraph id="par_id3148784" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigation</emph> icon, and then click an item category - for example, "Images".</ahelp> Jump to the previous item in the document, as specified in <emph>Navigate By</emph>.</paragraph>
+<paragraph id="par_id3148784" role="paragraph" xml-lang="en-US">Jumps to the previous item in the document. To specify the type of item to jump to, click the <emph>Navigate By</emph> list, and then click an item category - for example, "Images".</paragraph>
 
 <table id="tbl_id3150044">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3154616" role="paragraph" xml-lang="en-US"> <image id="img_id3154622" src="cmd/sc_upsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154622">Icon Previous Object</alt></image></paragraph>
+      <paragraph id="par_id3154616" role="paragraph" xml-lang="en-US"> <image id="img_id3154622" src="cmd/lc_upsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154622">Icon Previous Object</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3150659" role="paragraph" xml-lang="en-US">Previous Item</paragraph>
@@ -68,12 +70,12 @@
 <bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/navigatorpanel/forward" id="bm_id3154022" localize="false"/>
 
 <h2 id="hd_id3150675">Next</h2>
-<paragraph id="par_id3154028" role="paragraph" xml-lang="en-US"><ahelp hid="." visibility="hidden">Jumps to the next item in the document. To specify the type of item to jump to, click the <link href="text/swriter/01/02110100.xhp" name="Navigation"><emph>Navigation</emph></link> icon, and then click an item category - for example, "Images".</ahelp> Jump to the next item in the document, as specified in <emph>Navigate By</emph>.</paragraph>
+<paragraph id="par_id3154028" role="paragraph" xml-lang="en-US">Jumps to the next item in the document. To specify the type of item to jump to, click the <emph>Navigate By</emph> list, and then click an item category - for example, "Images".</paragraph>
 
 <table id="tbl_id3149971">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3150767" role="paragraph" xml-lang="en-US"> <image id="img_id3150773" src="cmd/sc_downsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150773">Icon Next Object</alt></image></paragraph>
+      <paragraph id="par_id3150767" role="paragraph" xml-lang="en-US"> <image id="img_id3150773" src="cmd/lc_downsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150773">Icon Next Object</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3155359" role="paragraph" xml-lang="en-US">Next Item</paragraph>
@@ -85,16 +87,16 @@
 <h2 id="hd_id3148715">Page number</h2>
 <paragraph id="par_id3155548" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/navigatorpanel/numericfield">Type the number of the page that you want to jump to, and then press Enter. Use the spin buttons to navigate.</ahelp></paragraph>
 
-<h2 id="hd_id3146891">Content View</h2>
+<h2 id="hd_id3146891">Content Navigation View</h2>
 <paragraph id="par_id3145596" role="paragraph" xml-lang="en-US"><ahelp hid="modules/swriter/ui/navigatorpanel/root">Switches between the display of all categories in the Navigator and the selected category.</ahelp></paragraph>
 <paragraph id="par_id471603110016087" role="paragraph">Context menus use a selection of commands found on this help page. The commands in a context menu change, depending on which category or item is selected.</paragraph>
 <table id="tbl_id3145616">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3154133" role="paragraph" xml-lang="en-US"> <image id="img_id3154140" src="sw/res/sc20244.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154140">Icon Switch Content View</alt></image></paragraph>
+      <paragraph id="par_id3154133" role="paragraph" xml-lang="en-US"> <image id="img_id3154140" src="sw/res/sc20244.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3154140">Icon Switch Content Navigation View</alt></image></paragraph>
     </tablecell>
     <tablecell>
-      <paragraph id="par_id3156067" role="paragraph" xml-lang="en-US">Switch Content View</paragraph>
+      <paragraph id="par_id3156067" role="paragraph" xml-lang="en-US">Switch Content Navigation View</paragraph>
     </tablecell>
   </tablerow>
 </table>
@@ -113,7 +115,7 @@
       </tablerow>
       <tablerow>
       <tablecell>
-        <paragraph role="image" id="par_id721603290925895"><image src="sw/res/nc20000.png" id="img_id1001603290925895" width="1cm" height="1cm"><alt id="alt_id591603290925895">Headings Icon</alt></image></paragraph>
+        <paragraph role="image" id="par_id721603290925895"><image src="sw/res/nc20000.svg" id="img_id1001603290925895" width="1cm" height="1cm"><alt id="alt_id591603290925895">Headings Icon</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id581603287134620" role="tablecontent">Headings</paragraph>
@@ -287,7 +289,7 @@
       <tablerow>
       <tablecell>
         <paragraph role="paragraph" id="par_id951603571856944">
-<image src="cmd/sc_insertdraw.png" id="img_id221603571856944" width="1cm" height="1cm"><alt id="alt_id751603571856944">Drawing objects Icon</alt></image></paragraph>
+<image src="cmd/lc_insertdraw.svg" id="img_id221603571856944" width="1cm" height="1cm"><alt id="alt_id751603571856944">Drawing objects Icon</alt></image></paragraph>
       </tablecell>
       <tablecell>
         <paragraph id="par_id351603571856944" role="tablecontent">Drawing objects</paragraph>
@@ -320,7 +322,7 @@
 <table id="tbl_id3155861">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3150689" role="paragraph" xml-lang="en-US"> <image id="img_id3150695" src="sw/res/sc20244.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150695">Icon Toggle Master View</alt></image></paragraph>
+      <paragraph id="par_id3150689" role="paragraph" xml-lang="en-US"> <image id="img_id3150695" src="sw/res/sc20244.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150695">Icon Toggle Master View</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3149568" role="paragraph" xml-lang="en-US">Toggle Master View</paragraph>
@@ -399,7 +401,7 @@
 <table id="tbl_id3147535">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153588" role="paragraph" xml-lang="en-US"> <image id="img_id3153595" src="sw/res/sc20236.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153595">Icon Outline level</alt></image></paragraph>
+      <paragraph id="par_id3153588" role="paragraph" xml-lang="en-US"> <image id="img_id3153595" src="sw/res/sc20236.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153595">Icon Outline level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3145554" role="paragraph" xml-lang="en-US">Outline level</paragraph>
@@ -437,7 +439,7 @@
 <table id="tbl_id3148898">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3155414" role="paragraph" xml-lang="en-US"> <image id="img_id3155420" src="sw/res/sc20172.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155420">Icon Promote level</alt></image></paragraph>
+      <paragraph id="par_id3155414" role="paragraph" xml-lang="en-US"> <image id="img_id3155420" src="sw/res/sc20172.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3155420">Icon Promote level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3153697" role="paragraph" xml-lang="en-US">Promote level</paragraph>
@@ -453,7 +455,7 @@
 <table id="tbl_id3150746">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3148414" role="paragraph" xml-lang="en-US"> <image id="img_id3148420" src="sw/res/sc20173.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3148420">Icon Demote level</alt></image></paragraph>
+      <paragraph id="par_id3148414" role="paragraph" xml-lang="en-US"> <image id="img_id3148420" src="sw/res/sc20173.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3148420">Icon Demote level</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3147324" role="paragraph" xml-lang="en-US">Demote level</paragraph>
@@ -469,7 +471,7 @@
 <table id="tbl_id3151301">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153268" role="paragraph" xml-lang="en-US"> <image id="img_id3153275" src="cmd/sc_upsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153275">Icon Chapter Up</alt></image></paragraph>
+      <paragraph id="par_id3153268" role="paragraph" xml-lang="en-US"> <image id="img_id3153275" src="cmd/lc_upsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3153275">Icon Chapter Up</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3149147" role="paragraph" xml-lang="en-US">Chapter Up</paragraph>
@@ -485,7 +487,7 @@
 <table id="tbl_id3153737">
   <tablerow>
     <tablecell>
-      <paragraph id="par_id3153768" role="paragraph" xml-lang="en-US"> <image id="img_id3150828" src="cmd/sc_downsearch.png" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150828">Icon Chapter down</alt></image></paragraph>
+      <paragraph id="par_id3153768" role="paragraph" xml-lang="en-US"> <image id="img_id3150828" src="cmd/lc_downsearch.svg" width="1cm" height="1cm"><alt xml-lang="en-US" id="alt_id3150828">Icon Chapter down</alt></image></paragraph>
     </tablecell>
     <tablecell>
       <paragraph id="par_id3150870" role="paragraph" xml-lang="en-US">Chapter down</paragraph>
diff --git a/source/text/swriter/guide/arrange_chapters.xhp b/source/text/swriter/guide/arrange_chapters.xhp
index 33d20a21cd..839cf20b99 100644
--- a/source/text/swriter/guide/arrange_chapters.xhp
+++ b/source/text/swriter/guide/arrange_chapters.xhp
@@ -48,10 +48,10 @@
 
 <list type="ordered">
   <listitem>
-    <paragraph id="par_id3151206" role="listitem" xml-lang="en-US">On the <emph>Standard Bar</emph>, click the <emph>Navigator</emph> icon <image id="img_id5211883" src="cmd/sc_navigator.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5211883">Icon navigator</alt></image> to open the <emph>Navigator</emph>.</paragraph>
+    <paragraph id="par_id3151206" role="listitem" xml-lang="en-US">On the <emph>Standard Bar</emph>, click the <emph>Navigator</emph> icon <image id="img_id5211883" src="cmd/sc_navigator.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5211883">Icon navigator</alt></image> to open the <emph>Navigator</emph>.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3151238" role="listitem" xml-lang="en-US">On the <emph>Navigator</emph>, click the <emph>Content View</emph> icon <image id="img_id3156338" src="sw/res/sc20244.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3156338">Icon content view</alt></image>.</paragraph>
+    <paragraph id="par_id3151238" role="listitem" xml-lang="en-US">On the <emph>Navigator</emph>, click the <emph>Content Navigation View</emph> icon <image id="img_id3156338" src="sw/res/sc20244.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3156338">Icon Content Navigation View</alt></image>.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id3155089" role="listitem" xml-lang="en-US">Do one of the following:</paragraph>
@@ -63,7 +63,7 @@
     <paragraph id="par_id3155114" role="listitem" xml-lang="en-US">Drag a heading to a new location in the <emph>Navigator</emph> list.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id3155139" role="listitem" xml-lang="en-US">Click a heading in the <emph>Navigator</emph> list, and then click the <emph>Promote Chapter</emph> <image id="img_id4217546" src="sw/res/sc20174.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4217546">Icon promote</alt></image> or <emph>Demote Chapter</emph> icon <image id="img_id6505788" src="sw/res/sc20171.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id6505788">Icon demote</alt></image>.</paragraph>
+    <paragraph id="par_id3155139" role="listitem" xml-lang="en-US">Click a heading in the <emph>Navigator</emph> list, and then click the <emph>Promote Chapter</emph> <image id="img_id4217546" src="sw/res/sc20174.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id4217546">Icon promote</alt></image> or <emph>Demote Chapter</emph> icon <image id="img_id6505788" src="sw/res/sc20171.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id6505788">Icon demote</alt></image>.</paragraph>
   </listitem>
 </list>
 <note id="par_id3145758">To move the heading without the subordinate text, hold down <switchinline select="sys"><caseinline select="MAC">Command</caseinline><defaultinline>Ctrl</defaultinline></switchinline> while you drag or click the <emph>Promote Chapter</emph> or <emph>Demote Chapter</emph> icons.</note>
@@ -75,7 +75,7 @@
     <paragraph id="par_id3155424" role="listitem" xml-lang="en-US">Select the heading in the <emph>Navigator</emph> list.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_idN1081C" role="listitem" xml-lang="en-US">Click the <emph>Promote Level</emph> <image id="img_id5564488" src="sw/res/sc20172.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5564488">Icon promote level</alt></image> or <emph>Demote Level</emph> icon <image id="img_id3159363" src="sw/res/sc20173.png" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3159363">Icon demote level</alt></image>.</paragraph>
+    <paragraph id="par_idN1081C" role="listitem" xml-lang="en-US">Click the <emph>Promote Level</emph> <image id="img_id5564488" src="sw/res/sc20172.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id5564488">Icon promote level</alt></image> or <emph>Demote Level</emph> icon <image id="img_id3159363" src="sw/res/sc20173.svg" width="0.566cm" height="0.566cm"><alt xml-lang="en-US" id="alt_id3159363">Icon demote level</alt></image>.</paragraph>
   </listitem>
 </list>