#315: Apply joomla 3.6.5 changes in language

app/administrator/language/en-GB/en-GB.localise.php

@@ -2,17 +2,16 @@
 /**
  * @package    Joomla.Language
  *
- * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * en-GB localise class
+ * en-GB localise class.
  *
- * @package  Joomla.Language
- * @since    1.6
+ * @since  1.6
  */
 abstract class En_GBLocalise
 {

app/administrator/language/en-GB/en-GB.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<metafile version="3.3" client="administrator">
-	<name>English (United Kingdom)</name>
-	<version>3.3.1</version>
-	<creationDate>2013-03-07</creationDate>
+<metafile version="3.6" client="administrator">
+	<name>English (en-GB)</name>
+	<version>3.6.5</version>
+	<creationDate>December 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<description>en-GB administrator language</description>
+	<description><![CDATA[en-GB administrator language]]></description>
 	<metadata>
-		<name>English (United Kingdom)</name>
+		<name>English (en-GB)</name>
 		<tag>en-GB</tag>
 		<rtl>0</rtl>
 		<locale>en_GB.utf8, en_GB.UTF-8, en_GB, eng_GB, en, english, english-uk, uk, gbr, britain, england, great britain, uk, united kingdom, united-kingdom</locale>

app/administrator/language/en-GB/install.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension version="3.3" client="administrator" type="language" method="upgrade">
+<extension version="3.6" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.3.1</version>
-	<creationDate>2013-03-07</creationDate>
+	<version>3.6.5</version>
+	<creationDate>December 2016</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB administrator language</description>
 	<files>

app/site/language/en-GB/en-GB.ini

@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.
 ; 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 - No BOM
+; Note : All ini files need to be saved as UTF-8
 
 ; Common boolean values
 ; Note: YES, NO, TRUE, FALSE are reserved words in INI format.
@@ -32,6 +32,8 @@ J25="25"
 J30="30"
 J50="50"
 J100="100"
+J200="200"
+J500="500"
 
 JACTION_ADMIN="Configure"
 JACTION_ADMIN_GLOBAL="Super User"
@@ -41,13 +43,14 @@ JACTION_DELETE="Delete"
 JACTION_EDIT="Edit"
 JACTION_EDITOWN="Edit Own"
 JACTION_EDITSTATE="Edit State"
-JACTION_LOGIN_ADMIN="Admin Login"
+JACTION_LOGIN_ADMIN="Administrator Login"
 JACTION_LOGIN_SITE="Site Login"
 JACTION_MANAGE="Access Administration Interface"
 
 JADMINISTRATOR="Administrator"
 JALL="All"
 JALL_LANGUAGE="All"
+JAPPLY="Save"
 JARCHIVED="Archived"
 JAUTHOR="Author"
 JCANCEL="Cancel"
@@ -62,7 +65,7 @@ JEXPIRED="Expired"
 JFALSE="False"
 JFEATURED="Featured"
 JHIDE="Hide"
-JINVALID_TOKEN="Invalid Token"
+JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again."
 JLOGIN="Log in"
 JLOGOUT="Log out"
 JNEW="New"
@@ -86,7 +89,7 @@ JSITE="Site"
 JSTATUS="Status"
 JSUBMIT="Submit"
 JTAG="Tags"
-JTAG_DESC="Add and delete tags to an item."
+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."
 JTOOLBAR_VERSIONS="Versions"
 JTRASH="Trash"
 JTRASHED="Trashed"
@@ -111,21 +114,24 @@ JERROR_LAYOUT_GO_TO_THE_HOME_PAGE="Go to the Home Page"
 JERROR_LAYOUT_HOME_PAGE="Home Page"
 JERROR_LAYOUT_MIS_TYPED_ADDRESS="a <strong>mistyped address</strong>"
 JERROR_LAYOUT_NOT_ABLE_TO_VISIT="You may not be able to visit this page because of:"
-JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page cannot be found."
+JERROR_LAYOUT_PAGE_NOT_FOUND="The requested page can't be found."
 JERROR_LAYOUT_PLEASE_CONTACT_THE_SYSTEM_ADMINISTRATOR="If difficulties persist, please contact the System Administrator of this site and report the error below."
 JERROR_LAYOUT_PLEASE_TRY_ONE_OF_THE_FOLLOWING_PAGES="Please try one of the following pages:"
+JERROR_LAYOUT_PREVIOUS_ERROR="Previous Error"
 JERROR_LAYOUT_REQUESTED_RESOURCE_WAS_NOT_FOUND="The requested resource was not found."
 JERROR_LAYOUT_SEARCH="You may wish to search the site or visit the home page."
 JERROR_LAYOUT_SEARCH_ENGINE_OUT_OF_DATE_LISTING="a search engine that has an <strong>out-of-date listing for this site</strong>"
 JERROR_LAYOUT_SEARCH_PAGE="Search this site"
 JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE="you have <strong>no access</strong> to this page"
 JERROR_LOADING_MENUS="Error loading Menus: %s"
-JERROR_LOGIN_DENIED="You cannot access the private section of this site."
+JERROR_LOGIN_DENIED="You can't access the private section of this site."
 JERROR_NOLOGIN_BLOCKED="Login denied! Your account has either been blocked or you have not activated it yet."
+JERROR_PAGE_NOT_FOUND="Page not found"
+JERROR_SESSION_STARTUP="Error initialising the session."
 JERROR_TABLE_BIND_FAILED="hmm %s ..."
 JERROR_USERS_PROFILE_NOT_FOUND="User profile not found"
 
-JFIELD_ACCESS_DESC="Access level for this content"
+JFIELD_ACCESS_DESC="Access level for this content."
 JFIELD_ACCESS_LABEL="Access"
 JFIELD_ALIAS_DESC="The Alias will be used in the SEF URL. Leave this blank and Joomla! will fill in a default value from the title. This value will depend on the SEO settings (Global Configuration->Site). <br />Using Unicode will produce UTF-8 aliases. You may also enter manually any UTF-8 character. Spaces and some forbidden characters will be changed to hyphens.<br />When using default transliteration it will produce an alias in lower case and with dashes instead of spaces. You may enter the Alias manually. Use lowercase letters and hyphens (-). No spaces or underscores are allowed. Default value will be a date and time if the title is typed in non-latin letters ."
 JFIELD_ALIAS_LABEL="Alias"
@@ -134,24 +140,25 @@ JFIELD_ALT_PAGE_TITLE_LABEL="Alternative Page Title"
 JFIELD_CATEGORY_DESC="Category"
 JFIELD_LANGUAGE_DESC="Assign a language to this article."
 JFIELD_LANGUAGE_LABEL="Language"
-JFIELD_META_DESCRIPTION_DESC="Meta data description"
+JFIELD_META_DESCRIPTION_DESC="Metadata description."
 JFIELD_META_DESCRIPTION_LABEL="Meta Description"
-JFIELD_META_KEYWORDS_DESC="Keywords describing the content"
+JFIELD_META_KEYWORDS_DESC="Keywords describing the content."
 JFIELD_META_KEYWORDS_LABEL="Keywords"
 JFIELD_META_RIGHTS_DESC="Describe what rights others have to use this content."
 JFIELD_META_RIGHTS_LABEL="Content Rights"
-JFIELD_ORDERING_DESC="Ordering of the article within the category"
+JFIELD_ORDERING_DESC="Ordering of the article within the category."
 JFIELD_ORDERING_LABEL="Ordering"
-JFIELD_PUBLISHED_DESC="Set publication status"
-JFIELD_TITLE_DESC="Title for the article"
+JFIELD_PUBLISHED_DESC="Set publication status."
+JFIELD_TITLE_DESC="Title for the article."
 
+JGLOBAL_ADD_CUSTOM_CATEGORY="Add new Category"
 JGLOBAL_ARTICLES="Articles"
 JGLOBAL_AUTH_ACCESS_DENIED="Access Denied"
 JGLOBAL_AUTH_ACCESS_GRANTED="Access Granted"
 JGLOBAL_AUTH_BIND_FAILED="Failed binding to LDAP server"
 JGLOBAL_AUTH_CANCEL="Authentication cancelled"
-JGLOBAL_AUTH_CURL_NOT_INSTALLED="Curl isn't installed"
-JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED="Empty password not allowed"
+JGLOBAL_AUTH_CURL_NOT_INSTALLED="Curl isn't installed."
+JGLOBAL_AUTH_EMPTY_PASS_NOT_ALLOWED="Empty password not allowed."
 JGLOBAL_AUTH_FAIL="Authentication failed"
 JGLOBAL_AUTH_FAILED="Failed to authenticate: %s"
 JGLOBAL_AUTH_INCORRECT="Incorrect username/password"
@@ -161,28 +168,54 @@ JGLOBAL_AUTH_NO_BIND="Unable to bind to LDAP"
 JGLOBAL_AUTH_NO_CONNECT="Unable to connect to LDAP server"
 JGLOBAL_AUTH_NO_REDIRECT="Could not redirect to server: %s"
 JGLOBAL_AUTH_NO_USER="Username and password do not match or you do not have an account yet."
-JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore directory %s. Please check the effective permissions."
+JGLOBAL_AUTH_NOT_CREATE_DIR="Could not create the FileStore folder %s. Please check the effective permissions."
 JGLOBAL_AUTH_PASS_BLANK="LDAP can't have blank password"
 JGLOBAL_AUTH_UNKNOWN_ACCESS_DENIED="Result Unknown. Access Denied"
-JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted"
+JGLOBAL_AUTH_USER_BLACKLISTED="User is blacklisted."
 JGLOBAL_AUTH_USER_NOT_FOUND="Unable to find user"
 JGLOBAL_AUTO="Auto"
 JGLOBAL_CATEGORY_NOT_FOUND="Category not found"
 JGLOBAL_CENTER="Center"
-JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Click to sort by this column"
+JGLOBAL_CHECK_ALL="Check All"
+JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column"
 JGLOBAL_CREATED_DATE_ON="Created on %s"
+JGLOBAL_CUSTOM_CATEGORY="New Categories"
 JGLOBAL_DESCRIPTION="Description"
 JGLOBAL_DISPLAY_NUM="Display #"
 JGLOBAL_EDIT="Edit"
+JGLOBAL_EDIT_TITLE="Edit article"
 JGLOBAL_EMAIL="Email"
-JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display"
+JGLOBAL_EMAIL_TITLE="Email this link to a friend"
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_DESC="Categories that are within this category will be displayed."
+JGLOBAL_FIELD_CATEGORIES_CHOOSE_CATEGORY_LABEL="Select a Top Level Category"
+JGLOBAL_FIELD_CATEGORIES_DESC_DESC="If you enter some text in this field, it will override the Top Level Category Description, if it has one."
+JGLOBAL_FIELD_CATEGORIES_DESC_LABEL="Top Level Category Description"
+JGLOBAL_FIELD_CREATED_BY_ALIAS_DESC="Uses another name than the author's for display."
 JGLOBAL_FIELD_CREATED_BY_ALIAS_LABEL="Author's Alias"
-JGLOBAL_FIELD_FEATURED_DESC="Assign the article to the featured blog layout"
+JGLOBAL_FIELD_CREATED_BY_DESC="The user who created this."
+JGLOBAL_FIELD_CREATED_BY_LABEL="Created By"
+JGLOBAL_FIELD_CREATED_DESC="Created Date."
+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_PUBLISH_DOWN_DESC="An optional date to Stop Publishing"
+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_ID_DESC="Record number in the database."
+JGLOBAL_FIELD_ID_LABEL="ID"
+JGLOBAL_FIELD_LAYOUT_DESC="Default layout to use for items."
+JGLOBAL_FIELD_LAYOUT_LABEL="Choose a Layout"
+JGLOBAL_FIELD_MODIFIED_LABEL="Modified Date"
+JGLOBAL_FIELD_MODIFIED_BY_DESC="The user who did the last modification."
+JGLOBAL_FIELD_MODIFIED_BY_LABEL="Modified By"
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_DESC="Number of categories to display for each level."
+JGLOBAL_FIELD_NUM_CATEGORY_ITEMS_LABEL="Number of Categories"
+JGLOBAL_FIELD_PUBLISH_DOWN_DESC="An optional date to stop publishing."
 JGLOBAL_FIELD_PUBLISH_DOWN_LABEL="Finish Publishing"
-JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to Start Publishing"
+JGLOBAL_FIELD_PUBLISH_UP_DESC="An optional date to start publishing."
 JGLOBAL_FIELD_PUBLISH_UP_LABEL="Start Publishing"
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC="Show description of the top level category or optionally override with the text from the description field found in menu item. If using Root as top level category, the description field has to be filled."
+JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_LABEL="Top Level Category Description"
 JGLOBAL_FIELD_VERSION_NOTE_DESC="Enter an optional note for this version of the item."
 JGLOBAL_FIELD_VERSION_NOTE_LABEL="Version Note"
 JGLOBAL_FILTER_BUTTON="Filter"
@@ -195,15 +228,17 @@ JGLOBAL_HITS_COUNT="Hits: %s"
 JGLOBAL_ICON_SEP="|"
 JGLOBAL_INHERIT="Inherit"
 JGLOBAL_INTRO_TEXT="Intro Text"
-JGLOBAL_KEEP_TYPING="Keep typing..."
+JGLOBAL_KEEP_TYPING="Keep typing ..."
 JGLOBAL_LEFT="Left"
 JGLOBAL_LOOKING_FOR="Looking for"
 JGLOBAL_LT="&lt;"
 JGLOBAL_NEWITEMSLAST_DESC="New items default to the last position. Ordering can be changed after this item has been saved."
+JGLOBAL_NO_MATCHING_RESULTS="No Matching Results"
 JGLOBAL_NUM="#"
 JGLOBAL_PASSWORD="Password"
 JGLOBAL_PASSWORD_RESET_REQUIRED="You are required to reset your password before proceeding."
 JGLOBAL_PRINT="Print"
+JGLOBAL_PRINT_TITLE="Print article < %s >"
 JGLOBAL_RECORD_NUMBER="Record ID: %d"
 JGLOBAL_REMEMBER_ME="Remember me"
 JGLOBAL_REMEMBER_MUST_LOGIN="For security reasons you must login before editing your personal information."
@@ -219,6 +254,8 @@ JGLOBAL_START_PUBLISH_AFTER_FINISH="Item start publishing date must be before fi
 JGLOBAL_SUBCATEGORIES="Subcategories"
 JGLOBAL_SUBHEADING_DESC="Optional text to show as a subheading."
 JGLOBAL_TITLE="Title"
+JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options"
+JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category"
 JGLOBAL_USE_GLOBAL="Use Global"
 JGLOBAL_USERNAME="Username"
 JGLOBAL_VALIDATION_FORM_FAILED="Invalid form"
@@ -240,20 +277,25 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s"
 JLIB_ERROR_INFINITE_LOOP="Infinite loop detected in JError"
 
 JOPTION_SELECT_ACCESS="- Select Access -"
+JOPTION_SELECT_AUTHOR="- Select Author -"
 JOPTION_SELECT_CATEGORY="- Select Category -"
 JOPTION_SELECT_LANGUAGE="- Select Language -"
 JOPTION_SELECT_PUBLISHED="- Select Status -"
+JOPTION_SELECT_MAX_LEVELS="- Select Max Levels -"
+JOPTION_SELECT_TAG="- Select Tag -"
 JOPTION_USE_DEFAULT="- Use Default -"
 
 JSEARCH_FILTER_CLEAR="Clear"
 JSEARCH_FILTER_LABEL="Filter"
 JSEARCH_FILTER_SUBMIT="Search"
+JSEARCH_FILTER="Search"
 
 DATE_FORMAT_LC="l, d F Y"
 DATE_FORMAT_LC1="l, d F Y"
 DATE_FORMAT_LC2="l, d F Y H:i"
 DATE_FORMAT_LC3="d F Y"
 DATE_FORMAT_LC4="Y-m-d"
+DATE_FORMAT_LC5="Y-m-d H:i"
 DATE_FORMAT_JS1="y-m-d"
 
 ; Months
@@ -299,7 +341,7 @@ THURSDAY="Thursday"
 FRI="Fri"
 FRIDAY="Friday"
 
-; Localized number format
+; Localised number format
 
 DECIMALS_SEPARATOR="."
 THOUSANDS_SEPARATOR=","
@@ -322,13 +364,19 @@ PHPMAILER_SIGNING_ERROR="Signing error: "
 PHPMAILER_SMTP_ERROR="SMTP server error: "
 PHPMAILER_EMPTY_MESSAGE="Empty message body"
 PHPMAILER_INVALID_ADDRESS="Invalid address"
-PHPMAILER_VARIABLE_SET="Cannot set or reset variable: "
+PHPMAILER_VARIABLE_SET="Can't set or reset variable: "
 PHPMAILER_SMTP_CONNECT_FAILED="SMTP connect failed"
 PHPMAILER_TLS="Could not start TLS"
 
 ; Database types (allows for a more descriptive label than the internal name)
 MYSQL="MySQL"
 MYSQLI="MySQLi"
 ORACLE="Oracle"
+PDOMYSQL="MySQL (PDO)"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
+
+; Search tools
+JSEARCH_TOOLS="Search Tools"
+JSEARCH_TOOLS_DESC="Filter the list items."
+JSEARCH_TOOLS_ORDERING="Order by:"