Merge branch '198522-rename-es-advanced-search' into 'master'

Rename Elasticsearch to Advanced Search in Admin UI

Closes #198522

See merge request gitlab-org/gitlab!42048

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

@@ -8,11 +8,11 @@
 %section.settings.as-elasticsearch.no-animate#js-elasticsearch-settings{ class: ('expanded' if expanded), data: { qa_selector: 'elasticsearch_tab' } }
   .settings-header
     %h4
-      = _('Elasticsearch')
+      = _('Advanced Search')
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
-      = _('Elasticsearch integration. Elasticsearch AWS IAM.')
+      = _('Advanced Search with Elasticsearch')
   .settings-content
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-elasticsearch-settings'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@application_setting) if expanded

ee/app/views/admin/dashboard/_elastic_and_geo.html.haml

-= feature_entry(_('Elasticsearch'),
+= feature_entry(_('Advanced Search'),
   href: general_admin_application_settings_path(anchor: 'js-elasticsearch-settings'),
   doc_href: help_page_path('integration/elasticsearch'),
   enabled: Gitlab::CurrentSettings.elasticsearch_search?)

ee/changelogs/unreleased/198522-rename-es-advanced-search.yml

+---
+title: Rename Elasticsearch to Advanced Search in Admin UI
+merge_request: 42048
+author:
+type: other

locale/gitlab.pot

@@ -2139,6 +2139,12 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
+msgid "Advanced Search"
+msgstr ""
+
+msgid "Advanced Search with Elasticsearch"
+msgstr ""
+
 msgid "Advanced Settings"
 msgstr ""
 
@@ -9273,9 +9279,6 @@ msgstr ""
 msgid "Editing"
 msgstr ""
 
-msgid "Elasticsearch"
-msgstr ""
-
 msgid "Elasticsearch AWS IAM credentials"
 msgstr ""
 
@@ -9288,9 +9291,6 @@ msgstr ""
 msgid "Elasticsearch indexing started"
 msgstr ""
 
-msgid "Elasticsearch integration. Elasticsearch AWS IAM."
-msgstr ""
-
 msgid "Elasticsearch reindexing is already in progress"
 msgstr ""