From e371b4ebc462e9dd24402bd0ee6f0e2e19b026a8 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 13 Mar 2019 15:44:17 +0000 Subject: Merge branch '48324-enable-squash-message-on-fast-forward' into 'master' Allow modifying squash commit message for fast-forward only merge method Closes #48324, #58805, and #58631 See merge request gitlab-org/gitlab-ce!26017 --- locale/gitlab.pot | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'locale') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 1928418dbd5..701c2bdb918 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4878,6 +4878,9 @@ msgstr "" msgid "Modal|Close" msgstr "" +msgid "Modify commit message" +msgstr "" + msgid "Modify commit messages" msgstr "" @@ -9029,6 +9032,9 @@ msgstr "" msgid "mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}." msgstr "" +msgid "mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}." +msgstr "" + msgid "mrWidgetCommitsAdded|1 merge commit" msgstr "" -- cgit v1.2.3