Review Adv Search admin UI text

Changelog: changed

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

@@ -26,8 +26,8 @@
                 %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
                   = sprite_icon('close', css_class: 'gl-icon')
                 .gl-alert-body
-                  %h4.gl-alert-title= _('There is a halted Elasticsearch migration')
-                  = html_escape_once(_('Check the elasticsearch.log file to debug why the migration was halted and make any changes before retrying the migration. When you fix the cause of the failure, click "Retry migration", and the migration will be scheduled to be retried in the background.')).html_safe
+                  %h4.gl-alert-title= _('Elasticsearch migration halted')
+                  = html_escape_once(_('Check the %{code_open}elasticsearch.log%{code_close} file to debug why the migration halted and make any changes before retrying the migration. When you fix the cause of the failure, select %{strong_open}Retry migration%{strong_close}, and the migration is scheduled to retry in the background.')) % { strong_open: '<strong>'.html_safe, strong_close: '</strong>'.html_safe, code_open: '<code>'.html_safe, code_close: '</code>'.html_safe }
                   = link_to _('Learn more.'), help_page_path('integration/elasticsearch', anchor: 'advanced-search-migrations')
                 .gl-alert-actions
                   - migration = Elastic::DataMigrationService.halted_migration
@@ -40,7 +40,7 @@
                   = _('Elasticsearch indexing')
                 - unless Gitlab::CurrentSettings.elasticsearch_indexing?
                   .form-text.gl-text-gray-600.gl-mt-0
-                    = _('An empty index will be created if one does not already exist')
+                    = _('If there isn\'t any existing index, GitLab creates one.')
                 - if Gitlab::CurrentSettings.elasticsearch_indexing?
                   .form-text
                     = link_to _('Index all projects'), admin_elasticsearch_enqueue_index_path,
@@ -56,32 +56,38 @@
                 = f.label :elasticsearch_pause_indexing, class: 'form-check-label' do
                   = _('Pause Elasticsearch indexing')
                 .form-text.gl-text-gray-600.gl-mt-0
-                  = _('Changes are still tracked. Useful for cluster/index migrations.')
+                  = _('When paused, GitLab still tracks the changes. This is useful for cluster/index migrations.')
                 - if pending_migration_running_and_pauses_indexing
                   .form-text.text-warning
-                    = _('There are pending advanced search migrations which require indexing to be paused. Indexing must remain paused until the migrations are completed.')
+                    = _('There are Advanced Search migrations pending that require indexing to pause. Indexing must remain paused until GitLab completes the migrations.')
 
             .form-group
               .form-check
                 = f.check_box :elasticsearch_search, class: 'form-check-input', data: { qa_selector: 'search_checkbox' }
                 = f.label :elasticsearch_search, class: 'form-check-label' do
                   Search with Elasticsearch enabled
+                .form-text.gl-text-gray-600.gl-mt-0
+                  = _('Disable Elasticsearch until indexing completes.')
 
             .form-group
               = f.label :elasticsearch_url, 'URL', class: 'label-bold'
-              = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control gl-form-input', placeholder: 'http://localhost:9200', data: { qa_selector: 'url_field' }
+              = f.text_field :elasticsearch_url, value: @application_setting.elasticsearch_url.join(', '), class: 'form-control gl-form-input', placeholder: 'http://localhost:9200, http://localhost:9201', data: { qa_selector: 'url_field' }
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., "http://localhost:9200, http://localhost:9201").')
+                = _('The URLs for connecting to Elasticsearch. For clustering, add the URLs separated by commas.')
 
             .form-group
-              = f.label :elasticsearch_username, _('Username (for password-protected Elasticsearch servers)'), class: 'label-bold'
+              = f.label :elasticsearch_username, _('Username'), class: 'label-bold'
               = f.text_field :elasticsearch_username, value: @application_setting.elasticsearch_username, class: 'form-control gl-form-input', data: { qa_selector: 'username_field' }
+              .form-text.gl-text-gray-600.gl-mt-0
+                = _('Enter the username for password-protected Elasticsearch servers.')
             .form-group
-              = f.label :elasticsearch_password, _('Password (for password-protected Elasticsearch servers)'), class: 'label-bold'
+              = f.label :elasticsearch_password, _('Password'), class: 'label-bold'
               = f.password_field :elasticsearch_password, value: (@application_setting.elasticsearch_password.present? ? ApplicationSetting::MASK_PASSWORD : ''), class: 'form-control gl-form-input', data: { qa_selector: 'password_field' }
