Merge branch '4.3-dev' into 4.4-dev

administrator/components/com_users/forms/group.xml

@@ -5,7 +5,6 @@
 			name="id"
 			type="hidden"
 			default="0"
-			required="true"
 			readonly="true"
 		/>
 

administrator/language/en-GB/com_actionlogs.sys.ini

@@ -6,4 +6,4 @@
 COM_ACTIONLOGS="User Actions Log"
 COM_ACTIONLOGS_VIEW_DEFAULT_DESC="Shows a list of user actions."
 COM_ACTIONLOGS_VIEW_DEFAULT_TITLE="User Action Log"
-COM_ACTIONLOGS_XML_DESCRIPTION="Displays a log of actions performed by users on your website."
+COM_ACTIONLOGS_XML_DESCRIPTION="Displays a log of actions performed by users on your website."

administrator/language/en-GB/com_associations.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 COM_ASSOCIATIONS="Multilingual Associations"
-COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"
+COM_ASSOCIATIONS_XML_DESCRIPTION="Improved multilingual content management component"

administrator/language/en-GB/mod_toolbar.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 MOD_TOOLBAR="Toolbar"
-MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."
+MOD_TOOLBAR_XML_DESCRIPTION="This module shows the toolbar icons used to control actions throughout the Administrator area."

administrator/language/en-GB/plg_content_joomla.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_JOOMLA="Content - Joomla"
-PLG_CONTENT_JOOMLA_XML_DESCRIPTION="This plugin does category processing for core extensions; sends an email when new article is submitted in the Frontend."
+PLG_CONTENT_JOOMLA_XML_DESCRIPTION="This plugin does category processing for core extensions; sends an email when new article is submitted in the Frontend."

administrator/language/en-GB/plg_content_vote.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_VOTE="Content - Vote"
-PLG_VOTE_XML_DESCRIPTION="Add Voting functionality to Articles."
+PLG_VOTE_XML_DESCRIPTION="Add Voting functionality to Articles."

administrator/language/en-GB/plg_extension_joomla.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_EXTENSION_JOOMLA="Extension - Joomla"
-PLG_EXTENSION_JOOMLA_XML_DESCRIPTION="Manage the update sites for extensions."
+PLG_EXTENSION_JOOMLA_XML_DESCRIPTION="Manage the update sites for extensions."

administrator/language/en-GB/plg_extension_namespacemap.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_EXTENSION_NAMESPACEMAP="Extension - Namespace Updater"
-PLG_EXTENSION_NAMESPACEMAP_XML_DESCRIPTION="<p>Automatically builds and updates the <strong>administrator/cache/autoload_psr4.php</strong> file that is used to autoload extensions.</p><p><strong>Warning! This plugin must be enabled</strong> as it runs on extension install, update and uninstall.</p>"
+PLG_EXTENSION_NAMESPACEMAP_XML_DESCRIPTION="<p>Automatically builds and updates the <strong>administrator/cache/autoload_psr4.php</strong> file that is used to autoload extensions.</p><p><strong>Warning! This plugin must be enabled</strong> as it runs on extension install, update and uninstall.</p>"

administrator/language/en-GB/plg_system_sef.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SEF_XML_DESCRIPTION="Adds SEF support to links in the document. It operates directly on the HTML and does not require a special tag."
-PLG_SYSTEM_SEF="System - SEF"
+PLG_SYSTEM_SEF="System - SEF"

administrator/language/en-GB/plg_user_terms.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_USER_TERMS="User - Terms and Conditions"
-PLG_USER_TERMS_XML_DESCRIPTION="Basic plugin to request user's consent to the site's terms and conditions."
+PLG_USER_TERMS_XML_DESCRIPTION="Basic plugin to request user's consent to the site's terms and conditions."

language/en-GB/com_users.ini

@@ -21,7 +21,7 @@ COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY="Hello {NAME},\n\nThank you for
 COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW="Hello {NAME},\n\nThank you for registering at {SITENAME}. Your account is created and must be activated before you can use it.\nTo activate the account select the following link or copy-paste it in your browser:\n{ACTIVATE} \n\nAfter activation you may login to {SITEURL} using the following username and the password you entered during registration:\n\nUsername: {USERNAME}"
 COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY="Hello {NAME},\n\nThank you for registering at {SITENAME}. Your account is created and must be verified before you can use it.\n\nTo verify the account select the following link or copy-paste it in your browser:\n{ACTIVATE} \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\n\nOnce that account has been activated you may login to {SITEURL} using the following username and password:\n\nUsername: {USERNAME}\nPassword: {PASSWORD_CLEAR}"
 COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY_NOPW="Hello {NAME},\n\nThank you for registering at {SITENAME}. Your account is created and must be verified before you can use it.\n\nTo verify the account select the following link or copy-paste it in your browser:\n{ACTIVATE} \n\nAfter verification an administrator will be notified to activate your account. You'll receive a confirmation when it's done.\n\nOnce that account has been activated you may login to {SITEURL} using the following username and the password you entered during registration:\n\nUsername: {USERNAME}"
-COM_USERS_EMAIL_USERNAME_REMINDER_BODY="Hello,\n\nA username reminder has been requested for your {SITENAME} account.\n\nYour username is {USERNAME}.\n\nTo login to your account, select the link below.\n\n{LINK_TEXT} \n\nThank you."
+COM_USERS_EMAIL_USERNAME_REMINDER_BODY="Hello,\n\nA username reminder has been requested for your {SITENAME} account.\n\nYour username: {USERNAME}\n\nTo login to your account, select the link below.\n\n{LINK_TEXT} \n\nThank you."
 COM_USERS_EMAIL_USERNAME_REMINDER_SUBJECT="Your {SITENAME} username"
 COM_USERS_FIELD_PASSWORD_RESET_LABEL="Email Address"
 COM_USERS_FIELD_REMIND_EMAIL_LABEL="Email Address"

language/en-GB/mod_breadcrumbs.ini

@@ -11,4 +11,4 @@ MOD_BREADCRUMBS_FIELD_SHOWHOME_LABEL="Home"
 MOD_BREADCRUMBS_FIELD_SHOWLAST_LABEL="Last"
 MOD_BREADCRUMBS_HERE="You are here: "
 MOD_BREADCRUMBS_HOME="Home"
-MOD_BREADCRUMBS_XML_DESCRIPTION="This module displays the Breadcrumbs."
+MOD_BREADCRUMBS_XML_DESCRIPTION="This module displays the Breadcrumbs."

libraries/src/Console/CleanCacheCommand.php

@@ -52,7 +52,7 @@ class CleanCacheCommand extends AbstractCommand
         $symfonyStyle->title('Cleaning System Cache');
 
         $cache = $this->getApplication()->bootComponent('com_cache')->getMVCFactory();
-        /** @var Joomla\Component\Cache\Administrator\Model\CacheModel $model */
+        /** @var \Joomla\Component\Cache\Administrator\Model\CacheModel $model */
         $model = $cache->createModel('Cache', 'Administrator', ['ignore_request' => true]);
 
         if ($input->getArgument('expired')) {