Merge branch '4.1-dev' into 4.1-dev-more-images

.github/CODEOWNERS

@@ -37,13 +37,11 @@ tests/javascript/*  @rdeutz
 tests/Unit/*  @rdeutz
 .appveyor.yml  @rdeutz @hackwar
 .drone.yml  @rdeutz @hackwar
-.hound.yml  @wilsonge @hackwar
 codeception.yml  @rdeutz @hackwar
 phpunit.xml.dist  @rdeutz @hackwar
 phpunit-pgsql.xml.dist  @rdeutz @hackwar
-RoboFile.php  @rdeutz @hackwar
 
-# CSP Tooling
+# HttpHeaders Plugin
 plugins/system/httpheaders/*  @zero-24
 
 # Web Authentication (WebAuthn)
@@ -77,3 +75,6 @@ plugins/*/tmpl/* @chmst
 templates/cassiopeia/* @chmst
 layouts/* @chmst
 installation/tmpl/* @chmst
+
+# Translation GitHub Actions
+.github/workflows/create-translation-pull-request-v4.yml @hleithner

.github/CONTRIBUTING.md

@@ -20,5 +20,5 @@ There are other branches available which serve specific purposes.
 | Branch | Purpose |
 | ------ | ------- |
 | 3.10-dev | Branch for the Joomla 3.x series. The 3.10 series release will only include compatibility features for 4.x as well as bugfixes and security patches. |
-| 4.0-dev | Branch for the Joomla 4.0 series. Commits to 3.10-dev will be applied to this branch as well. |
-| 4.1-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.0-dev will be applied to this branch as well. |
+| 4.1-dev | Branch for the current minor Joomla version. Commits to 3.10-dev will be applied to this branch as well. |
+| 4.2-dev | Branch for the next minor Joomla version. New features go into this branch. Commits to 4.1-dev will be applied to this branch as well. |

README.md

@@ -1,4 +1,4 @@
-Joomla! CMS™ 
+Joomla! CMS™
 ====================
 
 Build Status
@@ -39,7 +39,7 @@ You will need:
 **Steps to setup the local environment:**
 - Clone the repository:
 ```bash
-git clone git@github.com:joomla/joomla-cms.git
+git clone https://github.com/joomla/joomla-cms.git
 ```
 - Go to the joomla-cms folder:
 ```bash

administrator/components/com_admin/sql/updates/mysql/4.1.1-2022-02-20.sql

@@ -0,0 +1 @@
+DELETE FROM `#__postinstall_messages` WHERE `title_key` = 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE';

administrator/components/com_admin/sql/updates/postgresql/4.1.1-2022-02-20.sql

@@ -0,0 +1 @@
+DELETE FROM "#__postinstall_messages" WHERE "title_key" = 'COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE';

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -261,6 +261,7 @@ public function &getPhpSettings(): array
 			'zlib'                => \extension_loaded('zlib'),
 			'zip'                 => \function_exists('zip_open') && \function_exists('zip_read'),
 			'mbstring'            => \extension_loaded('mbstring'),
+			'fileinfo'            => \extension_loaded('fileinfo'),
 			'gd'                  => \extension_loaded('gd'),
 			'iconv'               => \function_exists('iconv'),
 			'intl'                => \function_exists('transliterator_transliterate'),

administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php

@@ -143,6 +143,14 @@
 					<?php echo HTMLHelper::_('phpsetting.string', $this->phpSettings['disable_functions']); ?>
 				</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<?php echo Text::sprintf('COM_ADMIN_EXTENSION_AVAILABLE', 'Fileinfo'); ?>
+				</th>
+				<td>
+					<?php echo HTMLHelper::_('phpsetting.set', $this->phpSettings['fileinfo']); ?>
+				</td>
+			</tr>
 			<tr>
 				<th scope="row">
 					<?php echo Text::_('COM_ADMIN_MBSTRING_ENABLED'); ?>

administrator/components/com_config/forms/application.xml

@@ -1107,19 +1107,6 @@
 
 		</field>
 
-		<field
-			name="block_floc"
-			type="radio"
-			label="COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL"
-			description="COM_CONFIG_FIELD_FLOC_BLOCKER_DESC"
-			layout="joomla.form.field.radio.switcher"
-			default="1"
-			filter="integer"
-			>
-			<option value="0">JNO</option>
-			<option value="1">JYES</option>
-		</field>
-
 	</fieldset>
 
 	<fieldset

administrator/components/com_fields/forms/field.xml

@@ -253,6 +253,7 @@
 					name="render_class"
 					type="textarea"
 					label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
+					description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
 					validate="CssIdentifier"
 				/>
 

administrator/components/com_languages/src/Service/HTML/Languages.php

@@ -55,7 +55,6 @@ public function id($rowNum, $language)
 			. ' name="cid"'
 			. ' value="' . htmlspecialchars($language, ENT_COMPAT, 'UTF-8') . '"'
 			. ' onclick="Joomla.isChecked(this.checked);"'
-			. ' title="' . ($rowNum + 1) . '"'
 			. '>';
 	}
 

administrator/components/com_menus/src/View/Items/HtmlView.php

@@ -365,7 +365,7 @@ protected function addToolbar()
 
 			if (Factory::getUser()->authorise('core.admin') && !$protected)
 			{
-				$childBar->checkin('articles.checkin')->listCheck(true);
+				$childBar->checkin('items.checkin')->listCheck(true);
 			}
 
 			if ($canDo->get('core.edit.state') && $this->state->get('filter.published') != -2)

administrator/components/com_scheduler/src/Model/TaskModel.php

@@ -498,10 +498,12 @@ static function (TaskOption $taskOption): string
 		}
 		finally
 		{
+			$affectedRows = $db->getAffectedRows();
+
 			$db->unlockTables();
 		}
 
-		if ($db->getAffectedRows() != 1)
+		if ($affectedRows != 1)
 		{
 			/*
 			 // @todo
@@ -552,7 +554,7 @@ public static function configureTaskGetterOptions(OptionsResolver $resolver): Op
 				'includeCliExclusive' => true,
 			]
 		)
-			->setAllowedTypes('id', 'int')
+			->setAllowedTypes('id', 'numeric')
 			->setAllowedTypes('allowDisabled', 'bool')
 			->setAllowedTypes('bypassScheduling', 'bool')
 			->setAllowedTypes('allowConcurrent', 'bool')

administrator/components/com_scheduler/src/Scheduler/Scheduler.php

@@ -112,9 +112,9 @@ public function runTask(array $options): ?Task
 		// ? Sure about inferring scheduling bypass?
 		$task = $this->getTask(
 			[
-				'id'                  => $options['id'],
+				'id'                  => (int) $options['id'],
 				'allowDisabled'       => $options['allowDisabled'],
-				'bypassScheduling'    => $options['id'] !== 0,
+				'bypassScheduling'    => (int) $options['id'] !== 0,
 				'allowConcurrent'     => $options['allowConcurrent'],
 				'includeCliExclusive' => ($app->isClient('cli')),
 			]
@@ -192,7 +192,7 @@ protected function configureTaskRunnerOptions(OptionsResolver $resolver): void
 				'allowConcurrent' => false,
 			]
 		)
-			->setAllowedTypes('id', 'int')
+			->setAllowedTypes('id', 'numeric')
 			->setAllowedTypes('allowDisabled', 'bool')
 			->setAllowedTypes('allowConcurrent', 'bool');
 	}

administrator/components/com_scheduler/src/View/Select/HtmlView.php

@@ -14,7 +14,6 @@
 
 use Joomla\CMS\Application\AdministratorApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -118,8 +117,6 @@ public function display($tpl = null): void
 	 */
 	protected function addToolbar(): void
 	{
-		$canDo = ContentHelper::getActions('com_scheduler');
-
 		/*
 		* Get the global Toolbar instance
 		* @todo : Replace usage with ToolbarFactoryInterface. but how?
@@ -135,14 +132,5 @@ protected function addToolbar(): void
 			->buttonClass('btn btn-danger')
 			->icon('icon-times')
 			->text(Text::_('JCANCEL'));
-
-		// Add preferences button if user has privileges
-		if ($canDo->get('core.admin') || $canDo->get('core.options'))
-		{
-			$toolbar->preferences('com_scheduler');
-		}
-
-		// Add help button
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
 	}
 }

administrator/components/com_scheduler/src/View/Task/HtmlView.php

@@ -145,6 +145,6 @@ protected function addToolbar(): void
 		// @todo | ? : Do we need save2new, save2copy?
 
 		$toolbar->cancel('task.cancel', $isNew ? 'JTOOLBAR_CANCEL' : 'JTOOLBAR_CLOSE');
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
+		$toolbar->help('Scheduled_Tasks:_Edit');
 	}
 }

administrator/components/com_scheduler/src/View/Tasks/HtmlView.php

@@ -190,6 +190,6 @@ protected function addToolbar(): void
 			$toolbar->preferences('com_scheduler');
 		}
 
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
+		$toolbar->help('Scheduled_Tasks');
 	}
 }

administrator/language/en-GB/com_admin.ini

@@ -95,6 +95,8 @@ COM_ADMIN_HELP_PRIVATE_MESSAGES:_WRITE="Private Messages: Write"
 COM_ADMIN_HELP_PRIVATE_MESSAGES="Private Messages: Inbox"
 COM_ADMIN_HELP_REDIRECTS:_LINKS="Redirect: Links"
 COM_ADMIN_HELP_REDIRECTS:_NEW_OR_EDIT="Redirect: Links - New/Edit"
+COM_ADMIN_HELP_SCHEDULED_TASKS="Scheduled Tasks"
+COM_ADMIN_HELP_SCHEDULED_TASKS:_EDIT="Scheduled Tasks: New/Edit"
 COM_ADMIN_HELP_SITE_GLOBAL_CONFIGURATION="Global Configuration"
 COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
 COM_ADMIN_HELP_SMART_SEARCH:_CONTENT_MAPS="Smart Search: Content Maps"
@@ -137,8 +139,6 @@ COM_ADMIN_POST_MAX_SIZE="Post Max Size"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_ACTION="Enable Behind Load Balancer Setting"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_DESCRIPTION="<p>For Joomla sites hosted behind Load Balancers and Reverse Proxies a new Global Configuration setting has been introduced with Joomla 3.9.26</p><p>This setting, when enabled, will allow your Load Balancer/Reverse Proxy to provide the real IP address of your visitors. This IP will then be used in your Action Logs and used for tracking voting on articles (if these features are enabled).</p><p><strong>Only sites behind a Load Balancer/Reverse Proxy will wish to enable this feature.</strong></p>"
 COM_ADMIN_POSTINSTALL_MSG_BEHIND_LOAD_BALANCER_TITLE="New Server Setting \"Behind Load Balancer\""
-COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_DESCRIPTION="<p>A new technology is currently being rolled out to browsers to replace third party tracking cookies. This technology is named Federated Learning of Cohorts (FLoC) and you can read more about it at the <a href=\"https://wicg.github.io/floc/\" target=\"_blank\" rel=\"noopener noreferrer\">Web Platform Incubator Community Group</a> and at the <a href=\"https://www.eff.org/deeplinks/2021/03/googles-floc-terrible-idea\" target=\"_blank\" rel=\"noopener noreferrer\">Electronic Frontier Foundation</a>. Starting with Joomla! 3.9.27 your website blocks this technology, you can re-allow it from the Global Configuration. Additionally to disable this technology for all requests to your server, you have to update your .htaccess.</p>"
-COM_ADMIN_POSTINSTALL_MSG_FLOC_BLOCKER_TITLE="Block Federated Learning of Cohorts (FLoC)"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_DESCRIPTION="<p>Before 3.9.22 the default htaccess.txt file contained erroneous code meant for disabling directory listings. The security team recommends to manually apply the necessary changes to any existing .htaccess file, as this file can not be updated automatically.</p><p>The old code:</p><pre>&lt;IfModule autoindex&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre><p>The new code:</p><pre>&lt;IfModule mod_autoindex.c&gt;\n  IndexIgnore *\n&lt;/IfModule&gt;</pre>"
 COM_ADMIN_POSTINSTALL_MSG_HTACCESS_AUTOINDEX_TITLE=".htaccess Update Concerning Directory Listings"
 COM_ADMIN_SAVE_SUCCESS="Profile saved."

administrator/language/en-GB/com_config.ini

@@ -72,7 +72,7 @@ COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
 COM_CONFIG_FIELD_DEBUG_VALUE="Value"
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items."
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
-COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
+COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\" rel=\"noopener noreferrer\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
 COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
 COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="This editor will be used for editing content and other rich text areas in third party extensions unless a user has chosen a different one in their user profile . This will also be the only editor available and used for users who are not already logged in (the Guest user group)."
 COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
@@ -89,8 +89,6 @@ COM_CONFIG_FIELD_FILTERS_DEFAULT_FORBIDDEN_LIST="Default Forbidden List"
 COM_CONFIG_FIELD_FILTERS_NO_FILTER="No Filtering"
 COM_CONFIG_FIELD_FILTERS_NO_HTML="No HTML"
 COM_CONFIG_FIELD_FILTERS_ALLOWED_LIST="Allowed List"
-COM_CONFIG_FIELD_FLOC_BLOCKER_DESC="Send a header to not support the tracking through the FLoC method."
-COM_CONFIG_FIELD_FLOC_BLOCKER_LABEL="Block FLoC"
 COM_CONFIG_FIELD_FORCE_SSL_DESC="HTTPS must be enabled on your server or load balancer to utilise this option. Enable 'Behind Load Balancer' if your SSL terminates on your load balancer but your site is served on http on its webserver."
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force HTTPS"
 COM_CONFIG_FIELD_GZIP_COMPRESSION_DESC="Joomla can automatically compress the generated HTML pages with GZip, making them smaller and increasing your site's speed score. Disable it if your server is already doing that for you or if it conflicts with third party extensions."
@@ -157,7 +155,7 @@ COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host/Sock"
 COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
 COM_CONFIG_FIELD_REDIS_PORT_DESC="Port discarded if connecting to Redis server over Unix sockets."
 COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
-COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
+COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\" rel=\"noopener noreferrer\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
 COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the <code>index.php/</code> part from the URLs."
 COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as <code>.html</code>, <code>.feed</code> etc based on the type of content being displayed by the URL."

administrator/language/en-GB/com_fields.ini

@@ -52,12 +52,12 @@ COM_FIELDS_FIELD_ONLY_USE_IN_SUBFORM_LABEL="Only Use In Subform"
 COM_FIELDS_FIELD_PLACEHOLDER_DESC="Placeholder text which will appear inside the field as a hint to the user for the required input."
 COM_FIELDS_FIELD_PLACEHOLDER_LABEL="Placeholder"
 COM_FIELDS_FIELD_PREFIX_LABEL="Prefix"
-COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the field is rendered. If multiple classes are needed, list them with spaces."
-COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
-COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Render Options"
+COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class of the field container in the output."
+COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Display Class"
+COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Display Options"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
 COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved"
-COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field renders."
+COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field displays."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
 COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_LABEL="Type"

administrator/language/en-GB/com_installer.ini

@@ -30,8 +30,8 @@ COM_INSTALLER_EMPTYSTATE_BUTTON_ADD="Check For Updates"
 COM_INSTALLER_EMPTYSTATE_CONTENT="You currently have no pending updates to apply. Check regularly for new updates to keep your site up to date and secure."
 COM_INSTALLER_EMPTYSTATE_DISCOVER_BUTTON_ADD="Discover extensions to install"
 COM_INSTALLER_EMPTYSTATE_DISCOVER_TITLE="You have no discovered extensions to install."
-COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disable default template is not permitted."
-COM_INSTALLER_ERROR_DISABLE_PARENT_TEMPLATE_NOT_PERMITTED="Disable parent template is not permitted."
+COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disabling the default template is not permitted."
+COM_INSTALLER_ERROR_DISABLE_PARENT_TEMPLATE_NOT_PERMITTED="Disabling the parent template is not permitted."
 COM_INSTALLER_ERROR_METHOD="Method Not Implemented"
 COM_INSTALLER_ERROR_NO_EXTENSIONS_DISCOVERED="No extensions discovered."
 COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED="No extensions selected."

administrator/language/en-GB/com_messages.ini

@@ -59,7 +59,7 @@ COM_MESSAGES_N_ITEMS_TRASHED_1="Message trashed."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED="%d messages marked as unread."
 COM_MESSAGES_N_ITEMS_UNPUBLISHED_1="Message marked as unread."
 COM_MESSAGES_NEW_MESSAGE="New Message from {FROMNAME} at {SITENAME}"
-COM_MESSAGES_NEW_MESSAGE_BODY="{SUBJECT} \n\n{MESSAGE} \n\nPlease log in to {SITEURL} to read your message."
+COM_MESSAGES_NEW_MESSAGE_BODY="{SUBJECT} \n\n{MESSAGE}"
 COM_MESSAGES_NO_ITEM_SELECTED="No messages selected."
 COM_MESSAGES_OPTION_READ="Read"
 COM_MESSAGES_OPTION_UNREAD="Unread"

administrator/language/en-GB/com_scheduler.ini

@@ -12,7 +12,7 @@ COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_KEY_LABEL="Global Key"
 COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_LINK_DESC="By default, requesting this base link will only run tasks due for execution. To execute a specific task, use the task's ID as a query parameter appended to the URL: <code>BASE_URL&id=&lt;taskId&gt;</code>"
 COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_LINK_LABEL="Webcron Link (Base)"
 COM_SCHEDULER_CONFIG_HASH_PROTECTION_DESC="If enabled, tasks will only be triggered when URLs have the scheduler hash as a parameter."
-COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_DESC="If disabled, scheduled tasks will not be triggered by visitors on the site.<br>Recommended if triggering with native cron."
+COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_DESC="If disabled, scheduled tasks will not be triggered by visitors on the site.<br>It is recommended to DISABLE the Lazy Scheduler, if triggering with native cron."
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_LABEL="Lazy Scheduler"
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_INTERVAL_DESC="Interval between scheduler trigger requests from the client."
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_INTERVAL_LABEL="Request Interval (seconds)"

administrator/language/en-GB/install.xml

@@ -2,7 +2,7 @@
 <extension client="administrator" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.1.0</version>
+	<version>4.1.1</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

administrator/language/en-GB/joomla.ini

@@ -367,7 +367,7 @@ JGLOBAL_BLOG="Blog"
 JGLOBAL_BLOG_ACROSS_OPTION="Across"
 JGLOBAL_BLOG_CLASS="Article Class"
 JGLOBAL_BLOG_CLASS_LEADING="Leading Article Class"
-JGLOBAL_BLOG_CLASS_NOTE_DESC="You can add any CSS class for your own styling ideas.<br>Add a border on top with class boxed.<br>For image position use for example image-left, image-right. Add image-alternate for alternative ordering of intro-images."
+JGLOBAL_BLOG_CLASS_NOTE_DESC="You can add any CSS class for your own styling ideas.<br>Add a border on top with class boxed.<br>For image position use for example image-left, image-right. Add image-alternate for alternate ordering of intro images."
 JGLOBAL_BLOG_DOWN_OPTION="Down"
 JGLOBAL_BLOG_LAYOUT_OPTIONS="Blog Layout"
 JGLOBAL_CATEGORIES_OPTIONS="Categories"
@@ -480,7 +480,7 @@ JGLOBAL_HITS_DESC="Hits descending"
 JGLOBAL_INHERIT="Inherit"
 JGLOBAL_INTEGRATION_LABEL="Integration"
 JGLOBAL_INTRO_TEXT="Intro Text"
-JGLOBAL_ISFREESOFTWARE="%s is free software released under the <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\">GNU General Public License</a>."
+JGLOBAL_ISFREESOFTWARE="%s is free software released under the <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\" rel=\"noopener noreferrer\">GNU General Public License</a>."
 JGLOBAL_ITEM_FEATURE="Feature Item"
 JGLOBAL_ITEM_UNFEATURE="Unfeature Item"
 JGLOBAL_JOOA11Y="Accessibility Check"

administrator/language/en-GB/langmetadata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="administrator">
 	<name>English (en-GB)</name>
-	<version>4.1.0</version>
+	<version>4.1.1</version>
 	<creationDate>February 2022</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>