Merge d33001c into 00d11e9

mattermost · Feb 18, 2017 · dd9ff03 · dd9ff03
2 parents 00d11e9 + d33001c
commit dd9ff03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/webapp/components/admin_console/privacy_settings.jsx b/webapp/components/admin_console/privacy_settings.jsx
@@ -56,7 +56,7 @@ export default class PrivacySettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.privacy.showEmailDescription'
-                            defaultMessage='When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.'
+                            defaultMessage='When false, hides the email address of members from everyone except System Administrators.'
                         />
                     }
                     value={this.state.showEmailAddress}
@@ -73,7 +73,7 @@ export default class PrivacySettings extends AdminSettings {
                     helpText={
                         <FormattedMessage
                             id='admin.privacy.showFullNameDescription'
-                            defaultMessage='When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.'
+                            defaultMessage='When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.'
                         />
                     }
                     value={this.state.showFullName}

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
@@ -565,9 +565,9 @@
   "admin.password.requirementsDescription": "Character types required in a valid password.",
   "admin.password.symbol": "At least one symbol (e.g. \"~!@#$%^&*()\")",
   "admin.password.uppercase": "At least one uppercase letter",
-  "admin.privacy.showEmailDescription": "When false, hides email address of users from other users in the user interface, including team owners and Team Administrators. Used when system is set up for managing teams where some users choose to keep their contact information private.",
+  "admin.privacy.showEmailDescription": "When false, hides the email address of members from everyone except System Administrators.",
   "admin.privacy.showEmailTitle": "Show Email Address: ",
-  "admin.privacy.showFullNameDescription": "When false, hides full name of users from other users, including team owners and Team Administrators. Username is shown in place of full name.",
+  "admin.privacy.showFullNameDescription": "When false, hides the full name of members from everyone except System Administrators. Username is shown in place of full name.",
   "admin.privacy.showFullNameTitle": "Show Full Name: ",
   "admin.purge.button": "Purge All Caches",
   "admin.purge.loading": " Loading...",