From 6009acdfbf0558cbb8273d1589e57c0a7a05eaf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Fri, 9 Oct 2020 10:46:36 +0200
Subject: [PATCH] updated wording

---
 src/Umbraco.Web.UI.Client/src/preview/preview.controller.js | 2 +-
 .../src/websitepreview/websitepreview.js                    | 2 +-
 src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml       | 4 ++--
 src/Umbraco.Web.UI/config/umbracoSettings.config            | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
index 412d0c9cc5..056ade090e 100644
--- a/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
@@ -292,7 +292,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
                 var modal = document.createElement("div");
                 modal.className = "umbraco-preview-dialog__modal";
                 modal.innerHTML = `<div class="umbraco-preview-dialog__headline">Preview content?</div>
-                    <div class="umbraco-preview-dialog__question">You have exited preview mode, do you want to continue previewing this content?</div>`;
+                    <div class="umbraco-preview-dialog__question">You have ended preview mode, do you want to continue previewing this content?</div>`;
                 con.appendChild(modal);
 
                 var continueButton = document.createElement("button");
diff --git a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
index cb76b47bb7..43fd152e61 100644
--- a/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
+++ b/src/Umbraco.Web.UI.Client/src/websitepreview/websitepreview.js
@@ -37,7 +37,7 @@
         window.top.location.href = scriptElement.getAttribute("data-umbraco-path")+"/preview/end?redir=" + encodeURIComponent(window.location.pathname+window.location.search);
     }
     function continuePreviewMode(minutsToExpire) {
-        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 2);
+        setCookie("UMB-WEBSITE-PREVIEW-ACCEPT", "true", minutsToExpire || 4);
     }
 
     var user = getCookie("UMB-WEBSITE-PREVIEW-ACCEPT");
diff --git a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
index 8b7d871ba4..912470eb65 100644
--- a/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
+++ b/src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
@@ -65,10 +65,10 @@
                     </div>
                 }
 
-                <button ng-click="openInBrowser()" title="Visit website in a new tab" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
+                <button ng-click="openInBrowser()" title="Open preview in the browser" class="menu-bar__button umb-outline"><i class="icon icon-out"></i><span>Open in browser</span>
                 </button>
 
-                <button ng-click="exitPreview()" title="Exit Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>Exit</span>
+                <button ng-click="exitPreview()" title="End Preview" class="menu-bar__button umb-outline"><i class="icon icon-power"></i><span>End</span>
                 </button>
 
             </div>
diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.config b/src/Umbraco.Web.UI/config/umbracoSettings.config
index 086210e5a5..454da921e7 100644
--- a/src/Umbraco.Web.UI/config/umbracoSettings.config
+++ b/src/Umbraco.Web.UI/config/umbracoSettings.config
@@ -41,11 +41,11 @@
         <![CDATA[
             <div id="umbracoPreviewBadge" class="umbraco-preview-badge">
                 <span class="umbraco-preview-badge__header">Preview mode</span>
-                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open">
+                <a href="{0}/preview/?id={2}" class="umbraco-preview-badge__a open" title="Open preview in BackOffice">
                     …
                 </a>
-                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end">
-                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
+                <a href="{0}/preview/end?redir={1}" class="umbraco-preview-badge__a end" title="End preview mode">
+                    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><title>Click to end preview mode</title><path fill="#fff" d="M5273.1 2400.1v-2c0-2.8-5-4-9.7-4s-9.7 1.3-9.7 4v2a7 7 0 002 4.9l5 4.9c.3.3.4.6.4 1v6.4c0 .4.2.7.6.8l2.9.9c.5.1 1-.2 1-.8v-7.2c0-.4.2-.7.4-1l5.1-5a7 7 0 002-4.9zm-9.7-.1c-4.8 0-7.4-1.3-7.5-1.8.1-.5 2.7-1.8 7.5-1.8s7.3 1.3 7.5 1.8c-.2.5-2.7 1.8-7.5 1.8z"/><path fill="#fff" d="M5268.4 2410.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1h-4.3zM5272.7 2413.7h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1s-.4-1-1-1zM5272.7 2417h-4.3c-.6 0-1 .4-1 1s.4 1 1 1h4.3c.6 0 1-.4 1-1 0-.5-.4-1-1-1z"/><path fill="#fff" d="M78.2 13l-8.7 11.7a32.5 32.5 0 11-51.9 25.8c0-10.3 4.7-19.7 12.9-25.8L21.8 13a47 47 0 1056.4 0z"/><path fill="#fff" d="M42.7 2.5h14.6v49.4H42.7z"/></svg>
                 </a>
             </div>
             <style type="text/css">