+              .form-text.gl-text-gray-600.gl-mt-0
+                = _('Enter the password for password-protected Elasticsearch servers.')
 
             .form-group
-              = f.label :elasticsearch_shards, _('Number of Elasticsearch shards and replicas (per index)'), class: 'gl-font-weight-bold'
+              = f.label :elasticsearch_shards, _('Number of Elasticsearch shards and replicas per index:'), class: 'gl-font-weight-bold'
 
             %table.table
               %thead
@@ -103,19 +109,19 @@
                 - configuration_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: configuration_link_url }
                 - recreated_link_url = help_page_url('integration/elasticsearch.md', anchor: 'zero-downtime-reindexing')
                 - recreated_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: recreated_link_url }
-                = _("Learn more about shards and replicas in the %{configuration_link_start}Advanced search configuration%{configuration_link_end} documentation. Changes won't take place until the index is %{recreated_link_start}recreated%{recreated_link_end}.").html_safe % { configuration_link_start: configuration_link_start, configuration_link_end: '</a>'.html_safe, recreated_link_start: recreated_link_start, recreated_link_end: '</a>'.html_safe }
+                = html_escape(_("Learn more about shards and replicas in the %{configuration_link_start}Advanced Search configuration%{configuration_link_end} documentation. Changes don\'t take place until you %{recreated_link_start}recreate%{recreated_link_end} the index.")) % { configuration_link_start: configuration_link_start, configuration_link_end: '</a>'.html_safe, recreated_link_start: recreated_link_start, recreated_link_end: '</a>'.html_safe }
 
             .form-group
               = f.label :elasticsearch_indexed_file_size_limit_kb, _('Maximum file size indexed (KiB)'), class: 'label-bold'
               = f.number_field :elasticsearch_indexed_file_size_limit_kb, value: @application_setting.elasticsearch_indexed_file_size_limit_kb, class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('Any files larger than this limit only index the file name. The file content is neither indexed nor searchable.')
+                = _('For files larger than this limit, only index the file name. The file content is neither indexed nor searchable.')
 
             .form-group
               = f.label :elasticsearch_indexed_field_length_limit, _('Maximum field length'), class: 'label-bold'
               = f.number_field :elasticsearch_indexed_field_length_limit, value: @application_setting.elasticsearch_indexed_field_length_limit, class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('If any indexed field exceeds this limit it will be truncated to this number of characters and the rest will not be indexed or searchable. This does not apply to repository and wiki indexing. Setting this to 0 means it is unlimited.')
+                = _('If any indexed field exceeds this limit, it is truncated to this number of characters. The rest of the content is neither indexed nor searchable. This does not apply to repository and wiki indexing. For unlimited characters, set this to 0.')
 
             .form-group
               = f.label :elasticsearch_max_bulk_size_mb, _('Maximum bulk request size (MiB)'), class: 'label-bold'
@@ -136,7 +142,7 @@
               = f.number_field :elasticsearch_client_request_timeout, value: @application_setting.elasticsearch_client_request_timeout, class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
                 = _('Elasticsearch HTTP client timeout value in seconds.')
-                = _('Setting this to 0 means using the system default timeout value.')
+                = _('To use the system\'s default, set this value to 0.')
 
         .gl-card.gl-bg-gray-10.gl-mb-6
           .gl-card-body
@@ -145,19 +151,19 @@
               .form-check
                 = f.check_box :elasticsearch_limit_indexing, class: 'form-check-input js-limit-checkbox'
                 = f.label :elasticsearch_limit_indexing, class: 'form-check-label' do
-                  = _('Limit namespaces and projects that can be indexed')
+                  = _('Limit the number of namespaces and projects that can be indexed.')
 
             .form-group.js-limit-namespaces{ class: ('hidden' unless @application_setting.elasticsearch_limit_indexing) }
               = f.label :elasticsearch_namespace_ids, _('Namespaces to index'), class: 'label-bold'
               - if elasticsearch_too_many_namespaces?
