[4.0] Crowdin comments

[jgerman-bot]

New language relevant PR in upstream repo: joomla/joomla-cms#34671 Here are the upstream changes:

Click to expand the diff!

diff --git a/administrator/language/en-GB/com_banners.ini b/administrator/language/en-GB/com_banners.ini
index 83dee761eef8..f2c727a5a293 100644
--- a/administrator/language/en-GB/com_banners.ini
+++ b/administrator/language/en-GB/com_banners.ini
@@ -199,5 +199,4 @@ COM_BANNERS_UNLIMITED="Unlimited"
 COM_BANNERS_WARNING_PROVIDE_VALID_NAME="Please provide a valid, non-blank name"
 COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_BANNERS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_BANNERS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_cache.ini b/administrator/language/en-GB/com_cache.ini
index a45c9203ab4e..01effdc62342 100644
--- a/administrator/language/en-GB/com_cache.ini
+++ b/administrator/language/en-GB/com_cache.ini
@@ -37,5 +37,4 @@ COM_CACHE_SIZE="Size"
 COM_CACHE_TABLE_CAPTION="Table of Cached Files"
 COM_CACHE_XML_DESCRIPTION="Component for cache management."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_CACHE="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_CACHE="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_checkin.ini b/administrator/language/en-GB/com_checkin.ini
index 1dc6516b43a6..6a14709de005 100644
--- a/administrator/language/en-GB/com_checkin.ini
+++ b/administrator/language/en-GB/com_checkin.ini
@@ -25,5 +25,4 @@ COM_CHECKIN_TABLE="<em>%s</em> table"
 COM_CHECKIN_TABLE_CAPTION="Table of Checked Out Items"
 COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_CHECKIN="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_CHECKIN="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_config.ini b/administrator/language/en-GB/com_config.ini
index 1e6e91683014..0fd4e1ac6dfd 100644
--- a/administrator/language/en-GB/com_config.ini
+++ b/administrator/language/en-GB/com_config.ini
@@ -232,5 +232,4 @@ COM_CONFIG_TEXT_FILTERS_SUMMARY="Expand for notes about the text filters"
 COM_CONFIG_WEBSERVICES_SETTINGS="Web Services"
 COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_CONFIG="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items."
+JLIB_RULES_SETTING_NOTES_COM_CONFIG="If you change the setting, it will apply to this and all child groups, components and content. Note that:<br><em><strong>Inherited</strong></em> means that the permissions from the parent group will be used.<br><em><strong>Denied</strong></em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br><em><strong>Allowed</strong></em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em><strong>Not Allowed (Locked)</strong></em> under Calculated Settings).<br><em><strong>Not Set</strong></em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_contact.ini b/administrator/language/en-GB/com_contact.ini
index 1e5598c34bc5..9655ff66d714 100644
--- a/administrator/language/en-GB/com_contact.ini
+++ b/administrator/language/en-GB/com_contact.ini
@@ -192,5 +192,4 @@ JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
 JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
 JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_CONTACT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_CONTACT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_content.ini b/administrator/language/en-GB/com_content.ini
index 716d1c01a889..e66a574bbe87 100644
--- a/administrator/language/en-GB/com_content.ini
+++ b/administrator/language/en-GB/com_content.ini
@@ -190,11 +190,9 @@ JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE="You are not allowed to create new ar
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these articles."
 JLIB_APPLICATION_ERROR_BATCH_CANNOT_EXECUTE_TRANSITION="You are not allowed to execute a transition for one or more of these articles."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_CONTENT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
-JLIB_RULES_SETTING_NOTES_ITEM_COM_CONTENT_ARTICLE="Changes apply to this article only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_CONTENT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
+JLIB_RULES_SETTING_NOTES_ITEM_COM_CONTENT_ARTICLE="Changes apply to this article only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
 
-; Fields overrides
-COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups"
-COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group"
-COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group"
+COM_CONTENT_ARTICLE_CATEGORIES_TITLE="Articles: Field Groups" ; Fields overrides
+COM_CONTENT_ARTICLE_CATEGORY_ADD_TITLE="Articles: New Field Group" ; Fields overrides
+COM_CONTENT_ARTICLE_CATEGORY_EDIT_TITLE="Articles: Edit Field Group" ; Fields overrides
diff --git a/administrator/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
index a8949910a403..ec0d09623196 100644
--- a/administrator/language/en-GB/com_cpanel.ini
+++ b/administrator/language/en-GB/com_cpanel.ini
@@ -15,8 +15,7 @@ COM_CPANEL_MESSAGES_BODY_NOCLOSE="There are important post-installation messages
 COM_CPANEL_MESSAGES_BODYMORE_NOCLOSE="This information area won't appear when you have hidden all the messages."
 COM_CPANEL_MESSAGES_REVIEW="Read Messages"
 COM_CPANEL_MESSAGES_TITLE="You have post-installation messages"
