Merge 18.6 code freeze to trunk

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 18.6
+Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience!
+
 ## 18.5
 Discover a more personalized shopping experience with the latest update to MyStore! We're excited to introduce a customizable dashboard that lets you tailor your view with a variety of unique cards. Streamline your management tasks and enjoy a dashboard designed just for you. Update now to start customizing your app experience!
 

RELEASE-NOTES.txt

@@ -1,4 +1,8 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
+18.7
+-----
+
+
 18.6
 -----
 - [*] Tap To Pay: Changed navigation from Tap To Pay Summary screen to About Tap To Pay [https://github.com/woocommerce/woocommerce-android/pull/11411]

WooCommerce/metadata/PlayStoreStrings.pot

@@ -11,18 +11,16 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_185"
+msgctxt "release_note_186"
 msgid ""
-"18.5:\n"
-"Discover a more personalized shopping experience with the latest update to MyStore! We're excited to introduce a customizable dashboard that lets you tailor your view with a variety of unique cards. Streamline your management tasks and enjoy a dashboard designed just for you. Update now to start customizing your app experience!\n"
+"18.6:\n"
+"Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience!\n"
 msgstr ""
 
-msgctxt "release_note_184"
+msgctxt "release_note_185"
 msgid ""
-"18.4:\n"
-"This release focuses on bug fixes and improvements to help you get your business started. Keep your feedback rolling in; it helps us figure out what to work on next.\n"
-"\n"
-"\n"
+"18.5:\n"
+"Discover a more personalized shopping experience with the latest update to MyStore! We're excited to introduce a customizable dashboard that lets you tailor your view with a variety of unique cards. Streamline your management tasks and enjoy a dashboard designed just for you. Update now to start customizing your app experience!\n"
 msgstr ""
 
 #. translators: Short description of the app to be displayed in the Play Store. Limit to 80 characters including spaces and commas!

WooCommerce/metadata/release_notes.txt

@@ -1 +1 @@
-Discover a more personalized shopping experience with the latest update to MyStore! We're excited to introduce a customizable dashboard that lets you tailor your view with a variety of unique cards. Streamline your management tasks and enjoy a dashboard designed just for you. Update now to start customizing your app experience!
+Enjoy enhanced functionality in our latest app update! We've improved the 'Tap To Pay' feature, introducing a new navigation path from the summary to the 'About Tap To Pay' screen, and revised its description for better clarity. Additionally, selecting shipping methods has been made more flexible, allowing you to choose specific options directly when adding or editing shipping details on an order. Update your app today for a smoother and more efficient experience!

fastlane/resources/values/strings.xml

@@ -371,7 +371,6 @@
     <string name="dashboard_stats_granularity_months">Months</string>
     <string name="dashboard_stats_granularity_years">Years</string>
     <string name="dashboard_stats_edit_granularity_content_description">Change date range button</string>
-    <string name="dashboard_stats_edit_granularity_selected_content_description">Item selected</string>
 
     <string name="dashboard_stats_visitors">Visitors</string>
     <string name="dashboard_stats_orders">Orders</string>
@@ -383,21 +382,14 @@
     <string name="dashboard_stats_todays_stats">Today\'s Stats</string>
     <string name="dashboard_stats_custom_range_label">Custom</string>
 
-    <string name="dashboard_top_performers_title">Top performers</string>
     <string name="dashboard_top_performers_items_sold">Items Sold</string>
     <string name="dashboard_top_performers_total_orders">Total orders: %s</string>
     <string name="dashboard_top_performers_empty">No activity this period</string>
     <string name="dashboard_top_performers_net_sales">Net sales: %s</string>
-    <string name="dashboard_top_performers_main_cta_view_all_analytics">View all store analytics</string>
 
     <string name="dashboard_action_view_order">View Order</string>
     <string name="dashboard_action_view_orders">View Orders</string>
 
-    <string name="my_store_stats_reverted_title">Upgrade to keep seeing your stats</string>
-    <string name="my_store_stats_reverted_message">We\'ve rolled out improvements to our analytics. Upgrade to WooCommerce 4.0 or above or install WooCommerce Admin plugin to keep seeing your stats after September 1, 2020.</string>
-    <string name="my_store_stats_availability_title">We can\'t display your\n store\'s analytics</string>
-    <string name="my_store_stats_availability_description">Make sure you are running the latest version of WooCommerce on your site and that you have WooCommerce Admin activated.\n\nStill need help? %1$s</string>
-    <string name="my_store_stats_availability_contact_us">Contact us</string>
     <string name="my_store_stats_plugin_inactive_title">We can\'t display your\n store\'s analytics</string>
     <string name="my_store_stats_plugin_inactive_description">Make sure you are running the latest version of WooCommerce on your site and that you have WooCommerce Admin activated.</string>
     <string name="my_store_stats_plugin_inactive_contact_us">Still need help? Contact us</string>
@@ -410,15 +402,11 @@
     <string name="my_store_custom_range_granularity_year">Yearly</string>
     <string name="my_store_custom_range_visitors_stats_unavailable_title">Visitors and conversion data not available</string>
     <string name="my_store_custom_range_visitors_stats_unavailable_message">The stats feature does not support the display of visitors and conversions data for arbitrary date ranges.\n\nHowever, you can tap a value on the graph to see visitors and conversions for that specific range.</string>
-    <string name="my_store_edit_screen_widgets">Edit sections of my store</string>
-    <string name="my_store_edit_screen_widget_stats">Store Stats</string>
-    <string name="my_store_edit_screen_widget_top_performers">Top Performer Products</string>
-    <string name="my_store_edit_screen_widget_blaze_campaigns">Blaze Campaigns</string>
-    <string name="my_store_edit_screen_widget_onboarding_list">Store Onboarding</string>
+    <string name="my_store_edit_screen_widgets">Customize</string>
 
-    <string name="my_store_widget_onboarding_title">Onboarding</string>
+    <string name="my_store_widget_onboarding_title">Store setup</string>
     <string name="my_store_widget_stats_title">Performance</string>
-    <string name="my_store_widget_top_products_title">Top products</string>
+    <string name="my_store_widget_top_products_title">Top performers</string>
     <string name="my_store_widget_blaze_title">Blaze campaigns</string>
     <string name="my_store_widget_feedback_title">Feedback</string>
 
@@ -448,7 +436,7 @@
     <!--
         Analytics View
     -->
-    <string name="analytics_section_see_all">See all store analytics</string>
+    <string name="analytics_section_see_all">View all store analytics</string>
     <string name="analytics_date_range_to_date">%1$s (%2$s)</string>
     <string name="analytics_date_range_from_date">vs Previous Period (%1$s)</string>
     <string name="analytics_date_range_custom">%1$s - %2$s</string>
@@ -592,6 +580,7 @@
     <string name="custom_amounts_bottom_sheet_percentage_amount_option">A percentage of the order total</string>
     <string name="custom_amounts_percentage_hint">0</string>
     <string name="custom_amounts_percentage_symbol">%</string>
+    <string name="custom_amounts_percentage_invalid_value">Invalid value</string>
 
     <!--
          Taxes
@@ -679,7 +668,15 @@
     <string name="order_creation_payment_tax_label">Taxes</string>
     <string name="order_creation_shipping_name">Name</string>
     <string name="order_creation_shipping_title_add">Add Shipping</string>
+    <string name="order_creation_shipping_methods_title">Method</string>
+    <string name="order_creation_shipping_methods_error">Error while fetching your shipping methods. Please try again</string>
+    <string name="order_creation_shipping_add">Add Shipping</string>
     <string name="order_creation_add_shipping">Add shipping</string>
+    <string name="order_creation_add_shipping_method">Method</string>
+    <string name="order_creation_add_shipping_amount">Amount</string>
+    <string name="order_creation_add_shipping_name">Name</string>
+    <string name="order_creation_add_shipping_name_hint">Shipping</string>
+    <string name="order_creation_add_shipping_method_select_hint">Select a shipping method</string>
     <string name="order_creation_edit_shipping">Shipping</string>
     <string name="order_creation_remove_shipping">Remove shipping from order</string>
     <string name="order_creation_add_fee_removal_hint">Remove fee from order</string>
@@ -1490,9 +1487,7 @@
     <string name="card_reader_tap_to_pay_about_important_info_description_3">To accept payments above this limit, consider purchasing a card reader that accepts PIN entry.</string>
     <string name="card_reader_tap_to_pay_about_important_info_button">Learn more about card readers</string>
     <string name="card_reader_tap_to_pay_about_how_works_title">How it works</string>
-    <string name="card_reader_tap_to_pay_about_how_works_1">1. %1$s or %2$s</string>
-    <string name="card_reader_tap_to_pay_about_how_works_create_order">Create an order</string>
-    <string name="card_reader_tap_to_pay_about_how_works_collect_payment">collect a payment</string>
+    <string name="card_reader_tap_to_pay_about_how_works_1_updated">1. Create an order</string>
     <string name="card_reader_tap_to_pay_about_how_works_2">2. Tap “Collect Payment” and choose “Tap to Pay”.</string>
     <string name="card_reader_tap_to_pay_about_how_works_3">3. Present your phone to the customer.</string>
     <string name="card_reader_tap_to_pay_about_how_works_4">4. Your customer holds their card horizontally at the top of your phone, over the contactless symbol.</string>
@@ -1968,6 +1963,7 @@
     <string name="product_list_filters_list_item">Selected filter option</string>
     <string name="product_list_unsaved_product_unselected_title">You about to discard changes to %s</string>
     <string name="product_list_unsaved_product_unselected_message">Are you sure you want to discard the changes you made to this product?</string>
+    <string name="product_list_fetch_error">Error fetching products!</string>
     <string name="product_search_hint">Search products</string>
     <string name="product_search_hint_active_filters">Search filtered products</string>
     <string name="product_search_all">All products</string>
@@ -2053,6 +2049,7 @@
     <string name="product_variation_no_price_set">No price set</string>
     <string name="product_categories">Categories</string>
     <string name="product_category_empty">Add category</string>
+    <string name="product_category_clear_parent">Clear parent category</string>
     <string name="product_category_list_empty_title">Add your first category</string>
     <string name="product_category_list_empty_message">Organise your products in categories</string>
     <string name="product_add_category">Add category</string>

version.properties

@@ -1,2 +1,2 @@
-versionName=18.5
-versionCode=547
+versionName=18.6-rc-1
+versionCode=548