summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-03-31 14:46:29 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-03-31 16:33:08 -0300
commit271876f3b53225611dfee40fd46917c6a477314b (patch)
tree1cde4a5faa62ee4f8478df802e05a87d4d1bfa36 /webapp/components/admin_console
parent36f611fac48536f26770357de8d5b6767bd46d2f (diff)
downloadchat-271876f3b53225611dfee40fd46917c6a477314b.tar.gz
chat-271876f3b53225611dfee40fd46917c6a477314b.tar.bz2
chat-271876f3b53225611dfee40fd46917c6a477314b.zip
Add missing en locs and translations to es
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/compliance_settings.jsx2
-rw-r--r--webapp/components/admin_console/user_item.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/compliance_settings.jsx b/webapp/components/admin_console/compliance_settings.jsx
index fb2ae26f9..206bb0faa 100644
--- a/webapp/components/admin_console/compliance_settings.jsx
+++ b/webapp/components/admin_console/compliance_settings.jsx
@@ -223,7 +223,7 @@ export default class ComplianceSettings extends React.Component {
</label>
<p className='help-text'>
<FormattedMessage
- id='admin.compliance.enableDesc'
+ id='admin.compliance.enableDailyDesc'
defaultMessage='When true, Mattermost will generate a daily compliance report.'
/>
</p>
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index 91f567d4d..c00050584 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -333,7 +333,7 @@ export default class UserItem extends React.Component {
<div>
<FormattedMessage
id='admin.user_item.confirmDemoteDescription'
- defaultMessage="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."
+ defaultMessage="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."
/>
<br/>
<br/>