Merge pull request #10679 from woocommerce/merge/17.2-code-freeze-int…

…o-trunk Merge 17.2 code freeze to trunk
woocommerce · Feb 5, 2024 · b3bc3e9 · b3bc3e9
2 parents e4821ab + 37c6ea8
commit b3bc3e9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 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>]
 
+17.3
+-----
+
+
 17.3
 -----
 - [*] [Internal] Enhanced user experience in shipping label creation with automatic scrolling to the first invalid field upon form submission failure [https://github.com/woocommerce/woocommerce-android/pull/10657]

diff --git a/WooCommerce/metadata/PlayStoreStrings.pot b/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_171"
+msgctxt "release_note_172"
 msgid ""
-"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"
+"17.2:\n"
+"This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.\n"
 msgstr ""
 
-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 ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

diff --git a/WooCommerce/metadata/release_notes.txt b/WooCommerce/metadata/release_notes.txt
@@ -1 +1 @@
-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.
+This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.
diff --git a/build.gradle b/build.gradle
@@ -96,7 +96,7 @@ tasks.register("installGitHooks", Copy) {
 }
 
 ext {
-    fluxCVersion = 'trunk-b34cc5eed609ca5274fbb442991f657f2380de17'
+    fluxCVersion = '2.65.0'
     glideVersion = '4.13.2'
     coilVersion = '2.1.0'
     constraintLayoutVersion = '1.2.0'

diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
@@ -153,6 +153,7 @@
     <string name="show_password_content_description">Show password</string>
     <string name="last_update">Last update: %s</string>
     <string name="last_update_with_frequency">Last update %s (Updates every 30 minutes)</string>
+    <string name="receipt_fetching_error">Sorry, we couldn\'t load a receipt for this order</string>
 
     <!--
         Date/Time Labels
@@ -1506,7 +1507,9 @@
     <string name="card_reader_payment_description_v2">In-Person Payment for Order #%1$s for %2$s blog_id %3$s.</string>
     <string name="card_reader_payment_receipt_email_subject">Your receipt from %s</string>
     <string name="card_reader_payment_receipt_email_content">Thank you for your purchase! Click the link below for your payment receipt.\n\n%s</string>
-    <string name="card_reader_payment_email_client_not_found">Can\'t detect your email client app</string>
+    <string name="card_reader_payment_email_client_not_found">Unable to detect any application to which the receipt can be shared</string>
+    <string name="card_reader_payment_receipt_can_not_be_downloaded">Unable to download the receipt</string>
+    <string name="card_reader_payment_receipt_can_not_be_stored">Unable to store the receipt</string>
     <string name="card_reader_refetching_order_failed">Error fetching order. Order state in the app might be outdated.</string>
     <string name="card_reader_payment_order_paid_payment_cancelled">The order is already paid</string>
     <string name="card_reader_payment_reader_not_connected">Please make sure that the card reader is connected.</string>

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
-versionName=17.1
-versionCode=502
+versionName=17.2-rc-1
+versionCode=503
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		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.
		This version includes optimizations for speed and reliability. We are committed to continuously improving the app, making managing your online store more efficient and hassle-free.