diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 12:09:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-05 12:09:29 +0300 |
| commit | 402c915cb58cfc658ecbdad368e89fb7b3993c1e (patch) | |
| tree | f86eb043a474ebc777cfb057011ae80b459a5a33 /locale | |
| parent | 6df4b70ba315dbb75b5f2f61398fbebb2cd20324 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 61b600d52a4..7b8ab4328ee 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -46137,6 +46137,9 @@ msgstr[1] "" msgid "mrWidget|Merge" msgstr "" +msgid "mrWidget|Merge blocked: all required approvals must be given." +msgstr "" + msgid "mrWidget|Merge blocked: all threads must be resolved." msgstr "" @@ -46155,9 +46158,6 @@ msgstr "" msgid "mrWidget|Merge blocked: pipeline must succeed. Push a commit that fixes the failure, or %{linkStart}learn about other solutions.%{linkEnd}" msgstr "" -msgid "mrWidget|Merge blocked: this merge request must be approved." -msgstr "" - msgid "mrWidget|Merge blocked: you can only merge after the above items are resolved." msgstr "" @@ -46621,6 +46621,9 @@ msgstr "" msgid "should be an array of %{object_name} objects" msgstr "" +msgid "should be an array of existing usernames. %{invalid} does not exist" +msgstr "" + msgid "should be greater than or equal to %{access} inherited membership from group %{group_name}" msgstr "" |