diff options
author | enahum <nahumhbl@gmail.com> | 2016-05-27 12:38:01 -0300 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-05-27 08:38:01 -0700 |
commit | 97a4310610310f5f62d377bd8d68902c0ccc92cd (patch) | |
tree | 3971c7e4b88d316528ee3858729643c9de16af1d /webapp/i18n/en.json | |
parent | 5ff85df9e92b5ca2c5cd33d3338e3e04190b09cd (diff) | |
download | chat-97a4310610310f5f62d377bd8d68902c0ccc92cd.tar.gz chat-97a4310610310f5f62d377bd8d68902c0ccc92cd.tar.bz2 chat-97a4310610310f5f62d377bd8d68902c0ccc92cd.zip |
daily translations 20160526 (#3131)
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1bb3d5f87..609de5a75 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -123,12 +123,6 @@ "admin.connectionSecurityTitle": "Connection Security:", "admin.connectionSecurityTls": "TLS", "admin.connectionSecurityTlsDescription": "Encrypts the communication between Mattermost and your server.", - "admin.reload.reloadFail": "Reloading unsuccessful: {error}", - "admin.reload.loading": " Loading...", - "admin.reload.button": "Reload Configuration From Disk", - "admin.recycle.reloadFail": "Recycling unsuccessful: {error}", - "admin.recycle.loading": " Recycling...", - "admin.recycle.button": "Recycle Database Connections", "admin.email.agreeHPNS": " I understand and accept the Mattermost Hosted Push Notification Service <a href=\"https://about.mattermost.com/hpns-terms/\" target=\"_blank\">Terms of Service</a> and <a href=\"https://about.mattermost.com/hpns-privacy/\" target=\"_blank\">Privacy Policy</a>.", "admin.email.allowEmailSignInDescription": "When true, Mattermost allows users to sign in using their email and password.", "admin.email.allowEmailSignInTitle": "Allow Sign In With Email: ", @@ -350,7 +344,13 @@ "admin.rate.queriesTitle": "Number Of Queries Per Second:", "admin.rate.remoteDescription": "When true, rate limit API access by IP address.", "admin.rate.remoteTitle": "Vary By Remote Address: ", + "admin.recycle.button": "Recycle Database Connections", + "admin.recycle.loading": " Recycling...", + "admin.recycle.reloadFail": "Recycling unsuccessful: {error}", "admin.regenerate": "Re-Generate", + "admin.reload.button": "Reload Configuration From Disk", + "admin.reload.loading": " Loading...", + "admin.reload.reloadFail": "Reloading unsuccessful: {error}", "admin.reset_password.close": "Close", "admin.reset_password.newPassword": "New Password", "admin.reset_password.select": "Select", |