Merge pull request #13680 from woocommerce/merge/release-21.9-into-trunk

Merge release/21.9 into trunk

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 21.9
+We’ve squashed a pesky bug that could cause a crash when adding a new payment card in the Blaze campaign form. This update ensures a smoother and more reliable experience—enjoy hassle-free payments with WooCommerce! 🚀
+
 ## 21.8
 Our latest update brings a smoother WooCommerce experience! The Dashboard now adapts beautifully to tablets, and accessibility in in-person payments has been improved. We've also fixed currency mismatches in order editing and made product selection more flexible. Plus, enjoy better stability, refined UI elements, and a seamless experience when accessing Analytics reports. Update now! 🚀
 

RELEASE-NOTES.txt

@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** 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.
+22.0
+-----
+
+
 21.9
 -----
 - [*][Internal] Added Analytics events in POS [https://github.com/woocommerce/woocommerce-android/pull/13622]

fastlane/metadata/PlayStoreStrings.pot

@@ -16,17 +16,16 @@ msgid "We've improved WooCommerce app! This time we've fixed several bugs and fo
 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_218"
+msgctxt "release_note_219"
 msgid ""
-"21.8:\n"
-"Our latest update brings a smoother WooCommerce experience! The Dashboard now adapts beautifully to tablets, and accessibility in in-person payments has been improved. We've also fixed currency mismatches in order editing and made product selection more flexible. Plus, enjoy better stability, refined UI elements, and a seamless experience when accessing Analytics reports. Update now! 🚀\n"
+"21.9:\n"
+"We’ve squashed a pesky bug that could cause a crash when adding a new payment card in the Blaze campaign form. This update ensures a smoother and more reliable experience—enjoy hassle-free payments with WooCommerce! 🚀\n"
 msgstr ""
 
-msgctxt "release_note_217"
+msgctxt "release_note_218"
 msgid ""
-"21.7:\n"
-"We've improved WooCommerce app! This time we've fixed several bugs and focused on improving user interface. Keep your feedback falling in; it helps us figure how to improve Woo for you. Happy selling!\n"
-"\n"
+"21.8:\n"
+"Our latest update brings a smoother WooCommerce experience! The Dashboard now adapts beautifully to tablets, and accessibility in in-person payments has been improved. We've also fixed currency mismatches in order editing and made product selection more flexible. Plus, enjoy better stability, refined UI elements, and a seamless experience when accessing Analytics reports. Update now! 🚀\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 @@
-Our latest update brings a smoother WooCommerce experience! The Dashboard now adapts beautifully to tablets, and accessibility in in-person payments has been improved. We've also fixed currency mismatches in order editing and made product selection more flexible. Plus, enjoy better stability, refined UI elements, and a seamless experience when accessing Analytics reports. Update now! 🚀
+We’ve squashed a pesky bug that could cause a crash when adding a new payment card in the Blaze campaign form. This update ensures a smoother and more reliable experience—enjoy hassle-free payments with WooCommerce! 🚀

fastlane/resources/values/strings.xml

@@ -4332,8 +4332,8 @@
     <string name="woopos_reader_not_connected_description">Please make sure a card reader is connected.</string>
     <string name="woopos_products_loading_error_retry_button">Retry</string>
     <string name="woopos_totals_order_creation_error">Couldn\'t create order</string>
-    <string name="woopos_totals_success_payment_cash">A cash payment of %1$s was successfully made</string>
-    <string name="woopos_totals_success_payment_card">A card payment of %1$s was successfully made</string>
+    <string name="woopos_totals_success_payment_cash">A cash payment of %1$s was successfully made.</string>
+    <string name="woopos_totals_success_payment_card">A card payment of %1$s was successfully made.</string>
 
     <string name="woopos_variations_empty_list_title">No supported variations found</string>
     <string name="woopos_variations_empty_list_message">POS currently only supports simple, variable, and virtual products – \ncreate one to get started.</string>
@@ -4457,6 +4457,9 @@
     <string name="woo_shipping_labels_package_creation_save_package_option">Save this as a new package template</string>
     <string name="woo_shipping_labels_package_creation_add_package">Add Package</string>
     <string name="woo_shipping_labels_package_creation_error">Failed to load the package data</string>
+    <string name="woo_shipping_labels_package_creation_carrier_loading_error">We are unable to load carrier packages.</string>
+    <string name="woo_shipping_labels_package_creation_saved_loading_error">We are unable to load saved packages.</string>
+    <string name="woo_shipping_labels_package_creation_shipping_rates_loading_error">We are unable to load shipping rates.</string>
     <string name="woo_shipping_labels_package_creation_box_type">Box</string>
     <string name="woo_shipping_labels_package_creation_envelope_type">Envelope</string>
     <string name="woo_shipping_labels_package_creation_error_title">We couldn\'t save the package as template</string>
@@ -4482,11 +4485,26 @@
     <string name="woo_shipping_labels_customs_restriction_quarantine">Quarantine</string>
     <string name="woo_shipping_labels_customs_restriction_sanitary">Sanitary / Phytosanitary inspection</string>
     <string name="woo_shipping_labels_customs_restriction_other">Other</string>
+    <string name="woo_shipping_labels_customs_other_error_message">Type must not be empty</string>
+    <string name="woo_shipping_labels_customs_itn_error_message">Invalid ITN format</string>
+    <string name="woo_shipping_labels_customs_itn_required_message">ITN must not be empty</string>
+    <string name="woo_shipping_labels_customs_product_details_title">Product Details</string>
+    <string name="woo_shipping_labels_customs_product_details_description">Description</string>
+    <string name="woo_shipping_labels_customs_product_details_description_missing">Missing Description</string>
+    <string name="woo_shipping_labels_customs_product_details_tariff">HS tariff number</string>
+    <string name="woo_shipping_labels_customs_product_details_tariff_missing">Missing tariff number</string>
+    <string name="woo_shipping_labels_customs_product_details_value_per_unit">Value per unit</string>
+    <string name="woo_shipping_labels_customs_product_details_weight_per_unit">Weight per unit</string>
+    <string name="woo_shipping_labels_customs_product_details_value_required">Value required</string>
+    <string name="woo_shipping_labels_customs_product_details_origin_country">Origin country</string>
+    <string name="woo_shipping_labels_customs_product_details_origin_country_missing">Missing country</string>
+    <string name="woo_shipping_labels_customs_product_details_origin_country_selection">Select a country</string>
 
 
     <string name="email_not_registered_wpcom">Hmm, we can\'t find a WordPress.com account connected to this email address.</string>
 
     <string name="woo_shipping_edit_origin_address_title">Edit Origin</string>
+    <string name="woo_shipping_edit_destination_address_title">Edit Destination</string>
     <string name="woo_shipping_label_name">Name</string>
     <string name="woo_shipping_label_company">Company</string>
     <string name="woo_shipping_label_country">Country</string>
@@ -4502,15 +4520,24 @@
     <string name="woo_shipping_address_verified">Address verified</string>
     <string name="woo_shipping_address_unverified">Unverified address</string>
     <string name="woo_shipping_address_missing_info">Missing information</string>
+    <string name="woo_shipping_address_missing">Missing address</string>
+    <string name="woo_shipping_address_unsaved_changes">Unsaved changes</string>
+    <string name="woo_shipping_verifying_address_failed">The address verification failed. Please try again.</string>
+    <string name="woo_shipping_updating_address_failed">We couldn\'t update your address. Please try again.</string>
+
 
     <string name="woo_shipping_address_validate_and_save">Validate &amp; Save</string>
     <string name="woo_shipping_address_missing_info_hint">Add missing information</string>
     <string name="woo_shipping_labels_loading_order_error">Unable to load the order</string>
     <string name="woo_shipping_labels_loading_error">Unable to load data</string>
+    <string name="woo_shipping_address_save_changes">Save changes</string>
 
     <string name="woo_shipping_address_validate_title">Validating</string>
     <string name="woo_shipping_address_validate_message">Validating entered address</string>
 
+    <string name="woo_shipping_address_update_title">Updating</string>
+    <string name="woo_shipping_address_update_message">Updating entered address</string>
+
     <string name="woo_shipping_confirm_address_title">Confirm address</string>
     <string name="woo_shipping_confirm_address_description">We have slightly modified the entered address.\nIf correct, please use the suggested address to ensure accurate delivery.</string>
     <string name="woo_shipping_confirm_address_entered">What you entered</string>

version.properties

@@ -1,2 +1,2 @@
-versionName=21.8
-versionCode=650
+versionName=21.9-rc-1
+versionCode=651