diff options
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/i18n/en.json b/i18n/en.json index 59a600f23..9a39c60ba 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3855,14 +3855,6 @@ "translation": "You have a new Direct Message from @{{.SenderName}}" }, { - "id": "app.notification.body.intro.notification.full", - "translation": "You have a new notification." - }, - { - "id": "app.notification.body.intro.notification.generic", - "translation": "You have a new notification from @{{.SenderName}}" - }, - { "id": "app.notification.body.intro.group_message.full", "translation": "You have a new Group Message." }, @@ -3871,6 +3863,14 @@ "translation": "You have a new Group Message from @{{.SenderName}}" }, { + "id": "app.notification.body.intro.notification.full", + "translation": "You have a new notification." + }, + { + "id": "app.notification.body.intro.notification.generic", + "translation": "You have a new notification from @{{.SenderName}}" + }, + { "id": "app.notification.body.text.direct.full", "translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, @@ -3879,19 +3879,19 @@ "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.full", + "id": "app.notification.body.text.group_message.full", "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.notification.generic", + "id": "app.notification.body.text.group_message.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.full", + "id": "app.notification.body.text.notification.full", "translation": "Channel: {{.ChannelName}}<br>@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { - "id": "app.notification.body.text.group_message.generic", + "id": "app.notification.body.text.notification.generic", "translation": "{{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}" }, { @@ -3899,10 +3899,6 @@ "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}}" }, @@ -3911,6 +3907,10 @@ "translation": "[{{ .SiteName }}] New Group Message on {{.Month}} {{.Day}}, {{.Year}}" }, { + "id": "app.notification.subject.notification.full", + "translation": "[{{ .SiteName }}] Notification in {{ .TeamName}} on {{.Month}} {{.Day}}, {{.Year}}" + }, + { "id": "app.plugin.activate.app_error", "translation": "Unable to activate extracted plugin." }, @@ -3927,6 +3927,10 @@ "translation": "Unable to deactivate plugin" }, { + "id": "app.plugin.delete_plugin_status_state.app_error", + "translation": "Unable to delete plugin status state." + }, + { "id": "app.plugin.disabled.app_error", "translation": "Plugins have been disabled. Please check your logs for details." }, @@ -3971,10 +3975,18 @@ "translation": "Plugin is not installed" }, { + "id": "app.plugin.prepackaged.app_error", + "translation": "Cannot install prepackaged plugin" + }, + { "id": "app.plugin.remove.app_error", "translation": "Unable to delete plugin" }, { + "id": "app.plugin.set_plugin_status_state.app_error", + "translation": "Unable to set plugin status state." + }, + { "id": "app.plugin.upload_disabled.app_error", "translation": "Plugins and/or plugin uploads have been disabled." }, @@ -4871,6 +4883,10 @@ "translation": "Unable to build multipart request" }, { + "id": "model.cluster.is_valid.id.app_error", + "translation": "Invalid Id" + }, + { "id": "model.command.is_valid.create_at.app_error", "translation": "Create at must be a valid time" }, @@ -5119,14 +5135,14 @@ "translation": "AD/LDAP field \"ID Attribute\" is required." }, { - "id": "model.config.is_valid.ldap_login_id", - "translation": "AD/LDAP field \"Login ID Attribute\" is required." - }, - { "id": "model.config.is_valid.ldap_lastname", "translation": "AD/LDAP field \"Last Name Attribute\" is required." }, { + "id": "model.config.is_valid.ldap_login_id", + "translation": "AD/LDAP field \"Login ID Attribute\" is required." + }, + { "id": "model.config.is_valid.ldap_max_page_size.app_error", "translation": "Invalid max page size value." }, |