From b3b71c292db2dcbdcfe03db1c24fa3f57f45794e Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 4 Feb 2016 08:29:15 -0500 Subject: Fix license info localization --- web/static/i18n/en.json | 2 +- web/static/i18n/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'web/static') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index a160aa58f..dffda84f3 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -255,7 +255,7 @@ "admin.license.removing": "Removing License...", "admin.license.uploading": "Uploading License...", "admin.license.enterpriseEdition": "Mattermost Enterprise Edition. Designed for enterprise-scale communication.", - "admin.license.entrepriseType": "

This compiled release of Mattermost platform is provided under a commercial license\n from Mattermost, Inc. based on your subscription level and is subject to the Terms of Service.

\n

Your subscription details are as follows:

\n Name: {name}
\n Company or organization name: {company}
\n Number of users: {users}
\n License issued: {issued}
\n Start date of license: {start}
\n Expiry date of license: {expires}
\n LDAP: {ldap}
", + "admin.license.enterpriseType": "

This compiled release of Mattermost platform is provided under a commercial license from Mattermost, Inc. based on your subscription level and is subject to the Terms of Service.

Your subscription details are as follows:

Name: {name}
Company or organization name: {company}
Number of users: {users}
License issued: {issued}
Start date of license: {start}
Expiry date of license: {expires}
LDAP: {ldap}
", "admin.license.keyRemove": "Remove Enterprise License and Downgrade Server", "admin.licence.keyMigration": "If you’re migrating servers you may need to remove your license key from this server in order to install it on a new server. To start,\n disable all Enterprise Edition features on this server.\n This will enable the ability to remove the license key and downgrade this server from Enterprise Edition to Team Edition.", "admin.license.teamEdition": "Mattermost Team Edition. Designed for teams from 5 to 50 users.", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 0a780c442..b6152474c 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -211,7 +211,7 @@ "admin.licence.keyMigration": "Si estás migrando servidores es posible que necesites remover tu licencia de este servidor para poder instalarlo en un servidor nuevo. Para empezar,\n deshabilita todas las características de la Edición Enterprise de este servidor.\n Esta operación habilitará la opción para remover la licencia y degradar este servidor de la Edición Enterprise a la Edición Team.", "admin.license.edition": "Edición: ", "admin.license.enterpriseEdition": "Mattermost Edición Enterprise. Diseñada para comunicación de escala empresarial.", - "admin.license.entrepriseType": "

Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una licencia comercial\n de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los Términos del Servicio.

\n

Los detalles de tu subscripción son los siguientes:

\n Nombre: {name}
\n Nombre de compañia u organización: {company}
\n Cantidad de usuarios: {users}
\n Licencia emitida por: {issued}
\n Inicio de la licencia: {start}
\n Fecha de expiración: {expires}
\n LDAP: {ldap}
", + "admin.license.enterpriseType": "

Esta versión compilada de la plataforma de Mattermost es proporcionada bajo una licencia comercial de Mattermost, Inc. basado en tu nivel de subscripción y sujeto a los Términos del Servicio.

Los detalles de tu subscripción son los siguientes:

