From b9dc759449f11e0352f97164360cc400fbc112d8 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 4 Oct 2016 15:37:05 -0300 Subject: translations PR 20160929 (#4123) --- webapp/i18n/en.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index a48671425..dc7e5fec4 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -532,6 +532,9 @@ "admin.rate.httpHeaderDescription": "When filled in, vary rate limiting by HTTP header field specified (e.g. when configuring NGINX set to \"X-Real-IP\", when configuring AmazonELB set to \"X-Forwarded-For\").", "admin.rate.httpHeaderExample": "Ex \"X-Real-IP\", \"X-Forwarded-For\"", "admin.rate.httpHeaderTitle": "Vary rate limit by HTTP header", + "admin.rate.maxBurst": "Maximum Burst Size:", + "admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.", + "admin.rate.maxBurstExample": "Ex \"100\"", "admin.rate.memoryDescription": "Maximum number of users sessions connected to the system as determined by \"Vary rate limit by remote address\" and \"Vary rate limit by HTTP header\" settings below.", "admin.rate.memoryExample": "Ex \"10000\"", "admin.rate.memoryTitle": "Memory Store Size:", @@ -543,9 +546,6 @@ "admin.rate.remoteDescription": "When true, rate limit API access by IP address.", "admin.rate.remoteTitle": "Vary rate limit by remote address: ", "admin.rate.title": "Rate Limit Settings", - "admin.rate.maxBurst": "Maximum Burst Size:", - "admin.rate.maxBurstExample": "Ex \"100\"", - "admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.", "admin.recycle.button": "Recycle Database Connections", "admin.recycle.loading": " Recycling...", "admin.recycle.recycleDescription": "Deployments using multiple databases can switch from one master database to another without restarting the Mattermost server by updating \"config.json\" to the new desired configuration and using the Configuration > Reload Configuration from Disk feature to load the new settings while the server is running. The administrator should then use Recycle Database Connections feature to recycle the database connections based on the new settings.", @@ -2066,8 +2066,5 @@ "webrtc.unmute_audio": "Unmute microphone", "webrtc.unpause_video": "Turn on camera", "webrtc.unsupported": "{username} client does not support video calls.", - "youtube_video.notFound": "Video not found", - "channel_header.webrtc.unavailable": "New call unavailable until your existing call ends", - "user_profile.webrtc.unavailable": "New call unavailable until your existing call ends", - "admin.sidebar.webrtc": "WebRTC (Beta)" + "youtube_video.notFound": "Video not found" } -- cgit v1.2.3-1-g7c22