IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mark-as-unread

Browse Source
This commit is contained in:
Harrison Healey
2019-09-18 13:16:23 -04:00
parent 42e927cc3f c7b583ccdd
commit 5f28ce9de0
190 changed files with 11424 additions and 2337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
i18n/en.json
View File

@@ -387,6 +387,10 @@
"id": "api.channel.update_channel_member_roles.scheme_role.app_error",
"translation": "The provided role is managed by a Scheme and therefore cannot be applied directly to a Channel Member"
},
{
"id": "api.channel.update_channel_privacy.default_channel_error",
"translation": "The default channel cannot be made private."
},
{
"id": "api.channel.update_channel_scheme.license.error",
"translation": "Your license does not support updating a channel's scheme"
@@ -3376,7 +3380,7 @@
},
{
"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.group_message.full",
@@ -3384,7 +3388,7 @@
},
{
"id": "app.notification.body.intro.group_message.generic",
"translation": "You have a new Group Message from @{{.SenderName}}"
"translation": "You have a new Group Message from {{.SenderName}}"
},
{
"id": "app.notification.body.intro.notification.full",
@@ -3392,11 +3396,11 @@
},
{
"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.text.direct.full",
"translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
"translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
},
{
"id": "app.notification.body.text.direct.generic",
@@ -3408,7 +3412,7 @@
},
{
"id": "app.notification.body.text.group_message.full2",
"translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
"translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
},
{
"id": "app.notification.body.text.group_message.generic",
@@ -3420,7 +3424,7 @@
},
{
"id": "app.notification.body.text.notification.full2",
"translation": "@{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
"translation": "{{.SenderName}} - {{.Hour}}:{{.Minute}} {{.TimeZone}}, {{.Month}} {{.Day}}"
},
{
"id": "app.notification.body.text.notification.generic",
@@ -3502,6 +3506,22 @@
"id": "app.plugin.manifest.app_error",
"translation": "Unable to find manifest for extracted plugin"
},
{
"id": "app.plugin.marketplace_client.app_error",
"translation": "Failed to create marketplace client."
},
{
"id": "app.plugin.marketplace_disabled.app_error",
"translation": "Marketplace has been disabled. Please check your logs for details."
},
{
"id": "app.plugin.marketplace_plugins.app_error",
"translation": "Failed to get plugins from the marketplace server."
},
{
"id": "app.plugin.marshal.app_error",
"translation": "Failed to marshal marketplace plugins."
},
{
"id": "app.plugin.mvdir.app_error",
"translation": "Unable to move plugin from temporary directory to final destination. Another plugin may be using the same directory name."
@@ -6362,10 +6382,6 @@
"id": "store.sql_post.permanent_delete_by_user.too_many.app_error",
"translation": "Unable to select the posts to delete for the user (too many), please re-run"
},
{
"id": "store.sql_post.query_max_post_size.error",
"translation": "Unable to determine the maximum supported post size"
},
{
"id": "store.sql_post.save.app_error",
"translation": "Unable to save the Post"