Merge branch '4.3-dev' into 4.4-dev

Author: laoneo

administrator/components/com_joomlaupdate/tmpl/update/default.php

@@ -11,7 +11,6 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Factory;
-use Joomla\CMS\Help\Help;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
@@ -55,7 +54,7 @@
     ]
 );
 
-$helpUrl = Help::createUrl('JHELP_COMPONENTS_JOOMLA_UPDATE', false);
+$helpUrl = 'https://docs.joomla.org/Special:MyLanguage/J4.x:Joomla_Update_Problems';
 ?>
 
 <div class="px-4 py-5 my-5 text-center" id="joomlaupdate-progress">

administrator/language/en-GB/com_content.ini

@@ -28,7 +28,7 @@ COM_CONTENT_CREATE_ARTICLE_CANCEL_REDIRECT_MENU_LABEL="Cancel Redirect"
 COM_CONTENT_CREATE_ARTICLE_CATEGORY_LABEL="Specific Category"
 COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_DESC="If set to 'Yes', you can set a redirection page, distinct from above 'Submission/Cancel Redirect', to redirect to when user Cancels article submission.<br>If set to 'No', when user Cancels article submission, the user is redirected to the above 'Submission/Cancel Redirect' page."
 COM_CONTENT_CREATE_ARTICLE_CUSTOM_CANCEL_REDIRECT_LABEL="Custom Redirect on Cancel"
-COM_CONTENT_CREATE_ARTICLE_ERROR="When default category is enabled, a category should be selected."
+COM_CONTENT_CREATE_ARTICLE_ERROR="When specific category is enabled, a category should be selected."
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_DESC="Select the page the user will be redirected to after a successful article submission and after cancel (if not set differently below). The default is to redirect to the home page."
 COM_CONTENT_CREATE_ARTICLE_REDIRECTMENU_LABEL="Submission/Cancel Redirect"
 COM_CONTENT_DASHBOARD_TITLE="Content Dashboard"

administrator/language/en-GB/com_users.ini

@@ -73,7 +73,7 @@ COM_USERS_CONFIG_MULTIFACTORAUTH_SETTINGS_LABEL="Multi-factor Authentication"
 COM_USERS_CONFIG_NEVERMFAUSERGROUPS_DESC="Any user who belongs in <em>any</em> of the selected user groups will be exempt from Multi-factor Authentication. Even if they have set up Multi-factor Authentication methods they will not be asked to use them when they are logging in, nor will they be able to view them, remove them, or change their configuration."
 COM_USERS_CONFIG_NEVERMFAUSERGROUPS_LABEL="Disable Multi-factor Authentication"
 COM_USERS_CONFIG_PASSWORD_OPTIONS="Password Options"
-COM_USERS_CONFIG_REDIRECTONLOGIN_DESC="If the user has not yet set up Multi-factor Authentication and this option is enabled they will be redirected to the Multi-factor Authentication setup page or the custom URL you set up below. This is meant to be a simple way to to let your users know that Multi-factor Authentication is an option on your site."
+COM_USERS_CONFIG_REDIRECTONLOGIN_DESC="If the user has not yet set up Multi-factor Authentication and this option is enabled they will be redirected to the Multi-factor Authentication setup page or the custom URL you set up below. This is meant to be a simple way to let your users know that Multi-factor Authentication is an option on your site."
 COM_USERS_CONFIG_REDIRECTONLOGIN_LABEL="Onboard new users"
 COM_USERS_CONFIG_REDIRECTURL_DESC="If it's not empty redirects to this URL instead of the Multi-factor Authentication setup page when the option above is enabled. WARNING: This must be a URL inside your site. You cannot log in to an external link or to a different subdomain."
 COM_USERS_CONFIG_REDIRECTURL_LABEL="Custom redirection URL"
@@ -178,7 +178,7 @@ COM_USERS_HEADING_LEVEL_NAME_DESC="Level Name descending"
 COM_USERS_HEADING_LFT="LFT"
 COM_USERS_HEADING_LFT_ASC="LFT ascending"
 COM_USERS_HEADING_LFT_DESC="LFT descending"
