Merge branch '4.0-dev' of github.com:joomla/joomla-cms into 4.1-dev

Author: bembelimen

administrator/components/com_actionlogs/config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config addfieldprefix="Joomla\Component\Actionlogs\Administrator\Field">
+	<help key="User_Actions_Log:_Options"/>
 	<fieldset name="actionlogs" label="COM_ACTIONLOGS_OPTIONS">
 		<field
 			name="ip_logging"

administrator/components/com_actionlogs/src/View/Actionlogs/HtmlView.php

@@ -140,6 +140,6 @@ protected function addToolbar()
 		$bar = Toolbar::getInstance('toolbar');
 		$bar->appendButton('Confirm', 'COM_ACTIONLOGS_PURGE_CONFIRM', 'delete', 'COM_ACTIONLOGS_TOOLBAR_PURGE', 'actionlogs.purge', false);
 		ToolbarHelper::preferences('com_actionlogs');
-		ToolbarHelper::help('JHELP_COMPONENTS_ACTIONLOGS');
+		ToolbarHelper::help('User_Actions_Log');
 	}
 }

administrator/components/com_admin/script.php

@@ -6098,6 +6098,14 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
 			'/templates/cassiopeia/css/global/fonts-web_roboto+noto-sans.min.css.gz',
 			'/templates/cassiopeia/scss/global/fonts-web_fira-sans.scss',
 			'/templates/cassiopeia/scss/global/fonts-web_roboto+noto-sans.scss',
+			// From 4.0.3 to 4.0.4
+			'/administrator/components/com_joomlaupdate/restore.php',
+			'/media/com_joomlaupdate/js/encryption.js',
+			'/media/com_joomlaupdate/js/encryption.min.js',
+			'/media/com_joomlaupdate/js/encryption.min.js.gz',
+			'/media/com_joomlaupdate/js/update.js',
+			'/media/com_joomlaupdate/js/update.min.js',
+			'/media/com_joomlaupdate/js/update.min.js.gz',
 		);
 
 		$folders = array(

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

@@ -93,7 +93,7 @@ public function &getPage()
 	{
 		if (is_null($this->page))
 		{
-			$this->page = Help::createUrl(Factory::getApplication()->input->get('page', 'JHELP_START_HERE'));
+			$this->page = Help::createUrl(Factory::getApplication()->input->get('page', 'Start_Here'));
 		}
 
 		return $this->page;

administrator/components/com_admin/src/View/Sysinfo/HtmlView.php

@@ -120,6 +120,6 @@ protected function addToolbar(): void
 			'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON',
 			'download'
 		);
-		ToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION');
+		ToolbarHelper::help('Site_System_Information');
 	}
 }

administrator/components/com_admin/tmpl/help/default.php

@@ -30,14 +30,14 @@
 			</button>
 			<div class="sidebar-nav" id="help-index">
 				<ul class="nav flex-column">
-					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_START_HERE'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Start_Here'), Text::_('COM_ADMIN_START_HERE'), ['target' => 'helpFrame']); ?></li>
 					<li class="item"><?php echo HTMLHelper::_('link', 'https://www.gnu.org/licenses/gpl-2.0.html', Text::_('COM_ADMIN_LICENSE'), ['target' => 'helpFrame']); ?></li>
-					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('JHELP_GLOSSARY'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
+					<li class="item"><?php echo HTMLHelper::_('link', Help::createUrl('Glossary'), Text::_('COM_ADMIN_GLOSSARY'), ['target' => 'helpFrame']); ?></li>
 					<li class="divider"></li>
 					<li class="nav-header"><?php echo Text::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
 					<?php foreach ($this->toc as $k => $v) : ?>
 						<li class="item">
-							<?php $url = Help::createUrl('JHELP_' . strtoupper($k)); ?>
+							<?php $url = Help::createUrl($k); ?>
 							<?php echo HTMLHelper::_('link', $url, $v, ['target' => 'helpFrame']); ?>
 						</li>
 					<?php endforeach; ?>

administrator/components/com_associations/config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Multilingual_Associations:_Options"/>
 	<fieldset
 		name="permissions"
 		label="JCONFIG_PERMISSIONS_LABEL"

administrator/components/com_associations/src/View/Association/HtmlView.php

@@ -386,6 +386,6 @@ protected function addToolbar(): void
 		}
 
 		ToolbarHelper::cancel('association.cancel', 'JTOOLBAR_CLOSE');
-		ToolbarHelper::help('JHELP_COMPONENTS_ASSOCIATIONS_EDIT');
+		ToolbarHelper::help('Multilingual_Associations:_Edit');
 	}
 }

administrator/components/com_associations/src/View/Associations/HtmlView.php

@@ -244,6 +244,6 @@ protected function addToolbar()
 			ToolbarHelper::preferences('com_associations');
 		}
 
-		ToolbarHelper::help('JHELP_COMPONENTS_ASSOCIATIONS');
+		ToolbarHelper::help('Multilingual_Associations');
 	}
 }

administrator/components/com_banners/config.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
+	<help key="Banners:_Options"/>
 	<fieldset
 		name="component"
 		label="COM_BANNERS_FIELDSET_CONFIG_CLIENT_OPTIONS_LABEL"