Add latest changes from gitlab-org/gitlab@master

1 files changed, 42 insertions, 15 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d0c4d7f101a..deb688382e2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -751,6 +751,9 @@ msgstr ""
 msgid "%{integrations_link_start}Integrations%{link_end} enable you to make third-party applications part of your GitLab workflow. If the available integrations don't meet your needs, consider using a %{webhooks_link_start}webhook%{link_end}."
 msgstr ""
 
+msgid "%{issuableDisplayName} %{lockStatus}."
+msgstr ""
+
 msgid "%{issuableType} will be removed! Are you sure?"
 msgstr ""
 
@@ -8867,7 +8870,7 @@ msgstr ""
 msgid "Checkout|Name of company or organization using GitLab"
 msgstr ""
 
-msgid "Checkout|Name: %{errors}"
+msgid "Checkout|Name: %{errorMessage}"
 msgstr ""
 
 msgid "Checkout|Need more users? Purchase GitLab for your %{company}."
@@ -11774,6 +11777,9 @@ msgstr ""
 msgid "Copy %{http_label} clone URL"
 msgstr ""
 
+msgid "Copy %{issueType} email address"
+msgstr ""
+
 msgid "Copy %{name}"
 msgstr ""
 
@@ -15853,6 +15859,9 @@ msgstr ""
 msgid "Email a new %{name} to this project"
 msgstr ""
 
+msgid "Email address copied"
+msgstr ""
+
 msgid "Email address suffix"
 msgstr ""
 
@@ -21268,6 +21277,12 @@ msgstr ""
 msgid "Header message"
 msgstr ""
 
+msgid "HeaderAction|Notifications and other %{issueType} actions have moved to this menu."
+msgstr ""
+
+msgid "HeaderAction|Okay!"
+msgstr ""
+
 msgid "HeaderAction|incident"
 msgstr ""
 
@@ -23740,9 +23755,6 @@ msgstr ""
 msgid "InviteMembersBanner|We noticed that you haven't invited anyone to this group. Invite your colleagues so you can discuss issues, collaborate on merge requests, and share your knowledge."
 msgstr ""
 
-msgid "InviteMembersModal| Inviting a group %{linkStart}adds its members to your group%{linkEnd}, including members who join after the invite. This might put your group over the free %{count} user limit."
-msgstr ""
-
 msgid "InviteMembersModal| To get more members, the owner of this top-level group can %{trialLinkStart}start a trial%{trialLinkEnd} or %{upgradeLinkStart}upgrade%{upgradeLinkEnd} to a paid tier."
 msgstr ""
 
@@ -23791,6 +23803,12 @@ msgstr ""
 msgid "InviteMembersModal|Invite members"
 msgstr ""
 
+msgid "InviteMembersModal|Inviting a group %{linkStart}adds its members to your group%{linkEnd}, including members who join after the invite. This might put your group over the free %{count} user limit."
+msgstr ""
+
+msgid "InviteMembersModal|Inviting a group %{linkStart}adds its members to your project%{linkEnd}, including members who join after the invite. This might put your group over the free %{count} user limit."
+msgstr ""
+
 msgid "InviteMembersModal|Manage members"
 msgstr ""
 
@@ -26211,6 +26229,9 @@ msgstr ""
 msgid "Lock %{issuableDisplayName}"
 msgstr ""
 
+msgid "Lock %{issuableType}"
+msgstr ""
+
 msgid "Lock File?"
 msgstr ""
 
@@ -26220,9 +26241,6 @@ msgstr ""
 msgid "Lock memberships to SAML Group Links synchronization"
 msgstr ""
 
-msgid "Lock merge request"
-msgstr ""
-
 msgid "Lock not found"
 msgstr ""
 
@@ -27199,18 +27217,12 @@ msgstr ""
 msgid "Merge request events"
 msgstr ""
 
-msgid "Merge request locked."
-msgstr ""
-
 msgid "Merge request not merged"
 msgstr ""
 
 msgid "Merge request reports"
 msgstr ""
 
-msgid "Merge request unlocked."
-msgstr ""
-
 msgid "Merge request was scheduled to merge after pipeline succeeds"
 msgstr ""
 
@@ -27430,6 +27442,9 @@ msgstr ""
 msgid "MergeRequest|No files found"
 msgstr ""
 
+msgid "MergeRequest|Reviewed by @%{username} but not yet approved"
+msgstr ""
+
 msgid "MergeRequest|Search (e.g. *.vue) (%{MODIFIER_KEY}P)"
 msgstr ""
 
@@ -36212,6 +36227,9 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
+msgid "Reference copied"
+msgstr ""
+
 msgid "References"
 msgstr ""
 
@@ -46817,10 +46835,10 @@ msgstr ""
 msgid "Unlock"
 msgstr ""
 
-msgid "Unlock account"
+msgid "Unlock %{issuableType}"
 msgstr ""
 
-msgid "Unlock merge request"
+msgid "Unlock account"
 msgstr ""
 
 msgid "Unlock more features with GitLab Ultimate"
@@ -48913,6 +48931,9 @@ msgstr ""
 msgid "Vulnerability|Unmodified Response"
 msgstr ""
 
+msgid "Vulnerability|Unmodified response:"
+msgstr ""
+
 msgid "Vulnerability|View training"
 msgstr ""
 
@@ -52356,6 +52377,9 @@ msgstr ""
 msgid "loading"
 msgstr ""
 
+msgid "locked"
+msgstr ""
+
 msgid "locked by %{path_lock_user_name} %{created_at}"
 msgstr ""
 
@@ -53254,6 +53278,9 @@ msgstr ""
 msgid "unicode domains should use IDNA encoding"
 msgstr ""
 
+msgid "unlocked"
+msgstr ""
+
 msgid "updated"
 msgstr ""