-COM_USERS_HEADING_MFA="Multi-factor Authentication"
+COM_USERS_HEADING_MFA="MFA"
 COM_USERS_HEADING_NAME="Name"
 COM_USERS_HEADING_REGISTRATION_DATE="Registered"
 COM_USERS_HEADING_REGISTRATION_DATE_ASC="Registration date ascending"

administrator/modules/mod_quickicon/src/Helper/QuickIconHelper.php

@@ -366,7 +366,7 @@ public function getButtons(Registry $params, CMSApplication $application = null)
             if ($params->get('show_languages')) {
                 $tmp = [
                     'image'   => 'icon-comments langmanager',
-                    'link'    => Route::_('index.php?option=com_languages&view=installed'),
+                    'link'    => Route::_('index.php?option=com_languages&view=languages'),
                     'linkadd' => Route::_('index.php?option=com_installer&view=languages'),
                     'name'    => 'MOD_QUICKICON_LANGUAGES_MANAGER',
                     'access'  => ['core.manage', 'com_languages'],

build/media_source/templates/administrator/atum/scss/blocks/_quickicons.scss

@@ -5,7 +5,7 @@
 
   .nav {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+    grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
     grid-gap: 1rem;
   }
 

installation/configuration.php-dist

@@ -58,7 +58,7 @@ class JConfig
 	public $helpurl = 'https://help.joomla.org/proxy?keyref=Help{major}{minor}:{keyref}&lang={langcode}';
 	public $tmp_path = '/tmp';                // This path needs to be writable by Joomla!
 	public $log_path = '/administrator/logs'; // This path needs to be writable by Joomla!
-	public $live_site = '';                   // Optional, full URL to Joomla install.
+	public $live_site = '';                   // Optional, full URL to Joomla install eg https://www.example.com
 	public $force_ssl = 0;                    // Force areas of the site to be SSL ONLY.  0 = None, 1 = Administrator, 2 = Both Site and Administrator
 
 	/* Locale Settings */

installation/language/af-ZA/joomla.ini

@@ -81,6 +81,7 @@ INSTL_DATABASE_NAME_MSG_POSTGRES="Die databasisnaam is ongeldig. Dit moet begin
 INSTL_DATABASE_NO_SCHEMA="Geen databasisskema bestaan ​​vir hierdie tipe databasis nie."
 INSTL_DATABASE_PASSWORD_DESC="Óf 'n wagwoord wat jy geskep het, óf 'n wagwoord wat jou gasheer verskaf."
 INSTL_DATABASE_PREFIX_DESC="Voer 'n tabelvoorvoegsel in of gebruik die lukraak gegenereerde een."
+INSTL_DATABASE_PREFIX_DUPLICATE_DESC="As jy 'n bestaande databasis met tabelle met dieselfde voorvoegsel gebruik, sal Joomla daardie bestaande tabelle hernoem deur die voorvoegsel \"bak_\" by te voeg."
 INSTL_DATABASE_PREFIX_MSG="Die tabelvoorvoegsel moet met 'n letter begin, optioneel gevolg deur alfanumeriese karakters en 'n onderstreep karakter"
 INSTL_DATABASE_RESPONSE_ERROR="Die installasieproses het misluk."
 INSTL_DATABASE_TYPE_DESC="Kies die tipe databasis."

installation/language/af-ZA/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Afrikaans (Suid-Afrika)</name>
-	<version>4.3.0</version>
-	<creationDate>2023-04</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-05</creationDate>
 	<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>

installation/language/ar-AA/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Arabic (اللغة العربية)</name>
-	<version>4.3.0</version>
-	<creationDate>2023-04</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-05</creationDate>
 	<author>Dr. Ashraf Damra</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>

installation/language/bg-BG/langmetadata.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <metafile client="installation">
 	<name>Bulgarian (bg-BG)</name>
-	<version>4.3.0</version>
-	<creationDate>2023-04</creationDate>
+	<version>4.3.3</version>
+	<creationDate>2023-05</creationDate>
 	<author>Joomla! Bulgaria</author>
 	<copyright>(C) 2005 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>