Merge branch 'russell/improve-instance-limits-ui-text' into 'master'

Improve UI text of instance limits

See merge request gitlab-org/gitlab!70346

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

@@ -23,11 +23,11 @@
     .form-group
       = f.label :max_import_size, _('Maximum import size (MB)'), class: 'label-light'
       = f.number_field :max_import_size, class: 'form-control gl-form-input qa-receive-max-import-size-field', title: _('Maximum size of import files.'), data: { toggle: 'tooltip', container: 'body' }
-      %span.form-text.text-muted= _('0 for unlimited, only effective with remote storage enabled.')
+      %span.form-text.text-muted= _('Only effective when remote storage is enabled. Set to 0 for no size limit.')
     .form-group
       = f.label :session_expire_delay, _('Session duration (minutes)'), class: 'label-light'
       = f.number_field :session_expire_delay, class: 'form-control gl-form-input', title: _('Maximum duration of a session.'), data: { toggle: 'tooltip', container: 'body' }
-      %span.form-text.text-muted#session_expire_delay_help_block= _('GitLab restart is required to apply changes.')
+      %span.form-text.text-muted#session_expire_delay_help_block= _('Restart GitLab to apply changes.')
 
     = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f
     = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f
@@ -45,13 +45,13 @@
       .form-check
         = f.check_box :user_default_external, class: 'form-check-input'
         = f.label :user_default_external, class: 'form-check-label' do
-          = _('Newly registered users will by default be external')
+          = _('Newly-registered users are external by default')
       .gl-mt-3
         = _('Internal users')
       = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2'
       .help-block
-        = _('Specify an e-mail address regex pattern to identify default internal users.')
-        = link_to _('More information'), help_page_path('user/permissions', anchor: 'setting-new-users-to-external'),
+        = _('Specify an email address regex pattern to identify default internal users.')
+        = link_to _('Learn more'), help_page_path('user/permissions', anchor: 'setting-new-users-to-external'),
           target: '_blank'
     - unless Gitlab.com?
       .form-group
@@ -59,11 +59,13 @@
         .form-check
           = f.check_box :deactivate_dormant_users, class: 'form-check-input'
           = f.label :deactivate_dormant_users, class: 'form-check-label' do
-            = _('Deactivate dormant users after 90 days of inactivity. Users can return to active status by signing in to their account. While inactive, a user is not counted as an active user in the instance.')
-            = link_to _('More information'), help_page_path('user/admin_area/moderate_users', anchor: 'automatically-deactivate-dormant-users'), target: '_blank'
+            = _('Deactivate dormant users after 90 days of inactivity')
+            .help-block
+              = _('Users can reactivate their account by signing in.')
+              = link_to _('Learn more'), help_page_path('user/admin_area/moderate_users', anchor: 'automatically-deactivate-dormant-users'), target: '_blank'
     .form-group
       = f.label :personal_access_token_prefix, _('Personal Access Token prefix'), class: 'label-light'
-      = f.text_field :personal_access_token_prefix, placeholder: _('Max 20 characters'), class: 'form-control gl-form-input'
+      = f.text_field :personal_access_token_prefix, placeholder: _('Maximum 20 characters'), class: 'form-control gl-form-input'
     .form-group
       = f.label :user_show_add_ssh_key_message, _('Prompt users to upload SSH keys'), class: 'label-bold'
       .form-check

ee/app/views/admin/application_settings/_availability_on_namespace_setting.html.haml

@@ -7,4 +7,6 @@
   .form-check
     = form.check_box :check_namespace_plan, class: 'form-check-input'
     = form.label :check_namespace_plan, class: 'form-check-label' do
-      = _("Enabling this will only make licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public.")
+      = _("Allow use of licensed EE features")
+      .help-block
+        = _("Licensed Enterprise Edition features can be used if the project namespace's plan includes the feature, or if the project is public.")

ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml

@@ -4,4 +4,4 @@
 .form-group
   = form.label :max_personal_access_token_lifetime, _('Maximum allowable lifetime for personal access token (days)'), class: 'label-light'
   = form.number_field :max_personal_access_token_lifetime, class: 'form-control gl-form-input input-xs'
-  %span.form-text.text-muted#max_personal_access_token_lifetime= _('Leave blank for no limit. Once set, existing personal access tokens may be revoked.')
+  %span.form-text.text-muted#max_personal_access_token_lifetime= _('When enabled, existing personal access tokens may be revoked. Leave blank for no limit.')

ee/app/views/admin/application_settings/_repository_size_limit_setting.html.haml

@@ -8,4 +8,4 @@
   = form.number_field :repository_size_limit, value: form.object.repository_size_limit.try(:to_mb), class: 'form-control gl-form-input', min: 0, title: _('Maximum size limit for each repository.'), data: { toggle: 'tooltip', container: 'body' }
   %span.form-text.text-muted#repository_size_limit_help_block
     = _('Includes LFS objects. It can be overridden per group, or per project. 0 for unlimited.')