-; Translators: Don't touch the code part in the following message, Starting with ## Mod_rewrite ...
-COM_CPANEL_MSG_ADDNOSNIFF_BODY="<p>Joomla is now shipped with additional security hardenings in the default htaccess.txt and web.config.txt files. These hardenings disable the so called MIME-type sniffing feature in web browsers. The sniffing leads to specific attack vectors, where scripts in normally harmless file formats (eg images) will be executed, leading to Cross-Site-Scripting vulnerabilities.</p><p>The security team recommends to manually apply the necessary changes to existing .htaccess or web.config files, as those files can not be updated automatically.</p><p><strong>Changes for .htaccess</strong><br>Add the following lines before \"## Mod_rewrite in use.\":</p><pre>&lt;IfModule mod_headers.c&gt;\nHeader always set X-Content-Type-Options \"nosniff\"\n&lt;/IfModule&gt;</pre><p><strong>Changes for web.config</strong><br>Add the following lines right after \"&lt;/rewrite&gt;\":</p><pre>&lt;httpProtocol&gt;\n  &lt;customHeaders&gt;\n    &lt;add name=\"X-Content-Type-Options\" value=\"nosniff\" /&gt;\n  &lt;/customHeaders&gt;\n&lt;/httpProtocol&gt;</pre>"
+COM_CPANEL_MSG_ADDNOSNIFF_BODY="<p>Joomla is now shipped with additional security hardenings in the default htaccess.txt and web.config.txt files. These hardenings disable the so called MIME-type sniffing feature in web browsers. The sniffing leads to specific attack vectors, where scripts in normally harmless file formats (eg images) will be executed, leading to Cross-Site-Scripting vulnerabilities.</p><p>The security team recommends to manually apply the necessary changes to existing .htaccess or web.config files, as those files can not be updated automatically.</p><p><strong>Changes for .htaccess</strong><br>Add the following lines before \"## Mod_rewrite in use.\":</p><pre>&lt;IfModule mod_headers.c&gt;\nHeader always set X-Content-Type-Options \"nosniff\"\n&lt;/IfModule&gt;</pre><p><strong>Changes for web.config</strong><br>Add the following lines right after \"&lt;/rewrite&gt;\":</p><pre>&lt;httpProtocol&gt;\n  &lt;customHeaders&gt;\n    &lt;add name=\"X-Content-Type-Options\" value=\"nosniff\" /&gt;\n  &lt;/customHeaders&gt;\n&lt;/httpProtocol&gt;</pre>" ; Translators: Don't touch the code part in the message, Starting with ## Mod_rewrite ...
 COM_CPANEL_MSG_ADDNOSNIFF_TITLE=".htaccess & web.config Security Update"
 COM_CPANEL_MSG_HTACCESSSVG_BODY="<p>Since 3.9.21 Joomla is shipped with an additional security rule in the default htaccess.txt. This rule will protect users of svg files from potential Cross-Site-Scripting (XSS) vulnerabilities.<br>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><strong>Changes for .htaccess</strong></p><pre>&lt;FilesMatch \"\.svg$\"&gt;\n  &lt;IfModule mod_headers.c&gt;\n    Header always set Content-Security-Policy \"script-src 'none'\"\n  &lt;/IfModule&gt;\n&lt;/FilesMatch&gt;</pre><p>Currently we are not aware of a method to conditionally configure this on IIS web servers, please contact your hosting provider for further assistance.</p>"
 COM_CPANEL_MSG_HTACCESSSVG_TITLE="Additional XSS protection for the usage of SVG files"
diff --git a/administrator/language/en-GB/com_installer.ini b/administrator/language/en-GB/com_installer.ini
index 626cc546f18b..04ef10c19d79 100644
--- a/administrator/language/en-GB/com_installer.ini
+++ b/administrator/language/en-GB/com_installer.ini
@@ -293,5 +293,4 @@ COM_INSTALLER_VALUE_SUPPORTED_SUPPORTED="Download Key supported"
 COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -"
 COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_INSTALLER="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_INSTALLER="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_languages.ini b/administrator/language/en-GB/com_languages.ini
index 4cb4a7e9824d..c4f41e1b8a4c 100644
--- a/administrator/language/en-GB/com_languages.ini
+++ b/administrator/language/en-GB/com_languages.ini
@@ -150,5 +150,4 @@ COM_LANGUAGES_VIEW_OVERRIDES_TEXT_DESC="Text descending"
 COM_LANGUAGES_VIEW_OVERRIDES_TITLE="Languages: Overrides"
 COM_LANGUAGES_XML_DESCRIPTION="Component for language management"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_LANGUAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_LANGUAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
index e7bd86194729..8335ec01db85 100644
--- a/administrator/language/en-GB/com_menus.ini
+++ b/administrator/language/en-GB/com_menus.ini
@@ -141,9 +141,7 @@ COM_MENUS_MENUS="Menu Items"
 COM_MENUS_MENUS_FILTER_SEARCH_DESC="Search in title and menu type."
 COM_MENUS_MENUS_FILTER_SEARCH_LABEL="Search Menus"
 COM_MENUS_MENUS_TABLE_CAPTION="Table of Menus"
-; in the following string
-; %1$s is for module title, %2$s is for access-title, %3$s is for position
-COM_MENUS_MODULE_ACCESS_POSITION="%1$s <small>(%2$s in %3$s)</small>"
+COM_MENUS_MODULE_ACCESS_POSITION="%1$s <small>(%2$s in %3$s)</small>" ; %1$s is for module title, %2$s is for access-title, %3$s is for position
 COM_MENUS_MODULES="Modules"
 COM_MENUS_MODULES_TABLE_CAPTION="Table of Module Assignments"
 COM_MENUS_N_ITEMS_CHECKED_IN_1="Menu item checked in."
