summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-31 13:06:25 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-03-31 13:06:25 -0400
commitd39947f53933ee4beb4ed8ab614324edc36fba2d (patch)
tree800e9d82a6b550509059cbf7a2f5f923596c9fe5 /webapp
parentaba07e5cb9e9b5668c4fb94bfe9f096a26538528 (diff)
downloadchat-d39947f53933ee4beb4ed8ab614324edc36fba2d.tar.gz
chat-d39947f53933ee4beb4ed8ab614324edc36fba2d.tar.bz2
chat-d39947f53933ee4beb4ed8ab614324edc36fba2d.zip
Corrected 'hangup' to 'hang up' (#5930)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/webrtc/webrtc_controller.jsx6
-rwxr-xr-xwebapp/i18n/en.json4
2 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/webrtc/webrtc_controller.jsx b/webapp/components/webrtc/webrtc_controller.jsx
index 0fab0d2e7..9d625dcf4 100644
--- a/webapp/components/webrtc/webrtc_controller.jsx
+++ b/webapp/components/webrtc/webrtc_controller.jsx
@@ -322,7 +322,7 @@ export default class WebrtcController extends React.Component {
error: (
<FormattedMessage
id='webrtc.inProgress'
- defaultMessage='You have a call in progress. Please hangup first.'
+ defaultMessage='You have a call in progress. Please hang up first.'
/>
),
errorType: ' warning'
@@ -408,7 +408,7 @@ export default class WebrtcController extends React.Component {
error: (
<FormattedMessage
id='webrtc.inProgress'
- defaultMessage='You have a call in progress. Please hangup first.'
+ defaultMessage='You have a call in progress. Please hang up first.'
/>
),
errorType: ' warning'
@@ -1063,7 +1063,7 @@ export default class WebrtcController extends React.Component {
<title>
<FormattedMessage
id='webrtc.hangup'
- defaultMessage='Hangup'
+ defaultMessage='Hang up'
/>
</title>
</circle>
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 7c5e45e09..b60db31cd 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2367,9 +2367,9 @@
"webrtc.declined": "Your call has been declined by {username}.",
"webrtc.disabled": "{username} has WebRTC disabled, and cannot receive calls. To enable the feature, they must go to Account Settings > Advanced > Preview pre-release features and turn on WebRTC.",
"webrtc.failed": "There was a problem connecting the video call.",
- "webrtc.hangup": "Hangup",
+ "webrtc.hangup": "Hang up",
"webrtc.header": "Call with {username}",
- "webrtc.inProgress": "You have a call in progress. Please hangup first.",
+ "webrtc.inProgress": "You have a call in progress. Please hang up first.",
"webrtc.mediaError": "Unable to access camera or microphone.",
"webrtc.mute_audio": "Mute microphone",
"webrtc.noAnswer": "{username} is not answering the call.",