From 097b12fea186e135ebac4c200aa1a115012a1635 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 26 Jan 2021 11:49:22 -0500
Subject: [PATCH 1/2] Add welcome message, startpage message already updated

---
 _locales/en/messages.json                              |  9 +++++++++
 .../OnboardingViews/Step0_WelcomeView/WelcomeView.jsx  | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index eb5903e37..77fe0709d 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1773,8 +1773,17 @@
 	"ghostery_dawn_onboarding_welcome": {
 		"message": "Welcome to Ghostery Dawn!"
 	},
+<<<<<<< Updated upstream
 	"ghostery_dawn_onboarding_lets_begin": {
+=======
+<<<<<<< Updated upstream
+	"ghostery_browser_hub_onboarding_lets_begin": {
+>>>>>>> Stashed changes
 		"message": "We've centralized online privacy by integrating our signature as well as novel technologies."
+=======
+	"ghostery_dawn_onboarding_welcome_message": {
+		"message": "Our browser protects your data and blocks bloatware so that you can surf privately and over 2x faster than with Chrome."
+>>>>>>> Stashed changes
 	},
 	"ghostery_dawn_onboarding_lets_do_this": {
 		"message": "Set up My Browser"
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
index 1b25e5772..6b07b5b12 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
@@ -26,8 +26,18 @@ const WelcomeView = (props) => {
 	const { setSetupStep } = actions;
 	return (
 		<div className="WelcomeView__container">
+<<<<<<< Updated upstream
 			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
 			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_lets_begin')}</div>
+=======
+<<<<<<< Updated upstream
+			<div className="WelcomeView__title">{t('ghostery_browser_hub_onboarding_welcome')}</div>
+			<div className="WelcomeView__subtitle">{t('ghostery_browser_hub_onboarding_lets_begin')}</div>
+=======
+			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
+			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_welcome_message')}</div>
+>>>>>>> Stashed changes
+>>>>>>> Stashed changes
 			<img className="WelcomeView__rocketShip" src="/app/images/hub/welcome/rocketShip.png" />
 			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: LOGIN, origin: WELCOME })}>
 				<span>{t('ghostery_dawn_onboarding_lets_do_this')}</span>

From 03be88ec66a6706fa77a74aa9b6d90267b6fec50 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 26 Jan 2021 11:54:20 -0500
Subject: [PATCH 2/2] Fix errors, add max-width to beautify string

---
 _locales/en/messages.json                              |  8 +-------
 .../OnboardingViews/Step0_WelcomeView/WelcomeView.jsx  | 10 ----------
 .../OnboardingViews/Step0_WelcomeView/WelcomeView.scss |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 77fe0709d..844613025 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1773,17 +1773,11 @@
 	"ghostery_dawn_onboarding_welcome": {
 		"message": "Welcome to Ghostery Dawn!"
 	},
-<<<<<<< Updated upstream
 	"ghostery_dawn_onboarding_lets_begin": {
-=======
-<<<<<<< Updated upstream
-	"ghostery_browser_hub_onboarding_lets_begin": {
->>>>>>> Stashed changes
 		"message": "We've centralized online privacy by integrating our signature as well as novel technologies."
-=======
+	},
 	"ghostery_dawn_onboarding_welcome_message": {
 		"message": "Our browser protects your data and blocks bloatware so that you can surf privately and over 2x faster than with Chrome."
->>>>>>> Stashed changes
 	},
 	"ghostery_dawn_onboarding_lets_do_this": {
 		"message": "Set up My Browser"
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
index 6b07b5b12..3f4216740 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx
@@ -26,18 +26,8 @@ const WelcomeView = (props) => {
 	const { setSetupStep } = actions;
 	return (
 		<div className="WelcomeView__container">
-<<<<<<< Updated upstream
-			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
-			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_lets_begin')}</div>
-=======
-<<<<<<< Updated upstream
-			<div className="WelcomeView__title">{t('ghostery_browser_hub_onboarding_welcome')}</div>
-			<div className="WelcomeView__subtitle">{t('ghostery_browser_hub_onboarding_lets_begin')}</div>
-=======
 			<div className="WelcomeView__title">{t('ghostery_dawn_onboarding_welcome')}</div>
 			<div className="WelcomeView__subtitle">{t('ghostery_dawn_onboarding_welcome_message')}</div>
->>>>>>> Stashed changes
->>>>>>> Stashed changes
 			<img className="WelcomeView__rocketShip" src="/app/images/hub/welcome/rocketShip.png" />
 			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: LOGIN, origin: WELCOME })}>
 				<span>{t('ghostery_dawn_onboarding_lets_do_this')}</span>
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss
index e327db797..f25adcef6 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.scss
@@ -28,7 +28,7 @@
 
 .WelcomeView__subtitle {
 	margin-bottom: 20px;
-	width: 392px;
+	max-width: 495px;
 	font-size: 18px;
 	line-height: 2.33;
 	text-align: center;