@@ -205,10 +203,8 @@ COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Item"
 COM_MENUS_VIEW_NEW_MENU_TITLE="Menus: Add"
 COM_MENUS_XML_DESCRIPTION="Component for creating menus."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_MENUS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_MENUS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
 
-; Alternate language strings for the default menu item
-JDEFAULT="Home"
-JLIB_HTML_SETDEFAULT_ITEM="Set as Home"
-JTOOLBAR_DEFAULT="Home"
+JDEFAULT="Home" ; Alternate language strings for the default menu item
+JLIB_HTML_SETDEFAULT_ITEM="Set as Home" ; Alternate language strings for the default menu item
+JTOOLBAR_DEFAULT="Home" ; Alternate language strings for the default menu item
diff --git a/administrator/language/en-GB/com_messages.ini b/administrator/language/en-GB/com_messages.ini
index fe28ca836391..43363d1e951d 100644
--- a/administrator/language/en-GB/com_messages.ini
+++ b/administrator/language/en-GB/com_messages.ini
@@ -77,5 +77,4 @@ COM_MESSAGES_VIEW_PRIVATE_MESSAGE="Private Messages: View"
 COM_MESSAGES_WRITE_PRIVATE_MESSAGE="Private Messages: Write"
 COM_MESSAGES_XML_DESCRIPTION="Component for private messaging support in Backend."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_MESSAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_MESSAGES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_modules.ini b/administrator/language/en-GB/com_modules.ini
index cfb0cc3c87bf..f0add7dbba49 100644
--- a/administrator/language/en-GB/com_modules.ini
+++ b/administrator/language/en-GB/com_modules.ini
@@ -192,5 +192,4 @@ COM_MODULES_TYPE_CHOOSE="Select a Module Type"
 COM_MODULES_TYPE_OR_SELECT_POSITION="Type or Select a Position"
 COM_MODULES_XML_DESCRIPTION="Component for module management in the Administrator Backend."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_MODULES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_MODULES="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_newsfeeds.ini b/administrator/language/en-GB/com_newsfeeds.ini
index c03180139d1a..77d889958389 100644
--- a/administrator/language/en-GB/com_newsfeeds.ini
+++ b/administrator/language/en-GB/com_newsfeeds.ini
@@ -95,5 +95,4 @@ COM_NEWSFEEDS_WARNING_PROVIDE_VALID_NAME="Please provide a valid name."
 COM_NEWSFEEDS_XML_DESCRIPTION="This component manages RSS and Atom news feeds."
 JGLOBAL_NEWITEMSLAST_DESC="New news feeds default to the last position. The ordering can be changed after this news feed has been saved."
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_NEWSFEEDS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_NEWSFEEDS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_plugins.ini b/administrator/language/en-GB/com_plugins.ini
index 1b72b3f93cf4..40d7f3662d95 100644
--- a/administrator/language/en-GB/com_plugins.ini
+++ b/administrator/language/en-GB/com_plugins.ini
@@ -42,5 +42,4 @@ COM_PLUGINS_XML_ERR="Plugins XML data not available."
 JLIB_HTML_PUBLISH_ITEM="Enable plugin"
 JLIB_HTML_UNPUBLISH_ITEM="Disable plugin"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_PLUGINS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_PLUGINS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_redirect.ini b/administrator/language/en-GB/com_redirect.ini
index dc121a38cafd..9b17e3fe3457 100644
--- a/administrator/language/en-GB/com_redirect.ini
+++ b/administrator/language/en-GB/com_redirect.ini
@@ -95,5 +95,4 @@ COM_REDIRECT_TOOLBAR_PURGE="Purge Disabled"
 COM_REDIRECT_XML_DESCRIPTION="This component implements link redirection."
 COM_REDIRECTS_TABLE_CAPTION="Table of redirect Links"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_REDIRECT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_REDIRECT="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 0454bcb066a6..b4ce39a46f5e 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -379,9 +379,7 @@ COM_USERS_VIEW_NOTES_TITLE="User Notes"
 COM_USERS_VIEW_USERS_TITLE="Users"
 COM_USERS_XML_DESCRIPTION="Component for managing users"
 
-; Alternate language strings for the rules form field
-JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting."
+JLIB_RULES_SETTING_NOTES_COM_USERS="Changes apply to this component only.<br><em><strong>Inherited</strong></em> - a Global Configuration setting or higher level setting is applied.<br><em><strong>Denied</strong></em> always wins - whatever is set at the Global or higher level and applies to all child elements.<br><em><strong>Allowed</strong></em> will enable the action for this component unless overruled by a Global Configuration setting." ; Alternate language strings for the rules form field
 
-; Categories overrides
-COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category"
-COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category"
+COM_CATEGORIES_CATEGORY_ADD_TITLE="User Notes: New Category" ; Categories overrides
+COM_CATEGORIES_CATEGORY_EDIT_TITLE="User Notes: Edit Category" ; Categories overrides
diff --git a/administrator/language/en-GB/mod_menu.ini b/administrator/language/en-GB/mod_menu.ini
index b13e0265005b..33fd0dc9c21e 100644
--- a/administrator/language/en-GB/mod_menu.ini
+++ b/administrator/language/en-GB/mod_menu.ini
@@ -70,14 +70,10 @@ MOD_MENU_HELP_PARENT_START_HERE="Start Here"
 MOD_MENU_HELP_RESOURCES="Joomla! Resources"
 MOD_MENU_HELP_SECURITY="Security Centre"
 MOD_MENU_HELP_SHOP="Joomla! Shop"
