Bug 1856432 - Change default onboarding strings

app/onboarding.fml.yaml

@@ -11,9 +11,9 @@ features:
         default:
             default-browser:
               card-type: default-browser
-              title: juno_onboarding_default_browser_title_nimbus
+              title: juno_onboarding_default_browser_title_nimbus_2
               ordering: 10
-              body: juno_onboarding_default_browser_description_nimbus
+              body: juno_onboarding_default_browser_description_nimbus_2
               link-text: juno_onboarding_default_browser_description_link_text
               image-res: ic_onboarding_welcome
               primary-button-label: juno_onboarding_default_browser_positive_button
@@ -31,8 +31,8 @@ features:
 
             sync-sign-in:
               card-type: sync-sign-in
-              title: juno_onboarding_sign_in_title
-              body: juno_onboarding_sign_in_description
+              title: juno_onboarding_sign_in_title_2
+              body: juno_onboarding_sign_in_description_2
               image-res: ic_onboarding_sync
               ordering: 20
               primary-button-label: juno_onboarding_sign_in_positive_button
@@ -40,8 +40,8 @@ features:
 
             notification-permission:
               card-type: notification-permission
-              title: juno_onboarding_enable_notifications_title_nimbus
-              body: juno_onboarding_enable_notifications_description_nimbus
+              title: juno_onboarding_enable_notifications_title_nimbus_2
+              body: juno_onboarding_enable_notifications_description_nimbus_2
               image-res: ic_notification_permission
               ordering: 30
               primary-button-label: juno_onboarding_enable_notifications_positive_button

app/src/main/java/org/mozilla/fenix/onboarding/view/JunoOnboardingScreen.kt

