diff options
| -rw-r--r-- | i18n/en.json | 2 | ||||
| -rw-r--r-- | webapp/components/admin_console/system_users/system_users_dropdown.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/audit_table.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/team_members_dropdown.jsx | 4 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 12 |
5 files changed, 13 insertions, 13 deletions
diff --git a/i18n/en.json b/i18n/en.json index 35cc10016..fa380c095 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -2525,7 +2525,7 @@ }, { "id": "api.user.login.inactive.app_error", - "translation": "Login failed because your account has been set to inactive. Please contact an administrator." + "translation": "Login failed because your account has been deactivated. Please contact an administrator." }, { "id": "api.user.login.invalid_credentials", diff --git a/webapp/components/admin_console/system_users/system_users_dropdown.jsx b/webapp/components/admin_console/system_users/system_users_dropdown.jsx index c6bf61b8f..262b42929 100644 --- a/webapp/components/admin_console/system_users/system_users_dropdown.jsx +++ b/webapp/components/admin_console/system_users/system_users_dropdown.jsx @@ -263,7 +263,7 @@ export default class SystemUsersDropdown extends React.Component { > <FormattedMessage id='admin.user_item.makeActive' - defaultMessage='Make Active' + defaultMessage='Activate' /> </a> </li> @@ -284,7 +284,7 @@ export default class SystemUsersDropdown extends React.Component { > <FormattedMessage id='admin.user_item.makeInactive' - defaultMessage='Make Inactive' + defaultMessage='Deactivate' /> </a> </li> diff --git a/webapp/components/audit_table.jsx b/webapp/components/audit_table.jsx index e04ba4d1e..5d4bc4580 100644 --- a/webapp/components/audit_table.jsx +++ b/webapp/components/audit_table.jsx @@ -110,11 +110,11 @@ const holders = defineMessages({ }, accountActive: { id: 'audit_table.accountActive', - defaultMessage: 'Account made active' + defaultMessage: 'Account activated' }, accountInactive: { id: 'audit_table.accountInactive', - defaultMessage: 'Account made inactive' + defaultMessage: 'Account deactivated' }, by: { id: 'audit_table.by', diff --git a/webapp/components/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx index 3f4180425..7c2b763c3 100644 --- a/webapp/components/team_members_dropdown.jsx +++ b/webapp/components/team_members_dropdown.jsx @@ -281,7 +281,7 @@ export default class TeamMembersDropdown extends React.Component { // > // <FormattedMessage // id='team_members_dropdown.makeActive' - // defaultMessage='Make Active' + // defaultMessage='Activate' // /> // </a> // </li> @@ -299,7 +299,7 @@ export default class TeamMembersDropdown extends React.Component { // > // <FormattedMessage // id='team_members_dropdown.makeInactive' - // defaultMessage='Make Inactive' + // defaultMessage='Deactivate' // /> // </a> // </li> diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 8086bcfef..29a46ac6b 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -896,8 +896,8 @@ "admin.user_item.confirmDemotionCmd": "platform roles system_admin {username}", "admin.user_item.emailTitle": "<strong>Email:</strong> {email}", "admin.user_item.inactive": "Inactive", - "admin.user_item.makeActive": "Make Active", - "admin.user_item.makeInactive": "Make Inactive", + "admin.user_item.makeActive": "Activate", + "admin.user_item.makeInactive": "Deactivate", "admin.user_item.makeMember": "Make Member", "admin.user_item.makeSysAdmin": "Make System Admin", "admin.user_item.makeTeamAdmin": "Make Team Admin", @@ -988,8 +988,8 @@ "app.channel.post_update_channel_purpose_message.removed": "{username} removed the channel purpose (was: {old})", "app.channel.post_update_channel_purpose_message.updated_from": "{username} updated the channel purpose from: {old} to: {new}", "app.channel.post_update_channel_purpose_message.updated_to": "{username} updated the channel purpose to: {new}", - "audit_table.accountActive": "Account made active", - "audit_table.accountInactive": "Account made inactive", + "audit_table.accountActive": "Account activated", + "audit_table.accountInactive": "Account deactivated", "audit_table.action": "Action", "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access", "audit_table.attemptedLicenseAdd": "Attempted to add new license", @@ -2025,9 +2025,9 @@ "team_members_dropdown.confirmDemotionCmd": "platform roles system_admin {username}", "team_members_dropdown.inactive": "Inactive", "team_members_dropdown.leave_team": "Remove From Team", - "team_members_dropdown.makeActive": "Make Active", + "team_members_dropdown.makeActive": "Activate", "team_members_dropdown.makeAdmin": "Make Team Admin", - "team_members_dropdown.makeInactive": "Make Inactive", + "team_members_dropdown.makeInactive": "Deactivate", "team_members_dropdown.makeMember": "Make Member", "team_members_dropdown.member": "Member", "team_members_dropdown.systemAdmin": "System Admin", |