Merge 17.0 code freeze to trunk

RELEASE-NOTES.txt

@@ -1,19 +1,13 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
-17.3
+17.1
 -----
-- [*] [Internal] Better displaying of the "locked" state of the buttons on the order creation screen. Fixed bug when it was possible to add "custom amount" even when the order is locked [https://github.com/woocommerce/woocommerce-android/pull/10562]
 
-17.2
+17.0
 -----
 - [*] [Internal] Removed the fields from the models that after the API change are not returned anymore. The endpoint is "deposits/overview-all". [https://github.com/woocommerce/woocommerce-android/pull/10535]
 - [*] [Internal] Tracking of "country" and "currency" properties for entry and exit of the payments flows [https://github.com/woocommerce/woocommerce-android/pull/10528]
 - [*] Fixed bug when gift card was not displayed in the "totals" sections on the order creation/editing screens [https://github.com/woocommerce/woocommerce-android/pull/10546]
-
-17.1
------
-
-17.0
------
+- [*] [Internal] Better displaying of the "locked" state of the buttons on the order creation screen. Fixed bug when it was possible to add "custom amount" even when the order is locked [https://github.com/woocommerce/woocommerce-android/pull/10562]
 
 16.9
 -----

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_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 ""
 
-msgctxt "release_note_168"
+msgctxt "release_note_169"
 msgid ""
-"16.8:\n"
-"We've polished your WooCommerce app experience! Check out the sleek new design for the deposit summary on the payments screen. Say goodbye to crashes after resetting your selected site, and enjoy a smoother store switching process right after you create a new store. Plus, managing custom amounts is now a breeze with our full-screen feature. Update now for a more seamless and stable business management journey!\n"
+"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"
 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 @@
-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!
+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!

build.gradle

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

fastlane/resources/values/strings.xml

@@ -3821,6 +3821,20 @@
     <string name="blaze_campaign_ceation_celebration_message">The ad has been submistted for approval. We’ll send you a confirmation email once it’s approvied and running.</string>
     <string name="blaze_campaign_ceation_celebration_button">Got it</string>
 
+    <!--
+    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_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>
+    <string name="blaze_campaign_preview_details_language">Language</string>
+    <string name="blaze_campaign_preview_details_devices">Devices</string>
+    <string name="blaze_campaign_preview_details_location">Location</string>
+    <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>
     <!--
     Blaze other
     -->

version.properties

@@ -1,2 +1,2 @@
-versionName=16.9
-versionCode=498
+versionName=17.0-rc-1
+versionCode=499