diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 13:48:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 13:48:45 +0000 |
| commit | 280aa61eec7efa0b60501546b6e1efedf0b9dc85 (patch) | |
| tree | b7e7ec000f237ac8a07dadaa9d1d3202545be1c1 /locale | |
| parent | b3907962ae1ab8801dab1be2241d659c036e55ed (diff) | |
| parent | cc4b9a377a4150265d9efc869601e9675e82ec11 (diff) | |
| download | gitlab-ce-280aa61eec7efa0b60501546b6e1efedf0b9dc85.tar.gz | |
Merge branch 'mr-widget-merge-error' into 'master'
Update rendering of merge request in merge request widget
Closes #40246
See merge request gitlab-org/gitlab-ce!28238
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index bb7309148e5..294c938d87d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12258,6 +12258,9 @@ msgstr "" msgid "mrWidget|Merge failed." msgstr "" +msgid "mrWidget|Merge failed: %{mergeError}. Please try again." +msgstr "" + msgid "mrWidget|Merge locally" msgstr "" |