-                %p= _('Too many namespaces enabled. You will need to manage them via the console or the API.')
+                %p= _('Too many namespaces enabled. Manage them through the console or the API.')
               - else
                 = f.text_field :elasticsearch_namespace_ids, class: 'js-elasticsearch-namespaces', value: elasticsearch_namespace_ids, data: { selected: elasticsearch_objects_options(@application_setting.elasticsearch_limited_namespaces(true)).to_json }
 
             .form-group.js-limit-projects{ class: ('hidden' unless @application_setting.elasticsearch_limit_indexing) }
               = f.label :elasticsearch_project_ids, _('Projects to index'), class: 'label-bold'
               - if elasticsearch_too_many_projects?
-                %p= _('Too many projects enabled. You will need to manage them via the console or the API.')
+                %p= _('Too many projects enabled. Manage them through the console or the API.')
               - else
                 = f.text_field :elasticsearch_project_ids, class: 'js-elasticsearch-projects', value: elasticsearch_project_ids, data: { selected: elasticsearch_objects_options(@application_setting.elasticsearch_limited_projects(true)).to_json }
 
@@ -179,7 +185,7 @@
                 = f.label :elasticsearch_analyzers_smartcn_search, class: 'form-check-label' do
                   = _('Enable smartcn custom analyzer: Search')
                 .form-text.gl-text-gray-600
-                  = _('Please only enable search after installing the plugin, enabling indexing and recreating the index')
+                  = _('Only enable search after installing the plugin, enabling indexing, and recreating the index.')
             %h5
               = _('Japanese language support using')
               %a{ href: 'https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-kuromoji.html' }
@@ -195,7 +201,7 @@
                 = f.label :elasticsearch_analyzers_kuromoji_search, class: 'form-check-label' do
                   = _('Enable kuromoji custom analyzer: Search')
                 .form-text.gl-text-gray-600
-                  = _('Please only enable search after installing the plugin, enabling indexing and recreating the index')
+                  = _('Only enable search after installing the plugin, enabling indexing, and recreating the index.')
 
         .gl-card.gl-bg-gray-10.gl-mb-6
           .gl-card-body
@@ -204,25 +210,25 @@
               .form-check
                 = f.check_box :elasticsearch_aws, class: 'form-check-input'
                 = f.label :elasticsearch_aws, class: 'form-check-label' do
-                  Using AWS hosted Elasticsearch with IAM credentials
+                  Use AWS hosted Elasticsearch with IAM credentials
             .form-group
               = f.label :elasticsearch_aws_region, 'AWS region', class: 'label-bold'
               = f.text_field :elasticsearch_aws_region, value: @application_setting.elasticsearch_aws_region, class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('Region that Elasticsearch is configured')
+                = _('Elasticsearch\'s region.')
 
             .form-group
               = f.label :elasticsearch_aws_access_key, _('AWS Access Key'), class: 'label-bold'
               = f.text_field :elasticsearch_aws_access_key, value: @application_setting.elasticsearch_aws_access_key, class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('AWS Access Key. Only required if not using role instance credentials')
+                = _('Required only if you are not using role instance credentials.')
 
             - secret_access_key_label = @application_setting.elasticsearch_aws_secret_access_key.present? ? _('Enter new AWS Secret Access Key') : _('AWS Secret Access Key')
             .form-group
               = f.label :elasticsearch_aws_secret_access_key, secret_access_key_label, class: 'label-bold'
               = f.password_field :elasticsearch_aws_secret_access_key, autocomplete: 'new-password', class: 'form-control gl-form-input'
               .form-text.gl-text-gray-600.gl-mt-0
-                = _('AWS Secret Access Key. Only required if not using role instance credentials')
+                = _('Required only if you are not using role instance credentials.')
 
       = f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'submit_button' }
 
@@ -233,7 +239,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Trigger cluster reindexing. This feature should be used with an index that was created after 13.0.')
+      = _('Trigger cluster reindexing. Only use this with an index that was created in GitLab 13.0 or later.')
 
   .settings-content
     = form_for @elasticsearch_reindexing_task, url: admin_elasticsearch_trigger_reindexing_path, method: :post, html: { class: 'fieldset-form' } do |f|
@@ -244,7 +250,7 @@
           .form-text.gl-text-gray-600.gl-mt-0
             - slice_multiplier_link_url = help_page_path('integration/elasticsearch.md', anchor: 'slice-multiplier')
             - slice_multiplier_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: slice_multiplier_link_url }
