From 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 4 Mar 2020 21:07:54 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- locale/gitlab.pot | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'locale') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0a63aca949d..c6738dafa23 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -68,6 +68,11 @@ msgstr "" msgid "\"%{path}\" did not exist on \"%{ref}\"" msgstr "" +msgid "%d code quality issue" +msgid_plural "%d code quality issues" +msgstr[0] "" +msgstr[1] "" + msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" @@ -4853,6 +4858,9 @@ msgstr "" msgid "Code Owners to the merge request changes." msgstr "" +msgid "Code Quality" +msgstr "" + msgid "Code Review" msgstr "" @@ -8378,6 +8386,9 @@ msgstr "" msgid "False positive" 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 "" @@ -8825,7 +8836,7 @@ msgstr "" msgid "From %{providerTitle}" msgstr "" -msgid "From %{source_title} into" +msgid "From %{source_title} into" msgstr "" msgid "From Bitbucket" @@ -23188,6 +23199,9 @@ msgstr "" msgid "ciReport|Fixed:" msgstr "" +msgid "ciReport|Found %{issuesWithCount}" +msgstr "" + msgid "ciReport|Investigate this vulnerability by creating an issue" msgstr "" @@ -23206,6 +23220,9 @@ msgstr "" msgid "ciReport|No changes to performance metrics" msgstr "" +msgid "ciReport|No code quality issues found" +msgstr "" + msgid "ciReport|Performance metrics" msgstr "" @@ -23236,6 +23253,9 @@ msgstr "" msgid "ciReport|There was an error dismissing the vulnerability. Please try again." msgstr "" +msgid "ciReport|There was an error fetching the codequality report." +msgstr "" + msgid "ciReport|There was an error reverting the dismissal. Please try again." msgstr "" -- cgit v1.2.1