Merge branch 'fneill-okr-group-settings' into 'master'

Review UI text: Group > Settings

See merge request gitlab-org/gitlab!72703

app/views/shared/doorkeeper/applications/_form.html.haml

@@ -16,13 +16,14 @@
     = f.check_box :confidential, class: 'form-check-input'
     = f.label :confidential, class: 'label-bold form-check-label'
     %span.form-text.text-muted
-      = _('The application will be used where the client secret can be kept confidential. Native mobile apps and Single Page Apps are considered non-confidential.')
+      = _('Enable only for confidential applications exclusively used by a trusted backend server that can securely store the client secret. Do not enable for native-mobile, single-page, or other JavaScript applications because they cannot keep the client secret confidential.')
 
   .form-group.form-check
     = f.check_box :expire_access_tokens, class: 'form-check-input'
     = f.label :expire_access_tokens, class: 'label-bold form-check-label'
     %span.form-text.text-muted
-      = _('Access tokens expire after 2 hours. A refresh token may be used at any time to generate a new access token. Non-expiring access tokens are deprecated. Clear this setting to enable backward compatibility.')
+      = _('Enable access tokens to expire after 2 hours. If disabled, tokens do not expire.')
+      = link_to _('Learn more.'), help_page_path('integration/oauth_provider.md', anchor: 'expiring-access-tokens'), target: '_blank', rel: 'noopener noreferrer'
 
   .form-group
     = f.label :scopes, class: 'label-bold'

app/views/shared/doorkeeper/applications/_index.html.haml

@@ -9,7 +9,7 @@
         - if oauth_authorized_applications_enabled
           = _("Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account.")
         - else
-          = _("Manage applications that can use GitLab as an OAuth provider.")
+          = _("Manage applications that use GitLab as an OAuth provider.")
       - else
         = _("Manage applications that you've authorized to use your account.")
   .col-lg-8

locale/gitlab.pot

@@ -12938,6 +12938,9 @@ msgstr ""
 msgid "Enable access to the performance bar for non-administrators in a given group."
 msgstr ""
 
+msgid "Enable access tokens to expire after 2 hours. If disabled, tokens do not expire."
+msgstr ""
+
 msgid "Enable admin mode"
 msgstr ""
 
@@ -13010,6 +13013,9 @@ msgstr ""
 msgid "Enable multipart emails"
 msgstr ""
 
+msgid "Enable only for confidential applications exclusively used by a trusted backend server that can securely store the client secret. Do not enable for native-mobile, single-page, or other JavaScript applications because they cannot keep the client secret confidential."
+msgstr ""
+
 msgid "Enable or disable the Pseudonymizer data collection."
 msgstr ""
 
@@ -21256,7 +21262,7 @@ msgstr ""
 msgid "Manage applications that can use GitLab as an OAuth provider, and applications that you've authorized to use your account."
 msgstr ""
 
-msgid "Manage applications that can use GitLab as an OAuth provider."
+msgid "Manage applications that use GitLab as an OAuth provider."
 msgstr ""
 
 msgid "Manage applications that you've authorized to use your account."