diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-06-30 16:06:59 +0800 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-06-30 09:06:59 +0100 |
| commit | eea64f8049d90c5dcf14a739d640f5aa6a9c7add (patch) | |
| tree | fabaa232bad7f4ebddf30b073c37a5962029f7fd /webapp/i18n | |
| parent | fb57b3dd53eaca28a557ea7e334e9d7216ce6aab (diff) | |
| download | chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.gz chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.tar.bz2 chat-eea64f8049d90c5dcf14a739d640f5aa6a9c7add.zip | |
[PLT-5864] Move teammate name display setting to the System Console (#6681)
* move teammate name display setting to the system console
* update all the likes of TeammateNameDisplay names
* fix gofmt error
* rebase and fix conflict
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 878c6cdea..ea989ea65 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -875,8 +875,13 @@ "admin.team.siteNameDescription": "Name of service shown in login screens and UI.", "admin.team.siteNameExample": "E.g.: \"Mattermost\"", "admin.team.siteNameTitle": "Site Name:", + "admin.team.showFullname": "Show first and last name (default)", + "admin.team.showNickname": "Show nickname if one exists, otherwise show first and last name", + "admin.team.showUsername": "Show username", "admin.team.teamCreationDescription": "When false, only System Administrators can create teams.", "admin.team.teamCreationTitle": "Enable Team Creation: ", + "admin.team.teammateNameDisplay": "Teammate Name Display:", + "admin.team.teammateNameDisplayDesc": "Set how to display users' names in posts and the Direct Messages list.", "admin.team.upload": "Upload", "admin.team.uploadDesc": "Customize your user experience by adding a custom image to your login screen. Recommended maximum image size is less than 2 MB.", "admin.team.uploaded": "Uploaded!", @@ -2188,7 +2193,7 @@ "user.settings.display.showFullname": "Show first and last name", "user.settings.display.showNickname": "Show nickname if one exists, otherwise show first and last name", "user.settings.display.showUsername": "Show username (default)", - "user.settings.display.teammateDisplay": "Teammate Name Display", + "user.settings.display.teammateNameDisplay": "Teammate Name Display", "user.settings.display.theme.applyToAllTeams": "Apply new theme to all my teams", "user.settings.display.theme.customTheme": "Custom Theme", "user.settings.display.theme.describe": "Open to manage your theme", |