change text to fix issue PLT-2181

mattermost · Apr 13, 2017 · 9f8dad1 · 9f8dad1
1 parent 0b55dc1
commit 9f8dad1
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/i18n/en.json b/i18n/en.json
@@ -2521,7 +2521,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
@@ -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/team_members_dropdown.jsx b/webapp/components/team_members_dropdown.jsx
@@ -295,7 +295,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
@@ -899,7 +899,7 @@
   "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.makeInactive": "Deactivate",
   "admin.user_item.makeMember": "Make Member",
   "admin.user_item.makeSysAdmin": "Make System Admin",
   "admin.user_item.makeTeamAdmin": "Make Team Admin",
@@ -2019,7 +2019,7 @@
   "team_members_dropdown.leave_team": "Remove From Team",
   "team_members_dropdown.makeActive": "Make Active",
   "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",