-            = _('Used to calculate the number of slices during reindexing. The multiplier will be applied to the number of shards per index. Learn more about %{slice_multiplier_link_start}slice multiplier configuration%{slice_multiplier_link_end}.').html_safe % { slice_multiplier_link_start: slice_multiplier_link_start, slice_multiplier_link_end: '</a>'.html_safe }
+            = html_escape(_('Calculate the number of slices during reindexing. The multiplier is applied to the number of shards per index. Learn more about %{slice_multiplier_link_start}slice multiplier configuration%{slice_multiplier_link_end}.')) % { slice_multiplier_link_start: slice_multiplier_link_start, slice_multiplier_link_end: '</a>'.html_safe }
 
         .form-group
           = f.label :max_slices_running, _('Maximum running slices'), class: 'label-bold'
@@ -252,7 +258,7 @@
           .form-text.gl-text-gray-600.gl-mt-0
             - max_slices_running_link_url = help_page_path('integration/elasticsearch.md', anchor: 'maximum-running-slices')
             - max_slices_running_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: max_slices_running_link_url }
-            = _('The maximum number of slices allowed to run concurrently during Elasticsearch reindexing. Learn more about %{max_slices_running_link_start}maximum running slices configuration%{max_slices_link_end}.').html_safe % { max_slices_running_link_start: max_slices_running_link_start, max_slices_link_end: '</a>'.html_safe }
+            = html_escape(_('Set the maximum number of slices allowed to run concurrently during Elasticsearch reindexing. Learn more about %{max_slices_running_link_start}maximum running slices configuration%{max_slices_link_end}.')) % { max_slices_running_link_start: max_slices_running_link_start, max_slices_link_end: '</a>'.html_safe }
 
         = f.submit _('Trigger cluster reindexing'), class: "gl-button btn btn-info", disabled: @last_elasticsearch_reindexing_task&.in_progress?, data: { confirm: _('Are you sure you want to reindex?') }
         .form-text.gl-text-gray-600

ee/spec/features/admin/admin_settings_spec.rb

@@ -115,7 +115,7 @@ RSpec.describe 'Admin updates EE-only settings' do
         expect(page).not_to have_content('Namespaces to index')
         expect(page).not_to have_content('Projects to index')
 
-        check 'Limit namespaces and projects that can be indexed'
+        check 'Limit the number of namespaces and projects that can be indexed.'
 
         expect(page).to have_content('Namespaces to index')
         expect(page).to have_content('Projects to index')

ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb

@@ -237,11 +237,11 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
     it 'does not show the retry migration card' do
       render
 
-      expect(rendered).not_to include('There is a halted Elasticsearch migration')
+      expect(rendered).not_to include('Elasticsearch migration halted')
       expect(rendered).not_to include('Retry migration')
     end
 
-    context 'when there is a halted migration' do
+    context 'when Elasticsearch migration halted' do
       let(:migration) { Elastic::DataMigrationService.migrations.last }
 
       before do
@@ -253,7 +253,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
         it 'shows the retry migration card' do
           render
 
-          expect(rendered).to include('There is a halted Elasticsearch migration')
+          expect(rendered).to include('Elasticsearch migration halted')
           expect(rendered).to have_css('a', text: 'Retry migration')
           expect(rendered).not_to have_css('a[disabled="disabled"]', text: 'Retry migration')
         end
@@ -267,7 +267,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
         it 'shows the retry migration card with retry button disabled' do
           render
 
-          expect(rendered).to include('There is a halted Elasticsearch migration')
+          expect(rendered).to include('Elasticsearch migration halted')
           expect(rendered).to have_css('a[disabled="disabled"]', text: 'Retry migration')
         end
       end
@@ -281,7 +281,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
       it 'does not show the retry migration card' do
         render
 
-        expect(rendered).not_to include('There is a halted Elasticsearch migration')
+        expect(rendered).not_to include('Elasticsearch migration halted')
         expect(rendered).not_to include('Retry migration')
       end
     end

locale/gitlab.pot

@@ -3520,9 +3520,6 @@ msgstr ""
 msgid "An empty GitLab User field will add the FogBugz user's full name (e.g. \"By John Smith\") in the description of all issues and comments. It will also associate and/or assign these issues and comments with the project creator."
 msgstr ""
 
