Fix accidentally reverted English strings (#6148)

1 files changed, 12 insertions, 8 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 9fa2ee7a2..cf800fc80 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -750,7 +750,6 @@
   "admin.service.webhooksTitle": "Enable Incoming Webhooks: ",
   "admin.service.writeTimeout": "Write Timeout:",
   "admin.service.writeTimeoutDescription": "If using HTTP (insecure), this is the maximum time allowed from the end of reading the request headers until the response is written. If using HTTPS, it is the total time from when the connection is accepted until the response is written.",
-  "admin.sidebar.addTeamSidebar": "Add team from sidebar menu",
   "admin.sidebar.advanced": "Advanced",
   "admin.sidebar.audits": "Compliance and Auditing",
   "admin.sidebar.authentication": "Authentication",
@@ -792,7 +791,6 @@
   "admin.sidebar.push": "Mobile Push",
   "admin.sidebar.rateLimiting": "Rate Limiting",
   "admin.sidebar.reports": "REPORTING",
-  "admin.sidebar.rmTeamSidebar": "Remove team from sidebar menu",
   "admin.sidebar.saml": "SAML",
   "admin.sidebar.security": "Security",
   "admin.sidebar.sessions": "Sessions",
@@ -802,7 +800,6 @@
   "admin.sidebar.statistics": "Team Statistics",
   "admin.sidebar.storage": "Storage",
   "admin.sidebar.support": "Legal and Support",
-  "admin.sidebar.teams": "TEAMS ({count, number})",
   "admin.sidebar.users": "Users",
   "admin.sidebar.usersAndTeams": "Users and Teams",
   "admin.sidebar.view_statistics": "Site Statistics",
@@ -842,6 +839,9 @@
   "admin.system_analytics.activeUsers": "Active Users With Posts",
   "admin.system_analytics.title": "the System",
   "admin.system_analytics.totalPosts": "Total Posts",
+  "admin.system_users.allUsers": "All Users",
+  "admin.system_users.noTeams": "No Teams",
+  "admin.system_users.title": "{siteName} Users",
   "admin.team.brandDesc": "Enable custom branding to show an image of your choice, uploaded below, and some help text, written below, on the login page.",
   "admin.team.brandDescriptionExample": "All team communication in one place, searchable and accessible anywhere",
   "admin.team.brandDescriptionHelp": "Description of service shown in login screens and UI. When not specified, \"All team communication in one place, searchable and accessible anywhere\" is displayed.",
@@ -888,8 +888,6 @@
   "admin.team_analytics.activeUsers": "Active Users With Posts",
   "admin.team_analytics.totalPosts": "Total Posts",
   "admin.true": "true",
-  "admin.userList.title": "Users for {team}",
-  "admin.userList.title2": "Users for {team} ({count})",
   "admin.user_item.authServiceEmail": "<strong>Sign-in Method:</strong> Email",
   "admin.user_item.authServiceNotEmail": "<strong>Sign-in Method:</strong> {service}",
   "admin.user_item.confirmDemoteDescription": "If you demote yourself from the System Admin role and there is not another user with System Admin privileges, you'll need to re-assign a System Admin by accessing the Mattermost server through a terminal and running the following command.",
@@ -970,6 +968,7 @@
   "analytics.system.totalWebsockets": "WebSocket Conns",
   "analytics.team.activeUsers": "Active Users With Posts",
   "analytics.team.newlyCreated": "Newly Created Users",
+  "analytics.team.noTeams": "There are no teams on this server for which to view statistics.",
   "analytics.team.privateGroups": "Private Channels",
   "analytics.team.publicChannels": "Public Channels",
   "analytics.team.recentActive": "Recent Active Users",
@@ -1064,6 +1063,7 @@
   "change_url.longer": "URL must be two or more characters.",
   "change_url.noUnderscore": "URL can not contain two underscores in a row.",
   "change_url.startWithLetter": "URL must start with a letter or number.",
+  "change_url.urlLabel": "Channel URL",
   "channelHeader.addToFavorites": "Add to Favorites",
   "channelHeader.removeFromFavorites": "Remove from Favorites",
   "channel_flow.alreadyExist": "A channel with that URL already exists",
@@ -1075,7 +1075,6 @@
   "channel_flow.set_url_title": "Set Channel URL",
   "channel_header.addMembers": "Add Members",
   "channel_header.addToFavorites": "Add to Favorites",
-  "channel_header.channel": "Channel",
   "channel_header.channelHeader": "Edit Channel Header",
   "channel_header.delete": "Delete Channel",
   "channel_header.flagged": "Flagged Posts",
@@ -1326,6 +1325,7 @@
   "filtered_channels_list.search": "Search channels",
   "filtered_user_list.any_team": "All Users",
   "filtered_user_list.count": "{count} {count, plural, =0 {0 members} one {member} other {members}}",
+  "filtered_user_list.countPage": "{startCount, number} - {endCount, number} {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.countTotalPage": "{startCount, number} - {endCount, number} {count, plural, =0 {0 members} one {member} other {members}} of {total} total",
   "filtered_user_list.member": "Member",
@@ -1614,6 +1614,7 @@
   "login.or": "or",
   "login.password": "Password",
   "login.passwordChanged": " Password updated successfully",
+  "login.placeholderOr": " or ",
   "login.session_expired": " Your session has expired. Please login again.",
   "login.signIn": "Sign in",
   "login.signInLoading": "Signing in...",
@@ -1993,6 +1994,9 @@
   "suggestion.mention.special": "Special Mentions",
   "suggestion.search.private": "Private Channels",
   "suggestion.search.public": "Public Channels",
+  "system_users_list.count": "{count, number} {count, plural, one {user} other {users}}",
+  "system_users_list.countPage": "{startCount, number} - {endCount, number} {count, plural, one {user} other {users}} of {total} total",
+  "system_users_list.countSearch": "{count, number} {count, plural, one {user} other {users}} of {total} total",
   "team_export_tab.download": "download",
   "team_export_tab.export": "Export",
   "team_export_tab.exportTeam": "Export your team",
@@ -2373,9 +2377,9 @@
   "webrtc.declined": "Your call has been declined by {username}.",
   "webrtc.disabled": "{username} has WebRTC disabled, and cannot receive calls. To enable the feature, they must go to Account Settings > Advanced > Preview pre-release features and turn on WebRTC.",
   "webrtc.failed": "There was a problem connecting the video call.",
-  "webrtc.hangup": "Hangup",
+  "webrtc.hangup": "Hang up",
   "webrtc.header": "Call with {username}",
-  "webrtc.inProgress": "You have a call in progress. Please hangup first.",
+  "webrtc.inProgress": "You have a call in progress. Please hang up first.",
   "webrtc.mediaError": "Unable to access camera or microphone.",
   "webrtc.mute_audio": "Mute microphone",
   "webrtc.noAnswer": "{username} is not answering the call.",