Add latest changes from gitlab-org/gitlab@master

1 files changed, 42 insertions, 6 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 80ff5f27fab..9bf0700b3b1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7708,6 +7708,9 @@ msgstr ""
 msgid "Billing|An error occurred while loading billable members list."
 msgstr ""
 
+msgid "Billing|An error occurred while loading details for the Code Suggestions add-on."
+msgstr ""
+
 msgid "Billing|An error occurred while loading pending members list"
 msgstr ""
 
@@ -11332,6 +11335,12 @@ msgstr ""
 msgid "Code Review Analytics displays a table of open merge requests considered to be in code review. There are currently no merge requests in review for this project and/or filters."
 msgstr ""
 
+msgid "Code Suggestions add-on"
+msgstr ""
+
+msgid "Code Suggestions add-on status"
+msgstr ""
+
 msgid "Code block"
 msgstr ""
 
@@ -17739,6 +17748,9 @@ msgstr ""
 msgid "Enter %{weights_link_start}weights%{weights_link_end} for storages for new repositories. Configured storages appear below."
 msgstr ""
 
+msgid "Enter a URL for your custom emoji"
+msgstr ""
+
 msgid "Enter a name for your comment template"
 msgstr ""
 
@@ -34777,9 +34789,15 @@ msgstr ""
 msgid "Please enable and migrate to hashed storage to avoid security issues and ensure data integrity. %{migrate_link}"
 msgstr ""
 
+msgid "Please enter a URL for the custom emoji."
+msgstr ""
+
 msgid "Please enter a name for the comment template."
 msgstr ""
 
+msgid "Please enter a name for the custom emoji."
+msgstr ""
+
 msgid "Please enter a non-negative number"
 msgstr ""
 
@@ -37856,7 +37874,7 @@ msgstr ""
 msgid "ProtectedEnvironments|Set which groups, access levels or users that are allowed to deploy to this environment"
 msgstr ""
 
-msgid "ProtectedEnvironments|Unified approval rules have been removed from the settings UI"
+msgid "ProtectedEnvironments|To configure unified approval rules, use the %{apiLinkStart}API%{apiLinkEnd}. Consider using %{docsLinkStart}multiple approval rules%{docsLinkEnd} instead."
 msgstr ""
 
 msgid "ProtectedEnvironments|Unprotect"
@@ -37865,9 +37883,6 @@ msgstr ""
 msgid "ProtectedEnvironments|Users"
 msgstr ""
 
-msgid "ProtectedEnvironments|You can still use the %{apiLinkStart}API%{apiLinkEnd} to configure unified approval rules. Consider using %{docsLinkStart}multiple approval rules%{docsLinkEnd} instead, because they provide greater flexibility."
-msgstr ""
-
 msgid "ProtectedEnvironment|%{environment_name} will be writable for developers. Are you sure?"
 msgstr ""
 
@@ -41225,10 +41240,10 @@ msgstr ""
 msgid "ScanResultPolicy|Unknown"
 msgstr ""
 
-msgid "ScanResultPolicy|When %{scanType} %{scanners} runs against the %{branches} and find(s) %{vulnerabilitiesNumber} %{boldDescription} of the following criteria:"
+msgid "ScanResultPolicy|When %{scanType} %{scanners} runs against the %{branches} %{branchExceptions} and find(s) %{vulnerabilitiesNumber} %{boldDescription} of the following criteria:"
 msgstr ""
 
-msgid "ScanResultPolicy|When %{scanType} in an open merge request targeting %{branches} and the licenses match all of the following criteria:"
+msgid "ScanResultPolicy|When %{scanType} in an open merge request targeting %{branches} %{branchExceptions} and the licenses match all of the following criteria:"
 msgstr ""
 
 msgid "ScanResultPolicy|When %{scanners} find scanner specified conditions in an open merge request targeting the %{branches} and match %{boldDescription} of the following criteria"
@@ -41946,6 +41961,9 @@ msgstr ""
 msgid "SecurityOrchestration|Every time a pipeline runs for %{branches}"
 msgstr ""
 
+msgid "SecurityOrchestration|Exceptions"
+msgstr ""
+
 msgid "SecurityOrchestration|Failed to load cluster agents."
 msgstr ""
 
@@ -42003,6 +42021,9 @@ msgstr ""
 msgid "SecurityOrchestration|No description"
 msgstr ""
 
+msgid "SecurityOrchestration|No exceptions"
+msgstr ""
+
 msgid "SecurityOrchestration|No rules defined - policy will not run."
 msgstr ""
 
@@ -42122,6 +42143,9 @@ msgstr ""
 msgid "SecurityOrchestration|Select a project to store your security policies in. %{linkStart}More information.%{linkEnd}"
 msgstr ""
 
+msgid "SecurityOrchestration|Select exception branches"
+msgstr ""
+
 msgid "SecurityOrchestration|Select groups"
 msgstr ""
 
@@ -42314,6 +42338,12 @@ msgstr ""
 msgid "SecurityOrchestration|the default branch"
 msgstr ""
 
+msgid "SecurityOrchestration|with %{exceptionType}"
+msgstr ""
+
+msgid "SecurityOrchestration|with %{exceptionType} on %{branchSelector}"
+msgstr ""
+
 msgid "SecurityPolicies|Invalid or empty policy"
 msgstr ""
 
@@ -46519,6 +46549,9 @@ msgstr ""
 msgid "The CSV export will be created in the background. Once finished, it will be sent to %{email} in an attachment."
 msgstr ""
 
+msgid "The Code Suggestions add-on is not available."
+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 ""
 
@@ -55071,6 +55104,9 @@ msgstr[1] ""
 msgid "e.g. %{token}"
 msgstr ""
 
+msgid "eg party_tanuki"
+msgstr ""
+
 msgid "element is not a hierarchy"
 msgstr ""