diff options
| author | Christopher Brown <ccbrown112@gmail.com> | 2017-10-16 23:10:45 -0500 |
|---|---|---|
| committer | Christopher Brown <ccbrown112@gmail.com> | 2017-10-16 23:10:45 -0500 |
| commit | 39cc2372695836fdc96059d8b94992b1416f98e1 (patch) | |
| tree | 56d2beb5420cd0054194f71e53c6a95578beff9a /i18n/en.json | |
| parent | 89dc3cb126ba46b486997c433adfdf34982fcc81 (diff) | |
| parent | 8bf47c1211d09079fd9407555026b7b29383ac37 (diff) | |
| download | chat-39cc2372695836fdc96059d8b94992b1416f98e1.tar.gz chat-39cc2372695836fdc96059d8b94992b1416f98e1.tar.bz2 chat-39cc2372695836fdc96059d8b94992b1416f98e1.zip | |
Merge branch 'release-4.3'
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/i18n/en.json b/i18n/en.json index df30fd9d5..4c09b8eba 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4384,10 +4384,6 @@ "translation": "Message retention must be one day or longer." }, { - "id": "model.config.is_valid.localization.available_locales.app_error", - "translation": "Available Languages must contain Default Client Language" - }, - { "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error", "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1" }, @@ -4532,6 +4528,10 @@ "translation": "Invalid listen address for service settings Must be set." }, { + "id": "model.config.is_valid.localization.available_locales.app_error", + "translation": "Available Languages must contain Default Client Language" + }, + { "id": "model.config.is_valid.login_attempts.app_error", "translation": "Invalid maximum login attempts for service settings. Must be a positive number." }, @@ -5552,6 +5552,10 @@ "translation": "We couldn't count the commands" }, { + "id": "store.sql_command.get_by_trigger.app_error", + "translation": "We couldn't get the command" + }, + { "id": "store.sql_command.save.delete.app_error", "translation": "We couldn't delete the command" }, @@ -5580,10 +5584,6 @@ "translation": "We couldn't update the command" }, { - "id": "store.sql_command.get_by_trigger.app_error", - "translation": "We couldn't get the command" - }, - { "id": "store.sql_command_webhooks.get.app_error", "translation": "We couldn't get the webhook" }, |