From bcfb65d728f6e3c7ec6dd905900e1ad4d5f286e3 Mon Sep 17 00:00:00 2001
From: Ashita Agrawal <agr.ash@gmail.com>
Date: Wed, 3 Apr 2024 10:43:59 +0530
Subject: [PATCH] Merge/7.60.1 into 7.61 (#2002)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Michał Sikora <me@mehow.io>
Co-authored-by: Wojciech Zięba <wojtek.zieba@automattic.com>
Co-authored-by: Eduarda Barbosa <42220351+mebarbosa@users.noreply.github.com>
Co-authored-by: Philip Simpson <philz.the.gecko@gmail.com>
---
 .../onboarding/upgrade/UpgradeFeatureItem.kt  |  8 -------
 .../src/main/res/values/strings.xml           | 24 +++++++++----------
 version.properties                            |  2 +-
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/modules/features/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/UpgradeFeatureItem.kt b/modules/features/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/UpgradeFeatureItem.kt
index eba498a7c1d..7bf489c6238 100644
--- a/modules/features/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/UpgradeFeatureItem.kt
+++ b/modules/features/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/onboarding/upgrade/UpgradeFeatureItem.kt
@@ -82,14 +82,6 @@ enum class PatronUpgradeFeatureItem(
         image = IR.drawable.ic_new_features,
         title = LR.string.onboarding_patron_feature_early_access_title,
     ),
-    SkipChapters(
-        image = IR.drawable.ic_tick_circle_filled,
-        title = LR.string.skip_chapters,
-        isYearlyFeature = FeatureFlag.isEnabled(Feature.DESELECT_CHAPTERS) &&
-            SubscriptionTier.fromFeatureTier(Feature.DESELECT_CHAPTERS) == SubscriptionTier.PATRON,
-        isMonthlyFeature = FeatureFlag.isEnabled(Feature.DESELECT_CHAPTERS) &&
-            SubscriptionTier.fromFeatureTier(Feature.DESELECT_CHAPTERS) == SubscriptionTier.PATRON,
-    ),
     CloudStorage(
         image = IR.drawable.ic_cloud_storage,
         title = LR.string.onboarding_patron_feature_cloud_storage_title,
diff --git a/modules/services/localization/src/main/res/values/strings.xml b/modules/services/localization/src/main/res/values/strings.xml
index 478ac0d7bdb..18a59ddde8c 100644
--- a/modules/services/localization/src/main/res/values/strings.xml
+++ b/modules/services/localization/src/main/res/values/strings.xml
@@ -345,8 +345,8 @@
 
     <!-- Chapters -->
 
-    <!-- Label that toggles the option for the user to choose which chapters of the podcast they want to skip (to not be played) -->
-    <string name="skip_chapters">Skip chapters</string>
+    <!-- Label that toggles the option for the user to choose which chapters of the podcast they want to preselect (to be played) -->
+    <string name="skip_chapters">Preselect chapters</string>
     <!-- Indicates the number of chapters in a podcast episode. %d is the number of chapters. -->
     <string name="number_of_chapters">%d chapters</string>
     <!-- Singular indication of number of chapters -->
@@ -355,8 +355,8 @@
     <string name="number_of_chapters_summary_plural">%1$d chapters &#x2022; %2$d hidden</string>
     <string name="number_of_chapters_summary_singular">1 chapter &#x2022; %d hidden</string>
     <string name="select_one_chapter_message">Please select at least one chapter</string>
-    <string name="skip_chapters_plus_prompt">Skip chapters and more with Pocket Casts Plus</string>
-    <string name="skip_chapters_patron_prompt">Skip chapters and more with Pocket Casts Patron</string>
+    <string name="skip_chapters_plus_prompt">Preselect chapters and more with Pocket Casts Plus</string>
+    <string name="skip_chapters_patron_prompt">Preselect chapters and more with Pocket Casts Patron</string>
 
     <!-- Podcasts -->
 
@@ -1437,14 +1437,14 @@
     <string name="whats_new_slumber_studios_body">As part of your Yearly Plus subscription, enjoy a 1-year subscription to Slumber Studios content using code %1$s. <![CDATA[<a href="https://slumberstudios.com/">Learn more</a>.]]></string>
     <string name="whats_new_slumber_studios_body_free_user">Subscribe to Plus Yearly and enjoy a 1-year subscription to Slumber Studios content, podcasts designed for the sweetest dreams. <![CDATA[<a href="https://slumberstudios.com/">Learn more</a>.]]></string>
     <string name="whats_new_slumber_studios_redeem_now_button">Redeem your code</string>
-    <!-- Skip Chapters what's new message for Patron users. Don't translate "Patron" -->
-    <string name="whats_new_deselect_chapters_patron_message">As part of your Patron subscription, you can now select and skip chapters in any episode that supports them.</string>
-    <!-- Skip Chapters what's new message for Plus users. Don't translate "Plus" -->
-    <string name="whats_new_deselect_chapters_plus_message">As part of your Plus subscription, you can now select and skip chapters in any episode that supports them.</string>
-    <!-- Skip Chapters what's new message to subscribe to Plus. Don't translate "Plus" -->
-    <string name="whats_new_deselect_chapters_subscribe_to_plus_message">Subscribe to Plus now so you can select and skip chapters in any episode that supports them.</string>
-    <!-- Skip Chapters what's new message to subscribe to Patron. Don't translate "Patron" -->
-    <string name="whats_new_deselect_chapters_subscribe_to_patron_message">Subscribe to Patron now so you can select and skip chapters in any episode that supports them.</string>
+    <!-- Preselect Chapters what's new message for Patron users. Don't translate "Patron" -->
+    <string name="whats_new_deselect_chapters_patron_message">As part of your Patron subscription, you can now preselect and skip chapters automatically in any episode that supports them.</string>
+    <!-- Preselect Chapters what's new message for Plus users. Don't translate "Plus" -->
+    <string name="whats_new_deselect_chapters_plus_message">As part of your Plus subscription, you can now preselect and skip chapters automatically in any episode that supports them.</string>
+    <!-- Preselect Chapters what's new message to subscribe to Plus. Don't translate "Plus" -->
+    <string name="whats_new_deselect_chapters_subscribe_to_plus_message">Subscribe to Plus now so you can preselect and skip chapters automatically in any episode that supports them.</string>
+    <!-- Preselect Chapters what's new message to subscribe to Patron. Don't translate "Patron" -->
+    <string name="whats_new_deselect_chapters_subscribe_to_patron_message">Subscribe to Patron now so you can preselect and skip chapters automatically in any episode that supports them.</string>
     <!-- Used in a button meaning that the user understood the message. -->
     <string name="whats_new_got_it_button">Got it</string>
     <!-- Button title to upgrade to Plus. Don't translate "Plus" -->
diff --git a/version.properties b/version.properties
index 5bc6af25550..abc6048e9ce 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 versionName=7.61-rc-1
-versionCode=9207
\ No newline at end of file
+versionCode=9208
\ No newline at end of file