Merge branch 'russell/improve-ui-text-sign-in-restrictions' into 'master'

Improve UI text of admin settings page - General -> Sign-in restrictions

See merge request gitlab-org/gitlab!81776

app/views/admin/application_settings/_signin.html.haml

@@ -8,17 +8,17 @@
         = f.label :password_authentication_enabled_for_web, class: 'form-check-label' do
           = _('Allow password authentication for the web interface')
           .form-text.text-muted
-            = _('When inactive, an external authentication provider must be used.')
+            = _('Clear this checkbox to use an external authentication provider instead.')
     .form-group
       .form-check
         = f.check_box :password_authentication_enabled_for_git, class: 'form-check-input'
         = f.label :password_authentication_enabled_for_git, class: 'form-check-label' do
           = _('Allow password authentication for Git over HTTP(S)')
           .form-text.text-muted
-            When inactive, a Personal Access Token
             - if Gitlab::Auth::Ldap::Config.enabled?
-              or LDAP password
-            must be used to authenticate.
+              = _('Clear this checkbox to use a personal access token or LDAP password instead.')
+            - else
+              = _('Clear this checkbox to use a personal access token instead.')
     - if omniauth_enabled? && button_based_providers.any?
       %fieldset.form-group
         %legend.gl-font-base.gl-mb-3.gl-border-none.gl-font-weight-bold= _('Enabled OAuth authentication sources')

locale/gitlab.pot

@@ -7453,6 +7453,15 @@ msgstr ""
 msgid "Clear templates search input"
 msgstr ""
 
+msgid "Clear this checkbox to use a personal access token instead."
+msgstr ""
+
+msgid "Clear this checkbox to use a personal access token or LDAP password instead."
+msgstr ""
+
+msgid "Clear this checkbox to use an external authentication provider instead."
+msgstr ""
+
 msgid "Clear weight"
 msgstr ""
 
@@ -41344,9 +41353,6 @@ msgstr ""
 msgid "When enabled, job logs are collected by Datadog and displayed along with pipeline execution traces."
 msgstr ""
 
-msgid "When inactive, an external authentication provider must be used."
-msgstr ""
-
 msgid "When merge requests and commits in the default branch close, any issues they reference also close."
 msgstr ""