Merge branch 'master' into new/puppeteer-screenshot-tester

2019-10-18 00:16:22 +01:00 · 2019-10-18 00:16:22 +01:00 · 11a8cbdf79
parent d444dbdaf4 0112ee58a3
commit 11a8cbdf79
206 changed files with 2724 additions and 3627 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -1,16 +1,48 @@
 # Contributing to WooCommerce ✨

-There are many ways to contribute to the WooCommerce project!
+WooCommerce powers many online stores across the internet, and your help making it even more awesome will be greatly appreciated :)

- Translating strings into your language.
- Answering questions on GitHub and within the various WooCommerce communities.
+There are many ways to contribute to the project!
+
+- [Translating strings into your language](https://github.com/woocommerce/woocommerce/wiki/Translating-WooCommerce).
+- Answering questions on the various WooCommerce communities like the [WP.org support forums](https://wordpress.org/support/plugin/woocommerce/).
+- Testing open [issues](https://github.com/woocommerce/woocommerce/issues) or [pull requests](https://github.com/woocommerce/woocommerce/pulls) and sharing your findings in a comment.
+- Testing WooCommerce beta versions and release candidates. Those are announced in the [WooCommerce development blog](https://woocommerce.wordpress.com/).
 - Submitting fixes, improvements, and enhancements.
+- To disclose a security issue to our team, [please submit a report via HackerOne](https://hackerone.com/automattic/).

-WooCommerce currently powers 30% of all online stores across the internet, and your help making it even more awesome will be greatly appreciated :)
+If you wish to contribute code, please read the information in the sections below. Then [fork](https://help.github.com/articles/fork-a-repo/) WooCommerce, commit your changes, and [submit a pull request](https://help.github.com/articles/using-pull-requests/) 🎉

-If you think something can be improved and you wish to contribute code,
-[fork](https://help.github.com/articles/fork-a-repo/) WooCommerce, commit your changes,
-and [send a pull request](https://help.github.com/articles/using-pull-requests/). We'll be happy to review your changes!
+We use the `help wanted` label to mark issues that are suitable for new contributors. You can find all the issues with this label [here](https://github.com/woocommerce/woocommerce/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22).
+
+WooCommerce is licensed under the GPLv3+, and all contributions to the project will be released under the same license. You maintain copyright over any contribution you make, and by submitting a pull request, you are agreeing to release that contribution under the GPLv3+ license.
+
+If you have questions about the process to contribute code or want to discuss details of your contribution, you can contact WooCommerce core developers on the #core channel in the [WooCommerce community Slack](https://woocommerce.com/community-slack/).
+
+## Getting started
+
+- [How to set up WooCommerce development environment](https://github.com/woocommerce/woocommerce/wiki/How-to-set-up-WooCommerce-development-environment)
+- [Git Flow](https://github.com/woocommerce/woocommerce/wiki/WooCommerce-Git-Flow)
+- [Minification of SCSS and JS](https://github.com/woocommerce/woocommerce/wiki/Minification-of-SCSS-and-JS)
+- [String localisation guidelines](https://github.com/woocommerce/woocommerce/wiki/String-localisation-guidelines)
+- [Running unit tests](https://github.com/woocommerce/woocommerce/blob/master/tests/README.md)
+- [Running e2e tests](https://github.com/woocommerce/woocommerce/wiki/End-to-end-Testing)
+
+## Coding Guidelines and Development 🛠
+
+- Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/)
+- Run our build process described in the document on [how to set up WooCommerce development environment](https://github.com/woocommerce/woocommerce/wiki/How-to-set-up-WooCommerce-development-environment), it will install our pre-commit hook, code sniffs, dependencies, and more.
+- Whenever possible please fix pre-existing code standards errors in the files that you change. It is ok to skip that for larger files or complex fixes.
+- Ensure you use LF line endings in your code editor. Use [EditorConfig](http://editorconfig.org/) if your editor supports it so that indentation, line endings and other settings are auto configured.
+- When committing, reference your issue number (#1234) and include a note about the fix.
+- Ensure that your code supports the minimum supported versions of PHP and WordPress; this is shown at the top of the `readme.txt` file.
+- Push the changes to your fork and submit a pull request on the master branch of the WooCommerce repository.
+- Make sure to write good and detailed commit messages (see [this post](https://chris.beams.io/posts/git-commit/) for more on this) and follow all the applicable sections of the pull request template.
+- Please avoid modifying the changelog directly or updating the .pot files. These will be updated by the WooCommerce team.
+
+If you are contributing code to the REST API or editor blocks, these are developed in external packages.
+- [WooCommerce REST API package](https://github.com/woocommerce/woocommerce-rest-api)
+- [Blocks](https://github.com/woocommerce/woocommerce-gutenberg-products-block)

 ## Feature Requests 🚀

@ -19,94 +51,3 @@ Feature requests can be [submitted to our issue tracker](https://github.com/wooc
 Feature request issues will remain closed until we see sufficient interest via comments and [👍 reactions](https://help.github.com/articles/about-discussions-in-issues-and-pull-requests/) from the community.

 You can see a [list of current feature requests which require votes here](https://github.com/woocommerce/woocommerce/issues?q=label%3A%22votes+needed%22+label%3Aenhancement+sort%3Areactions-%2B1-desc+is%3Aclosed).
-
-## Technical Support / Questions ❓
-
-We don't offer technical support on GitHub so we recommend using the following:
-
-**Reading our documentation**
-Usage docs can be found here: https://docs.woocommerce.com/
-
-If you have a problem, you may want to start with the self help guide here: https://docs.woocommerce.com/document/woocommerce-self-service-guide/
-
-**Technical support for premium extensions or if you're a WooCommerce.com customer**
- from a human being - submit a ticket via the helpdesk
-https://woocommerce.com/contact-us/ 
-
-**General usage and development questions**
- WooCommerce Slack Community: https://woocommerce.com/community-slack/
- WordPress.org Forums: https://wordpress.org/support/plugin/woocommerce
- The WooCommerce Help and Share Facebook group
-
-**Customizations**
- [WooExperts](https://woocommerce.com/experts/)
- [Codeable](https://codeable.io/)
-
-## Build process 🛠
-
-The source code found on GitHub does not contain compiled CSS or Javascript, and is missing some functionality such as Gutenberg Blocks and the REST API, until the build process is ran.
-
-To run the build process, in a terminal go to your WooCommerce installation and run:
-
-```bash
-npm install
-composer install
-npm run build
-```
-
-To get your development environment running we recommend [reading here](https://github.com/woocommerce/woocommerce/wiki/How-to-set-up-WooCommerce-development-environment).
-
-## Coding Guidelines and Development 🛠
-
- **Ensure you stick to the [WordPress Coding Standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/php/)**
- Run our build process described in the section above, it will install our pre-commit hook, code sniffs, dependencies, and more.
- Ensure you use LF line endings in your code editor. Use [EditorConfig](http://editorconfig.org/) if your editor supports it so that indentation, line endings and other settings are auto configured.
- When committing, reference your issue number (#1234) and include a note about the fix.
- Ensure that your code supports the minimum supported versions of PHP and WordPress; this is shown at the top of the `readme.txt` file.
- Push the changes to your fork and submit a pull request on the master branch of the WooCommerce repository.
-
-Please avoid modifying the change-log directly or updating the .pot files. These will be updated by the WooCommerce team.
-
-If you are contributing code to the REST API or editor blocks, these are developed in external packages.
- [WooCommerce REST API package](https://github.com/woocommerce/woocommerce-rest-api)
- [Blocks](https://github.com/woocommerce/woocommerce-gutenberg-products-block)
-
-## Translating WooCommerce 💬
-
-We have a [project on translate.wordpress.org](https://translate.wordpress.org/projects/wp-plugins/woocommerce). You can join the localization team of your language and help by translating WooCommerce. [Find more about using joining a language team and using GlotPress](https://make.wordpress.org/polyglots/handbook/tools/glotpress-translate-wordpress-org/).
-
-If WooCommerce is already 100% translated for your language, join the team anyway! We regularly update our language files and there will definitely be need of your help soon.
-
-### Glossary & Style Guide
-
-Please refer to this page on the [Translator Handbook](https://make.wordpress.org/polyglots/handbook/translating/glossary-style-guide/) for information about the glossary and the style guide.
-
-We maintain the WooCommerce glossary [on this shared Google Sheet](https://docs.google.com/spreadsheets/d/1Pobl2nNWieaSpZND9-Bwa4G8pnMU7QYceKsXuWCwSxQ/edit?usp=sharing). You can use it as a template for creating your own glossary.
-Please download the file by going to **File > Download as > Comma-separated values (.csv, current sheet)** and save it on your computer/Mac. Open it with your favourite CSV editor (or re-upload it on your own Google Drive) and edit it.
-
-Make sure to edit the second column’s header by using your own language’s code (eg. for Italian you would use `it`, for Portuguese (Brazil) you would use `pt-BR`).
-
-Write the translated entry in this column and translate the entry description as well.
-Don’t change other columns headers and value, but feel free to add new entries.
-
-When your CSV is ready, import it on GlotPress.
-
-_**Warning**: Importing a CSV does not replace existing items, they will be created again. We suggest to import them only when first creating the glossary._
-
-Each translation editor will take care of updating the glossary on GlotPress by editing/adding items when needed.
-
-_**Note**: Only editors can create/import and edit glossaries and glossary items on GlotPress. Anyone can suggest new items to add to the glossary or translate them._
-
-**Style Guides Available**
-
-We don’t have a Style Guide template available, so feel free to create your own. Here are the style guides available at the moment:
-
-* [Italian](https://docs.google.com/document/d/1rspopHOiTL-5-PjyG5eJxjkYk6JkzqVbyS24OdA052o/edit?usp=sharing)
-
-If you created a style guide for your language, please let us know so we can add it in the list above. You can also add it by yourself by submitting a PR for this file.
-
-### Translating Video Tutorials
-
-Another valuable way to help is by translating our growing library of WooCommerce video tutorials. Check out the [Translating  Our Videos](https://docs.woocommerce.com/document/translating-our-videos/) doc and join in!
-
-By translating video tutorials you'll be helping non-English speaking users and people affected by disabilities to get to grips with using WooCommerce for the first time, and to go on and create their businesses and make a living! That's something to be proud of and if you choose to dive into this area, we salute you.
--- a/.github/ISSUE_TEMPLATE/-----security-issue.md
+++ b/.github/ISSUE_TEMPLATE/-----security-issue.md
--- a/.github/ISSUE_TEMPLATE/2-External-issues.md
+++ b/.github/ISSUE_TEMPLATE/2-External-issues.md
@ -0,0 +1,10 @@
+---
+name: "\U0001F47D External issues"
+about: Please report WooCommerce REST API or WooCommerce Gutenberg Products Blocks issues directly to their respective repositories.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please report WooCommerce REST API (https://github.com/woocommerce/woocommerce-rest-api) or WooCommerce Gutenberg Products Blocks (https://github.com/woocommerce/woocommerce-gutenberg-products-block) issues directly to their respective repositories.
--- a/.github/ISSUE_TEMPLATE/3-Support.md
+++ b/.github/ISSUE_TEMPLATE/3-Support.md
--- a/.github/ISSUE_TEMPLATE/4-Bug-report.md
+++ b/.github/ISSUE_TEMPLATE/4-Bug-report.md
--- a/.github/ISSUE_TEMPLATE/5-Enhancement.md
+++ b/.github/ISSUE_TEMPLATE/5-Enhancement.md
--- a/.github/ISSUE_TEMPLATE/6-Feature-request.md
+++ b/.github/ISSUE_TEMPLATE/6-Feature-request.md
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,10 @@
 language: php
-dist: trusty
+dist: xenial
+
+# Since Xenial services are not started by default, we need to instruct it below to start.
+services:
+  - xvfb
+  - mysql

 sudo: false

@ -31,7 +36,7 @@ matrix:
    php: 7.2
    env: WP_VERSION=latest WP_MULTISITE=0 RUN_E2E=1
    addons:
-      chrome: stable
+      chrome: beta
      apt:
        packages:
          - nginx
@ -41,6 +46,8 @@ matrix:
  - name: "WooCommerce unit tests using WordPress nightly"
    php: 7.3
    env: WP_VERSION=nightly WP_MULTISITE=0
+  - php: 7.4snapshot
+    env: WP_VERSION=nightly WP_MULTISITE=0
  allow_failures:
  - php: 7.3
    env: WP_VERSION=latest WP_MULTISITE=0 RUN_CODE_COVERAGE=1
@ -61,6 +68,7 @@ before_script:
      bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
      composer global require "phpunit/phpunit=5.7.*|7.5.*"
    fi
+  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"

 script:
  - bash tests/bin/phpunit.sh
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@ -1,5 +1,34 @@
 == Changelog ==

+= 3.6.5 - 2019-07-02 =
+* Security - Introduce file type check for tax rate importer.
+* Security - Added nonce check to CSV importer actions.
+* Enhancement - WordPress & PHP upgrade nudges when running older versions. #23975
+* Fix - "Filter by price" widget excludes category when combined with a product attribute. #23720
+* Fix - Add query parameter (GET) forwarding when processing batch API requests. #23769
+* Fix - Fixed query of top rated products shortcode. #23771
+* Fix - Typo in customers endpoint schema. #23812
+* Fix - Update Emogrifier library to fix problem with nth-child pseudo selector. #23824
+* Fix - Avoid outputting a rating of zero when product has comments without a review rating. #23828
+* Fix - Do not throw a PHP notice if including the rest API handlers manually. #23840
+* Fix - WooCommerce Tracker review count. #23849
+* Fix - Coupon usage limit issue when applying coupon to order in the backend. #23851
+* Fix - Fatal error when trying to apply virtual coupons to guest orders. #23877
+* Fix - AJAX update order review doesn't reload the page. #23891
+* Fix - Variation matching returns incorrect values when using a large number of variations combined with 0 values attributes. #23909
+* Fix - Password mismatch when user registered with password containing a double quote. #23926
+* Fix - Minor Shipping Zone UI issue due to conflict with some browser extensions. #23789
+* Fix - Make Products->Categories active when clicked on "Make Default" link under any product category. #23936
+* Fix - Update URL describing how to increase PHP memory limit on system status page. #23919
+* Fix - Sets the position of the tracking image to fixed, so it doesn't affect page layout. #23953
+* Fix - Button to manually update database in WooCommerce > Status > Tools. #23966
+* Fix - Tracks blog ID retrieval from Jetpack options. #24028
+* Fix - Fixed support to parentheses in phone numbers validation. #23967
+* Tweak - Improve tooltip text describing the product sale dates in the product admin page. #23935
+* Tweak - Made NL postcode validation more flexible, allowing lowercase and missing space. #23837
+* Localization - Display city field as optional for Singapore addresses. #23878
+* Dev - Add filters to file paths passed to the different xsendfile like backends. #23814
+
 = 3.6.4 - 2019-05-27 =
 * Enhancement - Add notice to install WooCommerce Admin. #23659
 * Fix - Tracks: Add check for OBW is-opting-in. #23772
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -260,7 +260,7 @@ module.exports = function( grunt ) {
 					'echo "Generating contributor list since <%= fromDate %>"',
 					'./node_modules/.bin/githubcontrib --owner woocommerce --repo woocommerce --fromDate <%= fromDate %>' +
 					' --authToken <%= authToken %> --cols 6 --sortBy contributions --format md --sortOrder desc' +
-					' --showlogin true > contributors.md'
+					' --showlogin true --sha <%= sha %> --filter renovate-bot > contributors.md'
 				].join( '&&' )
 			}
 		},
@ -274,6 +274,11 @@ module.exports = function( grunt ) {
 							type: 'input',
 							message: 'What date (YYYY-MM-DD) should we get contributions since?'
 						},
+						{
+							config: 'sha',
+							type: 'input',
+							message: 'What branch should we get contributors from?'
+						},
 						{
 							config: 'authToken',
 							type: 'input',
@ -345,8 +350,7 @@ module.exports = function( grunt ) {
 	grunt.registerTask( 'js', [
 		'jshint',
 		'uglify:admin',
-		'uglify:frontend',
-		'uglify:flexslider'
+		'uglify:frontend'
 	]);

 	grunt.registerTask( 'css', [
--- a/README.md
+++ b/README.md
@ -16,6 +16,7 @@ If you are not a developer, please use the [WooCommerce plugin page](https://wor

 ## Documentation
 * [WooCommerce Documentation](https://docs.woocommerce.com/documentation/plugins/woocommerce/)
+* [WooCommerce Developer Documentation](https://github.com/woocommerce/woocommerce/wiki)
 * [WooCommerce Code Reference](https://docs.woocommerce.com/wc-apidocs/)
 * [WooCommerce REST API Docs](https://woocommerce.github.io/woocommerce-rest-api-docs/)

@ -25,8 +26,11 @@ To disclose a security issue to our team, [please submit a report via HackerOne
 ## Support
 This repository is not suitable for support. Please don't use our issue tracker for support requests, but for core WooCommerce issues only. Support can take place through the appropriate channels:

-* The [WooCommerce premium support portal](https://woocommerce.com/my-account/create-a-ticket/) for customers who have purchased themes or extensions.
+* If you have a problem, you may want to start with the [self help guide](https://docs.woocommerce.com/document/woocommerce-self-service-guide/).
+* The [WooCommerce.com premium support portal](https://woocommerce.com/contact-us/ ) for customers who have purchased themes or extensions.
 * [Our community forum on wp.org](https://wordpress.org/support/plugin/woocommerce) which is available for all WooCommerce users.
+* The WooCommerce Help and Share Facebook group.
+* For customizations, you may want to check our list of [WooExperts](https://woocommerce.com/experts/) or [Codeable](https://codeable.io/).

 Support requests in issues on this repository will be closed on sight.

--- a/assets/css/_variables.scss
+++ b/assets/css/_variables.scss
@ -18,4 +18,4 @@ $highlight:         adjust-hue($primary, 150deg);               // Prices, In st
 $highlightext:      desaturate(lighten($highlight, 50%), 18%);  // Text on highlight color bg

 $contentbg:         #fff;                                       // Content BG - Tabs (active state)
-$subtext:           #777;                                       // small, breadcrumbs etc
+$subtext:           #767676;                                    // small, breadcrumbs etc
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@ -578,6 +578,29 @@
 	margin: 10px;
 }

+#variable_product_options {
+	.form-row select {
+		max-width: 100%;
+	}
+
+	.toolbar-top {
+
+		.button {
+			margin: 1px;
+		}
+	}
+}
+
+#product_attributes {
+
+	.toolbar-top {
+
+		.button {
+			margin: 1px;
+		}
+	}
+}
+
 .clear {
 	clear: both;
 }
@ -1074,6 +1097,10 @@ ul.wc_coupon_list_block {

 	.order_data_column_container {
 		clear: both;
+
+		p._billing_email_field {
+			margin-top: 13px;
+		}
 	}

 	.order_data_column {
@ -1116,6 +1143,7 @@ ul.wc_coupon_list_block {

 			select {
 				width: 100%;
+				max-width: 100%;
 			}

 			.select2-container {
@ -1177,6 +1205,17 @@ ul.wc_coupon_list_block {
 			display: none;
 			zoom: 1;
 			padding-right: 1px;
+
+			.select2-container {
+
+				.select2-selection--single {
+					height: 32px;
+
+					.select2-selection__rendered {
+						line-height: 32px;
+					}
+				}
+			}
 		}

 		.wc-customer-user,
@ -1984,6 +2023,10 @@ ul.wc_coupon_list_block {
 			border-bottom: 0;
 		}
 	}
+
+	button {
+		margin: 1px;
+	}
 }

 #poststuff #woocommerce-order-notes .inside {
@ -1993,6 +2036,11 @@ ul.wc_coupon_list_block {
 	ul.order_notes li {
 		padding: 0 10px;
 	}
+
+	button {
+		margin: 1px;
+		vertical-align: top;
+	}
 }

 #woocommerce_customers {
@ -2116,6 +2164,21 @@ ul.wc_coupon_list_block {
 		display: none;
 	}

+	.tablenav {
+
+		.select2-selection--single {
+			height: 32px;
+
+			.select2-selection__rendered {
+				line-height: 29px;
+			}
+
+			.select2-selection__arrow {
+				height: 30px;
+			}
+		}
+	}
+
 	.wp-list-table {
 		margin-top: 1em;

@ -2757,6 +2820,10 @@ table.wp-list-table {
 		color: #999;
 	}

+	.row-actions span.id {
+		padding-top: 8px;
+	}
+
 	td.column-thumb img {
 		margin: 0;
 		width: auto;
@ -3272,7 +3339,7 @@ table.wc_shipping {
 }

 .wc-shipping-zone-settings tbody {
-	display: inherit;
+	display: table-row-group;
 }

 table {
@ -3864,7 +3931,6 @@ img.help_tip {
 			width: 400px;
 			margin: 0;
 			box-sizing: border-box;
-			height: 32px;
 			line-height: 32px;
 			vertical-align: top;
 		}
@ -5195,8 +5261,7 @@ img.help_tip {
 	}

 	select {
-		height: 30px;
-		line-height: 30px;
+		height: 40px;
 	}

 	&.dimensions_field {
@ -6476,16 +6541,16 @@ table.bar_chart {
 	}

 	.select2-selection--single {
-		height: 32px;
+		height: 40px;

 		.select2-selection__rendered {
-			line-height: 32px;
+			line-height: 40px;
 			padding-right: 24px;
 		}

 		.select2-selection__arrow {
 			right: 3px;
-			height: 30px;
+			height: 36px;
 		}
 	}

@ -6533,7 +6598,6 @@ table.bar_chart {

 	select,
 	input {
-		line-height: 1;
 		height: 32px;
 	}

--- a/assets/css/photoswipe/photoswipe.css
+++ b/assets/css/photoswipe/photoswipe.css
@ -1,3 +1,35 @@
+/**
+ * WooCommerce Photoswipe styles.
+ * 1. These styles are required to overwrite default theme button styles (Twenty Twelve adds gradients via background-image).
+ * 2. For zooming on mobile.
+ */
+.woocommerce img.pswp__img,
+.woocommerce-page img.pswp__img {
+	max-width: none; /* 2 */
+}
+button.pswp__button {
+	box-shadow: none !important;
+	background-image: url('default-skin/default-skin.png') !important;
+}
+button.pswp__button,
+button.pswp__button:hover,
+button.pswp__button--arrow--left::before,
+button.pswp__button--arrow--right::before {
+	background-color: transparent !important; /* 1 */
+}
+button.pswp__button--arrow--left,
+button.pswp__button--arrow--right,
+button.pswp__button--arrow--left:hover,
+button.pswp__button--arrow--right:hover {
+	background-image: none !important; /* 1 */
+}
+button.pswp__button--close:hover {
+	background-position: 0 -44px;
+}
+button.pswp__button--zoom:hover {
+	background-position: -88px 0;
+}
+
 /*! PhotoSwipe main CSS by Dmitry Semenov | photoswipe.com | MIT license */
 /*
 	Styles for basic PhotoSwipe functionality (sliding area, open/close transitions)
--- a/assets/css/twenty-nineteen.scss
+++ b/assets/css/twenty-nineteen.scss
@ -976,6 +976,7 @@ table.variations {
 #ship-to-different-address {
 	font-size: 1em;
 	display: inline-block;
+	margin: 1.42em 0;

 	label {
 		font-weight: 300;
--- a/assets/css/wc-setup.scss
+++ b/assets/css/wc-setup.scss
@ -20,6 +20,10 @@ body {
 .wc-setup {
 	text-align: center;

+	#wc_tracker_checkbox {
+		display: none;
+	}
+
 	.select2-container {
 		text-align: left;
 		width: auto;
@ -409,27 +413,6 @@ body {
 		}
 	}

-	.woocommerce-tracker {
-		margin: 24px 0;
-		border: 1px solid #eee;
-		padding: 20px;
-		border-radius: 4px;
-		overflow: hidden;
-
-		p {
-			font-size: 14px;
-			line-height: 1.5;
-		}
-
-		.checkbox {
-			line-height: 24px;
-			font-weight: 500;
-			font-size: 1em;
-			margin-top: 0;
-			margin-bottom: 20px;
-		}
-	}
-
 	.checkbox {

 		input[type="checkbox"] {
@ -491,6 +474,43 @@ body {
 	}
 }

+.woocommerce-tracker {
+	margin: 24px 0;
+	border: 1px solid #eee;
+	padding: 20px;
+	border-radius: 4px;
+	overflow: hidden;
+	text-align: left;
+
+	h1 {
+		border-bottom: 0;
+		padding-bottom: 0;
+	}
+
+	.wc-backbone-modal-header {
+		border-bottom: 0;
+	}
+
+	.wc-backbone-modal-main article {
+		padding-top: 0;
+	}
+
+	.wc-backbone-modal-main footer {
+		border-top: 0;
+		box-shadow: none;
+	}
+
+	p {
+		font-size: 14px;
+		line-height: 1.5;
+	}
+
+	.woocommerce-tracker-checkbox label {
+		margin-top: -4px;
+		display: inline-block;
+	}
+}
+
 .wc-setup-steps {
 	padding: 0 0 24px;
 	margin: 0;
@ -565,8 +585,10 @@ body {
 	overflow: hidden;
 	margin: 20px 0 0;
 	position: relative;
+}

-	.button-primary {
+.wc-setup .wc-setup-actions .button-primary,
+.woocommerce-tracker .button-primary {
 	background-color: #bb77ae;
 	border-color: #a36597;
 	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
@ -582,7 +604,6 @@ body {
 		box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 0 #a36597;
 	}
 }
-}

 .wc-setup-content p:last-child {
 	margin-bottom: 0;
@ -1125,13 +1146,13 @@ h3.jetpack-reasons {
 	border-color: #ddd;
 	border-radius: 4px;
 	height: 30px;
-	width: calc(100% - 8px - 24px - 2px); // account for padding, border to align with other elements
+	width: 100%;
 	padding-left: 8px;
-	padding-right: 24px;
+	padding-right: 8px;
 	font-size: 16px;
 	color: #444;
 	background-color: #fff;
-	display: inline-block;
+	display: block;

 	&.dropdown {
 		width: 100%;
@ -1167,13 +1188,15 @@ h3.jetpack-reasons {
 	}
 }

-.product-type-container {
+.product-type-container,
+.sell-in-person-container {
 	margin-top: 14px;
 	margin-bottom: 1px;
 }

 #woocommerce_sell_in_person {
 	margin-left: 0;
+	margin-top: calc(0.85em / 2);
 }

 .wc-wizard-service-settings {
@ -1348,7 +1371,6 @@ p.jetpack-terms {
 		margin-top: 5px;
 		margin-left: 0;
 		margin-right: 0;
-		width: 1.5em;
 	}

 	.stripe_create_account,
--- a/assets/js/admin/meta-boxes-order.js
+++ b/assets/js/admin/meta-boxes-order.js
@ -44,9 +44,10 @@ jQuery( function ( $ ) {
 				country = $this.val(),
 				$state = $this.parents( 'div.edit_address' ).find( ':input.js_field-state' ),
 				$parent = $state.parent(),
+				stateValue = $state.val(),
 				input_name = $state.attr( 'name' ),
 				input_id = $state.attr( 'id' ),
-				value = $this.data( 'woocommerce.stickState-' + country ) ? $this.data( 'woocommerce.stickState-' + country ) : $state.val(),
+				value = $this.data( 'woocommerce.stickState-' + country ) ? $this.data( 'woocommerce.stickState-' + country ) : stateValue,
 				placeholder = $state.attr( 'placeholder' ),
 				$newstate;

@ -73,6 +74,9 @@ jQuery( function ( $ ) {
 						var $option = $( '<option></option>' )
 							.prop( 'value', index )
 							.text( state[ index ] );
+						if ( index === stateValue ) {
+							$option.prop( 'selected' );
+						}
 						$newstate.append( $option );
 					} );

@ -87,7 +91,7 @@ jQuery( function ( $ ) {
 					.prop( 'name', input_name )
 					.prop( 'placeholder', placeholder )
 					.addClass( 'js_field-state' )
-					.val( '' );
+					.val( stateValue );
 				$state.replaceWith( $newstate );
 			}

--- a/assets/js/admin/wc-product-export.js
+++ b/assets/js/admin/wc-product-export.js
@ -15,6 +15,7 @@

 		// Events.
 		$form.on( 'submit', { productExportForm: this }, this.onSubmit );
+		$form.find( '.woocommerce-exporter-types' ).on( 'change', { productExportForm: this }, this.exportTypeFields );
 	};

 	/**
@ -84,6 +85,20 @@
 		} );
 	};

+	/**
+	 * Handle fields per export type.
+	 */
+	productExportForm.prototype.exportTypeFields = function() {
+		var exportCategory = $( '.woocommerce-exporter-category' );
+
+		if ( -1 !== $.inArray( 'variation', $( this ).val() ) ) {
+			exportCategory.closest( 'tr' ).hide();
+			exportCategory.val( '' ).change(); // Reset WooSelect selected value.
+		} else {
+			exportCategory.closest( 'tr' ).show();
+		}
+	};
+
 	/**
 	 * Function to call productExportForm on jquery selector.
 	 */
--- a/assets/js/admin/wc-setup.js
+++ b/assets/js/admin/wc-setup.js
@ -22,6 +22,35 @@ jQuery( function( $ ) {
 		return true;
 	} );

+	$( 'form.address-step' ).on( 'submit', function( e ) {
+		var form = $( this );
+		if ( ( 'function' !== typeof form.checkValidity ) || form.checkValidity() ) {
+			blockWizardUI();
+		}
+
+		e.preventDefault();
+		$('.wc-setup-content').unblock();
+
+		$( this ).WCBackboneModal( {
+			template: 'wc-modal-tracking-setup'
+		} );
+
+		$( document.body ).on( 'wc_backbone_modal_response', function() {
+			form.unbind( 'submit' ).submit();
+		} );
+
+		$( '#wc_tracker_checkbox_dialog' ).on( 'change', function( e ) {
+			var eventTarget = $( e.target );
+			$( '#wc_tracker_checkbox' ).prop( 'checked', eventTarget.prop( 'checked' ) );
+		} );
+
+		$( '#wc_tracker_submit' ).on( 'click', function () {
+			form.unbind( 'submit' ).submit();
+		} );
+
+		return true;
+	} );
+
 	$( '#store_country' ).on( 'change', function() {
 		// Prevent if we don't have the metabox data
 		if ( wc_setup_params.states === null ){
--- a/assets/js/frontend/add-to-cart-variation.js
+++ b/assets/js/frontend/add-to-cart-variation.js
@ -275,7 +275,6 @@
 		} else {
 			form.$form.trigger( 'woocommerce_variation_select_change' );
 			form.$form.trigger( 'check_variations' );
-			$( this ).blur();
 		}

 		// Custom event for when variation selection has been changed
--- a/assets/js/frontend/checkout.js
+++ b/assets/js/frontend/checkout.js
@ -374,10 +374,11 @@ jQuery( function( $ ) {
 					if ( ! $.isEmptyObject( paymentDetails ) ) {
 						$( '.payment_box :input' ).each( function() {
 							var ID = $( this ).attr( 'id' );
-
 							if ( ID ) {
 								if ( $.inArray( $( this ).attr( 'type' ), [ 'checkbox', 'radio' ] ) !== -1 ) {
 									$( this ).prop( 'checked', paymentDetails[ ID ] ).change();
+								} else if ( $.inArray( $( this ).attr( 'type' ), [ 'select' ] ) !== -1 ) {
+									$( this ).val( paymentDetails[ ID ] ).change();
 								} else if ( null !== $( this ).val() && 0 === $( this ).val().length ) {
 									$( this ).val( paymentDetails[ ID ] ).change();
 								}
@ -583,6 +584,7 @@ jQuery( function( $ ) {
 						$form.before( code );
 						$form.slideUp();

+						$( document.body ).trigger( 'applied_coupon_in_checkout', [ data.coupon_code ] );
 						$( document.body ).trigger( 'update_checkout', { update_shipping_method: false } );
 					}
 				},
--- a/assets/js/frontend/geolocation.js
+++ b/assets/js/frontend/geolocation.js
@ -80,4 +80,9 @@ jQuery( function( $ ) {
 		$append_hashes();
 	});
 	
+	// Enable user to trigger manual append hashes on AJAX operations
+	$( document.body ).on( 'woocommerce_append_geo_hashes', function() {
+		$append_hashes();
+	});
+
 });
--- a/assets/js/frontend/woocommerce.js
+++ b/assets/js/frontend/woocommerce.js
@ -32,9 +32,11 @@ jQuery( function( $ ) {
 	});

 	// Make form field descriptions toggle on focus.
+	if ( $( '.woocommerce-input-wrapper span.description' ).length ) {
 		$( document.body ).on( 'click', function() {
 			$( '.woocommerce-input-wrapper span.description:visible' ).prop( 'aria-hidden', true ).slideUp( 250 );
 		} );
+	}

 	$( '.woocommerce-input-wrapper' ).on( 'click', function( event ) {
 		event.stopPropagation();
--- a/bin/package-update.sh
+++ b/bin/package-update.sh
@ -29,7 +29,7 @@ output 2 "Done"
 output 3 "Updating package textdomains..."

 # Replace text domains within packages with woocommerce
-find ./packages/woocommerce-blocks -iname '*.php' -exec sed -i.bak -e "s/, 'woo-gutenberg-products-block'/, 'woocommerce'/g" {} \;
+find ./packages/woocommerce-blocks \( -iname '*.php' -o -iname '*.js' \) -exec sed -i.bak -e "s/'woo-gutenberg-products-block'/'woocommerce'/g" -e "s/\"woo-gutenberg-products-block\"/'woocommerce'/g" {} \;
 find ./packages/woocommerce-rest-api -iname '*.php' -exec sed -i.bak -e "s/, 'woocommerce-rest-api'/, 'woocommerce'/g" {} \;

 # Cleanup backup files
--- a/composer.json
+++ b/composer.json
@ -7,16 +7,15 @@
  "prefer-stable": true,
  "minimum-stability": "dev",
  "require": {
-    "automattic/jetpack-autoloader": "1.2.0",
+    "automattic/jetpack-autoloader": "^1.2.0",
    "php": ">=5.6|>=7.0",
-    "composer/installers": "1.6.0",
-    "woocommerce/woocommerce-blocks": "2.3.0-beta",
+    "composer/installers": "1.7.0",
+    "woocommerce/woocommerce-blocks": "2.4.3",
    "woocommerce/woocommerce-rest-api": "1.0.3"
  },
  "require-dev": {
-    "myclabs/deep-copy": "1.7.0",
-    "phpunit/phpunit": "7.5.14",
-    "woocommerce/woocommerce-sniffs": "0.0.6"
+    "phpunit/phpunit": "7.5.16",
+    "woocommerce/woocommerce-sniffs": "0.0.8"
  },
  "config": {
    "platform": {
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "8b2833a3907261e9b1fb056fe56c9dfb",
+    "content-hash": "c955d86ce8d65e6fb1e0e97282642d7b",
    "packages": [
        {
            "name": "automattic/jetpack-autoloader",
@ -44,16 +44,16 @@
        },
        {
            "name": "composer/installers",
-            "version": "v1.6.0",
+            "version": "v1.7.0",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/installers.git",
-                "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b"
+                "reference": "141b272484481432cda342727a427dc1e206bfa0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b",
-                "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b",
+                "url": "https://api.github.com/repos/composer/installers/zipball/141b272484481432cda342727a427dc1e206bfa0",
+                "reference": "141b272484481432cda342727a427dc1e206bfa0",
                "shasum": ""
            },
            "require": {
@ -109,6 +109,7 @@
                "RadPHP",
                "SMF",
                "Thelia",
+                "Whmcs",
                "WolfCMS",
                "agl",
                "aimeos",
@ -131,6 +132,7 @@
                "installer",
                "itop",
                "joomla",
+                "known",
                "kohana",
                "laravel",
                "lavalite",
@ -160,25 +162,25 @@
                "zend",
                "zikula"
            ],
-            "time": "2018-08-27T06:10:37+00:00"
+            "time": "2019-08-12T15:00:31+00:00"
        },
        {
            "name": "woocommerce/woocommerce-blocks",
-            "version": "v2.3.0-beta",
+            "version": "v2.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/woocommerce/woocommerce-gutenberg-products-block.git",
-                "reference": "00b6d8fefd62e6fe8b14fdb277dc784ff108291e"
+                "reference": "9a4b30a18f055ed83d819959cbc1386111f401a5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/00b6d8fefd62e6fe8b14fdb277dc784ff108291e",
-                "reference": "00b6d8fefd62e6fe8b14fdb277dc784ff108291e",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-gutenberg-products-block/zipball/9a4b30a18f055ed83d819959cbc1386111f401a5",
+                "reference": "9a4b30a18f055ed83d819959cbc1386111f401a5",
                "shasum": ""
            },
            "require": {
                "automattic/jetpack-autoloader": "1.2.0",
-                "composer/installers": "1.6.0"
+                "composer/installers": "1.7.0"
            },
            "require-dev": {
                "phpunit/phpunit": "6.5.14",
@ -207,7 +209,7 @@
                "gutenberg",
                "woocommerce"
            ],
-            "time": "2019-07-10T11:39:03+00:00"
+            "time": "2019-10-14T13:20:09+00:00"
        },
        {
            "name": "woocommerce/woocommerce-rest-api",
@ -375,25 +377,28 @@
        },
        {
            "name": "myclabs/deep-copy",
-            "version": "1.7.0",
+            "version": "1.9.3",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
+                "reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
                "shasum": ""
            },
            "require": {
-                "php": "^5.6 || ^7.0"
+                "php": "^7.1"
+            },
+            "replace": {
+                "myclabs/deep-copy": "self.version"
            },
            "require-dev": {
                "doctrine/collections": "^1.0",
                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
+                "phpunit/phpunit": "^7.1"
            },
            "type": "library",
            "autoload": {
@ -416,7 +421,7 @@
                "object",
                "object graph"
            ],
-            "time": "2017-10-19T19:58:43+00:00"
+            "time": "2019-08-09T12:45:53+00:00"
        },
        {
            "name": "phar-io/manifest",
@ -522,16 +527,16 @@
        },
        {
            "name": "phpcompatibility/php-compatibility",
-            "version": "9.2.0",
+            "version": "9.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPCompatibility/PHPCompatibility.git",
-                "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e"
+                "reference": "9999344e47e7af6b00e1a898eacc4e4368fb7196"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/3db1bf1e28123fd574a4ae2e9a84072826d51b5e",
-                "reference": "3db1bf1e28123fd574a4ae2e9a84072826d51b5e",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibility/zipball/9999344e47e7af6b00e1a898eacc4e4368fb7196",
+                "reference": "9999344e47e7af6b00e1a898eacc4e4368fb7196",
                "shasum": ""
            },
            "require": {
@ -554,10 +559,6 @@
                "LGPL-3.0-or-later"
            ],
            "authors": [
-                {
-                    "name": "Contributors",
-                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
-                },
                {
                    "name": "Wim Godden",
                    "homepage": "https://github.com/wimg",
@ -567,6 +568,10 @@
                    "name": "Juliette Reinders Folmer",
                    "homepage": "https://github.com/jrfnl",
                    "role": "lead"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/PHPCompatibility/PHPCompatibility/graphs/contributors"
                }
            ],
            "description": "A set of sniffs for PHP_CodeSniffer that checks for PHP cross-version compatibility.",
@ -576,30 +581,32 @@
                "phpcs",
                "standards"
            ],
-            "time": "2019-06-27T19:58:56+00:00"
+            "time": "2019-09-05T18:36:49+00:00"
        },
        {
            "name": "phpcompatibility/phpcompatibility-paragonie",
-            "version": "1.0.1",
+            "version": "1.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPCompatibility/PHPCompatibilityParagonie.git",
-                "reference": "9160de79fcd683b5c99e9c4133728d91529753ea"
+                "reference": "b1bb79a7cab1fb856b56f1b5cf110b6e52d8e936"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/9160de79fcd683b5c99e9c4133728d91529753ea",
-                "reference": "9160de79fcd683b5c99e9c4133728d91529753ea",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityParagonie/zipball/b1bb79a7cab1fb856b56f1b5cf110b6e52d8e936",
+                "reference": "b1bb79a7cab1fb856b56f1b5cf110b6e52d8e936",
                "shasum": ""
            },
            "require": {
                "phpcompatibility/php-compatibility": "^9.0"
            },
            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5",
+                "paragonie/random_compat": "dev-master",
+                "paragonie/sodium_compat": "dev-master"
            },
            "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
            },
            "type": "phpcodesniffer-standard",
@ -626,20 +633,20 @@
                "polyfill",
                "standards"
            ],
-            "time": "2018-12-16T19:10:44+00:00"
+            "time": "2019-08-28T15:58:19+00:00"
        },
        {
            "name": "phpcompatibility/phpcompatibility-wp",
-            "version": "2.0.0",
+            "version": "2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPCompatibility/PHPCompatibilityWP.git",
-                "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd"
+                "reference": "41bef18ba688af638b7310666db28e1ea9158b2f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
-                "reference": "cb303f0067cd5b366a41d4fb0e254fb40ff02efd",
+                "url": "https://api.github.com/repos/PHPCompatibility/PHPCompatibilityWP/zipball/41bef18ba688af638b7310666db28e1ea9158b2f",
+                "reference": "41bef18ba688af638b7310666db28e1ea9158b2f",
                "shasum": ""
            },
            "require": {
@ -647,10 +654,10 @@
                "phpcompatibility/phpcompatibility-paragonie": "^1.0"
            },
            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5"
            },
            "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5 || This Composer plugin will sort out the PHP_CodeSniffer 'installed_paths' automatically.",
                "roave/security-advisories": "dev-master || Helps prevent installing dependencies with known security issues."
            },
            "type": "phpcodesniffer-standard",
@ -676,39 +683,37 @@
                "standards",
                "wordpress"
            ],
-            "time": "2018-10-07T18:31:37+00:00"
+            "time": "2019-08-28T14:22:28+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
+            "version": "2.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.5"
+                "php": ">=7.1"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.6"
+                "phpunit/phpunit": "~6"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "2.x-dev"
                }
            },
            "autoload": {
                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src/"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -730,30 +735,30 @@
                "reflection",
                "static analysis"
            ],
-            "time": "2017-09-11T18:02:19+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.1",
+            "version": "4.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
-                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
+                "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e",
                "shasum": ""
            },
            "require": {
                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
+                "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0",
+                "phpdocumentor/type-resolver": "~0.4 || ^1.0.0",
                "webmozart/assert": "^1.0"
            },
            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
+                "doctrine/instantiator": "^1.0.5",
                "mockery/mockery": "^1.0",
                "phpunit/phpunit": "^6.4"
            },
@ -781,41 +786,40 @@
                }
            ],
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2019-04-30T17:48:53+00:00"
+            "time": "2019-09-12T14:27:41+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
+            "version": "1.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
                "shasum": ""
            },
            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
+                "php": "^7.1",
+                "phpdocumentor/reflection-common": "^2.0"
            },
            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
+                "ext-tokenizer": "^7.1",
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.x-dev"
                }
            },
            "autoload": {
                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
+                    "phpDocumentor\\Reflection\\": "src"
                }
            },
            "notification-url": "https://packagist.org/downloads/",
@ -828,7 +832,8 @@
                    "email": "me@mikevanriel.com"
                }
            ],
-            "time": "2017-07-14T14:27:02+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "time": "2019-08-22T18:11:29+00:00"
        },
        {
            "name": "phpspec/prophecy",
@ -1098,16 +1103,16 @@
        },
        {
            "name": "phpunit/php-token-stream",
-            "version": "3.0.2",
+            "version": "3.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c"
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c",
-                "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff",
+                "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff",
                "shasum": ""
            },
            "require": {
@ -1120,7 +1125,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "3.1-dev"
                }
            },
            "autoload": {
@ -1143,20 +1148,20 @@
            "keywords": [
                "tokenizer"
            ],
-            "time": "2019-07-08T05:24:54+00:00"
+            "time": "2019-09-17T06:23:10+00:00"
        },
        {
            "name": "phpunit/phpunit",
-            "version": "7.5.14",
+            "version": "7.5.16",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff"
+                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2834789aeb9ac182ad69bfdf9ae91856a59945ff",
-                "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661",
+                "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661",
                "shasum": ""
            },
            "require": {
@ -1227,7 +1232,7 @@
                "testing",
                "xunit"
            ],
-            "time": "2019-07-15T06:24:08+00:00"
+            "time": "2019-09-14T09:08:39+00:00"
        },
        {
            "name": "sebastian/code-unit-reverse-lookup",
@ -1449,16 +1454,16 @@
        },
        {
            "name": "sebastian/exporter",
-            "version": "3.1.0",
+            "version": "3.1.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e",
+                "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e",
                "shasum": ""
            },
            "require": {
@ -1485,6 +1490,10 @@
                "BSD-3-Clause"
            ],
            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
                {
                    "name": "Jeff Welch",
                    "email": "whatthejeff@gmail.com"
@ -1493,17 +1502,13 @@
                    "name": "Volker Dusch",
                    "email": "github@wallbash.com"
                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
                {
                    "name": "Adam Harvey",
                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
                }
            ],
            "description": "Provides the functionality to export PHP variables for visualization",
@ -1512,7 +1517,7 @@
                "export",
                "exporter"
            ],
-            "time": "2017-04-03T13:19:02+00:00"
+            "time": "2019-09-14T09:02:43+00:00"
        },
        {
            "name": "sebastian/global-state",
@ -1797,16 +1802,16 @@
        },
        {
            "name": "squizlabs/php_codesniffer",
-            "version": "3.4.2",
+            "version": "3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
+                "reference": "0afebf16a2e7f1e434920fa976253576151effe9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/0afebf16a2e7f1e434920fa976253576151effe9",
+                "reference": "0afebf16a2e7f1e434920fa976253576151effe9",
                "shasum": ""
            },
            "require": {
@ -1844,20 +1849,20 @@
                "phpcs",
                "standards"
            ],
-            "time": "2019-04-10T23:49:02+00:00"
+            "time": "2019-09-26T23:12:26+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.11.0",
+            "version": "v1.12.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "82ebae02209c21113908c229e9883c419720738a"
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "82ebae02209c21113908c229e9883c419720738a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4",
+                "reference": "550ebaac289296ce228a706d0867afc34687e3f4",
                "shasum": ""
            },
            "require": {
@ -1869,7 +1874,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.11-dev"
+                    "dev-master": "1.12-dev"
                }
            },
            "autoload": {
@ -1885,13 +1890,13 @@
                "MIT"
            ],
            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                },
                {
                    "name": "Gert de Pagter",
                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                }
            ],
            "description": "Symfony polyfill for ctype functions",
@ -1902,7 +1907,7 @@
                "polyfill",
                "portable"
            ],
-            "time": "2019-02-06T07:57:58+00:00"
+            "time": "2019-08-06T08:03:45+00:00"
        },
        {
            "name": "theseer/tokenizer",
@ -1946,16 +1951,16 @@
        },
        {
            "name": "webmozart/assert",
-            "version": "1.4.0",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/webmozart/assert.git",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9"
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/83e253c8e0be5b0257b881e1827274667c5c17a9",
-                "reference": "83e253c8e0be5b0257b881e1827274667c5c17a9",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4",
+                "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4",
                "shasum": ""
            },
            "require": {
@ -1963,8 +1968,7 @@
                "symfony/polyfill-ctype": "^1.8"
            },
            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
            },
            "type": "library",
            "extra": {
@ -1993,27 +1997,27 @@
                "check",
                "validate"
            ],
-            "time": "2018-12-25T11:19:39+00:00"
+            "time": "2019-08-24T08:43:50+00:00"
        },
        {
            "name": "woocommerce/woocommerce-sniffs",
-            "version": "0.0.6",
+            "version": "0.0.8",
            "source": {
                "type": "git",
                "url": "https://github.com/woocommerce/woocommerce-sniffs.git",
-                "reference": "a3032bdddd60c71d1330f591e1a9128e115f81ee"
+                "reference": "ccdae93ba678d59cd9741bec077d0c63c0a82958"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/a3032bdddd60c71d1330f591e1a9128e115f81ee",
-                "reference": "a3032bdddd60c71d1330f591e1a9128e115f81ee",
+                "url": "https://api.github.com/repos/woocommerce/woocommerce-sniffs/zipball/ccdae93ba678d59cd9741bec077d0c63c0a82958",
+                "reference": "ccdae93ba678d59cd9741bec077d0c63c0a82958",
                "shasum": ""
            },
            "require": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "0.5.0",
                "php": ">=7.0",
-                "phpcompatibility/phpcompatibility-wp": "2.0.0",
-                "wp-coding-standards/wpcs": "^1.2"
+                "phpcompatibility/phpcompatibility-wp": "2.1.0",
+                "wp-coding-standards/wpcs": "2.1.1"
            },
            "type": "phpcodesniffer-standard",
            "notification-url": "https://packagist.org/downloads/",
@ -2033,31 +2037,33 @@
                "woocommerce",
                "wordpress"
            ],
-            "time": "2019-03-11T15:30:23+00:00"
+            "time": "2019-10-16T18:25:21+00:00"
        },
        {
            "name": "wp-coding-standards/wpcs",
-            "version": "1.2.1",
+            "version": "2.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
-                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c"
+                "reference": "bd9c33152115e6741e3510ff7189605b35167908"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
-                "reference": "f328bcafd97377e8e5e5d7b244d5ddbf301a3a5c",
+                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/bd9c33152115e6741e3510ff7189605b35167908",
+                "reference": "bd9c33152115e6741e3510ff7189605b35167908",
                "shasum": ""
            },
            "require": {
-                "php": ">=5.3",
-                "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
+                "php": ">=5.4",
+                "squizlabs/php_codesniffer": "^3.3.1"
            },
            "require-dev": {
-                "phpcompatibility/php-compatibility": "^9.0"
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "phpcompatibility/php-compatibility": "^9.0",
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
            },
            "suggest": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
            },
            "type": "phpcodesniffer-standard",
            "notification-url": "https://packagist.org/downloads/",
@ -2076,7 +2082,7 @@
                "standards",
                "wordpress"
            ],
-            "time": "2018-12-18T09:43:51+00:00"
+            "time": "2019-05-21T02:50:00+00:00"
        }
    ],
    "aliases": [],
--- a/i18n/countries.php
+++ b/i18n/countries.php
@ -3,9 +3,10 @@
 * Countries
 *
 * Returns an array of countries and codes.
+ * Country codes and names should follow the Unicode CLDR recommendation (http://cldr.unicode.org/translation/country-names).
 *
- * @package WooCommerce/i18n
- * @version 2.5.0
+ * @package WooCommerce\i18n
+ * @version 3.8.0
 */

 defined( 'ABSPATH' ) || exit;
@ -139,7 +140,7 @@ return array(
 	'LI' => __( 'Liechtenstein', 'woocommerce' ),
 	'LT' => __( 'Lithuania', 'woocommerce' ),
 	'LU' => __( 'Luxembourg', 'woocommerce' ),
-	'MO' => __( 'Macao S.A.R., China', 'woocommerce' ),
+	'MO' => __( 'Macao', 'woocommerce' ),
 	'MK' => __( 'North Macedonia', 'woocommerce' ),
 	'MG' => __( 'Madagascar', 'woocommerce' ),
 	'MW' => __( 'Malawi', 'woocommerce' ),
--- a/i18n/states.php
+++ b/i18n/states.php
@ -3,11 +3,12 @@
 * States
 *
 * Returns an array of country states. This deprecates and replaces the /states/ directory found in older versions.
- * States /should/ be defined in English and translated native though localisation files.
+ * States should be defined in English and translated native through localisation files.
+ * Country codes and states (or province) names should follow the Unicode CLDR recommendation (http://cldr.unicode.org/translation/country-names).
 * Countries defined with empty arrays have no states.
 *
- * @package WooCommerce/i18n
- * @version 3.6.0
+ * @package WooCommerce\i18n
+ * @version 3.8.0
 */

 defined( 'ABSPATH' ) || exit;
@ -284,7 +285,7 @@ return array(
 		'CN27' => __( 'Gansu / &#29976;&#32899;', 'woocommerce' ),
 		'CN28' => __( 'Qinghai / &#38738;&#28023;', 'woocommerce' ),
 		'CN29' => __( 'Ningxia Hui / &#23425;&#22799;', 'woocommerce' ),
-		'CN30' => __( 'Macau / &#28595;&#38376;', 'woocommerce' ),
+		'CN30' => __( 'Macao / &#28595;&#38376;', 'woocommerce' ),
 		'CN31' => __( 'Tibet / &#35199;&#34255;', 'woocommerce' ),
 		'CN32' => __( 'Xinjiang / &#26032;&#30086;', 'woocommerce' ),
 	),
@ -913,8 +914,6 @@ return array(

 	/**
 	 * Philippine Provinces.
-	 *
-	 * @todo DAC Needs to be updated when ISO code is assigned.
 	 */
 	'PH' => array(
 		'ABR' => __( 'Abra', 'woocommerce' ),
@ -1277,6 +1276,147 @@ return array(
 	),
 	'LK' => array(),
 	'SE' => array(),
+	'UG' => array( // Uganda districts. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:UG.
+		'UG314' => __( 'Abim', 'woocommerce' ),
+		'UG301' => __( 'Adjumani', 'woocommerce' ),
+		'UG322' => __( 'Agago', 'woocommerce' ),
+		'UG323' => __( 'Alebtong', 'woocommerce' ),
+		'UG315' => __( 'Amolatar', 'woocommerce' ),
+		'UG324' => __( 'Amudat', 'woocommerce' ),
+		'UG216' => __( 'Amuria', 'woocommerce' ),
+		'UG316' => __( 'Amuru', 'woocommerce' ),
+		'UG302' => __( 'Apac', 'woocommerce' ),
+		'UG303' => __( 'Arua', 'woocommerce' ),
+		'UG217' => __( 'Budaka', 'woocommerce' ),
+		'UG218' => __( 'Bududa', 'woocommerce' ),
+		'UG201' => __( 'Bugiri', 'woocommerce' ),
+		'UG235' => __( 'Bugweri', 'woocommerce' ),
+		'UG420' => __( 'Buhweju', 'woocommerce' ),
+		'UG117' => __( 'Buikwe', 'woocommerce' ),
+		'UG219' => __( 'Bukedea', 'woocommerce' ),
+		'UG118' => __( 'Bukomansimbi', 'woocommerce' ),
+		'UG220' => __( 'Bukwa', 'woocommerce' ),
+		'UG225' => __( 'Bulambuli', 'woocommerce' ),
+		'UG416' => __( 'Buliisa', 'woocommerce' ),
+		'UG401' => __( 'Bundibugyo', 'woocommerce' ),
+		'UG430' => __( 'Bunyangabu', 'woocommerce' ),
+		'UG402' => __( 'Bushenyi', 'woocommerce' ),
+		'UG202' => __( 'Busia', 'woocommerce' ),
+		'UG221' => __( 'Butaleja', 'woocommerce' ),
+		'UG119' => __( 'Butambala', 'woocommerce' ),
+		'UG233' => __( 'Butebo', 'woocommerce' ),
+		'UG120' => __( 'Buvuma', 'woocommerce' ),
+		'UG226' => __( 'Buyende', 'woocommerce' ),
+		'UG317' => __( 'Dokolo', 'woocommerce' ),
+		'UG121' => __( 'Gomba', 'woocommerce' ),
+		'UG304' => __( 'Gulu', 'woocommerce' ),
+		'UG403' => __( 'Hoima', 'woocommerce' ),
+		'UG417' => __( 'Ibanda', 'woocommerce' ),
+		'UG203' => __( 'Iganga', 'woocommerce' ),
+		'UG418' => __( 'Isingiro', 'woocommerce' ),
+		'UG204' => __( 'Jinja', 'woocommerce' ),
+		'UG318' => __( 'Kaabong', 'woocommerce' ),
+		'UG404' => __( 'Kabale', 'woocommerce' ),
+		'UG405' => __( 'Kabarole', 'woocommerce' ),
+		'UG213' => __( 'Kaberamaido', 'woocommerce' ),
+		'UG427' => __( 'Kagadi', 'woocommerce' ),
+		'UG428' => __( 'Kakumiro', 'woocommerce' ),
+		'UG101' => __( 'Kalangala', 'woocommerce' ),
+		'UG222' => __( 'Kaliro', 'woocommerce' ),
+		'UG122' => __( 'Kalungu', 'woocommerce' ),
+		'UG102' => __( 'Kampala', 'woocommerce' ),
+		'UG205' => __( 'Kamuli', 'woocommerce' ),
+		'UG413' => __( 'Kamwenge', 'woocommerce' ),
+		'UG414' => __( 'Kanungu', 'woocommerce' ),
+		'UG206' => __( 'Kapchorwa', 'woocommerce' ),
+		'UG236' => __( 'Kapelebyong', 'woocommerce' ),
+		'UG126' => __( 'Kasanda', 'woocommerce' ),
+		'UG406' => __( 'Kasese', 'woocommerce' ),
+		'UG207' => __( 'Katakwi', 'woocommerce' ),
+		'UG112' => __( 'Kayunga', 'woocommerce' ),
+		'UG407' => __( 'Kibaale', 'woocommerce' ),
+		'UG103' => __( 'Kiboga', 'woocommerce' ),
+		'UG227' => __( 'Kibuku', 'woocommerce' ),
+		'UG432' => __( 'Kikuube', 'woocommerce' ),
+		'UG419' => __( 'Kiruhura', 'woocommerce' ),
+		'UG421' => __( 'Kiryandongo', 'woocommerce' ),
+		'UG408' => __( 'Kisoro', 'woocommerce' ),
+		'UG305' => __( 'Kitgum', 'woocommerce' ),
+		'UG319' => __( 'Koboko', 'woocommerce' ),
+		'UG325' => __( 'Kole', 'woocommerce' ),
+		'UG306' => __( 'Kotido', 'woocommerce' ),
+		'UG208' => __( 'Kumi', 'woocommerce' ),
+		'UG333' => __( 'Kwania', 'woocommerce' ),
+		'UG228' => __( 'Kween', 'woocommerce' ),
+		'UG123' => __( 'Kyankwanzi', 'woocommerce' ),
+		'UG422' => __( 'Kyegegwa', 'woocommerce' ),
+		'UG415' => __( 'Kyenjojo', 'woocommerce' ),
+		'UG125' => __( 'Kyotera', 'woocommerce' ),
+		'UG326' => __( 'Lamwo', 'woocommerce' ),
+		'UG307' => __( 'Lira', 'woocommerce' ),
+		'UG229' => __( 'Luuka', 'woocommerce' ),
+		'UG104' => __( 'Luwero', 'woocommerce' ),
+		'UG124' => __( 'Lwengo', 'woocommerce' ),
+		'UG114' => __( 'Lyantonde', 'woocommerce' ),
+		'UG223' => __( 'Manafwa', 'woocommerce' ),
+		'UG320' => __( 'Maracha', 'woocommerce' ),
+		'UG105' => __( 'Masaka', 'woocommerce' ),
+		'UG409' => __( 'Masindi', 'woocommerce' ),
+		'UG214' => __( 'Mayuge', 'woocommerce' ),
+		'UG209' => __( 'Mbale', 'woocommerce' ),
+		'UG410' => __( 'Mbarara', 'woocommerce' ),
+		'UG423' => __( 'Mitooma', 'woocommerce' ),
+		'UG115' => __( 'Mityana', 'woocommerce' ),
+		'UG308' => __( 'Moroto', 'woocommerce' ),
+		'UG309' => __( 'Moyo', 'woocommerce' ),
+		'UG106' => __( 'Mpigi', 'woocommerce' ),
+		'UG107' => __( 'Mubende', 'woocommerce' ),
+		'UG108' => __( 'Mukono', 'woocommerce' ),
+		'UG334' => __( 'Nabilatuk', 'woocommerce' ),
+		'UG311' => __( 'Nakapiripirit', 'woocommerce' ),
+		'UG116' => __( 'Nakaseke', 'woocommerce' ),
+		'UG109' => __( 'Nakasongola', 'woocommerce' ),
+		'UG230' => __( 'Namayingo', 'woocommerce' ),
+		'UG234' => __( 'Namisindwa', 'woocommerce' ),
+		'UG224' => __( 'Namutumba', 'woocommerce' ),
+		'UG327' => __( 'Napak', 'woocommerce' ),
+		'UG310' => __( 'Nebbi', 'woocommerce' ),
+		'UG231' => __( 'Ngora', 'woocommerce' ),
+		'UG424' => __( 'Ntoroko', 'woocommerce' ),
+		'UG411' => __( 'Ntungamo', 'woocommerce' ),
+		'UG328' => __( 'Nwoya', 'woocommerce' ),
+		'UG331' => __( 'Omoro', 'woocommerce' ),
+		'UG329' => __( 'Otuke', 'woocommerce' ),
+		'UG321' => __( 'Oyam', 'woocommerce' ),
+		'UG312' => __( 'Pader', 'woocommerce' ),
+		'UG332' => __( 'Pakwach', 'woocommerce' ),
+		'UG210' => __( 'Pallisa', 'woocommerce' ),
+		'UG110' => __( 'Rakai', 'woocommerce' ),
+		'UG429' => __( 'Rubanda', 'woocommerce' ),
+		'UG425' => __( 'Rubirizi', 'woocommerce' ),
+		'UG431' => __( 'Rukiga', 'woocommerce' ),
+		'UG412' => __( 'Rukungiri', 'woocommerce' ),
+		'UG111' => __( 'Sembabule', 'woocommerce' ),
+		'UG232' => __( 'Serere', 'woocommerce' ),
+		'UG426' => __( 'Sheema', 'woocommerce' ),
+		'UG215' => __( 'Sironko', 'woocommerce' ),
+		'UG211' => __( 'Soroti', 'woocommerce' ),
+		'UG212' => __( 'Tororo', 'woocommerce' ),
+		'UG113' => __( 'Wakiso', 'woocommerce' ),
+		'UG313' => __( 'Yumbe', 'woocommerce' ),
+		'UG330' => __( 'Zombo', 'woocommerce' ),
+	),
+	'UM' => array(
+		'81' => __( 'Baker Island', 'woocommerce' ),
+		'84' => __( 'Howland Island', 'woocommerce' ),
+		'86' => __( 'Jarvis Island', 'woocommerce' ),
+		'67' => __( 'Johnston Atoll', 'woocommerce' ),
+		'89' => __( 'Kingman Reef', 'woocommerce' ),
+		'71' => __( 'Midway Atoll', 'woocommerce' ),
+		'76' => __( 'Navassa Island', 'woocommerce' ),
+		'95' => __( 'Palmyra Atoll', 'woocommerce' ),
+		'79' => __( 'Wake Island', 'woocommerce' ),
+	),
 	'US' => array( // United States.
 		'AL' => __( 'Alabama', 'woocommerce' ),
 		'AK' => __( 'Alaska', 'woocommerce' ),
@ -1346,4 +1486,16 @@ return array(
 		'NW'  => __( 'North West', 'woocommerce' ),
 		'WC'  => __( 'Western Cape', 'woocommerce' ),
 	),
+	'ZM' => array( // Zambia's Provinces. Ref: https://en.wikipedia.org/wiki/ISO_3166-2:ZM.
+		'ZM-01' => __( 'Western', 'woocommerce' ),
+		'ZM-02' => __( 'Central', 'woocommerce' ),
+		'ZM-03' => __( 'Eastern', 'woocommerce' ),
+		'ZM-04' => __( 'Luapula', 'woocommerce' ),
+		'ZM-05' => __( 'Northern', 'woocommerce' ),
+		'ZM-06' => __( 'North-Western', 'woocommerce' ),
+		'ZM-07' => __( 'Southern', 'woocommerce' ),
+		'ZM-08' => __( 'Copperbelt', 'woocommerce' ),
+		'ZM-09' => __( 'Lusaka', 'woocommerce' ),
+		'ZM-10' => __( 'Muchinga', 'woocommerce' ),
+	),
 );
--- a/i18n/states/AO.php
+++ b/i18n/states/AO.php
@ -1,32 +0,0 @@
-<?php
-/**
- * Angola states
- *
- * @package WooCommerce/i18n
- * @version 1.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['AO'] = array(
-	'BGO' => __( 'Bengo', 'woocommerce' ),
-	'BLU' => __( 'Benguela', 'woocommerce' ),
-	'BIE' => __( 'Bié', 'woocommerce' ),
-	'CAB' => __( 'Cabinda', 'woocommerce' ),
-	'CNN' => __( 'Cunene', 'woocommerce' ),
-	'HUA' => __( 'Huambo', 'woocommerce' ),
-	'HUI' => __( 'Huíla', 'woocommerce' ),
-	'CCU' => __( 'Kuando Kubango', 'woocommerce' ),
-	'CNO' => __( 'Kwanza-Norte', 'woocommerce' ),
-	'CUS' => __( 'Kwanza-Sul', 'woocommerce' ),
-	'LUA' => __( 'Luanda', 'woocommerce' ),
-	'LNO' => __( 'Lunda-Norte', 'woocommerce' ),
-	'LSU' => __( 'Lunda-Sul', 'woocommerce' ),
-	'MAL' => __( 'Malanje', 'woocommerce' ),
-	'MOX' => __( 'Moxico', 'woocommerce' ),
-	'NAM' => __( 'Namibe', 'woocommerce' ),
-	'UIG' => __( 'Uíge', 'woocommerce' ),
-	'ZAI' => __( 'Zaire', 'woocommerce' ),
-);
--- a/i18n/states/AR.php
+++ b/i18n/states/AR.php
@ -1,38 +0,0 @@
-<?php
-/**
- * Argentinian provinces
- *
- * @package WooCommerce/i18n
- * @version 2.4.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['AR'] = array(
-	'C' => __( 'Ciudad Aut&oacute;noma de Buenos Aires', 'woocommerce' ),
-	'B' => __( 'Buenos Aires', 'woocommerce' ),
-	'K' => __( 'Catamarca', 'woocommerce' ),
-	'H' => __( 'Chaco', 'woocommerce' ),
-	'U' => __( 'Chubut', 'woocommerce' ),
-	'X' => __( 'C&oacute;rdoba', 'woocommerce' ),
-	'W' => __( 'Corrientes', 'woocommerce' ),
-	'E' => __( 'Entre R&iacute;os', 'woocommerce' ),
-	'P' => __( 'Formosa', 'woocommerce' ),
-	'Y' => __( 'Jujuy', 'woocommerce' ),
-	'L' => __( 'La Pampa', 'woocommerce' ),
-	'F' => __( 'La Rioja', 'woocommerce' ),
-	'M' => __( 'Mendoza', 'woocommerce' ),
-	'N' => __( 'Misiones', 'woocommerce' ),
-	'Q' => __( 'Neuqu&eacute;n', 'woocommerce' ),
-	'R' => __( 'R&iacute;o Negro', 'woocommerce' ),
-	'A' => __( 'Salta', 'woocommerce' ),
-	'J' => __( 'San Juan', 'woocommerce' ),
-	'D' => __( 'San Luis', 'woocommerce' ),
-	'Z' => __( 'Santa Cruz', 'woocommerce' ),
-	'S' => __( 'Santa Fe', 'woocommerce' ),
-	'G' => __( 'Santiago del Estero', 'woocommerce' ),
-	'V' => __( 'Tierra del Fuego', 'woocommerce' ),
-	'T' => __( 'Tucum&aacute;n', 'woocommerce' ),
-);
--- a/i18n/states/AU.php
+++ b/i18n/states/AU.php
@ -1,22 +0,0 @@
-<?php
-/**
- * Australian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['AU'] = array(
-	'ACT' => __( 'Australian Capital Territory', 'woocommerce' ),
-	'NSW' => __( 'New South Wales', 'woocommerce' ),
-	'NT'  => __( 'Northern Territory', 'woocommerce' ),
-	'QLD' => __( 'Queensland', 'woocommerce' ),
-	'SA'  => __( 'South Australia', 'woocommerce' ),
-	'TAS' => __( 'Tasmania', 'woocommerce' ),
-	'VIC' => __( 'Victoria', 'woocommerce' ),
-	'WA'  => __( 'Western Australia', 'woocommerce' ),
-);
--- a/i18n/states/BD.php
+++ b/i18n/states/BD.php
@ -1,77 +0,0 @@
-<?php
-/**
- * Bangladeshi states (districts)
- *
- * @package WooCommerce/i18n
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['BD'] = array(
-	'BD-05' => __( 'Bagerhat', 'woocommerce' ),
-	'BD-01' => __( 'Bandarban', 'woocommerce' ),
-	'BD-02' => __( 'Barguna', 'woocommerce' ),
-	'BD-06' => __( 'Barishal', 'woocommerce' ),
-	'BD-07' => __( 'Bhola', 'woocommerce' ),
-	'BD-03' => __( 'Bogura', 'woocommerce' ),
-	'BD-04' => __( 'Brahmanbaria', 'woocommerce' ),
-	'BD-09' => __( 'Chandpur', 'woocommerce' ),
-	'BD-10' => __( 'Chattogram', 'woocommerce' ),
-	'BD-12' => __( 'Chuadanga', 'woocommerce' ),
-	'BD-11' => __( "Cox's Bazar", 'woocommerce' ),
-	'BD-08' => __( 'Cumilla', 'woocommerce' ),
-	'BD-13' => __( 'Dhaka', 'woocommerce' ),
-	'BD-14' => __( 'Dinajpur', 'woocommerce' ),
-	'BD-15' => __( 'Faridpur ', 'woocommerce' ),
-	'BD-16' => __( 'Feni', 'woocommerce' ),
-	'BD-19' => __( 'Gaibandha', 'woocommerce' ),
-	'BD-18' => __( 'Gazipur', 'woocommerce' ),
-	'BD-17' => __( 'Gopalganj', 'woocommerce' ),
-	'BD-20' => __( 'Habiganj', 'woocommerce' ),
-	'BD-21' => __( 'Jamalpur', 'woocommerce' ),
-	'BD-22' => __( 'Jashore', 'woocommerce' ),
-	'BD-25' => __( 'Jhalokati', 'woocommerce' ),
-	'BD-23' => __( 'Jhenaidah', 'woocommerce' ),
-	'BD-24' => __( 'Joypurhat', 'woocommerce' ),
-	'BD-29' => __( 'Khagrachhari', 'woocommerce' ),
-	'BD-27' => __( 'Khulna', 'woocommerce' ),
-	'BD-26' => __( 'Kishoreganj', 'woocommerce' ),
-	'BD-28' => __( 'Kurigram', 'woocommerce' ),
-	'BD-30' => __( 'Kushtia', 'woocommerce' ),
-	'BD-31' => __( 'Lakshmipur', 'woocommerce' ),
-	'BD-32' => __( 'Lalmonirhat', 'woocommerce' ),
-	'BD-36' => __( 'Madaripur', 'woocommerce' ),
-	'BD-37' => __( 'Magura', 'woocommerce' ),
-	'BD-33' => __( 'Manikganj ', 'woocommerce' ),
-	'BD-39' => __( 'Meherpur', 'woocommerce' ),
-	'BD-38' => __( 'Moulvibazar', 'woocommerce' ),
-	'BD-35' => __( 'Munshiganj', 'woocommerce' ),
-	'BD-34' => __( 'Mymensingh', 'woocommerce' ),
-	'BD-48' => __( 'Naogaon', 'woocommerce' ),
-	'BD-43' => __( 'Narail', 'woocommerce' ),
-	'BD-40' => __( 'Narayanganj', 'woocommerce' ),
-	'BD-42' => __( 'Narsingdi', 'woocommerce' ),
-	'BD-44' => __( 'Natore', 'woocommerce' ),
-	'BD-45' => __( 'Nawabganj', 'woocommerce' ),
-	'BD-41' => __( 'Netrakona', 'woocommerce' ),
-	'BD-46' => __( 'Nilphamari', 'woocommerce' ),
-	'BD-47' => __( 'Noakhali', 'woocommerce' ),
-	'BD-49' => __( 'Pabna', 'woocommerce' ),
-	'BD-52' => __( 'Panchagarh', 'woocommerce' ),
-	'BD-51' => __( 'Patuakhali', 'woocommerce' ),
-	'BD-50' => __( 'Pirojpur', 'woocommerce' ),
-	'BD-53' => __( 'Rajbari', 'woocommerce' ),
-	'BD-54' => __( 'Rajshahi', 'woocommerce' ),
-	'BD-56' => __( 'Rangamati', 'woocommerce' ),
-	'BD-55' => __( 'Rangpur', 'woocommerce' ),
-	'BD-58' => __( 'Satkhira', 'woocommerce' ),
-	'BD-62' => __( 'Shariatpur', 'woocommerce' ),
-	'BD-57' => __( 'Sherpur', 'woocommerce' ),
-	'BD-59' => __( 'Sirajganj', 'woocommerce' ),
-	'BD-61' => __( 'Sunamganj', 'woocommerce' ),
-	'BD-60' => __( 'Sylhet', 'woocommerce' ),
-	'BD-63' => __( 'Tangail', 'woocommerce' ),
-	'BD-64' => __( 'Thakurgaon', 'woocommerce' ),
-);
--- a/i18n/states/BG.php
+++ b/i18n/states/BG.php
@ -1,42 +0,0 @@
-<?php
-/**
- * Bulgarian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['BG'] = array(
-	'BG-01' => __( 'Blagoevgrad', 'woocommerce' ),
-	'BG-02' => __( 'Burgas', 'woocommerce' ),
-	'BG-08' => __( 'Dobrich', 'woocommerce' ),
-	'BG-07' => __( 'Gabrovo', 'woocommerce' ),
-	'BG-26' => __( 'Haskovo', 'woocommerce' ),
-	'BG-09' => __( 'Kardzhali', 'woocommerce' ),
-	'BG-10' => __( 'Kyustendil', 'woocommerce' ),
-	'BG-11' => __( 'Lovech', 'woocommerce' ),
-	'BG-12' => __( 'Montana', 'woocommerce' ),
-	'BG-13' => __( 'Pazardzhik', 'woocommerce' ),
-	'BG-14' => __( 'Pernik', 'woocommerce' ),
-	'BG-15' => __( 'Pleven', 'woocommerce' ),
-	'BG-16' => __( 'Plovdiv', 'woocommerce' ),
-	'BG-17' => __( 'Razgrad', 'woocommerce' ),
-	'BG-18' => __( 'Ruse', 'woocommerce' ),
-	'BG-27' => __( 'Shumen', 'woocommerce' ),
-	'BG-19' => __( 'Silistra', 'woocommerce' ),
-	'BG-20' => __( 'Sliven', 'woocommerce' ),
-	'BG-21' => __( 'Smolyan', 'woocommerce' ),
-	'BG-23' => __( 'Sofia', 'woocommerce' ),
-	'BG-22' => __( 'Sofia-Grad', 'woocommerce' ),
-	'BG-24' => __( 'Stara Zagora', 'woocommerce' ),
-	'BG-25' => __( 'Targovishte', 'woocommerce' ),
-	'BG-03' => __( 'Varna', 'woocommerce' ),
-	'BG-04' => __( 'Veliko Tarnovo', 'woocommerce' ),
-	'BG-05' => __( 'Vidin', 'woocommerce' ),
-	'BG-06' => __( 'Vratsa', 'woocommerce' ),
-	'BG-28' => __( 'Yambol', 'woocommerce' ),
-);
--- a/i18n/states/BO.php
+++ b/i18n/states/BO.php
@ -1,23 +0,0 @@
-<?php
-/**
- * Bolivian states
- *
- * @package WooCommerce/i18n
- * @version 3.1.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['BO'] = array(
-	'B' => __( 'Chuquisaca', 'woocommerce' ),
-	'H' => __( 'Beni', 'woocommerce' ),
-	'C' => __( 'Cochabamba', 'woocommerce' ),
-	'L' => __( 'La Paz', 'woocommerce' ),
-	'O' => __( 'Oruro', 'woocommerce' ),
-	'N' => __( 'Pando', 'woocommerce' ),
-	'P' => __( 'Potosí', 'woocommerce' ),
-	'S' => __( 'Santa Cruz', 'woocommerce' ),
-	'T' => __( 'Tarija', 'woocommerce' ),
-);
--- a/i18n/states/BR.php
+++ b/i18n/states/BR.php
@ -1,41 +0,0 @@
-<?php
-/**
- * Brazillian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['BR'] = array(
-	'AC' => __( 'Acre', 'woocommerce' ),
-	'AL' => __( 'Alagoas', 'woocommerce' ),
-	'AP' => __( 'Amap&aacute;', 'woocommerce' ),
-	'AM' => __( 'Amazonas', 'woocommerce' ),
-	'BA' => __( 'Bahia', 'woocommerce' ),
-	'CE' => __( 'Cear&aacute;', 'woocommerce' ),
-	'DF' => __( 'Distrito Federal', 'woocommerce' ),
-	'ES' => __( 'Esp&iacute;rito Santo', 'woocommerce' ),
-	'GO' => __( 'Goi&aacute;s', 'woocommerce' ),
-	'MA' => __( 'Maranh&atilde;o', 'woocommerce' ),
-	'MT' => __( 'Mato Grosso', 'woocommerce' ),
-	'MS' => __( 'Mato Grosso do Sul', 'woocommerce' ),
-	'MG' => __( 'Minas Gerais', 'woocommerce' ),
-	'PA' => __( 'Par&aacute;', 'woocommerce' ),
-	'PB' => __( 'Para&iacute;ba', 'woocommerce' ),
-	'PR' => __( 'Paran&aacute;', 'woocommerce' ),
-	'PE' => __( 'Pernambuco', 'woocommerce' ),
-	'PI' => __( 'Piau&iacute;', 'woocommerce' ),
-	'RJ' => __( 'Rio de Janeiro', 'woocommerce' ),
-	'RN' => __( 'Rio Grande do Norte', 'woocommerce' ),
-	'RS' => __( 'Rio Grande do Sul', 'woocommerce' ),
-	'RO' => __( 'Rond&ocirc;nia', 'woocommerce' ),
-	'RR' => __( 'Roraima', 'woocommerce' ),
-	'SC' => __( 'Santa Catarina', 'woocommerce' ),
-	'SP' => __( 'S&atilde;o Paulo', 'woocommerce' ),
-	'SE' => __( 'Sergipe', 'woocommerce' ),
-	'TO' => __( 'Tocantins', 'woocommerce' ),
-);
--- a/i18n/states/CA.php
+++ b/i18n/states/CA.php
@ -1,27 +0,0 @@
-<?php
-/**
- * Canadian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['CA'] = array(
-	'AB' => __( 'Alberta', 'woocommerce' ),
-	'BC' => __( 'British Columbia', 'woocommerce' ),
-	'MB' => __( 'Manitoba', 'woocommerce' ),
-	'NB' => __( 'New Brunswick', 'woocommerce' ),
-	'NL' => __( 'Newfoundland and Labrador', 'woocommerce' ),
-	'NT' => __( 'Northwest Territories', 'woocommerce' ),
-	'NS' => __( 'Nova Scotia', 'woocommerce' ),
-	'NU' => __( 'Nunavut', 'woocommerce' ),
-	'ON' => __( 'Ontario', 'woocommerce' ),
-	'PE' => __( 'Prince Edward Island', 'woocommerce' ),
-	'QC' => __( 'Quebec', 'woocommerce' ),
-	'SK' => __( 'Saskatchewan', 'woocommerce' ),
-	'YT' => __( 'Yukon Territory', 'woocommerce' ),
-);
--- a/i18n/states/CH.php
+++ b/i18n/states/CH.php
@ -1,40 +0,0 @@
-<?php
-/**
- * Cantons of Switzerland
- *
- * @package  WooCommerce/i18n
- * @version  3.2.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['CH'] = array(
-	'AG' => __( 'Aargau', 'woocommerce' ),
-	'AR' => __( 'Appenzell Ausserrhoden', 'woocommerce' ),
-	'AI' => __( 'Appenzell Innerrhoden', 'woocommerce' ),
-	'BL' => __( 'Basel-Landschaft', 'woocommerce' ),
-	'BS' => __( 'Basel-Stadt', 'woocommerce' ),
-	'BE' => __( 'Bern', 'woocommerce' ),
-	'FR' => __( 'Fribourg', 'woocommerce' ),
-	'GE' => __( 'Geneva', 'woocommerce' ),
-	'GL' => __( 'Glarus', 'woocommerce' ),
-	'GR' => __( 'Graub&uuml;nden', 'woocommerce' ),
-	'JU' => __( 'Jura', 'woocommerce' ),
-	'LU' => __( 'Luzern', 'woocommerce' ),
-	'NE' => __( 'Neuch&acirc;tel', 'woocommerce' ),
-	'NW' => __( 'Nidwalden', 'woocommerce' ),
-	'OW' => __( 'Obwalden', 'woocommerce' ),
-	'SH' => __( 'Schaffhausen', 'woocommerce' ),
-	'SZ' => __( 'Schwyz', 'woocommerce' ),
-	'SO' => __( 'Solothurn', 'woocommerce' ),
-	'SG' => __( 'St. Gallen', 'woocommerce' ),
-	'TG' => __( 'Thurgau', 'woocommerce' ),
-	'TI' => __( 'Ticino', 'woocommerce' ),
-	'UR' => __( 'Uri', 'woocommerce' ),
-	'VS' => __( 'Valais', 'woocommerce' ),
-	'VD' => __( 'Vaud', 'woocommerce' ),
-	'ZG' => __( 'Zug', 'woocommerce' ),
-	'ZH' => __( 'Z&uuml;rich', 'woocommerce' ),
-);
--- a/i18n/states/CN.php
+++ b/i18n/states/CN.php
@ -1,46 +0,0 @@
-<?php
-/**
- * Chinese states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['CN'] = array(
-	'CN1'  => __( 'Yunnan / &#20113;&#21335;', 'woocommerce' ),
-	'CN2'  => __( 'Beijing / &#21271;&#20140;', 'woocommerce' ),
-	'CN3'  => __( 'Tianjin / &#22825;&#27941;', 'woocommerce' ),
-	'CN4'  => __( 'Hebei / &#27827;&#21271;', 'woocommerce' ),
-	'CN5'  => __( 'Shanxi / &#23665;&#35199;', 'woocommerce' ),
-	'CN6'  => __( 'Inner Mongolia / &#20839;&#33945;&#21476;', 'woocommerce' ),
-	'CN7'  => __( 'Liaoning / &#36797;&#23425;', 'woocommerce' ),
-	'CN8'  => __( 'Jilin / &#21513;&#26519;', 'woocommerce' ),
-	'CN9'  => __( 'Heilongjiang / &#40657;&#40857;&#27743;', 'woocommerce' ),
-	'CN10' => __( 'Shanghai / &#19978;&#28023;', 'woocommerce' ),
-	'CN11' => __( 'Jiangsu / &#27743;&#33487;', 'woocommerce' ),
-	'CN12' => __( 'Zhejiang / &#27993;&#27743;', 'woocommerce' ),
-	'CN13' => __( 'Anhui / &#23433;&#24509;', 'woocommerce' ),
-	'CN14' => __( 'Fujian / &#31119;&#24314;', 'woocommerce' ),
-	'CN15' => __( 'Jiangxi / &#27743;&#35199;', 'woocommerce' ),
-	'CN16' => __( 'Shandong / &#23665;&#19996;', 'woocommerce' ),
-	'CN17' => __( 'Henan / &#27827;&#21335;', 'woocommerce' ),
-	'CN18' => __( 'Hubei / &#28246;&#21271;', 'woocommerce' ),
-	'CN19' => __( 'Hunan / &#28246;&#21335;', 'woocommerce' ),
-	'CN20' => __( 'Guangdong / &#24191;&#19996;', 'woocommerce' ),
-	'CN21' => __( 'Guangxi Zhuang / &#24191;&#35199;&#22766;&#26063;', 'woocommerce' ),
-	'CN22' => __( 'Hainan / &#28023;&#21335;', 'woocommerce' ),
-	'CN23' => __( 'Chongqing / &#37325;&#24198;', 'woocommerce' ),
-	'CN24' => __( 'Sichuan / &#22235;&#24029;', 'woocommerce' ),
-	'CN25' => __( 'Guizhou / &#36149;&#24030;', 'woocommerce' ),
-	'CN26' => __( 'Shaanxi / &#38485;&#35199;', 'woocommerce' ),
-	'CN27' => __( 'Gansu / &#29976;&#32899;', 'woocommerce' ),
-	'CN28' => __( 'Qinghai / &#38738;&#28023;', 'woocommerce' ),
-	'CN29' => __( 'Ningxia Hui / &#23425;&#22799;', 'woocommerce' ),
-	'CN30' => __( 'Macau / &#28595;&#38376;', 'woocommerce' ),
-	'CN31' => __( 'Tibet / &#35199;&#34255;', 'woocommerce' ),
-	'CN32' => __( 'Xinjiang / &#26032;&#30086;', 'woocommerce' ),
-);
--- a/i18n/states/ES.php
+++ b/i18n/states/ES.php
@ -1,66 +0,0 @@
-<?php
-/**
- * Spain states
- *
- * @package WooCommerce/i18n
- * @version 2.0.11
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['ES'] = array(
-	'C'  => __( 'A Coru&ntilde;a', 'woocommerce' ),
-	'VI' => __( 'Araba/&Aacute;lava', 'woocommerce' ),
-	'AB' => __( 'Albacete', 'woocommerce' ),
-	'A'  => __( 'Alicante', 'woocommerce' ),
-	'AL' => __( 'Almer&iacute;a', 'woocommerce' ),
-	'O'  => __( 'Asturias', 'woocommerce' ),
-	'AV' => __( '&Aacute;vila', 'woocommerce' ),
-	'BA' => __( 'Badajoz', 'woocommerce' ),
-	'PM' => __( 'Baleares', 'woocommerce' ),
-	'B'  => __( 'Barcelona', 'woocommerce' ),
-	'BU' => __( 'Burgos', 'woocommerce' ),
-	'CC' => __( 'C&aacute;ceres', 'woocommerce' ),
-	'CA' => __( 'C&aacute;diz', 'woocommerce' ),
-	'S'  => __( 'Cantabria', 'woocommerce' ),
-	'CS' => __( 'Castell&oacute;n', 'woocommerce' ),
-	'CE' => __( 'Ceuta', 'woocommerce' ),
-	'CR' => __( 'Ciudad Real', 'woocommerce' ),
-	'CO' => __( 'C&oacute;rdoba', 'woocommerce' ),
-	'CU' => __( 'Cuenca', 'woocommerce' ),
-	'GI' => __( 'Girona', 'woocommerce' ),
-	'GR' => __( 'Granada', 'woocommerce' ),
-	'GU' => __( 'Guadalajara', 'woocommerce' ),
-	'SS' => __( 'Gipuzkoa', 'woocommerce' ),
-	'H'  => __( 'Huelva', 'woocommerce' ),
-	'HU' => __( 'Huesca', 'woocommerce' ),
-	'J'  => __( 'Ja&eacute;n', 'woocommerce' ),
-	'LO' => __( 'La Rioja', 'woocommerce' ),
-	'GC' => __( 'Las Palmas', 'woocommerce' ),
-	'LE' => __( 'Le&oacute;n', 'woocommerce' ),
-	'L'  => __( 'Lleida', 'woocommerce' ),
-	'LU' => __( 'Lugo', 'woocommerce' ),
-	'M'  => __( 'Madrid', 'woocommerce' ),
-	'MA' => __( 'M&aacute;laga', 'woocommerce' ),
-	'ML' => __( 'Melilla', 'woocommerce' ),
-	'MU' => __( 'Murcia', 'woocommerce' ),
-	'NA' => __( 'Navarra', 'woocommerce' ),
-	'OR' => __( 'Ourense', 'woocommerce' ),
-	'P'  => __( 'Palencia', 'woocommerce' ),
-	'PO' => __( 'Pontevedra', 'woocommerce' ),
-	'SA' => __( 'Salamanca', 'woocommerce' ),
-	'TF' => __( 'Santa Cruz de Tenerife', 'woocommerce' ),
-	'SG' => __( 'Segovia', 'woocommerce' ),
-	'SE' => __( 'Sevilla', 'woocommerce' ),
-	'SO' => __( 'Soria', 'woocommerce' ),
-	'T'  => __( 'Tarragona', 'woocommerce' ),
-	'TE' => __( 'Teruel', 'woocommerce' ),
-	'TO' => __( 'Toledo', 'woocommerce' ),
-	'V'  => __( 'Valencia', 'woocommerce' ),
-	'VA' => __( 'Valladolid', 'woocommerce' ),
-	'BI' => __( 'Bizkaia', 'woocommerce' ),
-	'ZA' => __( 'Zamora', 'woocommerce' ),
-	'Z'  => __( 'Zaragoza', 'woocommerce' ),
-);
--- a/i18n/states/GR.php
+++ b/i18n/states/GR.php
@ -1,27 +0,0 @@
-<?php
-/**
- * Greek Regions
- *
- * @package WooCommerce/i18n
- * @version 2.3.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['GR'] = array(
-	'I' => __( 'Attiki', 'woocommerce' ),
-	'A' => __( 'Anatoliki Makedonia kai Thraki', 'woocommerce' ),
-	'B' => __( 'Kentriki Makedonia', 'woocommerce' ),
-	'C' => __( 'Dytiki Makedonia', 'woocommerce' ),
-	'D' => __( 'Ipeiros', 'woocommerce' ),
-	'E' => __( 'Thessalia', 'woocommerce' ),
-	'F' => __( 'Ionia Nisia', 'woocommerce' ),
-	'G' => __( 'Dytiki Ellada', 'woocommerce' ),
-	'H' => __( 'Sterea Ellada', 'woocommerce' ),
-	'J' => __( 'Peloponnisos', 'woocommerce' ),
-	'K' => __( 'Voreio Aigaio', 'woocommerce' ),
-	'L' => __( 'Notio Aigaio', 'woocommerce' ),
-	'M' => __( 'Kriti', 'woocommerce' ),
-);
--- a/i18n/states/HK.php
+++ b/i18n/states/HK.php
@ -1,17 +0,0 @@
-<?php
-/**
- * Hong Kong states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['HK'] = array(
-	'HONG KONG'       => __( 'Hong Kong Island', 'woocommerce' ),
-	'KOWLOON'         => __( 'Kowloon', 'woocommerce' ),
-	'NEW TERRITORIES' => __( 'New Territories', 'woocommerce' ),
-);
--- a/i18n/states/HU.php
+++ b/i18n/states/HU.php
@ -1,34 +0,0 @@
-<?php
-/**
- * Hungary states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['HU'] = array(
-	'BK' => __( 'Bács-Kiskun', 'woocommerce' ),
-	'BE' => __( 'Békés', 'woocommerce' ),
-	'BA' => __( 'Baranya', 'woocommerce' ),
-	'BZ' => __( 'Borsod-Abaúj-Zemplén', 'woocommerce' ),
-	'BU' => __( 'Budapest', 'woocommerce' ),
-	'CS' => __( 'Csongrád', 'woocommerce' ),
-	'FE' => __( 'Fejér', 'woocommerce' ),
-	'GS' => __( 'Győr-Moson-Sopron', 'woocommerce' ),
-	'HB' => __( 'Hajdú-Bihar', 'woocommerce' ),
-	'HE' => __( 'Heves', 'woocommerce' ),
-	'JN' => __( 'Jász-Nagykun-Szolnok', 'woocommerce' ),
-	'KE' => __( 'Komárom-Esztergom', 'woocommerce' ),
-	'NO' => __( 'Nógrád', 'woocommerce' ),
-	'PE' => __( 'Pest', 'woocommerce' ),
-	'SO' => __( 'Somogy', 'woocommerce' ),
-	'SZ' => __( 'Szabolcs-Szatmár-Bereg', 'woocommerce' ),
-	'TO' => __( 'Tolna', 'woocommerce' ),
-	'VA' => __( 'Vas', 'woocommerce' ),
-	'VE' => __( 'Veszprém', 'woocommerce' ),
-	'ZA' => __( 'Zala', 'woocommerce' ),
-);
--- a/i18n/states/ID.php
+++ b/i18n/states/ID.php
@ -1,48 +0,0 @@
-<?php
-/**
- * Indonesia Provinces
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['ID'] = array(
-	'AC' => __( 'Daerah Istimewa Aceh', 'woocommerce' ),
-	'SU' => __( 'Sumatera Utara', 'woocommerce' ),
-	'SB' => __( 'Sumatera Barat', 'woocommerce' ),
-	'RI' => __( 'Riau', 'woocommerce' ),
-	'KR' => __( 'Kepulauan Riau', 'woocommerce' ),
-	'JA' => __( 'Jambi', 'woocommerce' ),
-	'SS' => __( 'Sumatera Selatan', 'woocommerce' ),
-	'BB' => __( 'Bangka Belitung', 'woocommerce' ),
-	'BE' => __( 'Bengkulu', 'woocommerce' ),
-	'LA' => __( 'Lampung', 'woocommerce' ),
-	'JK' => __( 'DKI Jakarta', 'woocommerce' ),
-	'JB' => __( 'Jawa Barat', 'woocommerce' ),
-	'BT' => __( 'Banten', 'woocommerce' ),
-	'JT' => __( 'Jawa Tengah', 'woocommerce' ),
-	'JI' => __( 'Jawa Timur', 'woocommerce' ),
-	'YO' => __( 'Daerah Istimewa Yogyakarta', 'woocommerce' ),
-	'BA' => __( 'Bali', 'woocommerce' ),
-	'NB' => __( 'Nusa Tenggara Barat', 'woocommerce' ),
-	'NT' => __( 'Nusa Tenggara Timur', 'woocommerce' ),
-	'KB' => __( 'Kalimantan Barat', 'woocommerce' ),
-	'KT' => __( 'Kalimantan Tengah', 'woocommerce' ),
-	'KI' => __( 'Kalimantan Timur', 'woocommerce' ),
-	'KS' => __( 'Kalimantan Selatan', 'woocommerce' ),
-	'KU' => __( 'Kalimantan Utara', 'woocommerce' ),
-	'SA' => __( 'Sulawesi Utara', 'woocommerce' ),
-	'ST' => __( 'Sulawesi Tengah', 'woocommerce' ),
-	'SG' => __( 'Sulawesi Tenggara', 'woocommerce' ),
-	'SR' => __( 'Sulawesi Barat', 'woocommerce' ),
-	'SN' => __( 'Sulawesi Selatan', 'woocommerce' ),
-	'GO' => __( 'Gorontalo', 'woocommerce' ),
-	'MA' => __( 'Maluku', 'woocommerce' ),
-	'MU' => __( 'Maluku Utara', 'woocommerce' ),
-	'PA' => __( 'Papua', 'woocommerce' ),
-	'PB' => __( 'Papua Barat', 'woocommerce' ),
-);
--- a/i18n/states/IE.php
+++ b/i18n/states/IE.php
@ -1,40 +0,0 @@
-<?php
-/**
- * Republic of Ireland
- *
- * @package WooCommerce/i18n
- * @version 3.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['IE'] = array(
-	'CW' => __( 'Carlow', 'woocommerce' ),
-	'CN' => __( 'Cavan', 'woocommerce' ),
-	'CE' => __( 'Clare', 'woocommerce' ),
-	'CO' => __( 'Cork', 'woocommerce' ),
-	'DL' => __( 'Donegal', 'woocommerce' ),
-	'D'  => __( 'Dublin', 'woocommerce' ),
-	'G'  => __( 'Galway', 'woocommerce' ),
-	'KY' => __( 'Kerry', 'woocommerce' ),
-	'KE' => __( 'Kildare', 'woocommerce' ),
-	'KK' => __( 'Kilkenny', 'woocommerce' ),
-	'LS' => __( 'Laois', 'woocommerce' ),
-	'LM' => __( 'Leitrim', 'woocommerce' ),
-	'LK' => __( 'Limerick', 'woocommerce' ),
-	'LD' => __( 'Longford', 'woocommerce' ),
-	'LH' => __( 'Louth', 'woocommerce' ),
-	'MO' => __( 'Mayo', 'woocommerce' ),
-	'MH' => __( 'Meath', 'woocommerce' ),
-	'MN' => __( 'Monaghan', 'woocommerce' ),
-	'OY' => __( 'Offaly', 'woocommerce' ),
-	'RN' => __( 'Roscommon', 'woocommerce' ),
-	'SO' => __( 'Sligo', 'woocommerce' ),
-	'TA' => __( 'Tipperary', 'woocommerce' ),
-	'WD' => __( 'Waterford', 'woocommerce' ),
-	'WH' => __( 'Westmeath', 'woocommerce' ),
-	'WX' => __( 'Wexford', 'woocommerce' ),
-	'WW' => __( 'Wicklow', 'woocommerce' ),
-);
--- a/i18n/states/IN.php
+++ b/i18n/states/IN.php
@ -1,50 +0,0 @@
-<?php
-/**
- * Indian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['IN'] = array(
-	'AP' => __( 'Andhra Pradesh', 'woocommerce' ),
-	'AR' => __( 'Arunachal Pradesh', 'woocommerce' ),
-	'AS' => __( 'Assam', 'woocommerce' ),
-	'BR' => __( 'Bihar', 'woocommerce' ),
-	'CT' => __( 'Chhattisgarh', 'woocommerce' ),
-	'GA' => __( 'Goa', 'woocommerce' ),
-	'GJ' => __( 'Gujarat', 'woocommerce' ),
-	'HR' => __( 'Haryana', 'woocommerce' ),
-	'HP' => __( 'Himachal Pradesh', 'woocommerce' ),
-	'JK' => __( 'Jammu and Kashmir', 'woocommerce' ),
-	'JH' => __( 'Jharkhand', 'woocommerce' ),
-	'KA' => __( 'Karnataka', 'woocommerce' ),
-	'KL' => __( 'Kerala', 'woocommerce' ),
-	'MP' => __( 'Madhya Pradesh', 'woocommerce' ),
-	'MH' => __( 'Maharashtra', 'woocommerce' ),
-	'MN' => __( 'Manipur', 'woocommerce' ),
-	'ML' => __( 'Meghalaya', 'woocommerce' ),
-	'MZ' => __( 'Mizoram', 'woocommerce' ),
-	'NL' => __( 'Nagaland', 'woocommerce' ),
-	'OR' => __( 'Orissa', 'woocommerce' ),
-	'PB' => __( 'Punjab', 'woocommerce' ),
-	'RJ' => __( 'Rajasthan', 'woocommerce' ),
-	'SK' => __( 'Sikkim', 'woocommerce' ),
-	'TN' => __( 'Tamil Nadu', 'woocommerce' ),
-	'TS' => __( 'Telangana', 'woocommerce' ),
-	'TR' => __( 'Tripura', 'woocommerce' ),
-	'UK' => __( 'Uttarakhand', 'woocommerce' ),
-	'UP' => __( 'Uttar Pradesh', 'woocommerce' ),
-	'WB' => __( 'West Bengal', 'woocommerce' ),
-	'AN' => __( 'Andaman and Nicobar Islands', 'woocommerce' ),
-	'CH' => __( 'Chandigarh', 'woocommerce' ),
-	'DN' => __( 'Dadra and Nagar Haveli', 'woocommerce' ),
-	'DD' => __( 'Daman and Diu', 'woocommerce' ),
-	'DL' => __( 'Delhi', 'woocommerce' ),
-	'LD' => __( 'Lakshadeep', 'woocommerce' ),
-	'PY' => __( 'Pondicherry (Puducherry)', 'woocommerce' ),
-);
--- a/i18n/states/IR.php
+++ b/i18n/states/IR.php
@ -1,45 +0,0 @@
-<?php
-/**
- * Iran States
- *
- * @package WooCommerce/i18n
- * @version 2.2.3
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['IR'] = array(
-	'KHZ' => __( 'Khuzestan  (خوزستان)', 'woocommerce' ),
-	'THR' => __( 'Tehran  (تهران)', 'woocommerce' ),
-	'ILM' => __( 'Ilaam (ایلام)', 'woocommerce' ),
-	'BHR' => __( 'Bushehr (بوشهر)', 'woocommerce' ),
-	'ADL' => __( 'Ardabil (اردبیل)', 'woocommerce' ),
-	'ESF' => __( 'Isfahan (اصفهان)', 'woocommerce' ),
-	'YZD' => __( 'Yazd (یزد)', 'woocommerce' ),
-	'KRH' => __( 'Kermanshah (کرمانشاه)', 'woocommerce' ),
-	'KRN' => __( 'Kerman (کرمان)', 'woocommerce' ),
-	'HDN' => __( 'Hamadan (همدان)', 'woocommerce' ),
-	'GZN' => __( 'Ghazvin (قزوین)', 'woocommerce' ),
-	'ZJN' => __( 'Zanjan (زنجان)', 'woocommerce' ),
-	'LRS' => __( 'Luristan (لرستان)', 'woocommerce' ),
-	'ABZ' => __( 'Alborz (البرز)', 'woocommerce' ),
-	'EAZ' => __( 'East Azarbaijan (آذربایجان شرقی)', 'woocommerce' ),
-	'WAZ' => __( 'West Azarbaijan (آذربایجان غربی)', 'woocommerce' ),
-	'CHB' => __( 'Chaharmahal and Bakhtiari (چهارمحال و بختیاری)', 'woocommerce' ),
-	'SKH' => __( 'South Khorasan (خراسان جنوبی)', 'woocommerce' ),
-	'RKH' => __( 'Razavi Khorasan (خراسان رضوی)', 'woocommerce' ),
-	'NKH' => __( 'North Khorasan (خراسان شمالی)', 'woocommerce' ),
-	'SMN' => __( 'Semnan (سمنان)', 'woocommerce' ),
-	'FRS' => __( 'Fars (فارس)', 'woocommerce' ),
-	'QHM' => __( 'Qom (قم)', 'woocommerce' ),
-	'KRD' => __( 'Kurdistan / کردستان)', 'woocommerce' ),
-	'KBD' => __( 'Kohgiluyeh and BoyerAhmad (کهگیلوییه و بویراحمد)', 'woocommerce' ),
-	'GLS' => __( 'Golestan (گلستان)', 'woocommerce' ),
-	'GIL' => __( 'Gilan (گیلان)', 'woocommerce' ),
-	'MZN' => __( 'Mazandaran (مازندران)', 'woocommerce' ),
-	'MKZ' => __( 'Markazi (مرکزی)', 'woocommerce' ),
-	'HRZ' => __( 'Hormozgan (هرمزگان)', 'woocommerce' ),
-	'SBN' => __( 'Sistan and Baluchestan (سیستان و بلوچستان)', 'woocommerce' ),
-);
--- a/i18n/states/IT.php
+++ b/i18n/states/IT.php
@ -1,121 +0,0 @@
-<?php
-/**
- * Italy Provinces
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['IT'] = array(
-	'AG' => __( 'Agrigento', 'woocommerce' ),
-	'AL' => __( 'Alessandria', 'woocommerce' ),
-	'AN' => __( 'Ancona', 'woocommerce' ),
-	'AO' => __( 'Aosta', 'woocommerce' ),
-	'AR' => __( 'Arezzo', 'woocommerce' ),
-	'AP' => __( 'Ascoli Piceno', 'woocommerce' ),
-	'AT' => __( 'Asti', 'woocommerce' ),
-	'AV' => __( 'Avellino', 'woocommerce' ),
-	'BA' => __( 'Bari', 'woocommerce' ),
-	'BT' => __( 'Barletta-Andria-Trani', 'woocommerce' ),
-	'BL' => __( 'Belluno', 'woocommerce' ),
-	'BN' => __( 'Benevento', 'woocommerce' ),
-	'BG' => __( 'Bergamo', 'woocommerce' ),
-	'BI' => __( 'Biella', 'woocommerce' ),
-	'BO' => __( 'Bologna', 'woocommerce' ),
-	'BZ' => __( 'Bolzano', 'woocommerce' ),
-	'BS' => __( 'Brescia', 'woocommerce' ),
-	'BR' => __( 'Brindisi', 'woocommerce' ),
-	'CA' => __( 'Cagliari', 'woocommerce' ),
-	'CL' => __( 'Caltanissetta', 'woocommerce' ),
-	'CB' => __( 'Campobasso', 'woocommerce' ),
-	'CE' => __( 'Caserta', 'woocommerce' ),
-	'CT' => __( 'Catania', 'woocommerce' ),
-	'CZ' => __( 'Catanzaro', 'woocommerce' ),
-	'CH' => __( 'Chieti', 'woocommerce' ),
-	'CO' => __( 'Como', 'woocommerce' ),
-	'CS' => __( 'Cosenza', 'woocommerce' ),
-	'CR' => __( 'Cremona', 'woocommerce' ),
-	'KR' => __( 'Crotone', 'woocommerce' ),
-	'CN' => __( 'Cuneo', 'woocommerce' ),
-	'EN' => __( 'Enna', 'woocommerce' ),
-	'FM' => __( 'Fermo', 'woocommerce' ),
-	'FE' => __( 'Ferrara', 'woocommerce' ),
-	'FI' => __( 'Firenze', 'woocommerce' ),
-	'FG' => __( 'Foggia', 'woocommerce' ),
-	'FC' => __( 'Forlì-Cesena', 'woocommerce' ),
-	'FR' => __( 'Frosinone', 'woocommerce' ),
-	'GE' => __( 'Genova', 'woocommerce' ),
-	'GO' => __( 'Gorizia', 'woocommerce' ),
-	'GR' => __( 'Grosseto', 'woocommerce' ),
-	'IM' => __( 'Imperia', 'woocommerce' ),
-	'IS' => __( 'Isernia', 'woocommerce' ),
-	'SP' => __( 'La Spezia', 'woocommerce' ),
-	'AQ' => __( "L'Aquila", 'woocommerce' ),
-	'LT' => __( 'Latina', 'woocommerce' ),
-	'LE' => __( 'Lecce', 'woocommerce' ),
-	'LC' => __( 'Lecco', 'woocommerce' ),
-	'LI' => __( 'Livorno', 'woocommerce' ),
-	'LO' => __( 'Lodi', 'woocommerce' ),
-	'LU' => __( 'Lucca', 'woocommerce' ),
-	'MC' => __( 'Macerata', 'woocommerce' ),
-	'MN' => __( 'Mantova', 'woocommerce' ),
-	'MS' => __( 'Massa-Carrara', 'woocommerce' ),
-	'MT' => __( 'Matera', 'woocommerce' ),
-	'ME' => __( 'Messina', 'woocommerce' ),
-	'MI' => __( 'Milano', 'woocommerce' ),
-	'MO' => __( 'Modena', 'woocommerce' ),
-	'MB' => __( 'Monza e della Brianza', 'woocommerce' ),
-	'NA' => __( 'Napoli', 'woocommerce' ),
-	'NO' => __( 'Novara', 'woocommerce' ),
-	'NU' => __( 'Nuoro', 'woocommerce' ),
-	'OR' => __( 'Oristano', 'woocommerce' ),
-	'PD' => __( 'Padova', 'woocommerce' ),
-	'PA' => __( 'Palermo', 'woocommerce' ),
-	'PR' => __( 'Parma', 'woocommerce' ),
-	'PV' => __( 'Pavia', 'woocommerce' ),
-	'PG' => __( 'Perugia', 'woocommerce' ),
-	'PU' => __( 'Pesaro e Urbino', 'woocommerce' ),
-	'PE' => __( 'Pescara', 'woocommerce' ),
-	'PC' => __( 'Piacenza', 'woocommerce' ),
-	'PI' => __( 'Pisa', 'woocommerce' ),
-	'PT' => __( 'Pistoia', 'woocommerce' ),
-	'PN' => __( 'Pordenone', 'woocommerce' ),
-	'PZ' => __( 'Potenza', 'woocommerce' ),
-	'PO' => __( 'Prato', 'woocommerce' ),
-	'RG' => __( 'Ragusa', 'woocommerce' ),
-	'RA' => __( 'Ravenna', 'woocommerce' ),
-	'RC' => __( 'Reggio Calabria', 'woocommerce' ),
-	'RE' => __( 'Reggio Emilia', 'woocommerce' ),
-	'RI' => __( 'Rieti', 'woocommerce' ),
-	'RN' => __( 'Rimini', 'woocommerce' ),
-	'RM' => __( 'Roma', 'woocommerce' ),
-	'RO' => __( 'Rovigo', 'woocommerce' ),
-	'SA' => __( 'Salerno', 'woocommerce' ),
-	'SS' => __( 'Sassari', 'woocommerce' ),
-	'SV' => __( 'Savona', 'woocommerce' ),
-	'SI' => __( 'Siena', 'woocommerce' ),
-	'SR' => __( 'Siracusa', 'woocommerce' ),
-	'SO' => __( 'Sondrio', 'woocommerce' ),
-	'SU' => __( 'Sud Sardegna', 'woocommerce' ),
-	'TA' => __( 'Taranto', 'woocommerce' ),
-	'TE' => __( 'Teramo', 'woocommerce' ),
-	'TR' => __( 'Terni', 'woocommerce' ),
-	'TO' => __( 'Torino', 'woocommerce' ),
-	'TP' => __( 'Trapani', 'woocommerce' ),
-	'TN' => __( 'Trento', 'woocommerce' ),
-	'TV' => __( 'Treviso', 'woocommerce' ),
-	'TS' => __( 'Trieste', 'woocommerce' ),
-	'UD' => __( 'Udine', 'woocommerce' ),
-	'VA' => __( 'Varese', 'woocommerce' ),
-	'VE' => __( 'Venezia', 'woocommerce' ),
-	'VB' => __( 'Verbano-Cusio-Ossola', 'woocommerce' ),
-	'VC' => __( 'Vercelli', 'woocommerce' ),
-	'VR' => __( 'Verona', 'woocommerce' ),
-	'VV' => __( 'Vibo Valentia', 'woocommerce' ),
-	'VI' => __( 'Vicenza', 'woocommerce' ),
-	'VT' => __( 'Viterbo', 'woocommerce' ),
-);
--- a/i18n/states/JP.php
+++ b/i18n/states/JP.php
@ -1,64 +0,0 @@
-<?php
-/**
- * Japan States
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- *
- * English notation of prefectures conform to the notation of Japan Post.
- * The suffix corresponds with the Japanese translation file.
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['JP'] = array(
-	'JP01' => __( 'Hokkaido', 'woocommerce' ),
-	'JP02' => __( 'Aomori', 'woocommerce' ),
-	'JP03' => __( 'Iwate', 'woocommerce' ),
-	'JP04' => __( 'Miyagi', 'woocommerce' ),
-	'JP05' => __( 'Akita', 'woocommerce' ),
-	'JP06' => __( 'Yamagata', 'woocommerce' ),
-	'JP07' => __( 'Fukushima', 'woocommerce' ),
-	'JP08' => __( 'Ibaraki', 'woocommerce' ),
-	'JP09' => __( 'Tochigi', 'woocommerce' ),
-	'JP10' => __( 'Gunma', 'woocommerce' ),
-	'JP11' => __( 'Saitama', 'woocommerce' ),
-	'JP12' => __( 'Chiba', 'woocommerce' ),
-	'JP13' => __( 'Tokyo', 'woocommerce' ),
-	'JP14' => __( 'Kanagawa', 'woocommerce' ),
-	'JP15' => __( 'Niigata', 'woocommerce' ),
-	'JP16' => __( 'Toyama', 'woocommerce' ),
-	'JP17' => __( 'Ishikawa', 'woocommerce' ),
-	'JP18' => __( 'Fukui', 'woocommerce' ),
-	'JP19' => __( 'Yamanashi', 'woocommerce' ),
-	'JP20' => __( 'Nagano', 'woocommerce' ),
-	'JP21' => __( 'Gifu', 'woocommerce' ),
-	'JP22' => __( 'Shizuoka', 'woocommerce' ),
-	'JP23' => __( 'Aichi', 'woocommerce' ),
-	'JP24' => __( 'Mie', 'woocommerce' ),
-	'JP25' => __( 'Shiga', 'woocommerce' ),
-	'JP26' => __( 'Kyoto', 'woocommerce' ),
-	'JP27' => __( 'Osaka', 'woocommerce' ),
-	'JP28' => __( 'Hyogo', 'woocommerce' ),
-	'JP29' => __( 'Nara', 'woocommerce' ),
-	'JP30' => __( 'Wakayama', 'woocommerce' ),
-	'JP31' => __( 'Tottori', 'woocommerce' ),
-	'JP32' => __( 'Shimane', 'woocommerce' ),
-	'JP33' => __( 'Okayama', 'woocommerce' ),
-	'JP34' => __( 'Hiroshima', 'woocommerce' ),
-	'JP35' => __( 'Yamaguchi', 'woocommerce' ),
-	'JP36' => __( 'Tokushima', 'woocommerce' ),
-	'JP37' => __( 'Kagawa', 'woocommerce' ),
-	'JP38' => __( 'Ehime', 'woocommerce' ),
-	'JP39' => __( 'Kochi', 'woocommerce' ),
-	'JP40' => __( 'Fukuoka', 'woocommerce' ),
-	'JP41' => __( 'Saga', 'woocommerce' ),
-	'JP42' => __( 'Nagasaki', 'woocommerce' ),
-	'JP43' => __( 'Kumamoto', 'woocommerce' ),
-	'JP44' => __( 'Oita', 'woocommerce' ),
-	'JP45' => __( 'Miyazaki', 'woocommerce' ),
-	'JP46' => __( 'Kagoshima', 'woocommerce' ),
-	'JP47' => __( 'Okinawa', 'woocommerce' ),
-);
--- a/i18n/states/LR.php
+++ b/i18n/states/LR.php
@ -1,29 +0,0 @@
-<?php
-/**
- * Liberia provinces
- *
- * @package WooCommerce/i18n
- * @version 3.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['LR'] = array(
-	'BM' => __( 'Bomi', 'woocommerce' ),
-	'BN' => __( 'Bong', 'woocommerce' ),
-	'GA' => __( 'Gbarpolu', 'woocommerce' ),
-	'GB' => __( 'Grand Bassa', 'woocommerce' ),
-	'GC' => __( 'Grand Cape Mount', 'woocommerce' ),
-	'GG' => __( 'Grand Gedeh', 'woocommerce' ),
-	'GK' => __( 'Grand Kru', 'woocommerce' ),
-	'LO' => __( 'Lofa', 'woocommerce' ),
-	'MA' => __( 'Margibi', 'woocommerce' ),
-	'MY' => __( 'Maryland', 'woocommerce' ),
-	'MO' => __( 'Montserrado', 'woocommerce' ),
-	'NM' => __( 'Nimba', 'woocommerce' ),
-	'RV' => __( 'Rivercess', 'woocommerce' ),
-	'RG' => __( 'River Gee', 'woocommerce' ),
-	'SN' => __( 'Sinoe', 'woocommerce' ),
-);
--- a/i18n/states/MD.php
+++ b/i18n/states/MD.php
@ -1,55 +0,0 @@
-<?php
-/**
- * Moldova states
- *
- * For more details check:
- * https://ro.wikipedia.org/wiki/Organizarea_administrativ-teritorial%C4%83_a_Republicii_Moldova
- * https://ro.wikipedia.org/wiki/Raioanele_Republicii_Moldova
- * https://en.wikipedia.org/wiki/ISO_3166-2:MD
- * https://en.wikipedia.org/wiki/Romanian_alphabet#Unicode_and_HTML
- *
- * @package WooCommerce/i18n
- * @version 3.3.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['MD'] = array(
-	'C'  => __( 'Chi&#537;in&#259;u', 'woocommerce' ),
-	'BL' => __( 'B&#259;l&#539;i', 'woocommerce' ),
-	'AN' => __( 'Anenii Noi', 'woocommerce' ),
-	'BS' => __( 'Basarabeasca', 'woocommerce' ),
-	'BR' => __( 'Briceni', 'woocommerce' ),
-	'CH' => __( 'Cahul', 'woocommerce' ),
-	'CT' => __( 'Cantemir', 'woocommerce' ),
-	'CL' => __( 'C&#259;l&#259;ra&#537;i', 'woocommerce' ),
-	'CS' => __( 'C&#259;u&#537;eni', 'woocommerce' ),
-	'CM' => __( 'Cimi&#537;lia', 'woocommerce' ),
-	'CR' => __( 'Criuleni', 'woocommerce' ),
-	'DN' => __( 'Dondu&#537;eni', 'woocommerce' ),
-	'DR' => __( 'Drochia', 'woocommerce' ),
-	'DB' => __( 'Dub&#259;sari', 'woocommerce' ),
-	'ED' => __( 'Edine&#539;', 'woocommerce' ),
-	'FL' => __( 'F&#259;le&#537;ti', 'woocommerce' ),
-	'FR' => __( 'Flore&#537;ti', 'woocommerce' ),
-	'GE' => __( 'UTA G&#259;g&#259;uzia', 'woocommerce' ),
-	'GL' => __( 'Glodeni', 'woocommerce' ),
-	'HN' => __( 'H&icirc;nce&#537;ti', 'woocommerce' ),
-	'IL' => __( 'Ialoveni', 'woocommerce' ),
-	'LV' => __( 'Leova', 'woocommerce' ),
-	'NS' => __( 'Nisporeni', 'woocommerce' ),
-	'OC' => __( 'Ocni&#539;a', 'woocommerce' ),
-	'OR' => __( 'Orhei', 'woocommerce' ),
-	'RZ' => __( 'Rezina', 'woocommerce' ),
-	'RS' => __( 'R&icirc;&#537;cani', 'woocommerce' ),
-	'SG' => __( 'S&icirc;ngerei', 'woocommerce' ),
-	'SR' => __( 'Soroca', 'woocommerce' ),
-	'ST' => __( 'Str&#259;&#537;eni', 'woocommerce' ),
-	'SD' => __( '&#536;old&#259;ne&#537;ti', 'woocommerce' ),
-	'SV' => __( '&#536;tefan Vod&#259;', 'woocommerce' ),
-	'TR' => __( 'Taraclia', 'woocommerce' ),
-	'TL' => __( 'Telene&#537;ti', 'woocommerce' ),
-	'UN' => __( 'Ungheni', 'woocommerce' ),
-);
--- a/i18n/states/MX.php
+++ b/i18n/states/MX.php
@ -1,46 +0,0 @@
-<?php
-/**
- * Mexico States
- *
- * @package WooCommerce/i18n
- * @version 2.2.9
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['MX'] = array(
-	'DF' => __( 'Ciudad de M&eacute;xico', 'woocommerce' ),
-	'JA' => __( 'Jalisco', 'woocommerce' ),
-	'NL' => __( 'Nuevo Le&oacute;n', 'woocommerce' ),
-	'AG' => __( 'Aguascalientes', 'woocommerce' ),
-	'BC' => __( 'Baja California', 'woocommerce' ),
-	'BS' => __( 'Baja California Sur', 'woocommerce' ),
-	'CM' => __( 'Campeche', 'woocommerce' ),
-	'CS' => __( 'Chiapas', 'woocommerce' ),
-	'CH' => __( 'Chihuahua', 'woocommerce' ),
-	'CO' => __( 'Coahuila', 'woocommerce' ),
-	'CL' => __( 'Colima', 'woocommerce' ),
-	'DG' => __( 'Durango', 'woocommerce' ),
-	'GT' => __( 'Guanajuato', 'woocommerce' ),
-	'GR' => __( 'Guerrero', 'woocommerce' ),
-	'HG' => __( 'Hidalgo', 'woocommerce' ),
-	'MX' => __( 'Estado de M&eacute;xico', 'woocommerce' ),
-	'MI' => __( 'Michoac&aacute;n', 'woocommerce' ),
-	'MO' => __( 'Morelos', 'woocommerce' ),
-	'NA' => __( 'Nayarit', 'woocommerce' ),
-	'OA' => __( 'Oaxaca', 'woocommerce' ),
-	'PU' => __( 'Puebla', 'woocommerce' ),
-	'QT' => __( 'Quer&eacute;taro', 'woocommerce' ),
-	'QR' => __( 'Quintana Roo', 'woocommerce' ),
-	'SL' => __( 'San Luis Potos&iacute;', 'woocommerce' ),
-	'SI' => __( 'Sinaloa', 'woocommerce' ),
-	'SO' => __( 'Sonora', 'woocommerce' ),
-	'TB' => __( 'Tabasco', 'woocommerce' ),
-	'TM' => __( 'Tamaulipas', 'woocommerce' ),
-	'TL' => __( 'Tlaxcala', 'woocommerce' ),
-	'VE' => __( 'Veracruz', 'woocommerce' ),
-	'YU' => __( 'Yucat&aacute;n', 'woocommerce' ),
-	'ZA' => __( 'Zacatecas', 'woocommerce' ),
-);
--- a/i18n/states/MY.php
+++ b/i18n/states/MY.php
@ -1,30 +0,0 @@
-<?php
-/**
- * Malaysian states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['MY'] = array(
-	'JHR' => __( 'Johor', 'woocommerce' ),
-	'KDH' => __( 'Kedah', 'woocommerce' ),
-	'KTN' => __( 'Kelantan', 'woocommerce' ),
-	'LBN' => __( 'Labuan', 'woocommerce' ),
-	'MLK' => __( 'Malacca (Melaka)', 'woocommerce' ),
-	'NSN' => __( 'Negeri Sembilan', 'woocommerce' ),
-	'PHG' => __( 'Pahang', 'woocommerce' ),
-	'PNG' => __( 'Penang (Pulau Pinang)', 'woocommerce' ),
-	'PRK' => __( 'Perak', 'woocommerce' ),
-	'PLS' => __( 'Perlis', 'woocommerce' ),
-	'SBH' => __( 'Sabah', 'woocommerce' ),
-	'SWK' => __( 'Sarawak', 'woocommerce' ),
-	'SGR' => __( 'Selangor', 'woocommerce' ),
-	'TRG' => __( 'Terengganu', 'woocommerce' ),
-	'PJY' => __( 'Putrajaya', 'woocommerce' ),
-	'KUL' => __( 'Kuala Lumpur', 'woocommerce' ),
-);
--- a/i18n/states/NG.php
+++ b/i18n/states/NG.php
@ -1,51 +0,0 @@
-<?php
-/**
- * Nigerian provinces
- *
- * @package WooCommerce/i18n
- * @version 3.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['NG'] = array(
-	'AB' => __( 'Abia', 'woocommerce' ),
-	'FC' => __( 'Abuja', 'woocommerce' ),
-	'AD' => __( 'Adamawa', 'woocommerce' ),
-	'AK' => __( 'Akwa Ibom', 'woocommerce' ),
-	'AN' => __( 'Anambra', 'woocommerce' ),
-	'BA' => __( 'Bauchi', 'woocommerce' ),
-	'BY' => __( 'Bayelsa', 'woocommerce' ),
-	'BE' => __( 'Benue', 'woocommerce' ),
-	'BO' => __( 'Borno', 'woocommerce' ),
-	'CR' => __( 'Cross River', 'woocommerce' ),
-	'DE' => __( 'Delta', 'woocommerce' ),
-	'EB' => __( 'Ebonyi', 'woocommerce' ),
-	'ED' => __( 'Edo', 'woocommerce' ),
-	'EK' => __( 'Ekiti', 'woocommerce' ),
-	'EN' => __( 'Enugu', 'woocommerce' ),
-	'GO' => __( 'Gombe', 'woocommerce' ),
-	'IM' => __( 'Imo', 'woocommerce' ),
-	'JI' => __( 'Jigawa', 'woocommerce' ),
-	'KD' => __( 'Kaduna', 'woocommerce' ),
-	'KN' => __( 'Kano', 'woocommerce' ),
-	'KT' => __( 'Katsina', 'woocommerce' ),
-	'KE' => __( 'Kebbi', 'woocommerce' ),
-	'KO' => __( 'Kogi', 'woocommerce' ),
-	'KW' => __( 'Kwara', 'woocommerce' ),
-	'LA' => __( 'Lagos', 'woocommerce' ),
-	'NA' => __( 'Nasarawa', 'woocommerce' ),
-	'NI' => __( 'Niger', 'woocommerce' ),
-	'OG' => __( 'Ogun', 'woocommerce' ),
-	'ON' => __( 'Ondo', 'woocommerce' ),
-	'OS' => __( 'Osun', 'woocommerce' ),
-	'OY' => __( 'Oyo', 'woocommerce' ),
-	'PL' => __( 'Plateau', 'woocommerce' ),
-	'RI' => __( 'Rivers', 'woocommerce' ),
-	'SO' => __( 'Sokoto', 'woocommerce' ),
-	'TA' => __( 'Taraba', 'woocommerce' ),
-	'YO' => __( 'Yobe', 'woocommerce' ),
-	'ZA' => __( 'Zamfara', 'woocommerce' ),
-);
--- a/i18n/states/NP.php
+++ b/i18n/states/NP.php
@ -1,28 +0,0 @@
-<?php
-/**
- * Nepal states (Zones)
- *
- * @package WooCommerce/i18n
- * @version 2.2.5
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['NP'] = array(
-	'BAG' => __( 'Bagmati', 'woocommerce' ),
-	'BHE' => __( 'Bheri', 'woocommerce' ),
-	'DHA' => __( 'Dhaulagiri', 'woocommerce' ),
-	'GAN' => __( 'Gandaki', 'woocommerce' ),
-	'JAN' => __( 'Janakpur', 'woocommerce' ),
-	'KAR' => __( 'Karnali', 'woocommerce' ),
-	'KOS' => __( 'Koshi', 'woocommerce' ),
-	'LUM' => __( 'Lumbini', 'woocommerce' ),
-	'MAH' => __( 'Mahakali', 'woocommerce' ),
-	'MEC' => __( 'Mechi', 'woocommerce' ),
-	'NAR' => __( 'Narayani', 'woocommerce' ),
-	'RAP' => __( 'Rapti', 'woocommerce' ),
-	'SAG' => __( 'Sagarmatha', 'woocommerce' ),
-	'SET' => __( 'Seti', 'woocommerce' ),
-);
--- a/i18n/states/NZ.php
+++ b/i18n/states/NZ.php
@ -1,30 +0,0 @@
-<?php
-/**
- * New Zealand States
- *
- * @package WooCommerce/i18n
- * @version 2.3.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['NZ'] = array(
-	'NL' => __( 'Northland', 'woocommerce' ),
-	'AK' => __( 'Auckland', 'woocommerce' ),
-	'WA' => __( 'Waikato', 'woocommerce' ),
-	'BP' => __( 'Bay of Plenty', 'woocommerce' ),
-	'TK' => __( 'Taranaki', 'woocommerce' ),
-	'GI' => __( 'Gisborne', 'woocommerce' ),
-	'HB' => __( 'Hawke&rsquo;s Bay', 'woocommerce' ),
-	'MW' => __( 'Manawatu-Wanganui', 'woocommerce' ),
-	'WE' => __( 'Wellington', 'woocommerce' ),
-	'NS' => __( 'Nelson', 'woocommerce' ),
-	'MB' => __( 'Marlborough', 'woocommerce' ),
-	'TM' => __( 'Tasman', 'woocommerce' ),
-	'WC' => __( 'West Coast', 'woocommerce' ),
-	'CT' => __( 'Canterbury', 'woocommerce' ),
-	'OT' => __( 'Otago', 'woocommerce' ),
-	'SL' => __( 'Southland', 'woocommerce' ),
-);
--- a/i18n/states/PE.php
+++ b/i18n/states/PE.php
@ -1,40 +0,0 @@
-<?php
-/**
- * Peru states
- *
- * @package WooCommerce/i18n
- * @version 2.1.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['PE'] = array(
-	'CAL' => __( 'El Callao', 'woocommerce' ),
-	'LMA' => __( 'Municipalidad Metropolitana de Lima', 'woocommerce' ),
-	'AMA' => __( 'Amazonas', 'woocommerce' ),
-	'ANC' => __( 'Ancash', 'woocommerce' ),
-	'APU' => __( 'Apur&iacute;mac', 'woocommerce' ),
-	'ARE' => __( 'Arequipa', 'woocommerce' ),
-	'AYA' => __( 'Ayacucho', 'woocommerce' ),
-	'CAJ' => __( 'Cajamarca', 'woocommerce' ),
-	'CUS' => __( 'Cusco', 'woocommerce' ),
-	'HUV' => __( 'Huancavelica', 'woocommerce' ),
-	'HUC' => __( 'Hu&aacute;nuco', 'woocommerce' ),
-	'ICA' => __( 'Ica', 'woocommerce' ),
-	'JUN' => __( 'Jun&iacute;n', 'woocommerce' ),
-	'LAL' => __( 'La Libertad', 'woocommerce' ),
-	'LAM' => __( 'Lambayeque', 'woocommerce' ),
-	'LIM' => __( 'Lima', 'woocommerce' ),
-	'LOR' => __( 'Loreto', 'woocommerce' ),
-	'MDD' => __( 'Madre de Dios', 'woocommerce' ),
-	'MOQ' => __( 'Moquegua', 'woocommerce' ),
-	'PAS' => __( 'Pasco', 'woocommerce' ),
-	'PIU' => __( 'Piura', 'woocommerce' ),
-	'PUN' => __( 'Puno', 'woocommerce' ),
-	'SAM' => __( 'San Mart&iacute;n', 'woocommerce' ),
-	'TAC' => __( 'Tacna', 'woocommerce' ),
-	'TUM' => __( 'Tumbes', 'woocommerce' ),
-	'UCA' => __( 'Ucayali', 'woocommerce' ),
-);
--- a/i18n/states/PH.php
+++ b/i18n/states/PH.php
@ -1,96 +0,0 @@
-<?php
-/**
- * Philippines Provinces
- *
- * @package WooCommerce/i18n
- * @version 2.4.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['PH'] = array(
-	'ABR' => __( 'Abra', 'woocommerce' ),
-	'AGN' => __( 'Agusan del Norte', 'woocommerce' ),
-	'AGS' => __( 'Agusan del Sur', 'woocommerce' ),
-	'AKL' => __( 'Aklan', 'woocommerce' ),
-	'ALB' => __( 'Albay', 'woocommerce' ),
-	'ANT' => __( 'Antique', 'woocommerce' ),
-	'APA' => __( 'Apayao', 'woocommerce' ),
-	'AUR' => __( 'Aurora', 'woocommerce' ),
-	'BAS' => __( 'Basilan', 'woocommerce' ),
-	'BAN' => __( 'Bataan', 'woocommerce' ),
-	'BTN' => __( 'Batanes', 'woocommerce' ),
-	'BTG' => __( 'Batangas', 'woocommerce' ),
-	'BEN' => __( 'Benguet', 'woocommerce' ),
-	'BIL' => __( 'Biliran', 'woocommerce' ),
-	'BOH' => __( 'Bohol', 'woocommerce' ),
-	'BUK' => __( 'Bukidnon', 'woocommerce' ),
-	'BUL' => __( 'Bulacan', 'woocommerce' ),
-	'CAG' => __( 'Cagayan', 'woocommerce' ),
-	'CAN' => __( 'Camarines Norte', 'woocommerce' ),
-	'CAS' => __( 'Camarines Sur', 'woocommerce' ),
-	'CAM' => __( 'Camiguin', 'woocommerce' ),
-	'CAP' => __( 'Capiz', 'woocommerce' ),
-	'CAT' => __( 'Catanduanes', 'woocommerce' ),
-	'CAV' => __( 'Cavite', 'woocommerce' ),
-	'CEB' => __( 'Cebu', 'woocommerce' ),
-	'COM' => __( 'Compostela Valley', 'woocommerce' ),
-	'NCO' => __( 'Cotabato', 'woocommerce' ),
-	'DAV' => __( 'Davao del Norte', 'woocommerce' ),
-	'DAS' => __( 'Davao del Sur', 'woocommerce' ),
-	'DAC' => __( 'Davao Occidental', 'woocommerce' ), // TODO: Needs to be updated when ISO code is assigned.
-	'DAO' => __( 'Davao Oriental', 'woocommerce' ),
-	'DIN' => __( 'Dinagat Islands', 'woocommerce' ),
-	'EAS' => __( 'Eastern Samar', 'woocommerce' ),
-	'GUI' => __( 'Guimaras', 'woocommerce' ),
-	'IFU' => __( 'Ifugao', 'woocommerce' ),
-	'ILN' => __( 'Ilocos Norte', 'woocommerce' ),
-	'ILS' => __( 'Ilocos Sur', 'woocommerce' ),
-	'ILI' => __( 'Iloilo', 'woocommerce' ),
-	'ISA' => __( 'Isabela', 'woocommerce' ),
-	'KAL' => __( 'Kalinga', 'woocommerce' ),
-	'LUN' => __( 'La Union', 'woocommerce' ),
-	'LAG' => __( 'Laguna', 'woocommerce' ),
-	'LAN' => __( 'Lanao del Norte', 'woocommerce' ),
-	'LAS' => __( 'Lanao del Sur', 'woocommerce' ),
-	'LEY' => __( 'Leyte', 'woocommerce' ),
-	'MAG' => __( 'Maguindanao', 'woocommerce' ),
-	'MAD' => __( 'Marinduque', 'woocommerce' ),
-	'MAS' => __( 'Masbate', 'woocommerce' ),
-	'MSC' => __( 'Misamis Occidental', 'woocommerce' ),
-	'MSR' => __( 'Misamis Oriental', 'woocommerce' ),
-	'MOU' => __( 'Mountain Province', 'woocommerce' ),
-	'NEC' => __( 'Negros Occidental', 'woocommerce' ),
-	'NER' => __( 'Negros Oriental', 'woocommerce' ),
-	'NSA' => __( 'Northern Samar', 'woocommerce' ),
-	'NUE' => __( 'Nueva Ecija', 'woocommerce' ),
-	'NUV' => __( 'Nueva Vizcaya', 'woocommerce' ),
-	'MDC' => __( 'Occidental Mindoro', 'woocommerce' ),
-	'MDR' => __( 'Oriental Mindoro', 'woocommerce' ),
-	'PLW' => __( 'Palawan', 'woocommerce' ),
-	'PAM' => __( 'Pampanga', 'woocommerce' ),
-	'PAN' => __( 'Pangasinan', 'woocommerce' ),
-	'QUE' => __( 'Quezon', 'woocommerce' ),
-	'QUI' => __( 'Quirino', 'woocommerce' ),
-	'RIZ' => __( 'Rizal', 'woocommerce' ),
-	'ROM' => __( 'Romblon', 'woocommerce' ),
-	'WSA' => __( 'Samar', 'woocommerce' ),
-	'SAR' => __( 'Sarangani', 'woocommerce' ),
-	'SIQ' => __( 'Siquijor', 'woocommerce' ),
-	'SOR' => __( 'Sorsogon', 'woocommerce' ),
-	'SCO' => __( 'South Cotabato', 'woocommerce' ),
-	'SLE' => __( 'Southern Leyte', 'woocommerce' ),
-	'SUK' => __( 'Sultan Kudarat', 'woocommerce' ),
-	'SLU' => __( 'Sulu', 'woocommerce' ),
-	'SUN' => __( 'Surigao del Norte', 'woocommerce' ),
-	'SUR' => __( 'Surigao del Sur', 'woocommerce' ),
-	'TAR' => __( 'Tarlac', 'woocommerce' ),
-	'TAW' => __( 'Tawi-Tawi', 'woocommerce' ),
-	'ZMB' => __( 'Zambales', 'woocommerce' ),
-	'ZAN' => __( 'Zamboanga del Norte', 'woocommerce' ),
-	'ZAS' => __( 'Zamboanga del Sur', 'woocommerce' ),
-	'ZSI' => __( 'Zamboanga Sibugay', 'woocommerce' ),
-	'00'  => __( 'Metro Manila', 'woocommerce' ),
-);
--- a/i18n/states/PK.php
+++ b/i18n/states/PK.php
@ -1,22 +0,0 @@
-<?php
-/**
- * Pakistan's states
- *
- * @package WooCommerce/i18n
- * @version 3.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['PK'] = array(
-	'JK' => __( 'Azad Kashmir', 'woocommerce' ),
-	'BA' => __( 'Balochistan', 'woocommerce' ),
-	'TA' => __( 'FATA', 'woocommerce' ),
-	'GB' => __( 'Gilgit Baltistan', 'woocommerce' ),
-	'IS' => __( 'Islamabad Capital Territory', 'woocommerce' ),
-	'KP' => __( 'Khyber Pakhtunkhwa', 'woocommerce' ),
-	'PB' => __( 'Punjab', 'woocommerce' ),
-	'SD' => __( 'Sindh', 'woocommerce' ),
-);
--- a/i18n/states/PY.php
+++ b/i18n/states/PY.php
@ -1,32 +0,0 @@
-<?php
-/**
- * Paraguay states
- *
- * @package WooCommerce/i18n
- * @version 3.5.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['PYG'] = array(
-	'PY-ASU' => __( 'Asunci&oacute;n', 'woocommerce' ),
-	'PY-1' => __( 'Concepci&oacute;n', 'woocommerce' ),
-	'PY-2' => __( 'San Pedro', 'woocommerce' ),
-	'PY-3' => __( 'Cordillera', 'woocommerce' ),
-	'PY-4' => __( 'Guair&aacute;', 'woocommerce' ),
-	'PY-5' => __( 'Caaguaz&uacute;', 'woocommerce' ),
-	'PY-6' => __( 'Caazap&aacute;', 'woocommerce' ),
-	'PY-7' => __( 'Itap&uacute;a', 'woocommerce' ),
-	'PY-8' => __( 'Misiones', 'woocommerce' ),
-	'PY-9' => __( 'Paraguar&iacute;', 'woocommerce' ),
-	'PY-10' => __( 'Alto Paran&aacute;', 'woocommerce' ),
-	'PY-11' => __( 'Central', 'woocommerce' ),
-	'PY-12' => __( '&Ntilde;eembuc&uacute;', 'woocommerce' ),
-	'PY-13' => __( 'Amambay', 'woocommerce' ),
-	'PY-14' => __( 'Canindey&uacute;', 'woocommerce' ),
-	'PY-15' => __( 'Presidente Hayes', 'woocommerce' ),
-	'PY-16' => __( 'Alto Paraguay', 'woocommerce' ),
-	'PY-17' => __( 'Boquer&oacute;n', 'woocommerce' ),
-);
--- a/i18n/states/RO.php
+++ b/i18n/states/RO.php
@ -1,59 +0,0 @@
-<?php
-/**
- * Romania states
- *
- * For more details check:
- * https://ro.wikipedia.org/wiki/Jude%C8%9Bele_Rom%C3%A2niei
- *
- * @package WooCommerce/i18n
- * @version 3.1.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['RO'] = array(
-	'AB' => __( 'Alba', 'woocommerce' ),
-	'AR' => __( 'Arad', 'woocommerce' ),
-	'AG' => __( 'Arge&#537;', 'woocommerce' ),
-	'BC' => __( 'Bac&#259;u', 'woocommerce' ),
-	'BH' => __( 'Bihor', 'woocommerce' ),
-	'BN' => __( 'Bistri&#539;a-N&#259;s&#259;ud', 'woocommerce' ),
-	'BT' => __( 'Boto&#537;ani', 'woocommerce' ),
-	'BR' => __( 'Br&#259;ila', 'woocommerce' ),
-	'BV' => __( 'Bra&#537;ov', 'woocommerce' ),
-	'B'  => __( 'Bucure&#537;ti', 'woocommerce' ),
-	'BZ' => __( 'Buz&#259;u', 'woocommerce' ),
-	'CL' => __( 'C&#259;l&#259;ra&#537;i', 'woocommerce' ),
-	'CS' => __( 'Cara&#537;-Severin', 'woocommerce' ),
-	'CJ' => __( 'Cluj', 'woocommerce' ),
-	'CT' => __( 'Constan&#539;a', 'woocommerce' ),
-	'CV' => __( 'Covasna', 'woocommerce' ),
-	'DB' => __( 'D&acirc;mbovi&#539;a', 'woocommerce' ),
-	'DJ' => __( 'Dolj', 'woocommerce' ),
-	'GL' => __( 'Gala&#539;i', 'woocommerce' ),
-	'GR' => __( 'Giurgiu', 'woocommerce' ),
-	'GJ' => __( 'Gorj', 'woocommerce' ),
-	'HR' => __( 'Harghita', 'woocommerce' ),
-	'HD' => __( 'Hunedoara', 'woocommerce' ),
-	'IL' => __( 'Ialomi&#539;a', 'woocommerce' ),
-	'IS' => __( 'Ia&#537;i', 'woocommerce' ),
-	'IF' => __( 'Ilfov', 'woocommerce' ),
-	'MM' => __( 'Maramure&#537;', 'woocommerce' ),
-	'MH' => __( 'Mehedin&#539;i', 'woocommerce' ),
-	'MS' => __( 'Mure&#537;', 'woocommerce' ),
-	'NT' => __( 'Neam&#539;', 'woocommerce' ),
-	'OT' => __( 'Olt', 'woocommerce' ),
-	'PH' => __( 'Prahova', 'woocommerce' ),
-	'SJ' => __( 'S&#259;laj', 'woocommerce' ),
-	'SM' => __( 'Satu Mare', 'woocommerce' ),
-	'SB' => __( 'Sibiu', 'woocommerce' ),
-	'SV' => __( 'Suceava', 'woocommerce' ),
-	'TR' => __( 'Teleorman', 'woocommerce' ),
-	'TM' => __( 'Timi&#537;', 'woocommerce' ),
-	'TL' => __( 'Tulcea', 'woocommerce' ),
-	'VL' => __( 'V&acirc;lcea', 'woocommerce' ),
-	'VS' => __( 'Vaslui', 'woocommerce' ),
-	'VN' => __( 'Vrancea', 'woocommerce' ),
-);
--- a/i18n/states/TH.php
+++ b/i18n/states/TH.php
@ -1,91 +0,0 @@
-<?php
-/**
- * Thailand states
- *
- * @package WooCommerce/i18n
- * @version 3.4.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['TH'] = array(
-	'TH-37' => __( 'Amnat Charoen', 'woocommerce' ),
-	'TH-15' => __( 'Ang Thong', 'woocommerce' ),
-	'TH-14' => __( 'Ayutthaya', 'woocommerce' ),
-	'TH-10' => __( 'Bangkok', 'woocommerce' ),
-	'TH-38' => __( 'Bueng Kan', 'woocommerce' ),
-	'TH-31' => __( 'Buri Ram', 'woocommerce' ),
-	'TH-24' => __( 'Chachoengsao', 'woocommerce' ),
-	'TH-18' => __( 'Chai Nat', 'woocommerce' ),
-	'TH-36' => __( 'Chaiyaphum', 'woocommerce' ),
-	'TH-22' => __( 'Chanthaburi', 'woocommerce' ),
-	'TH-50' => __( 'Chiang Mai', 'woocommerce' ),
-	'TH-57' => __( 'Chiang Rai', 'woocommerce' ),
-	'TH-20' => __( 'Chonburi', 'woocommerce' ),
-	'TH-86' => __( 'Chumphon', 'woocommerce' ),
-	'TH-46' => __( 'Kalasin', 'woocommerce' ),
-	'TH-62' => __( 'Kamphaeng Phet', 'woocommerce' ),
-	'TH-71' => __( 'Kanchanaburi', 'woocommerce' ),
-	'TH-40' => __( 'Khon Kaen', 'woocommerce' ),
-	'TH-81' => __( 'Krabi', 'woocommerce' ),
-	'TH-52' => __( 'Lampang', 'woocommerce' ),
-	'TH-51' => __( 'Lamphun', 'woocommerce' ),
-	'TH-42' => __( 'Loei', 'woocommerce' ),
-	'TH-16' => __( 'Lopburi', 'woocommerce' ),
-	'TH-58' => __( 'Mae Hong Son', 'woocommerce' ),
-	'TH-44' => __( 'Maha Sarakham', 'woocommerce' ),
-	'TH-49' => __( 'Mukdahan', 'woocommerce' ),
-	'TH-26' => __( 'Nakhon Nayok', 'woocommerce' ),
-	'TH-73' => __( 'Nakhon Pathom', 'woocommerce' ),
-	'TH-48' => __( 'Nakhon Phanom', 'woocommerce' ),
-	'TH-30' => __( 'Nakhon Ratchasima', 'woocommerce' ),
-	'TH-60' => __( 'Nakhon Sawan', 'woocommerce' ),
-	'TH-80' => __( 'Nakhon Si Thammarat', 'woocommerce' ),
-	'TH-55' => __( 'Nan', 'woocommerce' ),
-	'TH-96' => __( 'Narathiwat', 'woocommerce' ),
-	'TH-39' => __( 'Nong Bua Lam Phu', 'woocommerce' ),
-	'TH-43' => __( 'Nong Khai', 'woocommerce' ),
-	'TH-12' => __( 'Nonthaburi', 'woocommerce' ),
-	'TH-13' => __( 'Pathum Thani', 'woocommerce' ),
-	'TH-94' => __( 'Pattani', 'woocommerce' ),
-	'TH-82' => __( 'Phang Nga', 'woocommerce' ),
-	'TH-93' => __( 'Phatthalung', 'woocommerce' ),
-	'TH-56' => __( 'Phayao', 'woocommerce' ),
-	'TH-67' => __( 'Phetchabun', 'woocommerce' ),
-	'TH-76' => __( 'Phetchaburi', 'woocommerce' ),
-	'TH-66' => __( 'Phichit', 'woocommerce' ),
-	'TH-65' => __( 'Phitsanulok', 'woocommerce' ),
-	'TH-54' => __( 'Phrae', 'woocommerce' ),
-	'TH-83' => __( 'Phuket', 'woocommerce' ),
-	'TH-25' => __( 'Prachin Buri', 'woocommerce' ),
-	'TH-77' => __( 'Prachuap Khiri Khan', 'woocommerce' ),
-	'TH-85' => __( 'Ranong', 'woocommerce' ),
-	'TH-70' => __( 'Ratchaburi', 'woocommerce' ),
-	'TH-21' => __( 'Rayong', 'woocommerce' ),
-	'TH-45' => __( 'Roi Et', 'woocommerce' ),
-	'TH-27' => __( 'Sa Kaeo', 'woocommerce' ),
-	'TH-47' => __( 'Sakon Nakhon', 'woocommerce' ),
-	'TH-11' => __( 'Samut Prakan', 'woocommerce' ),
-	'TH-74' => __( 'Samut Sakhon', 'woocommerce' ),
-	'TH-75' => __( 'Samut Songkhram', 'woocommerce' ),
-	'TH-19' => __( 'Saraburi', 'woocommerce' ),
-	'TH-91' => __( 'Satun', 'woocommerce' ),
-	'TH-17' => __( 'Sing Buri', 'woocommerce' ),
-	'TH-33' => __( 'Sisaket', 'woocommerce' ),
-	'TH-90' => __( 'Songkhla', 'woocommerce' ),
-	'TH-64' => __( 'Sukhothai', 'woocommerce' ),
-	'TH-72' => __( 'Suphan Buri', 'woocommerce' ),
-	'TH-84' => __( 'Surat Thani', 'woocommerce' ),
-	'TH-32' => __( 'Surin', 'woocommerce' ),
-	'TH-63' => __( 'Tak', 'woocommerce' ),
-	'TH-92' => __( 'Trang', 'woocommerce' ),
-	'TH-23' => __( 'Trat', 'woocommerce' ),
-	'TH-34' => __( 'Ubon Ratchathani', 'woocommerce' ),
-	'TH-41' => __( 'Udon Thani', 'woocommerce' ),
-	'TH-61' => __( 'Uthai Thani', 'woocommerce' ),
-	'TH-53' => __( 'Uttaradit', 'woocommerce' ),
-	'TH-95' => __( 'Yala', 'woocommerce' ),
-	'TH-35' => __( 'Yasothon', 'woocommerce' ),
-);
--- a/i18n/states/TR.php
+++ b/i18n/states/TR.php
@ -1,95 +0,0 @@
-<?php
-/**
- * Turkey States
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['TR'] = array(
-	'TR01' => __( 'Adana', 'woocommerce' ),
-	'TR02' => __( 'Ad&#305;yaman', 'woocommerce' ),
-	'TR03' => __( 'Afyon', 'woocommerce' ),
-	'TR04' => __( 'A&#287;r&#305;', 'woocommerce' ),
-	'TR05' => __( 'Amasya', 'woocommerce' ),
-	'TR06' => __( 'Ankara', 'woocommerce' ),
-	'TR07' => __( 'Antalya', 'woocommerce' ),
-	'TR08' => __( 'Artvin', 'woocommerce' ),
-	'TR09' => __( 'Ayd&#305;n', 'woocommerce' ),
-	'TR10' => __( 'Bal&#305;kesir', 'woocommerce' ),
-	'TR11' => __( 'Bilecik', 'woocommerce' ),
-	'TR12' => __( 'Bing&#246;l', 'woocommerce' ),
-	'TR13' => __( 'Bitlis', 'woocommerce' ),
-	'TR14' => __( 'Bolu', 'woocommerce' ),
-	'TR15' => __( 'Burdur', 'woocommerce' ),
-	'TR16' => __( 'Bursa', 'woocommerce' ),
-	'TR17' => __( '&#199;anakkale', 'woocommerce' ),
-	'TR18' => __( '&#199;ank&#305;r&#305;', 'woocommerce' ),
-	'TR19' => __( '&#199;orum', 'woocommerce' ),
-	'TR20' => __( 'Denizli', 'woocommerce' ),
-	'TR21' => __( 'Diyarbak&#305;r', 'woocommerce' ),
-	'TR22' => __( 'Edirne', 'woocommerce' ),
-	'TR23' => __( 'Elaz&#305;&#287;', 'woocommerce' ),
-	'TR24' => __( 'Erzincan', 'woocommerce' ),
-	'TR25' => __( 'Erzurum', 'woocommerce' ),
-	'TR26' => __( 'Eski&#351;ehir', 'woocommerce' ),
-	'TR27' => __( 'Gaziantep', 'woocommerce' ),
-	'TR28' => __( 'Giresun', 'woocommerce' ),
-	'TR29' => __( 'G&#252;m&#252;&#351;hane', 'woocommerce' ),
-	'TR30' => __( 'Hakkari', 'woocommerce' ),
-	'TR31' => __( 'Hatay', 'woocommerce' ),
-	'TR32' => __( 'Isparta', 'woocommerce' ),
-	'TR33' => __( '&#304;&#231;el', 'woocommerce' ),
-	'TR34' => __( '&#304;stanbul', 'woocommerce' ),
-	'TR35' => __( '&#304;zmir', 'woocommerce' ),
-	'TR36' => __( 'Kars', 'woocommerce' ),
-	'TR37' => __( 'Kastamonu', 'woocommerce' ),
-	'TR38' => __( 'Kayseri', 'woocommerce' ),
-	'TR39' => __( 'K&#305;rklareli', 'woocommerce' ),
-	'TR40' => __( 'K&#305;r&#351;ehir', 'woocommerce' ),
-	'TR41' => __( 'Kocaeli', 'woocommerce' ),
-	'TR42' => __( 'Konya', 'woocommerce' ),
-	'TR43' => __( 'K&#252;tahya', 'woocommerce' ),
-	'TR44' => __( 'Malatya', 'woocommerce' ),
-	'TR45' => __( 'Manisa', 'woocommerce' ),
-	'TR46' => __( 'Kahramanmara&#351;', 'woocommerce' ),
-	'TR47' => __( 'Mardin', 'woocommerce' ),
-	'TR48' => __( 'Mu&#287;la', 'woocommerce' ),
-	'TR49' => __( 'Mu&#351;', 'woocommerce' ),
-	'TR50' => __( 'Nev&#351;ehir', 'woocommerce' ),
-	'TR51' => __( 'Ni&#287;de', 'woocommerce' ),
-	'TR52' => __( 'Ordu', 'woocommerce' ),
-	'TR53' => __( 'Rize', 'woocommerce' ),
-	'TR54' => __( 'Sakarya', 'woocommerce' ),
-	'TR55' => __( 'Samsun', 'woocommerce' ),
-	'TR56' => __( 'Siirt', 'woocommerce' ),
-	'TR57' => __( 'Sinop', 'woocommerce' ),
-	'TR58' => __( 'Sivas', 'woocommerce' ),
-	'TR59' => __( 'Tekirda&#287;', 'woocommerce' ),
-	'TR60' => __( 'Tokat', 'woocommerce' ),
-	'TR61' => __( 'Trabzon', 'woocommerce' ),
-	'TR62' => __( 'Tunceli', 'woocommerce' ),
-	'TR63' => __( '&#350;anl&#305;urfa', 'woocommerce' ),
-	'TR64' => __( 'U&#351;ak', 'woocommerce' ),
-	'TR65' => __( 'Van', 'woocommerce' ),
-	'TR66' => __( 'Yozgat', 'woocommerce' ),
-	'TR67' => __( 'Zonguldak', 'woocommerce' ),
-	'TR68' => __( 'Aksaray', 'woocommerce' ),
-	'TR69' => __( 'Bayburt', 'woocommerce' ),
-	'TR70' => __( 'Karaman', 'woocommerce' ),
-	'TR71' => __( 'K&#305;r&#305;kkale', 'woocommerce' ),
-	'TR72' => __( 'Batman', 'woocommerce' ),
-	'TR73' => __( '&#350;&#305;rnak', 'woocommerce' ),
-	'TR74' => __( 'Bart&#305;n', 'woocommerce' ),
-	'TR75' => __( 'Ardahan', 'woocommerce' ),
-	'TR76' => __( 'I&#287;d&#305;r', 'woocommerce' ),
-	'TR77' => __( 'Yalova', 'woocommerce' ),
-	'TR78' => __( 'Karab&#252;k', 'woocommerce' ),
-	'TR79' => __( 'Kilis', 'woocommerce' ),
-	'TR80' => __( 'Osmaniye', 'woocommerce' ),
-	'TR81' => __( 'D&#252;zce', 'woocommerce' ),
-);
--- a/i18n/states/TZ.php
+++ b/i18n/states/TZ.php
@ -1,44 +0,0 @@
-<?php
-/**
- * Tanzania States
- *
- * Based on English names published at https://en.wikipedia.org/wiki/ISO_3166-2:TZ
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-$states['TZ'] = array(
-	'TZ01' => __( 'Arusha', 'woocommerce' ),
-	'TZ02' => __( 'Dar es Salaam', 'woocommerce' ),
-	'TZ03' => __( 'Dodoma', 'woocommerce' ),
-	'TZ04' => __( 'Iringa', 'woocommerce' ),
-	'TZ05' => __( 'Kagera', 'woocommerce' ),
-	'TZ06' => __( 'Pemba North', 'woocommerce' ),
-	'TZ07' => __( 'Zanzibar North', 'woocommerce' ),
-	'TZ08' => __( 'Kigoma', 'woocommerce' ),
-	'TZ09' => __( 'Kilimanjaro', 'woocommerce' ),
-	'TZ10' => __( 'Pemba South', 'woocommerce' ),
-	'TZ11' => __( 'Zanzibar South', 'woocommerce' ),
-	'TZ12' => __( 'Lindi', 'woocommerce' ),
-	'TZ13' => __( 'Mara', 'woocommerce' ),
-	'TZ14' => __( 'Mbeya', 'woocommerce' ),
-	'TZ15' => __( 'Zanzibar West', 'woocommerce' ),
-	'TZ16' => __( 'Morogoro', 'woocommerce' ),
-	'TZ17' => __( 'Mtwara', 'woocommerce' ),
-	'TZ18' => __( 'Mwanza', 'woocommerce' ),
-	'TZ19' => __( 'Coast', 'woocommerce' ),
-	'TZ20' => __( 'Rukwa', 'woocommerce' ),
-	'TZ21' => __( 'Ruvuma', 'woocommerce' ),
-	'TZ22' => __( 'Shinyanga', 'woocommerce' ),
-	'TZ23' => __( 'Singida', 'woocommerce' ),
-	'TZ24' => __( 'Tabora', 'woocommerce' ),
-	'TZ25' => __( 'Tanga', 'woocommerce' ),
-	'TZ26' => __( 'Manyara', 'woocommerce' ),
-	'TZ27' => __( 'Geita', 'woocommerce' ),
-	'TZ28' => __( 'Katavi', 'woocommerce' ),
-	'TZ29' => __( 'Njombe', 'woocommerce' ),
-	'TZ30' => __( 'Simiyu', 'woocommerce' ),
-);
--- a/i18n/states/UG.php
+++ b/i18n/states/UG.php
@ -1,144 +0,0 @@
-<?php
-/**
- * Uganda Districts
- *
- * Based on English names published at https://en.wikipedia.org/wiki/ISO_3166-2:UG
- *
- * @package WooCommerce\i18n
- * @version 3.7.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['UG'] = array(
-	'UG314' => __( 'Abim', 'woocommerce' ),
-	'UG301' => __( 'Adjumani', 'woocommerce' ),
-	'UG322' => __( 'Agago', 'woocommerce' ),
-	'UG323' => __( 'Alebtong', 'woocommerce' ),
-	'UG315' => __( 'Amolatar', 'woocommerce' ),
-	'UG324' => __( 'Amudat', 'woocommerce' ),
-	'UG216' => __( 'Amuria', 'woocommerce' ),
-	'UG316' => __( 'Amuru', 'woocommerce' ),
-	'UG302' => __( 'Apac', 'woocommerce' ),
-	'UG303' => __( 'Arua', 'woocommerce' ),
-	'UG217' => __( 'Budaka', 'woocommerce' ),
-	'UG218' => __( 'Bududa', 'woocommerce' ),
-	'UG201' => __( 'Bugiri', 'woocommerce' ),
-	'UG235' => __( 'Bugweri', 'woocommerce' ),
-	'UG420' => __( 'Buhweju', 'woocommerce' ),
-	'UG117' => __( 'Buikwe', 'woocommerce' ),
-	'UG219' => __( 'Bukedea', 'woocommerce' ),
-	'UG118' => __( 'Bukomansimbi', 'woocommerce' ),
-	'UG220' => __( 'Bukwa', 'woocommerce' ),
-	'UG225' => __( 'Bulambuli', 'woocommerce' ),
-	'UG416' => __( 'Buliisa', 'woocommerce' ),
-	'UG401' => __( 'Bundibugyo', 'woocommerce' ),
-	'UG430' => __( 'Bunyangabu', 'woocommerce' ),
-	'UG402' => __( 'Bushenyi', 'woocommerce' ),
-	'UG202' => __( 'Busia', 'woocommerce' ),
-	'UG221' => __( 'Butaleja', 'woocommerce' ),
-	'UG119' => __( 'Butambala', 'woocommerce' ),
-	'UG233' => __( 'Butebo', 'woocommerce' ),
-	'UG120' => __( 'Buvuma', 'woocommerce' ),
-	'UG226' => __( 'Buyende', 'woocommerce' ),
-	'UG317' => __( 'Dokolo', 'woocommerce' ),
-	'UG121' => __( 'Gomba', 'woocommerce' ),
-	'UG304' => __( 'Gulu', 'woocommerce' ),
-	'UG403' => __( 'Hoima', 'woocommerce' ),
-	'UG417' => __( 'Ibanda', 'woocommerce' ),
-	'UG203' => __( 'Iganga', 'woocommerce' ),
-	'UG418' => __( 'Isingiro', 'woocommerce' ),
-	'UG204' => __( 'Jinja', 'woocommerce' ),
-	'UG318' => __( 'Kaabong', 'woocommerce' ),
-	'UG404' => __( 'Kabale', 'woocommerce' ),
-	'UG405' => __( 'Kabarole', 'woocommerce' ),
-	'UG213' => __( 'Kaberamaido', 'woocommerce' ),
-	'UG427' => __( 'Kagadi', 'woocommerce' ),
-	'UG428' => __( 'Kakumiro', 'woocommerce' ),
-	'UG101' => __( 'Kalangala', 'woocommerce' ),
-	'UG222' => __( 'Kaliro', 'woocommerce' ),
-	'UG122' => __( 'Kalungu', 'woocommerce' ),
-	'UG102' => __( 'Kampala', 'woocommerce' ),
-	'UG205' => __( 'Kamuli', 'woocommerce' ),
-	'UG413' => __( 'Kamwenge', 'woocommerce' ),
-	'UG414' => __( 'Kanungu', 'woocommerce' ),
-	'UG206' => __( 'Kapchorwa', 'woocommerce' ),
-	'UG236' => __( 'Kapelebyong', 'woocommerce' ),
-	'UG126' => __( 'Kasanda', 'woocommerce' ),
-	'UG406' => __( 'Kasese', 'woocommerce' ),
-	'UG207' => __( 'Katakwi', 'woocommerce' ),
-	'UG112' => __( 'Kayunga', 'woocommerce' ),
-	'UG407' => __( 'Kibaale', 'woocommerce' ),
-	'UG103' => __( 'Kiboga', 'woocommerce' ),
-	'UG227' => __( 'Kibuku', 'woocommerce' ),
-	'UG432' => __( 'Kikuube', 'woocommerce' ),
-	'UG419' => __( 'Kiruhura', 'woocommerce' ),
-	'UG421' => __( 'Kiryandongo', 'woocommerce' ),
-	'UG408' => __( 'Kisoro', 'woocommerce' ),
-	'UG305' => __( 'Kitgum', 'woocommerce' ),
-	'UG319' => __( 'Koboko', 'woocommerce' ),
-	'UG325' => __( 'Kole', 'woocommerce' ),
-	'UG306' => __( 'Kotido', 'woocommerce' ),
-	'UG208' => __( 'Kumi', 'woocommerce' ),
-	'UG333' => __( 'Kwania', 'woocommerce' ),
-	'UG228' => __( 'Kween', 'woocommerce' ),
-	'UG123' => __( 'Kyankwanzi', 'woocommerce' ),
-	'UG422' => __( 'Kyegegwa', 'woocommerce' ),
-	'UG415' => __( 'Kyenjojo', 'woocommerce' ),
-	'UG125' => __( 'Kyotera', 'woocommerce' ),
-	'UG326' => __( 'Lamwo', 'woocommerce' ),
-	'UG307' => __( 'Lira', 'woocommerce' ),
-	'UG229' => __( 'Luuka', 'woocommerce' ),
-	'UG104' => __( 'Luwero', 'woocommerce' ),
-	'UG124' => __( 'Lwengo', 'woocommerce' ),
-	'UG114' => __( 'Lyantonde', 'woocommerce' ),
-	'UG223' => __( 'Manafwa', 'woocommerce' ),
-	'UG320' => __( 'Maracha', 'woocommerce' ),
-	'UG105' => __( 'Masaka', 'woocommerce' ),
-	'UG409' => __( 'Masindi', 'woocommerce' ),
-	'UG214' => __( 'Mayuge', 'woocommerce' ),
-	'UG209' => __( 'Mbale', 'woocommerce' ),
-	'UG410' => __( 'Mbarara', 'woocommerce' ),
-	'UG423' => __( 'Mitooma', 'woocommerce' ),
-	'UG115' => __( 'Mityana', 'woocommerce' ),
-	'UG308' => __( 'Moroto', 'woocommerce' ),
-	'UG309' => __( 'Moyo', 'woocommerce' ),
-	'UG106' => __( 'Mpigi', 'woocommerce' ),
-	'UG107' => __( 'Mubende', 'woocommerce' ),
-	'UG108' => __( 'Mukono', 'woocommerce' ),
-	'UG334' => __( 'Nabilatuk', 'woocommerce' ),
-	'UG311' => __( 'Nakapiripirit', 'woocommerce' ),
-	'UG116' => __( 'Nakaseke', 'woocommerce' ),
-	'UG109' => __( 'Nakasongola', 'woocommerce' ),
-	'UG230' => __( 'Namayingo', 'woocommerce' ),
-	'UG234' => __( 'Namisindwa', 'woocommerce' ),
-	'UG224' => __( 'Namutumba', 'woocommerce' ),
-	'UG327' => __( 'Napak', 'woocommerce' ),
-	'UG310' => __( 'Nebbi', 'woocommerce' ),
-	'UG231' => __( 'Ngora', 'woocommerce' ),
-	'UG424' => __( 'Ntoroko', 'woocommerce' ),
-	'UG411' => __( 'Ntungamo', 'woocommerce' ),
-	'UG328' => __( 'Nwoya', 'woocommerce' ),
-	'UG331' => __( 'Omoro', 'woocommerce' ),
-	'UG329' => __( 'Otuke', 'woocommerce' ),
-	'UG321' => __( 'Oyam', 'woocommerce' ),
-	'UG312' => __( 'Pader', 'woocommerce' ),
-	'UG332' => __( 'Pakwach', 'woocommerce' ),
-	'UG210' => __( 'Pallisa', 'woocommerce' ),
-	'UG110' => __( 'Rakai', 'woocommerce' ),
-	'UG429' => __( 'Rubanda', 'woocommerce' ),
-	'UG425' => __( 'Rubirizi', 'woocommerce' ),
-	'UG431' => __( 'Rukiga', 'woocommerce' ),
-	'UG412' => __( 'Rukungiri', 'woocommerce' ),
-	'UG111' => __( 'Sembabule', 'woocommerce' ),
-	'UG232' => __( 'Serere', 'woocommerce' ),
-	'UG426' => __( 'Sheema', 'woocommerce' ),
-	'UG215' => __( 'Sironko', 'woocommerce' ),
-	'UG211' => __( 'Soroti', 'woocommerce' ),
-	'UG212' => __( 'Tororo', 'woocommerce' ),
-	'UG113' => __( 'Wakiso', 'woocommerce' ),
-	'UG313' => __( 'Yumbe', 'woocommerce' ),
-	'UG330' => __( 'Zombo', 'woocommerce' ),
-);
--- a/i18n/states/UM.php
+++ b/i18n/states/UM.php
@ -1,22 +0,0 @@
-<?php
-/**
- * United States (US) Minor Outlying Islands. ISO 3166-2.
- *
- * @package WooCommerce/i18n
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['UM'] = array(
-	'UM-81' => __( 'Baker Island', 'woocommerce' ),
-	'UM-84' => __( 'Howland Island', 'woocommerce' ),
-	'UM-86' => __( 'Jarvis Island', 'woocommerce' ),
-	'UM-67' => __( 'Johnston Atoll', 'woocommerce' ),
-	'UM-89' => __( 'Kingman Reef', 'woocommerce' ),
-	'UM-71' => __( 'Midway Islands', 'woocommerce' ),
-	'UM-76' => __( 'Navassa Island', 'woocommerce' ),
-	'UM-95' => __( 'Palmyra Atoll', 'woocommerce' ),
-	'UM-79' => __( 'Wake Island', 'woocommerce' ),
-);
--- a/i18n/states/US.php
+++ b/i18n/states/US.php
@ -1,68 +0,0 @@
-<?php
-/**
- * United States
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['US'] = array(
-	'AL' => __( 'Alabama', 'woocommerce' ),
-	'AK' => __( 'Alaska', 'woocommerce' ),
-	'AZ' => __( 'Arizona', 'woocommerce' ),
-	'AR' => __( 'Arkansas', 'woocommerce' ),
-	'CA' => __( 'California', 'woocommerce' ),
-	'CO' => __( 'Colorado', 'woocommerce' ),
-	'CT' => __( 'Connecticut', 'woocommerce' ),
-	'DE' => __( 'Delaware', 'woocommerce' ),
-	'DC' => __( 'District Of Columbia', 'woocommerce' ),
-	'FL' => __( 'Florida', 'woocommerce' ),
-	'GA' => _x( 'Georgia', 'US state of Georgia', 'woocommerce' ),
-	'HI' => __( 'Hawaii', 'woocommerce' ),
-	'ID' => __( 'Idaho', 'woocommerce' ),
-	'IL' => __( 'Illinois', 'woocommerce' ),
-	'IN' => __( 'Indiana', 'woocommerce' ),
-	'IA' => __( 'Iowa', 'woocommerce' ),
-	'KS' => __( 'Kansas', 'woocommerce' ),
-	'KY' => __( 'Kentucky', 'woocommerce' ),
-	'LA' => __( 'Louisiana', 'woocommerce' ),
-	'ME' => __( 'Maine', 'woocommerce' ),
-	'MD' => __( 'Maryland', 'woocommerce' ),
-	'MA' => __( 'Massachusetts', 'woocommerce' ),
-	'MI' => __( 'Michigan', 'woocommerce' ),
-	'MN' => __( 'Minnesota', 'woocommerce' ),
-	'MS' => __( 'Mississippi', 'woocommerce' ),
-	'MO' => __( 'Missouri', 'woocommerce' ),
-	'MT' => __( 'Montana', 'woocommerce' ),
-	'NE' => __( 'Nebraska', 'woocommerce' ),
-	'NV' => __( 'Nevada', 'woocommerce' ),
-	'NH' => __( 'New Hampshire', 'woocommerce' ),
-	'NJ' => __( 'New Jersey', 'woocommerce' ),
-	'NM' => __( 'New Mexico', 'woocommerce' ),
-	'NY' => __( 'New York', 'woocommerce' ),
-	'NC' => __( 'North Carolina', 'woocommerce' ),
-	'ND' => __( 'North Dakota', 'woocommerce' ),
-	'OH' => __( 'Ohio', 'woocommerce' ),
-	'OK' => __( 'Oklahoma', 'woocommerce' ),
-	'OR' => __( 'Oregon', 'woocommerce' ),
-	'PA' => __( 'Pennsylvania', 'woocommerce' ),
-	'RI' => __( 'Rhode Island', 'woocommerce' ),
-	'SC' => __( 'South Carolina', 'woocommerce' ),
-	'SD' => __( 'South Dakota', 'woocommerce' ),
-	'TN' => __( 'Tennessee', 'woocommerce' ),
-	'TX' => __( 'Texas', 'woocommerce' ),
-	'UT' => __( 'Utah', 'woocommerce' ),
-	'VT' => __( 'Vermont', 'woocommerce' ),
-	'VA' => __( 'Virginia', 'woocommerce' ),
-	'WA' => __( 'Washington', 'woocommerce' ),
-	'WV' => __( 'West Virginia', 'woocommerce' ),
-	'WI' => __( 'Wisconsin', 'woocommerce' ),
-	'WY' => __( 'Wyoming', 'woocommerce' ),
-	'AA' => __( 'Armed Forces (AA)', 'woocommerce' ),
-	'AE' => __( 'Armed Forces (AE)', 'woocommerce' ),
-	'AP' => __( 'Armed Forces (AP)', 'woocommerce' ),
-);
--- a/i18n/states/ZA.php
+++ b/i18n/states/ZA.php
@ -1,23 +0,0 @@
-<?php
-/**
- * South African states
- *
- * @package WooCommerce/i18n
- * @version 2.0.0
- */
-
-global $states;
-
-defined( 'ABSPATH' ) || exit;
-
-$states['ZA'] = array(
-	'EC'  => __( 'Eastern Cape', 'woocommerce' ),
-	'FS'  => __( 'Free State', 'woocommerce' ),
-	'GP'  => __( 'Gauteng', 'woocommerce' ),
-	'KZN' => __( 'KwaZulu-Natal', 'woocommerce' ),
-	'LP'  => __( 'Limpopo', 'woocommerce' ),
-	'MP'  => __( 'Mpumalanga', 'woocommerce' ),
-	'NC'  => __( 'Northern Cape', 'woocommerce' ),
-	'NW'  => __( 'North West', 'woocommerce' ),
-	'WC'  => __( 'Western Cape', 'woocommerce' ),
-);
--- a/includes/abstracts/abstract-wc-order.php
+++ b/includes/abstracts/abstract-wc-order.php
@ -1070,10 +1070,11 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {

 	/**
 	 * Apply all coupons in this order again to all line items.
+	 * This method is public since WooCommerce 3.8.0.
 	 *
 	 * @since 3.2.0
 	 */
-	protected function recalculate_coupons() {
+	public function recalculate_coupons() {
 		// Reset line item totals.
 		foreach ( $this->get_items() as $item ) {
 			$item->set_total( $item->get_subtotal() );
@ -1534,7 +1535,7 @@ abstract class WC_Abstract_Order extends WC_Abstract_Legacy_Order {
 			if ( 0 > $fee_total ) {
 				$max_discount = round( $cart_total + $fees_total + $shipping_total, wc_get_price_decimals() ) * -1;

-				if ( $fee_total < $max_discount ) {
+				if ( $fee_total < $max_discount && 0 > $max_discount ) {
 					$item->set_total( $max_discount );
 				}
 			}
--- a/includes/abstracts/abstract-wc-payment-gateway.php
+++ b/includes/abstracts/abstract-wc-payment-gateway.php
@ -216,18 +216,14 @@ abstract class WC_Payment_Gateway extends WC_Settings_API {
 		if ( $order ) {
 			$return_url = $order->get_checkout_order_received_url();
 		} else {
-			$return_url = wc_get_endpoint_url( 'order-received', '', wc_get_page_permalink( 'checkout' ) );
-		}
-
-		if ( is_ssl() || get_option( 'woocommerce_force_ssl_checkout' ) == 'yes' ) {
-			$return_url = str_replace( 'http:', 'https:', $return_url );
+			$return_url = wc_get_endpoint_url( 'order-received', '', wc_get_checkout_url() );
 		}

 		return apply_filters( 'woocommerce_get_return_url', $return_url, $order );
 	}

 	/**
-	 * Get a link to the transaction on the 3rd party gateway size (if applicable).
+	 * Get a link to the transaction on the 3rd party gateway site (if applicable).
 	 *
 	 * @param  WC_Order $order the order object.
 	 * @return string transaction URL, or empty string.
--- a/includes/abstracts/abstract-wc-product.php
+++ b/includes/abstracts/abstract-wc-product.php
@ -2002,6 +2002,8 @@ class WC_Product extends WC_Abstract_Legacy_Product {
 			$availability = __( 'Out of stock', 'woocommerce' );
 		} elseif ( $this->managing_stock() && $this->is_on_backorder( 1 ) ) {
 			$availability = $this->backorders_require_notification() ? __( 'Available on backorder', 'woocommerce' ) : '';
+		} elseif ( ! $this->managing_stock() && $this->is_on_backorder( 1 ) ) {
+			$availability = __( 'Available on backorder', 'woocommerce' );
 		} elseif ( $this->managing_stock() ) {
 			$availability = wc_format_stock_for_display( $this );
 		} else {
@ -2018,7 +2020,7 @@ class WC_Product extends WC_Abstract_Legacy_Product {
 	protected function get_availability_class() {
 		if ( ! $this->is_in_stock() ) {
 			$class = 'out-of-stock';
-		} elseif ( $this->managing_stock() && $this->is_on_backorder( 1 ) ) {
+		} elseif ( ( $this->managing_stock() && $this->is_on_backorder( 1 ) ) || ( ! $this->managing_stock() && $this->is_on_backorder( 1 ) ) ) {
 			$class = 'available-on-backorder';
 		} else {
 			$class = 'in-stock';
--- a/includes/admin/class-wc-admin-addons.php
+++ b/includes/admin/class-wc-admin-addons.php
@ -427,7 +427,7 @@ class WC_Admin_Addons {
 					<?php foreach ( $block_data['logos'] as $logo ) : ?>
 						<li>
 							<img
-								alt="<?php echo esc_url( $logo['alt'] ); ?>"
+								alt="<?php echo esc_attr( $logo['alt'] ); ?>"
 								class="wcs-service-logo"
 								src="<?php echo esc_url( $logo['link'] ); ?>"
 							>
@ -490,6 +490,7 @@ class WC_Admin_Addons {
 			'wccom-site'          => site_url(),
 			'wccom-back'          => esc_url( $back_admin_path ),
 			'wccom-woo-version'   => WC_VERSION,
+			'wccom-connect-nonce' => wp_create_nonce( 'connect' ),
 		);
 	}

--- a/includes/admin/class-wc-admin-attributes.php
+++ b/includes/admin/class-wc-admin-attributes.php
@ -234,7 +234,7 @@ class WC_Admin_Attributes {
 									<td>
 										<select name="attribute_type" id="attribute_type">
 											<?php foreach ( wc_get_attribute_types() as $key => $value ) : ?>
-												<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $att_type, $key ); ?>><?php echo esc_attr( $value ); ?></option>
+												<option value="<?php echo esc_attr( $key ); ?>" <?php selected( $att_type, $key ); ?>><?php echo esc_html( $value ); ?></option>
 											<?php endforeach; ?>
 											<?php
 												/**
@ -311,7 +311,7 @@ class WC_Admin_Attributes {
 										?>
 										<tr>
 												<td>
-													<strong><a href="edit-tags.php?taxonomy=<?php echo esc_html( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product"><?php echo esc_html( $tax->attribute_label ); ?></a></strong>
+													<strong><a href="edit-tags.php?taxonomy=<?php echo esc_attr( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product"><?php echo esc_html( $tax->attribute_label ); ?></a></strong>

 													<div class="row-actions"><span class="edit"><a href="<?php echo esc_url( add_query_arg( 'edit', $tax->attribute_id, 'edit.php?post_type=product&amp;page=product_attributes' ) ); ?>"><?php esc_html_e( 'Edit', 'woocommerce' ); ?></a> | </span><span class="delete"><a class="delete" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'delete', $tax->attribute_id, 'edit.php?post_type=product&amp;page=product_attributes' ), 'woocommerce-delete-attribute_' . $tax->attribute_id ) ); ?>"><?php esc_html_e( 'Delete', 'woocommerce' ); ?></a></span></div>
 												</td>
@ -353,7 +353,7 @@ class WC_Admin_Attributes {
 															echo '<span class="na">&ndash;</span>';
 													}
 													?>
-													<br /><a href="edit-tags.php?taxonomy=<?php echo esc_html( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product" class="configure-terms"><?php esc_html_e( 'Configure terms', 'woocommerce' ); ?></a>
+													<br /><a href="edit-tags.php?taxonomy=<?php echo esc_attr( wc_attribute_taxonomy_name( $tax->attribute_name ) ); ?>&amp;post_type=product" class="configure-terms"><?php esc_html_e( 'Configure terms', 'woocommerce' ); ?></a>
 												</td>
 											</tr>
 											<?php
@ -410,7 +410,7 @@ class WC_Admin_Attributes {
 										<label for="attribute_type"><?php esc_html_e( 'Type', 'woocommerce' ); ?></label>
 										<select name="attribute_type" id="attribute_type">
 											<?php foreach ( wc_get_attribute_types() as $key => $value ) : ?>
-												<option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_attr( $value ); ?></option>
+												<option value="<?php echo esc_attr( $key ); ?>"><?php echo esc_html( $value ); ?></option>
 											<?php endforeach; ?>
 											<?php
 												/**
--- a/includes/admin/class-wc-admin-dashboard.php
+++ b/includes/admin/class-wc-admin-dashboard.php
@ -305,10 +305,10 @@ if ( ! class_exists( 'WC_Admin_Dashboard', false ) ) :
 					$rating = intval( get_comment_meta( $comment->comment_ID, 'rating', true ) );

 					/* translators: %s: rating */
-					echo '<div class="star-rating"><span style="width:' . esc_html( $rating * 20 ) . '%">' . sprintf( esc_html__( '%s out of 5', 'woocommerce' ), esc_html( $rating ) ) . '</span></div>';
+					echo '<div class="star-rating"><span style="width:' . esc_attr( $rating * 20 ) . '%">' . sprintf( esc_html__( '%s out of 5', 'woocommerce' ), esc_html( $rating ) ) . '</span></div>';

 					/* translators: %s: review author */
-					echo '<h4 class="meta"><a href="' . esc_url( get_permalink( $comment->ID ) ) . '#comment-' . esc_html( absint( $comment->comment_ID ) ) . '">' . esc_html( apply_filters( 'woocommerce_admin_dashboard_recent_reviews', $comment->post_title, $comment ) ) . '</a> ' . sprintf( esc_html__( 'reviewed by %s', 'woocommerce' ), esc_html( $comment->comment_author ) ) . '</h4>';
+					echo '<h4 class="meta"><a href="' . esc_url( get_permalink( $comment->ID ) ) . '#comment-' . esc_attr( absint( $comment->comment_ID ) ) . '">' . esc_html( apply_filters( 'woocommerce_admin_dashboard_recent_reviews', $comment->post_title, $comment ) ) . '</a> ' . sprintf( esc_html__( 'reviewed by %s', 'woocommerce' ), esc_html( $comment->comment_author ) ) . '</h4>';
 					echo '<blockquote>' . wp_kses_data( $comment->comment_content ) . '</blockquote></li>';

 				}
--- a/includes/admin/class-wc-admin-duplicate-product.php
+++ b/includes/admin/class-wc-admin-duplicate-product.php
@ -59,12 +59,12 @@ class WC_Admin_Duplicate_Product {
 				get_delete_post_link( $the_product->get_id(), '', false ),
 				/* translators: %s: post title */
 				esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash', 'woocommerce' ), $the_product->get_name() ) ),
-				__( 'Trash', 'woocommerce' )
+				esc_html__( 'Trash', 'woocommerce' )
 			);
 		}

 		$actions['duplicate'] = '<a href="' . wp_nonce_url( admin_url( 'edit.php?post_type=product&action=duplicate_product&amp;post=' . $post->ID ), 'woocommerce-duplicate-product_' . $post->ID ) . '" aria-label="' . esc_attr__( 'Make a duplicate from this product', 'woocommerce' )
-			. '" rel="permalink">' . __( 'Duplicate', 'woocommerce' ) . '</a>';
+			. '" rel="permalink">' . esc_html__( 'Duplicate', 'woocommerce' ) . '</a>';

 		return $actions;
 	}
@ -90,7 +90,7 @@ class WC_Admin_Duplicate_Product {
 		if ( isset( $_GET['post'] ) ) {
 			$notify_url = wp_nonce_url( admin_url( 'edit.php?post_type=product&action=duplicate_product&post=' . absint( $_GET['post'] ) ), 'woocommerce-duplicate-product_' . $_GET['post'] );
 			?>
-			<div id="duplicate-action"><a class="submitduplicate duplication" href="<?php echo esc_url( $notify_url ); ?>"><?php _e( 'Copy to a new draft', 'woocommerce' ); ?></a></div>
+			<div id="duplicate-action"><a class="submitduplicate duplication" href="<?php echo esc_url( $notify_url ); ?>"><?php esc_html_e( 'Copy to a new draft', 'woocommerce' ); ?></a></div>
 			<?php
 		}
 	}
@ -100,7 +100,7 @@ class WC_Admin_Duplicate_Product {
 	 */
 	public function duplicate_product_action() {
 		if ( empty( $_REQUEST['post'] ) ) {
-			wp_die( __( 'No product to duplicate has been supplied!', 'woocommerce' ) );
+			wp_die( esc_html__( 'No product to duplicate has been supplied!', 'woocommerce' ) );
 		}

 		$product_id = isset( $_REQUEST['post'] ) ? absint( $_REQUEST['post'] ) : '';
@ -111,7 +111,7 @@ class WC_Admin_Duplicate_Product {

 		if ( false === $product ) {
 			/* translators: %s: product id */
-			wp_die( sprintf( __( 'Product creation failed, could not find original product: %s', 'woocommerce' ), $product_id ) );
+			wp_die( sprintf( esc_html__( 'Product creation failed, could not find original product: %s', 'woocommerce' ), $product_id ) );
 		}

 		$duplicate = $this->product_duplicate( $product );
@ -137,7 +137,7 @@ class WC_Admin_Duplicate_Product {

 		$duplicate = clone $product;
 		$duplicate->set_id( 0 );
-		$duplicate->set_name( sprintf( __( '%s (Copy)', 'woocommerce' ), $duplicate->get_name() ) );
+		$duplicate->set_name( sprintf( esc_html__( '%s (Copy)', 'woocommerce' ), $duplicate->get_name() ) );
 		$duplicate->set_total_sales( 0 );
 		if ( '' !== $product->get_sku( 'edit' ) ) {
 			$duplicate->set_sku( wc_product_generate_unique_sku( 0, $product->get_sku( 'edit' ) ) );
--- a/includes/admin/class-wc-admin-log-table-list.php
+++ b/includes/admin/class-wc-admin-log-table-list.php
@ -75,9 +75,9 @@ class WC_Admin_Log_Table_List extends WP_List_Table {

 		$selected_level = isset( $_REQUEST['level'] ) ? $_REQUEST['level'] : '';
 		?>
-			<label for="filter-by-level" class="screen-reader-text"><?php _e( 'Filter by level', 'woocommerce' ); ?></label>
+			<label for="filter-by-level" class="screen-reader-text"><?php esc_html_e( 'Filter by level', 'woocommerce' ); ?></label>
 			<select name="level" id="filter-by-level">
-				<option<?php selected( $selected_level, '' ); ?> value=""><?php _e( 'All levels', 'woocommerce' ); ?></option>
+				<option<?php selected( $selected_level, '' ); ?> value=""><?php esc_html_e( 'All levels', 'woocommerce' ); ?></option>
 				<?php
 				foreach ( $levels as $l ) {
 					printf(
@ -237,9 +237,9 @@ class WC_Admin_Log_Table_List extends WP_List_Table {
 		if ( ! empty( $sources ) ) {
 			$selected_source = isset( $_REQUEST['source'] ) ? $_REQUEST['source'] : '';
 			?>
-				<label for="filter-by-source" class="screen-reader-text"><?php _e( 'Filter by source', 'woocommerce' ); ?></label>
+				<label for="filter-by-source" class="screen-reader-text"><?php esc_html_e( 'Filter by source', 'woocommerce' ); ?></label>
 				<select name="source" id="filter-by-source">
-					<option<?php selected( $selected_source, '' ); ?> value=""><?php _e( 'All sources', 'woocommerce' ); ?></option>
+					<option<?php selected( $selected_source, '' ); ?> value=""><?php esc_html_e( 'All sources', 'woocommerce' ); ?></option>
 					<?php
 					foreach ( $sources as $s ) {
 						printf(
--- a/includes/admin/class-wc-admin-menus.php
+++ b/includes/admin/class-wc-admin-menus.php
@ -331,7 +331,7 @@ class WC_Admin_Menus {
 								<input type="checkbox" class="menu-item-checkbox" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-object-id]" value="<?php echo esc_attr( $i ); ?>" /> <?php echo esc_html( $value ); ?>
 							</label>
 							<input type="hidden" class="menu-item-type" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-type]" value="custom" />
-							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-title]" value="<?php echo esc_html( $value ); ?>" />
+							<input type="hidden" class="menu-item-title" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-title]" value="<?php echo esc_attr( $value ); ?>" />
 							<input type="hidden" class="menu-item-url" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-url]" value="<?php echo esc_url( wc_get_account_endpoint_url( $key ) ); ?>" />
 							<input type="hidden" class="menu-item-classes" name="menu-item[<?php echo esc_attr( $i ); ?>][menu-item-classes]" />
 						</li>
--- a/includes/admin/class-wc-admin-notices.php
+++ b/includes/admin/class-wc-admin-notices.php
@ -35,7 +35,7 @@ class WC_Admin_Notices {
 		'regenerating_lookup_table'    => 'regenerating_lookup_table_notice',
 		'no_secure_connection'         => 'secure_connection_notice',
 		'wc_admin'                     => 'wc_admin_feature_plugin_notice',
-		'wp_php_min_requirements'   => 'wp_php_min_requirements_notice',
+		WC_PHP_MIN_REQUIREMENTS_NOTICE => 'wp_php_min_requirements_notice',
 	);

 	/**
@ -380,7 +380,7 @@ class WC_Admin_Notices {
 	 */
 	public static function add_min_version_notice() {
 		if ( version_compare( phpversion(), WC_NOTICE_MIN_PHP_VERSION, '<' ) || version_compare( get_bloginfo( 'version' ), WC_NOTICE_MIN_WP_VERSION, '<' ) ) {
-			self::add_notice( 'wp_php_min_requirements' );
+			self::add_notice( WC_PHP_MIN_REQUIREMENTS_NOTICE );
 		}
 	}

@ -391,8 +391,8 @@ class WC_Admin_Notices {
 	 * @return void
 	 */
 	public static function wp_php_min_requirements_notice() {
-		if ( apply_filters( 'woocommerce_hide_php_wp_nag', get_user_meta( get_current_user_id(), 'dismissed_wp_php_min_requirements_notice', true ) ) ) {
-			self::remove_notice( 'wp_php_min_requirements' );
+		if ( apply_filters( 'woocommerce_hide_php_wp_nag', get_user_meta( get_current_user_id(), 'dismissed_' . WC_PHP_MIN_REQUIREMENTS_NOTICE . '_notice', true ) ) ) {
+			self::remove_notice( WC_PHP_MIN_REQUIREMENTS_NOTICE );
 			return;
 		}

--- a/includes/admin/class-wc-admin-profile.php
+++ b/includes/admin/class-wc-admin-profile.php
@ -176,7 +176,7 @@ if ( ! class_exists( 'WC_Admin_Profile', false ) ) :
 											$selected = esc_attr( get_user_meta( $user->ID, $key, true ) );
 										foreach ( $field['options'] as $option_key => $option_value ) :
 											?>
-											<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $selected, $option_key, true ); ?>><?php echo esc_attr( $option_value ); ?></option>
+											<option value="<?php echo esc_attr( $option_key ); ?>" <?php selected( $selected, $option_key, true ); ?>><?php echo esc_html( $option_value ); ?></option>
 										<?php endforeach; ?>
 									</select>
 								<?php elseif ( ! empty( $field['type'] ) && 'checkbox' === $field['type'] ) : ?>
--- a/includes/admin/class-wc-admin-settings.php
+++ b/includes/admin/class-wc-admin-settings.php
@ -187,7 +187,7 @@ if ( ! class_exists( 'WC_Admin_Settings', false ) ) :
 			}

 			if ( is_array( $option_value ) ) {
-				$option_value = array_map( 'stripslashes', $option_value );
+				$option_value = wp_unslash( $option_value );
 			} elseif ( ! is_null( $option_value ) ) {
 				$option_value = stripslashes( $option_value );
 			}
--- a/includes/admin/class-wc-admin-setup-wizard.php
+++ b/includes/admin/class-wc-admin-setup-wizard.php
@ -204,7 +204,7 @@ class WC_Admin_Setup_Wizard {
 		wp_enqueue_style( 'woocommerce_admin_styles', WC()->plugin_url() . '/assets/css/admin.css', array(), WC_VERSION );
 		wp_enqueue_style( 'wc-setup', WC()->plugin_url() . '/assets/css/wc-setup.css', array( 'dashicons', 'install' ), WC_VERSION );

-		wp_register_script( 'wc-setup', WC()->plugin_url() . '/assets/js/admin/wc-setup' . $suffix . '.js', array( 'jquery', 'wc-enhanced-select', 'jquery-blockui', 'wp-util', 'jquery-tiptip' ), WC_VERSION );
+		wp_register_script( 'wc-setup', WC()->plugin_url() . '/assets/js/admin/wc-setup' . $suffix . '.js', array( 'jquery', 'wc-enhanced-select', 'jquery-blockui', 'wp-util', 'jquery-tiptip', 'backbone', 'wc-backbone-modal' ), WC_VERSION );
 		wp_localize_script(
 			'wc-setup',
 			'wc_setup_params',
@ -360,7 +360,7 @@ class WC_Admin_Setup_Wizard {
 			<?php do_action( 'admin_head' ); ?>
 		</head>
 		<body class="wc-setup wp-core-ui">
-			<h1 id="wc-logo"><a href="https://woocommerce.com/"><img src="<?php echo esc_url( WC()->plugin_url() ); ?>/assets/images/woocommerce_logo.png" alt="WooCommerce" /></a></h1>
+			<h1 id="wc-logo"><a href="https://woocommerce.com/"><img src="<?php echo esc_url( WC()->plugin_url() ); ?>/assets/images/woocommerce_logo.png" alt="<?php esc_attr_e( 'WooCommerce', 'woocommerce' ); ?>" /></a></h1>
 		<?php
 	}

@ -456,6 +456,7 @@ class WC_Admin_Setup_Wizard {
 		$currency_by_country = wp_list_pluck( $locale_info, 'currency_code' );
 		?>
 		<form method="post" class="address-step">
+			<input type="hidden" name="save_step" value="store_setup" />
 			<?php wp_nonce_field( 'wc-setup' ); ?>
 			<p class="store-setup"><?php esc_html_e( 'The following wizard will help you configure your store and get you started quickly.', 'woocommerce' ); ?></p>

@ -537,6 +538,7 @@ class WC_Admin_Setup_Wizard {
 			</select>
 			</div>

+			<div class="sell-in-person-container">
 			<input
 				type="checkbox"
 				id="woocommerce_sell_in_person"
@ -547,26 +549,67 @@ class WC_Admin_Setup_Wizard {
 			<label class="location-prompt" for="woocommerce_sell_in_person">
 				<?php esc_html_e( 'I will also be selling products or services in person.', 'woocommerce' ); ?>
 			</label>
-
-			<div class="woocommerce-tracker">
-				<p class="checkbox">
-					<input type="checkbox" id="wc_tracker_checkbox" name="wc_tracker_checkbox" value="yes" checked />
-					<label for="wc_tracker_checkbox"><?php esc_html_e( 'Help WooCommerce improve with usage tracking.', 'woocommerce' ); ?></label>
-				</p>
-				<p>
-				<?php
-				esc_html_e( 'Gathering usage data allows us to make WooCommerce better &mdash; your store will be considered as we evaluate new features, judge the quality of an update, or determine if an improvement makes sense. If you would rather opt-out, and do not check this box, we will not know this store exists and we will not collect any usage data.', 'woocommerce' );
-				echo ' <a target="_blank" href="https://woocommerce.com/usage-tracking/">' . esc_html__( 'Read more about what we collect.', 'woocommerce' ) . '</a>';
-				?>
-				</p>
 			</div>
+
+			<input type="checkbox" id="wc_tracker_checkbox" name="wc_tracker_checkbox" value="yes" <?php checked( 'yes', get_option( 'woocommerce_allow_tracking', 'no' ) ); ?> />
+
+			<?php $this->tracking_modal(); ?>
+
 			<p class="wc-setup-actions step">
-				<button type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( "Let's go!", 'woocommerce' ); ?>" name="save_step"><?php esc_html_e( "Let's go!", 'woocommerce' ); ?></button>
+				<button class="button-primary button button-large" value="<?php esc_attr_e( "Let's go!", 'woocommerce' ); ?>" name="save_step"><?php esc_html_e( "Let's go!", 'woocommerce' ); ?></button>
 			</p>
 		</form>
 		<?php
 	}

+	/**
+	 * Template for the usage tracking modal.
+	 */
+	public function tracking_modal() {
+		?>
+		<script type="text/template" id="tmpl-wc-modal-tracking-setup">
+			<div class="wc-backbone-modal woocommerce-tracker">
+				<div class="wc-backbone-modal-content">
+					<section class="wc-backbone-modal-main" role="main">
+						<header class="wc-backbone-modal-header">
+							<h1><?php esc_html_e( 'Help improve WooCommerce with usage tracking', 'woocommerce' ); ?></h1>
+						</header>
+						<article>
+							<p>
+							<?php
+								printf(
+									wp_kses(
+										/* translators: %1$s: usage tracking help link */
+										__( 'Learn more about how usage tracking works, and how you\'ll be helping <a href="%1$s" target="_blank">here</a>.', 'woocommerce' ),
+										array(
+											'a'    => array(
+												'href'   => array(),
+												'target' => array(),
+											),
+										)
+									),
+									'https://woocommerce.com/usage-tracking/'
+								);
+							?>
+							</p>
+							<p class="woocommerce-tracker-checkbox">
+								<input type="checkbox" id="wc_tracker_checkbox_dialog" name="wc_tracker_checkbox_dialog" value="yes" <?php checked( 'yes', get_option( 'woocommerce_allow_tracking', 'no' ) ); ?> />
+								<label for="wc_tracker_checkbox_dialog"><?php esc_html_e( 'Enable usage tracking and help improve WooCommerce', 'woocommerce' ); ?></label>
+							</p>
+						</article>
+						<footer>
+							<div class="inner">
+								<button class="button button-primary button-large" id="wc_tracker_submit" aria-label="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></a>
+							</div>
+						</footer>
+					</section>
+				</div>
+			</div>
+			<div class="wc-backbone-modal-backdrop modal-close"></div>
+		</script>
+		<?php
+	}
+
 	/**
 	 * Save initial store settings.
 	 */
@ -1078,7 +1121,7 @@ class WC_Admin_Setup_Wizard {

 			<p class="wc-setup-actions step">
 				<?php $this->plugin_install_info(); ?>
-				<button type="submit" class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
+				<button class="button-primary button button-large button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
 				<?php wp_nonce_field( 'wc-setup' ); ?>
 			</p>
 		</form>
@ -2132,7 +2175,7 @@ class WC_Admin_Setup_Wizard {
 				<img
 					class="jetpack-logo"
 					src="<?php echo esc_url( WC()->plugin_url() . '/assets/images/jetpack_horizontal_logo.png' ); ?>"
-					alt="Jetpack logo"
+					alt="<?php esc_attr_e( 'Jetpack logo', 'woocommerce' ); ?>"
 				/>
 				<img
 					class="wcs-notice"
@ -2143,7 +2186,7 @@ class WC_Admin_Setup_Wizard {
 			<img
 				class="jetpack-logo"
 				src="<?php echo esc_url( WC()->plugin_url() . '/assets/images/jetpack_vertical_logo.png' ); ?>"
-				alt="Jetpack logo"
+				alt="<?php esc_attr_e( 'Jetpack logo', 'woocommerce' ); ?>"
 			/>
 		<?php endif; ?>

@ -2320,7 +2363,7 @@ class WC_Admin_Setup_Wizard {
 					<p class="wc-setup-actions step newsletter-form-button-container">
 						<button
 							type="submit"
-							value="<?php esc_html_e( 'Yes please!', 'woocommerce' ); ?>"
+							value="<?php esc_attr_e( 'Yes please!', 'woocommerce' ); ?>"
 							name="subscribe"
 							id="mc-embedded-subscribe"
 							class="button-primary button newsletter-form-button"
--- a/includes/admin/class-wc-admin.php
+++ b/includes/admin/class-wc-admin.php
@ -80,11 +80,6 @@ class WC_Admin {
 			}
 		}

-		// Importers.
-		if ( defined( 'WP_LOAD_IMPORTERS' ) ) {
-			include_once dirname( __FILE__ ) . '/class-wc-admin-importers.php';
-		}
-
 		// Helper.
 		include_once dirname( __FILE__ ) . '/helper/class-wc-helper.php';

--- a/includes/admin/helper/class-wc-helper.php
+++ b/includes/admin/helper/class-wc-helper.php
@ -799,6 +799,13 @@ class WC_Helper {
 			WC_Tracker::send_tracking_data( true );
 		}

+		// If connecting through in-app purchase, redirects back to WooCommerce.com
+		// for product installation.
+		if ( ! empty( $_GET['wccom-install-url'] ) ) {
+			wp_redirect( wp_unslash( $_GET['wccom-install-url'] ) );
+			exit;
+		}
+
 		wp_safe_redirect(
 			add_query_arg(
 				array(
--- a/includes/admin/helper/views/html-oauth-start.php
+++ b/includes/admin/helper/views/html-oauth-start.php
@ -16,7 +16,7 @@ defined( 'ABSPATH' ) || exit();

 		<div class="start-container">
 			<div class="text">
-				<img src="<?php echo esc_url( WC()->plugin_url() . '/assets/images/woocommerce_logo.png' ); ?>" alt="WooCommerce" style="width:180px;">
+				<img src="<?php echo esc_url( WC()->plugin_url() . '/assets/images/woocommerce_logo.png' ); ?>" alt="<?php esc_attr_e( 'WooCommerce', 'woocommerce' ); ?>" style="width:180px;">

 				<?php if ( ! empty( $_GET['wc-helper-status'] ) && 'helper-disconnected' === $_GET['wc-helper-status'] ) : ?>
 					<p><strong><?php esc_html_e( 'Sorry to see you go.', 'woocommerce' ); ?></strong> <?php esc_html_e( 'Feel free to reconnect again using the button below.', 'woocommerce' ); ?></p>
--- a/includes/admin/helper/views/html-section-nav.php
+++ b/includes/admin/helper/views/html-section-nav.php
@ -1,11 +1,19 @@
-<?php defined( 'ABSPATH' ) or exit(); ?>
+<?php
+/**
+ * Helper admin navigation.
+ *
+ * @package WooCommerce/Helper
+ */
+
+defined( 'ABSPATH' ) || exit(); ?>

 <nav class="nav-tab-wrapper woo-nav-tab-wrapper">
-	<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons' ) ); ?>" class="nav-tab"><?php _e( 'Browse Extensions', 'woocommerce' ); ?></a>
+	<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons' ) ); ?>" class="nav-tab"><?php esc_html_e( 'Browse Extensions', 'woocommerce' ); ?></a>

 	<?php
 		$count_html = WC_Helper_Updater::get_updates_count_html();
+		/* translators: %s: WooCommerce.com Subscriptions tab count HTML. */
 		$menu_title = sprintf( __( 'WooCommerce.com Subscriptions %s', 'woocommerce' ), $count_html );
 	?>
-	<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons&section=helper' ) ); ?>" class="nav-tab nav-tab-active"><?php echo $menu_title; ?></a>
+	<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons&section=helper' ) ); ?>" class="nav-tab nav-tab-active"><?php echo wp_kses_post( $menu_title ); ?></a>
 </nav>
--- a/includes/admin/importers/views/html-product-csv-import-form.php
+++ b/includes/admin/importers/views/html-product-csv-import-form.php
@ -97,7 +97,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 		});
 	</script>
 	<div class="wc-actions">
-		<a href="#" class="woocommerce-importer-toggle-advanced-options" data-hidetext="<?php esc_html_e( 'Hide advanced options', 'woocommerce' ); ?>" data-showtext="<?php esc_html_e( 'Hide advanced options', 'woocommerce' ); ?>"><?php esc_html_e( 'Show advanced options', 'woocommerce' ); ?></a>
+		<a href="#" class="woocommerce-importer-toggle-advanced-options" data-hidetext="<?php esc_attr_e( 'Hide advanced options', 'woocommerce' ); ?>" data-showtext="<?php esc_attr_e( 'Show advanced options', 'woocommerce' ); ?>"><?php esc_html_e( 'Show advanced options', 'woocommerce' ); ?></a>
 		<button type="submit" class="button button-primary button-next" value="<?php esc_attr_e( 'Continue', 'woocommerce' ); ?>" name="save_step"><?php esc_html_e( 'Continue', 'woocommerce' ); ?></button>
 		<?php wp_nonce_field( 'woocommerce-csv-importer' ); ?>
 	</div>
--- a/includes/admin/list-tables/abstract-class-wc-admin-list-table.php
+++ b/includes/admin/list-tables/abstract-class-wc-admin-list-table.php
@ -72,7 +72,7 @@ abstract class WC_Admin_List_Table {

 			$this->render_blank_state();

-			echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub  { display: none; } </style>';
+			echo '<style type="text/css">#posts-filter .wp-list-table, #posts-filter .tablenav.top, .tablenav.bottom .actions, .wrap .subsubsub  { display: none; } #posts-filter .tablenav.bottom { height: auto; } </style>';
 		}
 	}

--- a/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php
@ -116,7 +116,8 @@ class WC_Meta_Box_Coupon_Data {
 						'value'             => esc_attr( $expiry_date ),
 						'label'             => __( 'Coupon expiry date', 'woocommerce' ),
 						'placeholder'       => 'YYYY-MM-DD',
-						'description'       => '',
+						'description'       => __( 'The coupon will expire at 00:00:00 of this date.', 'woocommerce' ),
+						'desc_tip'          => true,
 						'class'             => 'date-picker',
 						'custom_attributes' => array(
 							'pattern' => apply_filters( 'woocommerce_date_input_html_pattern', '[0-9]{4}-(0[1-9]|1[012])-(0[1-9]|1[0-9]|2[0-9]|3[01])' ),
--- a/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
+++ b/includes/admin/meta-boxes/class-wc-meta-box-product-images.php
@ -78,7 +78,7 @@ class WC_Meta_Box_Product_Images {

 		</div>
 		<p class="add_product_images hide-if-no-js">
-			<a href="#" data-choose="<?php esc_attr_e( 'Add images to product gallery', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Add to gallery', 'woocommerce' ); ?>" data-delete="<?php esc_attr_e( 'Delete image', 'woocommerce' ); ?>" data-text="<?php esc_attr_e( 'Delete', 'woocommerce' ); ?>"><?php _e( 'Add product gallery images', 'woocommerce' ); ?></a>
+			<a href="#" data-choose="<?php esc_attr_e( 'Add images to product gallery', 'woocommerce' ); ?>" data-update="<?php esc_attr_e( 'Add to gallery', 'woocommerce' ); ?>" data-delete="<?php esc_attr_e( 'Delete image', 'woocommerce' ); ?>" data-text="<?php esc_attr_e( 'Delete', 'woocommerce' ); ?>"><?php esc_html_e( 'Add product gallery images', 'woocommerce' ); ?></a>
 		</p>
 		<?php
 	}
--- a/includes/admin/meta-boxes/views/html-order-notes.php
+++ b/includes/admin/meta-boxes/views/html-order-notes.php
@ -22,7 +22,7 @@ defined( 'ABSPATH' ) || exit;
 					<?php echo wpautop( wptexturize( wp_kses_post( $note->content ) ) ); // @codingStandardsIgnoreLine ?>
 				</div>
 				<p class="meta">
-					<abbr class="exact-date" title="<?php echo esc_attr( $note->date_created->date( 'y-m-d h:i:s' ) ); ?>">
+					<abbr class="exact-date" title="<?php echo esc_attr( $note->date_created->date( 'Y-m-d H:i:s' ) ); ?>">
 						<?php
 						/* translators: %1$s: note date %2$s: note time */
 						echo esc_html( sprintf( __( '%1$s at %2$s', 'woocommerce' ), $note->date_created->date_i18n( wc_date_format() ), $note->date_created->date_i18n( wc_time_format() ) ) );
--- a/includes/admin/meta-boxes/views/html-order-refund.php
+++ b/includes/admin/meta-boxes/views/html-order-refund.php
@ -43,6 +43,8 @@ $who_refunded = new WP_User( $refund->get_refunded_by() );
 			<p class="description"><?php echo esc_html( $refund->get_reason() ); ?></p>
 		<?php endif; ?>
 		<input type="hidden" class="order_refund_id" name="order_refund_id[]" value="<?php echo esc_attr( $refund->get_id() ); ?>" />
+
+		<?php do_action( 'woocommerce_after_order_refund_item_name', $refund ); ?>
 	</td>

 	<?php do_action( 'woocommerce_admin_order_item_values', null, $refund, $refund->get_id() ); ?>
--- a/includes/admin/meta-boxes/views/html-product-data-shipping.php
+++ b/includes/admin/meta-boxes/views/html-product-data-shipping.php
@ -50,6 +50,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			'id'               => 'product_shipping_class',
 			'selected'         => $product_object->get_shipping_class_id( 'edit' ),
 			'class'            => 'select short',
+			'orderby'          => 'name',
 		);
 		?>
 		<p class="form-field shipping_class_field">
--- a/includes/admin/meta-boxes/views/html-variation-admin.php
+++ b/includes/admin/meta-boxes/views/html-variation-admin.php
@ -89,17 +89,17 @@ defined( 'ABSPATH' ) || exit;
 					<?php esc_html_e( 'Enabled', 'woocommerce' ); ?>:
 					<input type="checkbox" class="checkbox" name="variable_enabled[<?php echo esc_attr( $loop ); ?>]" <?php checked( in_array( $variation_object->get_status( 'edit' ), array( 'publish', false ), true ), true ); ?> />
 				</label>
-				<label class="tips" data-tip="<?php esc_html_e( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ); ?>">
+				<label class="tips" data-tip="<?php esc_attr_e( 'Enable this option if access is given to a downloadable file upon purchase of a product', 'woocommerce' ); ?>">
 					<?php esc_html_e( 'Downloadable', 'woocommerce' ); ?>:
 					<input type="checkbox" class="checkbox variable_is_downloadable" name="variable_is_downloadable[<?php echo esc_attr( $loop ); ?>]" <?php checked( $variation_object->get_downloadable( 'edit' ), true ); ?> />
 				</label>
-				<label class="tips" data-tip="<?php esc_html_e( 'Enable this option if a product is not shipped or there is no shipping cost', 'woocommerce' ); ?>">
+				<label class="tips" data-tip="<?php esc_attr_e( 'Enable this option if a product is not shipped or there is no shipping cost', 'woocommerce' ); ?>">
 					<?php esc_html_e( 'Virtual', 'woocommerce' ); ?>:
 					<input type="checkbox" class="checkbox variable_is_virtual" name="variable_is_virtual[<?php echo esc_attr( $loop ); ?>]" <?php checked( $variation_object->get_virtual( 'edit' ), true ); ?> />
 				</label>

 				<?php if ( 'yes' === get_option( 'woocommerce_manage_stock' ) ) : ?>
-					<label class="tips" data-tip="<?php esc_html_e( 'Enable this option to enable stock management at variation level', 'woocommerce' ); ?>">
+					<label class="tips" data-tip="<?php esc_attr_e( 'Enable this option to enable stock management at variation level', 'woocommerce' ); ?>">
 						<?php esc_html_e( 'Manage stock?', 'woocommerce' ); ?>
 						<input type="checkbox" class="checkbox variable_manage_stock" name="variable_manage_stock[<?php echo esc_attr( $loop ); ?>]" <?php checked( $variation_object->get_manage_stock(), true ); // Use view context so 'parent' is considered. ?> />
 					</label>
--- a/includes/admin/settings/class-wc-settings-advanced.php
+++ b/includes/admin/settings/class-wc-settings-advanced.php
@ -183,7 +183,7 @@ class WC_Settings_Advanced extends WC_Settings_Page {
 						'title' => __( 'Checkout endpoints', 'woocommerce' ),
 						'type'  => 'title',
 						'desc'  => __( 'Endpoints are appended to your page URLs to handle specific actions during the checkout process. They should be unique.', 'woocommerce' ),
-						'id'    => 'account_endpoint_options',
+						'id'    => 'checkout_endpoint_options',
 					),

 					array(
--- a/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
+++ b/includes/admin/settings/views/html-admin-page-shipping-zone-methods.php
@ -39,7 +39,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 					</label>
 				</th>
 				<td class="forminp">
-					<select multiple="multiple" data-attribute="zone_locations" id="zone_locations" name="zone_locations" data-placeholder="<?php esc_html_e( 'Select regions within this zone', 'woocommerce' ); ?>" class="wc-shipping-zone-region-select chosen_select">
+					<select multiple="multiple" data-attribute="zone_locations" id="zone_locations" name="zone_locations" data-placeholder="<?php esc_attr_e( 'Select regions within this zone', 'woocommerce' ); ?>" class="wc-shipping-zone-region-select chosen_select">
 						<?php
 						foreach ( $shipping_continents as $continent_code => $continent ) {
 							echo '<option value="continent:' . esc_attr( $continent_code ) . '"' . wc_selected( "continent:$continent_code", $locations ) . '>' . esc_html( $continent['name'] ) . '</option>';
--- a/includes/admin/views/html-admin-page-addons.php
+++ b/includes/admin/views/html-admin-page-addons.php
@ -21,7 +21,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 			// translators: Count of updates for WooCommerce.com subscriptions.
 			$menu_title = sprintf( __( 'WooCommerce.com Subscriptions %s', 'woocommerce' ), $count_html );
 		?>
-		<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons&section=helper' ) ); ?>" class="nav-tab"><?php echo esc_html( $menu_title ); ?></a>
+		<a href="<?php echo esc_url( admin_url( 'admin.php?page=wc-addons&section=helper' ) ); ?>" class="nav-tab"><?php echo wp_kses_post( $menu_title ); ?></a>
 	</nav>

 	<h1 class="screen-reader-text"><?php esc_html_e( 'WooCommerce Extensions', 'woocommerce' ); ?></h1>
@ -39,9 +39,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<?php endforeach; ?>
 		</ul>

-		<?php if ( isset( $_GET['search'] ) ) : ?>
+		<?php if ( isset( $_GET['search'] ) ) : // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>
 			<h1 class="search-form-title" >
-				<?php printf( esc_html( 'Showing search results for: %s', 'woocommerce' ), '<strong>' . esc_html( sanitize_text_field( wp_unslash( $_GET['search'] ) ) ) . '</strong>' ); ?>
+				<?php printf( esc_html__( 'Showing search results for: %s', 'woocommerce' ), '<strong>' . esc_html( sanitize_text_field( wp_unslash( $_GET['search'] ) ) ) . '</strong>' ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>
 			</h1>
 		<?php endif; ?>

@ -52,10 +52,10 @@ if ( ! defined( 'ABSPATH' ) ) {
 			<input
 				type="text"
 				name="search"
-				value="<?php echo esc_attr( isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '' ); ?>"
-				placeholder="<?php esc_html_e( 'Enter a search term and press enter', 'woocommerce' ); ?>">
+				value="<?php echo esc_attr( isset( $_GET['search'] ) ? sanitize_text_field( wp_unslash( $_GET['search'] ) ) : '' ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>"
+				placeholder="<?php esc_attr_e( 'Enter a search term and press enter', 'woocommerce' ); ?>">
 			<input type="hidden" name="page" value="wc-addons">
-			<?php $page_section = ( isset( $_GET['section'] ) && '_featured' !== $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_all'; ?>
+			<?php $page_section = ( isset( $_GET['section'] ) && '_featured' !== $_GET['section'] ) ? sanitize_text_field( wp_unslash( $_GET['section'] ) ) : '_all'; // phpcs:ignore WordPress.Security.NonceVerification.Recommended ?>
 			<input type="hidden" name="section" value="<?php echo esc_attr( $page_section ); ?>">
 		</form>
 		<?php if ( '_featured' === $current_section ) : ?>
@ -111,15 +111,15 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<?php endif; ?>
 	<?php else : ?>
 		<?php /* translators: a url */ ?>
-		<p><?php printf( esc_html__( 'Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
+		<p><?php printf( wp_kses_post( __( 'Our catalog of WooCommerce Extensions can be found on WooCommerce.com here: <a href="%s">WooCommerce Extensions Catalog</a>', 'woocommerce' ) ), 'https://woocommerce.com/product-category/woocommerce-extensions/' ); ?></p>
 	<?php endif; ?>

 	<?php if ( 'Storefront' !== $theme['Name'] && '_featured' !== $current_section ) : ?>
 		<div class="storefront">
-			<a href="<?php echo esc_url( 'https://woocommerce.com/storefront/' ); ?>" target="_blank"><img src="<?php echo esc_url( WC()->plugin_url() ); ?>/assets/images/storefront.png" alt="Storefront" /></a>
+			<a href="<?php echo esc_url( 'https://woocommerce.com/storefront/' ); ?>" target="_blank"><img src="<?php echo esc_url( WC()->plugin_url() ); ?>/assets/images/storefront.png" alt="<?php esc_attr_e( 'Storefront', 'woocommerce' ); ?>" /></a>
 			<h2><?php esc_html_e( 'Looking for a WooCommerce theme?', 'woocommerce' ); ?></h2>
-			<p><?php esc_html_e( 'We recommend Storefront, the <em>official</em> WooCommerce theme.', 'woocommerce' ); ?></p>
-			<p><?php esc_html_e( 'Storefront is an intuitive, flexible and <strong>free</strong> WordPress theme offering deep integration with WooCommerce and many of the most popular customer-facing extensions.', 'woocommerce' ); ?></p>
+			<p><?php echo wp_kses_post( __( 'We recommend Storefront, the <em>official</em> WooCommerce theme.', 'woocommerce' ) ); ?></p>
+			<p><?php echo wp_kses_post( __( 'Storefront is an intuitive, flexible and <strong>free</strong> WordPress theme offering deep integration with WooCommerce and many of the most popular customer-facing extensions.', 'woocommerce' ) ); ?></p>
 			<p>
 				<a href="https://woocommerce.com/storefront/" target="_blank" class="button"><?php esc_html_e( 'Read all about it', 'woocommerce' ); ?></a>
 				<a href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'update.php?action=install-theme&theme=storefront' ), 'install-theme_storefront' ) ); ?>" class="button button-primary"><?php esc_html_e( 'Download &amp; install', 'woocommerce' ); ?></a>
--- a/includes/admin/views/html-admin-page-status-report.php
+++ b/includes/admin/views/html-admin-page-status-report.php
@ -12,6 +12,7 @@ global $wpdb;
 $report             = wc()->api->get_endpoint_data( '/wc/v3/system_status' );
 $environment        = $report['environment'];
 $database           = $report['database'];
+$post_type_counts   = isset( $report['post_type_counts'] ) ? $report['post_type_counts'] : array();
 $active_plugins     = $report['active_plugins'];
 $inactive_plugins   = $report['inactive_plugins'];
 $dropins_mu_plugins = $report['dropins_mu_plugins'];
@ -517,6 +518,28 @@ $untested_plugins   = $plugin_updates->get_untested_plugins( WC()->version, 'min
 		<?php endif; ?>
 	</tbody>
 </table>
+<?php if ( $post_type_counts ) : ?>
+	<table class="wc_status_table widefat" cellspacing="0">
+		<thead>
+		<tr>
+			<th colspan="3" data-export-label="Post Type Counts"><h2><?php esc_html_e( 'Post Type Counts', 'woocommerce' ); ?></h2></th>
+		</tr>
+		</thead>
+		<tbody>
+			<?php
+			foreach ( $post_type_counts as $ptype ) {
+				?>
+				<tr>
+					<td><?php echo esc_html( $ptype['type'] ); ?></td>
+					<td class="help">&nbsp;</td>
+					<td><?php echo absint( $ptype['count'] ); ?></td>
+				</tr>
+				<?php
+			}
+			?>
+		</tbody>
+	</table>
+<?php endif; ?>
 <table class="wc_status_table widefat" cellspacing="0">
 	<thead>
 		<tr>
--- a/includes/admin/views/html-notice-wp-php-minimum-requirements.php
+++ b/includes/admin/views/html-notice-wp-php-minimum-requirements.php
@ -8,7 +8,7 @@
 defined( 'ABSPATH' ) || exit;
 ?>
 <div id="message" class="updated woocommerce-message">
-	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', 'wp_php_min_requirements' ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce' ); ?></a>
+	<a class="woocommerce-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wc-hide-notice', WC_PHP_MIN_REQUIREMENTS_NOTICE ), 'woocommerce_hide_notices_nonce', '_wc_notice_nonce' ) ); ?>"><?php esc_html_e( 'Dismiss', 'woocommerce' ); ?></a>

 	<p>
 		<?php
--- a/includes/admin/wc-admin-functions.php
+++ b/includes/admin/wc-admin-functions.php
@ -194,6 +194,18 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) {
 		return false;
 	}

+	/**
+	 * Prevent adjust line item product stock.
+	 *
+	 * @since 3.7.1
+	 * @param bool $prevent If should prevent.
+	 * @param WC_Order_Item $item Item object.
+	 * @param int           $item_quantity Optional quantity to check against.
+	 */
+	if ( apply_filters( 'woocommerce_prevent_adjust_line_item_product_stock', false, $item, $item_quantity ) ) {
+		return false;
+	}
+
 	$product               = $item->get_product();
 	$item_quantity         = wc_stock_amount( $item_quantity >= 0 ? $item_quantity : $item->get_quantity() );
 	$already_reduced_stock = wc_stock_amount( $item->get_meta( '_reduced_stock', true ) );
@ -202,19 +214,23 @@ function wc_maybe_adjust_line_item_product_stock( $item, $item_quantity = -1 ) {
 		return false;
 	}

-	$diff = $item_quantity - $already_reduced_stock;
+	$order                  = $item->get_order();
+	$refunded_item_quantity = $order->get_qty_refunded_for_item( $item->get_id() );
+	$diff                   = $item_quantity + $refunded_item_quantity - $already_reduced_stock;

 	if ( $diff < 0 ) {
 		$new_stock = wc_update_product_stock( $product, $diff * -1, 'increase' );
-	} else {
+	} elseif ( $diff > 0 ) {
 		$new_stock = wc_update_product_stock( $product, $diff, 'decrease' );
+	} else {
+		return false;
 	}

 	if ( is_wp_error( $new_stock ) ) {
 		return $new_stock;
 	}

-	$item->update_meta_data( '_reduced_stock', $item_quantity );
+	$item->update_meta_data( '_reduced_stock', $item_quantity + $refunded_item_quantity );
 	$item->save();

 	return array(
--- a/includes/class-wc-ajax.php
+++ b/includes/class-wc-ajax.php
@ -898,7 +898,12 @@ class WC_AJAX {
 				if ( ! $product ) {
 					throw new Exception( __( 'Invalid product ID', 'woocommerce' ) . ' ' . $product_id );
 				}
+				$validation_error = new WP_Error();
+				$validation_error = apply_filters( 'woocommerce_ajax_add_order_item_validation', $validation_error, $product, $order, $qty );

+				if ( $validation_error->get_error_code() ) {
+					throw new Exception( '<strong>' . __( 'Error:', 'woocommerce' ) . '</strong> ' . $validation_error->get_error_message() );
+				}
 				$item_id                 = $order->add_product( $product, $qty );
 				$item                    = apply_filters( 'woocommerce_ajax_order_item', $order->get_item( $item_id ), $item_id, $order, $product );
 				$added_items[ $item_id ] = $item;
--- a/includes/class-wc-cache-helper.php
+++ b/includes/class-wc-cache-helper.php
@ -40,8 +40,8 @@ class WC_Cache_Helper {
 	 * @since 3.6.0
 	 */
 	public static function additional_nocache_headers( $headers ) {
-		// Opt-out of Google weblight if page is dynamic e.g. cart/checkout. https://support.google.com/webmasters/answer/6211428?hl=en.
-		$headers['Cache-Control'] = 'no-transform, no-cache, must-revalidate, max-age=0';
+		// no-transform: Opt-out of Google weblight if page is dynamic e.g. cart/checkout. https://support.google.com/webmasters/answer/6211428?hl=en.
+		$headers['Cache-Control'] = 'no-transform, no-cache, no-store, must-revalidate';
 		return $headers;
 	}

--- a/Show More
+++ b/Show More