Merge branch '55466-make-translatable-strings-scoped' into 'master'

Improve issue weight promotion translations

Closes #55466

See merge request gitlab-org/gitlab!31178

ee/app/views/shared/promotions/_promote_issue_weights.html.haml

@@ -7,7 +7,7 @@
         = icon('balance-scale')
         %span No
     .title.hide-collapsed
-      = _('Weight')
+      = s_('Promotions|Weight')
     .hide-collapsed.js-toggle-container.promotion-issue-weight-sidebar-message
       = s_('Promotions|This feature is locked.')
       %a.btn-link.js-toggle-button.js-weight-sidebar-callout{ href: '#' }
@@ -27,7 +27,7 @@
               - subscription_link_start = '<a href="%{url}" target="_blank" class="btn-link">'.html_safe % { url: subscription_link_url }
               = s_("Promotions|See the other features in the %{subscription_link_start}bronze plan%{subscription_link_end}").html_safe % { subscription_link_start: subscription_link_start, subscription_link_end: '</a>'.html_safe }
             - else
-              = _('Improve issues management with Issue weight and GitLab Enterprise Edition.')
+              = s_('Promotions|Improve issues management with Issue weight and GitLab Enterprise Edition.')
           %div
             = render 'shared/promotions/promotion_link_project', short_form: true, target_blank: true
             = link_to s_("Promotions|Don't show me this again"), '#', class: ['btn', 'js-close', 'js-close-callout', 'gl-mt-3']

ee/app/views/shared/promotions/_promotion_link_project.html.haml

@@ -4,17 +4,17 @@
   - namespace = @project&.namespace || @group
   - if can?(current_user, :admin_namespace, namespace)
     - current_group = @project&.group || @group
-    = link_to _('Upgrade your plan'), upgrade_plan_path(current_group), class: 'btn btn-primary', target: target_blank ? '_blank' : '_self'
+    = link_to s_('Promotions|Upgrade your plan'), upgrade_plan_path(current_group), class: 'btn btn-primary', target: target_blank ? '_blank' : '_self'
   - elsif namespace.is_a?(Group)
-    %p= _('Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name }
+    %p= s_('Promotions|Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name }
   - else
     - owner = namespace.owner
     - link_start = "<a href='#{user_path(owner)}' rel='noowner noreferrer' target='_blank'>".html_safe
-    %p= _('Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan.').html_safe % { owner_name: owner.name, link_start: link_start, link_end: '</a>'.html_safe }
+    %p= s_('Promotions|Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan.').html_safe % { owner_name: owner.name, link_start: link_start, link_end: '</a>'.html_safe }
 - elsif current_user&.admin?
   - if License.current&.expired?
-    = link_to (!short_form ? _('Buy GitLab Enterprise Edition') : _('Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'
+    = link_to (!short_form ? s_('Promotions|Buy GitLab Enterprise Edition') : s_('Promotions|Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary'
   - else
-    = link_to _('Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary'
+    = link_to s_('Promotions|Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary'
 - else
-  %p= _('Contact your Administrator to upgrade your license.')
+  %p= s_('Promotions|Contact your Administrator to upgrade your license.')

locale/gitlab.pot

@@ -3410,12 +3410,6 @@ msgstr ""
 msgid "Business metrics (Custom)"
 msgstr ""
 
-msgid "Buy EE"
-msgstr ""
-
-msgid "Buy GitLab Enterprise Edition"
-msgstr ""
-
 msgid "Buy more Pipeline minutes"
 msgstr ""
 
@@ -5593,18 +5587,9 @@ msgstr ""
 msgid "Connection timed out"
 msgstr ""
 
-msgid "Contact an owner of group %{namespace_name} to upgrade the plan."
-msgstr ""
-
-msgid "Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan."
-msgstr ""
-
 msgid "Contact sales to upgrade"
 msgstr ""
 
-msgid "Contact your Administrator to upgrade your license."
-msgstr ""
-
 msgid "Container Registry"
 msgstr ""
 
@@ -11306,9 +11291,6 @@ msgstr ""
 msgid "Improve Merge Requests and customer support with GitLab Enterprise Edition."
 msgstr ""
 
-msgid "Improve issues management with Issue weight and GitLab Enterprise Edition."
-msgstr ""
-
 msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
 msgstr ""
 
@@ -16671,24 +16653,51 @@ msgstr ""
 msgid "Promoted issue to an epic."
 msgstr ""
 
+msgid "Promotions|Buy EE"
+msgstr ""
+
+msgid "Promotions|Buy GitLab Enterprise Edition"
+msgstr ""
+
+msgid "Promotions|Contact an owner of group %{namespace_name} to upgrade the plan."
+msgstr ""
+
+msgid "Promotions|Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan."
+msgstr ""
+
+msgid "Promotions|Contact your Administrator to upgrade your license."
+msgstr ""
+
 msgid "Promotions|Don't show me this again"
 msgstr ""
 
 msgid "Promotions|Epics let you manage your portfolio of projects more efficiently and with less effort by tracking groups of issues that share a theme, across projects and milestones."
 msgstr ""
 
+msgid "Promotions|Improve issues management with Issue weight and GitLab Enterprise Edition."
+msgstr ""
+
 msgid "Promotions|Learn more"
 msgstr ""
 
 msgid "Promotions|See the other features in the %{subscription_link_start}bronze plan%{subscription_link_end}"
 msgstr ""
 
+msgid "Promotions|Start GitLab Ultimate trial"
+msgstr ""
+
 msgid "Promotions|This feature is locked."
 msgstr ""
 
 msgid "Promotions|Upgrade plan"
 msgstr ""
 
+msgid "Promotions|Upgrade your plan"
+msgstr ""
+
+msgid "Promotions|Weight"
+msgstr ""
+
 msgid "Promotions|Weighting your issue"
 msgstr ""
 
@@ -19774,9 +19783,6 @@ msgstr ""
 msgid "Stars"
 msgstr ""
 
-msgid "Start GitLab Ultimate trial"
-msgstr ""
-
 msgid "Start Web Terminal"
 msgstr ""
 
@@ -22643,9 +22649,6 @@ msgstr ""
 msgid "Upgrade plan to unlock Canary Deployments feature"
 msgstr ""
 
-msgid "Upgrade your plan"
-msgstr ""
-
 msgid "Upgrade your plan to activate Advanced Global Search."
 msgstr ""