-msgid "An empty index will be created if one does not already exist"
-msgstr ""
-
 msgid "An error has occurred"
 msgstr ""
 
@@ -3972,9 +3969,6 @@ msgstr ""
 msgid "Any encrypted tokens"
 msgstr ""
 
-msgid "Any files larger than this limit only index the file name. The file content is neither indexed nor searchable."
-msgstr ""
-
 msgid "Any label"
 msgstr ""
 
@@ -6193,6 +6187,9 @@ msgstr ""
 msgid "Cadence is not automated"
 msgstr ""
 
+msgid "Calculate the number of slices during reindexing. The multiplier is applied to the number of shards per index. Learn more about %{slice_multiplier_link_start}slice multiplier configuration%{slice_multiplier_link_end}."
+msgstr ""
+
 msgid "Callback URL"
 msgstr ""
 
@@ -6541,9 +6538,6 @@ msgstr ""
 msgid "Changes are shown as if the %{b_open}source%{b_close} revision was being merged into the %{b_open}target%{b_close} revision."
 msgstr ""
 
-msgid "Changes are still tracked. Useful for cluster/index migrations."
-msgstr ""
-
 msgid "Changes saved."
 msgstr ""
 
@@ -6619,10 +6613,10 @@ msgstr ""
 msgid "Check out, review, and merge locally"
 msgstr ""
 
-msgid "Check the current instance configuration "
+msgid "Check the %{code_open}elasticsearch.log%{code_close} file to debug why the migration halted and make any changes before retrying the migration. When you fix the cause of the failure, select %{strong_open}Retry migration%{strong_close}, and the migration is scheduled to retry in the background."
 msgstr ""
 
-msgid "Check the elasticsearch.log file to debug why the migration was halted and make any changes before retrying the migration. When you fix the cause of the failure, click \"Retry migration\", and the migration will be scheduled to be retried in the background."
+msgid "Check the current instance configuration "
 msgstr ""
 
 msgid "Check with your administrator."
@@ -12053,6 +12047,9 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
+msgid "Disable Elasticsearch until indexing completes."
+msgstr ""
+
 msgid "Disable Two-factor Authentication"
 msgstr ""
 
@@ -12523,6 +12520,9 @@ msgstr ""
 msgid "Elasticsearch indexing started"
 msgstr ""
 
+msgid "Elasticsearch migration halted"
+msgstr ""
+
 msgid "Elasticsearch reindexing is already in progress"
 msgstr ""
 
@@ -12538,6 +12538,9 @@ msgstr ""
 msgid "Elasticsearch zero-downtime reindexing"
 msgstr ""
 
+msgid "Elasticsearch's region."
+msgstr ""
+
 msgid "Elastic|None. Select namespaces to index."
 msgstr ""
 
@@ -12976,6 +12979,12 @@ msgstr ""
 msgid "Enter the number of seconds, or other human-readable input, like \"1 hour\". This timeout takes precedence over lower timeouts set for the project."
 msgstr ""
 
+msgid "Enter the password for password-protected Elasticsearch servers."
+msgstr ""
+
+msgid "Enter the username for password-protected Elasticsearch servers."
+msgstr ""
+
 msgid "Enter your Packagist server. Defaults to https://packagist.org."
 msgstr ""
 
@@ -14903,6 +14912,9 @@ msgstr ""
 msgid "For example, the application using the token or the purpose of the token."
 msgstr ""
 
+msgid "For files larger than this limit, only index the file name. The file content is neither indexed nor searchable."
+msgstr ""
+
 msgid "For general work"
 msgstr ""
 
@@ -17235,7 +17247,7 @@ msgstr ""
 msgid "Identities"
 msgstr ""
 
-msgid "If any indexed field exceeds this limit it will be truncated to this number of characters and the rest will not be indexed or searchable. This does not apply to repository and wiki indexing. Setting this to 0 means it is unlimited."
+msgid "If any indexed field exceeds this limit, it is truncated to this number of characters. The rest of the content is neither indexed nor searchable. This does not apply to repository and wiki indexing. For unlimited characters, set this to 0."
 msgstr ""
 
 msgid "If blank, defaults to %{code_open}Retry later%{code_close}."
