diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 22:59:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 22:59:18 +0300 |
| commit | 15322f219a99c7056ad77400559fc72e833607e9 (patch) | |
| tree | 6f7f9fd0ce4c51d205139ccb88504b3c75c32633 /locale/gitlab.pot | |
| parent | b7d29500f28ff59c8898cdf889a40d3da908f162 (diff) | |
Add latest changes from gitlab-org/security/gitlab@12-7-stable-ee
Diffstat (limited to 'locale/gitlab.pot')
| -rw-r--r-- | locale/gitlab.pot | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index af51d4af448..5183f129a76 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7882,6 +7882,9 @@ msgstr "" msgid "Failure" msgstr "" +msgid "Fast-forward merge is not possible. Rebase the source branch onto %{targetBranch} to allow this merge request to be merged." +msgstr "" + msgid "Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged." msgstr "" @@ -8328,7 +8331,7 @@ msgstr "" msgid "From %{providerTitle}" msgstr "" -msgid "From %{source_title} into" +msgid "From <code>%{source_title}</code> into" msgstr "" msgid "From Bitbucket" |