Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH-2218: Browser Onboarding Copy Edits #666

Merged
merged 2 commits into from Jan 26, 2021
Merged
Changes from 1 commit
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

Next

Add welcome message, startpage message already updated

  • Loading branch information
benstrumeyer committed Jan 26, 2021
commit 097b12fea186e135ebac4c200aa1a115012a1635
@@ -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"
@@ -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>
ProTip! Use n and p to navigate between commits in a pull request.