[6.0] Upmerges - 2025-05-25

Merge pull request joomla#45526 from Bodge-IT/upmerges/2025-05-25
Pre -alpha prep.

Author: Bodge-IT

administrator/components/com_joomlaupdate/config.xml

@@ -75,7 +75,8 @@
 	<fieldset
 		name="automated-updates"
 		label="COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_LABEL"
-	>
+		description="COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DESC"
+		>
 		<field
 			name="autoupdate"
 			type="radio"

administrator/language/en-GB/com_joomlaupdate.ini

@@ -10,6 +10,7 @@ COM_JOOMLAUPDATE_AUTOUPDATE_UNREGISTER_SUCCESS="Unregistered from automated upda
 COM_JOOMLAUPDATE_CAPTIVE_HEADLINE="Confirm your credentials"
 COM_JOOMLAUPDATE_CHECKED_UPDATES="Checked for updates."
 COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DISABLED_LABEL="<span class=\"fa-fw me-2 fa fa-info-circle\"></span>Automated updates are only supported for the \"default\" channel and \"Minimum Stability\" \"Stable\"."
+COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_DESC="Automated updates are only available for sites that are publicly accessible on the internet. If your site is behind a firewall or not publicly accessible, such as a local test environment, you will need to update manually."
 COM_JOOMLAUPDATE_CONFIG_AUTOMATED_UPDATES_LABEL="Automated Updates"
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_DESC="Automatically update Joomla to the latest version when it is available."
 COM_JOOMLAUPDATE_CONFIG_AUTOUPDATE_LABEL="Automated Update"