From 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 15 Jun 2017 11:05:43 -0400
Subject: Merge release-3.10 into master (#6654)

* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)

* Fix quick switcher for channels/users not stored locally (#6610)

* Fix button text on confirm mention modal (#6609)

* fix post delete permission of channel admin (#6608)

* open comment thread for the most recent reply-able message (#6605)

* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)

* Use mutex flag with yarn to prevent concurrent builds interfering

* Remove yarn mutex file with clean

* Minor bug fixes (#6615)

* PLT-6774 - Fixing color for offline icon

* PLT-6784 - Fixing status icon

* Fixing icon margin

* Updating caret position

* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)

* Fixing JS error (#6623)

* Minor bug fixes (#6622)

* PLT-6808 - Updating channel switcher on mobile

* PLT-6743 - Updating scrollbar styling

* Login instead of failing if user exists in OAuth sign-up flow (#6627)

* PLT-6802 Disable team switcher (#6626)

* Disable team switcher

* Fix ESLint errors

* PLT-6807 Ensured select teams page can scroll on iOS (#6630)

* Do not redirect from account switch pages on 401 (#6631)

* Fixing loadtest command and renaming to /test (#6624)

* PLT-6820 Update mattermost-redux dependency (#6632)

* translations PR 20170612 (#6629)

* Bump HTTP client timeout to 30 seconds (#6633)

* For team unreads return empty array instead of null (#6636)

* PLT-6831 Fix status modal localization IDs (#6637)

* Fix status modal localization IDs

* Update test snapshot
---
 webapp/components/reset_status_modal/reset_status_modal.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'webapp/components/reset_status_modal/reset_status_modal.jsx')

diff --git a/webapp/components/reset_status_modal/reset_status_modal.jsx b/webapp/components/reset_status_modal/reset_status_modal.jsx
index 4a04d7561..2e9bb8382 100644
--- a/webapp/components/reset_status_modal/reset_status_modal.jsx
+++ b/webapp/components/reset_status_modal/reset_status_modal.jsx
@@ -86,7 +86,7 @@ export default class ResetStatusModal extends React.PureComponent {
         const userStatus = toTitleCase(this.state.currentUserStatus.status || '');
         const manualStatusTitle = (
             <FormattedMessage
-                id='modal.manual_status.title'
+                id='modal.manaul_status.title'
                 defaultMessage='Your status is set to "{status}"'
                 values={{
                     status: userStatus
@@ -96,21 +96,21 @@ export default class ResetStatusModal extends React.PureComponent {
 
         const manualStatusMessage = (
             <FormattedMessage
-                id='modal.manual_status.message'
+                id='modal.manaul_status.message'
                 defaultMessage='Would you like to switch your status to "Online"?'
             />
         );
 
         const manualStatusButton = (
             <FormattedMessage
-                id='modal.manual_status.button'
+                id='modal.manaul_status.button'
                 defaultMessage='Yes, set my status to "Online"'
             />
         );
 
         const manualStatusCancel = (
             <FormattedMessage
-                id='modal.manual_status.cancel'
+                id='modal.manaul_status.cancel'
                 defaultMessage='No, keep it as "{status}"'
                 values={{
                     status: userStatus
@@ -120,7 +120,7 @@ export default class ResetStatusModal extends React.PureComponent {
 
         const manualStatusCheckbox = (
             <FormattedMessage
-                id='modal.manual_status.ask'
+                id='modal.manaul_status.ask'
                 defaultMessage='Do not ask me again'
             />
         );
-- 
cgit v1.2.3-1-g7c22

