Merge branch '6.0-dev' into 6.0-dev/remove-bs-fw

Author: dgrammatiko

.github/workflows/typos.toml

@@ -28,7 +28,6 @@ crypted="crypted"           # Used in MD5Handler
 datas="datas"               # Used in showon.es6.js
 deactive="deactive"         # Used in searchtools.es6.js
 exept="exept"               # Used in El.php Greek language stemmer
-fof="fof"                   # To be fixed - outdated code comment in com_postinstall
 Formater="Formater"         # Used in AbstractDataCollector of debug plugin
 hel="hel"                   # Variable name in MenusHelper
 identicals="identicals"     # administrator\components\com_templates\tmpl\template\default.php
@@ -41,9 +40,3 @@ supercedes="supercedes"     # Valid spelling rejected https://github.com/crate-c
 ue="ue"                     # selector in queries
 vertexes="vertexes"         # Valid spelling waiting fix https://github.com/crate-ci/typos/issues/1150
 wheres="wheres"             # $wheres in modules\mod_related_items\src\Helper\RelatedItemsHelper.php
-
-# deprecated strings can be removed in 6.0
-configurated="configurated"
-discernable="discernable"
-hilight="hilight"
-mis="mis"

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -632,7 +632,7 @@ public function changeAutoUpdateRegistration(AutoupdateRegisterState $targetStat
             ($targetState === AutoupdateRegisterState::Subscribe)
                 ? AutoupdateRegisterState::Subscribed
                 : AutoupdateRegisterState::Unsubscribed,
-            ($targetState === AutoupdateRegisterState::Unsubscribed)
+            ($targetState === AutoupdateRegisterState::Subscribe)
         );
 
         return AutoupdateRegisterResultState::Success;

administrator/components/com_postinstall/src/Model/MessagesModel.php

@@ -508,8 +508,7 @@ public function getComponentOptions()
      * enabled             Must be 1 for this message to be enabled. If you omit it, it defaults to 1.
      *
      * condition_file      The RAD path to a PHP file containing a PHP function which determines whether this message should be shown to
-     *                     the user. @see FOFTemplateUtils::parsePath() for RAD path format. Joomla! will include this file before calling
-     *                     the condition_method.
+     *                     the user. Joomla! will include this file before calling the condition_method.
      *                     Example:   admin://components/com_foobar/helpers/postinstall.php
      *
      * condition_method    The name of a PHP function which will be used to determine whether to show this message to the user. This must be

administrator/language/en-GB/com_finder.ini

@@ -19,8 +19,6 @@ COM_FINDER_CONFIG_FILTER_NUMERICS_LABEL="Filter Numeric Terms"
 COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL="Gather Search Statistics"
 COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_DESC="For performance reasons, this will not highlight more than 10 different terms in the search results."
 COM_FINDER_CONFIG_HIGHLIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
-; deprecated will be removed in 6.0
-COM_FINDER_CONFIG_HILIGHT_CONTENT_SEARCH_TERMS_LABEL="Highlight Search Terms"
 COM_FINDER_CONFIG_IMAGE_CLASS_LABEL="Image Class"
 COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DEFAULT_LANGUAGE="Default Site Language"
 COM_FINDER_CONFIG_LANGUAGE_DEFAULT_DESC="Set the language to be used for non-multilingual sites or content marked as \"All\"."

administrator/language/en-GB/guidedtours.joomla_categories.ini

@@ -3,5 +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
 
-COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE="How to create categories?"
-COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION="This tour will show you how you can create a category."
+COM_GUIDEDTOURS_TOUR_CATEGORIES_TITLE="How to create article categories?"
+COM_GUIDEDTOURS_TOUR_CATEGORIES_DESCRIPTION="This tour will show you how you can create a category for articles."

administrator/language/en-GB/install.xml

@@ -3,7 +3,7 @@
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
 	<version>6.0.0</version>
-	<creationDate>2025-06</creationDate>
+	<creationDate>2025-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/langmetadata.xml

@@ -2,7 +2,7 @@
 <metafile client="administrator">
 	<name>English (en-GB)</name>
 	<version>6.0.0</version>
-	<creationDate>2025-06</creationDate>
+	<creationDate>2025-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>[email protected]</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>

administrator/language/en-GB/plg_editors_tinymce.ini

@@ -42,6 +42,11 @@ PLG_TINY_FIELD_EXTERNALPLUGINS_NAME_LABEL="Plugin Name"
 PLG_TINY_FIELD_EXTERNALPLUGINS_PATH_LABEL="Path"
 PLG_TINY_FIELD_HTMLHEIGHT_LABEL="HTML Height"
 PLG_TINY_FIELD_HTMLWIDTH_LABEL="HTML Width"
+PLG_TINY_FIELD_IMG_CLASS_LIST_LABEL="Class List"
+PLG_TINY_FIELD_IMG_CLASS_NAME_LABEL="Name"
+PLG_TINY_FIELD_IMG_CLASS_NO_CLASS="No Class Selected"
+PLG_TINY_FIELD_IMG_CLASSES_LIST_DESC="Add classes to the image class dropdown in the image dialog."
+PLG_TINY_FIELD_IMG_CLASSES_LIST_LABEL="Image Classes List"
 PLG_TINY_FIELD_LABEL_ADVANCEDPARAMS="Advanced"
 PLG_TINY_FIELD_LANGCODE_LABEL="Language Code"
 PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection"

administrator/language/en-GB/plg_system_schemaorg.ini

@@ -9,9 +9,6 @@ PLG_SYSTEM_SCHEMAORG_BASETYPE_LABEL="Base Type"
 PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_ORGANIZATION="Organization"
 PLG_SYSTEM_SCHEMAORG_BASETYPE_OPTION_PERSON="Person"
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION="Structured data is a standardised format for organising and representing information on the web. It provides a way to describe the content and meaning of data in a structured manner, making it easier for search engines and other applications to understand and process the information. <a href=\"https://schema.org\" target=\"_blank\" rel=\"noopener noreferrer\">More information on schema.org</a>."
-; The following two strings are deprecated and will be removed with 6.0
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
-PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURATED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED="To use the schema.org functionality, you have to configure the plugin first. Please contact an administrator of the page to get it configured."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_DESCRIPTION_NOT_CONFIGURED_ADMIN="To use the schema.org functionality, you have to configure the plugin first. Please select <a href=\"index.php?option=com_plugins&amp;task=plugin.edit&amp;extension_id=%s\" target=\"_blank\">this link to open the plugin</a>, configure and save."
 PLG_SYSTEM_SCHEMAORG_FIELD_SCHEMA_EXTEND_JED_DESC="<strong>Need more Schema types?</strong> Extend with <a href=\"https://extensions.joomla.org/category/core-enhancements/schema-plugins\" target=\"_blank\" rel=\"noopener noreferrer\">Schema Plugins from Joomla! Extension Directory</a>."

administrator/manifests/files/joomla.xml

@@ -6,8 +6,8 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>6.0.0-alpha3-dev</version>
-	<creationDate>2025-06</creationDate>
+	<version>6.0.0-alpha4-dev</version>
+	<creationDate>2025-07</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>