Merge branch '330187-aqualls-web-terminal' into 'master'

Polish UI text for web terminals

See merge request gitlab-org/gitlab!70322

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

@@ -6,5 +6,5 @@
       = f.label :terminal_max_session_time, _('Max session time'), class: 'label-bold'
       = f.number_field :terminal_max_session_time, class: 'form-control gl-form-input'
       .form-text.text-muted
-        = _('Maximum time for web terminal websocket connection (in seconds). 0 for unlimited.')
+        = _('Maximum time, in seconds, for a web terminal websocket connection. 0 for unlimited.')
   = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

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

@@ -79,7 +79,8 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Set max session time for web terminal.')
+      = _('Set the maximum session time for a web terminal.')
+      = link_to _('How do I use a web terminal?'), help_page_path('ci/environments/index.md', anchor: 'web-terminals'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = render 'terminal'
 

locale/gitlab.pot

@@ -16817,6 +16817,9 @@ msgstr ""
 msgid "How do I set up this service?"
 msgstr ""
 
+msgid "How do I use a web terminal?"
+msgstr ""
+
 msgid "How it works"
 msgstr ""
 
@@ -20969,10 +20972,10 @@ msgstr ""
 msgid "Maximum time between updates that a mirror can have when scheduled to synchronize."
 msgstr ""
 
-msgid "Maximum time for web terminal websocket connection (in seconds). 0 for unlimited."
+msgid "Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in."
 msgstr ""
 
-msgid "Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in."
+msgid "Maximum time, in seconds, for a web terminal websocket connection. 0 for unlimited."
 msgstr ""
 
 msgid "Maximum unauthenticated API requests per rate limit period per IP"
@@ -30808,9 +30811,6 @@ msgstr ""
 msgid "Set limits for web and API requests."
 msgstr ""
 
-msgid "Set max session time for web terminal."
-msgstr ""
-
 msgid "Set milestone"
 msgstr ""
 
@@ -30859,6 +30859,9 @@ msgstr ""
 msgid "Set the iteration to %{iteration_reference}."
 msgstr ""
 
+msgid "Set the maximum session time for a web terminal."
+msgstr ""
+
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""