summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json14
1 files changed, 7 insertions, 7 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index fbd1b53c3..7fbe464c1 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -518,10 +518,14 @@
"admin.team.openServerDescription": "When true, anyone can signup for a user account on this server without the need to be invited.",
"admin.team.openServerTitle": "Enable Open Server: ",
"admin.team.restrictDescription": "Teams and user accounts can only be created from a specific domain (e.g. \"mattermost.org\") or list of comma-separated domains (e.g. \"corp.mattermost.com, mattermost.org\").",
+ "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.restrictExample": "Ex \"corp.mattermost.com, mattermost.org\"",
"admin.team.restrictNameDesc": "When true, You cannot create a team name with reserved words like www, admin, support, test, channel, etc",
"admin.team.restrictNameTitle": "Restrict Team Names: ",
"admin.team.restrictTitle": "Restrict Creation To Domains:",
+ "admin.team.restrict_direct_message_any": "Any user on the Mattermost server",
+ "admin.team.restrict_direct_message_team": "Any member of the team",
"admin.team.save": "Save",
"admin.team.saving": "Saving Config...",
"admin.team.siteNameDescription": "Name of service shown in login screens and UI.",
@@ -539,10 +543,6 @@
"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": ", <strong>Sign-in Method:</strong> Email",
@@ -858,13 +858,13 @@
"file_upload.filesAbove": "Files above {max}MB could not be uploaded: {filenames}",
"file_upload.limited": "Uploads limited to {count} files maximum. Please use additional posts for more files.",
"file_upload.pasted": "Image Pasted at ",
+ "filtered_user_list.any_team": "All Users",
"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",
+ "filtered_user_list.show": "Show",
+ "filtered_user_list.team_only": "Members of this Team",
"find_team.email": "Email",
"find_team.findDescription": "An email was sent with links to any teams to which you are a member.",
"find_team.findTitle": "Find Your Team",