diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 21:14:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 21:14:31 +0300 |
| commit | 844eb8879aa445d8a5ee0f2ba3ee1ccf18319ef1 (patch) | |
| tree | 051c632f870cbffd93efccda0711b3ae3a5885df /locale | |
| parent | b8d516a6876de74b68a800c5b69af9448b0de140 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index dd1994954a7..834556a2003 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41549,6 +41549,9 @@ msgstr "" msgid "mrWidget|Merge blocked: fast-forward merge is not possible. To merge this request, first rebase locally." msgstr "" +msgid "mrWidget|Merge blocked: merge conflicts must be resolved." +msgstr "" + msgid "mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue." msgstr "" @@ -41627,9 +41630,6 @@ msgstr "" msgid "mrWidget|Resolve conflicts" msgstr "" -msgid "mrWidget|Resolve these conflicts or ask someone with write access to this repository to merge it locally" -msgstr "" - msgid "mrWidget|Revert" msgstr "" @@ -41675,9 +41675,6 @@ msgstr "" msgid "mrWidget|The source branch is being deleted" msgstr "" -msgid "mrWidget|There are merge conflicts" -msgstr "" - msgid "mrWidget|This merge request failed to be merged automatically" msgstr "" @@ -41690,6 +41687,9 @@ msgstr "" msgid "mrWidget|To merge, a Jira issue key must be mentioned in the title or description." msgstr "" +msgid "mrWidget|Users who can write to the source or target branches can resolve the conflicts." +msgstr "" + msgid "mrWidget|What is a merge train?" msgstr "" |