diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2019-05-31 09:32:27 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2019-05-31 09:32:27 +0000 |
| commit | 290007c18f5f079c1f60d2c697e7601584e242dd (patch) | |
| tree | 7d9aff59a94e80f599ddd2d8f2814562970270c7 | |
| parent | a1c9a8aa1a09f783d88cd176537a4d5df78280f1 (diff) | |
| parent | 85798d3cd27e6ddc94914808e928f6041b7f83f1 (diff) | |
| download | gitlab-ce-290007c18f5f079c1f60d2c697e7601584e242dd.tar.gz | |
Merge branch '62148-groupDeleteConfirm' into 'master'
delete group confirm popup mention projects deletion
Closes #62148
See merge request gitlab-org/gitlab-ce!28899
| -rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 7af766c8544..a3f53ca8dd6 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -99,7 +99,7 @@ module GroupsHelper end def remove_group_message(group) - _("You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % + _("You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % { group_name: group.name } end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5980f8ff738..701df0ae2a5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11541,7 +11541,7 @@ msgstr "" msgid "You are attempting to update a file that has changed since you started editing it." msgstr "" -msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" +msgid "You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" msgstr "" msgid "You are going to remove %{project_full_name}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?" |