diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-04 10:34:35 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-04 10:34:35 +0300 |
| commit | cc4b9a377a4150265d9efc869601e9675e82ec11 (patch) | |
| tree | 1774876d9fafade9832e4558509f1a8219206853 /locale | |
| parent | 6d3ab5d8f676962fea5edd7a88b9cfb4ef45d2b5 (diff) | |
Update rendering of merge request in merge request widget
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40246
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 39e148d983a..42ba62f132f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12234,6 +12234,9 @@ msgstr "" msgid "mrWidget|Merge failed." msgstr "" +msgid "mrWidget|Merge failed: %{mergeError}. Please try again." +msgstr "" + msgid "mrWidget|Merge locally" msgstr "" |