diff --git a/app/administrator/components/com_config/language/en-GB/en-GB.com_config.ini b/app/administrator/components/com_config/language/en-GB/en-GB.com_config.ini index 18b038dec2..96873b523f 100644 --- a/app/administrator/components/com_config/language/en-GB/en-GB.com_config.ini +++ b/app/administrator/components/com_config/language/en-GB/en-GB.com_config.ini @@ -18,11 +18,10 @@ COM_CONFIG_ERROR_COMPONENT_ASSET_NOT_FOUND="The asset for the component could no COM_CONFIG_ERROR_CONFIG_EXTENSION_NOT_FOUND="The Global Configuration extension could not be found." COM_CONFIG_ERROR_ROOT_ASSET_NOT_FOUND="The asset for global configuration could not be found. Permissions have not been saved." COM_CONFIG_ERROR_REMOVING_SUPER_ADMIN="You cannot remove your own Super User permissions." -COM_CONFIG_GLOBAL_CONFIGURATION="Global Configuration" +COM_CONFIG_GLOBAL_CONFIGURATION="System Settings" COM_CONFIG_PERMISSION_SETTINGS="Permission Settings" COM_CONFIG_PERMISSIONS="Permissions" COM_CONFIG_SAVE_SUCCESS="Configuration successfully saved." COM_CONFIG_XML_DESCRIPTION="Configuration Manager" COM_CONFIG_SYSTEM="System" -COM_CONFIG_SYSTEM_SETTINGS="System Settings" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that:
Inherited means that the permissions from the parent group will be used.
Denied means that no matter what the parent group's setting is, the group being edited cannot take this action.
Allowed means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
Not Set is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items.
2. If you select a new setting, click Save to refresh the calculated settings." +COM_CONFIG_SYSTEM_SETTINGS="System Settings" \ No newline at end of file diff --git a/app/administrator/components/com_cpanel/language/en-GB/en-GB.com_cpanel.ini b/app/administrator/components/com_cpanel/language/en-GB/en-GB.com_cpanel.ini index de891bd4a4..7380583f3c 100644 --- a/app/administrator/components/com_cpanel/language/en-GB/en-GB.com_cpanel.ini +++ b/app/administrator/components/com_cpanel/language/en-GB/en-GB.com_cpanel.ini @@ -3,13 +3,13 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_CPANEL="Control Panel" +COM_CPANEL="Dashboard" COM_CPANEL_HEADER_SUBMENU="Submenu" COM_CPANEL_HEADER_SYSTEM="System" COM_CPANEL_LINK_CHECKIN="Global Check-in" COM_CPANEL_LINK_CLEAR_CACHE="Clear Cache" COM_CPANEL_LINK_DASHBOARD="Dashboard" -COM_CPANEL_LINK_GLOBAL_CONFIG="Global Configuration" +COM_CPANEL_LINK_GLOBAL_CONFIG="System Settings" COM_CPANEL_LINK_SYSINFO="System Information" COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages that require your attention. To view those messages please click on the Review Messages button below." COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE="You can review the messages at any time by clicking on the Components, Post-installation messages menu item of your site's administrator section. This information area won't appear when you have hidden all messages." diff --git a/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.ini b/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.ini index d6da680e01..82899b8b8d 100644 --- a/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.ini +++ b/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.ini @@ -3,8 +3,8 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_LANGUAGES="Language Manager" -COM_LANGUAGES_CONFIGURATION="Language Manager Options" +COM_LANGUAGES="Languages" +COM_LANGUAGES_CONFIGURATION="Language Settings" COM_LANGUAGES_ERR_DELETE="Select a language to delete" COM_LANGUAGES_ERR_NO_LANGUAGE_SELECTED="No Language Selected" COM_LANGUAGES_ERR_PUBLISH="Select a language to publish" @@ -76,9 +76,8 @@ COM_LANGUAGES_SEARCH_IN_TITLE="Search in title" COM_LANGUAGES_SUBMENU_CONTENT="Content" COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR="Installed - Administrator" COM_LANGUAGES_SUBMENU_INSTALLED_SITE="Installed - Site" -COM_LANGUAGES_VIEW_INSTALLED_TITLE="Language Manager: Installed Languages" -COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Language Manager: Edit Content Language" -COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Language Manager: New Content Language" -COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Language Manager: Content Languages" -COM_LANGUAGES_XML_DESCRIPTION="Component for language management" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." +COM_LANGUAGES_VIEW_INSTALLED_TITLE="Languages: Installed Languages" +COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Languages: Edit Content Language" +COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language" +COM_LANGUAGES_VIEW_LANGUAGES_TITLE="Languages: Content Languages" +COM_LANGUAGES_XML_DESCRIPTION="Component for language management" \ No newline at end of file diff --git a/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.sys.ini b/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.sys.ini index 9e3826532f..ac96a5d181 100644 --- a/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.sys.ini +++ b/app/administrator/components/com_languages/language/en-GB/en-GB.com_languages.sys.ini @@ -3,5 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_LANGUAGES="Language Manager" +COM_LANGUAGES="Languages" COM_LANGUAGES_XML_DESCRIPTION="Component for language management" diff --git a/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.ini b/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.ini index 95d95a9f5c..664329a495 100644 --- a/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.ini +++ b/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.ini @@ -3,7 +3,7 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_MENUS="Menus Manager" +COM_MENUS="Menus" COM_MENUS_ADD_MENU_MODULE="Add a module for this menu type." COM_MENUS_ADVANCED_FIELDSET_LABEL="Advanced" COM_MENUS_BASIC_FIELDSET_LABEL="Options" @@ -12,7 +12,7 @@ COM_MENUS_BATCH_MENU_ITEM_CANNOT_EDIT="You are not allowed to edit menu items." COM_MENUS_BATCH_MENU_LABEL="Select Menu or Parent for Move/Copy" COM_MENUS_BATCH_OPTIONS="Batch process the selected menu items" COM_MENUS_BATCH_TIP="If a menu or parent is selected for move/copy, any actions selected will be applied to the copied or moved menu items. Otherwise, all actions are applied to the selected menu items." -COM_MENUS_CONFIGURATION="Menus Configuration" +COM_MENUS_CONFIGURATION="Menu Settings" COM_MENUS_EDIT_MODULE_SETTINGS="Edit module settings" COM_MENUS_ERROR_ALL_LANGUAGE_ASSOCIATED="A menu item set to All languages can't be associated. Associations have not been set." COM_MENUS_ERROR_ALREADY_HOME="Menu item already set to home" @@ -170,11 +170,10 @@ COM_MENUS_TYPE_SEPARATOR="Text Separator" COM_MENUS_TYPE_SEPARATOR_DESC="A text separator." COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist" COM_MENUS_TYPE_UNKNOWN="Unknown" -COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menu Manager: Edit Menu Item" -COM_MENUS_VIEW_EDIT_MENU_TITLE="Menu Manager: Edit Menu" -COM_MENUS_VIEW_ITEMS_TITLE="Menu Manager: Menu Items" -COM_MENUS_VIEW_MENUS_TITLE="Menu Manager: Menus" -COM_MENUS_VIEW_NEW_ITEM_TITLE="Menu Manager: New Menu Item" -COM_MENUS_VIEW_NEW_MENU_TITLE="Menu Manager: Add Menu" -COM_MENUS_XML_DESCRIPTION="Component for creating menus" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." +COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menus: Edit Menu Item" +COM_MENUS_VIEW_EDIT_MENU_TITLE="Menu: Edit Menu" +COM_MENUS_VIEW_ITEMS_TITLE="Menus: Menu Items" +COM_MENUS_VIEW_MENUS_TITLE="Menus: Menus" +COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Menu Item" +COM_MENUS_VIEW_NEW_MENU_TITLE="Menus: Add Menu" +COM_MENUS_XML_DESCRIPTION="Component for creating menus" \ No newline at end of file diff --git a/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.sys.ini b/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.sys.ini index 19d946c01f..2ff080ee9d 100644 --- a/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.sys.ini +++ b/app/administrator/components/com_menus/language/en-GB/en-GB.com_menus.sys.ini @@ -3,6 +3,6 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_MENUS="Menus Manager" +COM_MENUS="Menus" COM_MENUS_XML_DESCRIPTION="Component for creating menus" diff --git a/app/administrator/components/com_modules/helpers/xml.php b/app/administrator/components/com_modules/helpers/xml.php index a955fb3435..d1b13c3e0a 100644 --- a/app/administrator/components/com_modules/helpers/xml.php +++ b/app/administrator/components/com_modules/helpers/xml.php @@ -33,7 +33,7 @@ public function parseXMLModuleFile(&$rows) { $rows[$i]->name = 'custom'; $rows[$i]->module = 'custom'; - $rows[$i]->descrip = 'Custom created module, using Module Manager New function'; + $rows[$i]->descrip = 'Custom created module, using Modules New function'; } else { diff --git a/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.ini b/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.ini index 2b8404f291..cf20728d00 100644 --- a/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.ini +++ b/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.ini @@ -15,7 +15,7 @@ COM_MODULES_BATCH_OPTIONS="Batch process the selected modules" COM_MODULES_BATCH_TIP="If choosing to copy a module, any other actions selected will be applied to the copied module. Otherwise, all actions are applied to the selected module. When copying and not changing position, it is nevertheless necessary to select 'Keep Original Position' in the dropdown" COM_MODULES_CHANGE_POSITION_BUTTON="Select" COM_MODULES_CHANGE_POSITION_TITLE="Change" -COM_MODULES_CONFIGURATION="Module Manager Options" +COM_MODULES_CONFIGURATION="Module Settings" COM_MODULES_CUSTOM_OUTPUT="Custom Output" COM_MODULES_ERR_XML="Module XML data not available" COM_MODULES_ERROR_CANNOT_FIND_MODULE="Cannot find module" @@ -73,10 +73,10 @@ COM_MODULES_HTML_PUBLISH_DISABLED="Publish module::Extension disabled" COM_MODULES_HTML_PUBLISH_ENABLED="Publish module::Extension enabled" COM_MODULES_HTML_UNPUBLISH_DISABLED="Unpublish module::Extension disabled" COM_MODULES_HTML_UNPUBLISH_ENABLED="Unpublish module::Extension enabled" -COM_MODULES_MANAGER_MODULE="Module Manager: Module %s" -COM_MODULES_MANAGER_MODULE_ADD="Module Manager: Add New Module" -COM_MODULES_MANAGER_MODULE_EDIT="Module Manager: Edit Module" -COM_MODULES_MANAGER_MODULES="Module Manager: Modules" +COM_MODULES_MANAGER_MODULE="Modules: %s" +COM_MODULES_MANAGER_MODULE_ADD="Modules: Add Module" +COM_MODULES_MANAGER_MODULE_EDIT="Modules: Edit Module" +COM_MODULES_MANAGER_MODULES="Modules: Modules" COM_MODULES_MENU_ASSIGNMENT="Menu Assignment" COM_MODULES_MODULE_ASSIGN="Module Assignment" COM_MODULES_MODULE="Module" @@ -169,7 +169,6 @@ COM_MODULES_XML_DESCRIPTION="Component for module management in backend" COM_MODULES_ADD_CUSTOM_POSITION="Add custom position" COM_MODULES_CUSTOM_POSITION="Custom Position" COM_MODULES_TYPE_OR_SELECT_POSITION="Type or Select a Position" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." COM_MODULES_DESELECT="Deselect" COM_MODULES_EXPAND="Expand" COM_MODULES_COLLAPSE="Collapse" diff --git a/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.sys.ini b/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.sys.ini index 9dd3bc3b41..76920607f1 100644 --- a/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.sys.ini +++ b/app/administrator/components/com_modules/language/en-GB/en-GB.com_modules.sys.ini @@ -3,6 +3,6 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_MODULES="Module Manager" +COM_MODULES="Modules" COM_MODULES_XML_DESCRIPTION="Component for module management on the backend." diff --git a/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.ini b/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.ini index 0f5c77beff..a9c216ca43 100644 --- a/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.ini +++ b/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.ini @@ -3,10 +3,10 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_PLUGINS="Plugin Manager" +COM_PLUGINS="Plugins" COM_PLUGINS_ADVANCED_FIELDSET_LABEL="Advanced" COM_PLUGINS_BASIC_FIELDSET_LABEL="Basic" -COM_PLUGINS_CONFIGURATION="Plugin Manager Options" +COM_PLUGINS_CONFIGURATION="Plugin Settings" COM_PLUGINS_ELEMENT_HEADING="Element" COM_PLUGINS_ERROR_FILE_NOT_FOUND="The file %s could not be found." COM_PLUGINS_FIELD_ELEMENT_DESC="Plugin main file name" @@ -17,8 +17,8 @@ COM_PLUGINS_FIELD_FOLDER_LABEL="Plugin Type" COM_PLUGINS_FIELD_NAME_DESC="The name of the plugin as defined in its xml" COM_PLUGINS_FIELD_NAME_LABEL="Plugin Name" COM_PLUGINS_FOLDER_HEADING="Type" -COM_PLUGINS_MANAGER_PLUGIN="Plugin Manager: %s" -COM_PLUGINS_MANAGER_PLUGINS="Plugin Manager: Plugins" +COM_PLUGINS_MANAGER_PLUGIN="Plugin: %s" +COM_PLUGINS_MANAGER_PLUGINS="Plugins" COM_PLUGINS_MSG_MANAGE_NO_PLUGINS="There are no plugins installed matching your query" COM_PLUGINS_N_ITEMS_CHECKED_IN_0="No plugin successfully checked in" COM_PLUGINS_N_ITEMS_CHECKED_IN_1="%d plugin successfully checked in" @@ -37,5 +37,4 @@ COM_PLUGINS_SEARCH_IN_TITLE="Search in plugin title." COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla! plugins" COM_PLUGINS_XML_ERR="Plugins XML data not available" JLIB_HTML_PUBLISH_ITEM="Enable plugin" -JLIB_HTML_UNPUBLISH_ITEM="Disable plugin" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." +JLIB_HTML_UNPUBLISH_ITEM="Disable plugin" \ No newline at end of file diff --git a/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.sys.ini b/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.sys.ini index c547b98b20..de8048fd2c 100644 --- a/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.sys.ini +++ b/app/administrator/components/com_plugins/language/en-GB/en-GB.com_plugins.sys.ini @@ -3,5 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_PLUGINS="Plugins Manager" +COM_PLUGINS="Plugins" COM_PLUGINS_XML_DESCRIPTION="This component manages Joomla! plugins" diff --git a/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.ini b/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.ini index e466f7017d..e519e70058 100644 --- a/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.ini +++ b/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.ini @@ -3,7 +3,7 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_TEMPLATES="Template Manager" +COM_TEMPLATES="Templates" COM_TEMPLATES_ADVANCED_FIELDSET_LABEL="Advanced" COM_TEMPLATES_ARE_YOU_SURE="Are you sure?" COM_TEMPLATES_ASSIGNED_1="Assigned to one menu item" @@ -41,9 +41,9 @@ COM_TEMPLATES_CONFIG_SOURCE_DESC="These file types will be available for editing COM_TEMPLATES_CONFIG_SOURCE_LABEL="Valid Source Formats" COM_TEMPLATES_CONFIG_SUPPORTED_DESC="Be careful before changing the file types. Read the tool tips before editing." COM_TEMPLATES_CONFIG_SUPPORTED_LABEL="Supported File Formats" -COM_TEMPLATES_CONFIG_UPLOAD_DESC="The maximum upload size for files inside Template Manager." +COM_TEMPLATES_CONFIG_UPLOAD_DESC="The maximum upload size for files inside Templates." COM_TEMPLATES_CONFIG_UPLOAD_LABEL="Upload Size (MB)" -COM_TEMPLATES_CONFIGURATION="Template Manager Options" +COM_TEMPLATES_CONFIGURATION="Template Settings" COM_TEMPLATES_COPY_SUCCESS="New template called %s was installed successfully." COM_TEMPLATES_CROP_AREA_ERROR="Crop area not selected." COM_TEMPLATES_DIRECTORY_NOT_WRITABLE="The template directory is not writable. Some features may not work." @@ -136,7 +136,7 @@ COM_TEMPLATES_FOLDER_NOT_EXISTS="The folder does not exist." COM_TEMPLATES_GRID_UNSET_LANGUAGE="Unset %s Default" COM_TEMPLATES_HOME_BUTTON="Documentation" COM_TEMPLATES_HOME_HEADING="Select a File" -COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customising the look of your templates. The Template Manager supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Just select a file and you are good to go. Check the documentation if you want to know more." +COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customising the look of your templates. The Templates supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Just select a file and you are good to go. Check the documentation if you want to know more." COM_TEMPLATES_HEADING_ASSIGNED="Assigned" COM_TEMPLATES_HEADING_DEFAULT="Default" COM_TEMPLATES_HEADING_STYLE="Style" @@ -146,14 +146,14 @@ COM_TEMPLATES_IMAGE_WIDTH="Width" COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name containing a-z, A-Z, 0-9, - and _." COM_TEMPLATES_INVALID_FILE_TYPE="File type not selected." COM_TEMPLATES_INVALID_FOLDER_NAME="Invalid folder name. Please choose a folder name containing a-z, A-Z, 0-9, - and _." -COM_TEMPLATES_MANAGER="Template Manager" -COM_TEMPLATES_MANAGER_ADD_STYLE="Template Manager: Add Style" -COM_TEMPLATES_MANAGER_EDIT_FILE="Template Manager: Edit File" -COM_TEMPLATES_MANAGER_EDIT_STYLE="Template Manager: Edit Style" +COM_TEMPLATES_MANAGER="Templates" +COM_TEMPLATES_MANAGER_ADD_STYLE="Template: Add Style" +COM_TEMPLATES_MANAGER_EDIT_FILE="Template: Edit File" +COM_TEMPLATES_MANAGER_EDIT_STYLE="Template: Edit Style" COM_TEMPLATES_MANAGE_FOLDERS="Manage Folders" -COM_TEMPLATES_MANAGER_STYLES="Template Manager: Styles" -COM_TEMPLATES_MANAGER_TEMPLATES="Template Manager: Templates" -COM_TEMPLATES_MANAGER_VIEW_TEMPLATE="Template Manager: Customise Template" +COM_TEMPLATES_MANAGER_STYLES="Templates: Styles" +COM_TEMPLATES_MANAGER_TEMPLATES="Templates" +COM_TEMPLATES_MANAGER_VIEW_TEMPLATE="Template: Customise Template" COM_TEMPLATES_MENU_CHANGED_1="One menu item has been assigned or unassigned to this style" COM_TEMPLATES_MENU_CHANGED_MORE="%d menu items have been assigned or unassigned to this style" COM_TEMPLATES_MENUS_ASSIGNMENT="Menus assignment" @@ -216,4 +216,3 @@ COM_TEMPLATES_TEMPLATES_FILTER_SEARCH_DESC="Search in template name or folder na COM_TEMPLATES_TOGGLE_FULL_SCREEN="Press Ctrl-Q to toggle Full Screen editing." COM_TEMPLATES_TOOLBAR_SET_HOME="Default" COM_TEMPLATES_XML_DESCRIPTION="This component manages templates" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." diff --git a/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.sys.ini b/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.sys.ini index 782749512c..624d115e5f 100644 --- a/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.sys.ini +++ b/app/administrator/components/com_templates/language/en-GB/en-GB.com_templates.sys.ini @@ -3,5 +3,5 @@ ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -COM_TEMPLATES="Template Manager" +COM_TEMPLATES="Templates" COM_TEMPLATES_XML_DESCRIPTION="This component manages templates" diff --git a/app/administrator/components/com_users/language/en-GB/en-GB.com_users.ini b/app/administrator/components/com_users/language/en-GB/en-GB.com_users.ini index 5429fb97ce..64fe9c0dc0 100644 --- a/app/administrator/components/com_users/language/en-GB/en-GB.com_users.ini +++ b/app/administrator/components/com_users/language/en-GB/en-GB.com_users.ini @@ -12,11 +12,11 @@ COM_USERS_OPTION_RANGE_PAST_YEAR="in the last year" COM_USERS_OPTION_RANGE_POST_YEAR="more than a year ago" COM_USERS_OPTION_RANGE_TODAY="today" -COM_USERS="Users Manager" +COM_USERS="Users" COM_USERS_ACTIONS_AVAILABLE="Actions Permitted" COM_USERS_ACTIVATED="Activated" COM_USERS_ADD_NOTE="Add a note" -COM_USERS_ASSIGNED_GROUPS="Assigned User Groups" +COM_USERS_ASSIGNED_GROUPS="Groups" COM_USERS_BATCH_ADD="Add To Group" COM_USERS_BATCH_DELETE="Delete From Group" COM_USERS_BATCH_GROUP="Select Group" @@ -24,7 +24,7 @@ COM_USERS_BATCH_OPTIONS="Batch process the selected users" COM_USERS_BATCH_SET="Set To Group" COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_DESC="If set to Yes, new Users are allowed to self-register." COM_USERS_CONFIG_FIELD_ALLOWREGISTRATION_LABEL="Allow User Registration" -COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin Manager.
If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration." +COM_USERS_CONFIG_FIELD_CAPTCHA_DESC="Select the captcha plugin that will be used in the registration, password and username reminder forms. You may need to enter required information for your captcha plugin in the Plugin.
If 'Use Default' is selected, make sure a captcha plugin is selected in Global Configuration." COM_USERS_CONFIG_FIELD_CAPTCHA_LABEL="Captcha" COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_DESC="Allow users to change their Login name when editing their profile." COM_USERS_CONFIG_FIELD_CHANGEUSERNAME_LABEL="Change Login Name" @@ -62,7 +62,7 @@ COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_ADMINACTIVATION="Admin" COM_USERS_CONFIG_FIELD_USERACTIVATION_OPTION_SELFACTIVATION="Self" COM_USERS_CONFIG_IMPORT_FAILED="An error was encountered while importing the configuration: %s." COM_USERS_CONFIG_SAVE_FAILED="An error was encountered while saving the configuration: %s." -COM_USERS_CONFIGURATION="Users Configuration" +COM_USERS_CONFIGURATION="Users Settings" COM_USERS_DEBUG_EXPLICIT_ALLOW="Allowed" COM_USERS_DEBUG_EXPLICIT_DENY="Forbidden" COM_USERS_DEBUG_GROUP="Debug Permissions Report" @@ -76,7 +76,7 @@ COM_USERS_EDIT_USER="Edit User %s" COM_USERS_EMPTY_REVIEW="-" COM_USERS_EMPTY_SUBJECT="- No subject -" COM_USERS_ERROR_INVALID_GROUP="Invalid Group" -COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED="No View Permission Level(s) selected." +COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED="No Presets(s) selected." COM_USERS_ERROR_NO_ADDITIONS="The selected user(s) are already assigned to the selected group." COM_USERS_ERROR_VIEW_LEVEL_IN_USE="You cannot delete the view access level '%d:%s' because it is being used by content." COM_USERS_ERROR_SECRET_CODE_WITHOUT_TFA="You have entered a Secret Code but two factor authentication is not enabled in your user account. If you want to use a secret code to secure your login please edit your user profile and enable two factor authentication." @@ -114,7 +114,7 @@ COM_USERS_HEADING_ENABLED="Enabled" COM_USERS_HEADING_ENABLED_ASC="Enabled ascending" COM_USERS_HEADING_ENABLED_DESC="Enabled descending" COM_USERS_HEADING_GROUP_TITLE="Group Title" -COM_USERS_HEADING_GROUPS="User Groups" +COM_USERS_HEADING_GROUPS="Groups" COM_USERS_HEADING_LAST_VISIT_DATE="Last Visit Date" COM_USERS_HEADING_LAST_VISIT_DATE_ASC="Last visit date ascending" COM_USERS_HEADING_LAST_VISIT_DATE_DESC="Last visit date descending" @@ -129,13 +129,13 @@ COM_USERS_HEADING_REGISTRATION_DATE="Registration Date" COM_USERS_HEADING_REGISTRATION_DATE_ASC="Registration date ascending" COM_USERS_HEADING_REGISTRATION_DATE_DESC="Registration date descending" COM_USERS_HEADING_USERS_IN_GROUP="Users in group" -COM_USERS_LEVEL_DETAILS="Level Details" -COM_USERS_LEVEL_FIELD_TITLE_DESC="Enter a Title for this Access level." -COM_USERS_LEVEL_FIELD_TITLE_LABEL="Level Title" +COM_USERS_LEVEL_DETAILS="Details" +COM_USERS_LEVEL_FIELD_TITLE_DESC="Enter a Title for this preset." +COM_USERS_LEVEL_FIELD_TITLE_LABEL="Title" COM_USERS_LEVEL_HEADER_ERROR="User header access level error" COM_USERS_LEVEL_SAVE_SUCCESS="Access level successfully saved" -COM_USERS_LEVELS_N_ITEMS_DELETED="%d View Permission Level successfully deleted" -COM_USERS_LEVELS_N_ITEMS_DELETED_1="One View Permission Level successfully deleted" +COM_USERS_LEVELS_N_ITEMS_DELETED="%d Preset successfully deleted" +COM_USERS_LEVELS_N_ITEMS_DELETED_1="One Preset successfully deleted" COM_USERS_MAIL_DETAILS="Details" COM_USERS_MAIL_EMAIL_SENT_TO_N_USERS="Email sent to %s users" COM_USERS_MAIL_EMAIL_SENT_TO_N_USERS_1="Email sent to one user" @@ -187,7 +187,7 @@ COM_USERS_N_USERS_UNBLOCKED_0="No User enabled" COM_USERS_N_USERS_UNBLOCKED_1="User enabled" COM_USERS_NEW_NOTE="New note" COM_USERS_NO_ACTION="No Action" -COM_USERS_NO_LEVELS_SELECTED="No Viewing Access Levels selected" +COM_USERS_NO_LEVELS_SELECTED="No Presets selected" COM_USERS_OPTION_LEVEL_COMPONENT="%d (component)" COM_USERS_OPTION_LEVEL_DEEPER="%d (deeper)" COM_USERS_OPTION_SELECT_COMPONENT="- Select Component -" @@ -196,16 +196,16 @@ COM_USERS_OPTION_SELECT_LEVEL_START="- Select Start Level -" COM_USERS_PASSWORD_RESET_REQUIRED="Password Reset Required" COM_USERS_REQUIRE_PASSWORD_RESET="Require Password Reset" COM_USERS_REVIEW_HEADING="Review date" -COM_USERS_SEARCH_ACCESS_LEVELS="Search Viewing Access Levels" +COM_USERS_SEARCH_ACCESS_LEVELS="Search Presets" COM_USERS_SEARCH_ASSETS="Search Assets" -COM_USERS_SEARCH_GROUPS_LABEL="Search User Groups" +COM_USERS_SEARCH_GROUPS_LABEL="Search Groups" COM_USERS_SEARCH_IN_GROUPS="Search in title" COM_USERS_SEARCH_IN_NAME="Search in name" COM_USERS_SEARCH_TITLE_LEVELS="Search for Access Levels." COM_USERS_SEARCH_USERS="Search Users" COM_USERS_SETTINGS_FIELDSET_LABEL="Basic Settings" -COM_USERS_SUBMENU_GROUPS="User Groups" -COM_USERS_SUBMENU_LEVELS="Viewing Access Levels" +COM_USERS_SUBMENU_GROUPS="Groups" +COM_USERS_SUBMENU_LEVELS="Presets" COM_USERS_SUBMENU_USERS="Users" COM_USERS_SUBJECT_HEADING="Subject" COM_USERS_TOOLBAR_ACTIVATE="Activate" @@ -250,7 +250,7 @@ COM_USERS_USER_FIELD_TIMEZONE_DESC="Time zone for this user" COM_USERS_USER_FIELD_TIMEZONE_LABEL="Time Zone" COM_USERS_USER_FIELD_USERNAME_DESC="Enter the login name (Username) for the user." COM_USERS_USER_FIELD_USERNAME_LABEL="Login Name" -COM_USERS_USER_GROUPS_HAVING_ACCESS="User Groups Having Viewing Access" +COM_USERS_USER_GROUPS_HAVING_ACCESS="Groups" COM_USERS_USER_HEADING="User" COM_USERS_USER_SAVE_FAILED="An error was encountered while saving the member: %s." COM_USERS_USER_SAVE_SUCCESS="User successfully saved." @@ -264,20 +264,18 @@ COM_USERS_USERS_N_ITEMS_DELETED_1="One user successfully deleted" COM_USERS_USERS_NO_ITEM_SELECTED="No Users selected" COM_USERS_VIEW_DEBUG_GROUP_TITLE="Debug Permissions Report for Group #%d, %s" COM_USERS_VIEW_DEBUG_USER_TITLE="Debug Permissions Report for User #%d, %s" -COM_USERS_VIEW_EDIT_GROUP_TITLE="User Manager: Edit Group" -COM_USERS_VIEW_EDIT_LEVEL_TITLE="User Manager: Edit Viewing Access Level" -COM_USERS_VIEW_EDIT_PROFILE_TITLE="User Manager: Edit Profile" -COM_USERS_VIEW_EDIT_USER_TITLE="User Manager: Edit User" -COM_USERS_VIEW_GROUPS_TITLE="User Manager: User Groups" -COM_USERS_VIEW_LEVELS_TITLE="User Manager: Viewing Access Levels" -COM_USERS_VIEW_NEW_GROUP_TITLE="User Manager: Add New User Group" -COM_USERS_VIEW_NEW_LEVEL_TITLE="User Manager: Add New Viewing Access Level" -COM_USERS_VIEW_NEW_USER_TITLE="User Manager: Add New User" -COM_USERS_VIEW_NOTES_TITLE="User Notes" -COM_USERS_VIEW_USERS_TITLE="User Manager: Users" +COM_USERS_VIEW_EDIT_GROUP_TITLE="Users: Edit Group" +COM_USERS_VIEW_EDIT_LEVEL_TITLE="Users: Edit Preset" +COM_USERS_VIEW_EDIT_PROFILE_TITLE="Users: Edit Profile" +COM_USERS_VIEW_EDIT_USER_TITLE="Users: Edit User" +COM_USERS_VIEW_GROUPS_TITLE="Users: Groups" +COM_USERS_VIEW_LEVELS_TITLE="Users: Presets" +COM_USERS_VIEW_NEW_GROUP_TITLE="Users: Add Group" +COM_USERS_VIEW_NEW_LEVEL_TITLE="Users: Add Preset" +COM_USERS_VIEW_NEW_USER_TITLE="Users: Add User" +COM_USERS_VIEW_USERS_TITLE="Users" COM_USERS_VIEW_PROFILE_TITLE="My Profile" COM_USERS_XML_DESCRIPTION="Component for managing users" -JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:
Inherited means that the permissions from global configuration and parent group will be used.
Denied means that no matter what the global configuration or parent group settings are, the group being edited cannot take this action on this component.
Allowed means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by Not Allowed (Locked) under Calculated Settings).
2. If you select a new setting, click Save to refresh the calculated settings." COM_USERS_USER_FIELD_BACKEND_LANGUAGE_DESC="Select the Language for the Administrator Backend interface. This will only affect this User." COM_USERS_USER_FIELD_BACKEND_LANGUAGE_LABEL="Backend Language" diff --git a/app/administrator/components/com_users/language/en-GB/en-GB.com_users.sys.ini b/app/administrator/components/com_users/language/en-GB/en-GB.com_users.sys.ini index d11d2e667b..6d16cfbcf6 100644 --- a/app/administrator/components/com_users/language/en-GB/en-GB.com_users.sys.ini +++ b/app/administrator/components/com_users/language/en-GB/en-GB.com_users.sys.ini @@ -21,5 +21,5 @@ COM_USER_REMIND_VIEW_DEFAULT_TITLE="Username Reminder Request" COM_USER_RESET_VIEW_DEFAULT_DESC="Displays a request to Reset Password" COM_USER_RESET_VIEW_DEFAULT_OPTION="Default" COM_USER_RESET_VIEW_DEFAULT_TITLE="Password Reset" -COM_USERS="Users Manager" +COM_USERS="Users" COM_USERS_XML_DESCRIPTION="Component for managing users" diff --git a/app/administrator/language/en-GB/en-GB.ini b/app/administrator/language/en-GB/en-GB.ini index 268c1f2481..0378ff0891 100644 --- a/app/administrator/language/en-GB/en-GB.ini +++ b/app/administrator/language/en-GB/en-GB.ini @@ -774,7 +774,7 @@ JTOOLBAR_EXPORT="Export" JTOOLBAR_HELP="Help" JTOOLBAR_INSTALL="Install" JTOOLBAR_NEW="New" -JTOOLBAR_OPTIONS="Options" +JTOOLBAR_OPTIONS="Settings" JTOOLBAR_PUBLISH="Publish" JTOOLBAR_PURGE_CACHE="Purge Cache" JTOOLBAR_REBUILD="Rebuild" diff --git a/app/administrator/modules/mod_menu/language/en-GB/en-GB.mod_menu.ini b/app/administrator/modules/mod_menu/language/en-GB/en-GB.mod_menu.ini index 8b7c49979b..558c2a7b63 100644 --- a/app/administrator/modules/mod_menu/language/en-GB/en-GB.mod_menu.ini +++ b/app/administrator/modules/mod_menu/language/en-GB/en-GB.mod_menu.ini @@ -7,58 +7,33 @@ MOD_MENU="Administrator Menu" MOD_MENU_CLEAR_CACHE="Clear Cache" MOD_MENU_COMPONENTS="Components" MOD_MENU_COM_USERS="Users" -MOD_MENU_COM_USERS_ADD_GROUP="Add New Group" -MOD_MENU_COM_USERS_ADD_LEVEL="Add New Access Level" -MOD_MENU_COM_USERS_ADD_USER="Add New User" +MOD_MENU_COM_USERS_ADD_GROUP="Add Group" +MOD_MENU_COM_USERS_ADD_LEVEL="Add Preset" +MOD_MENU_COM_USERS_ADD_USER="Add User" MOD_MENU_COM_USERS_GROUPS="Groups" -MOD_MENU_COM_USERS_LEVELS="Access Levels" +MOD_MENU_COM_USERS_LEVELS="Presets" MOD_MENU_COM_USERS_USERS="Users" -MOD_MENU_COM_USERS_USER_MANAGER="User Manager" -MOD_MENU_CONFIGURATION="Global Configuration" -MOD_MENU_CONTROL_PANEL="Control Panel" +MOD_MENU_COM_USERS_USER_MANAGER="Users" +MOD_MENU_CONFIGURATION="Settings" +MOD_MENU_CONTROL_PANEL="Dashboard" MOD_MENU_EXTENSIONS_EXTENSIONS="Extensions" -MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Extension Manager" -MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Language Manager" -MOD_MENU_EXTENSIONS_MODULE_MANAGER="Module Manager" -MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plugin Manager" -MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER="Template Manager" -MOD_MENU_FIELD_FORUMURL_DESC="Enter the URL to a forum other than the default." -MOD_MENU_FIELD_FORUMURL_LABEL="Custom Support Forum" -MOD_MENU_FIELD_SHOWHELP="Help Menu" -MOD_MENU_FIELD_SHOWHELP_DESC="Show or hide the Help menu which includes links to various joomla.org sites useful to users." +MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Extensions" +MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Languages" +MOD_MENU_EXTENSIONS_MODULE_MANAGER="Modules" +MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plugins" +MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER="Templates" MOD_MENU_FIELD_SHOWNEW="Add New Shortcuts" MOD_MENU_FIELD_SHOWNEW_DESC="Show or hide various 'Add New...' shortcuts against users, groups, access levels, articles and categories." MOD_MENU_GLOBAL_CHECKIN="Global Check-in" -MOD_MENU_HELP="Help" -MOD_MENU_HELP_COMMUNITY="Community Portal" -MOD_MENU_HELP_CURRENT="Help with this page" -MOD_MENU_HELP_DEVELOPER="Developer Resources" -MOD_MENU_HELP_DOCUMENTATION="Documentation Wiki" -MOD_MENU_HELP_EXTENSIONS="Joomla! Extensions" -MOD_MENU_HELP_JOOMLA="Joomla! Help" -MOD_MENU_HELP_LINKS="Useful Joomla! links" -MOD_MENU_HELP_RESOURCES="Joomla! Resources" -MOD_MENU_HELP_SECURITY="Security Center" -MOD_MENU_HELP_SHOP="Joomla! Shop" -MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum" -; the string below will be used if the localised sample data contains an URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Admin Menu module contains an url -MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" -; the string below will be used if MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE has a value, i.e the # of the specific language forum in forum.joomla.org -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official [language] forum" -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="" -MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations" MOD_MENU_HOME_DEFAULT="Home" MOD_MENU_HOME_MULTIPLE="Warning! Multiple homes!" MOD_MENU_LOGOUT="Logout" -MOD_MENU_MASS_MAIL_USERS="Mass Mail Users" -MOD_MENU_MEDIA_MANAGER="Media Manager" +MOD_MENU_MEDIA_MANAGER="Files" MOD_MENU_MENUS="Menus" -MOD_MENU_MENU_MANAGER="Menu Manager" -MOD_MENU_MENU_MANAGER_NEW_MENU="Add New Menu" -MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add New Menu Item" -MOD_MENU_NEW_PRIVATE_MESSAGE="New Private Message" +MOD_MENU_MENU_MANAGER="Menus" +MOD_MENU_MENU_MANAGER_NEW_MENU="Add Menu" +MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM="Add Menu Item" MOD_MENU_PURGE_EXPIRED_CACHE="Purge Expired Cache" -MOD_MENU_READ_PRIVATE_MESSAGES="Read Private Messages" MOD_MENU_SETTINGS="Settings" MOD_MENU_MAINTENANCE="Maintenance" MOD_MENU_SYSTEM="System" diff --git a/app/administrator/modules/mod_menu/tmpl/default.php b/app/administrator/modules/mod_menu/tmpl/default.php index ecd044e76c..ddb8d1190d 100644 --- a/app/administrator/modules/mod_menu/tmpl/default.php +++ b/app/administrator/modules/mod_menu/tmpl/default.php @@ -10,7 +10,193 @@ defined('_JEXEC') or die; $document = JFactory::getDocument(); +$user = JFactory::getUser(); +$lang = JFactory::getLanguage(); + $direction = $document->direction == 'rtl' ? 'pull-right' : ''; -require JModuleHelper::getLayoutPath('mod_menu', $enabled ? 'default_enabled' : 'default_disabled'); +$shownew = (boolean) $params->get('shownew', 1); + +/* + * Dashboard Submenu + */ + +$menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', $enabled ? 'class:cpanel' : 'disabled')); + +/* + * Components Submenu + */ + +$menu->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), '#', $enabled ? '' : 'disabled'), true); + +// Get the authorised components and sub-menus. +$components = ModMenuHelper::getComponents(true); + +// Check if there are any components, otherwise, don't render the menu +if($components && $enabled) +{ + foreach ($components as &$component) + { + if (!empty($component->submenu)) + { + // This component has a db driven submenu. + $menu->addChild(new JMenuNode($component->text, $component->link, $component->img), true); + + foreach ($component->submenu as $sub) + { + $menu->addChild(new JMenuNode($sub->text, $sub->link, $sub->img)); + } + + $menu->getParent(); + } + else + { + $menu->addChild(new JMenuNode($component->text, $component->link, $component->img)); + } + } +} + +$menu->getParent(); + +/* + * Menus Submenu + */ +if ($user->authorise('core.manage', 'com_menus')) +{ + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), '#', $enabled ? '' : 'disabled'), true); + $createMenu = $shownew && $user->authorise('core.create', 'com_menus'); + + if($enabled) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus', 'class:menumgr'), $createMenu); + + $menu->getParent(); + + $menu->addSeparator(); + + // Menu Types + foreach (ModMenuHelper::getMenus() as $menuType) + { + $alt = '*' . $menuType->sef . '*'; + + if ($menuType->home == 0) + { + $titleicon = ''; + } + elseif ($menuType->home == 1 && $menuType->language == '*') + { + $titleicon = ' '; + } + elseif ($menuType->home > 1) + { + $titleicon = ' ' + . JHtml::_('image', 'mod_languages/icon-16-language.png', $menuType->home, array('title' => JText::_('MOD_MENU_HOME_MULTIPLE')), true) + . ''; + } + else + { + $image = JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', null, null, true, true); + + if (!$image) + { + $image = JHtml::_('image', 'mod_languages/icon-16-language.png', $alt, array('title' => $menuType->title_native), true); + } + else + { + $image = JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', $alt, array('title' => $menuType->title_native), true); + } + + $titleicon = ' ' . $image . ''; + } + + $menu->addChild( + new JMenuNode( + $menuType->title, 'index.php?option=com_menus&view=items&menutype=' . $menuType->menutype, 'class:menu', null, null, $titleicon + ), + $createMenu + ); + + $menu->getParent(); + } + } + + $menu->getParent(); +} + +/* + * Users Submenu + */ +if ($user->authorise('core.manage', 'com_users')) +{ + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#', $enabled ? '' : 'disabled'), true); + $createUser = $shownew && $user->authorise('core.create', 'com_users'); + $createGrp = $user->authorise('core.admin', 'com_users'); + + if($enabled) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users', 'class:user'), $createUser); + $menu->getParent(); + + + if ($createGrp) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups', 'class:groups'), $createUser); + $menu->getParent(); + + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels', 'class:levels'), $createUser); + $menu->getParent(); + } + } + + $menu->getParent(); +} + +/* + * System Submenu + */ +$mm = $user->authorise('core.manage', 'com_modules'); +$pm = $user->authorise('core.manage', 'com_plugins'); +$tm = $user->authorise('core.manage', 'com_templates'); +$lm = $user->authorise('core.manage', 'com_languages'); + +$menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#', $enabled ? '' : 'disabled'), true); + +if($enabled) +{ + if ($enabled && $user->authorise('core.admin')) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONFIGURATION'), 'index.php?option=com_config', 'class:config')); + $menu->addSeparator(); + } + + /* + * Extensions Submenu + */ + + if ($mm || $pm || $tm || $lm) + { + if ($mm) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules', 'class:module')); + } + + if ($pm) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_PLUGIN_MANAGER'), 'index.php?option=com_plugins', 'class:plugin')); + } + + if ($tm) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER'), 'index.php?option=com_templates', 'class:themes')); + } + + if ($lm) + { + $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER'), 'index.php?option=com_languages', 'class:language')); + } + } + +} + +$menu->getParent(); $menu->renderMenu('menu', $enabled ? 'nav ' . $direction : 'nav disabled ' . $direction); diff --git a/app/administrator/modules/mod_menu/tmpl/default_enabled.php b/app/administrator/modules/mod_menu/tmpl/default_enabled.php deleted file mode 100644 index 0615b284a7..0000000000 --- a/app/administrator/modules/mod_menu/tmpl/default_enabled.php +++ /dev/null @@ -1,214 +0,0 @@ -get('shownew', 1); -$user = JFactory::getUser(); -$lang = JFactory::getLanguage(); - -/* - * Site Submenu - */ -$menu->addChild(new JMenuNode(JText::_('MOD_MENU_SYSTEM'), '#'), true); -$menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONTROL_PANEL'), 'index.php', 'class:cpanel')); - -if ($user->authorise('core.admin')) -{ - $menu->addSeparator(); - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_CONFIGURATION'), 'index.php?option=com_config', 'class:config')); -} - -$menu->getParent(); - -/* - * Users Submenu - */ -if ($user->authorise('core.manage', 'com_users')) -{ - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USERS'), '#'), true); - $createUser = $shownew && $user->authorise('core.create', 'com_users'); - $createGrp = $user->authorise('core.admin', 'com_users'); - - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_USER_MANAGER'), 'index.php?option=com_users&view=users', 'class:user'), $createUser); - - if ($createUser) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_USER'), 'index.php?option=com_users&task=user.add', 'class:newarticle')); - $menu->getParent(); - } - - if ($createGrp) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_GROUPS'), 'index.php?option=com_users&view=groups', 'class:groups'), $createUser); - - if ($createUser) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_GROUP'), 'index.php?option=com_users&task=group.add', 'class:newarticle')); - $menu->getParent(); - } - - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_LEVELS'), 'index.php?option=com_users&view=levels', 'class:levels'), $createUser); - - if ($createUser) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COM_USERS_ADD_LEVEL'), 'index.php?option=com_users&task=level.add', 'class:newarticle')); - $menu->getParent(); - } - } - - $menu->getParent(); -} - -/* - * Menus Submenu - */ -if ($user->authorise('core.manage', 'com_menus')) -{ - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENUS'), '#'), true); - $createMenu = $shownew && $user->authorise('core.create', 'com_menus'); - - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER'), 'index.php?option=com_menus&view=menus', 'class:menumgr'), $createMenu); - - if ($createMenu) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU'), 'index.php?option=com_menus&view=menu&layout=edit', 'class:newarticle')); - $menu->getParent(); - } - - $menu->addSeparator(); - - // Menu Types - foreach (ModMenuHelper::getMenus() as $menuType) - { - $alt = '*' . $menuType->sef . '*'; - - if ($menuType->home == 0) - { - $titleicon = ''; - } - elseif ($menuType->home == 1 && $menuType->language == '*') - { - $titleicon = ' '; - } - elseif ($menuType->home > 1) - { - $titleicon = ' ' - . JHtml::_('image', 'mod_languages/icon-16-language.png', $menuType->home, array('title' => JText::_('MOD_MENU_HOME_MULTIPLE')), true) - . ''; - } - else - { - $image = JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', null, null, true, true); - - if (!$image) - { - $image = JHtml::_('image', 'mod_languages/icon-16-language.png', $alt, array('title' => $menuType->title_native), true); - } - else - { - $image = JHtml::_('image', 'mod_languages/' . $menuType->image . '.gif', $alt, array('title' => $menuType->title_native), true); - } - - $titleicon = ' ' . $image . ''; - } - - $menu->addChild( - new JMenuNode( - $menuType->title, 'index.php?option=com_menus&view=items&menutype=' . $menuType->menutype, 'class:menu', null, null, $titleicon - ), - $createMenu - ); - - if ($createMenu) - { - $menu->addChild( - new JMenuNode( - JText::_('MOD_MENU_MENU_MANAGER_NEW_MENU_ITEM'), 'index.php?option=com_menus&view=item&layout=edit&menutype=' . $menuType->menutype, - 'class:newarticle') - ); - $menu->getParent(); - } - } - - $menu->getParent(); -} - - -/* - * Components Submenu - */ - -// Get the authorised components and sub-menus. -$components = ModMenuHelper::getComponents(true); - -// Check if there are any components, otherwise, don't render the menu -if ($components) -{ - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_COMPONENTS'), '#'), true); - - foreach ($components as &$component) - { - if (!empty($component->submenu)) - { - // This component has a db driven submenu. - $menu->addChild(new JMenuNode($component->text, $component->link, $component->img), true); - - foreach ($component->submenu as $sub) - { - $menu->addChild(new JMenuNode($sub->text, $sub->link, $sub->img)); - } - - $menu->getParent(); - } - else - { - $menu->addChild(new JMenuNode($component->text, $component->link, $component->img)); - } - } - - $menu->getParent(); -} - -/* - * Extensions Submenu - */ -$mm = $user->authorise('core.manage', 'com_modules'); -$pm = $user->authorise('core.manage', 'com_plugins'); -$tm = $user->authorise('core.manage', 'com_templates'); -$lm = $user->authorise('core.manage', 'com_languages'); - -if ($mm || $pm || $tm || $lm) -{ - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_EXTENSIONS'), '#'), true); - - if ($mm) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_MODULE_MANAGER'), 'index.php?option=com_modules', 'class:module')); - } - - if ($pm) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_PLUGIN_MANAGER'), 'index.php?option=com_plugins', 'class:plugin')); - } - - if ($tm) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_TEMPLATE_MANAGER'), 'index.php?option=com_templates', 'class:themes')); - } - - if ($lm) - { - $menu->addChild(new JMenuNode(JText::_('MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER'), 'index.php?option=com_languages', 'class:language')); - } - - $menu->getParent(); -} diff --git a/app/administrator/modules/mod_quickicon/language/en-GB/en-GB.mod_quickicon.ini b/app/administrator/modules/mod_quickicon/language/en-GB/en-GB.mod_quickicon.ini index 181060d4bb..4c125899ae 100644 --- a/app/administrator/modules/mod_quickicon/language/en-GB/en-GB.mod_quickicon.ini +++ b/app/administrator/modules/mod_quickicon/language/en-GB/en-GB.mod_quickicon.ini @@ -4,29 +4,29 @@ ; Note : All ini files need to be saved as UTF-8 MOD_QUICKICON="Quick Icons" -MOD_QUICKICON_ADD_NEW_ARTICLE="Add New Article" -MOD_QUICKICON_ARTICLE_MANAGER="Article Manager" -MOD_QUICKICON_CATEGORY_MANAGER="Category Manager" +MOD_QUICKICON_ADD_NEW_ARTICLE="Add Article" +MOD_QUICKICON_ARTICLE_MANAGER="Articles" +MOD_QUICKICON_CATEGORY_MANAGER="Categories" MOD_QUICKICON_CLEAR_CACHE="Clear Cache" -MOD_QUICKICON_CONFIGURATION="Configuration" +MOD_QUICKICON_CONFIGURATION="System" MOD_QUICKICON_CONTENT="Content" MOD_QUICKICON_EXTENSIONS="Extensions" -MOD_QUICKICON_EXTENSION_MANAGER="Extension Manager" -MOD_QUICKICON_FRONTPAGE_MANAGER="Front Page Manager" +MOD_QUICKICON_EXTENSION_MANAGER="Extensions" +MOD_QUICKICON_FRONTPAGE_MANAGER="Front Page" MOD_QUICKICON_GLOBAL_CHECKIN="Global Check-in" -MOD_QUICKICON_GLOBAL_CONFIGURATION="Global Configuration" +MOD_QUICKICON_GLOBAL_CONFIGURATION="Settings" MOD_QUICKICON_GROUP_DESC="The group of this module (this value is compared with the group value used in Quick Icons plugins to inject icons). The 'mod_quickicon' group always displays the Joomla! core icons." MOD_QUICKICON_GROUP_LABEL="Group" -MOD_QUICKICON_LANGUAGE_MANAGER="Language Manager" +MOD_QUICKICON_LANGUAGE_MANAGER="Languages" MOD_QUICKICON_MAINTENANCE="Maintenance" -MOD_QUICKICON_MEDIA_MANAGER="Media Manager" -MOD_QUICKICON_MENU_MANAGER="Menu Manager" -MOD_QUICKICON_MODULE_MANAGER="Module Manager" +MOD_QUICKICON_MEDIA_MANAGER="Files" +MOD_QUICKICON_MENU_MANAGER="Menus" +MOD_QUICKICON_MODULE_MANAGER="Modules" MOD_QUICKICON_PROFILE="Edit Profile" MOD_QUICKICON_STRUCTURE="Structure" MOD_QUICKICON_SYSTEM_INFORMATION="System Information" -MOD_QUICKICON_TEMPLATE_MANAGER="Template Manager" +MOD_QUICKICON_TEMPLATE_MANAGER="Templates" MOD_QUICKICON_TITLE="Quick Icons" -MOD_QUICKICON_USER_MANAGER="User Manager" +MOD_QUICKICON_USER_MANAGER="Users" MOD_QUICKICON_USERS="Users" MOD_QUICKICON_XML_DESCRIPTION="This module shows Quick Icons that are visible on the Control Panel (admin area home page)" diff --git a/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.ini b/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.ini index bd619f3ee5..39916c4ae6 100644 --- a/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.ini +++ b/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.ini @@ -23,4 +23,4 @@ MOD_LANGUAGES_FIELD_USEIMAGE_LABEL="Use Image Flags" MOD_LANGUAGES_OPTION_DEFAULT_LANGUAGE="Default" MOD_LANGUAGES_SPACERDROP_LABEL="If Use Dropdown is set to 'Yes',
the display options below will be ignored" MOD_LANGUAGES_SPACERNAME_LABEL="If Use Image Flags is set to 'Yes',
the display options below will be ignored" -MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Language Manager Content tab) for switching between them when one wants to use Joomla! as a multilingual site.
--The plugin 'System - Language Filter' has to be enabled.--
When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.
Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language.
If the plugin 'System - Language Filter' is disabled, this may have unwanted results.
Method:
1. Open Language Manager Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.
2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language.
3. Thereafter, you can assign a language to any Article, Category, Module, Newsfeed in Joomla.
4. Make sure the module is published and the plugin is enabled.
5. When using associated items, make sure the module is displayed on the pages concerned.
6. The way the flags or names of the languages are displayed is defined by the ordering in the Language Manager - Content Languages.

