diff options
author | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
---|---|---|
committer | cpanato <ctadeu@gmail.com> | 2018-07-10 19:27:14 +0200 |
commit | c042ffa460296587579aff54b157a5109e022f7e (patch) | |
tree | 9e7f77fbc83b6d06204db099066be8999dbb22d9 /i18n/nl.json | |
parent | 9470564d355c201155f6fcb123152b8ac954f812 (diff) | |
parent | dccd95bc67779a5b83a2660aec0cf4622cd56550 (diff) | |
download | chat-c042ffa460296587579aff54b157a5109e022f7e.tar.gz chat-c042ffa460296587579aff54b157a5109e022f7e.tar.bz2 chat-c042ffa460296587579aff54b157a5109e022f7e.zip |
Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710
Diffstat (limited to 'i18n/nl.json')
-rw-r--r-- | i18n/nl.json | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/i18n/nl.json b/i18n/nl.json index bddce760b..4ce0e742d 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -160,6 +160,10 @@ "translation": "Het kanaal is gearchiveerd of verwijderd" }, { + "id": "api.channel.delete_channel.type.invalid", + "translation": "Cannot delete direct or group message channels" + }, + { "id": "api.channel.join_channel.already_deleted.app_error", "translation": "Channel is already deleted" }, @@ -3780,7 +3784,7 @@ }, { "id": "model.config.is_valid.display.custom_url_schemes.app_error", - "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)." + "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers and hyphen (-)." }, { "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error", |