Merge pull request #9829 from woocommerce/merge/13.8-code-freeze-into-trunk

Merge 13.8 code freeze into trunk

Author: spencertransier

Gemfile.lock

@@ -18,16 +18,16 @@ GEM
     ast (2.4.2)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.752.0)
-    aws-sdk-core (3.171.0)
+    aws-partitions (1.771.0)
+    aws-sdk-core (3.173.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.63.0)
+    aws-sdk-kms (1.64.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.121.0)
+    aws-sdk-s3 (1.122.0)
       aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
@@ -124,8 +124,8 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
-    fastlane (2.212.2)
+    fastimage (2.2.7)
+    fastlane (2.213.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -149,7 +149,7 @@ GEM
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
       optparse (~> 0.1.1)
       plist (>= 3.1.0, < 4.0.0)
@@ -189,7 +189,7 @@ GEM
     git (1.13.2)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.39.0)
+    google-apis-androidpublisher_v3 (0.42.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -243,7 +243,7 @@ GEM
     minitest (5.17.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+13.9
+-----
+
+
 13.8
 -----
 - [Internal] Orders: Bundled products (within a product bundle) are now indented, to show their relationship to the parent bundle. [https://github.com/woocommerce/woocommerce-ios/pull/9778]

WooCommerce/Resources/AppStoreStrings.pot

@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v13.7-whats-new"
+msgctxt "v13.8-whats-new"
 msgid ""
-"You’ve asked for it, and now it’s here! You can now search for an order using a SKU when creating an order on the go. We have also made updates to the product selection so it's easier to search variations of a product. Awesome, right?\n"
+"Lots of updates this week! We've added a new privacy screen for merchants in the EU to better control their privacy choices. We made it easy for you to share your products and store directly from the app. We also focused on fixing a few bugs and enhancements around product and order management. Keep your feedback coming!\n"
 msgstr ""
 
 #. translators: This is a promo message that will be attached on top of a screenshot in the App Store.

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -522,9 +522,6 @@ which should be translated separately and considered part of this sentence. */
 /* Title for adding an external URL row on Product main screen for an external/affiliate product */
 "Add product link" = "Add product link";
 
-/* Title text of the button to add a single product via SKU scanning */
-"Add Product via SKU scanner" = "Add Product via SKU scanner";
-
 /* Action to add linked products to a product in the Linked Products List Selector screen
    Add Products button inside the Linked Products screen.
    Navigation bar title for selecting multiple products.
@@ -1616,6 +1613,9 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the domain purchase success screen. */
 "Congratulations on your purchase" = "Congratulations on your purchase";
 
+/* Message on the celebratory screen after creating first product */
+"Congratulations! You're one step closer to getting the new store ready." = "Congratulations! You're one step closer to getting the new store ready.";
+
 /* Settings > Manage Card Reader > Connected Reader > A prompt to update a reader running older software */
 "Congratulations! Your reader is running the latest software" = "Congratulations! Your reader is running the latest software";
 
@@ -1882,9 +1882,6 @@ which should be translated separately and considered part of this sentence. */
 /* The plural coupon summary. Reads like: Coupon (code1, code2) */
 "Coupons (%1$@)" = "Coupons (%1$@)";
 
-/* The title for a menu that helps debug crashes in production builds */
-"Crash Debug Menu" = "Crash Debug Menu";
-
 /* The title for a button that causes the app to deliberately crash for debugging purposes */
 "Crash Immediately" = "Crash Immediately";
 
@@ -2217,6 +2214,7 @@ which should be translated separately and considered part of this sentence. */
    Add a note screen - button title for closing the view
    Button title for dismissing filtering a list.
    Button to dismiss the alert presented when finding a reader to connect to fails
+   Button to dismiss the first created product screen
    Button to dismiss the Jetpack benefits screen.
    Button to dismiss. Presented to users after collecting a payment fails
    Button to dismiss. Presented to users when updating the card reader software fails
@@ -2974,6 +2972,9 @@ which should be translated separately and considered part of this sentence. */
 /* Text field name in Edit Address Form */
 "First name" = "First name";
 
+/* Title of the celebratory screen after creating the first product */
+"First product created 🎉" = "First product created 🎉";
+
 /* Subtitle for the account creation form. */
 "First, let’s create your account." = "First, let’s create your account.";
 
@@ -5738,6 +5739,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Deletes all activity logs except for the marked 'Current'. */
 "Reset Activity Log" = "Reset Activity Log";
 
+/* The title for a menu to reset the privacy choice banner presentation */
+"Reset Privacy Choice Banner State" = "Reset Privacy Choice Banner State";
+
 /* Button to reset password on the site credential login screen
    Button to reset password on the WPCom password login screen of the Jetpack setup flow.
    The button title for a secondary call-to-action button. When the user can't remember their password. */
@@ -5775,7 +5779,8 @@ This part is the link to the website, and forms part of a longer sentence which
    Retry action title
    Retry button on the error notice for the upgrade view
    Retry button title for the privacy screen notices
-   Retry the last action */
+   Retry the last action
+   Retry title on the notice action button */
 "Retry" = "Retry";
 
 /* Button to try again after connecting to a specific reader fails due to address problems. Intended for use after the merchant corrects the address in the store admin pages.
@@ -6167,6 +6172,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Payment Link method title on the select payment method screen */
 "Share Payment Link" = "Share Payment Link";
 
+/* Title of the action button to share the first created product */
+"Share Product" = "Share Product";
+
 /* Navigates to a screen to share feedback about Tap to Pay on iPhone. */
 "Share Tap to Pay on iPhone Feedback" = "Share Tap to Pay on iPhone Feedback";
 
@@ -7333,6 +7341,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Text of the notice that is displayed while the refund creation fails. */
 "There was an error issuing the refund" = "There was an error issuing the refund";
 
+/* Notice title when there is an error saving the privacy banner choice */
+"There was an error saving your privacy choices." = "There was an error saving your privacy choices.";
+
 /* Notice displayed when searching the list of products fails */
 "There was an error searching products" = "There was an error searching products";
 

WooCommerce/Resources/release_notes.txt

@@ -1 +1 @@
-You’ve asked for it, and now it’s here! You can now search for an order using a SKU when creating an order on the go. We have also made updates to the product selection so it's easier to search variations of a product. Awesome, right?
+Lots of updates this week! We've added a new privacy screen for merchants in the EU to better control their privacy choices. We made it easy for you to share your products and store directly from the app. We also focused on fixing a few bugs and enhancements around product and order management. Keep your feedback coming!

config/Version.Public.xcconfig

@@ -1,7 +1,7 @@
-VERSION_SHORT=13.7
+VERSION_SHORT=13.8
 
 // Public long version example: VERSION_LONG=1.2.0.0
-VERSION_LONG=13.7.0.1
+VERSION_LONG=13.8.0.0
 
 // Re-map our custom version values (used by release-toolkit) to the Xcode ones
 MARKETING_VERSION=$VERSION_SHORT