Merge branch '4.2-dev' into improveNoDownloadMessage

joomla · Oct 1, 2022 · 3119f00 · 3119f00
2 parents e868a68 + 5eed209
commit 3119f00
Show file tree

Hide file tree

Showing 49 changed files with 159 additions and 64 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.2.3-2022-09-07.sql b/administrator/components/com_admin/sql/updates/mysql/4.2.3-2022-09-07.sql
@@ -0,0 +1,2 @@
+-- Remove the record of any template overrides where the template has already been uninstalled
+DELETE FROM `#__template_overrides` WHERE `template` NOT IN (SELECT `name` FROM `#__extensions` WHERE `type`='template');
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.2.3-2022-09-07.sql b/administrator/components/com_admin/sql/updates/postgresql/4.2.3-2022-09-07.sql
@@ -0,0 +1,2 @@
+-- Remove the record of any template overrides where the template has already been uninstalled
+DELETE FROM "#__template_overrides" WHERE "template" NOT IN (SELECT "name" FROM "#__extensions" WHERE "type"='template');
diff --git a/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php b/administrator/components/com_cpanel/src/View/Cpanel/HtmlView.php
@@ -10,8 +10,8 @@
 
 namespace Joomla\Component\Cpanel\Administrator\View\Cpanel;
 
-use Joomla\CMS\Application\ApplicationHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Filter\OutputFilter;
 use Joomla\CMS\Helper\ModuleHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -61,7 +61,7 @@ public function display($tpl = null)
         $app = Factory::getApplication();
         $dashboard = $app->input->getCmd('dashboard', '');
 
