Merge pull request #8070 from marijkestuivenberg/patch-4

Consistency Title in Categories

administrator/language/en-GB/en-GB.com_categories.ini

@@ -17,12 +17,12 @@ COM_CATEGORIES_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of the
 COM_CATEGORIES_BATCH_CATEGORY_LABEL="To Move or Copy your selection please select a Category."
 COM_CATEGORIES_BATCH_OPTIONS="Batch process the selected categories."
 COM_CATEGORIES_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved categories. Otherwise, all actions are applied to the selected categories."
-COM_CATEGORIES_CATEGORIES_BASE_TITLE="Category Manager"
+COM_CATEGORIES_CATEGORIES_BASE_TITLE="Categories"
 COM_CATEGORIES_CATEGORIES_TITLE="%s: Categories"
-COM_CATEGORIES_CATEGORY_ADD_TITLE="Category Manager: Add A New %s Category"
-COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="Category Manager: Add New Category"
-COM_CATEGORIES_CATEGORY_BASE_EDIT_TITLE="Category Manager: Edit Category"
-COM_CATEGORIES_CATEGORY_EDIT_TITLE="Category Manager: Edit A %s Category"
+COM_CATEGORIES_CATEGORY_ADD_TITLE="%s: New Category"
+COM_CATEGORIES_CATEGORY_BASE_ADD_TITLE="Categories: New Category"
+COM_CATEGORIES_CATEGORY_BASE_EDIT_TITLE="Categories: Edit Category"
+COM_CATEGORIES_CATEGORY_EDIT_TITLE="%s: Edit Category"
 COM_CATEGORIES_CATEGORY_OPTIONS="Category"
 COM_CATEGORIES_CHANGE_CATEGORY="Change Category"
 COM_CATEGORIES_DELETE_NOT_ALLOWED="Delete not allowed for category %s."

administrator/language/en-GB/en-GB.com_content.ini

@@ -3,7 +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_CATEGORIES_CATEGORY_EDIT_TITLE="Article: Edit Category"
 COM_CONTENT="Articles"
 COM_CONTENT_ACCESS_DELETE_DESC="New setting for <strong>delete actions</strong> on this article and the calculated setting based on the parent category and group permissions."
 COM_CONTENT_ACCESS_EDIT_DESC="New setting for <strong>edit actions</strong> on this article and the calculated setting based on the parent category and group permissions."
@@ -180,4 +179,4 @@ JGLOBAL_NO_ITEM_SELECTED="No articles selected"
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new articles in this category."
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
 JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
-JLIB_RULES_SETTING_NOTES_ITEM="1. Changes apply to this article only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES_ITEM="1. Changes apply to this article only.<br /><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br /><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br /><em><strong>Allowed</strong></em> will enable the action for this component unless it is overruled by a Global Configuration setting.<br /><br />2. Select Save to refresh the calculated settings."