woocommerce · bozidarsevo · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
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.6
+In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions.
+
 ## 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!
 

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.7
+-----
+
+
 20.6
 -----
 - [*] Dashboard: Cards are now displayed in 2 columns on large screen sizes. [https://github.com/woocommerce/woocommerce-ios/pull/13983]

diff --git a/WooCommerce/Resources/AppStoreStrings.pot b/WooCommerce/Resources/AppStoreStrings.pot
@@ -61,11 +61,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v20.5-whats-new"
+msgctxt "v20.6-whats-new"
 msgid ""
-"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"
+"In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions.\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

diff --git a/WooCommerce/Resources/en.lproj/Localizable.strings b/WooCommerce/Resources/en.lproj/Localizable.strings
@@ -1414,6 +1414,9 @@ which should be translated separately and considered part of this sentence. */
 /* The total amount for weekly spend on the Blaze budget setting screen. Reads like: $35 USD weekly spend */
 "blazeBudgetSettingViewModel.weeklySpendAmount" = "%1$@ weekly spend";
 
+/* Question in the feedback banner after a Blaze campaign is successfully created */
+"blazeCampaignCreationCoordinator.feedbackQuestion" = "How was the experience with Blaze?";
+
 /* Button to dismiss the alert when attempting to start Blaze campaign creation flow without any product in the store */
 "blazeCampaignCreationCoordinator.NoProductAlert.cancel" = "Cancel";
 
@@ -4470,6 +4473,9 @@ which should be translated separately and considered part of this sentence. */
 /* Option to select the Fastmail app when logging in with magic links */
 "Fastmail" = "Fastmail";
 
+/* Description of the filter used to show only favorite products. */
+"favoriteProductsFilter.favoriteProducts" = "Favorite Products";
+
 /* Featured Product switch in Product Catalog Visibility */
 "Featured Product" = "Featured Product";
 
@@ -4528,6 +4534,9 @@ which should be translated separately and considered part of this sentence. */
 /* Row title for filtering orders by Product. */
 "filterOrderListViewModel.OrderListFilter.rowTitleProduct" = "Product";
 
+/* Row title for filtering products by favorite products. */
+"filterProductListViewModel.favoriteProduct" = "Favorite Products";
+
 /* Filters button text on header bar on top of order list
    Navigation bar title format for filtering a list of products without filters applied. */
 "Filters" = "Filters";
@@ -7527,6 +7536,13 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the button used on a card payment error from the Point of Sale Checkout to go back and try another payment method. */
 "pointOfSale.cardPresent.paymentErrorNonRetryable.tryAnotherPaymentMethod.button.title" = "Try another payment method";
 
+/* Button to come back to order editing when a card payment fails. Presented to users after payment intention creation fails on the Point of Sale Checkout
+   Button to try to collect a payment again. Presented to users after collecting a payment intention creation fails on the Point of Sale Checkout */
+"pointOfSale.cardPresent.paymentIntentCreationError.backToCheckout.button.title" = "Try payment again";
+
+/* Error message. Presented to users after payment intent creation fails on the Point of Sale Checkout */
+"pointOfSale.cardPresent.paymentIntentCreationError.title" = "Payment preparation error";
+
 /* Indicates to wait while payment is processing. Presented to users when payment collection starts */
 "pointOfSale.cardPresent.paymentProcessing.message" = "Please wait...";
 
@@ -7761,6 +7777,9 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the alert presented when payment capture may have failed. This draws extra attention to the issue. */
 "pointOfSale.cardPresentPayment.paymentCaptureError.order.may.have.failed.title" = "This order may have failed";
 
+/* The title of the floating button to indicate that the reader is not ready for another connection, usually because a connection has just been cancelled */
+"pointOfSale.floatingButtons.cancellingConnection.pleaseWait.title" = "Please wait";
+
 /* The title of the menu button to disconnect a connected card reader, as confirmation. */
 "pointOfSale.floatingButtons.disconnectCardReader.button.title" = "Disconnect Reader";
 
@@ -8312,6 +8331,12 @@ which should be translated separately and considered part of this sentence. */
 /* Title message indicating that images are unavailable because the site is private. */
 "productFormTableViewDataSource.wpComStoreNotPublicTitle" = "The images are unavailable because your site is marked Private. You can change this by switching to Coming Soon mode.";
 
+/* Mark favorite button title in Edit Product More Options Action Sheet */
+"productFormViewController.markAsFavorite" = "Mark as favorite";
+
+/* Remove favorite button title in Edit Product More Options Action Sheet */
+"productFormViewController.removeAsFavorite" = "Remove from favorite";
+
 /* Button to dismiss the product image picker screen */
 "productImagePickerView.cancel" = "Cancel";
 
@@ -12146,9 +12171,51 @@ which should be translated separately and considered part of this sentence. */
    Title of the webview for WCPay setup from onboarding. */
 "WooPayments" = "WooPayments";
 
+/* Button to select a package to use for a shipment in the shipping label creation flow. */
+"wooShipping.createLabel.addPackage.button" = "Select a Package";
+
 /* Title of the button to dismiss the shipping label creation screen */
 "wooShipping.createLabel.cancelButton" = "Cancel";
 
+/* Label for section in shipping label creation to declare when a package contains hazardous materials. */
+"wooShipping.createLabel.hazmatLabel" = "Are you shipping dangerous goods or hazardous materials?";
+
+/* Message in the shipping rate section during shipping label creation, when there is no selected package. */
+"wooShipping.createLabel.shippingRate.placeholderMessage" = "Enter your package's dimensions or pick a carrier package option to see the available shipping rates.";
+
+/* Call to action in the shipping rate section during shipping label creation, when there is no selected package. */
+"wooShipping.createLabel.shippingRate.placeholderTitle" = "Select a package to get shipping rates";
+
+/* Label for the toggle to mark the order as complete on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.markComplete" = "Mark this order complete and notify the customer";
+
+/* Header for order details section on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.orderDetails" = "Order details";
+
+/* Label for the menu to select a paper size on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.paperSize" = "Choose label paper size";
+
+/* Label for button to purchase the shipping label on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.purchase" = "Purchase Label";
+
+/* Label for address where the shipment is shipped from on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.shipFrom" = "Ship from";
+
+/* Header for shipment costs section on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.shipmentCosts" = "Shipment costs";
+
+/* Label for address where the shipment is shipped to on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.shipTo" = "Ship to";
+
+/* Label for row showing the subtotal for shipment costs on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.subtotal" = "Subtotal";
+
+/* Label on the bottom sheet that can be expanded to show shipment detailson the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.title" = "Shipment details";
+
+/* Label for row showing the total for shipment costs on the shipping label creation screen */
+"wooShipping.createLabels.bottomSheet.total" = "Total";
+
 /* Total number of items to ship during shipping label creation. Reads like: '3 items' */
 "wooShipping.createLabels.items.count" = "%1$@ items";
 

diff --git a/WooCommerce/Resources/release_notes.txt b/WooCommerce/Resources/release_notes.txt
@@ -1,3 +1 @@
-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!
-
-
+In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions.
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.5.0.2
-VERSION_SHORT = 20.5
+VERSION_LONG = 20.6.0.0
+VERSION_SHORT = 20.6
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		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!


		In this update, we’ve improved the dashboard with a cleaner, 2-column layout on larger screens. Jetpack setup is now smoother, and campaigns cancel instantly with immediate feedback options. Creating product categories is faster with an auto-opening keyboard, and your phone stays active during card reader updates for seamless transactions.