diff options
| author | Phil Hughes <me@iamphill.com> | 2019-03-13 18:44:17 +0300 |
|---|---|---|
| committer | John T Skarbek <jtslear@gmail.com> | 2019-03-14 16:19:40 +0300 |
| commit | e371b4ebc462e9dd24402bd0ee6f0e2e19b026a8 (patch) | |
| tree | 24d4328aa5815abb9a1f9d3f3a24a4c0c111c0d8 /locale | |
| parent | 17426abf3196d4a298c9f789c07034b70903c08f (diff) | |
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
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 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 "" |