Merge branch 'mjang-update-export-to-import' into 'master'

Update import group screen to specify *Import*

See merge request gitlab-org/gitlab!40659

app/views/groups/_import_group_pane.html.haml

@@ -41,7 +41,7 @@
       = s_('GroupsNew|To copy a GitLab group between installations, navigate to the group settings page for the original installation, generate an export file, and upload it here.')
   .row
     .form-group.col-sm-12
-      = f.label :file, s_('GroupsNew|GitLab group export'), class: 'label-bold'
+      = f.label :file, s_('GroupsNew|Import a GitLab group export file'), class: 'label-bold'
       %div
         = render 'shared/file_picker_button', f: f, field: :file, help_text: nil
 

doc/user/group/settings/import_export.md

@@ -94,7 +94,7 @@ on an existing group's page.
 
 1. On the New Group page, select the **Import group** tab.
 
-   ![Fill in group details](img/import_panel_v13_1.png)
+   ![Fill in group details](img/import_panel_v13_4.png)
 
 1. Enter your group name.
 

locale/gitlab.pot

@@ -12755,10 +12755,10 @@ msgstr ""
 msgid "GroupsNew|Create group"
 msgstr ""
 
-msgid "GroupsNew|GitLab group export"
+msgid "GroupsNew|Import"
 msgstr ""
 
-msgid "GroupsNew|Import"
+msgid "GroupsNew|Import a GitLab group export file"
 msgstr ""
 
 msgid "GroupsNew|Import group"

spec/features/groups/import_export/import_file_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe 'Import/Export - Group Import', :js do
         fill_in :group_name, with: group_name
         find('#import-group-tab').click
 
-        expect(page).to have_content 'GitLab group export'
+        expect(page).to have_content 'Import a GitLab group export file'
         attach_file(file) do
           find('.js-filepicker-button').click
         end