@@ -17274,6 +17286,9 @@ msgstr ""
 msgid "If the number of active users exceeds the user limit, you will be charged for the number of %{users_over_license_link} at your next license reconciliation."
 msgstr ""
 
+msgid "If there isn't any existing index, GitLab creates one."
+msgstr ""
+
 msgid "If this email was added in error, you can remove it here:"
 msgstr ""
 
@@ -20335,7 +20350,7 @@ msgstr ""
 msgid "Learn more about groups."
 msgstr ""
 
-msgid "Learn more about shards and replicas in the %{configuration_link_start}Advanced search configuration%{configuration_link_end} documentation. Changes won't take place until the index is %{recreated_link_start}recreated%{recreated_link_end}."
+msgid "Learn more about shards and replicas in the %{configuration_link_start}Advanced Search configuration%{configuration_link_end} documentation. Changes don't take place until you %{recreated_link_start}recreate%{recreated_link_end} the index."
 msgstr ""
 
 msgid "Learn more about signing commits"
@@ -20659,9 +20674,6 @@ msgstr ""
 msgid "Limit display of time tracking units to hours."
 msgstr ""
 
-msgid "Limit namespaces and projects that can be indexed"
-msgstr ""
-
 msgid "Limit project size at a global, group, and project level. %{link_start}Learn more%{link_end}."
 msgstr ""
 
@@ -20677,6 +20689,9 @@ msgstr ""
 msgid "Limit the number of issues and epics per minute a user can create through web and API requests."
 msgstr ""
 
+msgid "Limit the number of namespaces and projects that can be indexed."
+msgstr ""
+
 msgid "Limit the size of Sidekiq jobs stored in Redis."
 msgstr ""
 
@@ -23700,7 +23715,7 @@ msgstr ""
 msgid "Nuget metadatum must have at least license_url, project_url or icon_url set"
 msgstr ""
 
-msgid "Number of Elasticsearch shards and replicas (per index)"
+msgid "Number of Elasticsearch shards and replicas per index:"
 msgstr ""
 
 msgid "Number of Git pushes after which %{code_start}git gc%{code_end} is run."
@@ -24104,6 +24119,9 @@ msgstr ""
 msgid "Only effective when remote storage is enabled. Set to 0 for no size limit."
 msgstr ""
 
+msgid "Only enable search after installing the plugin, enabling indexing, and recreating the index."
+msgstr ""
+
 msgid "Only include features new to your current subscription tier."
 msgstr ""
 
@@ -24838,9 +24856,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-msgid "Password (for password-protected Elasticsearch servers)"
-msgstr ""
-
 msgid "Password (optional)"
 msgstr ""
 
@@ -25816,9 +25831,6 @@ msgstr ""
 msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
 msgstr ""
 
-msgid "Please only enable search after installing the plugin, enabling indexing and recreating the index"
-msgstr ""
-
 msgid "Please provide a name"
 msgstr ""
 
@@ -28392,9 +28404,6 @@ msgstr ""
 msgid "Regex pattern"
 msgstr ""
 
-msgid "Region that Elasticsearch is configured"
-msgstr ""
-
 msgid "Register"
 msgstr ""
 
@@ -29212,6 +29221,9 @@ msgstr ""
 msgid "Required in this project."
 msgstr ""
 
+msgid "Required only if you are not using role instance credentials."
+msgstr ""
+
 msgid "Requirement %{reference} has been added"
 msgstr ""
 
@@ -31444,6 +31456,9 @@ msgstr ""
 msgid "Set the iteration to %{iteration_reference}."
 msgstr ""
 
+msgid "Set the maximum number of slices allowed to run concurrently during Elasticsearch reindexing. Learn more about %{max_slices_running_link_start}maximum running slices configuration%{max_slices_link_end}."
+msgstr ""
+
 msgid "Set the maximum session time for a web terminal."
 msgstr ""
 
@@ -31578,9 +31593,6 @@ msgid_plural "Settings saved successfully"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "Setting this to 0 means using the system default timeout value."
-msgstr ""
-
 msgid "Settings"
 msgstr ""
 
@@ -34082,7 +34094,7 @@ msgstr ""
 msgid "The URL should start with http:// or https://"
 msgstr ""
 
