diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-21 13:47:03 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-07 12:17:04 +0300 |
| commit | aae6d174948a238abf05af2d3038d80b5e8750f4 (patch) | |
| tree | 4fd28fc7358cb7602ffd527e152260c90a1f4da0 /locale | |
| parent | 301315f3b3e5ffe43c3de1f7f15e4e3a307c0912 (diff) | |
Disable resolve conflicts for protected branches
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
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 d4dbe2ef1a0..e32fa57acbd 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7953,6 +7953,9 @@ msgstr[1] "" msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch" msgstr "" +msgid "mrWidget|%{link_start}Learn more about resolving conflicts%{link_end}" +msgstr "" + msgid "mrWidget|%{metricsLinkStart} Memory %{metricsLinkEnd} usage %{emphasisStart} decreased %{emphasisEnd} from %{memoryFrom}MB to %{memoryTo}MB" msgstr "" @@ -8112,6 +8115,9 @@ msgstr "" msgid "mrWidget|There are unresolved discussions. Please resolve these discussions" msgstr "" +msgid "mrWidget|This feature merges changes from the target branch to the source branch. You cannot use this feature since the source branch is protected." +msgstr "" + msgid "mrWidget|This merge request failed to be merged automatically" msgstr "" |