From f1a65a74a1f5e4e9c946ae036605bd684ee2e01c Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Wed, 24 Feb 2016 12:09:36 -0800
Subject: Update activity_log_modal.jsx

---
 web/react/components/activity_log_modal.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 1a0c9c6d5..95b4caa12 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -254,7 +254,7 @@ export default class ActivityLogModal extends React.Component {
                     <p className='session-help-text'>
                         <FormattedMessage
                             id='activity_log.sessionsDescription'
-                            defaultMessage="Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the 'Logout' button below to end a session."
+                            defaultMessage="Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session."
                         />
                     </p>
                     {content}
-- 
cgit v1.2.3-1-g7c22


From a10b1f8343abe6be47011ce82e386f09c1aa83ef Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Wed, 24 Feb 2016 12:11:44 -0800
Subject: Update sessionsDescription

---
 web/static/i18n/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 0a4cbde6b..1e68ac1f6 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -17,7 +17,7 @@
   "activity_log.moreInfo": "More info",
   "activity_log.os": "OS: {os}",
   "activity_log.sessionId": "Session ID: {id}",
-  "activity_log.sessionsDescription": "Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the 'Logout' button below to end a session.",
+  "activity_log.sessionsDescription": "Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android Native App",
   "activity_log_modal.iphoneNativeApp": "iPhone Native App",
-- 
cgit v1.2.3-1-g7c22


From 7679637019f91f115431687430f2eb71d1d0748c Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Wed, 24 Feb 2016 12:12:32 -0800
Subject: Update es.json

---
 web/static/i18n/es.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 3991a5b84..1fa86e9ad 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -17,7 +17,6 @@
   "activity_log.moreInfo": "Mas información",
   "activity_log.os": "Sistema Operativo: {os}",
   "activity_log.sessionId": "Sesión ID: {id}",
-  "activity_log.sessionsDescription": "Las sesiones son creadas cuando inicias sesión con tus credenciales en un nuevo navegador desde cualquier dispositivo. Las sesiones te permiten utilizar Mattermost por un período de hasta 30 días sin tener que iniciar sesión nuevamente. Si quieres cerrar tu sesión antes de ese tiempo, utiliza el botón de 'Cerrar Sesión' en la parte de abajo.",
   "activity_log_modal.android": "Android",
   "activity_log_modal.androidNativeApp": "Android App Nativa",
   "activity_log_modal.iphoneNativeApp": "iPhone App Nativa",
-- 
cgit v1.2.3-1-g7c22