-    = link_to sprite_icon('question-o'), help_page_path('user/admin_area/settings/account_and_limit_settings')
+    = link_to _('Learn more.'), help_page_path('user/admin_area/settings/account_and_limit_settings'), target: '_blank', rel: 'noopener noreferrer'

locale/gitlab.pot

@@ -1213,9 +1213,6 @@ msgstr ""
 msgid "0 bytes"
 msgstr ""
 
-msgid "0 for unlimited, only effective with remote storage enabled."
-msgstr ""
-
 msgid "0t1DgySidms"
 msgstr ""
 
@@ -3416,6 +3413,9 @@ msgstr ""
 msgid "Allow this secondary node to replicate content on Object Storage"
 msgstr ""
 
+msgid "Allow use of licensed EE features"
+msgstr ""
+
 msgid "Allow users to dismiss the broadcast message"
 msgstr ""
 
@@ -10782,7 +10782,7 @@ msgstr ""
 msgid "Days to merge"
 msgstr ""
 
-msgid "Deactivate dormant users after 90 days of inactivity. Users can return to active status by signing in to their account. While inactive, a user is not counted as an active user in the instance."
+msgid "Deactivate dormant users after 90 days of inactivity"
 msgstr ""
 
 msgid "Dear Administrator,"
@@ -12757,9 +12757,6 @@ msgstr ""
 msgid "Enabled sources for code import during project creation. OmniAuth must be configured for GitHub"
 msgstr ""
 
-msgid "Enabling this will only make licensed EE features available to projects if the project namespace's plan includes the feature or if the project is public."
-msgstr ""
-
 msgid "Encountered an error while rendering: %{err}"
 msgstr ""
 
@@ -15544,9 +15541,6 @@ msgstr ""
 msgid "GitLab project export"
 msgstr ""
 
-msgid "GitLab restart is required to apply changes."
-msgstr ""
-
 msgid "GitLab single sign-on URL"
 msgstr ""
 
@@ -20184,9 +20178,6 @@ msgstr ""
 msgid "Leave Admin Mode"
 msgstr ""
 
-msgid "Leave blank for no limit. Once set, existing personal access tokens may be revoked."
-msgstr ""
-
 msgid "Leave edit mode? All unsaved changes will be lost."
 msgstr ""
 
@@ -20325,6 +20316,9 @@ msgstr ""
 msgid "LicenseManagement|Uncategorized"
 msgstr ""
 
+msgid "Licensed Enterprise Edition features can be used if the project namespace's plan includes the feature, or if the project is public."
+msgstr ""
+
 msgid "Licensed Features"
 msgstr ""
 
@@ -20891,9 +20885,6 @@ msgstr ""
 msgid "Max 100,000 events"
 msgstr ""
 
-msgid "Max 20 characters"
-msgstr ""
-
 msgid "Max authenticated Git LFS requests per period per user"
 msgstr ""
 
@@ -20909,6 +20900,9 @@ msgstr ""
 msgid "MaxBuilds"
 msgstr ""
 
+msgid "Maximum 20 characters"
+msgstr ""
+
 msgid "Maximum Conan package file size in bytes"
 msgstr ""
 
@@ -22825,7 +22819,7 @@ msgstr ""
 msgid "Newest first"
 msgstr ""
 
-msgid "Newly registered users will by default be external"
+msgid "Newly-registered users are external by default"
 msgstr ""
 
 msgid "Next"
@@ -23803,6 +23797,9 @@ msgstr ""
 msgid "Only admins can delete project"
 msgstr ""
 
+msgid "Only effective when remote storage is enabled. Set to 0 for no size limit."
+msgstr ""
+
 msgid "Only include features new to your current subscription tier."
 msgstr ""
 
@@ -28976,6 +28973,9 @@ msgstr ""
 msgid "Response text"
 msgstr ""
 
+msgid "Restart GitLab to apply changes."
+msgstr ""
+
 msgid "Restart Terminal"
 msgstr ""
 
@@ -32102,7 +32102,7 @@ msgstr ""
 msgid "Specified URL cannot be used: \"%{reason}\""
 msgstr ""
 
-msgid "Specify an e-mail address regex pattern to identify default internal users."
+msgid "Specify an email address regex pattern to identify default internal users."
 msgstr ""
 
 msgid "Speed up your pipelines with Needs relationships"
@@ -37226,6 +37226,9 @@ msgstr ""
 msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled."
 msgstr ""
 
+msgid "Users can reactivate their account by signing in."
+msgstr ""
+
 msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki."
 msgstr ""
 
@@ -38201,6 +38204,9 @@ msgstr ""
 msgid "When an event in GitLab triggers a webhook, you can use the request details to figure out if something went wrong."
 msgstr ""
 
+msgid "When enabled, existing personal access tokens may be revoked. Leave blank for no limit."
+msgstr ""
+
 msgid "When inactive, an external authentication provider must be used."
 msgstr ""