If this module is published, it is suggested to publish the administrator multilingual status module." +MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Languages Content tab) for switching between them when one wants to use Joomla! as a multilingual site.
--The plugin 'System - Language Filter' has to be enabled.--
When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.
Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language.
If the plugin 'System - Language Filter' is disabled, this may have unwanted results.
Method:
1. Open Languages Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.
2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language.
3. Thereafter, you can assign a language to any Article, Category, Module, Newsfeed in Joomla.
4. Make sure the module is published and the plugin is enabled.
5. When using associated items, make sure the module is displayed on the pages concerned.
6. The way the flags or names of the languages are displayed is defined by the ordering in the Languages - Content Languages.

If this module is published, it is suggested to publish the administrator multilingual status module." diff --git a/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.sys.ini b/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.sys.ini index a632f0e4be..f6c75b14c1 100644 --- a/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.sys.ini +++ b/app/site/modules/mod_languages/language/en-GB/en-GB.mod_languages.sys.ini @@ -4,6 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 - No BOM MOD_LANGUAGES="Language Switcher" -MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Language Manager Content tab) for switching between them when one wants to use Joomla! as a multilingual site.
--The plugin 'System - Language Filter' has to be enabled.--
When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.
Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language.
If the plugin 'System - Language Filter' is disabled, this may have unwanted results.
Method:
1. Open Language Manager Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.
2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language.
3. Thereafter, you can assign a language to any Article, Category, Module, Newsfeed in Joomla.
4. Make sure the module is published and the plugin is enabled.
5. When using associated items, make sure the module is displayed on the pages concerned.
6. The way the flags or names of the languages are displayed is defined by the ordering in the Language Manager - Content Languages.

