diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 14:21:50 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-04-16 14:21:50 +0000 |
| commit | cd509d991ec43b05994af1c157ef724af7f04e8f (patch) | |
| tree | 811b8c65b6e825db3af4e8ca932683b10a74322c /locale | |
| parent | 2dbbe7348b4156dea1f5229fd3e5db43ccad8834 (diff) | |
| parent | 12170f8320c3bbe5b6bbdbda83ac7a163826b34a (diff) | |
| download | gitlab-ce-cd509d991ec43b05994af1c157ef724af7f04e8f.tar.gz | |
Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' into 'master'
Update merge request widget to accommodate post-merge pipelines
See merge request gitlab-org/gitlab-ce!25983
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 435f2408a9e..e6e161a2b27 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -10947,6 +10947,9 @@ msgstr "" msgid "mrWidget|Fast-forward merge is not possible. To merge this request, first rebase locally." msgstr "" +msgid "mrWidget|Fork merge requests do not create merge request pipelines which validate a post merge result" +msgstr "" + msgid "mrWidget|If the %{branch} branch exists in your local repository, you can merge this merge request manually using the" msgstr "" @@ -11040,6 +11043,9 @@ msgstr "" msgid "mrWidget|The source branch will not be deleted" msgstr "" +msgid "mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging" +msgstr "" + msgid "mrWidget|There are merge conflicts" msgstr "" |