From 54526d686b8bc4802dbedb3b7753393f68295a05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Br=C3=BCckmann?= <64bit@posteo.de> Date: Fri, 14 Feb 2020 19:28:57 +0100 Subject: [PATCH 1/4] State the fact that also archived projects are deleted when a group is removed --- app/views/groups/settings/_permanent_deletion.html.haml | 2 +- locale/gitlab.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml index 31e2bac70be6dc..99208dbbae8f49 100644 --- a/app/views/groups/settings/_permanent_deletion.html.haml +++ b/app/views/groups/settings/_permanent_deletion.html.haml @@ -2,7 +2,7 @@ %h4.danger-title= _('Remove group') = form_tag(group, method: :delete) do %p - = _('Removing group will cause all child projects and resources to be removed.') + = _('Removing group will also remove all child projects, including archived projects, and their resources.') %br %strong= _('Removed group can not be restored!') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 074c74e41cbb93..f09587bba192c0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15974,7 +15974,7 @@ msgstr "" msgid "Removing a project places it into a read-only state until %{date}, at which point the project will be permanently removed." msgstr "" -msgid "Removing group will cause all child projects and resources to be removed." +msgid "Removing group will also remove all child projects, including archived projects, and their resources." msgstr "" msgid "Removing license…" -- GitLab From e2335811f4e36e01dd183f57229799c3d4354d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Br=C3=BCckmann?= <64bit@posteo.de> Date: Sat, 15 Feb 2020 16:33:20 +0100 Subject: [PATCH 2/4] add a 'this' to the string as it is a specific group --- app/views/groups/settings/_permanent_deletion.html.haml | 2 +- locale/gitlab.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml index 99208dbbae8f49..397cd0f99f2e49 100644 --- a/app/views/groups/settings/_permanent_deletion.html.haml +++ b/app/views/groups/settings/_permanent_deletion.html.haml @@ -2,7 +2,7 @@ %h4.danger-title= _('Remove group') = form_tag(group, method: :delete) do %p - = _('Removing group will also remove all child projects, including archived projects, and their resources.') + = _('Removing this group will also remove all child projects, including archived projects, and their resources.') %br %strong= _('Removed group can not be restored!') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f09587bba192c0..58a44cf273e619 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15974,7 +15974,7 @@ msgstr "" msgid "Removing a project places it into a read-only state until %{date}, at which point the project will be permanently removed." msgstr "" -msgid "Removing group will also remove all child projects, including archived projects, and their resources." +msgid "Removing this group will also remove all child projects, including archived projects, and their resources." msgstr "" msgid "Removing license…" -- GitLab From eacacea3ea16482d070e3357ce553491dba5d85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Br=C3=BCckmann?= <64bit@posteo.de> Date: Sun, 16 Feb 2020 15:27:35 +0100 Subject: [PATCH 3/4] update locale/gitlab.pot --- locale/gitlab.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 58a44cf273e619..f400674b0e11d0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15974,15 +15974,15 @@ msgstr "" msgid "Removing a project places it into a read-only state until %{date}, at which point the project will be permanently removed." msgstr "" -msgid "Removing this group will also remove all child projects, including archived projects, and their resources." -msgstr "" - msgid "Removing license…" msgstr "" msgid "Removing the project will delete its repository and all related resources including issues, merge requests etc." msgstr "" +msgid "Removing this group will also remove all child projects, including archived projects, and their resources." +msgstr "" + msgid "Rename file" msgstr "" -- GitLab From 9977548747deb49b164d3ce3bb75d9e88e5a5a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benedikt=20Br=C3=BCckmann?= <64bit@posteo.de> Date: Wed, 19 Feb 2020 06:35:07 +0000 Subject: [PATCH 4/4] Apply minor change --- app/views/groups/settings/_permanent_deletion.html.haml | 2 +- locale/gitlab.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/groups/settings/_permanent_deletion.html.haml b/app/views/groups/settings/_permanent_deletion.html.haml index 397cd0f99f2e49..155efc03ffe279 100644 --- a/app/views/groups/settings/_permanent_deletion.html.haml +++ b/app/views/groups/settings/_permanent_deletion.html.haml @@ -2,7 +2,7 @@ %h4.danger-title= _('Remove group') = form_tag(group, method: :delete) do %p - = _('Removing this group will also remove all child projects, including archived projects, and their resources.') + = _('Removing this group also removes all child projects, including archived projects, and their resources.') %br %strong= _('Removed group can not be restored!') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f400674b0e11d0..7a3751e61c7bb9 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -15980,7 +15980,7 @@ msgstr "" msgid "Removing the project will delete its repository and all related resources including issues, merge requests etc." msgstr "" -msgid "Removing this group will also remove all child projects, including archived projects, and their resources." +msgid "Removing this group also removes all child projects, including archived projects, and their resources." msgstr "" msgid "Rename file" -- GitLab