Merge branch 'celdem/update-lm-paragraph' into 'master'

Update license management paragraph in ci settings

See merge request gitlab-org/gitlab-ee!14295

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

@@ -9,6 +9,8 @@
     %button.btn.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = s_('LicenseManagement|Manage approved and blacklisted licenses for this project.')
+      - ci = link_to(s_('Gitlab CI/CD'), 'https://docs.gitlab.com/ee/ci/', target: '_blank', rel: 'noopener noreferrer')
+      - license = link_to(s_('Auto License Complience'), 'https://docs.gitlab.com/ee/topics/autodevops/index.html#auto-license-management-ultimate', target: '_blank', rel: 'noopener noreferrer')
+      = s_('License Compliance|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 }
   .settings-content
     #js-managed-licenses{ data: { api_url: @license_management_url } }

ee/changelogs/unreleased/celdem-update-lm-paragraph.yml

+---
+title: Update License Management section information under CI/CD settings
+merge_request: 4295
+author:
+type: other

locale/gitlab.pot

@@ -1711,6 +1711,9 @@ msgstr ""
 msgid "Auto DevOps, runners and job artifacts"
 msgstr ""
 
+msgid "Auto License Complience"
+msgstr ""
+
 msgid "Auto-cancel redundant, pending pipelines"
 msgstr ""
 
@@ -6383,6 +6386,9 @@ msgstr ""
 msgid "Gitea Import"
 msgstr ""
 
+msgid "Gitlab CI/CD"
+msgstr ""
+
 msgid "Given access %{time_ago}"
 msgstr ""
 
@@ -7781,6 +7787,9 @@ msgstr ""
 msgid "License"
 msgstr ""
 
+msgid "License Compliance|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."
+msgstr ""
+
 msgid "LicenseManagement|Add a license"
 msgstr ""
 
@@ -7826,9 +7835,6 @@ msgstr ""
 msgid "LicenseManagement|License name"
 msgstr ""
 
-msgid "LicenseManagement|Manage approved and blacklisted licenses for this project."
-msgstr ""
-
 msgid "LicenseManagement|Packages"
 msgstr ""