-; The string below will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL
-MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum"
+MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" ; Will be used if the localised sample data has a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module has a URL
 MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum"
-; If you have chosen to display in the string above the section for all languages, translate the string below.
-; If you have displayed the specific language forum, use something like "Official French Forum" in your language.
-MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums"
-; Enter in the string below the # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums.
-MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511"
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" ; If you have displayed the specific language forum, use something like "Official French Forum" in your language.
+MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511" ; The # of the specific language forum in https://forum.joomla.org/ (example: 19 for French). Default is '511' which is the section for all languages forums.
 MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations"
 MOD_MENU_HELP_USER_GROUPS="Joomla User Groups"
 MOD_MENU_HELP_XCHANGE="Stack Exchange"
diff --git a/administrator/language/en-GB/plg_fields_imagelist.ini b/administrator/language/en-GB/plg_fields_imagelist.ini
index 1fe6b5905a1f..650be93932c8 100644
--- a/administrator/language/en-GB/plg_fields_imagelist.ini
+++ b/administrator/language/en-GB/plg_fields_imagelist.ini
@@ -5,8 +5,7 @@
 
 PLG_FIELDS_IMAGELIST="Fields - Imagelist"
 PLG_FIELDS_IMAGELIST_LABEL="List of Images (%s)"
-; Don't translate "images" in the string below.
-PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root."
+PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_DESC="This directory is relative to \"images\" directory in Joomla! root." ; Don't translate "images"
 PLG_FIELDS_IMAGELIST_PARAMS_DIRECTORY_LABEL="Directory"
 PLG_FIELDS_IMAGELIST_PARAMS_IMAGE_CLASS_LABEL="Image Class"
 PLG_FIELDS_IMAGELIST_PARAMS_MULTIPLE_LABEL="Multiple"
diff --git a/administrator/language/en-GB/plg_fields_sql.ini b/administrator/language/en-GB/plg_fields_sql.ini
index 4717eabf9e6b..5744e7f54110 100644
--- a/administrator/language/en-GB/plg_fields_sql.ini
+++ b/administrator/language/en-GB/plg_fields_sql.ini
@@ -7,7 +7,6 @@ PLG_FIELDS_SQL="Fields - SQL"
 PLG_FIELDS_SQL_CREATE_NOT_POSSIBLE="Only a Super User can create or edit an SQL field!"
 PLG_FIELDS_SQL_LABEL="SQL (%s)"
 PLG_FIELDS_SQL_PARAMS_MULTIPLE_LABEL="Multiple"
-; In the string below the terms 'value' and 'text' should not be translated
-PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list."
+PLG_FIELDS_SQL_PARAMS_QUERY_DESC="The SQL query which will provide the data for the dropdown list. The query must return two columns; one called 'value' which will hold the values of the list items; the other called 'text' with the text in the dropdown list." ; The terms 'value' and 'text' should not be translated
 PLG_FIELDS_SQL_PARAMS_QUERY_LABEL="Query"
 PLG_FIELDS_SQL_XML_DESCRIPTION="This plugin lets you create new fields of type 'sql' in any extensions where custom fields are supported."
diff --git a/administrator/language/en-GB/plg_installer_webinstaller.ini b/administrator/language/en-GB/plg_installer_webinstaller.ini
index d6e63f9e8cac..e3ebf2fa3919 100644
--- a/administrator/language/en-GB/plg_installer_webinstaller.ini
+++ b/administrator/language/en-GB/plg_installer_webinstaller.ini
@@ -10,7 +10,6 @@ PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_NAME="Extension Name"
 PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_CONFIRM_URL="Install from"
 PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING="Loading ..."
 PLG_INSTALLER_WEBINSTALLER_INSTALL_WEB_LOADING_ERROR="Can't connect to the Joomla! server. Please try again later."
-; The [SITEURL] placeholder should not be translated as it is used in the JavaScript API to insert the correct URL
-PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL="You will be redirected to the following link to complete the registration/purchase: [SITEURL]"
+PLG_INSTALLER_WEBINSTALLER_REDIRECT_TO_EXTERNAL_SITE_TO_INSTALL="You will be redirected to the following link to complete the registration/purchase: [SITEURL]" ; The [SITEURL] placeholder should not be translated as it is used in the JavaScript API to insert the correct URL
 PLG_INSTALLER_WEBINSTALLER_TAB_LABEL="Install from Web"
 PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin allows you to install directly from the Joomla! Extension Directory."