If this module is published, it is suggested to publish the administrator multilingual status module." +MOD_LANGUAGES_XML_DESCRIPTION="This module displays a list of available Content Languages (as defined and published in Languages Content tab) for switching between them when one wants to use Joomla! as a multilingual site.
--The plugin 'System - Language Filter' has to be enabled.--
When switching languages and if the item displayed in the page is not associated to another item, the module redirects to the Home page defined for the chosen language.
Otherwise, if the parameter is set for the Language filter plugin, it will redirect to the associated item in the language chosen. Thereafter, the navigation will be the one defined for that language.
If the plugin 'System - Language Filter' is disabled, this may have unwanted results.
Method:
1. Open Languages Content tab and make sure the Languages you want to use in contents are published and have a Language Code for the URL as well as prefix for the image used in the module display.
2. Create a Home page by assigning a language to a menu item and defining it as Default Home page for each published content language.
3. Thereafter, you can assign a language to any Article, Category, Module, Newsfeed in Joomla.
4. Make sure the module is published and the plugin is enabled.
5. When using associated items, make sure the module is displayed on the pages concerned.
6. The way the flags or names of the languages are displayed is defined by the ordering in the Languages - Content Languages.

If this module is published, it is suggested to publish the administrator multilingual status module." MOD_LANGUAGES_LAYOUT_DEFAULT="Default" diff --git a/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.ini b/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.ini index 8083942bc5..6247fdab9b 100644 --- a/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.ini +++ b/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.ini @@ -29,4 +29,4 @@ MOD_LOGIN_VALUE_ICONS="Icons" MOD_LOGIN_VALUE_NAME="Name" MOD_LOGIN_VALUE_TEXT="Text" MOD_LOGIN_VALUE_USERNAME="Username" -MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in User Manager > Options), another link will be shown to enable self-registration for users." +MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Options), another link will be shown to enable self-registration for users." diff --git a/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.sys.ini b/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.sys.ini index b0bdfe6b27..86519a5425 100644 --- a/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.sys.ini +++ b/app/site/modules/mod_login/language/en-GB/en-GB.mod_login.sys.ini @@ -4,6 +4,6 @@ ; Note : All ini files need to be saved as UTF-8 - No BOM MOD_LOGIN="Login" -MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in User Manager > Options), another link will be shown to enable self-registration for users." +MOD_LOGIN_XML_DESCRIPTION="This module displays a username and password login form. It also displays a link to retrieve a forgotten password. If user registration is enabled (in Users > Options), another link will be shown to enable self-registration for users." MOD_LOGIN_LAYOUT_DEFAULT="Default" diff --git a/lib/libraries/joomla/form/fields/rules.php b/lib/libraries/joomla/form/fields/rules.php index cc928a205f..72db8112ff 100644 --- a/lib/libraries/joomla/form/fields/rules.php +++ b/lib/libraries/joomla/form/fields/rules.php @@ -189,7 +189,7 @@ protected function getInput() $html = array(); // Description - $html[] = '

' . JText::_('JLIB_RULES_SETTINGS_DESC') . '

'; + //$html[] = '

' . JText::_('JLIB_RULES_SETTINGS_DESC') . '

'; // Begin tabs $html[] = '
'; @@ -367,7 +367,7 @@ protected function getInput() $html[] = '
'; - $html[] = '
'; + /*$html[] = '
'; if ($section == 'component' || $section == null) { @@ -378,7 +378,7 @@ protected function getInput() $html[] = JText::_('JLIB_RULES_SETTING_NOTES_ITEM'); } - $html[] = '
'; + $html[] = '
';*/ return implode("\n", $html); }