From 6611229cd7bd3cdfc0082c0a581145aaac0ab322 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 4 May 2016 06:31:42 -0700 Subject: PLT-2707 Adding option to show DM list from all of server (#2871) * PLT-2707 Adding option to show DM list from all of server * Fixing loc --- webapp/i18n/en.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index fbbf66fbd..da2acba3d 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -542,6 +542,10 @@ "admin.team.userCreationTitle": "Enable User Creation: ", "admin.team_analytics.activeUsers": "Active Users With Posts", "admin.team_analytics.totalPosts": "Total Posts", + "admin.team.restrictDirectMessage": "Enable users to open Direct Message channels with:", + "admin.team.restrictDirectMessageDesc": "'Any user on the Mattermost server' enables users to open a Direct Message channel with any user on the server, even if they are not on any teams together. 'Any member of the team' limits the ability to open Direct Message channels to only users who are in the same team.", + "admin.team.restrict_direct_message_any": "Any user on the Mattermost server", + "admin.team.restrict_direct_message_team": "Any member of the team", "admin.userList.title": "Users for {team}", "admin.userList.title2": "Users for {team} ({count})", "admin.user_item.authServiceEmail": ", Sign-in Method: Email", @@ -859,6 +863,9 @@ "file_upload.pasted": "Image Pasted at ", "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}", "filtered_user_list.countTotal": "{count} {count, plural, =0 {0 members} one {member} other {members}} of {total} Total", + "filtered_user_list.show": "Show", + "filtered_user_list.any_team": "All Users", + "filtered_user_list.team_only": "Members of this Team", "filtered_user_list.member": "Member", "filtered_user_list.search": "Search members", "find_team.email": "Email", @@ -1120,7 +1127,7 @@ "sidebar.createChannel": "Create new channel", "sidebar.createGroup": "Create new group", "sidebar.direct": "Direct Messages", - "sidebar.more": "More ({count})", + "sidebar.more": "More", "sidebar.moreElips": "More...", "sidebar.pg": "Private Groups", "sidebar.removeList": "Remove from list", -- cgit v1.2.3-1-g7c22