Merge branch '6415_outdated_wording_for_container_scanning_popover' into 'master'

Update outdated wording for Container Scanning

Closes #6415

See merge request gitlab-org/gitlab-ee!6116

ee/app/assets/javascripts/vue_shared/security_reports/mixins/security_report_mixin.js

@@ -19,7 +19,7 @@ export default {
       return {
         title: s__('ciReport|Container scanning detects known vulnerabilities in your docker images.'),
         content: sprintf(
-          s__('ciReport|%{linkStartTag}Learn more about SAST image %{linkEndTag}'),
+          s__('ciReport|%{linkStartTag}Learn more about Container Scanning %{linkEndTag}'),
           {
             linkStartTag: `<a href="${this.sastContainerHelpPath}">`,
             linkEndTag: '</a>',

locale/gitlab.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-12 18:57+1000\n"
-"PO-Revision-Date: 2018-06-12 18:57+1000\n"
+"POT-Creation-Date: 2018-06-13 10:31-0400\n"
+"PO-Revision-Date: 2018-06-13 10:31-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -1928,9 +1928,6 @@ msgstr ""
 msgid "Creating epic"
 msgstr ""
 
-msgid "Created by me"
-msgstr ""
-
 msgid "Cron Timezone"
 msgstr ""
 
@@ -2137,9 +2134,6 @@ msgstr ""
 msgid "Descending"
 msgstr ""
 
-msgid "Deprioritize label"
-msgstr ""
-
 msgid "Description"
 msgstr ""
 
@@ -2817,10 +2811,10 @@ msgstr ""
 msgid "Gitaly"
 msgstr ""
 
-msgid "Gitaly|Address"
+msgid "Gitaly Servers"
 msgstr ""
 
-msgid "Gitaly Servers"
+msgid "Gitaly|Address"
 msgstr ""
 
 msgid "Go Back"
@@ -3800,9 +3794,6 @@ msgstr ""
 msgid "Other information"
 msgstr ""
 
-msgid "Other Labels"
-msgstr ""
-
 msgid "Otherwise it is recommended you start with one of the options below."
 msgstr ""
 
@@ -5138,9 +5129,6 @@ msgstr ""
 msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
 msgstr ""
 
-msgid "Terms of Service and Privacy Policy"
-msgstr ""
-
 msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project"
 msgstr ""
 
@@ -6030,9 +6018,6 @@ msgstr ""
 msgid "You do not have the correct permissions to override the settings from the LDAP group sync."
 msgstr ""
 
-msgid "You do not have any assigned merge requests"
-msgstr ""
-
 msgid "You have no permissions"
 msgstr ""
 
@@ -6140,6 +6125,9 @@ msgstr ""
 msgid "by"
 msgstr ""
 
+msgid "ciReport|%{linkStartTag}Learn more about Container Scanning %{linkEndTag}"
+msgstr ""
+
 msgid "ciReport|%{linkStartTag}Learn more about DAST %{linkEndTag}"
 msgstr ""
 
@@ -6149,9 +6137,6 @@ msgstr ""
 msgid "ciReport|%{linkStartTag}Learn more about SAST %{linkEndTag}"
 msgstr ""
 
-msgid "ciReport|%{linkStartTag}Learn more about SAST image %{linkEndTag}"
-msgstr ""
-
 msgid "ciReport|%{namespace} is affected by %{vulnerability}."
 msgstr ""
 
@@ -6188,6 +6173,9 @@ msgstr ""
 msgid "ciReport|Confidence"
 msgstr ""
 
+msgid "ciReport|Container scanning detected"
+msgstr ""
+
 msgid "ciReport|Container scanning detects known vulnerabilities in your docker images."
 msgstr ""
 
@@ -6197,6 +6185,9 @@ msgstr ""
 msgid "ciReport|Container scanning resulted in error while loading results"
 msgstr ""
 
+msgid "ciReport|DAST detected"
+msgstr ""
+
 msgid "ciReport|DAST is loading"
 msgstr ""
 
@@ -6311,9 +6302,15 @@ msgstr ""
 msgid "ciReport|There was an error dismissing the vulnerability. Please try again."
 msgstr ""
 
+msgid "ciReport|There was an error loading DAST report"
+msgstr ""
+
 msgid "ciReport|There was an error loading SAST report"
 msgstr ""
 
+msgid "ciReport|There was an error loading container scanning report"
+msgstr ""
+
 msgid "ciReport|There was an error loading dependency scanning report"
 msgstr ""