Changes in favour of the J3.6 beta release and language freeze status.

joomla · Jun 19, 2016 · 1b0008c · 1b0008c
1 parent a2bfff3
commit 1b0008c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -73,9 +73,6 @@ MOD_MENU_INSTALLER_SUBMENU_UPDATE="Update"
 MOD_MENU_INSTALLER_SUBMENU_UPDATESITES="Update Sites"
 MOD_MENU_INSTALLER_SUBMENU_WARNINGS="Warnings"
 MOD_MENU_LOGOUT="Logout"
-MOD_MENU_MANAGE="Manage"
-MOD_MENU_MANAGE_SYSTEM="System"
-MOD_MENU_MANAGE_EXTENSIONS="Extensions"
 MOD_MENU_MASS_MAIL_USERS="Mass Mail Users"
 MOD_MENU_MEDIA_MANAGER="Media"
 MOD_MENU_MENUS="Menus"

diff --git a/administrator/modules/mod_menu/tmpl/default_disabled.php b/administrator/modules/mod_menu/tmpl/default_disabled.php
@@ -78,7 +78,7 @@
 
 if ($ju || $pi || $im || $mm || $pm || $tm || $lm)
 {
-	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MANAGE'), null, 'disabled'));
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), null, 'disabled'));
 }
 
 /**

diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -305,11 +305,11 @@
 
 if ($ju || $pi || $im || $mm || $pm || $tm || $lm)
 {
-	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MANAGE'), '#'), true);
+	$menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSION_MANAGER'), '#'), true);
 
 	if ($ju || $pi || $im)
 	{
-		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MANAGE_SYSTEM'), '#', 'class:install'), true);
+		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#', 'class:install'), true);
 
 		if ($ju)
 		{
@@ -338,7 +338,7 @@
 
 	if ($im)
 	{
-		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_MANAGE_EXTENSIONS'), '#', 'class:install'), $im);
+		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#', 'class:install'), $im);
 
 		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_INSTALL'), 'index.php?option=com_installer', 'class:install'));
 		$menu->addChild(new JMenuNode(JText::_('MOD_MENU_INSTALLER_SUBMENU_UPDATE'), 'index.php?option=com_installer&view=update', 'class:install'));