Merge pull request #19909 from wordpress-mobile/release/24.0

Merge 24.0 code freeze to trunk
wordpress-mobile · Jan 9, 2024 · 76e41d4 · 76e41d4
2 parents 54367bc + b49a90e
commit 76e41d4
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 30 deletions.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+24.1
+-----
+
+
 24.0
 -----
 * [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754]

diff --git a/WordPress/jetpack_metadata/release_notes.txt b/WordPress/jetpack_metadata/release_notes.txt
@@ -1,4 +1,9 @@
-No updates this week! Enjoy these reindeer facts:
-- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female.
-- Reindeer don’t actually have red noses.
-- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first.
+* [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754]
+* [***] [Jetpack-only] Plans: Upgrade to a Plan from domains dashboard in Jetpack app [https://github.com/wordpress-mobile/WordPress-Android/pull/19818]
+* [**] [internal] Removes unused resources and code [https://github.com/wordpress-mobile/WordPress-Android/pull/19788]
+* [*] Block Editor: Add support for unselecting blocks with the hardware back button [https://github.com/wordpress-mobile/WordPress-Android/pull/19828]
+* [**] [internal] Removes unused code using android tool [https://github.com/wordpress-mobile/WordPress-Android/pull/19850]
+* [**] [internal] [Jetpack-only] Adds support for dynamic dashboard cards driven by the backend [https://github.com/wordpress-mobile/WordPress-Android/pull/19801]
+* [***] Block Editor: Avoid keyboard dismiss when interacting with text blocks [https://github.com/WordPress/gutenberg/pull/57070]
+* [**] Block Editor: Auto-scroll upon block insertion [https://github.com/WordPress/gutenberg/pull/57273]
+
diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,4 +1,8 @@
-No updates this week! Enjoy these reindeer facts:
-- Male reindeer shed their antlers in fall and females in spring, so Santa’s reindeer are female.
-- Reindeer don’t actually have red noses.
-- Santa hasn’t eaten milk and cookies since 2003 because Blitzen always gets there first.
+* [*] Filter media types when sharing files to the editor [https://github.com/wordpress-mobile/WordPress-Android/pull/19754]
+* [**] [internal] Removes unused resources and code [https://github.com/wordpress-mobile/WordPress-Android/pull/19788]
+* [*] Block Editor: Add support for unselecting blocks with the hardware back button [https://github.com/wordpress-mobile/WordPress-Android/pull/19828]
+* [**] [internal] Removes unused code using android tool [https://github.com/wordpress-mobile/WordPress-Android/pull/19850]
+* [**] [internal] [Jetpack-only] Adds support for dynamic dashboard cards driven by the backend [https://github.com/wordpress-mobile/WordPress-Android/pull/19801]
+* [***] Block Editor: Avoid keyboard dismiss when interacting with text blocks [https://github.com/WordPress/gutenberg/pull/57070]
+* [**] Block Editor: Auto-scroll upon block insertion [https://github.com/WordPress/gutenberg/pull/57273]
+
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
@@ -4836,5 +4836,10 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="wp_sotw_2023_dashboard_nudge_title" translatable="false">State of the Word 2023</string>
     <string name="wp_sotw_2023_dashboard_nudge_text" translatable="false">Check out WordPress co-founder Matt Mullenweg’s annual keynote to stay on top of what’s coming in 2024 and beyond.</string>
     <string name="wp_sotw_2023_dashboard_nudge_cta" translatable="false">Watch now</string>
+    <string name="gutenberg_native_file_type_not_supported_as_a_media_file" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">File type not supported as a media file.</string>
+    <string name="gutenberg_native_font_size_1_s" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Font Size, %1$s</string>
+    <string name="gutenberg_native_network_connection_lost_working_offline" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Network connection lost, working offline</string>
+    <string name="gutenberg_native_network_connection_re_established" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Network connection re-established</string>
+    <string name="gutenberg_native_working_offline" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Working Offline</string>
 
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ ext {
     automatticTracksVersion = '3.3.0'
     gutenbergMobileVersion = 'v1.110.0'
     wordPressAztecVersion = 'v1.9.0'
-    wordPressFluxCVersion = 'trunk-37ca3a9ecd10dcd73402c29a4728ab46106dbc1e'
+    wordPressFluxCVersion = '2.61.0'
     wordPressLoginVersion = '1.10.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.11.0'

diff --git a/fastlane/jetpack_resources/values/strings.xml b/fastlane/jetpack_resources/values/strings.xml
@@ -21,10 +21,14 @@
     <string name="login_prologue_revamped_jetpack_feature_text_6">Respond to comments</string>
     <string name="login_prologue_revamped_jetpack_feature_text_7">Restore a backup</string>
     <string name="login_prologue_revamped_jetpack_feature_text_8">Search for plugins</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_9">Share on Facebook</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_9">Share on social</string>
     <string name="login_prologue_revamped_jetpack_feature_text_10">Fix a security issue</string>
     <string name="login_prologue_revamped_jetpack_feature_text_11">Post a photo</string>
-    <string name="login_prologue_revamped_jetpack_feature_text_12">Add an author</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_12">Read other blogs</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_13">Build an audience</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_14">Post a photo</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_15">Write from anywhere</string>
+    <string name="login_prologue_revamped_jetpack_feature_text_16">Manage your domains</string>
 
     <!-- Login Magic Link -->
     <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>

diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
@@ -2328,7 +2328,7 @@
     <string name="my_site_create_new_site">Create a new site for your business, magazine, or personal blog; or connect an existing WordPress installation.</string>
     <string name="my_site_create_new_site_title">You don\'t have any sites</string>
     <string name="my_site_add_new_site">Add new site</string>
-    <string name="my_site_custom_domain_name">All WordPress.com plans include a custom domain name. Register your free premium domain now.</string>
+    <string name="my_site_custom_domain_name">All WordPress.com annual plans include a custom domain name. Register your free domain now.</string>
     <string name="my_site_verify_your_email">Verify your email address - instructions sent to %s</string>
     <string name="my_site_verify_your_email_without_email">Verify your email address - instructions sent to your email</string>
     <string name="my_site_icon_dialog_title">Site Icon</string>
@@ -2660,7 +2660,7 @@
     <string name="register_domain">Register Domain</string>
     <string name="domains_suggestions_select_domain">Select domain</string>
     <string name="domains_suggestions_empty_list">No suggestions found</string>
-    <string name="domains_suggestions_intro_title">Choose a premium domain name</string>
+    <string name="domains_suggestions_intro_title">Choose a custom domain name</string>
     <string name="domains_suggestions_intro_description">This is where people will find you on the internet.</string>
     <string name="domain_suggestions_search_hint">Type a keyword for more ideas</string>
     <string name="domain_suggestions_list_item_cost">%s&lt;span style="color:#50575e;"&gt; /year&lt;/span&gt;</string>
@@ -2692,23 +2692,24 @@
     <string name="domain_registration_state_picker_dialog_title">Select State</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Registering domain name…</string>
 
-    <string name="domains_primary_site_caption">Your free WordPress.com address is</string>
-    <string name="domains_primary_site_more_menu_change_site_address">Change site address</string>
-    <string name="domains_primary_site_address">%s</string>
-    <string name="domains_primary_site_address_chip">Primary site address</string>
-    <string name="domains_site_domains">Your site domains</string>
+    <string name="domains_site_domain">%s</string>
+    <string name="domains_primary_site_domain_chip">Primary domain</string>
+    <string name="domains_site_other_domains">Other domains for %s</string>
+    <string name="domains_free_domain">Your free WordPress.com domain</string>
     <string name="domains_site_domain_expires">Expires on %s</string>
+    <string name="domains_site_domain_never_expires">Never expires</string>
     <string name="domains_site_domain_expires_soon">&lt;span style="color:#d63638;"&gt;Expires on %s&lt;/span&gt;</string>
     <string name="domains_add_a_domain">Add a domain</string>
-    <string name="domains_redirected_domains_blurb">Your domains will redirect to your site at %s</string>
-    <string name="domains_manage_domains">Manage Domains</string>
     <string name="domains_paid_plan_claim_your_domain_title">Claim your free domain</string>
     <string name="domains_paid_plan_claim_your_domain_caption">You have a free one-year domain registration included with your plan</string>
     <string name="domains_paid_plan_add_your_domain_title">Add your domain</string>
     <string name="domains_paid_plan_add_your_domain_caption">Adding a custom domain makes it easy for visitors to find your site</string>
     <string name="domains_free_plan_get_your_domain_title">Get your domain</string>
     <string name="domains_free_plan_get_your_domain_caption">Domains purchased on this site will redirect visitors to &lt;b&gt;%s&lt;/b&gt;</string>
     <string name="domains_search_for_a_domain_button">Search for a domain</string>
+    <string name="domains_upgrade_to_plan_caption">Get a free one-year domain registration or transfer with any annual paid plan.</string>
+    <string name="domains_upgrade_to_a_plan_button">Upgrade to a plan</string>
+    <string name="domains_just_search_for_a_domain_button">Just search for a domain</string>
 
     <!-- Domain Management -->
     <string name="domain_management_expires">Expires %1$s</string>
@@ -4576,13 +4577,6 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="jetpack_full_plugin_install_onboarding_contact_support_button">Contact support</string>
     <string name="jetpack_full_plugin_install_onboarding_dismiss_button_content_description">Close</string>
 
-    <!-- Dashboard Card Domain Transfer-->
-    <string name="domain_transfer_card_title">News</string>
-    <string name="domain_transfer_card_sub_title">Reclaim Your Google Domains</string>
-    <string name="domain_transfer_card_caption">As you may know, Google Domains has been sold to Squarespace. Transfer your domains to WordPress.com now, and we\'ll pay all transfer fees plus an extra year of your domain registration.</string>
-    <string name="domain_transfer_card_cta">Transfer your domains</string>
-    <string name="domain_transfer_card_more_menu_hide_this" translatable="false">@string/my_site_dashboard_card_more_menu_hide_card</string>
-
     <!-- Dashboard Card Plans-->
     <string name="dashboard_card_plans_title">Free domain with annual plan</string>
     <string name="dashboard_card_plans_sub_title">Get a free domain for the first year, remove ads on your site, and increase your storage.</string>
@@ -4820,6 +4814,8 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_the_web_edit" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">For this reason, we recommend editing the block using the web editor.</string>
     <string name="gutenberg_native_for_this_reason_we_recommend_editing_the_block_using_your_web_bro" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">For this reason, we recommend editing the block using your web browser.</string>
 
+    <string name="media_cannot_be_started">We cannot open media at the moment. Please try again later</string>
+
     <!-- Bloganuary -->
     <string name="bloganuary_dashboard_nudge_title_december">Bloganuary is coming!</string>
     <string name="bloganuary_dashboard_nudge_title_january">Bloganuary is here!</string>
@@ -4835,9 +4831,14 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     <string name="bloganuary_dashboard_nudge_overlay_action_turn_on_prompts">Turn on blogging prompts</string>
     <string name="bloganuary_dashboard_nudge_overlay_action_dismiss">Let’s go!</string>
 
-
     <!-- State of the Word 2023 -->
     <string name="wp_sotw_2023_dashboard_nudge_title" translatable="false">State of the Word 2023</string>
     <string name="wp_sotw_2023_dashboard_nudge_text" translatable="false">Check out WordPress co-founder Matt Mullenweg’s annual keynote to stay on top of what’s coming in 2024 and beyond.</string>
     <string name="wp_sotw_2023_dashboard_nudge_cta" translatable="false">Watch now</string>
+    <string name="gutenberg_native_file_type_not_supported_as_a_media_file" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">File type not supported as a media file.</string>
+    <string name="gutenberg_native_font_size_1_s" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Font Size, %1$s</string>
+    <string name="gutenberg_native_network_connection_lost_working_offline" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Network connection lost, working offline</string>
+    <string name="gutenberg_native_network_connection_re_established" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Network connection re-established</string>
+    <string name="gutenberg_native_working_offline" tools:ignore="UnusedResources" a8c-src-lib="gutenberg">Working Offline</string>
+
 </resources>
diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=23.9
-versionCode=1398
+versionName=24.0-rc-1
+versionCode=1399