update choosing of user interface and notebookbar modes

Change-Id: I2a6b2252e504cd00058c48486ed8ecc34125d0b7
Reviewed-on: https://gerrit.libreoffice.org/65219
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>

1 files changed, 14 insertions, 12 deletions

diff --git a/source/text/shared/01/notebook_bar.xhp b/source/text/shared/01/notebook_bar.xhp
index 890346970a..f731132e7e 100644
--- a/source/text/shared/01/notebook_bar.xhp
+++ b/source/text/shared/01/notebook_bar.xhp
@@ -50,46 +50,48 @@
 <paragraph id="par_id190920161744065146" role="paragraph" xml-lang="en-US">By default, %PRODUCTNAME commands are grouped in cascading menus and in toolbars filled with icons.</paragraph>
 <paragraph id="par_id190920161744061691" role="paragraph" xml-lang="en-US">The notebook bar shows a different way to organize controls and icons than a collection of straight rows of icons, displaying contextual groups of commands and contents.</paragraph>
 <paragraph id="par_id190920161744064258" role="paragraph" xml-lang="en-US">With the notebook bar, frequently used commands are grouped in an arrangement that will make it quicker to access, avoiding lengthy menu navigation and toolbars command icon lookup.</paragraph>
-<paragraph id="par_id190920161744067918" role="paragraph" xml-lang="en-US">The notebook bar is available in Writer, Calc and Impress. The user interface has now several available layouts. Two entries in the <item type="menuitem">View</item> menu controls the notebook bar: <item type="menuitem">Toolbar Layout</item> and <item type="menuitem">Notebook bar</item>.</paragraph>
+<paragraph id="par_id190920161744067918" role="paragraph" xml-lang="en-US">The notebook bar is available in Writer, Calc and Impress. The user interface has now several available layouts. To change the layout, choose <item type="menuitem">View - User Interface</item> and from the submenu select the layout which you want.</paragraph>
 
 <section id="howtoget">
-<paragraph id="par_id190920161744066306" role="paragraph" xml-lang="en-US">Choose menu <item type="menuitem">View - Toolbar layout - Notebook bar</item></paragraph>
+<paragraph id="par_id190920161744066306" role="paragraph" xml-lang="en-US">Choose menu <item type="menuitem">View - User Interface</item></paragraph>
 </section>
 
 <paragraph id="hd_id190920161911374012" role="heading" level="2" xml-lang="en-US">User interface layouts</paragraph>
-<paragraph id="par_id190920161744068946" role="paragraph" xml-lang="en-US">The Toolbar Layout entry defines which user interface elements are visible. The available layouts are:</paragraph>
+<paragraph id="par_id190920161744068946" role="paragraph" xml-lang="en-US">The <emph>User Interface</emph> entry defines which user interface elements are visible. The following three layouts are not of notebook bar type:</paragraph>
 
 <list type="unordered">
   <listitem>
-    <paragraph id="par_id190920161744068819" role="paragraph" xml-lang="en-US"><emph>Default</emph> – classic mode with two visible toolbars – standard and formatting. The sidebar is partially collapsed and shows only tabs.</paragraph>
+    <paragraph id="par_id190920161744068819" role="paragraph" xml-lang="en-US"><emph>Standard toolbar</emph> – classic mode with two visible toolbars – standard and formatting. The sidebar is partially collapsed and shows only tabs.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id190920161744061192" role="paragraph" xml-lang="en-US"><emph>Single toolbar</emph> – one toolbar with all frequently used features. The sidebar is collapsed.</paragraph>
   </listitem>
   <listitem>
     <paragraph id="par_id190920161744069136" role="paragraph" xml-lang="en-US"><emph>Sidebar</emph> – The sidebar is fully opened and only one toolbar is showed – formatting toolbar.</paragraph>
-  </listitem>
-  <listitem>
-    <paragraph id="par_id190920161744063875" role="paragraph" xml-lang="en-US"><emph>Notebook bar</emph> – all toolbar and sidebar are hidden and the notebook bar is placed on the top. The menu entry: <item type="menuitem">View </item><item type="menuitem">-</item><item type="menuitem"> Notebook bar</item> is active only in this mode and user can then choose the notebook bar layout.</paragraph>
   </listitem></list>
