Merge pull request #7339 from woocommerce/release/9.7-into-trunk

Merge 9.7 code freeze to trunk

Author: oguzkocer

Gemfile.lock

@@ -1,19 +1,21 @@
 GIT
   remote: git@github.com:wordpress-mobile/release-toolkit
-  revision: a4d04a43125d84288e46ea38b893d001cd660a3b
+  revision: 57e9ad1c7311b076d7c273cd176073748299fdca
   branch: trunk
   specs:
-    fastlane-plugin-wpmreleasetoolkit (4.2.0)
+    fastlane-plugin-wpmreleasetoolkit (5.1.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
       chroma (= 0.2.0)
       diffy (~> 3.3)
       git (~> 1.3)
+      google-cloud-storage (~> 1.31)
       jsonlint (~> 0.3)
       nokogiri (~> 1.11)
       octokit (~> 4.18)
       parallel (~> 1.14)
+      plist (~> 3.1)
       progress_bar (~> 1.3)
       rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
@@ -23,7 +25,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (5.2.8)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -104,7 +106,7 @@ GEM
       highline (~> 2.0.0)
     concurrent-ruby (1.1.10)
     declarative (0.0.20)
-    diffy (3.4.0)
+    diffy (3.4.2)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
@@ -134,8 +136,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
-      multipart-post (>= 1.2, < 3)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -233,7 +235,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
     json (2.6.1)
@@ -245,23 +247,23 @@ GEM
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.13.6)
+    nokogiri (1.13.8)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.8-x86_64-darwin)
       racc (~> 1.4)
-    octokit (4.23.0)
+    octokit (4.25.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    oj (3.13.13)
+    oj (3.13.17)
     optimist (3.0.1)
     options (2.3.2)
     optparse (0.1.1)
@@ -306,7 +308,7 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.9.1)
+    sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     security (0.1.3)
@@ -328,7 +330,7 @@ GEM
       tty-cursor (~> 0.7)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)

RELEASE-NOTES.txt

@@ -1,20 +1,20 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
 9.8