diff --git a/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini b/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini
index 256cd3954e87..c03c665c6682 100644
--- a/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini
+++ b/administrator/language/en-GB/plg_quickicon_phpversioncheck.ini
@@ -4,10 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_QUICKICON_PHPVERSIONCHECK="Quick Icon - PHP Version Check"
-; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version
-PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes from the PHP project at this time. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version. Please contact your host for upgrade instructions."
-; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version
-PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s. <br><br>Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure."
-; Key 1 is the server's current PHP version
-PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. Furthermore, we cannot recommend a newer PHP version because you are using an outdated Joomla! version. We recommend updating Joomla! and then following further PHP upgrade instructions."
+PLG_QUICKICON_PHPVERSIONCHECK_SECURITY_ONLY="Your PHP version, %1$s, is only receiving security fixes from the PHP project at this time. This means your PHP version will soon no longer be supported. We recommend planning to upgrade to a newer PHP version before it reaches end of support on %2$s. Joomla will be faster and more secure if you upgrade to a newer PHP version. Please contact your host for upgrade instructions." ; Key 1 is the server's current PHP version, key 2 is the date at which support will end for the current PHP version
+PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. The Joomla! Project recommends upgrading your site to PHP %2$s or later which will receive security updates at least until %3$s. <br><br>Please ask your host to make PHP %2$s or a later version the default version for your site. If your host is already PHP %2$s ready please enable PHP %2$s on your site's root and 'administrator' directories – typically you can do this yourself through a tool in your hosting control panel, but it's best to ask your host if you are unsure." ; Key 1 is the server's current PHP version, key 2 is the recommended PHP version, and key 3 is the date at which support will end for the recommended PHP version
+PLG_QUICKICON_PHPVERSIONCHECK_UNSUPPORTED_JOOMLA_OUTDATED="We have detected that your server is using PHP %1$s which is obsolete and no longer receives official security updates by its developers. Furthermore, we cannot recommend a newer PHP version because you are using an outdated Joomla! version. We recommend updating Joomla! and then following further PHP upgrade instructions." ; Key 1 is the server's current PHP version
 PLG_QUICKICON_PHPVERSIONCHECK_XML_DESCRIPTION="Checks the support status of your installation's PHP version and raises a warning if not fully supported."
diff --git a/administrator/language/en-GB/plg_system_httpheaders.ini b/administrator/language/en-GB/plg_system_httpheaders.ini
index dd306e086098..ee90100271ba 100644
--- a/administrator/language/en-GB/plg_system_httpheaders.ini
+++ b/administrator/language/en-GB/plg_system_httpheaders.ini
@@ -3,61 +3,43 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-; Please do not translate the word 'HTTP Headers' in the following two language strings
-PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers"
-PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER="Force HTTP Headers"
-; Please do not translate the word 'HTTP Header' in the following two language strings
-PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_KEY="HTTP Header"
-PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_VALUE="HTTP Header Value"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP' target='_blank' rel='noopener noreferrer'>Content Security Policy (CSP)</a>"
+PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" ; Do not translate 'HTTP Headers'
+PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER="Force HTTP Headers" ; Do not translate 'HTTP Headers'
+PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_KEY="HTTP Header" ; Do not translate 'HTTP Header'
+PLG_SYSTEM_HTTPHEADERS_ADDITIONAL_HEADER_VALUE="HTTP Header Value" ; Do not translate 'HTTP Header'
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP' target='_blank' rel='noopener noreferrer'>Content Security Policy (CSP)</a>" ; Do not translate
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_CLIENT="Client"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED="frame-ancestors 'self'"
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED="frame-ancestors 'self'" ; Do not translate
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_FRAME_ANCESTORS_SELF_ENABLED_DESC="Enable the CSP clickjacking protection frame-ancestors and only allow the origin 'self'. Please use the form below to allow origins other than 'self'."
-; Please only change the URL in the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Nonce</a>"
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Nonce</a>" ; Please only change the URL
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_NONCE_ENABLED_DESC="Enable the whitelist for specific inline scripts using a cryptographic nonce (number used once) for all scripts and styles using the Joomla API. Specifying a nonce makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without nonce support."
-; Please do not translate 'Content-Security-Policy' & 'Content-Security-Policy-Report-Only' in the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY_DESC="Use the header 'Content-Security-Policy-Report-Only' instead of 'Content-Security-Policy'."
-; Please do not translate the following two language strings
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY="Report-Only"
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED="strict-dynamic"
-; Please do not translate 'strict-dynamic', 'self' and 'unsafe-inline' in the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED_DESC="The strict-dynamic source expression specifies that the trust explicitly given to a script present in the markup, by accompanying it with a nonce or a hash, shall be propagated to all the scripts loaded by that root script. At the same time, any allowed or source expressions such as 'self' or 'unsafe-inline' will be ignored."
-; Please only change the URL in the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Script hashes</a>"
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY_DESC="Use the header 'Content-Security-Policy-Report-Only' instead of 'Content-Security-Policy'." ; Do not translate 'Content-Security-Policy' & 'Content-Security-Policy-Report-Only'
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_REPORT_ONLY="Report-Only" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED="strict-dynamic" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STRICT_DYNAMIC_ENABLED_DESC="The strict-dynamic source expression specifies that the trust explicitly given to a script present in the markup, by accompanying it with a nonce or a hash, shall be propagated to all the scripts loaded by that root script. At the same time, any allowed or source expressions such as 'self' or 'unsafe-inline' will be ignored." ; Do not translate 'strict-dynamic', 'self' and 'unsafe-inline'
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Script hashes</a>" ; Please only change the URL
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_SCRIPT_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline scripts using a cryptographic hash for all scripts using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support."
-; Please only change the URL in the following language string
-PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Style hashes</a>"
+PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/script-src' target='_blank' rel='noopener noreferrer'>Style hashes</a>" ; Please only change the URL
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_STYLE_HASHES_ENABLED_DESC="Enable the optional hash based whitelist inline styles using a cryptographic hash for all styles using the Joomla API. Specifying hashes makes a modern browser ignore 'unsafe-inline' which should still be set for older browsers without hash support."
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES="Add Directive"
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_DIRECTIVE="Policy Directive"
 PLG_SYSTEM_HTTPHEADERS_CONTENTSECURITYPOLICY_VALUES_VALUE="Value"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_COOP="Cross-Origin-Opener-Policy"
