diff options
| author | George Goldberg <george@gberg.me> | 2017-04-04 20:17:15 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-04 15:17:15 -0400 |
| commit | 1fa3f2351c98e4d1b9c198e357d90ac0d436dcaa (patch) | |
| tree | 23ff5a64041ed6aa1dc6b7a1db85b85972b2ec66 /webapp/i18n/en.json | |
| parent | 77a76487a8e15084c8b5e8e350eb8dc7a87455ea (diff) | |
| download | chat-1fa3f2351c98e4d1b9c198e357d90ac0d436dcaa.tar.gz chat-1fa3f2351c98e4d1b9c198e357d90ac0d436dcaa.tar.bz2 chat-1fa3f2351c98e4d1b9c198e357d90ac0d436dcaa.zip | |
PLT-6023: Add Users to Team in WebApp. (#5956)
* PLT-6198: Use added to channel system message on default channels.
Use a different sytem message when a user was added to a default channel
by someone else than when they joined themselves.
* PLT-6023: Add Users to Team in WebApp.
* Fix string text.
* Handle added_to_team websocket message.
* Fix unread flag on new channel.
Diffstat (limited to 'webapp/i18n/en.json')
| -rwxr-xr-x | webapp/i18n/en.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 37207b279..7515c52fd 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -137,6 +137,7 @@ "add_outgoing_webhook.triggerWordsTriggerWhen.help": "Choose when to trigger the outgoing webhook; if the first word of a message matches a Trigger Word exactly, or if it starts with a Trigger Word.", "add_outgoing_webhook.triggerWordsTriggerWhenFullWord": "First word matches a trigger word exactly", "add_outgoing_webhook.triggerWordsTriggerWhenStartsWith": "First word starts with a trigger word", + "add_users_to_team.title": "Add New Members To {teamName} Team", "admin.advance.cluster": "High Availability (Beta)", "admin.advance.metrics": "Performance Monitoring", "admin.audits.reload": "Reload User Activity Logs", @@ -1759,12 +1760,13 @@ "navbar.viewPinnedPosts": "View Pinned Posts", "navbar_dropdown.about": "About Mattermost", "navbar_dropdown.accountSettings": "Account Settings", + "navbar_dropdown.addMemberToTeam": "Add Members to Team", "navbar_dropdown.console": "System Console", "navbar_dropdown.create": "Create a New Team", "navbar_dropdown.emoji": "Custom Emoji", "navbar_dropdown.help": "Help", "navbar_dropdown.integrations": "Integrations", - "navbar_dropdown.inviteMember": "Invite New Member", + "navbar_dropdown.inviteMember": "Send Email Invite", "navbar_dropdown.join": "Join Another Team", "navbar_dropdown.leave": "Leave Team", "navbar_dropdown.logout": "Logout", @@ -1917,10 +1919,11 @@ "sidebar.unreadBelow": "Unread post(s) below", "sidebar_header.tutorial": "<h4>Main Menu</h4><p>The <strong>Main Menu</strong> is where you can <strong>Invite New Members</strong>, access your <strong>Account Settings</strong> and set your <strong>Theme Color</strong>.</p><p>Team administrators can also access their <strong>Team Settings</strong> from this menu.</p><p>System administrators will find a <strong>System Console</strong> option to administrate the entire system.</p>", "sidebar_right_menu.accountSettings": "Account Settings", + "sidebar_right_menu.addMemberToTeam": "Add Members to Team", "sidebar_right_menu.console": "System Console", "sidebar_right_menu.flagged": "Flagged Posts", "sidebar_right_menu.help": "Help", - "sidebar_right_menu.inviteNew": "Invite New Member", + "sidebar_right_menu.inviteNew": "Send Email Invite", "sidebar_right_menu.logout": "Logout", "sidebar_right_menu.manageMembers": "Manage Members", "sidebar_right_menu.nativeApps": "Download Apps", |