diff options
| author | enahum <nahumhbl@gmail.com> | 2016-12-19 10:05:46 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-19 08:05:46 -0500 |
| commit | 999d1553e1ce45adf58f6082b160bc1147dc592b (patch) | |
| tree | 369a9b7f46dd44d136a79a050469429169433cec /webapp/i18n/en.json | |
| parent | 3ce2ce9dc882ed962dc3ce7550bdb07963f376b6 (diff) | |
| download | chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.gz chat-999d1553e1ce45adf58f6082b160bc1147dc592b.tar.bz2 chat-999d1553e1ce45adf58f6082b160bc1147dc592b.zip | |
PLT-4167 Team Sidebar (#4569)
* PLT-4167 Team Sidebar
* Address feedback from PM
* change route from my_members to members
* bug fixes
* Updating styles for teams sidebar (#4681)
* Added PM changes
* Fix corner cases
* Addressing feedback
* use two different endpoints
* Bug fixes
* Rename model and client functions, using preferences to store last team and channel viewed
* Fix mobile notification count and closing the team sidebar
* unit test, fixed bad merge and retrieve from cached when available
* bug fixes
* use id for last channel in preferences, query optimization
* Updating multi team css (#4830)
Diffstat (limited to 'webapp/i18n/en.json')
| -rw-r--r-- | webapp/i18n/en.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 556987ee4..10460e2b8 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1602,6 +1602,7 @@ "navbar_dropdown.help": "Help", "navbar_dropdown.integrations": "Integrations", "navbar_dropdown.inviteMember": "Invite New Member", + "navbar_dropdown.join": "Join Another Team", "navbar_dropdown.leave": "Leave Team", "navbar_dropdown.logout": "Logout", "navbar_dropdown.manageMembers": "Manage Members", @@ -1750,7 +1751,6 @@ "sidebar_right_menu.nativeApps": "Download Apps", "sidebar_right_menu.recentMentions": "Recent Mentions", "sidebar_right_menu.report": "Report a Problem", - "sidebar_right_menu.switch_team": "Team Selection", "sidebar_right_menu.teamLink": "Get Team Invite Link", "sidebar_right_menu.teamSettings": "Team Settings", "sidebar_right_menu.viewMembers": "View Members", @@ -1760,7 +1760,6 @@ "signup.ldap": "AD/LDAP Credentials", "signup.office365": "Office 365", "signup.title": "Create an account with:", - "signup_team.choose": "Your teams: ", "signup_team.createTeam": "Or Create a Team", "signup_team.disabled": "Team creation has been disabled. Please contact an administrator for access.", "signup_team.join_open": "Teams you can join: ", @@ -1853,6 +1852,7 @@ "team_settings_modal.generalTab": "General", "team_settings_modal.importTab": "Import", "team_settings_modal.title": "Team Settings", + "team_sidebar.join": "Other teams you can join.", "textbox.bold": "**bold**", "textbox.edit": "Edit message", "textbox.help": "Help", @@ -2170,6 +2170,7 @@ "web.footer.privacy": "Privacy", "web.footer.terms": "Terms", "web.header.back": "Back", + "web.header.logout": "Logout", "web.root.signup_info": "All team communication in one place, searchable and accessible anywhere", "webrtc.busy": "{username} is busy.", "webrtc.call": "Call", |