+PLG_SYSTEM_HTTPHEADERS_COOP="Cross-Origin-Opener-Policy" ; Do not translate
 PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT="Client"
 PLG_SYSTEM_HTTPHEADERS_HEADER_CLIENT_BOTH="Both"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_HSTS="<a href='https://hstspreload.org' target='_blank' rel='noopener noreferrer'>HTTP Strict Transport Security (HSTS)</a>"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE="max-age"
-; Please do not translate 'max-age' in the following language string
-PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE_DESC="This option sets the time for 'max-age', it is specified in seconds. The default value is 31536000, which corresponds to one year"
-; Please do not translate the following language string
-PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="Preload"
+PLG_SYSTEM_HTTPHEADERS_HSTS="<a href='https://hstspreload.org' target='_blank' rel='noopener noreferrer'>HTTP Strict Transport Security (HSTS)</a>" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE="max-age" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_HSTS_MAXAGE_DESC="This option sets the time for 'max-age', it is specified in seconds. The default value is 31536000, which corresponds to one year" ; Please do not translate 'max-age'
+PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD="Preload" ; Do not translate
 PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_DESC="This option activates the opt-in for inclusion in so-called browser preload lists."
 PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE="Important"
-; Please do not translate 'max-age' in the following language string
-PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can no longer be called without HTTPS. Once added to the preload list, this is not easy to undo. Domains can be removed, but it takes months for users to make a change with a browser update.<br><strong>This option is very important to prevent 'man-in-the-middle attacks', so it should be activated in any case, but only if you are sure that HTTPS is supported for domain and all subdomains in the long run! The value for 'max-age' must be set to 63072000 (2 years) for recording.</strong>"
+PLG_SYSTEM_HTTPHEADERS_HSTS_PRELOAD_NOTE_DESC="HSTS means that your domain can no longer be called without HTTPS. Once added to the preload list, this is not easy to undo. Domains can be removed, but it takes months for users to make a change with a browser update.<br><strong>This option is very important to prevent 'man-in-the-middle attacks', so it should be activated in any case, but only if you are sure that HTTPS is supported for domain and all subdomains in the long run! The value for 'max-age' must be set to 63072000 (2 years) for recording.</strong>" ; Please do not translate 'max-age'
 PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS="Also for subdomains"
 PLG_SYSTEM_HTTPHEADERS_HSTS_SUBDOMAINS_DESC="HSTS should also be enabled <strong>for subdomains</strong> usually the subdomain 'www' is taken into account when creating the SSL certificate. If further subdomains are used, please note that they are also provided with a valid SSL certificate."
 PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_ACTION="Enable default security headers"
 PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_BODY="<p>Joomla! comes with a built-in set of tools that help you to handle http security headers. These headers help your browser for example to protect your website from <a href='https://en.wikipedia.org/wiki/Cross-site_scripting' target='_blank' rel='noopener noreferrer'>XSS</a> and <a href='https://en.wikipedia.org/wiki/Clickjacking' target='_blank' rel='noopener noreferrer'>Clickjacking</a> attacks.</p><p>You can find more details in the <a href='https://docs.joomla.org/Special:MyLanguage/J4.x:Http_Header_Management' target='_blank' rel='noopener noreferrer'>HTTP Header Management Tutorial in the Joomla! Documentation.</a></p>"
 PLG_SYSTEM_HTTPHEADERS_POSTINSTALL_INTRODUCTION_TITLE="HTTP Security Headers"
-; Please do not translate the following two language strings
-PLG_SYSTEM_HTTPHEADERS_REFERRERPOLICY="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy' target='_blank' rel='noopener noreferrer'>Referrer-Policy</a>"
-PLG_SYSTEM_HTTPHEADERS_XFRAMEOPTIONS="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options' target='_blank' rel='noopener noreferrer'>X-Frame-Options</a>"
-; Please do not translate 'HTTP Security Headers' in the following language string
-PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin helps you to set the HTTP Security Headers"
+PLG_SYSTEM_HTTPHEADERS_REFERRERPOLICY="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy' target='_blank' rel='noopener noreferrer'>Referrer-Policy</a>" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_XFRAMEOPTIONS="<a href='https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options' target='_blank' rel='noopener noreferrer'>X-Frame-Options</a>" ; Do not translate
+PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin helps you to set the HTTP Security Headers" ; Please do not translate 'HTTP Security Headers'
 
