Merge branch 'aa-scope-promotions' into 'master'

Translation scopes for promotion views

See merge request gitlab-org/gitlab!66821

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

@@ -8,11 +8,11 @@
       .user-callout-copy
         %h5
           - if Gitlab::CurrentSettings.should_check_namespace_plan?
-            = _('Upgrade your plan to activate Advanced Search.')
+            = s_('Promotions|Upgrade your plan to activate Advanced Search.')
           - else
-            = _('Improve search with Advanced Search and GitLab Enterprise Edition.')
+            = s_('Promotions|Improve search with Advanced Search and GitLab Enterprise Edition.')
         %p
-          = _('The Advanced Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project.')
+          = s_('Promotions|The Advanced Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project.')
           = link_to _('Read more'), help_page_path('user/search/advanced_search.md'), target: '_blank'
 
         = render 'shared/promotions/promotion_link_project', location: :advanced_search

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

@@ -4,11 +4,11 @@
   .user-callout-copy
     %h4
       - if Gitlab::CurrentSettings.should_check_namespace_plan?
-        = _('Upgrade your plan to activate Audit Events.')
+        = s_('Promotions|Upgrade your plan to activate Audit Events.')
       - else
-        = _('Track your project with Audit Events.')
+        = s_('Promotions|Track your project with Audit Events.')
     %p
-      = _('Audit Events is a way to keep track of important events that happened in GitLab.')
+      = s_('Promotions|Audit Events is a way to keep track of important events that happened in GitLab.')
       = link_to _('Read more'), help_page_path('administration/audit_events.md'), target: '_blank'
 
     = render 'shared/promotions/promotion_link_project', location: :audit_events

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

@@ -4,11 +4,11 @@
   .user-callout-copy
     %h4
       - if Gitlab::CurrentSettings.should_check_namespace_plan?
-        = _('Upgrade your plan to activate Group Webhooks.')
+        = s_('Promotions|Upgrade your plan to activate Group Webhooks.')
       - else
-        = _('Add Group Webhooks and GitLab Enterprise Edition.')
+        = s_('Promotions|Add Group Webhooks and GitLab Enterprise Edition.')
     %p
-      = _('Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group.')
+      = s_('Promotions|Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group.')
       = link_to _('Read more'), help_page_path('user/project/integrations/webhooks.md'), target: '_blank'
     .gl-mt-5
       = render 'shared/promotions/promotion_link_project', location: :group_webhooks

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

 .form-text.text-muted
   = _('Add')
-  = link_to 'description templates', '#', id: 'promotion-issue-template-link', data: { toggle: 'dropdown' }, tabindex: -1
-  = _('to help your contributors communicate effectively!')
+  = link_to s_('Promotions|description templates'), '#', id: 'promotion-issue-template-link', data: { toggle: 'dropdown' }, tabindex: -1
+  = s_('Promotions|to help your contributors communicate effectively!')
   .dropdown.promotion-issue-template
     .dropdown-menu.promotion-issue-template-message
       .dropdown-title.gl-display-flex.gl-justify-content-end
@@ -9,7 +9,7 @@
           = sprite_icon('close', size: 16, css_class: 'dropdown-menu-close-icon')
       %div
         %p
-          = _('Description templates allow you to define context-specific templates for issue and merge request description fields for your project.')
+          = s_('Promotions|Description templates allow you to define context-specific templates for issue and merge request description fields for your project.')
           = link_to _('Read more'), help_page_path('user/project/description_templates'), class: 'btn-link'
         %div
           = render 'shared/promotions/promotion_link_project', location: :issue_templates

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

@@ -6,14 +6,14 @@
       .user-callout-copy
         %h4
           - if Gitlab::CurrentSettings.should_check_namespace_plan?
-            = _('Upgrade your plan to improve merge requests.')
+            = s_('Promotions|Upgrade your plan to improve merge requests.')
           - else
