Merge branch '4.1-dev' into Bootstrap_collapse_for_child_sub-categories

README.md

@@ -1,4 +1,4 @@
-Joomla! CMS™ 
+Joomla! CMS™
 ====================
 
 Build Status
@@ -39,7 +39,7 @@ You will need:
 **Steps to setup the local environment:**
 - Clone the repository:
 ```bash
-git clone git@github.com:joomla/joomla-cms.git
+git clone https://github.com/joomla/joomla-cms.git
 ```
 - Go to the joomla-cms folder:
 ```bash

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

@@ -261,6 +261,7 @@ public function &getPhpSettings(): array
 			'zlib'                => \extension_loaded('zlib'),
 			'zip'                 => \function_exists('zip_open') && \function_exists('zip_read'),
 			'mbstring'            => \extension_loaded('mbstring'),
+			'fileinfo'            => \extension_loaded('fileinfo'),
 			'gd'                  => \extension_loaded('gd'),
 			'iconv'               => \function_exists('iconv'),
 			'intl'                => \function_exists('transliterator_transliterate'),

administrator/components/com_admin/tmpl/sysinfo/default_phpsettings.php

@@ -143,6 +143,14 @@
 					<?php echo HTMLHelper::_('phpsetting.string', $this->phpSettings['disable_functions']); ?>
 				</td>
 			</tr>
+			<tr>
+				<th scope="row">
+					<?php echo Text::sprintf('COM_ADMIN_EXTENSION_AVAILABLE', 'Fileinfo'); ?>
+				</th>
+				<td>
+					<?php echo HTMLHelper::_('phpsetting.set', $this->phpSettings['fileinfo']); ?>
+				</td>
+			</tr>
 			<tr>
 				<th scope="row">
 					<?php echo Text::_('COM_ADMIN_MBSTRING_ENABLED'); ?>

administrator/components/com_fields/forms/field.xml

@@ -253,6 +253,7 @@
 					name="render_class"
 					type="textarea"
 					label="COM_FIELDS_FIELD_RENDER_CLASS_LABEL"
+					description="COM_FIELDS_FIELD_RENDER_CLASS_DESC"
 					validate="CssIdentifier"
 				/>
 

administrator/components/com_languages/src/Service/HTML/Languages.php

@@ -55,7 +55,6 @@ public function id($rowNum, $language)
 			. ' name="cid"'
 			. ' value="' . htmlspecialchars($language, ENT_COMPAT, 'UTF-8') . '"'
 			. ' onclick="Joomla.isChecked(this.checked);"'
-			. ' title="' . ($rowNum + 1) . '"'
 			. '>';
 	}
 

administrator/components/com_menus/src/View/Items/HtmlView.php

@@ -365,7 +365,7 @@ protected function addToolbar()
 
 			if (Factory::getUser()->authorise('core.admin') && !$protected)
 			{
-				$childBar->checkin('articles.checkin')->listCheck(true);
+				$childBar->checkin('items.checkin')->listCheck(true);
 			}
 
 			if ($canDo->get('core.edit.state') && $this->state->get('filter.published') != -2)

administrator/components/com_scheduler/src/View/Select/HtmlView.php

@@ -14,7 +14,6 @@
 
 use Joomla\CMS\Application\AdministratorApplication;
 use Joomla\CMS\Factory;
-use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\MVC\View\GenericDataException;
 use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
@@ -118,8 +117,6 @@ public function display($tpl = null): void
 	 */
 	protected function addToolbar(): void
 	{
-		$canDo = ContentHelper::getActions('com_scheduler');
-
 		/*
 		* Get the global Toolbar instance
 		* @todo : Replace usage with ToolbarFactoryInterface. but how?
@@ -135,14 +132,5 @@ protected function addToolbar(): void
 			->buttonClass('btn btn-danger')
 			->icon('icon-times')
 			->text(Text::_('JCANCEL'));
-
-		// Add preferences button if user has privileges
-		if ($canDo->get('core.admin') || $canDo->get('core.options'))
-		{
-			$toolbar->preferences('com_scheduler');
-		}
-
-		// Add help button
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
 	}
 }

administrator/components/com_scheduler/src/View/Task/HtmlView.php

@@ -145,6 +145,6 @@ protected function addToolbar(): void
 		// @todo | ? : Do we need save2new, save2copy?
 
 		$toolbar->cancel('task.cancel', $isNew ? 'JTOOLBAR_CANCEL' : 'JTOOLBAR_CLOSE');
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
+		$toolbar->help('Scheduled_Tasks:_Edit');
 	}
 }

administrator/components/com_scheduler/src/View/Tasks/HtmlView.php

@@ -190,6 +190,6 @@ protected function addToolbar(): void
 			$toolbar->preferences('com_scheduler');
 		}
 
-		$toolbar->help('JHELP_COMPONENTS_SCHEDULED_TASKS_MANAGER');
+		$toolbar->help('Scheduled_Tasks');
 	}
 }

administrator/language/en-GB/com_admin.ini

@@ -95,6 +95,8 @@ COM_ADMIN_HELP_PRIVATE_MESSAGES:_WRITE="Private Messages: Write"
 COM_ADMIN_HELP_PRIVATE_MESSAGES="Private Messages: Inbox"
 COM_ADMIN_HELP_REDIRECTS:_LINKS="Redirect: Links"
 COM_ADMIN_HELP_REDIRECTS:_NEW_OR_EDIT="Redirect: Links - New/Edit"
+COM_ADMIN_HELP_SCHEDULED_TASKS="Scheduled Tasks"
+COM_ADMIN_HELP_SCHEDULED_TASKS:_EDIT="Scheduled Tasks: New/Edit"
 COM_ADMIN_HELP_SITE_GLOBAL_CONFIGURATION="Global Configuration"
 COM_ADMIN_HELP_SITE_SYSTEM_INFORMATION="System Information"
 COM_ADMIN_HELP_SMART_SEARCH:_CONTENT_MAPS="Smart Search: Content Maps"

administrator/language/en-GB/com_config.ini

@@ -72,7 +72,7 @@ COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL="Debug System"
 COM_CONFIG_FIELD_DEBUG_VALUE="Value"
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC="Set the Access Level which will be assigned by default to newly created items."
 COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL="Default Access Level"
-COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
+COM_CONFIG_FIELD_DEFAULT_CAPTCHA_DESC="Joomla and third party extensions can use a <a href=\"https://en.wikipedia.org/wiki/CAPTCHA\" target=\"_blank\" rel=\"noopener noreferrer\">CAPTCHA</a> to prevent abuse (spam) on public forms. Each extension can choose to use a different CAPTCHA, if more than one are available. If no selection is made this will be used by default. You can enable additional CAPTCHA methods in System, Manage, Plugins."
 COM_CONFIG_FIELD_DEFAULT_CAPTCHA_LABEL="Default Captcha"
 COM_CONFIG_FIELD_DEFAULT_EDITOR_DESC="This editor will be used for editing content and other rich text areas in third party extensions unless a user has chosen a different one in their user profile . This will also be the only editor available and used for users who are not already logged in (the Guest user group)."
 COM_CONFIG_FIELD_DEFAULT_EDITOR_LABEL="Default Editor"
@@ -155,7 +155,7 @@ COM_CONFIG_FIELD_REDIS_HOST_LABEL="Redis Server Host/Sock"
 COM_CONFIG_FIELD_REDIS_PERSISTENT_LABEL="Persistent Redis"
 COM_CONFIG_FIELD_REDIS_PORT_DESC="Port discarded if connecting to Redis server over Unix sockets."
 COM_CONFIG_FIELD_REDIS_PORT_LABEL="Redis Server Port"
-COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
+COM_CONFIG_FIELD_SEF_REWRITE_NOTE="Apache and Litespeed: Rename <code>htaccess.txt</code> to <code>.htaccess</code><br>IIS: Rename <code>web.config.txt</code> to <code>web.config</code><br>NginX: you must <a href=\"https://docs.joomla.org/Nginx\" target=\"_blank\" rel=\"noopener noreferrer\">configure your server</a>.<br>Other servers or if unsure: please consult your hosting company."
 COM_CONFIG_FIELD_SEF_REWRITE_DESC="Removes the <code>index.php/</code> part from the URLs."
 COM_CONFIG_FIELD_SEF_REWRITE_LABEL="Use URL Rewriting"
 COM_CONFIG_FIELD_SEF_SUFFIX_DESC="By default, Joomla URLs are “bare”, without an extension. This options tells Joomla to add an extension such as <code>.html</code>, <code>.feed</code> etc based on the type of content being displayed by the URL."

administrator/language/en-GB/com_fields.ini

@@ -52,12 +52,12 @@ COM_FIELDS_FIELD_ONLY_USE_IN_SUBFORM_LABEL="Only Use In Subform"
 COM_FIELDS_FIELD_PLACEHOLDER_DESC="Placeholder text which will appear inside the field as a hint to the user for the required input."
 COM_FIELDS_FIELD_PLACEHOLDER_LABEL="Placeholder"
 COM_FIELDS_FIELD_PREFIX_LABEL="Prefix"
-COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class attributes of the field when the field is rendered. If multiple classes are needed, list them with spaces."
-COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Render Class"
-COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Render Options"
+COM_FIELDS_FIELD_RENDER_CLASS_DESC="The class of the field container in the output."
+COM_FIELDS_FIELD_RENDER_CLASS_LABEL="Display Class"
+COM_FIELDS_FIELD_RENDEROPTIONS_HEADING="Display Options"
 COM_FIELDS_FIELD_REQUIRED_LABEL="Required"
 COM_FIELDS_FIELD_SAVE_SUCCESS="Field saved"
-COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field renders."
+COM_FIELDS_FIELD_SHOWLABEL_DESC="Show or Hide the label when the field displays."
 COM_FIELDS_FIELD_SHOWLABEL_LABEL="Label"
 COM_FIELDS_FIELD_SUFFIX_LABEL="Suffix"
 COM_FIELDS_FIELD_TYPE_LABEL="Type"

administrator/language/en-GB/com_installer.ini

@@ -30,8 +30,8 @@ COM_INSTALLER_EMPTYSTATE_BUTTON_ADD="Check For Updates"
 COM_INSTALLER_EMPTYSTATE_CONTENT="You currently have no pending updates to apply. Check regularly for new updates to keep your site up to date and secure."
 COM_INSTALLER_EMPTYSTATE_DISCOVER_BUTTON_ADD="Discover extensions to install"
 COM_INSTALLER_EMPTYSTATE_DISCOVER_TITLE="You have no discovered extensions to install."
-COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disable default template is not permitted."
-COM_INSTALLER_ERROR_DISABLE_PARENT_TEMPLATE_NOT_PERMITTED="Disable parent template is not permitted."
+COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disabling the default template is not permitted."
+COM_INSTALLER_ERROR_DISABLE_PARENT_TEMPLATE_NOT_PERMITTED="Disabling the parent template is not permitted."
 COM_INSTALLER_ERROR_METHOD="Method Not Implemented"
 COM_INSTALLER_ERROR_NO_EXTENSIONS_DISCOVERED="No extensions discovered."
 COM_INSTALLER_ERROR_NO_EXTENSIONS_SELECTED="No extensions selected."

administrator/language/en-GB/com_scheduler.ini

@@ -12,7 +12,7 @@ COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_KEY_LABEL="Global Key"
 COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_LINK_DESC="By default, requesting this base link will only run tasks due for execution. To execute a specific task, use the task's ID as a query parameter appended to the URL: <code>BASE_URL&id=&lt;taskId&gt;</code>"
 COM_SCHEDULER_CONFIG_GLOBAL_WEBCRON_LINK_LABEL="Webcron Link (Base)"
 COM_SCHEDULER_CONFIG_HASH_PROTECTION_DESC="If enabled, tasks will only be triggered when URLs have the scheduler hash as a parameter."
-COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_DESC="If disabled, scheduled tasks will not be triggered by visitors on the site.<br>Recommended if triggering with native cron."
+COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_DESC="If disabled, scheduled tasks will not be triggered by visitors on the site.<br>It is recommended to DISABLE the Lazy Scheduler, if triggering with native cron."
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_ENABLED_LABEL="Lazy Scheduler"
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_INTERVAL_DESC="Interval between scheduler trigger requests from the client."
 COM_SCHEDULER_CONFIG_LAZY_SCHEDULER_INTERVAL_LABEL="Request Interval (seconds)"

administrator/language/en-GB/joomla.ini

@@ -480,7 +480,7 @@ JGLOBAL_HITS_DESC="Hits descending"
 JGLOBAL_INHERIT="Inherit"
 JGLOBAL_INTEGRATION_LABEL="Integration"
 JGLOBAL_INTRO_TEXT="Intro Text"
-JGLOBAL_ISFREESOFTWARE="%s is free software released under the <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\">GNU General Public License</a>."
+JGLOBAL_ISFREESOFTWARE="%s is free software released under the <a href=\"https://www.gnu.org/licenses/gpl-2.0.html\" target=\"_blank\" rel=\"noopener noreferrer\">GNU General Public License</a>."
 JGLOBAL_ITEM_FEATURE="Feature Item"
 JGLOBAL_ITEM_UNFEATURE="Unfeature Item"
 JGLOBAL_JOOA11Y="Accessibility Check"

administrator/language/en-GB/plg_captcha_recaptcha.ini

@@ -4,7 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
 PLG_RECAPTCHA_CALLBACK_DESC="(Optional) JavaScript callback, executed after successful reCAPTCHA response."
 PLG_RECAPTCHA_CALLBACK_LABEL="Callback"
 PLG_RECAPTCHA_ERROR_CALLBACK_DESC="(Optional) JavaScript callback, executed when the reCAPTCHA encounters an error."

administrator/language/en-GB/plg_captcha_recaptcha.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."
+PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION="This CAPTCHA plugin uses the reCAPTCHA service to prevent spammers while it helps to digitize books, newspapers and old radio shows. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>. To use this for new account registration, go to Options in the User Manager and select CAPTCHA - reCAPTCHA as the CAPTCHA."

administrator/language/en-GB/plg_captcha_recaptcha_invisible.ini

@@ -4,7 +4,7 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CAPTCHA_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>."
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>."
 PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMLEFT="Bottom left"
 PLG_RECAPTCHA_INVISIBLE_BADGE_BOTTOMRIGHT="Bottom right"
 PLG_RECAPTCHA_INVISIBLE_BADGE_DESC="Positioning of the reCAPTCHA badge."

administrator/language/en-GB/plg_captcha_recaptcha_invisible.sys.ini

@@ -4,4 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CAPTCHA_RECAPTCHA_INVISIBLE="CAPTCHA - Invisible reCAPTCHA"
-PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\">https://www.google.com/recaptcha</a>."
+PLG_CAPTCHA_RECAPTCHA_INVISIBLE_XML_DESCRIPTION="This CAPTCHA plugin uses the Invisible reCAPTCHA service. To get a site and secret key for your domain, go to <a href=\"https://www.google.com/recaptcha\" target=\"_blank\" rel=\"noopener noreferrer\">https://www.google.com/recaptcha</a>."

administrator/language/en-GB/plg_sampledata_blog.ini

@@ -25,7 +25,7 @@ PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_INTROTEXT="<p>Your home page is
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_3_TITLE="About your home page"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_FULLTEXTIMAGE_ALT="Crab Nebula"
-PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image Module which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Most Read Posts which lists articles based on the number of times they have been read.</li><li>Older Articles which lists out articles by month.</li><li>Syndicate which allows your readers to read your posts in a news reader.</li><li>Popular Tags, which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href='https://extensions.joomla.org/'>Joomla Extensions Directory.</a></p>"
+PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_INTROTEXT="<p>Your site has some commonly used modules already preconfigured. These include:</p><ul><li>Image (type: Custom), which holds the image beneath the menu. This is a Custom module that you can edit to change the image.</li><li>Popular Tags (type: Tags - Popular), which will appear if you use tagging on your articles. Enter a tag in the Tags field when editing.</li><li>Older Posts (type: Articles - Category), which lists out articles by categories.</li><li>Syndication (type: Syndication Feeds), which allows your readers to read your posts in a news reader.</li><li>Login Form (type: Login), which allows your users to access restricted areas of the website.</li></ul><p>Each of these modules has many options which you can experiment with in the Module Manager in your site Administrator. When you are logged in you can also select the edit icon in the top right corner which will take you to an edit screen for that module. Always be sure to save and close any module you edit.</p><p>Joomla! also includes many other modules you can incorporate in your site. As you develop your site you may want to add more modules that you can find at the <a href="https://extensions.joomla.org/">Joomla Extensions Directory.</a></p>"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_4_TITLE="Your Modules"
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_FULLTEXT=""
 PLG_SAMPLEDATA_BLOG_SAMPLEDATA_CONTENT_ARTICLE_5_INTROTEXT="<p>Templates control the look and feel of your website.</p><p>This blog is installed with the Cassiopeia template.</p><p>You can edit the options by selecting the Working on Your Site, Template Settings link in the menu which is visible when you log in.</p><p>For example you can change the site background colour, highlights colour, site title, site description and title font used.</p><p>More options are available in the site administrator. You may also install a new template using the extension manager.</p>"

administrator/language/en-GB/plg_twofactorauth_totp.ini

@@ -19,7 +19,7 @@ PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1="Official Google Authenticator app for Androi
 PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM1_LINK="https://support.google.com/accounts/bin/answer.py?hl=en&answer=1066447" ; Check the URL and change the part hl=en to your language tag if this is available (example hl=de; hl=zh-cn; hl=zh-tw)
 PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2="Compatible clients for other devices and operating system (listed in Wikipedia)."
 PLG_TWOFACTORAUTH_TOTP_STEP1_ITEM2_LINK="https://en.wikipedia.org/wiki/Google_Authenticator#Implementation" ; Change and check this link if there is a translation in your language available. (current: German, Spanish, French, Japanese, Polish)
-PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install <a href=\"https://en.wikipedia.org/wiki/Google_Authenticator\" target=\"_blank\" rel=\"noopener noreferrer\">Google Authenticator</a>, or a compatible application such as <a href=\"https://freeotp.github.io/\" target=\"_blank\">FreeOTP</a>, on your smartphone or desktop. Use one of the following:"
+PLG_TWOFACTORAUTH_TOTP_STEP1_TEXT="Download and install <a href=\"https://en.wikipedia.org/wiki/Google_Authenticator\" target=\"_blank\" rel=\"noopener noreferrer\">Google Authenticator</a>, or a compatible application such as <a href=\"https://freeotp.github.io/\" target=\"_blank\" rel=\"noopener noreferrer\">FreeOTP</a>, on your smartphone or desktop. Use one of the following:"
 PLG_TWOFACTORAUTH_TOTP_STEP1_WARN="Please remember to sync your device's clock with a time-server. Time drift in your device may cause an inability to log in to your site."
 PLG_TWOFACTORAUTH_TOTP_STEP2_ACCOUNT="Account"
 PLG_TWOFACTORAUTH_TOTP_STEP2_ALTTEXT="Alternatively, you can scan the following QR code in Google Authenticator."