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/fr.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/fr.json')
-rw-r--r-- | i18n/fr.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/fr.json b/i18n/fr.json index 33ecded35..c7a04656d 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -160,6 +160,10 @@ "translation": "Le canal a été archivé ou effacé" }, { + "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": "Le can est déjà supprimé" }, |