diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-21 10:20:35 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-21 10:20:35 -0400 |
commit | a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6 (patch) | |
tree | bdc4c8959ccff1fef7348101a63b14479311d0b8 /webapp/i18n/en.json | |
parent | 85837efe06a93b38e449c750108a4105cc629611 (diff) | |
download | chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.tar.gz chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.tar.bz2 chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.zip |
Merge release branch commits
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r-- | webapp/i18n/en.json | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 9b44f9abd..e4485dc29 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1,12 +1,12 @@ { "about.close": "Close", "about.date": "Build Date:", - "about.enterpriseEditione1": "Enterprise Edition E1", + "about.enterpriseEditione1": "Enterprise Edition", "about.hash": "Build Hash:", "about.licensed": "Licensed by:", "about.number": "Build Number:", - "about.teamEditiont0": "Team Edition T0", - "about.teamEditiont1": "Team Edition T1", + "about.teamEditiont0": "Team Edition", + "about.teamEditiont1": "Enterprise Edition", "about.title": "About Mattermost", "about.version": "Version:", "access_history.title": "Access History", @@ -230,15 +230,9 @@ "admin.ldap.usernameAttrTitle": "Username Attribute:", "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start, <a href=\"http://mattermost.com\" target=\"_blank\">disable all Enterprise Edition features on this server</a>. This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.", "admin.license.chooseFile": "Choose File", - "admin.license.edition": "Edition: ", - "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.", - "admin.license.enterpriseType": "<div><p>This compiled release of Mattermost platform is provided under a <a href=\"http://mattermost.com\" target=\"_blank\">commercial license</a> from Mattermost, Inc. based on your subscription level and is subject to the <a href=\"{terms}\" target=\"_blank\">Terms of Service.</a></p><p>Your subscription details are as follows:</p>Name: {name}<br />Company or organization name: {company}<br/>Number of users: {users}<br/>License issued: {issued}<br/>Start date of license: {start}<br/>Expiry date of license: {expires}<br/>LDAP: {ldap}<br/></div>", - "admin.license.key": "License Key: ", "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server", "admin.license.noFile": "No file uploaded", "admin.license.removing": "Removing License...", - "admin.license.teamEdition": "Mattermost Team Edition. Designed for teams from 5 to 50 users.", - "admin.license.teamType": "<span><p>This compiled release of Mattermost platform is offered under an MIT license.</p><p>See MIT-COMPILED-LICENSE.txt in your root install directory for details. See NOTICES.txt for information about open source software used in this system.</p></span>", "admin.license.title": "Edition and License", "admin.license.type": "License: ", "admin.license.upload": "Upload", |