From ff41b817139f7f78c3b0e4b46b52f46275519e47 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Fri, 12 Jun 2015 07:59:06 +0200
Subject: [PATCH] Improved wording.

---
 .../javascripts/app/controllers/widget/maintenance.js.coffee  | 2 +-
 .../app/controllers/widget/session_taken_over.js.coffee       | 4 ++--
 test/browser/maintenance_message_test.rb                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee b/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
index 5674c7283..c35af8237 100644
--- a/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
+++ b/app/assets/javascripts/app/controllers/widget/maintenance.js.coffee
@@ -14,7 +14,7 @@ class Widget extends App.Controller
   showMessage: (message = {}) =>
     if message.reload
       @disconnectClient()
-      button = 'Reload application'
+      button = 'Continue session'
 
     # convert to html and linkify
     message.message = App.Utils.textCleanup( message.message )
diff --git a/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee b/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
index 477db047e..90a048857 100644
--- a/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
+++ b/app/assets/javascripts/app/controllers/widget/session_taken_over.js.coffee
@@ -40,11 +40,11 @@ class Widget extends App.Controller
           if data.taskbar_id isnt App.TaskManager.TaskbarId()
             @error = new App.SessionMessage(
               head:        'Session'
-              message:     'Session taken over... please reload page or work with other browser window.'
+              message:     App.i18n.translateInline('A new session with your account was created. This session will be stopped to prevent a conflict.')
               keyboard:    false
               backdrop:    true
               close:       false
-              button:      'Reload application'
+              button:      'Continue session'
               forceReload: true
             )
             @disconnectClient()
diff --git a/test/browser/maintenance_message_test.rb b/test/browser/maintenance_message_test.rb
index ac8d8270a..a50611470 100644
--- a/test/browser/maintenance_message_test.rb
+++ b/test/browser/maintenance_message_test.rb
@@ -162,7 +162,7 @@ class MaintenanceMessageTest < TestCase
     watch_for(
       browser: browser2,
       css: '.modal',
-      value: 'Reload application',
+      value: 'Continue session',
     )
 
     match_not(