diff options
Diffstat (limited to 'locale/gitlab.pot')
-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 "" |