Merge pull request #10640 from woocommerce/merge/17.1-code-freeze-int…

…o-trunk

Merge 17.1 code freeze to trunk

RELEASE-NOTES.txt

@@ -1,4 +1,8 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
+17.2
+-----
+
+
 17.1
 -----
 - [*] [Internal] Fixed crash when going to background from the order creation screen [https://github.com/woocommerce/woocommerce-android/pull/10600]

WooCommerce/metadata/PlayStoreStrings.pot

@@ -11,16 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_170"
+msgctxt "release_note_171"
 msgid ""
-"17.0:\n"
-"Get ready for a smoother experience with our latest update! We've ironed out the pesky bug that kept gift cards from showing up in the 'totals' section during order creation and editing. Managing your sales with our WooCommerce app is now more seamless than ever. Update now and enjoy the hassle-free enhancements!\n"
+"17.1:\n"
+"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
 msgstr ""
 
-msgctxt "release_note_169"
+msgctxt "release_note_170"
 msgid ""
-"16.9:\n"
-"Fresh out of the oven! Our latest WooCommerce app update brings you a sleeker shopping cart experience. We've handily relocated the order creation to the bottom of your screen for easy thumb access, giving you more room to navigate. Plus, we've streamlined your workflow by detaching the order editing from the creation process. Get ready for a tidier, more efficient way to manage your sales. Tap "Update" and feel the difference!\n"
+"17.0:\n"
+"Get ready for a smoother experience with our latest update! We've ironed out the pesky bug that kept gift cards from showing up in the 'totals' section during order creation and editing. Managing your sales with our WooCommerce app is now more seamless than ever. Update now and enjoy the hassle-free enhancements!\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

WooCommerce/metadata/release_notes.txt

@@ -1 +1 @@
-Get ready for a smoother experience with our latest update! We've ironed out the pesky bug that kept gift cards from showing up in the 'totals' section during order creation and editing. Managing your sales with our WooCommerce app is now more seamless than ever. Update now and enjoy the hassle-free enhancements!
+This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.

build.gradle

@@ -96,7 +96,7 @@ tasks.register("installGitHooks", Copy) {
 }
 
 ext {
-    fluxCVersion = 'trunk-bf45b08090e8241eb930e1eef32f935bc6cd0424'
+    fluxCVersion = '2.64.0'
     glideVersion = '4.13.2'
     coilVersion = '2.1.0'
     constraintLayoutVersion = '1.2.0'

fastlane/resources/values/strings.xml

@@ -2041,9 +2041,10 @@
     <string name="product_filter_explore_plugin">Explore!</string>
     <string name="scan_barcode_to_update_inventory_menu_item_title">Scan barcode to update inventory</string>
     <string name="product_creation_survey_title">We value your input!</string>
-    <string name="product_creation_survey_description">You\'ve used our AI-assisted feature to add products multiple times now. We\'d love to hear your thoughts to make it even better.</string>
+    <string name="product_creation_survey_description">Got a minute? Help us improve our AI-assisted features with your quick feedback.</string>
     <string name="product_creation_survey_button_open">Start the Survey</string>
-    <string name="product_creation_survey_button_skip">Skip</string>
+    <string name="product_creation_survey_button_remind_me_later">Remind Me Later</string>
+    <string name="product_creation_survey_button_dont_show_again">Don\’t show it Again</string>
 
     <!--
         Product Add more details Bottom sheet
@@ -3825,7 +3826,7 @@
     Blaze campaign preview screen
     -->
     <string name="blaze_campaign_screen_fragment_title">Preview</string>
-    <string name="blaze_campaign_preview_edit_ad_button">Edit ad</string>
+    <string name="blaze_campaign_preview_edit_ad">Edit ad</string>
     <string name="blaze_campaign_preview_shop_now_button">Shop now</string>
     <string name="blaze_campaign_preview_details_section_title">Details</string>
     <string name="blaze_campaign_preview_details_budget">Budget</string>
@@ -3835,6 +3836,38 @@
     <string name="blaze_campaign_preview_details_interests">Interests</string>
     <string name="blaze_campaign_preview_details_destination_url">Ad destination</string>
     <string name="blaze_campaign_preview_details_confirm_details_button">Confirm Details</string>
+    <string name="blaze_campaign_preview_days_duration">%1$s days from %2$s</string>
+    <string name="blaze_campaign_preview_target_default_value">All</string>
+    <!--
+    Blaze campaign budget screen
+    -->
+    <string name="blaze_campaign_budget_toolbar_title">Set your budget</string>
+    <string name="blaze_campaign_budget_subtitle">How much would you like to spend on your product promotion campaign?</string>
+    <string name="blaze_campaign_budget_total_spend">Total spend</string>
+    <string name="blaze_campaign_budget_days_duration">for %1$s days</string>
+    <string name="blaze_campaign_budget_daily_spend">%1$s daily</string>
+    <string name="blaze_campaign_budget_reach_forecast">Estimated people reached per day</string>
+    <string name="blaze_campaign_budget_duration_section_title">Duration</string>
+    <string name="blaze_campaign_budget_edit_duration_button">Edit</string>
+    <string name="blaze_campaign_budget_update_button">Update</string>
+    <string name="blaze_campaign_budget_impressions_title">Impressions</string>
+    <string name="blaze_campaign_budget_impressions_done_button">Done</string>
+    <string name="blaze_campaign_budget_impressions_info">Impressions reflect the frequency with which your ad appears to potential customers.\n\n
+        While exact numbers can\'t be assured due to fluctuating online traffic and user behavior, we aim to match your ad\'s actual impressions as closely as possible to your target count.\n\n
+        Remember, impressions are about visibility, not action taken by viewers.</string>
+    <string name="blaze_campaign_budget_duration_bottom_sheet_title">Set duration</string>
+    <string name="blaze_campaign_budget_duration_bottom_sheet_duration">%1$s days</string>
+    <string name="blaze_campaign_budget_duration_bottom_sheet_starts">Starts</string>
+    <string name="blaze_campaign_budget_duration_bottom_sheet_apply_button">Apply</string>
+
+    <!--
+    Blaze campaign edit-ad screen
+    -->
+    <string name="blaze_campaign_edit_ad_change_image_button">Change image</string>
+    <string name="blaze_campaign_edit_ad_change_tagline_title">Tagline</string>
+    <string name="blaze_campaign_edit_ad_change_description_title">Description</string>
+    <string name="blaze_campaign_edit_ad_characters_remaining">%d characters remaining</string>
+    <string name="blaze_campaign_edit_ad_suggested_by_ai">Suggested by AI</string>
     <!--
     Blaze other
     -->

version.properties

@@ -1,2 +1,2 @@
-versionName=17.0
-versionCode=500
+versionName=17.1-rc-1
+versionCode=501