diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-03-02 17:48:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-02 17:48:56 -0500 |
| commit | 3a91d4e5e419a43ff19a0736ce697f8d611d36e3 (patch) | |
| tree | e57ad85d49f8768a575f27c89d338a4ccaeda521 /webapp/i18n/en.json | |
| parent | 8c5cee9521656bcffb371aad9dae4bea8fc70e29 (diff) | |
| download | chat-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 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index a0ae76c72..8196d1aa1 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1,4 +1,10 @@ { + "multiselect.go": "Go", + "multiselect.instructions": "Use up/down arrows to navigate and enter to select", + "multiselect.placeholder": "Search and add members", + "multiselect.numRemaining": "You can add {num, number} more", + "multiselect.numPeopleRemaining": "You can add {num, number} more {num, plural, =0 {people} one {person} other {people}}. ", + "filtered_channels_list.count": "{count} {count, plural, =0 {0 channels} one {channel} other {channels}}", "about.close": "Close", "about.copyright": "Copyright 2016 Mattermost, Inc. All rights reserved", "about.database": "Database:", @@ -1638,6 +1644,8 @@ "more_channels.prev": "Previous", "more_channels.title": "More Channels", "more_direct_channels.close": "Close", + "more_direct_channels.new_convo_note": "This will start a new conversation. If you’re adding a lot of people, consider creating a private group instead.", + "more_direct_channels.new_convo_note.full": "You’ve reached the maximum number of people for this conversation. Consider creating a private group instead.", "more_direct_channels.message": "Message", "more_direct_channels.title": "Direct Messages", "msg_typing.areTyping": "{users} and {last} are typing...", |