Merge branch '347468_rename_deleted_projects_tab' into 'master'

Rename "Deleted projects" tab to "Pending deletion"

See merge request gitlab-org/gitlab!76738

doc/user/admin_area/index.md

@@ -107,15 +107,16 @@ You can combine the filter options. For example, to list only public projects wi
 1. Click the **Public** tab.
 1. Enter `score` in the **Filter by name...** input box.
-#### Deleted projects **(PREMIUM SELF)**
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37014) in GitLab 13.3.
+#### Projects pending deletion **(PREMIUM SELF)**
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37014) in GitLab 13.3.
+> - [Tab renamed](https://gitlab.com/gitlab-org/gitlab/-/issues/347468) from **Deleted projects** in GitLab 14.7.
 When delayed project deletion is [enabled for a group](../group/index.md#enable-delayed-project-deletion),
 projects within that group are not deleted immediately, but only after a delay. To access a list of all projects that are pending deletion:
 1. On the top bar, select **Menu > Projects > Explore projects**.
-1. Select the **Deleted projects** tab.
+1. Select the **Pending deletion** tab (in GitLab 14.7 and later) or the **Deleted projects** tab (GitLab 14.6 and earlier).
 Listed for each project is:

ee/app/views/dashboard/_removed_projects_tab.html.haml

 - if can?(current_user, :list_removable_projects)
   = gl_tab_link_to removed_dashboard_projects_path, { data: { placement: 'right' } } do
-    = _("Deleted projects")
+    = _("Pending deletion")
     = gl_tab_counter_badge(limited_counter_with_delimiter(removed_projects_count))

ee/app/views/dashboard/projects/_removed_empty_state.html.haml

@@ -4,6 +4,7 @@
       = image_tag 'illustrations/erased-log_empty.svg'
     .text-content
       %h4.gl-text-center
-        = s_("RemovedProjects|You haven’t removed any projects.")
-      %p.gl-text-gray-500
-        = s_("RemovedProjects|Projects which are removed and are yet to be permanently removed are visible here.")
+        = s_("RemovedProjects|No projects pending deletion found")
+      %p.gl-text-center
+        = s_("RemovedProjects|Projects that are pending deletion that you have access to are listed here.")
+        = link_to s_('Learn more.'), 'https://docs.gitlab.com/ee/user/project/settings/index.html#delayed-project-deletion'

ee/app/views/dashboard/projects/removed.html.haml

-= render partial: 'dashboard/projects/shared/common', locals: { page_title: _('Deleted Projects'), empty_page: 'removed_empty_state' }
+= render partial: 'dashboard/projects/shared/common', locals: { page_title: _('Pending Deletion'), empty_page: 'removed_empty_state' }

locale/gitlab.pot

@@ -11491,15 +11491,9 @@ msgstr ""
 msgid "Deleted"
 msgstr ""
-msgid "Deleted Projects"
-msgstr ""
-
 msgid "Deleted chat nickname: %{chat_name}!"
 msgstr ""
-msgid "Deleted projects"
-msgstr ""
-
 msgid "Deleted projects cannot be restored!"
 msgstr ""
@@ -25489,9 +25483,15 @@ msgstr ""
 msgid "Pending"
 msgstr ""
+msgid "Pending Deletion"
+msgstr ""
+
 msgid "Pending comments"
 msgstr ""
+msgid "Pending deletion"
+msgstr ""
+
 msgid "Pending owner approval"
 msgstr ""
@@ -29399,10 +29399,10 @@ msgstr ""
 msgid "Removed upload with id %{id}"
 msgstr ""
-msgid "RemovedProjects|Projects which are removed and are yet to be permanently removed are visible here."
+msgid "RemovedProjects|No projects pending deletion found"
 msgstr ""
-msgid "RemovedProjects|You haven’t removed any projects."
+msgid "RemovedProjects|Projects that are pending deletion that you have access to are listed here."
 msgstr ""
 msgid "Removes %{assignee_text} %{assignee_references}."