summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-10-12 10:49:17 -0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-10-12 09:49:17 -0400
commitd195eea07de0654fb716d856448d6f10a2a7a0ff (patch)
tree70811d1d03383cc36b3b7212b2622570d00e8403 /webapp/i18n/en.json
parent0a2146692c1c53eb75e4b561d66be30aa5819857 (diff)
downloadchat-d195eea07de0654fb716d856448d6f10a2a7a0ff.tar.gz
chat-d195eea07de0654fb716d856448d6f10a2a7a0ff.tar.bz2
chat-d195eea07de0654fb716d856448d6f10a2a7a0ff.zip
translations PR 20161011 (#4199)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json5
1 files changed, 1 insertions, 4 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 926191a17..81dc5cdc3 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -534,7 +534,7 @@
"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.maxBurstExample": "E.g.: \"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": "E.g.: \"10000\"",
"admin.rate.memoryTitle": "Memory Store Size:",
@@ -546,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": "E.g.: \"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 <a href=\"../general/configuration\"><b>Configuration > Reload Configuration from Disk</b></a> feature to load the new settings while the server is running. The administrator should then use <b>Recycle Database Connections</b> feature to recycle the database connections based on the new settings.",