Merge branch '340764-fix-share-text' into 'master'

Fix project group share setting wording

See merge request gitlab-org/gitlab!70636

app/helpers/groups_helper.rb

@@ -178,7 +178,7 @@ module GroupsHelper
   end
 
   def default_help
-    s_("GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually.")
+    s_("GroupSettings|This setting is applied to all subgroups unless overridden by a group owner. Groups that have already been added to the project lose access.")
   end
 
   def ancestor_locked_but_you_can_override(group)

locale/gitlab.pot

@@ -16393,10 +16393,10 @@ msgstr ""
 msgid "GroupSettings|This setting is applied on %{ancestor_group}. You can override the setting or %{remove_ancestor_share_with_group_lock}."
 msgstr ""
 
-msgid "GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually."
+msgid "GroupSettings|This setting is applied to all subgroups unless overridden by a group owner. Groups that have already been added to the project lose access."
 msgstr ""
 
-msgid "GroupSettings|This setting will be applied to all subgroups unless overridden by a group owner. Groups that already have access to the project will continue to have access unless removed manually."
+msgid "GroupSettings|This setting is only available on the top-level group and it applies to all subgroups. Groups that have already been shared with a group outside %{group} will still be shared, and this access will have to be revoked manually."
 msgstr ""
 
 msgid "GroupSettings|This setting will override user notification preferences for all members of the group, subgroups, and projects."

spec/helpers/groups_helper_spec.rb

@@ -146,7 +146,7 @@ RSpec.describe GroupsHelper do
 
       let(:possible_help_texts) do
         {
-          default_help: "This setting will be applied to all subgroups unless overridden by a group owner",
+          default_help: "This setting is applied to all subgroups unless overridden by a group owner",
           ancestor_locked_but_you_can_override: %r{This setting is applied on <a .+>.+</a>\. You can override the setting or .+},
           ancestor_locked_so_ask_the_owner: /This setting is applied on .+\. To share projects in this group with another group, ask the owner to override the setting or remove the share with group lock from .+/,
           ancestor_locked_and_has_been_overridden: /This setting is applied on .+ and has been overridden on this subgroup/