summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-03-02 17:48:56 -0500
committerGitHub <noreply@github.com>2017-03-02 17:48:56 -0500
commit3a91d4e5e419a43ff19a0736ce697f8d611d36e3 (patch)
treee57ad85d49f8768a575f27c89d338a4ccaeda521 /i18n
parent8c5cee9521656bcffb371aad9dae4bea8fc70e29 (diff)
downloadchat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.tar.gz
chat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.tar.bz2
chat-3a91d4e5e419a43ff19a0736ce697f8d611d36e3.zip
PLT-3077 Add group messaging (#5489)
* Implement server changes for group messaging * Majority of client-side implementation * Some server updates * Added new React multiselect component * Fix style issues * Add custom renderer for options * Fix model test * Update ENTER functionality for multiselect control * Remove buttons from multiselect UI control * Updating group messaging UI (#5524) * Move filter controls up a component level * Scroll with arrow keys * Updating mobile layout for multiselect (#5534) * Fix race condition when backspacing quickly * Hidden or new GMs show up for regular messages * Add overriding of number remaining text * Add UI filtering for team if config setting set * Add icon to channel switcher and class prop to status icon * Minor updates per feedback * Improving group messaging UI (#5563) * UX changes per feedback * Update email for group messages * UI fixes for group messaging (#5587) * Fix missing localization string * Add maximum users message when adding members to GM * Fix input clearing on Android * Updating group messaging UI (#5603) * Updating UI for group messaging (#5604)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json28
1 files changed, 28 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index c372b6d0a..677a5c289 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -200,6 +200,14 @@
"translation": "Must use createDirectChannel API service for direct message channel creation"
},
{
+ "id": "api.channel.create_group.bad_size.app_error",
+ "translation": "Group message channels must contain at least 3 and no more than 8 users"
+ },
+ {
+ "id": "api.channel.create_group.bad_user.app_error",
+ "translation": "One of the provided users does not exist"
+ },
+ {
"id": "api.channel.create_channel.invalid_character.app_error",
"translation": "Invalid character '__' in channel name for non-direct channel"
},
@@ -888,6 +896,10 @@
"translation": "Direct Message"
},
{
+ "id": "api.email_batching.render_batched_post.group_message",
+ "translation": "Group Message"
+ },
+ {
"id": "api.email_batching.render_batched_post.go_to_post",
"translation": "Go to Post"
},
@@ -2152,6 +2164,14 @@
"translation": "{{.SubjectText}} in {{.TeamDisplayName}} from {{.SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
},
{
+ "id": "api.templates.channel_name.group",
+ "translation": "Group Message"
+ },
+ {
+ "id": "api.templates.post_subject_in_group_message",
+ "translation": "New Group Message from {{ .SenderDisplayName}} on {{.Month}} {{.Day}}, {{.Year}}"
+ },
+ {
"id": "api.templates.reset_body.button",
"translation": "Reset Password"
},
@@ -3060,6 +3080,14 @@
"translation": "Import data line has type \"post\" but the post object is null."
},
{
+ "id": "authentication.permissions.create_group_channel.description",
+ "translation": "Ability to create new group message channels"
+ },
+ {
+ "id": "authentication.permissions.create_group_channel.name",
+ "translation": "Create Group Message"
+ },
+ {
"id": "authentication.permissions.create_team_roles.description",
"translation": "Ability to create new teams"
},