Add latest changes from gitlab-org/gitlab@master

app/views/projects/_project_templates.html.haml

@@ -5,11 +5,11 @@
     %li.built-in-tab
       %a.nav-link.active{ href: "#built-in", data: { toggle: 'tab'} }
         = _('Built-in')
-        %span.badge.badge-pill= Gitlab::SampleDataTemplate.all.count + Gitlab::ProjectTemplate.all.count
+        %span.badge.badge-pill= Gitlab::ProjectTemplate.all.count + Gitlab::SampleDataTemplate.all.count
 
 .tab-content
   .project-templates-buttons.import-buttons.tab-pane.active#built-in
-    = render partial: 'projects/project_templates/template', collection: Gitlab::SampleDataTemplate.all + Gitlab::ProjectTemplate.all
+    = render partial: 'projects/project_templates/template', collection: Gitlab::ProjectTemplate.all + Gitlab::SampleDataTemplate.all
 
 .project-fields-form
   = render 'projects/project_templates/project_fields_form'

changelogs/unreleased/gy-clarify-sample-data.yml

@@ -0,0 +1,5 @@
+---
+title: Update Sample GitLab Project Template to be clearer and adjust prominent placement
+merge_request: 53750
+author:
+type: changed

lib/gitlab/sample_data_template.rb

@@ -5,7 +5,7 @@ module Gitlab
     class << self
       def localized_templates_table
         [
-          SampleDataTemplate.new('sample', 'Sample GitLab Project', _('Get started with a project that follows best practices for setting up GitLab for your own organization, including sample Issues, Merge Requests, and Milestones'), 'https://gitlab.com/gitlab-org/sample-data-templates/sample-gitlab-project')
+          SampleDataTemplate.new('sample', 'Sample GitLab Project', _('An example project that shows off the best practices for setting up GitLab for your own organization, including sample issues, merge requests, and milestones'), 'https://gitlab.com/gitlab-org/sample-data-templates/sample-gitlab-project')
         ].freeze
       end
 

locale/gitlab.pot

@@ -3509,6 +3509,9 @@ msgstr ""
 msgid "An example project for managing Kubernetes clusters integrated with GitLab"
 msgstr ""
 
+msgid "An example project that shows off the best practices for setting up GitLab for your own organization, including sample issues, merge requests, and milestones"
+msgstr ""
+
 msgid "An example showing how to use Jsonnet with GitLab dynamic child pipelines"
 msgstr ""
 
@@ -13514,9 +13517,6 @@ msgstr ""
 msgid "Get started with GitLab"
 msgstr ""
 
-msgid "Get started with a project that follows best practices for setting up GitLab for your own organization, including sample Issues, Merge Requests, and Milestones"
-msgstr ""
-
 msgid "Get started with error tracking"
 msgstr ""