From 8710fd9939adb250b45ebce2b38787c04c697853 Mon Sep 17 00:00:00 2001
From: "diana.iacos" <diana.iacos@softvision.ro>
Date: Wed, 29 May 2019 10:55:32 +0000
Subject: [PATCH] Bug 1555044 - Update Onboarding's Sync screen text; r=petru

Because the news strings are unused we need to add them in lint.xml as UnusedResources.
The suppress will be removed it in a future patch.

Differential Revision: https://phabricator.services.mozilla.com/D32979

--HG--
extra : moz-landing-system : lando
---
 mobile/android/app/lint.xml                           | 1 +
 mobile/android/base/locales/en-US/android_strings.dtd | 2 ++
 mobile/android/base/strings.xml.in                    | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/mobile/android/app/lint.xml b/mobile/android/app/lint.xml
index 5c1a1d94f275..5bbe47ca4b4a 100644
--- a/mobile/android/app/lint.xml
+++ b/mobile/android/app/lint.xml
@@ -242,6 +242,7 @@
              preprocessed_resources res/raw folder. Lint reports it as unused. We should get
              rid of the file eventually. See bug 1268948. -->
         <ignore path="**/raw/.mkdir.done" />
+        <ignore regexp="updatednewfirstrun_sync_subtext|updatednewfirstrun_signin_button" />
     </issue>
     <issue id="Usability" severity="error" />
     <issue id="UseCheckPermission" severity="error" />
diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd
index 723b15e63ec2..ac974cc1bbc1 100644
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -24,9 +24,11 @@
 <!ENTITY firstrun_sync_message2 "Pick up where you left off.">
 <!ENTITY firstrun_sync_subtext2 "Use Sync to find the bookmarks, passwords, and other things you save to &brandShortName; on all your devices.">
 <!ENTITY newfirstrun_sync_subtext "Sync the things you save on mobile to Firefox for desktop, privately and securely.">
+<!ENTITY updatednewfirstrun_sync_subtext "Sign in to your account to get the most out of &brandShortName;">
 <!ENTITY firstrun_signin_message "Get connected, get started">
 <!ENTITY firstrun_signin_button "Sign in to Sync">
 <!ENTITY newfirstrun_signin_button "Turn on Sync">
+<!ENTITY updatednewfirstrun_signin_button "Sign in to &brandShortName;">
 <!ENTITY  onboard_start_button_browser "Start Browsing">
 <!ENTITY firstrun_button_notnow "Not right now">
 <!ENTITY firstrun_button_next "Next">
diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in
index cc1e367607bb..6e8ceeb1abed 100644
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -43,8 +43,10 @@
   <string name="firstrun_sync_message">&firstrun_sync_message2;</string>
   <string name="firstrun_sync_subtext">&firstrun_sync_subtext2;</string>
   <string name="newfirstrun_sync_subtext">&newfirstrun_sync_subtext;</string>
+  <string name="updatednewfirstrun_sync_subtext">&updatednewfirstrun_sync_subtext;</string>
   <string name="firstrun_signin_button">&firstrun_signin_button;</string>
   <string name="newfirstrun_signin_button">&newfirstrun_signin_button;</string>
+  <string name="updatednewfirstrun_signin_button">&updatednewfirstrun_signin_button;</string>
   <string name="firstrun_welcome_button_browser">&onboard_start_button_browser;</string>
   <string name="firstrun_button_next">&firstrun_button_next;</string>