diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-12-20 21:10:50 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-12-20 21:10:50 +0000 |
commit | 62d250ff666770f9807eec2199a7b208ea8b518a (patch) | |
tree | 15034db1e7b8b9d8896ff58409280c82aaac62c8 /locale/gitlab.pot | |
parent | a39008fed3d16b081c8a694f6ea4d2a556075a71 (diff) | |
parent | 795b4a307f5e03714e022978a0a0f14a47a23eb4 (diff) | |
download | gitlab-ce-62d250ff666770f9807eec2199a7b208ea8b518a.tar.gz |
Merge branch 'winh-discussion-header-commented' into 'master'
Display "commented" only for commit discussions on merge requests
Closes #53950 and #53681
See merge request gitlab-org/gitlab-ce!23622
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 fed490309cc..c79df09229f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4126,6 +4126,9 @@ msgstr "" msgid "MergeRequests|View replaced file @ %{commitId}" msgstr "" +msgid "MergeRequests|commented on commit %{linkStart}%{commitId}%{linkEnd}" +msgstr "" + msgid "MergeRequests|started a discussion" msgstr "" |