Merge pull request #8443 from woocommerce/merge/11.7-code-freeze-into-trunk

Merge 11.7 code freeze into trunk

Author: spencertransier

RELEASE-NOTES.txt

@@ -1,5 +1,9 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
+11.8
+-----
+
+
 11.7
 -----
 - [**] Analytics Hub: Now you can select custom date ranges. [https://github.com/woocommerce/woocommerce-ios/pull/8414]

WooCommerce/Resources/AppStoreStrings.pot

@@ -57,9 +57,9 @@ msgctxt "app_store_promo_text"
 msgid "Run your store from anywhere"
 msgstr ""
 
-msgctxt "v11.6-whats-new"
+msgctxt "v11.7-whats-new"
 msgid ""
-"Good news! We added a new analytics section to the app! Simply click on the See More button under the store stats to check more detailed information on Revenue and Orders. This isn’t the last of it – more updates to come in the next few weeks!\n"
+"Did you know we've added a new analytics section? It's now possible to select custom date ranges when viewing your stats! Simply click on the See More button under the store stats to check it out.\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

@@ -755,6 +755,12 @@ which should be translated separately and considered part of this sentence. */
 /* Message displayed in the alert for dismissing all the inbox notes. */
 "Are you sure? Inbox messages will be dismissed forever." = "Are you sure? Inbox messages will be dismissed forever.";
 
+/* Option in the store creation category question. */
+"Art & Photography" = "Art & Photography";
+
+/* Option in the store creation category question. */
+"Arts and Crafts" = "Arts and Crafts";
+
 /* Placeholder in the Attribute Name row on Rename Attributes screen. */
 "Attribute name" = "Attribute name";
 
@@ -846,6 +852,9 @@ which should be translated separately and considered part of this sentence. */
 /* Accessibility label for bold button on formatting toolbar. */
 "Bold" = "Bold";
 
+/* Option in the store creation category question. */
+"Books & Magazines" = "Books & Magazines";
+
 /* The details text on the placeholder overlay when there are no coupons on the coupon list screen. */
 "Boost your business by sending customers special offers and discounts." = "Boost your business by sending customers special offers and discounts.";
 
@@ -1123,6 +1132,9 @@ which should be translated separately and considered part of this sentence. */
 /* Title of the WPCOM checkout web view. */
 "Checkout" = "Checkout";
 
+/* Subtitle of the store creation profiler question about the store category. */
+"Choose a category that defines your business the best." = "Choose a category that defines your business the best.";
+
 /* Navigation title on the shipping label country selector screen */
 "Choose a Country" = "Choose a Country";
 
@@ -1315,6 +1327,9 @@ which should be translated separately and considered part of this sentence. */
 /* Name of the step to connect the store to Jetpack */
 "Connecting your store" = "Connecting your store";
 
+/* Option in the store creation category question. */
+"Construction & Industrial" = "Construction & Industrial";
+
 /* Contact Customer action in Shipping Label Address Validation. */
 "Contact Customer" = "Contact Customer";
 
@@ -1357,6 +1372,7 @@ which should be translated separately and considered part of this sentence. */
    Title of continue button
    Title of dismiss button presented when users attempt to log in without Jetpack installed or connected
    Title of the button on the store creation store name form to continue.
+   Title of the button to continue with a profiler question.
    Title of the button to continue with a selected domain. */
 "Continue" = "Continue";
 
@@ -1384,6 +1400,9 @@ which should be translated separately and considered part of this sentence. */
 /* Conversion stat label on dashboard. */
 "Conversion" = "Conversion";
 
+/* Label for the conversion rate (orders per visitor) in the Analytics Hub */
+"Conversion Rate" = "Conversion Rate";
+
 /* Copy address text button title — should be one word and as short as possible. */
 "Copy" = "Copy";
 
@@ -1565,7 +1584,8 @@ which should be translated separately and considered part of this sentence. */
 /* Message in the footer of bulk price setting screen, when variations have different price values. */
 "Current prices are mixed." = "Current prices are mixed.";
 
-/* Name of the section for custom shipment tracking carriers */
+/* Name of the section for custom shipment tracking carriers
+   Title of the Analytics Hub Custom selection range */
 "Custom" = "Custom";
 
 /* Title text of the row that shows the provided amount when creating a simple payment */
@@ -1680,6 +1700,9 @@ which should be translated separately and considered part of this sentence. */
    Title of Description row of item details in Customs screen of Shipping Label flow */
 "Description" = "Description";
 
+/* Option in the store creation category question. */
+"Design & Marketing" = "Design & Marketing";
+
 /* Details section title in the Edit Address Form */
 "DETAILS" = "DETAILS";
 
@@ -1943,6 +1966,9 @@ which should be translated separately and considered part of this sentence. */
 /* Accessibility label for the button to edit order status on the New Order screen */
 "Edit Status" = "Edit Status";
 
+/* Option in the store creation category question. */
+"Electronics and Software" = "Electronics and Software";
+
 /* Carrier eligible for free pickup in Shipping Labels > Carrier and Rates */
 "Eligible for free pickup" = "Eligible for free pickup";
 
@@ -2271,6 +2297,9 @@ which should be translated separately and considered part of this sentence. */
 /* Content of error presented when undo of Mark Order Completed failed. It reads: Failed to undo fulfillment of order #{order number}. Parameters: %1$d - order number */
 "Failed to undo fulfillment of order #%1$d" = "Failed to undo fulfillment of order #%1$d";
 
+/* Option in the store creation category question. */
+"Fashion and Apparel" = "Fashion and Apparel";
+
 /* Option to select the Fastmail app when logging in with magic links */
 "Fastmail" = "Fastmail";
 
@@ -2368,6 +2397,9 @@ which should be translated separately and considered part of this sentence. */
 /* User role badge */
 "Follower" = "Follower";
 
+/* Option in the store creation category question. */
+"Food and Drink" = "Food and Drink";
+
 /* Next web page */
 "Forward" = "Forward";
 
@@ -2523,6 +2555,9 @@ which should be translated separately and considered part of this sentence. */
 /* H6 Aztec Style */
 "Heading 6" = "Heading 6";
 
+/* Option in the store creation category question. */
+"Health and Beauty" = "Health and Beauty";
+
 /* Title for the row to enter the package height on the Add New Custom Package screen in Shipping Label flow
    Title of the cell in Product Shipping Settings > Height */
 "Height" = "Height";
@@ -3443,6 +3478,8 @@ This part is the link to the website, and forms part of a longer sentence which
 "Offline - using cached data" = "Offline - using cached data";
 
 /* Alert dismissal title
+   Button title to cancel the alert when the user cannot create a store.
+   Button title to dismiss the alert when the created store never becomes a Jetpack site in the store creation flow.
    Button title to dismiss the alert when the store cannot be created in the store creation flow.
    Button title to dismiss the alert when the WPCOM plan cannot be purchased in the store creation flow.
    Button title. An acknowledgement of the message displayed in a prompt.
@@ -3771,6 +3808,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Close Account button title - confirms and closes user's WordPress.com account. */
 "Permanently Close Account" = "Permanently Close Account";
 
+/* Option in the store creation category question. */
+"Pets Pet Care" = "Pets Pet Care";
+
 /* Text field phone in Edit Address Form
    Text field phone in Shipping Label Address Validation */
 "Phone" = "Phone";
@@ -4722,6 +4762,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Service Package menu in Shipping Label Add New Package flow */
 "Service Package" = "Service Package";
 
+/* Title for sessions section in the Analytics Hub */
+"SESSIONS" = "SESSIONS";
+
 /* Tells user to set an email that support can use for replies */
 "Set email" = "Set email";
 
@@ -4947,7 +4990,8 @@ This part is the link to the website, and forms part of a longer sentence which
 "Site Redirect" = "Site Redirect";
 
 /* The button title on the login onboarding screen to skip to the prologue screen.
-   Title for the button to skip the onboarding step informing the merchant of pending account requirements */
+   Title for the button to skip the onboarding step informing the merchant of pending account requirements
+   Title of the button to skip a profiler question. */
 "Skip" = "Skip";
 
 /* Title for the button to skip the onboarding step encoraging the merchant to enable thePay in Person payment gateway */
@@ -5000,6 +5044,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Notice format when a shipping label refund request fails. */
 "Something went wrong with the refund. Please try again." = "Something went wrong with the refund. Please try again.";
 
+/* Message of the alert when the user cannot create a store because they already created one before. */
+"Sorry, but you can only create one store. Your account is already associated with an active store." = "Sorry, but you can only create one store. Your account is already associated with an active store.";
+
 /* This error message occurs when a user tries to create a username that contains an invalid phrase for WordPress.com. The %@ may include the phrase in question if it was sent down by the API */
 "Sorry, but your username contains an invalid phrase%@." = "Sorry, but your username contains an invalid phrase%@.";
 
@@ -5074,6 +5121,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Option to select the Spark email app when logging in with magic links */
 "Spark" = "Spark";
 
+/* Option in the store creation category question. */
+"Sports and Recreation" = "Sports and Recreation";
+
 /* The name of the default Tax Class in Product Price Settings */
 "Standard rate" = "Standard rate";
 
@@ -5115,6 +5165,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Row title for filtering products by stock status. */
 "Stock Status" = "Stock Status";
 
+/* Title of the alert when the created store never becomes a Jetpack site in the store creation flow. */
+"Store creation still in progress" = "Store creation still in progress";
+
 /* Text field prompt on the store name form in the store creation flow. */
 "Store name" = "Store name";
 
@@ -5563,6 +5616,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* The message of the alert when another service package has the same name */
 "The new service package name is not unique." = "The new service package name is not unique.";
 
+/* Message of the alert when the created store never becomes a Jetpack site in the store creation flow. */
+"The new store will be available soon in the store picker. If you have any issues, please contact support." = "The new store will be available soon in the store picker. If you have any issues, please contact support.";
+
 /* Fetching an Order Failed */
 "The Order couldn't be loaded!" = "The Order couldn't be loaded!";
 
@@ -5578,6 +5634,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* In Refund Confirmation, The message shown to the user to inform them that they have to issue the refund manually. */
 "The payment method does not support automatic refunds. Complete the refund by transferring the money to the customer manually." = "The payment method does not support automatic refunds. Complete the refund by transferring the money to the customer manually.";
 
+/* Error message when the cancel button on the reader is used. */
+"The payment was canceled on the reader" = "The payment was canceled on the reader";
+
 /* Error in calling the phone number of the customer in the Shipping Label Address Validation */
 "The phone number is not valid or you can't call the customer from this device." = "The phone number is not valid or you can't call the customer from this device.";
 
@@ -6092,6 +6151,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Text displayed when there is an error loading revenue stats data. */
 "Unable to load revenue analytics" = "Unable to load revenue analytics";
 
+/* Text displayed when there is an error loading session stats data. */
+"Unable to load session analytics" = "Unable to load session analytics";
+
 /* Content of error presented when loading the list of shipment carriers failed. It reads: Unable to load Shipment Carriers */
 "Unable to load Shipment Carriers" = "Unable to load Shipment Carriers";
 
@@ -6460,6 +6522,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* User role badge */
 "Viewer" = "Viewer";
 
+/* Label for total store views in the Analytics Hub */
+"Views" = "Views";
+
 /* Display label for simple virtual product type. */
 "Virtual" = "Virtual";
 
@@ -6570,6 +6635,12 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Error message shown when having trouble connecting to a Jetpack site. */
 "We're not able to connect to the Jetpack site at that URL.  Contact us for assistance." = "We're not able to connect to the Jetpack site at that URL.  Contact us for assistance.";
 
+/* Message of the alert when the user cannot create a store for some reason. */
+"We're sorry, but store creation is not currently available in the app." = "We're sorry, but store creation is not currently available in the app.";
+
+/* Message of the alert when the user cannot create a store because their App Store country is not supported. */
+"We're sorry, but store creation is not currently available in your country in the app." = "We're sorry, but store creation is not currently available in your country in the app.";
+
 /* Message for empty Orders filtered results. The %@ is a placeholder for the filters entered by the user. */
 "We're sorry, we couldn't find any order that match %@" = "We're sorry, we couldn't find any order that match %@";
 
@@ -6637,6 +6708,9 @@ This part is the link to the website, and forms part of a longer sentence which
 /* Title of Whats New Component */
 "What’s New in WooCommerce" = "What’s New in WooCommerce";
 
+/* Title of the store creation profiler question about the store category. */
+"What’s your business about?" = "What’s your business about?";
+
 /* Title label on the store name form in the store creation flow. */
 "What’s your store name?" = "What’s your store name?";
 

WooCommerce/Resources/release_notes.txt

@@ -1 +1 @@
-Good news! We added a new analytics section to the app! Simply click on the See More button under the store stats to check more detailed information on Revenue and Orders. This isn’t the last of it – more updates to come in the next few weeks!
+Did you know we've added a new analytics section? It's now possible to select custom date ranges when viewing your stats! Simply click on the See More button under the store stats to check it out.

config/Version.Public.xcconfig

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

fastlane/Deliverfile

@@ -15,7 +15,7 @@ app_identifier 'com.automattic.woocommerce'
 screenshots_path './fastlane/promo_screenshots/'
 
 # Make sure to update these keys for a new version
-app_version "11.6"
+app_version "11.7"
 
 team_id '299112'