Merge branch 'fix16' into 'master'

Fix strings with double "PrometheusService|PrometheusService|"

See merge request gitlab-org/gitlab!69391

app/models/integrations/prometheus.rb

@@ -76,7 +76,7 @@ module Integrations
           name: 'google_iap_audience_client_id',
           title: 'Google IAP Audience Client ID',
           placeholder: s_('PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'),
-          help: s_('PrometheusService|PrometheusService|The ID of the IAP-secured resource.'),
+          help: s_('PrometheusService|The ID of the IAP-secured resource.'),
           autocomplete: 'off',
           required: false
         },

locale/gitlab.pot

@@ -26900,10 +26900,10 @@ msgstr ""
 msgid "PrometheusService|Prometheus cluster integration"
 msgstr ""
 
-msgid "PrometheusService|PrometheusService|The ID of the IAP-secured resource."
+msgid "PrometheusService|Select this checkbox to override the auto configuration settings with your own settings."
 msgstr ""
 
-msgid "PrometheusService|Select this checkbox to override the auto configuration settings with your own settings."
+msgid "PrometheusService|The ID of the IAP-secured resource."
 msgstr ""
 
 msgid "PrometheusService|The Prometheus API base URL."

spec/models/integrations/prometheus_spec.rb

@@ -516,7 +516,7 @@ RSpec.describe Integrations::Prometheus, :use_clean_rails_memory_store_caching,
           name: 'google_iap_audience_client_id',
           title: 'Google IAP Audience Client ID',
           placeholder: s_('PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'),
-          help: s_('PrometheusService|PrometheusService|The ID of the IAP-secured resource.'),
+          help: s_('PrometheusService|The ID of the IAP-secured resource.'),
           autocomplete: 'off',
           required: false
         },