summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-29 09:17:09 -0300
committerChristopher Speller <crspeller@gmail.com>2016-06-29 08:17:09 -0400
commitb418d78517b4fbdb6ad405ad8b3b483f2fd624d5 (patch)
tree38f59382e473fc976ea382da965b05f567874b83 /webapp/i18n/en.json
parentb63f61fe7d022bf1569993afbd9441ee7db2feca (diff)
downloadchat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.tar.gz
chat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.tar.bz2
chat-b418d78517b4fbdb6ad405ad8b3b483f2fd624d5.zip
daily translations 20160628 (#3444)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 04ff8c17e..8c8b61498 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -391,13 +391,13 @@
"admin.rate.title": "Rate Limit Settings",
"admin.recycle.button": "Recycle Database Connections",
"admin.recycle.loading": " Recycling...",
- "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
"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 confugration 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.",
+ "admin.recycle.reloadFail": "Recycling unsuccessful: {error}",
"admin.regenerate": "Regenerate",
"admin.reload.button": "Reload Configuration From Disk",
"admin.reload.loading": " Loading...",
- "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
"admin.reload.reloadDescription": "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 <b>Reload Configuration from Disk</b> feature to load the new settings while the server is running. The administrator should then use the <a href=\"../advanced/database\"><b>Database > Recycle Database Connections</b></a> feature to recycle the database connections based on the new settings.",
+ "admin.reload.reloadFail": "Reloading unsuccessful: {error}",
"admin.reset_password.close": "Close",
"admin.reset_password.newPassword": "New Password",
"admin.reset_password.select": "Select",