@@ -267,8 +267,8 @@ private fun defaultPreviewPages() = listOf(
     OnboardingPageUiData(
         type = OnboardingPageUiData.Type.DEFAULT_BROWSER,
         imageRes = R.drawable.ic_onboarding_welcome,
-        title = stringResource(R.string.juno_onboarding_default_browser_title_nimbus),
-        description = stringResource(R.string.juno_onboarding_default_browser_description_nimbus),
+        title = stringResource(R.string.juno_onboarding_default_browser_title_nimbus_2),
+        description = stringResource(R.string.juno_onboarding_default_browser_description_nimbus_2),
         linkText = stringResource(R.string.juno_onboarding_default_browser_description_link_text),
         primaryButtonLabel = stringResource(R.string.juno_onboarding_default_browser_positive_button),
         secondaryButtonLabel = stringResource(R.string.juno_onboarding_default_browser_negative_button),
@@ -276,16 +276,16 @@ private fun defaultPreviewPages() = listOf(
     OnboardingPageUiData(
         type = OnboardingPageUiData.Type.SYNC_SIGN_IN,
         imageRes = R.drawable.ic_onboarding_sync,
-        title = stringResource(R.string.juno_onboarding_sign_in_title),
-        description = stringResource(R.string.juno_onboarding_sign_in_description),
+        title = stringResource(R.string.juno_onboarding_sign_in_title_2),
+        description = stringResource(R.string.juno_onboarding_sign_in_description_2),
         primaryButtonLabel = stringResource(R.string.juno_onboarding_sign_in_positive_button),
         secondaryButtonLabel = stringResource(R.string.juno_onboarding_sign_in_negative_button),
     ),
     OnboardingPageUiData(
         type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION,
         imageRes = R.drawable.ic_notification_permission,
-        title = stringResource(R.string.juno_onboarding_enable_notifications_title_nimbus),
-        description = stringResource(R.string.juno_onboarding_enable_notifications_description_nimbus),
+        title = stringResource(R.string.juno_onboarding_enable_notifications_title_nimbus_2),
+        description = stringResource(R.string.juno_onboarding_enable_notifications_description_nimbus_2),
         primaryButtonLabel = stringResource(R.string.juno_onboarding_enable_notifications_positive_button),
         secondaryButtonLabel = stringResource(R.string.juno_onboarding_enable_notifications_negative_button),
     ),

app/src/main/res/values/strings.xml

@@ -308,10 +308,14 @@
     <!-- Juno first user onboarding flow experiment, strings are marked unused as they are only referenced by Nimbus experiments. -->
     <!-- Title for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_title_nimbus" tools:ignore="UnusedResources">Make Firefox your go-to browser</string>
+    <string name="juno_onboarding_default_browser_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Make Firefox your go-to browser</string>
+    <!-- Title for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_title_nimbus_2">We love keeping you safe</string>
     <!-- Description for set firefox as default browser screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_default_browser_description_nimbus" tools:ignore="UnusedResources">Firefox puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our privacy notice.</string>
+    <string name="juno_onboarding_default_browser_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Firefox puts people over profits and defends your privacy by blocking cross-site trackers.\n\nLearn more in our privacy notice.</string>
+    <!-- Description for set firefox as default browser screen used by Nimbus experiments. -->
+    <string name="juno_onboarding_default_browser_description_nimbus_2">Our non-profit backed browser helps stop companies from secretly following you around the web.\n\nLearn more in our privacy notice.</string>
     <!-- Text for the link to the privacy notice webpage for set as firefox default browser screen.
     This is part of the string with the key "juno_onboarding_default_browser_description". -->
     <string name="juno_onboarding_default_browser_description_link_text" tools:ignore="UnusedResources">privacy notice</string>
@@ -320,19 +324,30 @@
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_default_browser_negative_button" tools:ignore="UnusedResources">Not now</string>
     <!-- Title for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_title" tools:ignore="UnusedResources">Hop from phone to laptop and back</string>
+    <string name="juno_onboarding_sign_in_title" moz:removedIn="120" tools:ignore="UnusedResources">Hop from phone to laptop and back</string>
+    <!-- Title for sign in to sync screen. -->
+    <string name="juno_onboarding_sign_in_title_2">Stay encrypted when you hop between devices</string>
     <!-- Description for sign in to sync screen. -->
-    <string name="juno_onboarding_sign_in_description" tools:ignore="UnusedResources">Grab tabs and passwords from your other devices to pick up where you left off.</string>
+    <string name="juno_onboarding_sign_in_description" moz:removedIn="120" tools:ignore="UnusedResources">Grab tabs and passwords from your other devices to pick up where you left off.</string>
+    <!-- Description for sign in to sync screen. Nimbus experiments do not support string placeholders.
+     Note: The word "Firefox" should NOT be translated   -->
+    <string name="juno_onboarding_sign_in_description_2">When you\'re signed in and synced, you\'re safer. Firefox encrypts your passwords, bookmarks, and more.</string>
     <!-- Text for the button to sign in to sync on the device -->
     <string name="juno_onboarding_sign_in_positive_button" tools:ignore="UnusedResources">Sign in</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
     <string name="juno_onboarding_sign_in_negative_button" tools:ignore="UnusedResources">Not now</string>
     <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
         Note: The word "Firefox" should NOT be translated -->
-    <string name="juno_onboarding_enable_notifications_title_nimbus" tools:ignore="UnusedResources">Notifications help you do more with Firefox</string>
+    <string name="juno_onboarding_enable_notifications_title_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Notifications help you do more with Firefox</string>
+    <!-- Title for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+        Note: The word "Firefox" should NOT be translated -->
+    <string name="juno_onboarding_enable_notifications_title_nimbus_2">Notifications help you stay safer with Firefox</string>
+    <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
+       Note: The word "Firefox" should NOT be translated   -->
+    <string name="juno_onboarding_enable_notifications_description_nimbus" moz:removedIn="120" tools:ignore="UnusedResources">Send tabs between devices, manage downloads, and get tips on getting the most out of Firefox.</string>
     <!-- Description for enable notification permission screen used by Nimbus experiments. Nimbus experiments do not support string placeholders.
        Note: The word "Firefox" should NOT be translated   -->
-    <string name="juno_onboarding_enable_notifications_description_nimbus" tools:ignore="UnusedResources">Send tabs between devices, manage downloads, and get tips on getting the most out of Firefox.</string>
+    <string name="juno_onboarding_enable_notifications_description_nimbus_2">Securely send tabs between your devices and discover other privacy features in Firefox.</string>
     <!-- Text for the button to request notification permission on the device -->
     <string name="juno_onboarding_enable_notifications_positive_button" tools:ignore="UnusedResources">Turn on notifications</string>
     <!-- Text for the button dismiss the screen and move on with the flow -->
@@ -945,10 +960,10 @@
     <string name="collection_open_tabs">Open tabs</string>
     <!-- Hint for adding name of a collection -->
     <string name="collection_name_hint">Collection name</string>
-	<!-- Text for the menu button to rename a top site -->
-	<string name="rename_top_site">Rename</string>
-	<!-- Text for the menu button to remove a top site -->
-	<string name="remove_top_site">Remove</string>
+    <!-- Text for the menu button to rename a top site -->
+    <string name="rename_top_site">Rename</string>
+    <!-- Text for the menu button to remove a top site -->
+    <string name="remove_top_site">Remove</string>
     <!-- Text for the menu button to delete a top site from history -->
     <string name="delete_from_history">Delete from history</string>
     <!-- Postfix for private WebApp titles, placeholder is replaced with app name -->
@@ -2027,14 +2042,14 @@
     <string name="top_sites_max_limit_confirmation_button">OK, Got It</string>
     <!-- Label for the preference to show the shortcuts for the most visited top sites on the homepage -->
     <string name="top_sites_toggle_top_recent_sites_4">Shortcuts</string>
-	<!-- Title text displayed in the rename top site dialog. -->
-	<string name="top_sites_rename_dialog_title">Name</string>
+    <!-- Title text displayed in the rename top site dialog. -->
+    <string name="top_sites_rename_dialog_title">Name</string>
     <!-- Hint for renaming title of a shortcut -->
     <string name="shortcut_name_hint">Shortcut name</string>
-	<!-- Button caption to confirm the renaming of the top site. -->
-	<string name="top_sites_rename_dialog_ok">OK</string>
-	<!-- Dialog button text for canceling the rename top site prompt. -->
-	<string name="top_sites_rename_dialog_cancel">Cancel</string>
+    <!-- Button caption to confirm the renaming of the top site. -->
+    <string name="top_sites_rename_dialog_ok">OK</string>
+    <!-- Dialog button text for canceling the rename top site prompt. -->
+    <string name="top_sites_rename_dialog_cancel">Cancel</string>
     <!-- Text for the menu button to open the homepage settings. -->
     <string name="top_sites_menu_settings">Settings</string>
     <!-- Text for the menu button to navigate to sponsors and privacy support articles. '&amp;' is replaced with the ampersand symbol: & -->