Add latest changes from gitlab-org/gitlab@master

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -264,8 +264,8 @@
               = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do
                 %span
                   = _('Network')
-            - if template_exists?('admin/application_settings/geo')
-              = nav_link(path: 'application_settings#geo') do
+            - if template_exists?('admin/geo/settings/show')
+              = nav_link do
                 = link_to geo_admin_application_settings_path, title: _('Geo') do
                   %span
                     = _('Geo')

locale/gitlab.pot

@@ -7764,6 +7764,9 @@ msgstr ""
 msgid "Geo Nodes"
 msgstr ""
 
+msgid "Geo Settings"
+msgstr ""
+
 msgid "Geo allows you to replicate your GitLab instance to other geographical locations."
 msgstr ""
 
@@ -8214,9 +8217,6 @@ msgstr ""
 msgid "GitLab Enterprise Edition %{plan}"
 msgstr ""
 
-msgid "GitLab Geo"
-msgstr ""
-
 msgid "GitLab Group Runners can execute code for all the projects in this group."
 msgstr ""