-----
+-----
 - [*] In-Person Payments: The purchase card reader information card appears also in the Orders list screen. [https://github.com/woocommerce/woocommerce-ios/pull/7326]
 
 9.7
-----
+-----
 - [***] Orders: Orders can now be edited within the app. [https://github.com/woocommerce/woocommerce-ios/pull/7300]
+- [**] Orders: You can now view the Custom Fields for an order in the Order Details screen. [https://github.com/woocommerce/woocommerce-ios/pull/7310]
 - [*] In-Person Payments: Card Reader Manuals now appear based on country availability, consolidated into an unique view [https://github.com/woocommerce/woocommerce-ios/pull/7178]
 - [*] Login: Jetpack setup flow is now accessible from the Login with Store Address flow. [https://github.com/woocommerce/woocommerce-ios/pull/7294]
 - [*] In-Person Payments: The purchase card reader information card can be dismissed [https://github.com/woocommerce/woocommerce-ios/pull/7260]
 - [*] In-Person Payments: When dismissing the purchase card reader information card, the user can choose to be reminded in 14 days. [https://github.com/woocommerce/woocommerce-ios/pull/7271]
 - [*] In-Person Payments: The purchase card reader information card appears also in the App Settings screen. [https://github.com/woocommerce/woocommerce-ios/pull/7308]
 - [*] Refund lines in the Order details screen now appear ordered from oldest to newest [https://github.com/woocommerce/woocommerce-ios/pull/7287]
 - [*] Login: when the app is in logged out state, an onboarding screen is shown before the prologue screen if the user hasn't finished or skipped it.  [https://github.com/woocommerce/woocommerce-ios/pull/7324]
-- [**] Orders: You can now view the Custom Fields for an order in the Order Details screen. [https://github.com/woocommerce/woocommerce-ios/pull/7310]
 - [*] Orders: When a store has no orders yet, there is an updated message with a link to learn more on the Orders tab. [https://github.com/woocommerce/woocommerce-ios/pull/7328]
 
 9.6

WooCommerce/Resources/en.lproj/Localizable.strings

@@ -720,7 +720,10 @@ which should be translated separately and considered part of this sentence. */
 /* Title of a button linking to the Automattic website */
 "Automattic family" = "Automattic family";
 
-/* Awaiting payment via (payment method title) */
+/* The title on the payment row of the Order Details screen when the payment is still pending */
+"Awaiting payment" = "Awaiting payment";
+
+/* The title on the payment row of the Order Details screenwhen the payment for a specific payment method is still pending.Reads like: Awaiting payment via Stripe. */
 "Awaiting payment via %@" = "Awaiting payment via %@";
 
 /* Accessibility label for Back button in the navigation bar
@@ -964,9 +967,6 @@ which should be translated separately and considered part of this sentence. */
 /* Alert title for check your email during logIn/signUp. */
 "Check your email!" = "Check your email!";
 
-/* Navigates to Chipper Card Reader manual */
-"Chipper 2X card reader manual" = "Chipper 2X card reader manual";
-
 /* Navigation title on the shipping label country selector screen */
 "Choose a Country" = "Choose a Country";
 
@@ -1353,6 +1353,9 @@ which should be translated separately and considered part of this sentence. */
    Title of button to add a custom tracking carrier if filtering the list yields no results. */
 "Custom Carrier" = "Custom Carrier";
 
+/* Title for the order custom fields list */
+"Custom Fields" = "Custom Fields";
+
 /* Error shown in Shipping Label Origin Address validation for phone number when the it doesn't have expected length for international shipment. */
 "Custom forms require a 10-digit phone number" = "Custom forms require a 10-digit phone number";
 
@@ -1541,6 +1544,9 @@ which should be translated separately and considered part of this sentence. */
 /* Label for button to log in using your site address. The underscores _..._ denote underline */
 "Don't have an account? _Sign up_" = "Don't have an account? _Sign up_";
 
+/* Alert button text on a feature announcement which prevents the banner being shown again */
+"Don't show again" = "Don't show again";
+
 /* Action title to select products to add to a grouped product from search results
    Button to dismiss the Order Editing screen
    Button to finish selecting the Coupon expiry date in the Add or Edit Coupon screen
@@ -1647,10 +1653,10 @@ which should be translated separately and considered part of this sentence. */
 "Easily identify your products with unique codes" = "Easily identify your products with unique codes";
 
 /* Button to edit a customer on the New Order screen
+   Button to edit an order on Order Details screen
    Button to edit an order status on the New Order screen
    Button to edit the customer note on the New Order screen
-   Title text of the button that edits a note when creating a simple payment
-   Title to edit an order */
+   Title text of the button that edits a note when creating a simple payment */
 "Edit" = "Edit";
 
 /* Action to edit the address in Shipping Label Suggested screen */
@@ -1944,6 +1950,9 @@ which should be translated separately and considered part of this sentence. */
 /* Formatted content for coupon expiry date, reads like: Expires August 4, 2022 */
 "Expires %1$@" = "Expires %1$@";
 
+/* The detailed message shown in the Orders → All Orders tab if the list is empty. */
+"Explore how you can increase your store sales" = "Explore how you can increase your store sales";
+
 /* Action sheet option when the user wants to change the Product type to external product */
 "External product" = "External product";
 
@@ -2268,6 +2277,7 @@ which should be translated separately and considered part of this sentence. */
 "In-Person Payment for Order #%1$@ for %2$@ blog_id %3$@" = "In-Person Payment for Order #%1$@ for %2$@ blog_id %3$@";
 
 /* Navigates to In-Person Payments screen
+   Title for a dismissal alert on the upsell card reader feature announcement banner
    Title for the In-Person Payments settings screen */
 "In-Person Payments" = "In-Person Payments";
 
@@ -2350,7 +2360,8 @@ which should be translated separately and considered part of this sentence. */
 /* Title of a button linking to the app's Instagram profile */
 "Instagram" = "Instagram";
 
-/* Navigates to Install Jetpack screen.
+/* Action button for installing Jetpack.Presented when logging in with a site address that does not have a valid Jetpack installation
+   Navigates to Install Jetpack screen.
    Title of install action in the Jetpack benefits view.
    Title of the Install Jetpack intro view
    Title of the Install Jetpack view */
@@ -2475,6 +2486,9 @@ which should be translated separately and considered part of this sentence. */
 /* Long description of what Jetpack is. Presented when users attempt to log in without Jetpack installed or connected */
 "Jetpack is a free WordPress plugin that connects your store with tools needed to give you the best mobile experience, including push notifications and stats." = "Jetpack is a free WordPress plugin that connects your store with tools needed to give you the best mobile experience, including push notifications and stats.";
 
+/* Title of the Jetpack Setup screen */
+"Jetpack Setup" = "Jetpack Setup";
+
 /* Subtitle for button displaying the Automattic Work With Us web page, indicating that Automattic employees can work from anywhere in the world */
 "Join from anywhere" = "Join from anywhere";
 
@@ -2521,6 +2535,7 @@ which should be translated separately and considered part of this sentence. */
 This part is the link to the website, and forms part of a longer sentence which it should be considered a part of.
    Button title in the shipping label creation info screen
    Settings > Privacy Settings. A text link to the cookie policy.
+   Title of button shown in the Orders → All Orders tab if the list is empty.
    Title of button shown in the Reviews tab if the list is empty
    Title of button shown on the Product Reviews screen if the list is empty */
 "Learn more" = "Learn more";
@@ -2553,6 +2568,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Title of letter paper size option for printing a shipping label */
 "Letter (8.5 x 11 in)" = "Letter (8.5 x 11 in)";
 
+/* Caption displayed in the prologue screen shown after onboarding during the login flow. */
+"Let’s get started!" = "Let’s get started!";
+
 /* Title of the cell in Product Inventory Settings > Limit one per order */
 "Limit one per order" = "Limit one per order";
 
@@ -2668,6 +2686,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Subtitle of the product form bottom sheet action for editing tags. */
 "Make your products easier to find with tags" = "Make your products easier to find with tags";
 
+/* Caption displayed in promotional screens shown during the login flow. */
+"Manage and edit orders on the go" = "Manage and edit orders on the go";
+
 /* Navigates to Card Reader management screen */
 "Manage card reader" = "Manage card reader";
 
@@ -2685,9 +2706,6 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Title of the cell in Product Inventory Settings > Manage stock */
 "Manage stock" = "Manage stock";
 
-/* Caption displayed in promotional screens shown during the login flow. */
-"Manage your store orders on the go " = "Manage your store orders on the go ";
-
 /* Section name for manual offsets in time zone selector */
 "Manual Offsets" = "Manual Offsets";
 
@@ -2873,6 +2891,7 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Action navigate to the variation creation screen
    Next nav bar button title in Add Product Attribute Options screen
    Next nav bar button title in Add Product Attribute screen
+   The button title on the login onboarding screen to continue to the next step.
    Title for the button to confirm the amount in the simple payments screen
    Title of a button.
    Title of a button. The text should be capitalized.
@@ -2964,6 +2983,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* The text on the placeholder overlay when there are no tax classes on the Tax Class list picker */
 "No tax classes yet" = "No tax classes yet";
 
+/* Message for a dismissal alert on the upsell card reader feature announcement banner */
+"No worries! You can always get started with In-Person Payments in Settings" = "No worries! You can always get started with In-Person Payments in Settings";
+
 /* Coupon expiry date placeholder in the view for adding or editing a coupon
    Display label for the order fee's tax status setting option
    Display label for the product's tax status setting option
@@ -3104,6 +3126,9 @@ This part is the link to the website, and forms part of a longer sentence which
    Order number title. Parameters: %1$@ - order number */
 "Order #%1$@" = "Order #%1$@";
 
+/* Accessibility label for button triggering more actions menu sheet. */
+"Order actions" = "Order actions";
+
 /* Navigates to Card Reader ordering screen */
 "Order card reader" = "Order card reader";
 
@@ -3782,6 +3807,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Format of the regular price on the Price Settings row */
 "Regular price: %@" = "Regular price: %@";
 
+/* Alert button text on a feature announcement which gives the user the chance to be reminded of the new feature after a short time */
+"Remind me later" = "Remind me later";
+
 /* Confirm button on the alert when the user taps to delete a Product image
    Confirmation button on the alert when the user is deleting a variation
    Title for removing an attribute in the edit attribute action sheet. */
@@ -4017,9 +4045,6 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Action button linking to a list of connected stores.Presented when logging in with a store address that does not match the account entered */
 "See Connected Stores" = "See Connected Stores";
 
-/* Action button linking to instructions for installing Jetpack.Presented when logging in with a site address that does not have a valid Jetpack installation */
-"See Instructions" = "See Instructions";
-
 /* Link title to see all paper size options */
 "See layout and paper sizes options" = "See layout and paper sizes options";
 
@@ -4264,6 +4289,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* VoiceOver accessibility hint, informing the user that the button can be used to view billing information. */
 "Show the billing details for this order." = "Show the billing details for this order.";
 
+/* VoiceOver accessibility hint, informing the user that the button can be used to view the order custom fields information. */
+"Show the custom fields for this order." = "Show the custom fields for this order.";
+
 /* VoiceOver accessibility hint, informing the user that the button can be used to view the items inside the shipping label package */
 "Show the items included inside this shipping label package." = "Show the items included inside this shipping label package.";
 
@@ -4315,6 +4343,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Describes a site redirect domain */
 "Site Redirect" = "Site Redirect";
 
+/* The button title on the login onboarding screen to skip to the prologue screen. */
+"Skip" = "Skip";
+
 /* Edit Product SKU navigation title
    Title of the cell in Product Inventory Settings > SKU
    Title of the product form bottom sheet action for editing short description.
@@ -4486,9 +4517,6 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Accessibility label for strikethrough button on formatting toolbar. */
 "Strike Through" = "Strike Through";
 
-/* Navigates to Stripe M2 Card Reader manual */
-"Stripe M2 card reader manual" = "Stripe M2 card reader manual";
-
 /* Display label for subscription product type. */
 "Subscription" = "Subscription";
 
@@ -5594,6 +5622,10 @@ This part is the link to the website, and forms part of a longer sentence which
    Button on bottom of Customer's information to show the billing details */
 "View Billing Information" = "View Billing Information";
 
+/* Accessibility label for the 'View Custom Fields' button
+   Custom Fields section title */
+"View Custom Fields" = "View Custom Fields";
+
 /* The action to update downloadable files settings for a product */
 "View downloadable file settings" = "View downloadable file settings";
 
@@ -5678,6 +5710,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Title for the error screen when In-Person Payments is not supported because we don't know the name of the country */
 "We don’t support In-Person Payments with Stripe in your country" = "We don’t support In-Person Payments with Stripe in your country";
 
+/* Subtitle displayed in promotional screens shown during the login flow. */
+"We enable you to process them effortlessly." = "We enable you to process them effortlessly.";
+
 /* Message displayed in the error prompt when loading total discounted amount in Coupon Details screen fails */
 "We encountered a problem loading analytics" = "We encountered a problem loading analytics";
 
@@ -5687,6 +5722,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* message to ask a user to check their email for a WordPress.com email */
 "We just emailed a link to %@. Please check your mail app and tap the link to log in." = "We just emailed a link to %@. Please check your mail app and tap the link to log in.";
 
+/* Subtitle displayed in promotional screens shown during the login flow. */
+"We know it’s essential to your business." = "We know it’s essential to your business.";
+
 /* Settings > Privacy Settings > cookie info section. Explains what we do with the cookie information we collect. */
 "We use other tracking tools, including some from third parties. Read about these and how to control them." = "We use other tracking tools, including some from third parties. Read about these and how to control them.";
 
@@ -5787,9 +5825,6 @@ This part is the link to the website, and forms part of a longer sentence which
    Title of the cell in Product Shipping Settings > Width */
 "Width" = "Width";
 
-/* Navigates to WisePad 3 Card Reader manual */
-"WisePad 3 card reader manual" = "WisePad 3 card reader manual";
-
 /* Navigates to about WooCommerce app screen */
 "WooCommerce" = "WooCommerce";
 
@@ -5842,6 +5877,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Info notice at the bottom of the product add-ons screen */
 "You can edit product add-ons in the web dashboard." = "You can edit product add-ons in the web dashboard.";
 
+/* Subtitle displayed in promotional screens shown during the login flow. */
+"You can manage quickly and easily." = "You can manage quickly and easily.";
+
 /* The info of the shipping labels top banner in order details */
 "You can now create shipping labels for all physical orders directly from your device with the free WooCommerce Shipping plugin. Tap on Create Shipping Label to try our beta feature!" = "You can now create shipping labels for all physical orders directly from your device with the free WooCommerce Shipping plugin. Tap on Create Shipping Label to try our beta feature!";