Merge branch 'Externalize-strings-in-_usage.html.haml' into 'master'

Externalise strings in application_settings/_usage.html.haml

See merge request gitlab-org/gitlab!58088

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

@@ -8,11 +8,10 @@
       .form-check
         = f.check_box :version_check_enabled, class: 'form-check-input'
         = f.label :version_check_enabled, class: 'form-check-label' do
-          Enable version check
+          = _("Enable version check")
         .form-text.text-muted
-          GitLab will inform you if a new version is available.
-          = link_to 'Learn more', help_page_path('user/admin_area/settings/usage_statistics', anchor: 'version-check')
-          about what information is shared with GitLab Inc.
+          = _("GitLab will inform you if a new version is available.")
+          = _("%{link_start}Learn more%{link_end} about what information is shared with GitLab Inc.").html_safe % { link_start: "<a href='#{help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")}'>".html_safe, link_end: '</a>'.html_safe }
     .form-group
       - can_be_configured = @application_setting.usage_ping_can_be_configured?
       .form-check
@@ -37,4 +36,4 @@
             - deactivating_usage_ping_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: deactivating_usage_ping_path }
             = s_('For more information, see the documentation on %{deactivating_usage_ping_link_start}deactivating the usage ping%{deactivating_usage_ping_link_end}.').html_safe % { deactivating_usage_ping_link_start: deactivating_usage_ping_link_start, deactivating_usage_ping_link_end: '</a>'.html_safe }
 
-  = f.submit 'Save changes', class: "gl-button btn btn-confirm"
+  = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

changelogs/unreleased/Externalize-strings-in-_usage-html-haml.yml

+---
+title: Eternalize strings in application_settings/_usage.html.haml
+merge_request: 58088
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -12173,6 +12173,9 @@ msgstr ""
 msgid "Enable usage ping"
 msgstr ""
 
+msgid "Enable version check"
+msgstr ""
+
 msgid "EnableReviewApp|%{stepStart}Step 1%{stepEnd}. Ensure you have Kubernetes set up and have a base domain for your %{linkStart}cluster%{linkEnd}."
 msgstr ""
 
@@ -14947,6 +14950,9 @@ msgstr ""
 msgid "GitLab version"
 msgstr ""
 
+msgid "GitLab will inform you if a new version is available."
+msgstr ""
+
 msgid "GitLab will periodically run %{link_to_git_fsck} in all project and wiki repositories to look for silent disk corruption issues."
 msgstr ""