Merge branch '345217-add-hint-about-short-expiries-on-token-to-group-import' into 'master'

Add hint about short expiries on token to group import

See merge request gitlab-org/gitlab!81323

app/views/groups/_import_group_from_another_instance_panel.html.haml

@@ -23,7 +23,8 @@
       = f.label :bulk_import_gitlab_access_token, s_('GroupsNew|Personal access token'), for: 'import_gitlab_token'
       .gl-font-weight-normal
         - pat_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('user/profile/personal_access_tokens') }
-        = s_('GroupsNew|Navigate to user settings to find your %{link_start}personal access token%{link_end}.').html_safe % { link_start: pat_link_start, link_end: '</a>'.html_safe }
+        - short_living_link_start = '<a href="%{url}" target="_blank">'.html_safe % { url: help_page_path('security/token_overview', anchor: 'security-considerations') }
+        = s_('GroupsNew|Create this in the %{pat_link_start}user settings%{pat_link_end} of the source GitLab instance. For %{short_living_link_start}security reasons%{short_living_link_end}, use a short expiration date when creating the token.').html_safe % { pat_link_start: pat_link_start, pat_link_end: '</a>'.html_safe, short_living_link_start: short_living_link_start, short_living_link_end: '</a>'.html_safe }
       = f.text_field :bulk_import_gitlab_access_token, placeholder: s_('GroupsNew|e.g. h8d3f016698e...'), class: 'gl-form-input gl-mt-3 col-xs-12 col-sm-8',
         required: true,
         autocomplete: 'off',

locale/gitlab.pot

@@ -17794,6 +17794,9 @@ msgstr ""
 msgid "GroupsNew|Create new group"
 msgstr ""
 
+msgid "GroupsNew|Create this in the %{pat_link_start}user settings%{pat_link_end} of the source GitLab instance. For %{short_living_link_start}security reasons%{short_living_link_end}, use a short expiration date when creating the token."
+msgstr ""
+
 msgid "GroupsNew|Export groups with all their related data and move to a new GitLab instance."
 msgstr ""
 
@@ -17812,9 +17815,6 @@ msgstr ""
 msgid "GroupsNew|My Awesome Group"
 msgstr ""
 
-msgid "GroupsNew|Navigate to user settings to find your %{link_start}personal access token%{link_end}."
-msgstr ""
-
 msgid "GroupsNew|No import options available"
 msgstr ""