From e34e72ec12638bf834787b891ffdd5d161e3e7fa Mon Sep 17 00:00:00 2001
From: "Carrie Warner (Mattermost)"
 <74422101+cwarnermm@users.noreply.github.com>
Date: Fri, 27 Oct 2023 12:22:23 -0400
Subject: [PATCH] Revert "In-product notices can gather user feedback (#25004)"
 (#25066)

Automatic Merge
---
 .../src/components/admin_console/admin_definition.jsx         | 4 ++--
 webapp/channels/src/i18n/en.json                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/channels/src/components/admin_console/admin_definition.jsx b/webapp/channels/src/components/admin_console/admin_definition.jsx
index cb8dbea22d..a029d3b41a 100644
--- a/webapp/channels/src/components/admin_console/admin_definition.jsx
+++ b/webapp/channels/src/components/admin_console/admin_definition.jsx
@@ -3236,7 +3236,7 @@ const AdminDefinition = {
                         label: t('admin.notices.enableAdminNoticesTitle'),
                         label_default: 'Enable Admin Notices: ',
                         help_text: t('admin.notices.enableAdminNoticesDescription'),
-                        help_text_default: 'When enabled, system admins will receive in-product notices about available server upgrades, relevant administration features, external dependencies, and to gather user feedback to improve the product and user experience. <link>Learn more about notices</link> in our documentation.',
+                        help_text_default: 'When enabled, System Admins will receive notices about available server upgrades and relevant system administration features. <link>Learn more about notices</link> in our documentation.',
                         help_text_values: {
                             link: (msg) => (
                                 <ExternalLink
@@ -3256,7 +3256,7 @@ const AdminDefinition = {
                         label: t('admin.notices.enableEndUserNoticesTitle'),
                         label_default: 'Enable End User Notices: ',
                         help_text: t('admin.notices.enableEndUserNoticesDescription'),
-                        help_text_default: 'When enabled, all users will receive in-product notices about client upgrades, relevant end user features, and to gather user feedback to improve the product and user experience. <link>Learn more about notices</link> in our documentation.',
+                        help_text_default: 'When enabled, all users will receive notices about available client upgrades and relevant end user features to improve user experience. <link>Learn more about notices</link> in our documentation.',
                         help_text_values: {
                             link: (msg) => (
                                 <ExternalLink
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index dda8c69266..ae8dd10aad 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -1445,9 +1445,9 @@
   "admin.nav.menuAriaLabel": "Admin Console Menu",
   "admin.nav.switch": "Team Selection",
   "admin.nav.troubleshootingForum": "Troubleshooting Forum",
-  "admin.notices.enableAdminNoticesDescription": "When enabled, system admins will receive in-product notices about available server upgrades, relevant administration features, external dependencies, and to gather user feedback to improve the product and user experience. <link>Learn more about notices</link> in our documentation.",
+  "admin.notices.enableAdminNoticesDescription": "When enabled, System Admins will receive notices about available server upgrades and relevant system administration features. <link>Learn more about notices</link> in our documentation.",
   "admin.notices.enableAdminNoticesTitle": "Enable Admin Notices: ",
-  "admin.notices.enableEndUserNoticesDescription": "When enabled, all users will receive in-product notices about client upgrades, relevant end user features, and to gather user feedback to improve the product and user experience. <link>Learn more about notices</link> in our documentation.",
+  "admin.notices.enableEndUserNoticesDescription": "When enabled, all users will receive notices about available client upgrades and relevant end user features to improve user experience. <link>Learn more about notices</link> in our documentation.",
   "admin.notices.enableEndUserNoticesTitle": "Enable End User Notices: ",
   "admin.oauth.gitlab": "GitLab",
   "admin.oauth.google": "Google Apps",