Improve UI text in delete modal

Removes redundant text and removes the use of etc.

app/assets/javascripts/pages/admin/projects/index/components/delete_project_modal.vue

@@ -46,7 +46,7 @@ export default {
       return sprintf(
         s__(`AdminProjects|
           You’re about to permanently delete the project %{projectName}, its repository,
-          and all related resources including issues, merge requests, etc..  Once you confirm and press
+          and all related resources, including issues and merge requests. Once you confirm and press
           %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered.`),
         {
           projectName: `<strong>${escape(this.projectName)}</strong>`,

app/assets/javascripts/projects/components/project_delete_button.vue

@@ -24,9 +24,6 @@ export default {
     alertBody: __(
       'Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc.',
     ),
-    modalBody: __(
-      "This action cannot be undone. You will lose this project's repository and all related resources, including issues, merge requests, etc.",
-    ),
   },
 };
 </script>
@@ -46,7 +43,6 @@ export default {
           </template>
         </gl-sprintf>
       </gl-alert>
-      <p>{{ $options.strings.modalBody }}</p>
     </template>
   </shared-delete-button>
 </template>

app/views/projects/_remove.html.haml

@@ -3,7 +3,7 @@
 .sub-section
   %h4.danger-title= _('Delete project')
   %p
-    %strong= _('Deleting the project will delete its repository and all related resources including issues, merge requests, etc.')
+    %strong= _('Deleting the project will delete its repository and all related resources, including issues and merge requests.')
     = link_to _('Learn more.'), help_page_path('user/project/settings/index', anchor: 'removing-a-fork-relationship'), target: '_blank', rel: 'noopener noreferrer'
   %p
     %strong= _('Deleted projects cannot be restored!')

ee/app/assets/javascripts/projects/components/project_adjourned_delete_button.vue

@@ -30,7 +30,7 @@ export default {
   },
   strings: {
     modalBody: __(
-      "Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues, merge requests etc.",
+      "Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues and merge requests.",
     ),
     helpLabel: __('Recovering projects'),
     recoveryMessage: __('You can recover this project until %{date}'),

ee/app/helpers/ee/projects_helper.rb

@@ -100,13 +100,13 @@ module EE
     end
 
     def permanent_delete_message(project)
-      message = _('This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}immediately%{strongClose}, including its repositories and all related resources, including issues, merge requests, etc.')
+      message = _('This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}immediately%{strongClose}, including its repositories and all related resources, including issues and merge requests.')
       html_escape(message) % remove_message_data(project)
     end
 
     def marked_for_removal_message(project)
       date = permanent_deletion_date(Time.now.utc)
-      message = _('This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}on %{date}%{strongClose}, including its repositories and all related resources, including issues, merge requests, etc.')
+      message = _('This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}on %{date}%{strongClose}, including its repositories and all related resources, including issues and merge requests.')
       html_escape(message) % remove_message_data(project).merge(date: date)
     end
 

ee/app/views/projects/settings/_permanently_delete.html.haml

 .sub-section
   %h4.danger-title= _('Permanently delete project')
   %p
-    %strong= _('Deleting the project will delete its repository and all related resources including issues, merge requests, etc.')
+    %strong= _('Deleting the project will delete its repository and all related resources, including issues and merge requests.')
   %p= permanent_delete_message(project)
   %p
     %strong= _('Are you ABSOLUTELY SURE you wish to delete this project?')

ee/spec/frontend/projects/components/__snapshots__/project_adjourned_delete_button_spec.js.snap

@@ -43,7 +43,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
      
     <div>
       <p>
-        Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues, merge requests etc.
+        Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues and merge requests.
       </p>
        
       <p

locale/gitlab.pot

@@ -2359,7 +2359,7 @@ msgstr ""
 msgid "AdminDashboard|Error loading the statistics. Please try again"
 msgstr ""
 
-msgid "AdminProjects| You’re about to permanently delete the project %{projectName}, its repository, and all related resources including issues, merge requests, etc..  Once you confirm and press %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered."
+msgid "AdminProjects| You’re about to permanently delete the project %{projectName}, its repository, and all related resources, including issues and merge requests. Once you confirm and press %{strong_start}Delete project%{strong_end}, it cannot be undone or recovered."
 msgstr ""
 
 msgid "AdminProjects|Delete"
@@ -10656,7 +10656,7 @@ msgstr ""
 msgid "Deleting a user has the following effects:"
 msgstr ""
 
-msgid "Deleting the project will delete its repository and all related resources including issues, merge requests, etc."
+msgid "Deleting the project will delete its repository and all related resources, including issues and merge requests."
 msgstr ""
 
 msgid "Deletion pending. This project will be deleted on %{date}. Repository and other project resources are read-only."
@@ -23013,7 +23013,7 @@ msgstr ""
 msgid "Once a project is permanently deleted, it %{strongStart}cannot be recovered%{strongEnd}. Permanently deleting this project will %{strongStart}immediately delete%{strongEnd} its repositories and %{strongStart}all related resources%{strongEnd}, including issues, merge requests etc."
 msgstr ""
 
-msgid "Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues, merge requests etc."
+msgid "Once a project is permanently deleted, it cannot be recovered. You will lose this project's repository and all related resources, including issues and merge requests."
 msgstr ""
 
 msgid "Once imported, repositories can be mirrored over SSH. Read more %{link_start}here%{link_end}."
@@ -33378,16 +33378,13 @@ msgstr ""
 msgid "This action cannot be undone, and will permanently delete the %{key} SSH key"
 msgstr ""
 
-msgid "This action cannot be undone. You will lose this project's repository and all related resources, including issues, merge requests, etc."
-msgstr ""
-
 msgid "This action has been performed too many times. Try again later."
 msgstr ""
 
-msgid "This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}immediately%{strongClose}, including its repositories and all related resources, including issues, merge requests, etc."
+msgid "This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}immediately%{strongClose}, including its repositories and all related resources, including issues and merge requests."
 msgstr ""
 
-msgid "This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}on %{date}%{strongClose}, including its repositories and all related resources, including issues, merge requests, etc."
+msgid "This action will %{strongOpen}permanently delete%{strongClose} %{codeOpen}%{project}%{codeClose} %{strongOpen}on %{date}%{strongClose}, including its repositories and all related resources, including issues and merge requests."
 msgstr ""
 
 msgid "This also resolves all related threads"

spec/frontend/projects/components/__snapshots__/project_delete_button_spec.js.snap

@@ -57,10 +57,6 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
         />
       </gl-alert-stub>
        
-      <p>
-        This action cannot be undone. You will lose this project's repository and all related resources, including issues, merge requests, etc.
-      </p>
-       
       <p
         class="gl-mb-1"
       >