-        $position = ApplicationHelper::stringURLSafe($dashboard);
+        $position = OutputFilter::stringURLSafe($dashboard);
 
         // Generate a title for the view cpanel
         if (!empty($dashboard)) {

diff --git a/administrator/components/com_languages/tmpl/overrides/default.php b/administrator/components/com_languages/tmpl/overrides/default.php
@@ -93,11 +93,11 @@
                                     <?php echo $language; ?>
                                 </td>
                                 <td class="d-none d-md-table-cell">
-                                    <?php echo $client; ?>
                                     <?php
-                                    if (isset($oppositeStrings[$key]) && ($oppositeStrings[$key] == $text)) {
+                                    echo $client;
+                                    if (isset($oppositeStrings[$key]) && $oppositeStrings[$key] === $text) :
                                         echo '/' . $oppositeClient;
-                                    }
+                                    endif;
                                     ?>
                                 </td>
                             </tr>

diff --git a/administrator/components/com_menus/tmpl/items/modal.php b/administrator/components/com_menus/tmpl/items/modal.php
@@ -158,7 +158,7 @@
                         <?php if ($multilang) : ?>
                             <td class="small d-none d-md-table-cell">
                                 <?php if ($item->language == '') : ?>
-                                    <?php echo Text::_('JDEFAULT'); ?>
+                                    <?php echo Text::_('COM_MENUS_HOME'); ?>
                                 <?php elseif ($item->language == '*') : ?>
                                     <?php echo Text::alt('JALL', 'language'); ?>
                                 <?php else : ?>

diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
@@ -720,18 +720,59 @@ public function batchUser($groupId, $userIds, $action)
 
         // Remove the users from the group if requested.
         if (isset($doDelete)) {
-            $query = $db->getQuery(true);
+            /*
+            * First we need to check that the user is part of more than one group
+            * otherwise we will end up with a user that is not part of any group
+            * unless we are moving the user to a new group.
+            */
+            if ($doDelete === 'group') {
+                $query = $db->getQuery(true);
+                $query->select($db->quoteName('user_id'))
+                    ->from($db->quoteName('#__user_usergroup_map'))
+                    ->whereIn($db->quoteName('user_id'), $userIds);
+
+                // Add the group by clause to remove users who are only in one group
+                $query->group($db->quoteName('user_id'))
+                    ->having('COUNT(user_id) > 1');
+                $db->setQuery($query);
+                $users = $db->loadColumn();
+
+                // If we have no users to process, throw an error to notify the user
+                if (empty($users)) {
+                    $this->setError(Text::_('COM_USERS_ERROR_ONLY_ONE_GROUP'));
+
+                    return false;
+                }
+
+                // Check to see if the users are in the group to be removed
+                $query->clear()
+                    ->select($db->quoteName('user_id'))
+                    ->from($db->quoteName('#__user_usergroup_map'))
+                    ->whereIn($db->quoteName('user_id'), $users)
+                    ->where($db->quoteName('group_id') . ' = :group_id')
+                    ->bind(':group_id', $groupId, ParameterType::INTEGER);
+                $db->setQuery($query);
+                $users = $db->loadColumn();
 
-            // Remove users from the group
-            $query->delete($db->quoteName('#__user_usergroup_map'))
-                ->whereIn($db->quoteName('user_id'), $userIds);
+                // If we have no users to process, throw an error to notify the user
+                if (empty($users)) {
+                    $this->setError(Text::_('COM_USERS_ERROR_NOT_IN_GROUP'));
 
-            // Only remove users from selected group
-            if ($doDelete == 'group') {
-                $query->where($db->quoteName('group_id') . ' = :group_id')
+                    return false;
+                }
+
+                // Finally remove the users from the group
+                $query->clear()
+                    ->delete($db->quoteName('#__user_usergroup_map'))
+                    ->whereIn($db->quoteName('user_id'), $users)
+                    ->where($db->quoteName('group_id') . '= :group_id')
                     ->bind(':group_id', $groupId, ParameterType::INTEGER);
+                $db->setQuery($query);
+            } elseif ($doDelete === 'all') {
+                $query = $db->getQuery(true);
+                $query->delete($db->quoteName('#__user_usergroup_map'))
+                    ->whereIn($db->quoteName('user_id'), $users);
             }
-
             $db->setQuery($query);
 
             try {
@@ -954,7 +995,7 @@ public function getTwofactorform($userId = null)
      * @return  array  Empty array
      *
      * @since   3.2
-     * @deprecated 4.2.0 Wil be removed in 5.0.
+     * @deprecated 4.2.0 Will be removed in 5.0.
      */
     public function generateOteps($userId, $count = 10)
     {

diff --git a/administrator/components/com_users/tmpl/debuguser/default.php b/administrator/components/com_users/tmpl/debuguser/default.php
@@ -56,7 +56,7 @@
                     $text   = '';
                 endif;
                 ?>
-            <div class=" d-inline p-2">
+            <div class="d-inline p-2">
                 <?php echo Text::_($action[1]); ?>
                 <span class="<?php echo $class; ?>" aria-hidden="true"></span>
                 <span class="visually-hidden"><?php echo Text::_($text); ?></span>

diff --git a/administrator/language/en-GB/com_mails.ini b/administrator/language/en-GB/com_mails.ini
@@ -16,7 +16,7 @@ COM_MAILS_FIELD_ATTACHMENTS_LABEL="Attachments"
 COM_MAILS_FIELD_BASIC_LABEL="Options"
 COM_MAILS_FIELD_BODY_LABEL="Body"
 COM_MAILS_FIELD_FILE_LABEL="File"
-COM_MAILS_FIELD_FILENAME_LABEL="Filename"
+COM_MAILS_FIELD_FILENAME_LABEL="File Name"
 COM_MAILS_FIELD_HTMLBODY_LABEL="HTML Body"
 COM_MAILS_FIELD_LANGUAGE_CODE_INVALID="Invalid Language Code"
 COM_MAILS_FIELD_MAIL_COPY_MAIL_LABEL="Send Copy To Email"

diff --git a/administrator/language/en-GB/com_media.ini b/administrator/language/en-GB/com_media.ini
@@ -9,7 +9,7 @@ COM_MEDIA_ACTION_DOWNLOAD="Download item"
 COM_MEDIA_ACTION_EDIT="Edit item"
 COM_MEDIA_ACTION_PREVIEW="Preview item"
 COM_MEDIA_ACTION_RENAME="Rename item"
-COM_MEDIA_ACTION_SHARE="Get a sharable link"
+COM_MEDIA_ACTION_SHARE="Get a shareable link"
 COM_MEDIA_BREADCRUMB_LABEL="Breadcrumb"
 COM_MEDIA_BROWSER_TABLE_CAPTION="Contents of Directory %s"
 COM_MEDIA_CONFIGURATION="Media: Options"

diff --git a/administrator/language/en-GB/com_menus.ini b/administrator/language/en-GB/com_menus.ini
@@ -64,6 +64,7 @@ COM_MENUS_HEADING_POSITION="Position"
 COM_MENUS_HEADING_PUBLISHED_ITEMS="Published"
 COM_MENUS_HEADING_TRASHED_ITEMS="Trashed"
 COM_MENUS_HEADING_UNPUBLISHED_ITEMS="Unpublished"
+COM_MENUS_HOME="Home"
 COM_MENUS_INTEGRATION_FIELDSET_LABEL="Integration"
 COM_MENUS_ITEM_DETAILS="Details"
 COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL="Menu Item"
@@ -205,6 +206,5 @@ COM_MENUS_XML_DESCRIPTION="Component for creating menus."
 
 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
 
-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_scheduler.ini b/administrator/language/en-GB/com_scheduler.ini
@@ -51,7 +51,7 @@ COM_SCHEDULER_FIELD_LABEL_INTERVAL_DAYS="Interval in Days"
 COM_SCHEDULER_FIELD_LABEL_INTERVAL_HOURS="Interval in Hours"
 COM_SCHEDULER_FIELD_LABEL_INTERVAL_MINUTES="Interval in Minutes"
 COM_SCHEDULER_FIELD_LABEL_INTERVAL_MONTHS="Interval in Months"
-COM_SCHEDULER_FIELD_LABEL_LOG_FILE="Log Filename"
+COM_SCHEDULER_FIELD_LABEL_LOG_FILE="Log File Name"
 COM_SCHEDULER_FIELD_LABEL_SHOW_ORPHANED="Show Orphaned"
 COM_SCHEDULER_FIELD_OPTION_INTERVAL_MATCH_DAYS_M="Days of Month"
 COM_SCHEDULER_FIELD_OPTION_INTERVAL_MATCH_DAYS_W="Days of Week"

diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
@@ -100,6 +100,8 @@ COM_USERS_ERROR_CANNOT_BATCH_SUPERUSER="A non-Super User can't perform batch ope
 COM_USERS_ERROR_INVALID_GROUP="Invalid Group"
 COM_USERS_ERROR_LEVELS_NOLEVELS_SELECTED="No View Permission Level(s) selected."
 COM_USERS_ERROR_NO_ADDITIONS="The selected user(s) are already assigned to the selected group."
+COM_USERS_ERROR_NOT_IN_GROUP="The selected user(s) are not in the selected group."
+COM_USERS_ERROR_ONLY_ONE_GROUP="A user must belong to at least one group."
 COM_USERS_ERROR_VIEW_LEVEL_IN_USE="You can't delete the view access level '%d:%s' because it is being used by content."
 COM_USERS_FIELDS_USER_FIELDS_TITLE="Users: Fields"
 COM_USERS_FIELDS_USER_FIELD_ADD_TITLE="Users: New Field"

diff --git a/administrator/language/en-GB/install.xml b/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.2.3</version>
+	<version>4.2.4</version>
 	<creationDate>2022-09</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/language/en-GB/langmetadata.xml b/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.2.3</version>
+	<version>4.2.4</version>
 	<creationDate>2022-09</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<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>4.2.3-dev</version>
+	<version>4.2.4-dev</version>
 	<creationDate>2022-09</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>English (en-GB) Language Pack</name>
 	<packagename>en-GB</packagename>
-	<version>4.2.3.1</version>
+	<version>4.2.4.1</version>
 	<creationDate>2022-09</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php
@@ -14,6 +14,8 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+$user = \Joomla\CMS\Factory::getApplication()->getIdentity();
+
 /** @var  \Joomla\CMS\Menu\MenuItem  $root */
 ?>
 <?php foreach ($root->getChildren() as $child) : ?>

diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
@@ -45,10 +45,10 @@
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 
     // Get the hue value
     preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);

diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
@@ -46,13 +46,13 @@
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $loginLogoAlt = empty($this->params->get('loginLogoAlt')) && empty($this->params->get('emptyLoginLogoAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 
     // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -53,10 +53,10 @@
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);

diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
@@ -46,13 +46,13 @@
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandLargeAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $logoBrandSmallAlt = empty($this->params->get('logoBrandSmallAlt')) && empty($this->params->get('emptyLogoBrandSmallAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('logoBrandSmallAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 $loginLogoAlt = empty($this->params->get('loginLogoAlt')) && empty($this->params->get('emptyLoginLogoAlt'))
     ? 'alt=""'
-    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt'), ENT_COMPAT, 'UTF-8') . '"';
+    : 'alt="' . htmlspecialchars($this->params->get('loginLogoAlt', ''), ENT_COMPAT, 'UTF-8') . '"';
 
 // Get the hue value
 preg_match('#^hsla?\(([0-9]+)[\D]+([0-9]+)[\D]+([0-9]+)[\D]+([0-9](?:.\d+)?)?\)$#i', $this->params->get('hue', 'hsl(214, 63%, 20%)'), $matches);

diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml
@@ -2,7 +2,7 @@
 <extension client="api" type="language" method="upgrade">
 	<name>English (en-GB)</name>
 	<tag>en-GB</tag>
-	<version>4.2.3</version>
+	<version>4.2.4</version>
 	<creationDate>2022-09</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile client="api">
 	<name>English (en-GB)</name>
-	<version>4.2.3</version>
+	<version>4.2.4</version>
 	<creationDate>2022-09</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>

diff --git a/build/github_rebase.php b/build/github_rebase.php
@@ -32,7 +32,7 @@
             Rebase all open pull requests on github to the target branch.
 
             --base:
-              The base branch of the pull request. Multiple branches can be seperated by comma.
+              The base branch of the pull request. Multiple branches can be separated by comma.
 
             --target:
               The target branch the pull request gets rebased to.

diff --git a/build/media_source/system/js/table-columns.es6.js b/build/media_source/system/js/table-columns.es6.js
@@ -111,11 +111,11 @@ class TableColumns {
 
     // Remove "media query" classes, which may prevent toggling from working.
     this.$headers.forEach(($el) => {
-      $el.classList.remove('d-none', 'd-md-table-cell', 'd-lg-table-cell', 'd-xl-table-cell');
+      $el.classList.remove('d-none', 'd-xs-table-cell', 'd-sm-table-cell', 'd-md-table-cell', 'd-lg-table-cell', 'd-xl-table-cell', 'd-xxl-table-cell');
     });
     this.$rows.forEach(($row) => {
       [].slice.call($row.children).forEach(($el) => {
-        $el.classList.remove('d-none', 'd-md-table-cell', 'd-lg-table-cell', 'd-xl-table-cell');
+        $el.classList.remove('d-none', 'd-xs-table-cell', 'd-sm-table-cell', 'd-md-table-cell', 'd-lg-table-cell', 'd-xl-table-cell', 'd-xxl-table-cell');
       });
     });
 

diff --git a/build/psr12/psr12_converter.php b/build/psr12/psr12_converter.php
@@ -32,7 +32,7 @@
 
         Description:
             The converter has several tasks which can be run separately.
-            You can combine them seperated by a comma (,).
+            You can combine them separated by a comma (,).
 
             --tasks:
               * CBF
@@ -65,7 +65,7 @@
             Path:
               Providing a path will only check the directories or files
               specified. It's possible to add multiple files and folder
-              seperated by a comma (,).
+              separated by a comma (,).
 
 
         TEXT;

diff --git a/installation/language/af-ZA/joomla.ini b/installation/language/af-ZA/joomla.ini
@@ -117,6 +117,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Taal"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_SELECT="Kies Taal"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Taal Etiket"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Weergawe"
+INSTL_LANGUAGES_DESC="Die Joomla-koppelvlak is in verskillende tale beskikbaar. Kies die taal wat jy verkies, deur die keuseblokkies te kies en installeer dit dan deur die \"Installeer geselekteerde tale\"-knoppie te kies.<br>Nota: dit neem ongeveer 10 sekondes voordat elke taal afgelaai en geïnstalleer word. Om tydsopskortings te voorkom moenie meer as 3 tale kies om te installeer nie."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Dit sal tot tien sekondes per taal neem om hierdie werking te voltooi<br>Wag asseblief terwyl ons die tale aflaai en installeer &hellip;"
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Geen tale is geselekteer om geïnstalleer te word nie."
 INSTL_LANGUAGES_SELECTED="Installeer Geselekteerde Tale"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla kon nie verbinding maak met die tale-bediener nie. Voltooi asseblief die installasieproses."

diff --git a/installation/language/af-ZA/langmetadata.xml b/installation/language/af-ZA/langmetadata.xml
@@ -3,7 +3,7 @@
 	<name>Afrikaans (Suid-Afrika)</name>
 	<version>4.2.3</version>
 	<creationDate>2022-09</creationDate>
-	<author>Joomla! Projek</author>
+	<author>Afrikaans Translation Team</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<files>

diff --git a/installation/language/bg-BG/joomla.ini b/installation/language/bg-BG/joomla.ini
@@ -88,7 +88,7 @@ INSTL_DATABASE_USER_DESC="Потребителско име, което сте
 INSTL_DATABASE_VALIDATION_ERROR="Проверете идентификационните данни на базата данни, типа на базата данни, името на базата данни или името на хоста. Ако имате инсталиран MySQL 8, моля, прочетете това <a href=\"https://docs.joomla.org/Special:MyLanguage/Joomla_and_MySQL_8#Workaround_to_get_Joomla_working_with_MySQL_8\" target=\"_blank\" rel=\"noopener noreferrer\">wiki</a> за повече информация."
 
 INSTL_CONNECT_DB="Настройка на връзка с база данни"
-INSTL_INSTALL_JOOMLA="Инсталирай Joomla"
+INSTL_INSTALL_JOOMLA="Инсталиране на Joomla"
 ; Site View
 INSTL_ADMIN_EMAIL_DESC="Въведете имейл адреса на супер потребителя \"Super User\" на сайта."
 INSTL_ADMIN_PASSWORD_DESC="Задайте паролата за вашия акаунт на супер потребител."