diff --git a/administrator/language/en-GB/plg_system_httpheaders.sys.ini b/administrator/language/en-GB/plg_system_httpheaders.sys.ini
index 67ab816418e3..bce0c3f2c3d2 100644
--- a/administrator/language/en-GB/plg_system_httpheaders.sys.ini
+++ b/administrator/language/en-GB/plg_system_httpheaders.sys.ini
@@ -3,6 +3,5 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-; Please do not translate the word 'HTTP Headers' in the following two language strings
-PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers"
-PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin can set some Security HTTP Headers"
+PLG_SYSTEM_HTTPHEADERS="System - HTTP Headers" ; Do not translate the word 'HTTP Headers'
+PLG_SYSTEM_HTTPHEADERS_XML_DESCRIPTION="This Plugin can set some Security HTTP Headers" ; Do not translate the word 'HTTP Headers'
diff --git a/administrator/language/en-GB/plg_system_skipto.ini b/administrator/language/en-GB/plg_system_skipto.ini
index a94b17f78cf5..a3270dc65a9a 100644
--- a/administrator/language/en-GB/plg_system_skipto.ini
+++ b/administrator/language/en-GB/plg_system_skipto.ini
@@ -4,12 +4,10 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_SYSTEM_SKIPTO="System - Skip-To Navigation"
-; do not translate $key
-PLG_SYSTEM_SKIPTO_ACCESS_KEY="Access key is $key"
+PLG_SYSTEM_SKIPTO_ACCESS_KEY="Access key is $key" ; do not translate $key
 PLG_SYSTEM_SKIPTO_HEADING="Page Outline"
 PLG_SYSTEM_SKIPTO_HEADING_LEVEL="Heading level"
-; next line begins with a space. $m is count, %n is total
-PLG_SYSTEM_SKIPTO_HEADING_MOFN=" ($m of $n)"
+PLG_SYSTEM_SKIPTO_HEADING_MOFN=" ($m of $n)" ; Begins with a space. $m is count, %n is total
 PLG_SYSTEM_SKIPTO_HEADING_NONE="No headings to skip to"
 PLG_SYSTEM_SKIPTO_LANDMARK_ASIDE="Aside"
 PLG_SYSTEM_SKIPTO_LANDMARK_FOOTER="Footer"
diff --git a/administrator/language/en-GB/plg_twofactorauth_totp.ini b/administrator/language/en-GB/plg_twofactorauth_totp.ini
index fb7e6dd590f5..cee182dd5a83 100644
--- a/administrator/language/en-GB/plg_twofactorauth_totp.ini
+++ b/administrator/language/en-GB/plg_twofactorauth_totp.ini
@@ -16,11 +16,9 @@ PLG_TWOFACTORAUTH_TOTP_SECTION_LABEL="Site Section"
 PLG_TWOFACTORAUTH_TOTP_SECTION_SITE="Site (Frontend)"
 PLG_TWOFACTORAUTH_TOTP_STEP1_HEAD="Step 1 - Get Google Authenticator"
 PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1="Official Google Authenticator app for Android, iOS and BlackBerry"
-; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw)
-PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447"
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" ; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw)
 PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2="Compatible clients for other devices and operating system (listed in Wikipedia)."
-; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish)
-PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation"
+PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation" ; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish)
 PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install <a href=\"https://en.wikipedia.org/wiki/Google_Authenticator\" target=\"_blank\" rel=\"noopener noreferrer\">Google Authenticator</a>, or a compatible application such as <a href=\"https://freeotp.github.io/\" target=\"_blank\">FreeOTP</a>, on your smartphone or desktop. Use one of the following:"
 PLG_TWOFACTORAUTH_TOTP_STEP1_WARN="Please remember to sync your device's clock with a time-server. Time drift in your device may cause an inability to log in to your site."
 PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT="Account"
diff --git a/administrator/language/en-GB/plg_user_profile.ini b/administrator/language/en-GB/plg_user_profile.ini
index 78be52f03efe..0b3e2ed7cb49 100644
--- a/administrator/language/en-GB/plg_user_profile.ini
+++ b/administrator/language/en-GB/plg_user_profile.ini
@@ -26,6 +26,5 @@ PLG_USER_PROFILE_FIELD_WEB_SITE_LABEL="Website"
 PLG_USER_PROFILE_FILL_FIELD_DESC_SITE="If required, please fill this field."
 PLG_USER_PROFILE_OPTION_AGREE="Agree"
 PLG_USER_PROFILE_SLIDER_LABEL="User Profile"
-; Adapt the following string to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
-PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27."
+PLG_USER_PROFILE_SPACER_DOB="The date of birth entered should use the format Year-Month-Day, eg 2019-01-27." ; Adapt to the format you entered in the 'DATE_FORMAT_CALENDAR_DATE'
 PLG_USER_PROFILE_XML_DESCRIPTION="User Profile Plugin"
diff --git a/api/language/en-GB/joomla.ini b/api/language/en-GB/joomla.ini
index 05ec071a1a8a..d2177a6c8fbd 100644
--- a/api/language/en-GB/joomla.ini
+++ b/api/language/en-GB/joomla.ini
@@ -255,10 +255,8 @@ JFIELD_MEDIA_LAZY_LABEL="Image will be lazyloaded"
 JFIELD_MEDIA_SUMMARY_LABEL="Additional Data"
 JFIELD_MEDIA_WIDTH_LABEL="Width"
 JFIELD_MEDIA_TITLE_LABEL="Title"
