summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-08-17 09:35:36 -0700
committerChristopher Speller <crspeller@gmail.com>2017-08-17 09:35:36 -0700
commitfd1301779fecc2910a9fdcf93af52ff33a4349ba (patch)
treeccd8b35d347b77c8c6a99db9422b3dbc0ff3bd2d /i18n/en.json
parentd41f1695e99a81808f5dc1fbe7820062947b5291 (diff)
parent0033e3e37b12cb5d951d21492500d66a6abc472b (diff)
downloadchat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.gz
chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.bz2
chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.zip
Merge branch 'release-4.1'
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 49f5c1310..1b3691ecf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6621,7 +6621,7 @@
},
{
"id": "utils.config.supported_server_locale.app_error",
- "translation": "Unable to load mattermost configuration file: DefaultServerLocale must be one of the supported locales"
+ "translation": "Unable to load mattermost configuration file: DefaultServerLocale must be one of the supported locales. Setting DefaultServerLocale to en as default value."
},
{
"id": "utils.config.validate_locale.app_error",