Merge remote-tracking branch 'origin/trunk' into trunk

# Conflicts:
#	build.gradle

CHANGELOG.md

@@ -1,6 +1,12 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 19.7
+Get ready for a better WooCommerce experience with our latest update! Now, create and manage Google Ads campaigns seamlessly. Enjoy enhanced stability on the order detail screen and get helpful tips with our new AI-powered advice box during product creation. Update now for a smoother, smarter app!
+
+## 19.6
+Boost your WooCommerce experience with our latest update! Dive into enhanced analytics for Google Ads campaigns in the Analytics Hub, streamline package photo flow with our revamped Product Creation AI V2, and enjoy more reliable login. Plus, we've fixed cash payment assignments and improved button statuses on the More screen. Update now for a smoother, smarter store management!
+
 ## 19.5
 We're excited to bring you the latest update for our WooCommerce mobile app! Customize your experience with themed app icons, and enjoy the new Customer Section in the Hub Menu, where merchants can effortlessly manage customer contacts and delve into customer analytics. Plus, under the hood, we've enhanced compatibility with Android 14. Discover these improvements and more in our latest release!
 

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
+19.8
+-----
+
+
 19.7
 -----
 - [**] Google Listing and Ads: Google Ads campaign creation and management is now available for sites with the plugin active and set up. [https://github.com/woocommerce/woocommerce-android/pull/12145]

fastlane/metadata/PlayStoreStrings.pot

@@ -16,16 +16,16 @@ msgid "Introduces the new Woo WearOS app featuring instant updates on store data
 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_196"
+msgctxt "release_note_197"
 msgid ""
-"19.6:\n"
-"Boost your WooCommerce experience with our latest update! Dive into enhanced analytics for Google Ads campaigns in the Analytics Hub, streamline package photo flow with our revamped Product Creation AI V2, and enjoy more reliable login. Plus, we've fixed cash payment assignments and improved button statuses on the More screen. Update now for a smoother, smarter store management!\n"
+"19.7:\n"
+"Get ready for a better WooCommerce experience with our latest update! Now, create and manage Google Ads campaigns seamlessly. Enjoy enhanced stability on the order detail screen and get helpful tips with our new AI-powered advice box during product creation. Experience the improvements today!\n"
 msgstr ""
 
-msgctxt "release_note_195"
+msgctxt "release_note_196"
 msgid ""
-"19.5:\n"
-"We're excited to bring you the latest update for our WooCommerce mobile app! Customize your experience with themed app icons, and enjoy the new Customer Section in the Hub Menu, where merchants can effortlessly manage customer contacts and delve into customer analytics. Plus, under the hood, we've enhanced compatibility with Android 14. Discover these improvements and more in our latest release!\n"
+"19.6:\n"
+"Boost your WooCommerce experience with our latest update! Dive into enhanced analytics for Google Ads campaigns in the Analytics Hub, streamline package photo flow with our revamped Product Creation AI V2, and enjoy more reliable login. Plus, we've fixed cash payment assignments and improved button statuses on the More screen. Update now for a smoother, smarter store management!\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 @@
-Boost your WooCommerce experience with our latest update! Dive into enhanced analytics for Google Ads campaigns in the Analytics Hub, streamline package photo flow with our revamped Product Creation AI V2, and enjoy more reliable login. Plus, we've fixed cash payment assignments and improved button statuses on the More screen. Update now for a smoother, smarter store management!
+Get ready for a better WooCommerce experience with our latest update! Now, create and manage Google Ads campaigns seamlessly. Enjoy enhanced stability on the order detail screen and get helpful tips with our new AI-powered advice box during product creation. Experience the improvements today!

fastlane/resources/values/strings.xml

@@ -505,9 +505,11 @@
     <string name="analytics_google_ads_no_data">No Programs this period</string>
     <string name="analytics_session_no_data">No sessions this period</string>
     <string name="analytics_session_no_available">Session data unavailable</string>
+    <string name="analytics_custom_list_selection_button_description">Filter selection</string>
     <string name="analytics_session_no_available_description">Session analytics rely on unique visitor counts not available for custom date ranges</string>
     <string name="analytics_total_sales_title">Total sales</string>
-    <string name="analytics_spend_value">Spend: %1$s</string>
+    <string name="analytics_spend_subtitle_value">Spend: %1$s</string>
+    <string name="analytics_total_sales_subtitle_value">Total Sales: %1$s</string>
     <string name="analytics_used_title">Used</string>
     <string name="analytics_net_sales_title">Net sales</string>
     <string name="analytics_information_card_delta" translatable="false">%1$s%2$d%%</string>
@@ -526,6 +528,12 @@
     <string name="analytics_bundles_card_title">Bundles</string>
     <string name="analytics_gift_cards_card_title">Gift Cards</string>
     <string name="analytics_google_ads_card_title">Google Campaigns</string>
+    <string name="analytics_google_ads_metric_card_title">Metric</string>
+    <string name="analytics_google_ads_filter_total_sales">Total Sales</string>
+    <string name="analytics_google_ads_filter_spend">Spend</string>
+    <string name="analytics_google_ads_filter_conversion">Conversion</string>
+    <string name="analytics_google_ads_filter_impressions">Impressions</string>
+    <string name="analytics_google_ads_filter_clicks">Clicks</string>
     <string name="analytics_google_ads_programs_card_title">Programs</string>
     <string name="analytics_conversion_subtitle">Conversion Rate</string>
     <string name="analytics_visitors_subtitle">Visitors</string>
@@ -2247,7 +2255,9 @@
     <string name="ai_product_creation_replace_image">Replace photo</string>
     <string name="ai_product_creation_remove_image">Remove photo</string>
     <string name="ai_product_creation_image_selected">Photo selected</string>
-    <string name="ai_product_creation_image_selected_subtitle">Photo will be added to product</string>
+    <string name="ai_product_creation_image_scan_subtitle">Add text scanned from a photo</string>
+    <string name="ai_product_creation_image_selected_subtitle">Photo text added to starting info</string>
+    <string name="ai_product_creation_image_scanned_subtitle">Scanning image</string>
     <string name="ai_product_creation_scanning_image">Scanning image</string>
     <string name="ai_product_creation_scanning_photo_error">Error while trying to scan the text from the photo. Please try again</string>
     <string name="ai_product_creation_prompt_suggestion_initial">Add your product\'s name and key features, benefits, or details to help it get found online.</string>
@@ -2256,6 +2266,7 @@
     <string name="ai_product_creation_prompt_suggestion_almost_there"><![CDATA[<b>Great prompt!</b> Where was it made?]]></string>
     <string name="ai_product_creation_prompt_suggestion_great_prompt"><![CDATA[<b>Great prompt!</b> You\'ve given us enough to work with, but you may add more detail to make it even better.]]></string>
     <string name="ai_product_creation_error_media_upload">Failed to upload the selected product image.</string>
+    <string name="ai_product_creation_photo_removed">Photo removed</string>
 
     <!--
         Product Add more details Bottom sheet
@@ -4170,7 +4181,7 @@
     -->
     <string name="woopos_exit_pos">Exit POS</string>
     <string name="woopos_reader_connected">Reader Connected</string>
-    <string name="woopos_reader_disconnected">Reader Disconnected</string>
+    <string name="woopos_reader_disconnected">Connect your reader</string>
     <string name="woopos_checkout">Checkout</string>
     <string name="woopos_reader_unknown">Reader Status Unknown</string>
     <string name="woopos_checkout_button">Check out</string>
@@ -4179,6 +4190,7 @@
     <string name="woopos_clear_cart_button">Clear</string>
 
     <string name="woopos_exit_confirmation_title">Exit POS</string>
+    <string name="woopos_get_support_title">Get Support</string>
     <string name="woopos_exit_confirmation_message">Are you sure you want to exit POS?</string>
     <string name="woopos_exit_confirmation_confirm_button">Exit</string>
     <string name="woopos_exit_confirmation_dismiss_button">Cancel</string>
@@ -4199,6 +4211,17 @@
     <string name="woopos_totals_main_error_label">Couldn\'t load totals</string>
     <string name="woopos_cart_empty_subtitle">Tap on a product to\nadd it to the cart</string>
     <string name="woopos_cart_empty_content_description">Cart is empty</string>
+    <string name="woopos_splash_title">Starting up</string>
+    <string name="woopos_splash_message">Let’s serve some customers</string>
+    <string name="woopos_products_empty_list_image_description">No products</string>
+    <string name="woopos_products_empty_list_title">No supported products found</string>
+    <string name="woopos_products_empty_list_message">POS currently only supports simple products – \ncreate one to get started.</string>
+    <string name="woopos_products_empty_list_message_two">POS currently only supports simple products</string>
+    <string name="woopos_products_loading_error_title">Error loading products</string>
+    <string name="woopos_products_loading_error_message">Give it another go?</string>
+    <string name="woopos_error_icon_content_description">Error indication icon</string>
+    <string name="woopos_products_loading_error_retry_button">Rerty</string>
+    <string name="woopos_totals_order_creation_error">Couldn\'t create order</string>
 
     <string name="customers_details_customer_section">Customer</string>
     <string name="customers_details_orders_section">Orders</string>
@@ -4220,4 +4243,11 @@
 
     <string name="customers_details_no_phone_hint">No phone number</string>
     <string name="customers_details_none_hint">None</string>
+
+    <!--
+    Google ads campaign creation
+    -->
+    <string name="google_ads_campaign_created_success_title">Ready to Go!</string>
+    <string name="google_ads_campaign_created_success_description">Your new campaign has been created. Exciting times ahead for your sales!</string>
+    <string name="google_ads_campaign_created_success_done_button">Done</string>
 </resources>

version.properties

@@ -1,2 +1,2 @@
-versionName=19.6
-versionCode=580
+versionName=19.7-rc-1
+versionCode=581