summaryrefslogtreecommitdiffstats
path: root/i18n/pl.json
diff options
context:
space:
mode:
authorcpanato <ctadeu@gmail.com>2018-07-10 19:27:14 +0200
committercpanato <ctadeu@gmail.com>2018-07-10 19:27:14 +0200
commitc042ffa460296587579aff54b157a5109e022f7e (patch)
tree9e7f77fbc83b6d06204db099066be8999dbb22d9 /i18n/pl.json
parent9470564d355c201155f6fcb123152b8ac954f812 (diff)
parentdccd95bc67779a5b83a2660aec0cf4622cd56550 (diff)
downloadchat-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/pl.json')
-rw-r--r--i18n/pl.json6
1 files changed, 5 insertions, 1 deletions
diff --git a/i18n/pl.json b/i18n/pl.json
index 3a38630ad..889d3b542 100644
--- a/i18n/pl.json
+++ b/i18n/pl.json
@@ -160,6 +160,10 @@
"translation": "Kanał został zarchiwizowany lub usunięty"
},
{
+ "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": "Kanał jest już usunięty"
},
@@ -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",