-; Do not translate the text between the {}
-JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file.</a>"
-; Do not translate the text between the {}
-JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters."
+JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file.</a>" ; Do not translate the text between the {}
+JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters." ; Do not translate the text between the {}
 JFIELD_META_DESCRIPTION_DESC="An optional paragraph to be used as the description of the page in the HTML output. This will generally display in the results of search engines."
 JFIELD_META_DESCRIPTION_LABEL="Meta Description"
 JFIELD_META_KEYWORDS_DESC="An optional comma-separated list of keywords and/or phrases to be used in the HTML output."
diff --git a/installation/language/en-GB/joomla.ini b/installation/language/en-GB/joomla.ini
index efdac64e9e51..9aaa683cff50 100644
--- a/installation/language/en-GB/joomla.ini
+++ b/installation/language/en-GB/joomla.ini
@@ -153,8 +153,7 @@ INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SI
 INSTL_DEFAULTLANGUAGE_SET_DEFAULT_LANGUAGE="Set default language"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla Administrator."
 
-; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (UK)"
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (UK)" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 
 ; Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned error message: %s"
diff --git a/language/en-GB/joomla.ini b/language/en-GB/joomla.ini
index 01ebe46c963b..905fb39fe761 100644
--- a/language/en-GB/joomla.ini
+++ b/language/en-GB/joomla.ini
@@ -200,10 +200,8 @@ JFIELD_MEDIA_LAZY_LABEL="Image will be lazyloaded"
 JFIELD_MEDIA_SUMMARY_LABEL="Additional Data"
 JFIELD_MEDIA_WIDTH_LABEL="Width"
 JFIELD_MEDIA_TITLE_LABEL="Title"
-; Do not translate the text between the {}
-JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file.</a>"
-; Do not translate the text between the {}
-JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters."
+JFIELD_MEDIA_UNSUPPORTED="You don't have a {extension} plugin, but you can {tag} download the {extension} file.</a>" ; Do not translate the text between the {}
+JFIELD_META_DESCRIPTION_COUNTER="{remaining} characters remaining of {maxlength} characters." ; Do not translate the text between the {}
 JFIELD_META_DESCRIPTION_DESC="Metadata description."
 JFIELD_META_DESCRIPTION_LABEL="Meta Description"
 JFIELD_META_KEYWORDS_DESC="Keywords describing the content."
diff --git a/language/en-GB/mod_footer.ini b/language/en-GB/mod_footer.ini
index cab45518988b..30f31f54fb46 100644
--- a/language/en-GB/mod_footer.ini
+++ b/language/en-GB/mod_footer.ini
@@ -2,9 +2,8 @@
 ; (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
-; Note : %date% will be auto replaced by current year !Don't translate
 
 MOD_FOOTER="Footer"
-MOD_FOOTER_LINE1="Copyright &#169; %date% %sitename%. All Rights Reserved."
+MOD_FOOTER_LINE1="Copyright &#169; %date% %sitename%. All Rights Reserved." ; Note : %date% will be auto replaced by current year !Don't translate
 MOD_FOOTER_LINE2="<a href=\"https://www.joomla.org\">Joomla!</a> is Free Software released under the <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\">GNU General Public License.</a>"
 MOD_FOOTER_XML_DESCRIPTION="This module shows the Joomla! copyright information."
diff --git a/language/en-GB/mod_footer.sys.ini b/language/en-GB/mod_footer.sys.ini
index 6d3f6e436577..9294b58e5b37 100644
--- a/language/en-GB/mod_footer.sys.ini
+++ b/language/en-GB/mod_footer.sys.ini
@@ -2,7 +2,6 @@
 ; (C) 2010 Open Source Matters, Inc. <https://www.joomla.org>
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
-; Note : %date% will be auto replaced by current year !Don't translate
 
 MOD_FOOTER="Footer"
 MOD_FOOTER_LAYOUT_DEFAULT="Default"
diff --git a/language/en-GB/mod_whosonline.ini b/language/en-GB/mod_whosonline.ini
index 33dcd5f072b4..0b074b760b0e 100644
--- a/language/en-GB/mod_whosonline.ini
+++ b/language/en-GB/mod_whosonline.ini
@@ -3,7 +3,6 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
-; frontend display
 MOD_WHOSONLINE="Who's Online"
 MOD_WHOSONLINE_FIELD_FILTER_GROUPS_DESC="Choose to filter by groups of the connected user"
 MOD_WHOSONLINE_FIELD_FILTER_GROUPS_LABEL="Filter Groups"
@@ -20,6 +19,4 @@ MOD_WHOSONLINE_NO_SESSION_METADATA="Unable to display online user data at this t
 MOD_WHOSONLINE_SAME_GROUP_MESSAGE="List of Users who belong to your user groups or your user groups' child groups"
 MOD_WHOSONLINE_SHOWMODE_LABEL="Display"
 MOD_WHOSONLINE_XML_DESCRIPTION="The Who's Online Module displays the number of Anonymous Users (eg Guests) and Registered Users (ones logged-in) that are currently accessing the website."
-; in the following string
-; %1$s is for guests and %2$s for members
-MOD_WHOSONLINE_WE_HAVE="We have %1$s and %2$s online"
+MOD_WHOSONLINE_WE_HAVE="We have %1$s and %2$s online" ; %1$s is for guests and %2$s for members