Merge branch 'license-copy-changes' into 'master'

Update copy changes related to License Compliance

See merge request gitlab-org/gitlab!27970

ee/app/assets/javascripts/vue_shared/license_management/components/add_license_form.vue

@@ -60,7 +60,7 @@ export default {
   <div class="col-sm-6 js-add-license-form">
     <div class="form-group">
       <label class="label-bold" for="js-license-dropdown">
-        {{ s__('LicenseCompliance|Add licenses manually to approve or blacklist') }}
+        {{ s__('LicenseCompliance|Add license and related policy') }}
       </label>
       <add-license-form-dropdown
         id="js-license-dropdown"

ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml

@@ -11,6 +11,6 @@
     %p
       - ci = link_to(s_('Gitlab CI/CD'), 'https://docs.gitlab.com/ee/ci/', target: '_blank', rel: 'noopener noreferrer')
       - license = link_to(s_('Auto License Compliance'), 'https://docs.gitlab.com/ee/topics/autodevops/index.html#auto-license-management-ultimate', target: '_blank', rel: 'noopener noreferrer')
-      = s_('LicenseCompliance|Here you can approve or blacklist licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and approve or blacklist them in merge request.').html_safe % { ci: ci, license: license }
+      = s_('LicenseCompliance|Here you can allow or deny licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and allow or deny them in merge request.').html_safe % { ci: ci, license: license }
   .settings-content
     #js-managed-licenses{ data: { api_url: @license_management_url } }

ee/changelogs/unreleased/license-copy-changes.yml

+---
+title: Update copy for Adding Licenses
+merge_request: 27970
+author:
+type: changed

locale/gitlab.pot

@@ -11769,7 +11769,7 @@ msgstr ""
 msgid "LicenseCompliance|Add a license"
 msgstr ""
 
-msgid "LicenseCompliance|Add licenses manually to approve or blacklist"
+msgid "LicenseCompliance|Add license and related policy"
 msgstr ""
 
 msgid "LicenseCompliance|Allow"
@@ -11787,7 +11787,7 @@ msgstr ""
 msgid "LicenseCompliance|Deny"
 msgstr ""
 
-msgid "LicenseCompliance|Here you can approve or blacklist licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and approve or blacklist them in merge request."
+msgid "LicenseCompliance|Here you can allow or deny licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and allow or deny them in merge request."
 msgstr ""
 
 msgid "LicenseCompliance|License"