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 /i18n/en.json | |
| 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 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 923fd4b66..5ddaa9723 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4312,6 +4312,10 @@ "translation": "Invalid query timeout for SQL settings. Must be a positive number." }, { + "id": "model.config.is_valid.teammate_name_display.app_error", + "translation": "Invalid teammate display. Must be 'full_name', 'nickname_full_name' or 'username'" + }, + { "id": "model.config.is_valid.time_between_user_typing.app_error", "translation": "Time between user typing updates should not be set to less than 1000 milliseconds." }, |