-            = _('Improve merge requests and customer support with GitLab Enterprise Edition.')
+            = s_('Promotions|Improve merge requests and customer support with GitLab Enterprise Edition.')
         %ul
           - unless @project.feature_available?(:merge_request_approvers)
             %li
-              = link_to _('Merge request approvals'), help_page_path('user/project/merge_requests/merge_request_approvals.md'), target: '_blank'
+              = link_to s_('Promotions|Merge request approvals'), help_page_path('user/project/merge_requests/merge_request_approvals.md'), target: '_blank'
               %p
-                = _('Set the number of necessary approvals and define a list of approvers needed for every merge request in a project.')
+                = s_('Promotions|Set the number of necessary approvals and define a list of approvers needed for every merge request in a project.')
 
         = render 'shared/promotions/promotion_link_project', location: :mr_features

locale/gitlab.pot

@@ -1873,9 +1873,6 @@ msgstr ""
 msgid "Add GitLab to Slack"
 msgstr ""
 
-msgid "Add Group Webhooks and GitLab Enterprise Edition."
-msgstr ""
-
 msgid "Add Jaeger URL"
 msgstr ""
 
@@ -4622,9 +4619,6 @@ msgstr ""
 msgid "Audit Events"
 msgstr ""
 
-msgid "Audit Events is a way to keep track of important events that happened in GitLab."
-msgstr ""
-
 msgid "AuditLogs|(removed)"
 msgstr ""
 
@@ -11054,9 +11048,6 @@ msgstr ""
 msgid "Description template"
 msgstr ""
 
-msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project."
-msgstr ""
-
 msgid "Description:"
 msgstr ""
 
@@ -16748,12 +16739,6 @@ msgstr ""
 msgid "Improve customer support with Service Desk"
 msgstr ""
 
-msgid "Improve merge requests and customer support with GitLab Enterprise Edition."
-msgstr ""
-
-msgid "Improve search with Advanced Search and GitLab Enterprise Edition."
-msgstr ""
-
 msgid "Improves Git cloning performance."
 msgstr ""
 
@@ -26360,6 +26345,12 @@ msgstr ""
 msgid "Promotion is not supported."
 msgstr ""
 
+msgid "Promotions|Add Group Webhooks and GitLab Enterprise Edition."
+msgstr ""
+
+msgid "Promotions|Audit Events is a way to keep track of important events that happened in GitLab."
+msgstr ""
+
 msgid "Promotions|Burndown Charts are visual representations of the progress of completing a milestone. At a glance, you see the current state for the completion a given milestone. Without them, you would have to organize the data from the milestone and plot it yourself to have the same sense of progress."
 msgstr ""
 
@@ -26378,6 +26369,9 @@ msgstr ""
 msgid "Promotions|Contact your Administrator to upgrade your license."
 msgstr ""
 
+msgid "Promotions|Description templates allow you to define context-specific templates for issue and merge request description fields for your project."
+msgstr ""
+
 msgid "Promotions|Dismiss burndown charts promotion"
 msgstr ""
 
@@ -26390,39 +26384,72 @@ msgstr ""
 msgid "Promotions|Improve issues management with Issue weight and GitLab Enterprise Edition."
 msgstr ""
 
+msgid "Promotions|Improve merge requests and customer support with GitLab Enterprise Edition."
+msgstr ""
+
 msgid "Promotions|Improve milestones with Burndown Charts."
 msgstr ""
 
+msgid "Promotions|Improve search with Advanced Search and GitLab Enterprise Edition."
+msgstr ""
+
 msgid "Promotions|Learn more"
 msgstr ""
 
+msgid "Promotions|Merge request approvals"
+msgstr ""
+
 msgid "Promotions|Not now, thanks!"
 msgstr ""
 
 msgid "Promotions|See the other features in the %{subscription_link_start}Premium plan%{subscription_link_end}"
 msgstr ""
 