Nombre: {name}
Nombre de compañia u organización: {company}
Cantidad de usuarios: {users}
Licencia emitida por: {issued}
Inicio de la licencia: {start}
Fecha de expiración: {expires}
LDAP: {ldap}
", "admin.license.key": "Llave de la Licencia: ", "admin.license.keyRemove": "Remover la Licencia Enterprise y Degradar el Servidor", "admin.license.removing": "Removiendo Licencia...", -- cgit v1.2.3-1-g7c22 From a3df1eaa5520b5aab871464d767f1f56b84b6158 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 4 Feb 2016 09:29:00 -0500 Subject: Rename audits tab --- web/static/i18n/en.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'web/static') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index dffda84f3..bd3a44392 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -50,6 +50,8 @@ "admin.sidebar.teams": "TEAMS ({count})", "admin.sidebar.other": "OTHER", "admin.sidebar.logs": "Logs", + "admin.sidebar.audits": "Compliance and Auditing", + "admin.analytics.loading": "Loading...", "admin.analytics.totalUsers": "Total Users", "admin.analytics.publicChannels": "Public Channels", "admin.analytics.privateGroups": "Private Groups", @@ -293,6 +295,11 @@ "admin.log.save": "Save", "admin.logs.title": "Server Logs", "admin.logs.reload": "Reload", +<<<<<<< HEAD +======= + "admin.audits.title": "User Activity", + "admin.audits.reload": "Reload", +>>>>>>> Rename audits tab "admin.privacy.saving": "Saving Config...", "admin.privacy.title": "Privacy Settings", "admin.privacy.showEmailTitle": "Show Email Address: ", @@ -1257,4 +1264,4 @@ "intro_messages.beginning": "Beginning of {name}", "intro_messages.invite": "Invite others to this {type}", "intro_messages.setHeader": "Set a Header" -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22 From 66a5bdba2e622dc542d1add3acd50a5f2549335a Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Thu, 4 Feb 2016 10:35:31 -0500 Subject: Convert audit_table to a proper table --- web/static/i18n/en.json | 102 +++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 54 deletions(-) (limited to 'web/static') diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index bd3a44392..1ebb91c93 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -8,6 +8,54 @@ "about.date": "Build Date:", "about.hash": "Build Hash:", "about.close": "Close", + "audit_table.sessionRevoked": "The session with id {sessionId} was revoked", + "audit_table.channelCreated": "Created the {channelName} channel/group", + "audit_table.establishedDM": "Established a direct message channel with {username}", + "audit_table.nameUpdated": "Updated the {channelName} channel/group name", + "audit_table.headerUpdated": "Updated the {channelName} channel/group header", + "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}", + "audit_table.userAdded": "Added {username} to the {channelName} channel/group", + "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group", + "audit_table.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}", + "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access", + "audit_table.successfullOAuthAccess": "Successfully gave a new OAuth service access", + "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback", + "audit_table.attemptedOAuthToken": "Attempted to get an OAuth access token", + "audit_table.successfullOAuthToken": "Successfully added a new OAuth service", + "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}", + "audit_table.attemptedLogin": "Attempted to login", + "audit_table.successfullLogin": "Successfully logged in", + "audit_table.failedLogin": "FAILED login attempt", + "audit_table.updatePicture": "Updated your profile picture", + "audit_table.updateGeneral": "Updated the general settings of your account", + "audit_table.attemptedPassword": "Attempted to change password", + "audit_table.successfullPassword": "Successfully changed password", + "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth", + "audit_table.updatedRol": "Updated user role(s) to ", + "audit_table.member": "member", + "audit_table.accountActive": "Account made active", + "audit_table.accountInactive": "Account made inactive", + "audit_table.by": " by {username}", + "audit_table.byAdmin": " by an admin", + "audit_table.sentEmail": "Sent an email to {email} to reset your password", + "audit_table.attemptedReset": "Attempted to reset password", + "audit_table.successfullReset": "Successfully reset password", + "audit_table.updateGlobalNotifications": "Updated your global notification settings", + "audit_table.attemptedWebhookCreate": "Attempted to create a webhook", + "audit_table.successfullWebhookCreate": "Successfully created a webhook", + "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions", + "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook", + "audit_table.successfullWebhookDelete": "Successfully deleted a webhook", + "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions", + "audit_table.logout": "Logged out of your account", + "audit_table.verified": "Sucessfully verified your email address", + "audit_table.revokedAll": "Revoked all current sessions for the team", + "audit_table.loginAttempt": " (Login attempt)", + "audit_table.loginFailure": " (Login failure)", + "audit_table.moreInfo": "More info", + "audit_table.ip": "IP Address", + "audit_table.session": "Session ID", + "audit_table.userId": "User ID", "access_history.title": "Access History", "activity_log_modal.iphoneNativeApp": "iPhone Native App", "activity_log_modal.androidNativeApp": "Android Native App", @@ -33,7 +81,6 @@ "admin.sidebar.statistics": "- Statistics", "admin.sidebar.ldap": "LDAP Settings", "admin.sidebar.license": "Edition and License", - "admin.sidebar.audits": "Audits", "admin.sidebar.reports": "SITE REPORTS", "admin.sidebar.view_statistics": "View Statistics", "admin.sidebar.settings": "SETTINGS", @@ -69,8 +116,6 @@ "admin.analytics.recentActive": "Recent Active Users", "admin.analytics.newlyCreated": "Newly Created Users", "admin.analytics.title": "Statistics for {title}", - "admin.audits.title": "Server Audits", - "admin.audits.reload": "Reload", "admin.email.notificationDisplayExample": "Ex: \"Mattermost Notification\", \"System\", \"No-Reply\"", "admin.email.notificationEmailExample": "Ex: \"mattermost@yourcompany.com\", \"admin@yourcompany.com\"", "admin.email.smtpUsernameExample": "Ex: \"admin@yourcompany.com\", \"AKIADTOVBGERKLCBV\"", @@ -295,11 +340,8 @@ "admin.log.save": "Save", "admin.logs.title": "Server Logs", "admin.logs.reload": "Reload", -<<<<<<< HEAD -======= "admin.audits.title": "User Activity", "admin.audits.reload": "Reload", ->>>>>>> Rename audits tab "admin.privacy.saving": "Saving Config...", "admin.privacy.title": "Privacy Settings", "admin.privacy.showEmailTitle": "Show Email Address: ", @@ -447,54 +489,6 @@ "admin.user_item.makeActive": "Make Active", "admin.user_item.makeInactive": "Make Inactive", "admin.user_item.resetPwd": "Reset Password", - "audit_table.sessionRevoked": "The session with id {sessionId} was revoked", - "audit_table.channelCreated": "Created the {channelName} channel/group", - "audit_table.establishedDM": "Established a direct message channel with {username}", - "audit_table.nameUpdated": "Updated the {channelName} channel/group name", - "audit_table.headerUpdated": "Updated the {channelName} channel/group header", - "audit_table.channelDeleted": "Deleted the channel/group with the URL {url}", - "audit_table.userAdded": "Added {username} to the {channelName} channel/group", - "audit_table.userRemoved": "Removed {username} to the {channelName} channel/group", - "audit_table.attemptedRegisterApp": "Attempted to register a new OAuth Application with ID {id}", - "audit_table.attemptedAllowOAuthAccess": "Attempted to allow a new OAuth service access", - "audit_table.successfullOAuthAccess": "Successfully gave a new OAuth service access", - "audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback", - "audit_table.attemptedOAuthToken": "Attempted to get an OAuth access token", - "audit_table.successfullOAuthToken": "Successfully added a new OAuth service", - "audit_table.oauthTokenFailed": "Failed to get an OAuth access token - {token}", - "audit_table.attemptedLogin": "Attempted to login", - "audit_table.successfullLogin": "Successfully logged in", - "audit_table.failedLogin": "FAILED login attempt", - "audit_table.updatePicture": "Updated your profile picture", - "audit_table.updateGeneral": "Updated the general settings of your account", - "audit_table.attemptedPassword": "Attempted to change password", - "audit_table.successfullPassword": "Successfully changed password", - "audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth", - "audit_table.updatedRol": "Updated user role(s) to ", - "audit_table.member": "member", - "audit_table.accountActive": "Account made active", - "audit_table.accountInactive": "Account made inactive", - "audit_table.by": " by {username}", - "audit_table.byAdmin": " by an admin", - "audit_table.sentEmail": "Sent an email to {email} to reset your password", - "audit_table.attemptedReset": "Attempted to reset password", - "audit_table.successfullReset": "Successfully reset password", - "audit_table.updateGlobalNotifications": "Updated your global notification settings", - "audit_table.attemptedWebhookCreate": "Attempted to create a webhook", - "audit_table.successfullWebhookCreate": "Successfully created a webhook", - "audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions", - "audit_table.attemptedWebhookDelete": "Attempted to delete a webhook", - "audit_table.successfullWebhookDelete": "Successfully deleted a webhook", - "audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions", - "audit_table.logout": "Logged out of your account", - "audit_table.verified": "Sucessfully verified your email address", - "audit_table.revokedAll": "Revoked all current sessions for the team", - "audit_table.loginAttempt": " (Login attempt)", - "audit_table.loginFailure": " (Login failure)", - "audit_table.userId": "User ID", - "audit_table.moreInfo": "More info", - "audit_table.ip": "IP: {ip}", - "audit_table.session": "Session ID: {id}", "authorize.title": "An application would like to connect to your {teamName} account", "authorize.app": "The app {appName} would like the ability to access and modify your basic information.", "authorize.access": "Allow {appName} access?", -- cgit v1.2.3-1-g7c22