Merge release/24.3 into trunk

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 24.3
+We’ve improved stability in Site Picker by fixing a crash that could happen when re-adding a previously hidden site. This update makes switching back to hidden stores smoother and more reliable.
+
 ## 24.2
 Signing in just got easier and more secure! This update adds passkey support for WordPress.com accounts during Jetpack setup, so you can skip the password and log in with a tap. We also introduced booking management for eligible stores, helping you handle appointments right from the app.
 

RELEASE-NOTES.txt

@@ -2,6 +2,10 @@
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
 
+24.4
+-----
+
+
 24.3
 -----
 - [*] Fixed a crash when re-adding a previously hidden site in Site Picker [https://github.com/woocommerce/woocommerce-android/pull/15439]

fastlane/metadata/PlayStoreStrings.pot

@@ -16,17 +16,16 @@ msgid "This update makes the Wear app run more smoothly with faster startup time
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_242"
+msgctxt "release_note_243"
 msgid ""
-"24.2:\n"
-"Signing in just got easier and more secure! This update adds passkey support for WordPress.com accounts during Jetpack setup, so you can skip the password and log in with a tap. We also introduced booking management for eligible stores, helping you handle appointments right from the app.\n"
+"24.3:\n"
+"We’ve improved stability in Site Picker by fixing a crash that could happen when re-adding a previously hidden site. This update makes switching back to hidden stores smoother and more reliable.\n"
 msgstr ""
 
-msgctxt "release_note_241"
+msgctxt "release_note_242"
 msgid ""
-"24.1:\n"
-"We've made some under-the-hood improvements to make your WooCommerce experience even better. No flashy new features this time—just good old-fashioned maintenance to keep things running smoothly.\n"
-"Thanks for selling with WooCommerce! 🚀\n"
+"24.2:\n"
+"Signing in just got easier and more secure! This update adds passkey support for WordPress.com accounts during Jetpack setup, so you can skip the password and log in with a tap. We also introduced booking management for eligible stores, helping you handle appointments right from the app.\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -1 +1 @@
-Signing in just got easier and more secure! This update adds passkey support for WordPress.com accounts during Jetpack setup, so you can skip the password and log in with a tap. We also introduced booking management for eligible stores, helping you handle appointments right from the app.
+We’ve improved stability in Site Picker by fixing a crash that could happen when re-adding a previously hidden site. This update makes switching back to hidden stores smoother and more reliable.

fastlane/resources/values/strings.xml

@@ -2314,6 +2314,7 @@
     <string name="settings_licenses">Open source licenses</string>
     <string name="settings_whats_new">What\'s New in WooCommerce</string>
     <string name="settings_whats_new_icon_description">New feature icon image</string>
+    <string name="feature_announcement_dismiss">Not Now</string>
     <string name="settings_app_theme_title">Appearance</string>
     <string name="settings_app_theme_option_light">Light</string>
     <string name="settings_app_theme_option_dark">Dark</string>
@@ -2642,8 +2643,10 @@
     <string name="woo_push_notifications_introduction_update_required_title">Get push notifications for your store</string>
     <string name="woo_push_notifications_introduction_update_required_body">Your store is already connected to WordPress.com, but you\'ll need to update the WooCommerce plugin to enable push notifications for new orders, reviews, and more.</string>
     <string name="woo_push_notifications_introduction_update_plugin">Update plugin</string>
-    <string name="woo_push_notifications_connection_steps_title">Connect to WordPress.com</string>
-    <string name="woo_push_notifications_connection_steps_body">Please wait while we finalize connecting your store &lt;b&gt;%1$s&lt;/b&gt; to WordPress.com.</string>
+    <string name="woo_push_notifications_connection_steps_title_connect">Connect to WordPress.com</string>
+    <string name="woo_push_notifications_connection_steps_body_connect">Please wait while we finalize connecting your store &lt;b&gt;%1$s&lt;/b&gt; to WordPress.com.</string>
+    <string name="woo_push_notifications_connection_steps_title_setup">Set up push notifications</string>
+    <string name="woo_push_notifications_connection_steps_body_setup">Please wait while we set up push notifications for &lt;b&gt;%1$s&lt;/b&gt;.</string>
     <string name="woo_push_notifications_connection_steps_step_connect_store">Connect store to WordPress.com</string>
     <string name="woo_push_notifications_connection_steps_step_check_plugin_compatibility">Check plugin compatibility</string>
     <string name="woo_push_notifications_connection_steps_step_enable_push_notifications">Enable push notifications</string>
@@ -2655,6 +2658,8 @@
     <string name="woo_push_notifications_connection_steps_go_to_my_store">Go to My Store</string>
     <string name="woo_push_notifications_connection_steps_retry">Try again</string>
     <string name="woo_push_notifications_connection_steps_generic_error">There was an error completing your request.\nPlease try again or contact support if this error continues.</string>
+    <string name="woo_push_notifications_connection_steps_error_plugin_update_required">Your current WooCommerce plugin version %1$s needs updating to fully connect your store to WordPress.com.</string>
+    <string name="woo_push_notifications_connection_steps_update_plugin">Update plugin</string>
 
     <string name="jetpack_install_start_title">Install Jetpack</string>
     <string name="jetpack_install_start_subtitle">Install the free Jetpack plugin to &lt;strong&gt;%s&lt;/strong&gt; to experience the best mobile experience.</string>
@@ -3921,6 +3926,7 @@
     <string name="woopos_bookings_details_location_label">Location</string>
     <string name="woopos_bookings_details_duration_label">Duration</string>
     <string name="woopos_bookings_details_customer_title">Customer</string>
+    <string name="woopos_bookings_details_customer_guest_badge">Guest</string>
     <string name="woopos_bookings_details_billing_address_label">Billing address</string>
     <string name="woopos_bookings_details_customer_note_label">Note</string>
     <string name="woopos_bookings_payment_status_paid">Paid</string>
@@ -3984,6 +3990,7 @@
     <string name="woopos_search_back_content_description">Back</string>
     <string name="woopos_search_clear_content_description">Clear</string>
     <string name="woopos_search_products">Search products</string>
+    <string name="woopos_search_products_and_variations">Search products and variations</string>
     <string name="woopos_search_coupons">Search coupons</string>
     <string name="woopos_search_orders">Search orders</string>
     <string name="woopos_search_popular_items_title">Popular products</string>

version.properties

@@ -1,2 +1,2 @@
-versionName=24.2.1
-versionCode=731
+versionName=24.3-rc-1
+versionCode=732