+msgid "Promotions|Set the number of necessary approvals and define a list of approvers needed for every merge request in a project."
+msgstr ""
+
 msgid "Promotions|Start GitLab Ultimate trial"
 msgstr ""
 
+msgid "Promotions|The Advanced Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
+msgstr ""
+
 msgid "Promotions|This feature is locked."
 msgstr ""
 
 msgid "Promotions|Track activity with Contribution Analytics."
 msgstr ""
 
+msgid "Promotions|Track your project with Audit Events."
+msgstr ""
+
 msgid "Promotions|Try it for free"
 msgstr ""
 
 msgid "Promotions|Upgrade plan"
 msgstr ""
 
+msgid "Promotions|Upgrade your plan to activate Advanced Search."
+msgstr ""
+
+msgid "Promotions|Upgrade your plan to activate Audit Events."
+msgstr ""
+
 msgid "Promotions|Upgrade your plan to activate Contribution Analytics."
 msgstr ""
 
+msgid "Promotions|Upgrade your plan to activate Group Webhooks."
+msgstr ""
+
+msgid "Promotions|Upgrade your plan to improve merge requests."
+msgstr ""
+
 msgid "Promotions|Upgrade your plan to improve milestones with Burndown Charts."
 msgstr ""
 
+msgid "Promotions|Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
+msgstr ""
+
 msgid "Promotions|Weight"
 msgstr ""
 
@@ -26435,6 +26462,12 @@ msgstr ""
 msgid "Promotions|With Contribution Analytics you can have an overview for the activity of issues, merge requests, and push events of your organization and its members."
 msgstr ""
 
+msgid "Promotions|description templates"
+msgstr ""
+
+msgid "Promotions|to help your contributors communicate effectively!"
+msgstr ""
+
 msgid "Prompt users to upload SSH keys"
 msgstr ""
 
@@ -29894,9 +29927,6 @@ msgstr ""
 msgid "Set the milestone to %{milestone_reference}."
 msgstr ""
 
-msgid "Set the number of necessary approvals and define a list of approvers needed for every merge request in a project."
-msgstr ""
-
 msgid "Set the timeout in seconds to send a secondary node status to the primary and IPs allowed for the secondary nodes."
 msgstr ""
 
@@ -32461,9 +32491,6 @@ msgstr[1] ""
 msgid "The API key used by GitLab for accessing the Spam Check service endpoint"
 msgstr ""
 
-msgid "The Advanced Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
-msgstr ""
-
 msgid "The GitLab subscription service (customers.gitlab.com) is currently experiencing an outage. You can monitor the status and get updates at %{linkStart}status.gitlab.com%{linkEnd}."
 msgstr ""
 
@@ -34537,9 +34564,6 @@ msgstr ""
 msgid "Track your GitLab projects with GitLab for Slack."
 msgstr ""
 
-msgid "Track your project with Audit Events."
-msgstr ""
-
 msgid "Transfer"
 msgstr ""
 
@@ -35244,18 +35268,6 @@ msgstr ""
 msgid "Upgrade your plan"
 msgstr ""
 
-msgid "Upgrade your plan to activate Advanced Search."
-msgstr ""
-
-msgid "Upgrade your plan to activate Audit Events."
-msgstr ""
-
-msgid "Upgrade your plan to activate Group Webhooks."
-msgstr ""
-
-msgid "Upgrade your plan to improve merge requests."
-msgstr ""
-
 msgid "Upload"
 msgstr ""
 
@@ -36736,9 +36748,6 @@ msgstr ""
 msgid "Webhooks Help"
 msgstr ""
 
-msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
-msgstr ""
-
 msgid "Webhooks|Comments"
 msgstr ""
 
@@ -39712,9 +39721,6 @@ msgstr ""
 msgid "time summary"
 msgstr ""
 
-msgid "to help your contributors communicate effectively!"
-msgstr ""
-
 msgid "to join %{source_name}"
 msgstr ""