diff --git a/administrator/components/com_fields/views/fields/view.html.php b/administrator/components/com_fields/views/fields/view.html.php
index 6115bfcd75b1c..6da70525b674c 100644
--- a/administrator/components/com_fields/views/fields/view.html.php
+++ b/administrator/components/com_fields/views/fields/view.html.php
@@ -92,10 +92,10 @@ public function display($tpl = null)
if ($this->getLayout() !== 'modal')
{
$this->addToolbar();
+ $this->sidebar = JHtmlSidebar::render();
}
FieldsHelper::addSubmenu($this->state->get('filter.context'), 'fields');
- $this->sidebar = JHtmlSidebar::render();
return parent::display($tpl);
}
diff --git a/components/com_menus/menus.php b/components/com_menus/menus.php
index f7e112db395d2..93240705d7df1 100644
--- a/components/com_menus/menus.php
+++ b/components/com_menus/menus.php
@@ -23,7 +23,6 @@
}
}
-$lang->load('joomla', JPATH_ADMINISTRATOR);
$lang->load('com_menus', JPATH_ADMINISTRATOR);
// Trigger the controller
diff --git a/components/com_modules/modules.php b/components/com_modules/modules.php
index 955f6c7378a21..4d329936ddc01 100644
--- a/components/com_modules/modules.php
+++ b/components/com_modules/modules.php
@@ -13,7 +13,6 @@
$lang = JFactory::getLanguage();
$app = JFactory::getApplication();
$config = array();
-$lang->load('joomla', JPATH_ADMINISTRATOR);
$lang->load('com_modules', JPATH_ADMINISTRATOR);
if ($app->input->get('view') === 'modules' && $app->input->get('layout') === 'modal')
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index 78c6b3a196a2c..be29142129404 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -52,11 +52,19 @@ JALL_LANGUAGE="All"
JAPPLY="Save"
JARCHIVED="Archived"
JASSOCIATIONS="Also available:"
+JASSOCIATIONS_ASC="Associations ascending"
+JASSOCIATIONS_DESC="Associations descending"
JAUTHOR="Author"
+JAUTHOR_ASC="Author ascending"
+JAUTHOR_DESC="Author descending"
JCANCEL="Cancel"
JCATEGORY="Category"
+JCATEGORY_ASC="Category ascending"
+JCATEGORY_DESC="Category descending"
JCLEAR="Clear"
JDATE="Date"
+JDATE_ASC="Date ascending"
+JDATE_DESC="Date descending"
JDAY="Day"
JDEFAULT="Default"
JDETAILS="Details"
@@ -66,6 +74,8 @@ JENABLED="Enabled"
JEXPIRED="Expired"
JFALSE="False"
JFEATURED="Featured"
+JFEATURED_ASC="Featured ascending"
+JFEATURED_DESC="Featured descending"
JHIDE="Hide"
JINVALID_TOKEN="The most recent request was denied because it had an invalid security token. Please refresh the page and try again."
JINVALID_TOKEN_NOTICE="The security token did not match. The request was aborted to prevent any security breach. Please try again."
@@ -95,6 +105,8 @@ JSELECT="Select"
JSHOW="Show"
JSITE="Site"
JSTATUS="Status"
+JSTATUS_ASC="Status ascending"
+JSTATUS_DESC="Status descending"
JSUBMIT="Submit"
JTAG="Tags"
JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter."
@@ -219,8 +231,9 @@ JGLOBAL_FIELD_CREATED_LABEL="Created Date"
JGLOBAL_FIELD_FEATURED_DESC="Assign the article to the featured blog layout."
JGLOBAL_FIELD_FEATURED_LABEL="Featured"
JGLOBAL_FIELD_FIELD_CACHETIME_DESC="The number of minutes before the cache is refreshed."
-JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
JGLOBAL_FIELD_FIELD_ORDERING_DESC="Order items will be displayed in."
+JGLOBAL_FIELD_FIELD_ORDERING_LABEL="Order"
+JGLOBAL_FIELD_GROUPS="Field Groups"
JGLOBAL_FIELD_ID_DESC="Record number in the database."
JGLOBAL_FIELD_ID_LABEL="ID"
JGLOBAL_FIELD_LAYOUT_DESC="Default layout to use for items."
@@ -247,12 +260,16 @@ JGLOBAL_GT=">"
; The following string is deprecated and will be removed with 4.0.
JGLOBAL_HELPREFRESH_BUTTON="Refresh"
JGLOBAL_HITS="Hits"
+JGLOBAL_HITS_ASC="Hits ascending"
JGLOBAL_HITS_COUNT="Hits: %s"
+JGLOBAL_HITS_DESC="Hits descending"
JGLOBAL_ICON_SEP="|"
JGLOBAL_INHERIT="Inherit"
JGLOBAL_INTRO_TEXT="Intro Text"
JGLOBAL_KEEP_TYPING="Keep typing ..."
JGLOBAL_LEFT="Left"
+JGLOBAL_LIST_ALIAS="(Alias: %s)"
+JGLOBAL_LIST_ALIAS_NOTE="(Alias: %s, Note: %s)"
JGLOBAL_LOOKING_FOR="Looking for"
JGLOBAL_LT="<"
JGLOBAL_MAXIMUM_UPLOAD_SIZE_LIMIT="Maximum upload size: %s"
@@ -277,10 +294,13 @@ JGLOBAL_SECRETKEY_HELP="If you have enabled two factor authentication in your us
JGLOBAL_SELECT_AN_OPTION="Select an option"
JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"
JGLOBAL_SELECT_SOME_OPTIONS="Select some options"
+JGLOBAL_SORT_BY="Sort Table By:"
JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before finish publishing date"
JGLOBAL_SUBCATEGORIES="Subcategories"
JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
JGLOBAL_TITLE="Title"
+JGLOBAL_TITLE_ASC="Title ascending"
+JGLOBAL_TITLE_DESC="Title descending"
JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category"
JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
JGLOBAL_TYPE_OR_SELECT_SOME_TAGS="Type or select some tags"
@@ -291,8 +311,16 @@ JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
JGLOBAL_YOU_MUST_LOGIN_FIRST="Please login first"
JGRID_HEADING_ACCESS="Access"
+JGRID_HEADING_ACCESS_ASC="Access ascending"
+JGRID_HEADING_ACCESS_DESC="Access descending"
JGRID_HEADING_ID="ID"
+JGRID_HEADING_ID_ASC="ID ascending"
+JGRID_HEADING_ID_DESC="ID descending"
JGRID_HEADING_LANGUAGE="Language"
+JGRID_HEADING_LANGUAGE_ASC="Language ascending"
+JGRID_HEADING_LANGUAGE_DESC="Language descending"
+JGRID_HEADING_ORDERING_ASC="Ordering ascending"
+JGRID_HEADING_ORDERING_DESC="Ordering descending"
; if there is an error connecting database before initialisation, en-GB.lib_joomla.ini can't be loaded
; we therefore have to load the strings from en-GB.ini