From b70a4853d63aced188228d3a7da60f749d49dd26 Mon Sep 17 00:00:00 2001 From: Martin Wimpress Date: Fri, 4 Oct 2019 22:53:07 +0100 Subject: Change language to refer to Classic Menu and Compact Menu Update the references to Classic Menu and Compact Menu so mate-user-guide is consistent with the change in https://github.com/mate-desktop/mate-panel/pull/1025 --- mate-user-guide/C/gosdconfkeys.xml | 2 +- mate-user-guide/C/goseditmainmenu.xml | 10 +++++----- mate-user-guide/C/gosoverview.xml | 2 +- mate-user-guide/C/gospanel.xml | 32 ++++++++++++++++---------------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mate-user-guide/C/gosdconfkeys.xml b/mate-user-guide/C/gosdconfkeys.xml index fc982d7..9d612db 100644 --- a/mate-user-guide/C/gosdconfkeys.xml +++ b/mate-user-guide/C/gosdconfkeys.xml @@ -980,7 +980,7 @@ $ gsettings get org.mate.interface file-chooser-backend menubar-accel - (s) Keyboard shortcut to open the menu bars. + (s) Keyboard shortcut to open the menus. $ dconf read /org/mate/desktop/interface/menubar-accel $ gsettings get org.mate.interface menubar-accel diff --git a/mate-user-guide/C/goseditmainmenu.xml b/mate-user-guide/C/goseditmainmenu.xml index 3cb887d..5ea3e6f 100644 --- a/mate-user-guide/C/goseditmainmenu.xml +++ b/mate-user-guide/C/goseditmainmenu.xml @@ -23,17 +23,17 @@ menus - Menu Bar - Menu Bar + Classic Menu + Classic Menu - Menu Bar + Classic Menu introduction - The panel menubar is your main point of access to MATE. Use the Applications menu to launch applications, the Places to open locations on your computer or network, and the System to customize your system, get help with MATE, and log out of MATE or shut down your computer. + The classic menu is your main point of access to MATE. Use the Applications menu to launch applications, the Places to open locations on your computer or network, and the System to customize your system, get help with MATE, and log out of MATE or shut down your computer. The following sections describe these three menus. - By default, the panel menubar is on the . But like any other panel object, you can move the menubar to another panel, or have more than one instance of the menubar in your panels. For more on this, see . + By default, the classic menu is on the . But like any other panel object, you can move the classic menu to another panel, or have more than one instance of the classic menu in your panels. For more on this, see .
Applications Menu diff --git a/mate-user-guide/C/gosoverview.xml b/mate-user-guide/C/gosoverview.xml index a26ac3d..0585e8d 100644 --- a/mate-user-guide/C/gosoverview.xml +++ b/mate-user-guide/C/gosoverview.xml @@ -54,7 +54,7 @@ Panels - The panels are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the MATE main menu bar, the date and time, and a set of application launcher icons, and the bottom panel shows you the list of open windows and the workspace switcher. + The panels are the two bars that run along the top and bottom of the screen. By default, the top panel shows you the MATE Classic Menu, the date and time, and a set of application launcher icons, and the bottom panel shows you the list of open windows and the workspace switcher. Panels can be customized to contain a variety of tools, such as other menus and launchers, and small utility applications, called panel applets. For example, you can configure your panel to display the current weather for your location. For more diff --git a/mate-user-guide/C/gospanel.xml b/mate-user-guide/C/gospanel.xml index e983e60..e80a908 100644 --- a/mate-user-guide/C/gospanel.xml +++ b/mate-user-guide/C/gospanel.xml @@ -49,8 +49,8 @@ these panels. - Menu Bar applet - The Menu Bar contains the Applications, Places, and System menus. For more on the menu bar, see . + Classic Menu applet + The Classic Menu contains the Applications, Places, and System menus. For more on the classic menu, see . A set of application launcher icons @@ -1267,27 +1267,27 @@ See for more on this. You can add the following types of menu to your panels: - Menu Bar: You can access almost + Classic Menu: You can access almost all the standard applications, commands, and configuration options from -the menus in the Menu Bar. It contains the Applications, +the menus in the Classic Menu. It contains the Applications, Places, and System menus. - To add a Menu Bar to a panel, right-click + To add a Classic Menu to a panel, right-click on any vacant space on the panel. Choose Add to Panel, then -choose Menu Bar from the Add to Panel dialog. +choose Classic Menu from the Add to Panel dialog. See for more on this. - Main Menu: The Main Menu contains the same - items as the Menu Bar, but organizes them into one menu instead of three. + Compact Menu: The Compact Menu contains the same + items as the Classic Menu, but organizes them into one menu instead of three. It takes up less space on the panels as a result. - To add a Main Menu to a panel, right-click + To add a Compact Menu to a panel, right-click on any vacant space on the panel. Choose Add to Panel, then -choose Main Menu from the Add to Panel dialog. +choose Compact Menu from the Add to Panel dialog. See for more on this. - Submenus: You can add a submenu of the Menu Bar - or Main Menu directly to the panel. For example, you can add the Games + Submenus: You can add a submenu of the Classic Menu + or Compact Menu directly to the panel. For example, you can add the Games submenu of the Applications menu to the panel. To add a submenu to a panel, open the submenu, right-click on a launcher, then choose Entire menuAdd this as menu to panel. @@ -1547,22 +1547,22 @@ applet. The graphic above illustrates the CD icon in the Notificati Area applet.
-
Menu Bar +
Classic Menu - Menu Bar applet. Menus: Applications, Places, System. + Classic Menu applet. Menus: Applications, Places, System. - The Menu Bar contains the + The Classic Menu contains the Applications, Places, and System menus. You can access almost all the standard applications, commands, and configuration options - from the Menu Bar. For more on using the Menu Bar, see . + from the Classic Menu. For more on using the Classic Menu, see .
-- cgit v1.2.1