From c952985ffd035f95e82fef2fbc2e8bd48ab9ec3b Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 2 Dec 2016 10:43:14 -0300 Subject: translations PR 20161128 (#4666) --- webapp/i18n/en.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'webapp/i18n/en.json') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1334c7358..55ee0c2ad 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -146,11 +146,6 @@ "admin.authentication.oauth": "OAuth 2.0", "admin.authentication.saml": "SAML", "admin.banner.heading": "Note:", - "admin.metrics.enableTitle": "Enable Performance Monitoring:", - "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see documentation to learn more about configuring performance monitoring for Mattermost.", - "admin.metrics.listenAddressTitle": "Listen Address:", - "admin.metrics.listenAddressEx": "Ex \":8067\"", - "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.", "admin.cluster.enableDescription": "When true, Mattermost will run in High Availability mode. Please see documentation to learn more about configuring High Availability for Mattermost.", "admin.cluster.enableTitle": "Enable High Availability Mode:", "admin.cluster.interNodeListenAddressDesc": "The address the server will listen on for communicating with other servers.", @@ -501,6 +496,11 @@ "admin.log.logSettings": "Log Settings", "admin.logs.reload": "Reload", "admin.logs.title": "Server Logs", + "admin.metrics.enableDescription": "When true, Mattermost will enable performance monitoring collection and profiling. Please see documentation to learn more about configuring performance monitoring for Mattermost.", + "admin.metrics.enableTitle": "Enable Performance Monitoring:", + "admin.metrics.listenAddressDesc": "The address the server will listen on to expose performance metrics.", + "admin.metrics.listenAddressEx": "Ex \":8067\"", + "admin.metrics.listenAddressTitle": "Listen Address:", "admin.nav.help": "Help", "admin.nav.logout": "Logout", "admin.nav.report": "Report a Problem", @@ -708,7 +708,6 @@ "admin.sidebar.audits": "Compliance and Auditing", "admin.sidebar.authentication": "Authentication", "admin.sidebar.cluster": "High Availability (Beta)", - "admin.sidebar.metrics": "Performance Monitoring (Beta)", "admin.sidebar.compliance": "Compliance", "admin.sidebar.configuration": "Configuration", "admin.sidebar.connections": "Connections", @@ -732,6 +731,7 @@ "admin.sidebar.logging": "Logging", "admin.sidebar.login": "Login", "admin.sidebar.logs": "Logs", + "admin.sidebar.metrics": "Performance Monitoring (Beta)", "admin.sidebar.nativeAppLinks": "Mattermost App Links", "admin.sidebar.notifications": "Notifications", "admin.sidebar.oauth": "OAuth 2.0", @@ -807,9 +807,9 @@ "admin.team.maxChannelsDescription": "Maximum total number of channels per team, including both active and deleted channels.", "admin.team.maxChannelsExample": "Ex \"100\"", "admin.team.maxChannelsTitle": "Max Channels Per Team:", - "admin.team.maxNotificationsPerChannelTitle" : "Max Notifications Per Channel:", - "admin.team.maxNotificationsPerChannelExample" : "Ex \"1000\"", - "admin.team.maxNotificationsPerChannelDescription" : "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.", + "admin.team.maxNotificationsPerChannelDescription": "Maximum total number of users in a channel before users typing messages, @all, @here, and @channel no longer send notifications because of performance.", + "admin.team.maxNotificationsPerChannelExample": "Ex \"1000\"", + "admin.team.maxNotificationsPerChannelTitle": "Max Notifications Per Channel:", "admin.team.maxUsersDescription": "Maximum total number of users per team, including both active and inactive users.", "admin.team.maxUsersExample": "E.g.: \"25\"", "admin.team.maxUsersTitle": "Max Users Per Team:", -- cgit v1.2.3-1-g7c22