diff options
| author | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
|---|---|---|
| committer | Elias Nahum <nahumhbl@gmail.com> | 2016-08-09 17:05:59 -0500 |
| commit | 805659239098a0b382a2a8bad704c2e91ab38ed6 (patch) | |
| tree | e2c42b89d7ffc830bd9270cc65780fe470ccb4f4 /webapp/i18n/en.json | |
| parent | 7be82c2b279390d3659fbe74c7d3ccabc48a6dd8 (diff) | |
| parent | ac2f75ac8fd4e2d7ae1de6703a156b9636d4b8f0 (diff) | |
| download | chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.gz chat-805659239098a0b382a2a8bad704c2e91ab38ed6.tar.bz2 chat-805659239098a0b382a2a8bad704c2e91ab38ed6.zip | |
Merge branch 'release-3.3' RC3
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index e8c01d410..1636a3576 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -640,6 +640,9 @@ "admin.service.sessionCache": "Session Cache (minutes):", "admin.service.sessionCacheDesc": "The number of minutes to cache a session in memory.", "admin.service.sessionDaysEx": "Ex \"30\"", + "admin.service.siteURL": "Site URL:", + "admin.service.siteURLDescription": "The URL, including port number and protocol, from which users will access Mattermost. Leave blank to automatically configure based on incoming traffic.", + "admin.service.siteURLExample": "Ex \"https://mattermost.example.com:1234\"", "admin.service.ssoSessionDays": "Session length SSO (days):", "admin.service.ssoSessionDaysDesc": "The number of days from the last time a user entered their credentials to the expiry of the user's session. If the authentication method is SAML or GitLab, the user may automatically be logged back in to Mattermost if they are already logged in to SAML or GitLab. After changing this setting, the setting will take effect after the next time the user enters their credentials.", "admin.service.testingDescription": "When true, /loadtest slash command is enabled to load test accounts, data and text formatting. Changing this requires a server restart before taking effect.", |