Merge branch '330160-aqualls-project-templates' into 'master'

Revise group-templates UI text for style

See merge request gitlab-org/gitlab!62622

ee/app/views/admin/application_settings/_custom_templates_form.html.haml

@@ -6,7 +6,7 @@
       %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
         = expanded ? _('Collapse') : _('Expand')
       %p
-        = _('Select the custom project template source group.')
+        = _('Select a subgroup to use as a template when creating new projects in the group.')
     .settings-content
 
       = form_for @application_setting, url: templates_admin_application_settings_path(anchor: 'js-custom-project-templates-settings') do |f|
@@ -14,6 +14,12 @@
 
         %fieldset
           .form-group
+
+            = f.label :file_template_project_id, class: 'label-bold' do
+              .form-text
+                = _('Search for a group')
             = groups_select_tag('application_setting[custom_project_templates_group_id]', selected: @application_setting.custom_project_templates_group_id, class: 'input-clamp allowClear qa-custom-project-template-select', multiple: false)
+            - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('user/group/custom_project_templates') }
+            = s_("GroupTemplate|The selected group's repositories and databases are copied into the projects created in this group. %{link_start}What should I add to my template group?%{link_end} ").html_safe % { link_start: link_start, link_end: "</a>".html_safe }
 
         = f.submit _('Save changes'), class: "gl-button btn btn-confirm qa-save-changes-button"

locale/gitlab.pot

@@ -16129,6 +16129,9 @@ msgstr ""
 msgid "GroupSettings|remove the share with group lock from %{ancestor_group_name}"
 msgstr ""
 
+msgid "GroupTemplate|The selected group's repositories and databases are copied into the projects created in this group. %{link_start}What should I add to my template group?%{link_end} "
+msgstr ""
+
 msgid "Groups"
 msgstr ""
 
@@ -29384,6 +29387,9 @@ msgstr ""
 msgid "Select a shared template repository for all projects on this instance."
 msgstr ""
 
+msgid "Select a subgroup to use as a template when creating new projects in the group."
+msgstr ""
+
 msgid "Select a template repository"
 msgstr ""
 
@@ -29486,9 +29492,6 @@ msgstr ""
 msgid "Select target branch"
 msgstr ""
 
-msgid "Select the custom project template source group."
-msgstr ""
-
 msgid "Select timezone"
 msgstr ""