diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-16 14:45:46 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-16 14:45:46 -0400 |
commit | f1a830ce9aea87fbeab7e54a6b2b56423e5fed45 (patch) | |
tree | 613bb2cb29cca3016d6b6ac75602aad26303f4f7 /i18n/en.json | |
parent | 16bbbc2abca7c2e5dc2e6876da0dba2bae9eed04 (diff) | |
parent | 02f8c18f40cd0e973e4c75b751e8fcbbbd019728 (diff) | |
download | chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.tar.gz chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.tar.bz2 chat-f1a830ce9aea87fbeab7e54a6b2b56423e5fed45.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 48 |
1 files changed, 38 insertions, 10 deletions
diff --git a/i18n/en.json b/i18n/en.json index 6666f8503..b9b744608 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -871,6 +871,10 @@ "translation": "You don't have enough permissions to add {{.User}} in {{.Channel}}." }, { + "id": "api.command_invite.private_channel.app_error", + "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels." + }, + { "id": "api.command_invite.success", "translation": "{{.User}} added to {{.Channel}} channel." }, @@ -3828,11 +3832,11 @@ }, { "id": "app.notification.body.intro.direct.full", - "translation": "You have a new direct message." + "translation": "You have a new Direct Message." }, { "id": "app.notification.body.intro.direct.generic", - "translation": "You have a new direct message from {{.SenderName}}" + "translation": "You have a new Direct Message from @{{.SenderName}}" }, { "id": "app.notification.body.intro.notification.full", @@ -3840,11 +3844,19 @@ }, { "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from {{.SenderName}}" + "translation": "You have a new notification from @{{.SenderName}}" + }, + { + "id": "app.notification.body.intro.group_message.full", + "translation": "You have a new Group Message." + }, + { + "id": "app.notification.body.intro.group_message.generic", + "translation": "You have a new Group Message from @{{.SenderName}}" }, { "id": "app.notification.body.text.direct.full", - "translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.direct.generic", @@ -3852,21 +3864,37 @@ }, { "id": "app.notification.body.text.notification.full", - "translation": "CHANNEL: {{.ChannelName}}<br>{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { "id": "app.notification.body.text.notification.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { + "id": "app.notification.body.text.group_message.full", + "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { + "id": "app.notification.body.text.group_message.generic", + "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" + }, + { "id": "app.notification.subject.direct.full", - "translation": "[{{.SiteName}}] New Direct Message from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" + "translation": "[{{.SiteName}}] New Direct Message from @{{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}" }, { "id": "app.notification.subject.notification.full", "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" }, { + "id": "app.notification.subject.group_message.full", + "translation": "[{{ .SiteName }}] New Group Message in {{ .ChannelName}} on {{.Month}} {{.Day}}, {{.Year}}" + }, + { + "id": "app.notification.subject.group_message.generic", + "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}" + }, + { "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin." }, @@ -3903,10 +3931,6 @@ "translation": "Unable to get active plugins" }, { - "id": "app.plugin.invalid_id.app_error", - "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}." - }, - { "id": "app.plugin.install.app_error", "translation": "Unable to install plugin." }, @@ -3915,6 +3939,10 @@ "translation": "Unable to install plugin. A plugin with the same ID is already installed." }, { + "id": "app.plugin.invalid_id.app_error", + "translation": "Plugin Id must be at least {{.Min}} characters, at most {{.Max}} characters and match {{.Regex}}." + }, + { "id": "app.plugin.manifest.app_error", "translation": "Unable to find manifest for extracted plugin" }, |