From 763bdb3e423a7a84a6d6a774ae6a109d7e573794 Mon Sep 17 00:00:00 2001
From: Thomas Hunziker <werbemails@bakual.ch>
Date: Tue, 11 Feb 2020 08:12:52 +0100
Subject: [PATCH] [4.0] Load presets from component directory (#27869)

* Move component specific presets to component folder

* Move preset language strings from lib to components

* Dynamically load presets from component folders instead of using hardcoded list.

* Name of preset is without ".xml"

* Move language strings use din presets to respective component
---
 .../presets/content.xml                       | 20 +++++-----
 .../com_menus/Helper/MenusHelper.php          | 39 +++++++++++++++----
 .../com_menus/presets/alternate.xml           | 32 +++++++--------
 .../components/com_menus/presets/default.xml  | 32 +++++++--------
 .../presets/users.xml                         | 18 ++++-----
 .../language/en-GB/com_content.sys.ini        | 13 +++++++
 .../language/en-GB/com_menus.sys.ini          |  6 +++
 .../language/en-GB/com_users.sys.ini          | 15 +++++++
 administrator/language/en-GB/lib_joomla.ini   |  9 -----
 administrator/language/en-GB/mod_menu.ini     | 25 ------------
 language/en-GB/lib_joomla.ini                 |  9 -----
 11 files changed, 116 insertions(+), 102 deletions(-)
 rename administrator/components/{com_menus => com_content}/presets/content.xml (82%)
 rename administrator/components/{com_menus => com_users}/presets/users.xml (81%)

diff --git a/administrator/components/com_menus/presets/content.xml b/administrator/components/com_content/presets/content.xml
similarity index 82%
rename from administrator/components/com_menus/presets/content.xml
rename to administrator/components/com_content/presets/content.xml
index 2e8b1da8f0b..83d2a95c9d5 100644
--- a/administrator/components/com_menus/presets/content.xml
+++ b/administrator/components/com_content/presets/content.xml
@@ -5,31 +5,31 @@
 	xsi:schemaLocation="urn:joomla.org menu.xsd"
 	>
 	<menuitem
-		title="MOD_MENU_COM_CONTENT"
+		title="COM_CONTENT_MENUS"
 		type="heading"
 		icon="file-alt"
 		class="class:file-alt"
 		>
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
+			title="COM_CONTENT_MENUS_ARTICLE_MANAGER"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=articles"
 			quicktask="index.php?option=com_content&amp;task=article.add"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_ARTICLE"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
+			title="COM_CONTENT_MENUS_CATEGORY_MANAGER"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_content"
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+			quicktask-title="COM_CONTENT_MENUS_NEW_CATEGORY"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_FEATURED"
+			title="COM_CONTENT_MENUS_FEATURED"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=featured"
@@ -38,13 +38,13 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_CONTENT_MANAGE"
+		title="COM_CONTENT_MENUS_MANAGE"
 		type="heading"
 		icon="cog"
 		class="class:file-alt"
 		>
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_WORKFLOW"
+			title="COM_CONTENT_MENUS_WORKFLOW"
 			type="component"
 			element="com_workflow"
 			link="index.php?option=com_workflow&amp;view=workflows&amp;extension=com_content"
@@ -66,7 +66,7 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_CONTENT_MISC"
+		title="COM_CONTENT_MENUS_MISC"
 		type="heading"
 		icon="cubes"
 		class="class:file-alt"
@@ -86,7 +86,7 @@
 			element="com_modules"
 			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
 			quicktask="index.php?option=com_modules&amp;view=select&amp;client_id=0"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_SITE_MODULE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_SITE_MODULE"
 		/>
 
 		<menuitem
diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php
index da6e5ffad61..289103d1563 100644
--- a/administrator/components/com_menus/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/Helper/MenusHelper.php
@@ -12,7 +12,9 @@ namespace Joomla\Component\Menus\Administrator\Helper;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Application\ApplicationHelper;
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filesystem\File;
 use Joomla\CMS\Filesystem\Folder;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Associations;
@@ -660,14 +662,35 @@ class MenusHelper extends ContentHelper
 			// Important: 'null' will cause infinite recursion.
 			static::$presets = array();
 
-			static::addPreset('default', 'JLIB_MENUS_PRESET_DEFAULT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/default.xml');
-			static::addPreset('alternate', 'JLIB_MENUS_PRESET_ALTERNATE', JPATH_ADMINISTRATOR . '/components/com_menus/presets/alternate.xml');
-			static::addPreset('system', 'JLIB_MENUS_PRESET_SYSTEM', JPATH_ADMINISTRATOR . '/components/com_menus/presets/system.xml');
-			static::addPreset('content', 'JLIB_MENUS_PRESET_CONTENT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/content.xml');
-			static::addPreset('help', 'JLIB_MENUS_PRESET_HELP', JPATH_ADMINISTRATOR . '/components/com_menus/presets/help.xml');
-			static::addPreset('menus', 'JLIB_MENUS_PRESET_MENUS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/menus.xml');
-			static::addPreset('components', 'JLIB_MENUS_PRESET_COMPONENTS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/components.xml');
-			static::addPreset('users', 'JLIB_MENUS_PRESET_USERS', JPATH_ADMINISTRATOR . '/components/com_menus/presets/users.xml');
+			$components = ComponentHelper::getComponents();
+			$lang       = Factory::getApplication()->getLanguage();
+
+			foreach ($components as $component)
+			{
+				if (!$component->enabled)
+				{
+					continue;
+				}
+
+				$folder = JPATH_ADMINISTRATOR . '/components/' . $component->option . '/presets/';
+
+				if (!Folder::exists($folder))
+				{
+					continue;
+				}
+
+				$lang->load($component->option . '.sys', JPATH_ADMINISTRATOR)
+				|| $lang->load($component->option . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component->option);
+
+				$presets = Folder::files($folder, '.xml');
+
+				foreach ($presets as $preset)
+				{
+					$name  = File::stripExt($preset);
+					$title = strtoupper($component->option . '_MENUS_PRESET_' . $name);
+					static::addPreset($name, $title, $folder . $preset);
+				}
+			}
 
 			// Load from template folder automatically
 			$app = Factory::getApplication();
diff --git a/administrator/components/com_menus/presets/alternate.xml b/administrator/components/com_menus/presets/alternate.xml
index b79106a42d8..bbcfacb7609 100644
--- a/administrator/components/com_menus/presets/alternate.xml
+++ b/administrator/components/com_menus/presets/alternate.xml
@@ -48,14 +48,14 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_USERS_USERS"
+		title="COM_USERS_MENUS_USERS"
 		type="heading"
 		icon="users"
 		class="class:users"
 		>
 		<menuitem
-			title="MOD_MENU_COM_USERS_USER_MANAGER"
-			quicktask-title="MOD_MENU_COM_USERS_ADD_USER"
+			title="COM_USERS_MENUS_USER_MANAGER"
+			quicktask-title="COM_USERS_MENUS_ADD_USER"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=users"
@@ -63,14 +63,14 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_GROUPS"
+			title="COM_USERS_MENUS_GROUPS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=groups"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_LEVELS"
+			title="COM_USERS_MENUS_LEVELS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=levels"
@@ -99,14 +99,14 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTES"
+			title="COM_USERS_MENUS_NOTES"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=notes"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			title="COM_USERS_MENUS_NOTE_CATEGORIES"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
@@ -267,14 +267,14 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_CONTENT"
+		title="COM_CONTENT_MENUS"
 		type="heading"
 		icon="file-alt"
 		class="class:file-alt"
 		>
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+			title="COM_CONTENT_MENUS_ARTICLE_MANAGER"
+			quicktask-title="COM_CONTENT_MENUS_NEW_ARTICLE"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=articles"
@@ -282,8 +282,8 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+			title="COM_CONTENT_MENUS_CATEGORY_MANAGER"
+			quicktask-title="COM_CONTENT_MENUS_NEW_CATEGORY"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_content"
@@ -291,7 +291,7 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_FEATURED"
+			title="COM_CONTENT_MENUS_FEATURED"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=featured"
@@ -302,7 +302,7 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_WORKFLOW"
+			title="COM_CONTENT_MENUS_WORKFLOW"
 			type="component"
 			element="com_workflow"
 			link="index.php?option=com_workflow&amp;view=workflows&amp;extension=com_content"
@@ -435,7 +435,7 @@
 
 		<menuitem
 			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_SITE_MODULE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_SITE_MODULE"
 			type="component"
 			element="com_modules"
 			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
@@ -444,7 +444,7 @@
 
 		<menuitem
 			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ADMIN_MODULE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_ADMIN_MODULE"
 			type="component"
 			element="com_modules"
 			link="index.php?option=com_modules&amp;view=modules&amp;client_id=1"
diff --git a/administrator/components/com_menus/presets/default.xml b/administrator/components/com_menus/presets/default.xml
index cb325226cf9..d866069eace 100644
--- a/administrator/components/com_menus/presets/default.xml
+++ b/administrator/components/com_menus/presets/default.xml
@@ -13,15 +13,15 @@
 	/>
 
 	<menuitem
-		title="MOD_MENU_COM_CONTENT"
+		title="COM_CONTENT_MENUS"
 		type="heading"
 		icon="file-alt"
 		class="class:file-alt"
 		dashboard="content"
 		>
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_ARTICLE_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+			title="COM_CONTENT_MENUS_ARTICLE_MANAGER"
+			quicktask-title="COM_CONTENT_MENUS_NEW_ARTICLE"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=articles"
@@ -29,8 +29,8 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_CATEGORY"
+			title="COM_CONTENT_MENUS_CATEGORY_MANAGER"
+			quicktask-title="COM_CONTENT_MENUS_NEW_CATEGORY"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_content"
@@ -38,7 +38,7 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_FEATURED"
+			title="COM_CONTENT_MENUS_FEATURED"
 			type="component"
 			element="com_content"
 			link="index.php?option=com_content&amp;view=featured"
@@ -46,7 +46,7 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_CONTENT_WORKFLOW"
+			title="COM_CONTENT_MENUS_WORKFLOW"
 			type="component"
 			element="com_workflow"
 			link="index.php?option=com_workflow&amp;view=workflows&amp;extension=com_content"
@@ -84,7 +84,7 @@
 
 		<menuitem
 			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_SITE_MODULE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_SITE_MODULE"
 			type="component"
 			element="com_modules"
 			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
@@ -93,7 +93,7 @@
 
 		<menuitem
 			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_ADMIN_MODULE"
+			quicktask-title="COM_CONTENT_MENUS_NEW_ADMIN_MODULE"
 			type="component"
 			element="com_modules"
 			link="index.php?option=com_modules&amp;view=modules&amp;client_id=1"
@@ -185,7 +185,7 @@
 	/>
 
 	<menuitem
-		title="MOD_MENU_COM_USERS_USERS"
+		title="COM_USERS_MENUS_USERS"
 		type="heading"
 		icon="users"
 		class="class:users"
@@ -193,8 +193,8 @@
 		dashboard="users"
 		>
 		<menuitem
-			title="MOD_MENU_COM_USERS_USER_MANAGER"
-			quicktask-title="MOD_MENU_COM_USERS_ADD_USER"
+			title="COM_USERS_MENUS_USER_MANAGER"
+			quicktask-title="COM_USERS_MENUS_ADD_USER"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=users"
@@ -202,14 +202,14 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_GROUPS"
+			title="COM_USERS_MENUS_GROUPS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=groups"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_LEVELS"
+			title="COM_USERS_MENUS_LEVELS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=levels"
@@ -238,14 +238,14 @@
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTES"
+			title="COM_USERS_MENUS_NOTES"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=notes"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			title="COM_USERS_MENUS_NOTE_CATEGORIES"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
diff --git a/administrator/components/com_menus/presets/users.xml b/administrator/components/com_users/presets/users.xml
similarity index 81%
rename from administrator/components/com_menus/presets/users.xml
rename to administrator/components/com_users/presets/users.xml
index dc3d56e9e14..c45996af586 100644
--- a/administrator/components/com_menus/presets/users.xml
+++ b/administrator/components/com_users/presets/users.xml
@@ -5,29 +5,29 @@
 	xsi:schemaLocation="urn:joomla.org menu.xsd"
 	>
 	<menuitem
-		title="MOD_MENU_COM_USERS_USERS"
+		title="COM_USERS_MENUS_USERS"
 		type="heading"
 		icon="users"
 		class="class:users"
 		>
 		<menuitem
-			title="MOD_MENU_COM_USERS_USER_MANAGER"
+			title="COM_USERS_MENUS_USER_MANAGER"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=users"
 			quicktask="index.php?option=com_users&amp;task=user.add"
-			quicktask-title="MOD_MENU_COM_USERS_ADD_USER"
+			quicktask-title="COM_USERS_MENUS_ADD_USER"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_GROUPS"
+			title="COM_USERS_MENUS_GROUPS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=groups"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_LEVELS"
+			title="COM_USERS_MENUS_LEVELS"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=levels"
@@ -35,7 +35,7 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_USERS_FIELDS"
+		title="COM_USERS_MENUS_FIELDS"
 		type="heading"
 		icon="user-tag"
 		class="class:users"
@@ -56,20 +56,20 @@
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_COM_USERS_MISC"
+		title="COM_USERS_MENUS_MISC"
 		type="heading"
 		icon="user-edit"
 		class="class:users"
 		>
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTES"
+			title="COM_USERS_MENUS_NOTES"
 			type="component"
 			element="com_users"
 			link="index.php?option=com_users&amp;view=notes"
 		/>
 
 		<menuitem
-			title="MOD_MENU_COM_USERS_NOTE_CATEGORIES"
+			title="COM_USERS_MENUS_NOTE_CATEGORIES"
 			type="component"
 			element="com_categories"
 			link="index.php?option=com_categories&amp;view=categories&amp;extension=com_users"
diff --git a/administrator/language/en-GB/com_content.sys.ini b/administrator/language/en-GB/com_content.sys.ini
index 066906d3831..0d61ca0c6fd 100644
--- a/administrator/language/en-GB/com_content.sys.ini
+++ b/administrator/language/en-GB/com_content.sys.ini
@@ -36,6 +36,19 @@ COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE="Featured Articles"
 COM_CONTENT_FORM_VIEW_DEFAULT_DESC="Create a new article."
 COM_CONTENT_FORM_VIEW_DEFAULT_OPTION="Create"
 COM_CONTENT_FORM_VIEW_DEFAULT_TITLE="Create Article"
+COM_CONTENT_MENUS="Content"
+COM_CONTENT_MENUS_ARTICLE_MANAGER="Articles"
+COM_CONTENT_MENUS_CATEGORY_MANAGER="Categories"
+COM_CONTENT_MENUS_FEATURED="Featured Articles"
+COM_CONTENT_MENUS_MANAGE="Content Settings"
+COM_CONTENT_MENUS_MISC="Modules & Media"
+COM_CONTENT_MENUS_NEW_ADMIN_MODULE="Add Administrator Module"
+COM_CONTENT_MENUS_NEW_ARTICLE="Add Article"
+COM_CONTENT_MENUS_NEW_CATEGORY="Add Category"
+COM_CONTENT_MENUS_NEW_SITE_MODULE="Add Site Module"
+COM_CONTENT_MENUS_PRESET_CONTENT="Preset - Content Dashboard"
+COM_CONTENT_MENUS_WORKFLOW="Workflows"
+COM_CONTENT_MENUS_WORKFLOW_MANAGER="Workflows"
 COM_CONTENT_TAGS_ARTICLE="Article"
 COM_CONTENT_TAGS_CATEGORY="Article Category"
 COM_CONTENT_XML_DESCRIPTION="Article management component."
diff --git a/administrator/language/en-GB/com_menus.sys.ini b/administrator/language/en-GB/com_menus.sys.ini
index cc9a9fd1c76..8006011af42 100644
--- a/administrator/language/en-GB/com_menus.sys.ini
+++ b/administrator/language/en-GB/com_menus.sys.ini
@@ -10,6 +10,12 @@ COM_MENUS_ITEMS_VIEW_DEFAULT_DESC="Shows a list of menu items"
 COM_MENUS_ITEMS_VIEW_DEFAULT_TITLE="Menu Items"
 COM_MENUS_ITEM_VIEW_EDIT_DESC="Shows a form to create a new menu item"
 COM_MENUS_ITEM_VIEW_EDIT_TITLE="New Menu Item"
+COM_MENUS_MENUS_PRESET_ALTERNATE="Preset - Alternative Main Menu"
+COM_MENUS_MENUS_PRESET_COMPONENTS="Preset - Components Dashboard"
+COM_MENUS_MENUS_PRESET_DEFAULT="Preset - Joomla Main Menu"
+COM_MENUS_MENUS_PRESET_HELP="Preset - Help Dashboard"
+COM_MENUS_MENUS_PRESET_MENUS="Preset - Menus Dashboard"
+COM_MENUS_MENUS_PRESET_SYSTEM="Preset - System Dashboard"
 COM_MENUS_MENUS_VIEW_DEFAULT_DESC="Shows a list of Menu Types"
 COM_MENUS_MENUS_VIEW_DEFAULT_TITLE="Menus"
 COM_MENUS_MENU_VIEW_EDIT_DESC="Shows a form to create a new menu"
diff --git a/administrator/language/en-GB/com_users.sys.ini b/administrator/language/en-GB/com_users.sys.ini
index 95af711fcf1..1f979d935b0 100644
--- a/administrator/language/en-GB/com_users.sys.ini
+++ b/administrator/language/en-GB/com_users.sys.ini
@@ -23,6 +23,20 @@ COM_USERS_LOGOUT_VIEW_DEFAULT_OPTION="Logout"
 COM_USERS_LOGOUT_VIEW_DEFAULT_TITLE="Logout"
 COM_USERS_MAIL_VIEW_DEFAULT_DESC="Shows a form to send mass email to multiple users."
 COM_USERS_MAIL_VIEW_DEFAULT_TITLE="Mass Mail Users"
+COM_USERS_MENUS="Users"
+COM_USERS_MENUS_ADD_GROUP="Add Group"
+COM_USERS_MENUS_ADD_LEVEL="Add Access Level"
+COM_USERS_MENUS_ADD_NOTE="Add User Note"
+COM_USERS_MENUS_ADD_USER="Add User"
+COM_USERS_MENUS_FIELDS="User Fields"
+COM_USERS_MENUS_GROUPS="Groups"
+COM_USERS_MENUS_LEVELS="Access Levels"
+COM_USERS_MENUS_MISC="Miscellaneous"
+COM_USERS_MENUS_NOTE_CATEGORIES="User Note Categories"
+COM_USERS_MENUS_NOTES="User Notes"
+COM_USERS_MENUS_PRESET_USERS="Preset - Users Dashboard"
+COM_USERS_MENUS_USER_MANAGER="Manage"
+COM_USERS_MENUS_USERS="Users"
 COM_USERS_NOTES_VIEW_DEFAULT_DESC="Shows a List of User Notes"
 COM_USERS_NOTES_VIEW_DEFAULT_TITLE="User Notes"
 COM_USERS_NOTE_VIEW_EDIT_DESC="Shows a form to create a new User Note"
@@ -48,3 +62,4 @@ COM_USERS_USERS_VIEW_DEFAULT_TITLE="Users"
 COM_USERS_USER_VIEW_EDIT_DESC="Shows a form to create a new User Account"
 COM_USERS_USER_VIEW_EDIT_TITLE="Create User"
 COM_USERS_XML_DESCRIPTION="Component for managing users."
+
diff --git a/administrator/language/en-GB/lib_joomla.ini b/administrator/language/en-GB/lib_joomla.ini
index 8831ef87536..8191db01803 100644
--- a/administrator/language/en-GB/lib_joomla.ini
+++ b/administrator/language/en-GB/lib_joomla.ini
@@ -759,15 +759,6 @@ JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
 JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
 
-JLIB_MENUS_PRESET_ALTERNATE="Preset - Alternative Main Menu"
-JLIB_MENUS_PRESET_COMPONENTS="Preset - Components Dashboard"
-JLIB_MENUS_PRESET_CONTENT="Preset - Content Dashboard"
-JLIB_MENUS_PRESET_DEFAULT="Preset - Joomla Main Menu"
-JLIB_MENUS_PRESET_HELP="Preset - Help Dashboard"
-JLIB_MENUS_PRESET_MENUS="Preset - Menus Dashboard"
-JLIB_MENUS_PRESET_SYSTEM="Preset - System Dashboard"
-JLIB_MENUS_PRESET_USERS="Preset - Users Dashboard"
-
 JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
 
 JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"
diff --git a/administrator/language/en-GB/mod_menu.ini b/administrator/language/en-GB/mod_menu.ini
index 1687981ac7c..26b578bb76d 100644
--- a/administrator/language/en-GB/mod_menu.ini
+++ b/administrator/language/en-GB/mod_menu.ini
@@ -13,18 +13,6 @@ MOD_MENU_ARIA_CLOSE_SUBMENU="Close Sub Menu"
 MOD_MENU_ARIA_MAIN_MENU="Main Menu"
 MOD_MENU_CLEAR_CACHE="Clear Cache"
 MOD_MENU_COM_ACTIONLOGS="User Actions Log"
-MOD_MENU_COM_CONTENT="Content"
-MOD_MENU_COM_CONTENT_ARTICLE_MANAGER="Articles"
-MOD_MENU_COM_CONTENT_CATEGORY_MANAGER="Categories"
-MOD_MENU_COM_CONTENT_FEATURED="Featured Articles"
-MOD_MENU_COM_CONTENT_MANAGE="Content Settings"
-MOD_MENU_COM_CONTENT_MISC="Modules & Media"
-MOD_MENU_COM_CONTENT_NEW_ADMIN_MODULE="Add Administrator Module"
-MOD_MENU_COM_CONTENT_NEW_ARTICLE="Add Article"
-MOD_MENU_COM_CONTENT_NEW_CATEGORY="Add Category"
-MOD_MENU_COM_CONTENT_NEW_SITE_MODULE="Add Site Module"
-MOD_MENU_COM_CONTENT_WORKFLOW="Workflows"
-MOD_MENU_COM_CONTENT_WORKFLOW_MANAGER="Workflows"
 MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT="Content Languages"
 MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED="Installed"
 MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides"
@@ -36,19 +24,6 @@ MOD_MENU_COM_PRIVACY_DASHBOARD="Dashboard"
 MOD_MENU_COM_PRIVACY_REQUESTS="Requests"
 MOD_MENU_COM_TEMPLATES_SUBMENU_STYLES="Styles"
 MOD_MENU_COM_TEMPLATES_SUBMENU_TEMPLATES="Templates"
-MOD_MENU_COM_USERS="Users"
-MOD_MENU_COM_USERS_ADD_GROUP="Add Group"
-MOD_MENU_COM_USERS_ADD_LEVEL="Add Access Level"
-MOD_MENU_COM_USERS_ADD_NOTE="Add User Note"
-MOD_MENU_COM_USERS_ADD_USER="Add User"
-MOD_MENU_COM_USERS_FIELDS="User Fields"
-MOD_MENU_COM_USERS_GROUPS="Groups"
-MOD_MENU_COM_USERS_LEVELS="Access Levels"
-MOD_MENU_COM_USERS_MISC="Miscellaneous"
-MOD_MENU_COM_USERS_NOTE_CATEGORIES="User Note Categories"
-MOD_MENU_COM_USERS_NOTES="User Notes"
-MOD_MENU_COM_USERS_USER_MANAGER="Manage"
-MOD_MENU_COM_USERS_USERS="Users"
 MOD_MENU_COMPONENTS="Components"
 MOD_MENU_CONFIGURATION="Global Configuration"
 MOD_MENU_CONFIGURATION_MAILS="Mail Templates"
diff --git a/language/en-GB/lib_joomla.ini b/language/en-GB/lib_joomla.ini
index 8831ef87536..8191db01803 100644
--- a/language/en-GB/lib_joomla.ini
+++ b/language/en-GB/lib_joomla.ini
@@ -759,15 +759,6 @@ JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
 JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
 JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."
 
-JLIB_MENUS_PRESET_ALTERNATE="Preset - Alternative Main Menu"
-JLIB_MENUS_PRESET_COMPONENTS="Preset - Components Dashboard"
-JLIB_MENUS_PRESET_CONTENT="Preset - Content Dashboard"
-JLIB_MENUS_PRESET_DEFAULT="Preset - Joomla Main Menu"
-JLIB_MENUS_PRESET_HELP="Preset - Help Dashboard"
-JLIB_MENUS_PRESET_MENUS="Preset - Menus Dashboard"
-JLIB_MENUS_PRESET_SYSTEM="Preset - System Dashboard"
-JLIB_MENUS_PRESET_USERS="Preset - Users Dashboard"
-
 JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published."
 
 JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s"