Merge release/20.5 into trunk (#14009)

woocommerce · Sep 20, 2024 · 9ec592f · 9ec592f
2 parents bc50ce2 + c5f9406
commit 9ec592f
Showing 6 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 20.5
+In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go!
+
 ## 20.4
 In this version we've fixed an issue related to the onboarding of payments. Blaze ads management has also been enhanced for better experiences.
 

diff --git a/RELEASE-NOTES.txt b/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 IPA before release (e.g. major library or OS update).
 
+20.6
+-----
+
+
 20.5
 -----
 - [*] Blaze: Schedule a reminder local notification asking to continue abandoned campaign creation flow. [https://github.com/woocommerce/woocommerce-ios/pull/13950]

diff --git a/WooCommerce/Resources/AppStoreStrings.pot b/WooCommerce/Resources/AppStoreStrings.pot
@@ -61,9 +61,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v20.4-whats-new"
+msgctxt "v20.5-whats-new"
 msgid ""
-"In this version we've fixed an issue related to the onboarding of payments. Blaze ads management has also been enhanced for better experiences.\n"
+"In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go!\n"
 "\n"
 "\n"
 msgstr ""

diff --git a/WooCommerce/Resources/en.lproj/Localizable.strings b/WooCommerce/Resources/en.lproj/Localizable.strings
@@ -5719,6 +5719,12 @@ which should be translated separately and considered part of this sentence. */
 /* Loading. Verb */
 "Loading..." = "Loading...";
 
+/* Message on the local notification to remind to continue the Blaze campaign creation. */
+"localNotification.AbandonedCampaignCreation.body" = "Get your products seen by millions with Blaze and boost your sales";
+
+/* Title of the local notification to remind to continue the Blaze campaign creation. */
+"localNotification.AbandonedCampaignCreation.title" = "Thinking about boosting your sales?";
+
 /* Message on the local notification to remind scheduling a Blaze campaign. */
 "localNotification.BlazeNoCampaignReminder.body" = "Promote your products with Blaze Ads and increase your sales now.";
 
@@ -12143,6 +12149,12 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the button to dismiss the shipping label creation screen */
 "wooShipping.createLabel.cancelButton" = "Cancel";
 
+/* Total number of items to ship during shipping label creation. Reads like: '3 items' */
+"wooShipping.createLabels.items.count" = "%1$@ items";
+
+/* Length, width, and height dimensions with the unit for an item to ship. Reads like: '20 x 35 x 5 cm' */
+"wooShipping.createLabels.items.dimensions" = "%1$@ x %2$@ x %3$@ %4$@";
+
 /* Title for the screen to create a shipping label */
 "wooShipping.createLabels.title" = "Create Shipping Labels";
 

diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt
@@ -1,3 +1,3 @@
-In this version we've fixed an issue related to the onboarding of payments. Blaze ads management has also been enhanced for better experiences.
+In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go!
 
 
diff --git a/config/Version.Public.xcconfig b/config/Version.Public.xcconfig
@@ -1,4 +1,4 @@
 CURRENT_PROJECT_VERSION = $VERSION_LONG
 MARKETING_VERSION = $VERSION_SHORT
-VERSION_LONG = 20.4.0.1
-VERSION_SHORT = 20.4
+VERSION_LONG = 20.5.0.0
+VERSION_SHORT = 20.5
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,3 @@
		In this version we've fixed an issue related to the onboarding of payments. Blaze ads management has also been enhanced for better experiences.
		In this update, we've added a handy reminder feature to help you continue abandoned campaign creation and improved how notifications open directly to campaign creation in Blaze. We’ve also fixed formatting issues for discount and cash payments when device and store currency settings differ. Enjoy a smoother experience managing your store on the go!