Merge branch 'master' of https://github.com/joomla-projects/gsoc18_ov…

…erride_management into gsoc
anuragteapot · Sep 2, 2018 · 603447e · 603447e
2 parents d93fc74 + 5dbe6e2
commit 603447e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/administrator/components/com_templates/tmpl/template/default_updated_files.php b/administrator/components/com_templates/tmpl/template/default_updated_files.php
@@ -28,7 +28,7 @@
 								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<th scope="col" style="width:7%" class="nowrap">
-								<?php echo Text::_('JSTATUS'); ?>
+								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_CHECKED'); ?>
 							</th>
 							<th scope="col" style="width:30%">
 								<?php echo Text::_('COM_TEMPLATES_OVERRIDE_TEMPLATE_FILE'); ?>

diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -94,7 +94,7 @@ COM_TEMPLATES_FILE_CREATE_ERROR="An error occurred creating the file."
 COM_TEMPLATES_FILE_CREATE_SUCCESS="File created."
 COM_TEMPLATES_FILE_COMPARE_PANE="Diff between core and overridden file"
 COM_TEMPLATES_FILE_CONTENT_PREVIEW="File Content Preview."
-COM_TEMPLATES_FILE_CORE_PANE="Core file (readonly)"
+COM_TEMPLATES_FILE_CORE_PANE="Original file (readonly)"
 COM_TEMPLATES_FILE_COPY_FAIL="Failed to copy the file."
 COM_TEMPLATES_FILE_COPY_SUCCESS="The current file was copied as %s."
 COM_TEMPLATES_FILE_CROP_ERROR="Failed to crop image."
@@ -149,9 +149,9 @@ COM_TEMPLATES_IMAGE_WIDTH="Width"
 COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name with 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 with a-z, A-Z, 0-9, - and _."
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_CORE="Hide Original"
 COM_TEMPLATES_LAYOUTS_DIFFVIEW_HIDE_DIFF="Hide Diff"
-COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Core"
+COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_CORE="Show Original"
 COM_TEMPLATES_LAYOUTS_DIFFVIEW_SHOW_DIFF="Show Diff"
 COM_TEMPLATES_MANAGER_ADD_STYLE="Templates: Add Style"
 COM_TEMPLATES_MANAGER_EDIT_STYLE="Templates: Edit Style"
@@ -182,6 +182,7 @@ COM_TEMPLATES_NO_TEMPLATE_SELECTED="No template selected."
 COM_TEMPLATES_OPTION_NONE=":: None ::"
 COM_TEMPLATES_OPTION_SELECT_MENU_ITEM="- Select Menu Item -"
 COM_TEMPLATES_OVERRIDE_ACTION="Update Action"
+COM_TEMPLATES_OVERRIDE_CHECKED="Checked"
 COM_TEMPLATES_OVERRIDE_CREATED="Override created in "
 COM_TEMPLATES_OVERRIDE_CREATED_DATE="Added to the list"
 COM_TEMPLATES_OVERRIDE_CORE_REMOVED="Core file removed"

diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.ini
@@ -6,9 +6,9 @@
 PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
 PLG_QUICKICON_OVERRIDECHECK_CHECKING="Checking overrides ..."
 PLG_QUICKICON_OVERRIDECHECK_ERROR="Error on checking overrides."
-PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable installer override plugin."
+PLG_QUICKICON_OVERRIDECHECK_ERROR_ENABLE="Enable <strong>Installer - override</strong> plugin."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_DESC="The group of this plugin (this value is compared with the group value used in <strong>Quick Icons</strong> modules to inject icons)."
 PLG_QUICKICON_OVERRIDECHECK_GROUP_LABEL="Group"
 PLG_QUICKICON_OVERRIDECHECK_OVERRIDEFOUND="%s Override(s) to check."
-PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Override are up to date."
-PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
+PLG_QUICKICON_OVERRIDECHECK_UPTODATE="Overrides are up to date."
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong>Warning! You must have installer override plugin enabled to see results.</strong>"
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_overridecheck.sys.ini
@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_QUICKICON_OVERRIDECHECK="Quick Icon - Joomla! Overrides Update Notification"
-PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong> Warning! You must have installer override plugin enabled to see results.</strong>"
+PLG_QUICKICON_OVERRIDECHECK_XML_DESCRIPTION="Checks overrides on update and enables notifications when you visit the Control Panel page.<br><strong>Warning! You must have installer override plugin enabled to see results.</strong>"