-<paragraph id="par_id190920161744063797" role="paragraph" xml-lang="en-US">When user activates additional toolbars, they will be saved in the user profile. Therefore, on returning to the notebook bar mode, all toolbars set visible before will show again.</paragraph>
+<paragraph id="par_id190920161744063797" role="paragraph" xml-lang="en-US">When user activates additional toolbars, they will be saved in the user profile. Therefore, on returning from the notebook bar mode, all toolbars set visible before will show again.</paragraph>
 
 <paragraph id="hd_id190920161744069618" role="heading" level="2" xml-lang="en-US">Available Notebook bar modes</paragraph>
+<paragraph id="par_id190920161744063875" role="paragraph" xml-lang="en-US">In a notebook bar mode, all toolbar and sidebar are hidden and the notebook bar is placed on the top.</paragraph>
 
 <list type="unordered">
   <listitem>
     <paragraph id="par_id190920161744069064" role="paragraph" xml-lang="en-US"><emph>Tabbed</emph> – In this mode, the bar is divided into tabs, where each tab displays a set of icons grouped by context. The context can also change depending on the object selected in the document, for example a table or an image. </paragraph>
   </listitem></list>
-<paragraph id="par_id190920161744064039" role="note" xml-lang="en-US">In the tabbed mode the menu bar is hidden by default. To display the menu bar, select the “≡” icon at the top-left position of the window and choose <item type="menuitem">Menu bar</item>.</paragraph>
+<paragraph id="par_id190920161744064039" role="note" xml-lang="en-US">In the tabbed mode the menu bar is hidden by default. To display the menu bar, select the <emph>Menubar</emph> icon at the top-left position of the window.</paragraph>
 
 <list type="unordered">
   <listitem>
-    <paragraph id="par_id190920161744067802" role="paragraph" xml-lang="en-US"><emph>Contextual groups</emph> – The notebook bar is divided into 4 groups. The File, Clipboard and Format groups are fixed. The Insert group contents are replaced with commands that depends on the nature of the selected object in the document, as for a table, an image or an OLE object.</paragraph>
+    <paragraph id="par_id190920161744067802" role="paragraph" xml-lang="en-US"><emph>Contextual groups</emph> – The notebook bar is divided into 4 groups. The File, Clipboard and Text groups are fixed. The Insert group contents are replaced with commands that depends on the nature of the selected object in the document, as for a table, an image or an OLE object.</paragraph>
+  </listitem>
+  <listitem>
+    <paragraph id="par_id190920161744063712" role="paragraph" xml-lang="en-US"><emph>Contextual single</emph> – Displays a single centered toolbar with context-dependent contents.</paragraph>
   </listitem>
   <listitem>
-    <paragraph id="par_id190920161744063712" role="paragraph" xml-lang="en-US"><emph>Contextual single toolbar</emph> – Displays a single centered toolbar with context-dependent contents.</paragraph>
+    <paragraph id="par_id190920161744063446" role="paragraph" xml-lang="en-US"><emph>Groupedbar</emph> – The bar is divided into groups that contain commands organized as icon sets and menus.</paragraph>
   </listitem></list>
-<paragraph id="par_id190920161744076273" role="tip" xml-lang="en-US">The notebook bar icon size is adjustable in <item type="menuitem">Tools - Options - LibreOffice - View - Notebook bar </item>listbox.</paragraph>
+<paragraph id="par_id190920161744074224" role="note" xml-lang="en-US">The Tabbed and Groupedbar modes are also available as compact variants.</paragraph>
+<paragraph id="par_id190920161744076273" role="tip" xml-lang="en-US">The notebook bar icon size is adjustable in <switchinline select="sys"><caseinline select="MAC"><item type="menuitem">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type="menuitem">Tools - Options</item></defaultinline></switchinline><item type="menuitem"> - %PRODUCTNAME - View - Notebookbar icon size</item> listbox.</paragraph>
 <paragraph id="par_id190920161744074862" role="note" xml-lang="en-US">The notebook bar cannot be customized.</paragraph>
 <paragraph id="par_id190920161744078275" role="warning" xml-lang="en-US">The current implementation (%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc and Impress modules. A change in the notebook bar in one module will affect the notebook bar of the other modules.</paragraph>