summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-22 12:54:00 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-22 12:54:00 -0400
commit4c683aff7627040ff811f065848a820b2cb19d59 (patch)
tree668061e8acfd8827fd02bab18a998b7986944296 /i18n
parenteb78d273f39202046fa71555a5a19b0ec8a95cb3 (diff)
parent1af1bce6199597bb2d41ddcdc00ef0f28a73c83e (diff)
downloadchat-4c683aff7627040ff811f065848a820b2cb19d59.tar.gz
chat-4c683aff7627040ff811f065848a820b2cb19d59.tar.bz2
chat-4c683aff7627040ff811f065848a820b2cb19d59.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 8d2c90db0..88bbcb9f1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5300,7 +5300,7 @@
},
{
"id": "model.config.is_valid.site_url.app_error",
- "translation": "Site URL must be a valid URL and start with http:// or https://"
+ "translation": "Site URL must be set, a valid URL, and start with http:// or https://"
},
{
"id": "model.config.is_valid.site_url_email_batching.app_error",