-msgid "The URL to use for connecting to Elasticsearch. Use a comma-separated list to support clustering (e.g., \"http://localhost:9200, http://localhost:9201\")."
+msgid "The URLs for connecting to Elasticsearch. For clustering, add the URLs separated by commas."
 msgstr ""
 
 msgid "The X509 Certificate to use when mutual TLS is required to communicate with the external authorization service. If left blank, the server certificate is still validated when accessing over HTTPS."
@@ -34324,9 +34336,6 @@ msgstr ""
 msgid "The maximum number of pipeline minutes that a group can use on shared runners per month. 0 for unlimited."
 msgstr ""
 
-msgid "The maximum number of slices allowed to run concurrently during Elasticsearch reindexing. Learn more about %{max_slices_running_link_start}maximum running slices configuration%{max_slices_link_end}."
-msgstr ""
-
 msgid "The maximum number of tags that a single worker accepts for cleanup. If the number of tags goes above this limit, the list of tags to delete is truncated to this number. To remove this limit, set it to 0."
 msgstr ""
 
@@ -34516,6 +34525,9 @@ msgstr ""
 msgid "The vulnerability is no longer detected. Verify the vulnerability has been remediated before changing its status."
 msgstr ""
 
+msgid "There are Advanced Search migrations pending that require indexing to pause. Indexing must remain paused until GitLab completes the migrations."
+msgstr ""
+
 msgid "There are currently no events."
 msgstr ""
 
@@ -34612,9 +34624,6 @@ msgstr ""
 msgid "There are no variables yet."
 msgstr ""
 
-msgid "There are pending advanced search migrations which require indexing to be paused. Indexing must remain paused until the migrations are completed."
-msgstr ""
-
 msgid "There are running deployments on the environment. Please retry later."
 msgstr ""
 
@@ -34627,9 +34636,6 @@ msgstr ""
 msgid "There are several size limits in place."
 msgstr ""
 
-msgid "There is a halted Elasticsearch migration"
-msgstr ""
-
 msgid "There is already a repository with that name on disk"
 msgstr ""
 
@@ -35993,6 +35999,9 @@ msgstr ""
 msgid "To use the additional formats, you must start the required %{container_link_start}companion containers%{container_link_end}."
 msgstr ""
 
+msgid "To use the system's default, set this value to 0."
+msgstr ""
+
 msgid "To view all %{scannedResourcesCount} scanned URLs, %{linkStart}please download the CSV file%{linkEnd}"
 msgstr ""
 
@@ -36098,10 +36107,10 @@ msgstr ""
 msgid "Too many changes to show."
 msgstr ""
 
-msgid "Too many namespaces enabled. You will need to manage them via the console or the API."
+msgid "Too many namespaces enabled. Manage them through the console or the API."
 msgstr ""
 
-msgid "Too many projects enabled. You will need to manage them via the console or the API."
+msgid "Too many projects enabled. Manage them through the console or the API."
 msgstr ""
 
 msgid "TopNav|Go back"
@@ -36355,7 +36364,7 @@ msgstr ""
 msgid "Trigger cluster reindexing"
 msgstr ""
 
-msgid "Trigger cluster reindexing. This feature should be used with an index that was created after 13.0."
+msgid "Trigger cluster reindexing. Only use this with an index that was created in GitLab 13.0 or later."
 msgstr ""
 
 msgid "Trigger manual job"
@@ -37351,9 +37360,6 @@ msgstr ""
 msgid "Used programming language"
 msgstr ""
 
-msgid "Used to calculate the number of slices during reindexing. The multiplier will be applied to the number of shards per index. Learn more about %{slice_multiplier_link_start}slice multiplier configuration%{slice_multiplier_link_end}."
-msgstr ""
-
 msgid "Used to help configure your identity provider"
 msgstr ""
 
@@ -37657,9 +37663,6 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
-msgid "Username (for password-protected Elasticsearch servers)"
-msgstr ""
-
 msgid "Username (optional)"
 msgstr ""
 
@@ -38698,6 +38701,9 @@ msgstr ""
 msgid "When merge requests and commits in the default branch close, any issues they reference also close."
 msgstr ""
 
+msgid "When paused, GitLab still tracks the changes. This is useful for cluster/index migrations."
+msgstr ""
+
 msgid "When the number of active users exceeds this number, additional users must be %{user_cap_docs_link_start}approved by an owner%{user_cap_docs_link_end}. Leave empty if you don't want to enforce approvals."
 msgstr ""