pulled from upstream

.editorconfig

@@ -27,3 +27,8 @@ trim_trailing_whitespace = false
 insert_final_newline = false
 indent_style = space
 indent_size = 2
+
+[*.yml]
+insert_final_newline = false
+indent_style = space
+indent_size = 2

.gitignore

@@ -12,6 +12,9 @@ sftp-config.json
 /node_modules/
 /deploy/
 
+# Sass
+.sass-cache/
+
 # OS X metadata
 .DS_Store
 

.scrutinizer.yml

@@ -1,11 +1,11 @@
 filter:
-    excluded_paths:
+  excluded_paths:
-        - tests/*
+    - tests/*
-        - apigen/*
+    - apigen/*
-        - includes/api/v1/*
+    - includes/api/v1/*
-        - includes/libraries/*
+    - includes/libraries/*
 
 checks:
-    php:
+  php:
-        code_rating: true
+    code_rating: true
-        duplication: true
+    duplication: true

.travis.yml

@@ -14,10 +14,10 @@ matrix:
       env: WP_VERSION=latest WP_MULTISITE=0
 
 before_script:
-    - bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
+  - bash tests/bin/install.sh woocommerce_test root '' localhost $WP_VERSION
-    - bash tests/bin/travis.sh before
+  - bash tests/bin/travis.sh before
 
 script: phpunit -c phpunit.xml.dist
 
 after_script:
-    - bash tests/bin/travis.sh after
+  - bash tests/bin/travis.sh after

Gruntfile.js

@@ -27,27 +27,6 @@ module.exports = function( grunt ) {
 			]
 		},
 
-		// Compile all .less files.
-		less: {
-			compile: {
-				options: {
-					// These paths are searched for @imports
-					paths: ['<%= dirs.css %>/']
-				},
-				files: [{
-					expand: true,
-					cwd: '<%= dirs.css %>/',
-					src: [
-						'*.less',
-						'!woocommerce-base.less',
-						'!mixins.less'
-					],
-					dest: '<%= dirs.css %>/',
-					ext: '.css'
-				}]
-			}
-		},
-
 		// Minify .js files.
 		uglify: {
 			options: {
@@ -73,7 +52,7 @@ module.exports = function( grunt ) {
 					'<%= dirs.js %>/admin/jquery.flot.pie.min.js': ['<%= dirs.js %>/admin/jquery.flot.pie.js'],
 					'<%= dirs.js %>/admin/jquery.flot.resize.min.js': ['<%= dirs.js %>/admin/jquery.flot.resize.js'],
 					'<%= dirs.js %>/admin/jquery.flot.stack.min.js': ['<%= dirs.js %>/admin/jquery.flot.stack.js'],
-					'<%= dirs.js %>/admin/jquery.flot.time.min.js': ['<%= dirs.js %>/admin/jquery.flot.time.js'],
+					'<%= dirs.js %>/admin/jquery.flot.time.min.js': ['<%= dirs.js %>/admin/jquery.flot.time.js']
 				}
 			},
 			frontend: {
@@ -87,7 +66,23 @@ module.exports = function( grunt ) {
 					dest: '<%= dirs.js %>/frontend/',
 					ext: '.min.js'
 				}]
-			},
+			}
+		},
+
+		// Compile all .scss files.
+		sass: {
+			compile: {
+				options: {
+					sourcemap: 'none'
+				},
+				files: [{
+					expand: true,
+					cwd: '<%= dirs.css %>/',
+					src: ['*.scss'],
+					dest: '<%= dirs.css %>/',
+					ext: '.css'
+				}]
+			}
 		},
 
 		// Minify all .css files.
@@ -103,9 +98,9 @@ module.exports = function( grunt ) {
 
 		// Watch changes for assets.
 		watch: {
-			less: {
+			css: {
-				files: ['<%= dirs.css %>/*.less'],
+				files: ['<%= dirs.css %>/*.scss'],
-				tasks: ['less', 'cssmin']
+				tasks: ['sass', 'cssmin']
 			},
 			js: {
 				files: [
@@ -197,7 +192,7 @@ module.exports = function( grunt ) {
 			apigen: {
 				command: [
 					'cd apigen/',
-					'php apigen.php --source ../ --destination ../wc-apidocs --download yes --template-config ./templates/woodocs/config.neon --title "WooCommerce" --exclude "*/mijireh/*" --exclude "*/includes/libraries/*" --exclude "*/api/*" --exclude "*/i18n/*" --exclude "*/node_modules/*" --exclude "*/deploy/*" --exclude "*/apigen/*" --exclude "*/wc-apidocs/*"',
+					'php apigen.php --source ../ --destination ../wc-apidocs --download yes --template-config ./templates/woodocs/config.neon --title "WooCommerce" --exclude "*/mijireh/*" --exclude "*/includes/libraries/*" --exclude "*/api/*" --exclude "*/i18n/*" --exclude "*/node_modules/*" --exclude "*/deploy/*" --exclude "*/apigen/*" --exclude "*/wc-apidocs/*"'
 				].join( '&&' )
 			}
 		},
@@ -238,9 +233,9 @@ module.exports = function( grunt ) {
 	// Load NPM tasks to be used here
 	grunt.loadNpmTasks( 'grunt-shell' );
 	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-	grunt.loadNpmTasks( 'grunt-contrib-less' );
-	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
 	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
+	grunt.loadNpmTasks( 'grunt-contrib-sass' );
+	grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-contrib-copy' );
 	grunt.loadNpmTasks( 'grunt-contrib-clean' );
@@ -249,11 +244,15 @@ module.exports = function( grunt ) {
 
 	// Register tasks
 	grunt.registerTask( 'default', [
-		'less',
+		'css',
-		'cssmin',
 		'uglify'
 	]);
 
+	grunt.registerTask( 'css', [
+		'sass',
+		'cssmin'
+	]);
+
 	grunt.registerTask( 'docs', [
 		'clean:apigen',
 		'shell:apigen'

README.md

@@ -4,6 +4,11 @@ Welcome to the WooCommerce repository on GitHub. Here you can browse the source,
 
 If you are not a developer, please use the [WooCommerce plugin page](http://wordpress.org/plugins/woocommerce/) on WordPress.org.
 
+## Documentation
+* The [WooCommerce docs site](http://docs.woothemes.com/documentation/plugins/woocommerce/)
+* [WooCommerce API Docs](http://docs.woothemes.com/wc-apidocs/)
+* [WooCommerce REST API Docs](http://docs.woocommercev2.apiary.io/)
+
 ## 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 in the appropriate channels:
 
@@ -14,3 +19,5 @@ Support requests in issues on this repository will be closed on sight.
 
 ## Contributing to WooCommerce
 If you have a patch, or stumbled upon an issue with WooCommerce core, you can contribute this back to the code. Please read our [contributor guidelines](https://github.com/woothemes/woocommerce/blob/master/CONTRIBUTING.md) for more information how you can do this.
+
+If you have an idea for WooComerce, see the [Roadmap Trello board](https://trello.com/b/YgRbpuze/woocommerce-roadmap).

assets/css/_mixins.scss

@@ -0,0 +1,200 @@
+$woocommerce:   #ad74a2;
+$green:         #7ad03a;
+$red:           #a00;
+$orange:        #ffba00;
+$blue:          #2ea2cc;
+
+@mixin clearfix() {
+	*zoom: 1;
+
+	&:before,
+	&:after {
+		content: " ";
+		display: table;
+	}
+
+	&:after {
+		clear: both;
+	}
+}
+
+@mixin border_radius($radius: 4px) {
+	-webkit-border-radius:$radius;
+	border-radius:$radius;
+}
+
+@mixin border_radius_right($radius: 4px) {
+	-webkit-border-top-right-radius: $radius;
+	-webkit-border-bottom-right-radius: $radius;
+	border-top-right-radius: $radius;
+	border-bottom-right-radius: $radius;
+}
+
+@mixin border_radius_left($radius: 4px) {
+	-webkit-border-top-left-radius: $radius;
+	-webkit-border-bottom-left-radius: $radius;
+	border-top-left-radius: $radius;
+	border-bottom-left-radius: $radius;
+}
+
+@mixin border_radius_bottom($radius: 4px) {
+	-webkit-border-bottom-left-radius: $radius;
+	-webkit-border-bottom-right-radius: $radius;
+	border-bottom-left-radius: $radius;
+	border-bottom-right-radius: $radius;
+}
+
+@mixin border_radius_top($radius: 4px) {
+	-webkit-border-top-left-radius: $radius;
+	-webkit-border-top-right-radius: $radius;
+	border-top-left-radius: $radius;
+	border-top-right-radius: $radius;
+}
+
+@mixin opacity( $opacity: 0.75 ) {
+	filter: unquote("alpha(opacity=$opacity * 100)");
+	-moz-opacity: $opacity;
+	-khtml-opacity: $opacity;
+	opacity: $opacity;
+}
+
+@mixin box_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_in: 3px, $shadow_color: #888) {
+	box-shadow: $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
+	-webkit-box-shadow: $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
+}
+
+@mixin inset_box_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_in: 3px, $shadow_color: #888) {
+	box-shadow: inset $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
+	-webkit-box-shadow: inset $shadow_x $shadow_y $shadow_rad $shadow_in $shadow_color;
+}
+
+@mixin text_shadow($shadow_x: 3px, $shadow_y: 3px, $shadow_rad: 3px, $shadow_color: #fff) {
+	text-shadow: $shadow_x $shadow_y $shadow_rad $shadow_color;
+}
+
+@mixin vertical_gradient($from: #000, $to: #fff) {
+	background: $from;
+	background: -webkit-gradient(linear, left top, left bottom, from($from), to($to));
+	background: -webkit-linear-gradient($from, $to);
+	background: -moz-linear-gradient(center top, $from 0%, $to 100%);
+	background: -moz-gradient(center top, $from 0%, $to 100%);
+}
+
+@mixin transition($selector: all, $animation: ease-in-out, $duration: .2s) {
+	-webkit-transition: $selector $animation $duration;
+	-moz-transition: $selector $animation $duration;
+	-o-transition: $selector $animation $duration;
+	transition: $selector $animation $duration;
+}
+
+@mixin scale($ratio: 1.5) {
+	-webkit-transform: scale($ratio);
+	-moz-transform: scale($ratio);
+	-ms-transform: scale($ratio);
+	-o-transform: scale($ratio);
+	transform: scale($ratio);
+}
+
+@mixin borderbox() {
+	-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
+	-moz-box-sizing: border-box;    /* Firefox, other Gecko */
+	box-sizing: border-box;         /* Opera/IE 8+ */
+}
+
+@mixin darkorlighttextshadow($a, $opacity: .8) {
+    @if lightness($a) >= 65% {
+        @include text_shadow(0, -1px, 0, rgba(0, 0, 0, $opacity));
+    } @else {
+        @include text_shadow(0, 1px, 0, rgba(255, 255, 255, $opacity));
+    }
+}
+
+/**
+ * Objects
+ */
+@mixin menu() {
+	@include clearfix();
+
+	li {
+		display: inline-block;
+	}
+}
+
+@mixin mediaright() {
+	@include clearfix();
+
+	img {
+		float: right;
+		height: auto;
+	}
+}
+
+@mixin medialeft() {
+	@include clearfix();
+
+	img {
+		float: right;
+		height: auto;
+	}
+}
+
+@mixin ir() {
+	display: block;
+	text-indent: -9999px;
+	position: relative;
+	height: 1em;
+	width: 1em;
+}
+
+@mixin icon( $glyph: "\e001" ) {
+	font-family: 'WooCommerce';
+	speak: none;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	margin:0;
+	text-indent: 0;
+	position: absolute;
+	top:0;
+	left:0;
+	width:100%;
+	height: 100%;
+	text-align: center;
+	content: $glyph;
+}
+
+@mixin iconbefore( $glyph: "\e001" ) {
+	font-family: 'WooCommerce';
+	speak: none;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	margin-right:7px;
+	content: $glyph;
+}
+
+@mixin iconafter( $glyph: "\e001" ) {
+	font-family: 'WooCommerce';
+	speak: none;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	margin-left: 7px;
+	content: $glyph;
+}
+
+// Common styles.
+
+.clear {
+	clear: both;
+}
+
+.nobr {
+	white-space: nowrap;
+}

assets/css/_woocommerce-base.scss

@@ -0,0 +1,11 @@
+$primary:           #ad74a2;                                    // Primary colour for buttons (alt)
+$primarytext:       desaturate(lighten($primary, 50%), 18%);    // Text on primary colour bg
+
+$secondary:         desaturate(lighten($primary, 40%), 18%);    // Secondary buttons
+$secondarytext:     desaturate(darken($secondary, 60%), 18%);   // Text on secondary colour bg
+
+$highlight:         adjust-hue($primary, 150deg);               // Prices, In stock labels, sales flash
+$highlightext:      desaturate(lighten($highlight, 50%), 18%);  // Text on highlight colour bg
+
+$contentbg:         #fff;                                       // Content BG - Tabs (active state)
+$subtext:           #777;                                       // small, breadcrumbs etc

assets/css/admin.scss

@@ -1,6 +1,6 @@
 /* =Mixins
 -------------------------------------------------------------- */
-@import "mixins.less";
+@import "mixins";
 
 
 /* =Custom Font
@@ -160,13 +160,13 @@ table.wc_status_table {
 			background: transparent none;
 		}
 		mark.yes {
-			color: @green;
+			color: $green;
 		}
 		mark.no {
 			color: #999;
 		}
 		mark.error {
-			color: @red;
+			color: $red;
 		}
 		ul {
 			margin: 0;
@@ -279,104 +279,6 @@ ul.wc_coupon_list, .column-coupon_code {
 	overflow: hidden;
 	zoom: 1;
 	clear: both;
-	.code {
-		margin-right: 6px;
-	}
-	li.code {
-		margin: 0 6px 12px 0 !important;
-	}
-	.code, .code a, .code span {
-		&:before, &:after {
-			content: "";
-			display: block;
-			position: absolute;
-			width: 8px;
-			height: 4px;
-			background: #f7f7f7;
-			-webkit-border-radius:2px;
-			-moz-border-radius:2px;
-			-o-border-radius:2px;
-			border-radius:2px;
-			-moz-box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
-			-webkit-box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
-			box-shadow: 0 2px 0 0 rgba(255,255,255,0.3), inset 0 2px 0 0 rgba(0,0,0,0.1);
-		}
-	}
-	.code {
-		overflow: hidden;
-		vertical-align: middle;
-		margin: 0 8px 0 0;
-
-		background: #ececec;
-		color: #21759A;
-		text-shadow: 0 1px 0 #ddd;
-
-		padding: 2px;
-		position: relative;
-		float: left;
-		line-height: 1em;
-		-moz-box-shadow: 0 2px 0 0 #dddddd;
-		-webkit-box-shadow: 0 2px 0 0 #dddddd;
-		box-shadow: 0 2px 0 0 #dddddd;
-		font-weight: bold;
-
-		&:before {
-			bottom: 5px;
-			left: 0;
-			margin: 0 0 0 -4px;
-		}
-		&:after {
-			top: 5px;
-			left: 0;
-			margin: 0 0 0 -4px;
-		}
-		a, span {
-			float: left;
-			padding: 0 4px;
-			color: #21759A;
-			&:before {
-				bottom: 5px;
-				right: 0;
-				margin: 0 -4px 0 0;
-			}
-			&:after {
-				content: "";
-				top: 5px;
-				right: 0;
-				margin: 0 -4px 0 0;
-			}
-			span {
-				border: 1px dashed #ccc;
-				padding: .5em 6px;
-				-webkit-border-radius:2px;
-				-moz-border-radius:2px;
-				-o-border-radius:2px;
-				border-radius:2px;
-				&:before {
-					top: 50%;
-					left: 0;
-					margin: -2px 0 0 -4px;
-				}
-				&:after {
-					top: 50%;
-					right: 0;
-					margin: -2px -4px 0 0;
-				}
-			}
-		}
-
-		&:hover {
-			background: #975e83;
-			color: #fff;
-			text-shadow: 0 1px 0 #5a324b;
-			a, span {
-				color: #fff;
-				span {
-					border: 1px dashed #bb82a7;
-				}
-			}
-		}
-	}
 }
 ul.wc_coupon_list_block {
 	margin: 0;
@@ -401,7 +303,7 @@ ul.wc_coupon_list_block {
 
 /* Orders */
 .button.wc-reload {
-	.ir;
+	@include ir();
 	padding:0;
 	-webkit-border-radius:100%;
 	border-radius:100%;
@@ -409,7 +311,7 @@ ul.wc_coupon_list_block {
 	width:24px !important;
 	display: inline-block;
 	&:after {
-		.icon( "\e031" );
+		@include icon( "\e031" );
 		line-height: 22px;
 	}
 }
@@ -616,7 +518,7 @@ ul.wc_coupon_list_block {
 		background: #fff;
 		padding: 12px;
 		background:#f8f8f8;
-		.clearfix;
+		@include clearfix();
 		line-height: 2em;
 		text-align: right;
 		p {
@@ -685,7 +587,7 @@ ul.wc_coupon_list_block {
 			}
 		}
 		.refunded-total {
-			color: @red;
+			color: $red;
 		}
 	}
 	.refund-actions {
@@ -711,6 +613,11 @@ ul.wc_coupon_list_block {
 	.amount {
 		white-space: nowrap;
 	}
+	.add-items {
+		.description {
+			margin-right: 10px;
+		}
+	}
 }
 .woocommerce_order_items_wrapper {
 	margin: 0;
@@ -899,33 +806,33 @@ ul.wc_coupon_list_block {
 
 		tr.fee {
 			.thumb div {
-				.ir();
+				@include ir();
 				font-size: 14px;
 				margin: 6px;
 				&:before {
-					.icon( "\e007" );
+					@include icon( "\e007" );
 					color: #bbbbbb;
 				}
 			}
 		}
 		tr.refund {
 			.thumb div {
-				.ir();
+				@include ir();
 				font-size: 14px;
 				margin: 6px;
 				&:before {
-					.icon( "\e014" );
+					@include icon( "\e014" );
 					color: #bbbbbb;
 				}
 			}
 		}
 		tr.shipping {
 			.thumb div {
-				.ir();
+				@include ir();
 				font-size: 14px;
 				margin: 6px;
 				&:before {
-					.icon( "\e01a" );
+					@include icon( "\e01a" );
 					color: #bbbbbb;
 				}
 			}
@@ -936,13 +843,13 @@ ul.wc_coupon_list_block {
 		th.line_tax, td.line_tax {
 			padding: 8px 16px 8px 8px;
 			.delete-order-tax {
-				.ir;
+				@include ir();
 				font-size: 12px;
 				visibility: hidden;
 				float: right;
 				margin: 2px -16px 0 0;
 				&:before {
-					.icon( "\e013" );
+					@include icon( "\e013" );
 					color:white;
 					background-color: #000;
 					-webkit-border-radius:100%;
@@ -951,8 +858,8 @@ ul.wc_coupon_list_block {
 					box-shadow:0 1px 2px rgba(0,0,0,0.2);
 				}
 				&:hover:before {
-					border-color: @red;
+					border-color: $red;
-					background-color: @red;
+					background-color: $red;
 				}
 			}
 			&:hover {
@@ -963,7 +870,7 @@ ul.wc_coupon_list_block {
 		}
 		small.refunded {
 			display: block;
-			color: @red;
+			color: $red;
 			white-space: nowrap;
 		}
 	}
@@ -971,11 +878,11 @@ ul.wc_coupon_list_block {
 
 .wc-order-items-editable {
 	.edit-order-item {
-		.ir;
+		@include ir();
 		display: inline-block;
 		margin: 0 .5em 0 0;
 		&:before {
-			.icon;
+			@include icon;
 			content: "\e603";
 			color: #999;
 		}
@@ -987,17 +894,17 @@ ul.wc_coupon_list_block {
 	}
 	.delete-order-item,
 	.delete_refund {
-		.ir;
+		@include ir();
 		display: inline-block;
 		margin: 0;
 		&:before {
-			.icon;
+			@include icon;
 			content: "\e013";
 			color: #999;
 		}
 		&:hover {
 			&:before {
-				color: @red;
+				color: $red;
 			}
 		}
 	}
@@ -1123,23 +1030,23 @@ ul.wc_coupon_list_block {
 		width:45px;
 		text-align: center;
 		mark {
-			.ir;
+			@include ir();
 			background: none;
 			font-size: 1.4em;
 			margin: 0 auto;
 		}
 		mark.pending, mark.completed, mark.on-hold, mark.failed, mark.cancelled, mark.processing, mark.refunded {
 			&:after {
-				.icon;
+				@include icon;
 			}
 		}
 		mark.pending:after {
 			content: "\e012";
-			color: @orange;
+			color: $orange;
 		}
 		mark.completed:after {
 			content: "\e015";
-			color: @blue;
+			color: $blue;
 		}
 		mark.on-hold:after {
 			content: "\e033";
@@ -1151,7 +1058,7 @@ ul.wc_coupon_list_block {
 		}
 		mark.cancelled:after {
 			content: "\e013";
-			color: @red;
+			color: $red;
 		}
 		mark.processing:after {
 			content: "\e011";
@@ -1168,34 +1075,34 @@ ul.wc_coupon_list_block {
 }
 .column-customer_message {
 	.note-on {
-		.ir;
+		@include ir();
 		margin:0 auto;
 		color: #999;
 		&:after {
-			.icon( "\e026" );
+			@include icon( "\e026" );
 			line-height: 16px;
 		}
 	}
 }
 .column-order_notes {
 	.note-on {
-		.ir;
+		@include ir();
 		margin:0 auto;
 		color: #999;
 		&:after {
-			.icon( "\e027" );
+			@include icon( "\e027" );
 			line-height: 16px;
 		}
 	}
 }
 .order_actions {
 	.processing, .complete, .view {
-		.ir;
+		@include ir();
 		padding:0 !important;
 		height: 2em !important;
 		width:2em;
 		&:after {
-			.icon;
+			@include icon;
 			line-height: 1.85;
 		}
 	}
@@ -1211,12 +1118,12 @@ ul.wc_coupon_list_block {
 }
 .user_actions {
 	.edit, .link, .view {
-		.ir;
+		@include ir();
 		padding:0 !important;
 		height: 2em !important;
 		width:2em;
 		&:after {
-			.icon;
+			@include icon;
 			line-height: 1.85;
 		}
 	}
@@ -1242,12 +1149,12 @@ ul.wc_coupon_list_block {
 	.attribute-actions {
 		width:2em;
 		.configure-terms {
-			.ir;
+			@include ir();
 			padding:0 !important;
 			height: 2em !important;
 			width:2em;
 			&:after {
-				.icon("\e01c");
+				@include icon("\e01c");
 				line-height: 1.85;
 			}
 		}
@@ -1278,7 +1185,7 @@ ul.order_notes {
 			}
 		}
 		a.delete_note {
-			color: @red
+			color: $red
 		}
 		.note_content:after {
 		  content: "";
@@ -1368,10 +1275,10 @@ table.wp-list-table {
 		text-align: left !important;
 	}
 	span.wc-image, span.wc-featured, span.wc-type {
-		.ir;
+		@include ir();
 		margin:0 auto;
 		&:before {
-			.icon( "\e00c" );
+			@include icon( "\e00c" );
 		}
 	}
 	span.wc-featured {
@@ -1398,10 +1305,10 @@ table.wp-list-table {
 		}
 	}
 	span.product-type {
-		.ir;
+		@include ir();
 		font-size:1.2em;
 		&:before {
-			.icon( "\e006" );
+			@include icon( "\e006" );
 		}
 		&.grouped:before {
 			content: "\e002";
@@ -1421,7 +1328,7 @@ table.wp-list-table {
 	}
 	mark.instock {
 		font-weight: bold;
-		color: @green;
+		color: $green;
 		background: transparent none;
 		line-height: 1;
 	}
@@ -1432,11 +1339,11 @@ table.wp-list-table {
 		line-height: 1;
 	}
 	.order-notes_head, .notes_head, .status_head {
-		.ir;
+		@include ir();
 		margin:0 auto;
 
 		&:after {
-			.icon;
+			@include icon;
 		}
 	}
 	.order-notes_head:after {
@@ -1472,7 +1379,7 @@ table.wp-list-table {
 /* Settings */
 mark.notice {
 	background: #fff;
-	color: @red;
+	color: $red;
 	margin: 0 0 0 10px;
 }
 a.export_rates, a.import_rates {
@@ -1484,7 +1391,7 @@ a.export_rates, a.import_rates {
 table.wc_tax_rates, table.wc_input_table {
 	width: 100%;
 	span.tips {
-		color: @blue;
+		color: $blue;
 	}
 	td {
 		padding: 0;
@@ -1625,12 +1532,12 @@ img.help_tip {
 
 .status-enabled, .status-disabled {
 	font-size:1.4em;
-	.ir;
+	@include ir();
 }
 .status-enabled {
 	&:before {
-		.icon( "\e015" );
+		@include icon( "\e015" );
-		color: @woocommerce;
+		color: $woocommerce;
 	}
 }
 
@@ -1679,7 +1586,7 @@ img.help_tip {
 		}
 		span.help_tip {
 			cursor: help;
-			color: @blue;
+			color: $blue;
 		}
 		th {
 			position: relative;
@@ -1813,7 +1720,7 @@ img.help_tip {
 		#product_images_container {
 			padding: 0 0 0 9px;
 			ul {
-				.clearfix;
+				@include clearfix();
 				margin: 0;
 				padding: 0;
 				li.image, li.add, li.wc-metabox-sortable-placeholder {
@@ -1840,7 +1747,7 @@ img.help_tip {
 					border: 3px dashed #dddddd;
 					position: relative;
 					&:after {
-						.icon( "\e00c" );
+						@include icon( "\e00c" );
 						font-size:2.618em;
 						line-height: 72px;
 						color: #ddd;
@@ -1867,19 +1774,19 @@ img.help_tip {
 							}
 						}
 						a.view {
-							.ir;
+							@include ir();
 							font-size:1.4em;
 							&:before {
-								.icon( "\e00c" );
+								@include icon( "\e00c" );
 								background-color: #000;
 								color: #fff;
 							}
 						}
 						a.delete {
-							.ir;
+							@include ir();
 							font-size:1.4em;
 							&:before {
-								.icon( "\e013" );
+								@include icon( "\e013" );
 								color:white;
 								background-color: #000;
 								-webkit-border-radius:100%;
@@ -1887,7 +1794,7 @@ img.help_tip {
 								box-shadow:0 1px 2px rgba(0,0,0,0.2);
 							}
 							&:hover:before {
-								background-color: @red;
+								background-color: $red;
 							}
 						}
 					}
@@ -2016,7 +1923,7 @@ img.help_tip {
 				border-bottom: 1px solid #f5f5f5;
 				border-top: 1px solid #eaeaea;
 				&:before {
-					.iconbefore( "\e028" );
+					@include iconbefore( "\e028" );
 				}
 			}
 
@@ -2110,7 +2017,7 @@ img.help_tip {
 		}
 
 		.add.button:before {
-			.iconbefore( "\e007" );
+			@include iconbefore( "\e007" );
 		}
 	}
 	h4.wc-settings-sub-title {
@@ -2209,15 +2116,15 @@ img.help_tip {
 					cursor: pointer;
 				}
 				.delete {
-					.ir;
+					@include ir();
 					&:before {
-						.icon;
+						@include icon;
 						content: "\e013";
 						color: #999;
 					}
 					&:hover {
 						&:before {
-							color: @red;
+							color: $red;
 						}
 					}
 				}
@@ -2279,7 +2186,7 @@ img.help_tip {
 		.req {
 			font-weight: bold;
 			font-style: normal;
-			color: @red;
+			color: $red;
 		}
 	}
 	.description {
@@ -2537,7 +2444,7 @@ img.help_tip {
 		line-height: 22px;
 		text-decoration: none;
 		&:before {
-			.iconbefore( "\e036" );
+			@include iconbefore( "\e036" );
 			font-size: .8em;
 			color: #999;
 		}
@@ -2830,7 +2737,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 				display: block;
 				text-decoration: none;
 				&:before {
-					.iconbefore( "\e00a" );
+					@include iconbefore( "\e00a" );
 					margin-right:4px;
 				}
 			}
@@ -2918,7 +2825,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 					border-right-width: 0;
 					padding: 10px;
 					margin:0;
-					color: @blue;
+					color: $blue;
 					border-top-width:0;
 					background-image: -webkit-gradient(linear,left bottom,left top,from(#ececec),to(#f9f9f9));
 					background-image: -webkit-linear-gradient(bottom,#ececec,#f9f9f9);
@@ -2926,7 +2833,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 					background-image: -o-linear-gradient(bottom,#ececec,#f9f9f9);
 					background-image: linear-gradient(to top,#ececec,#f9f9f9);
 					&.section_title:hover {
-						color:@red;
+						color:$red;
 					}
 				}
 				.section_title {
@@ -2934,7 +2841,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 					span {
 						display: block;
 						&:after {
-							.iconafter( "\e035" );
+							@include iconafter( "\e035" );
 							float: right;
 							font-size:.9em;
 							line-height: 1.618;
@@ -3032,7 +2939,7 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 				&:hover {
 					box-shadow:
 						inset 0 -1px 0 0 #dfdfdf,
-						inset 300px 0 0 fade(#9c5d90,10%);
+						inset 300px 0 0 rgba(156, 93, 144, 0.1);
 					border-right: 5px solid #9c5d90 !important;
 					padding-left:1.5em;
 					color: #9c5d90;
@@ -3117,12 +3024,12 @@ img.ui-datepicker-trigger { vertical-align: middle; margin-top: -1px; cursor: po
 	.column-wc_actions {
 		a.edit,
 		a.view {
-			.ir;
+			@include ir();
 			padding:0 !important;
 			height: 2em !important;
 			width:2em;
 			&:after {
-				.icon;
+				@include icon;
 				line-height: 1.85;
 			}
 		}
@@ -3343,7 +3250,7 @@ table.bar_chart {
 	}
 }
 
-@import 'chosen.less';
+@import 'chosen';
 
 .chosen-container-single .chosen-single {
 	abbr {

assets/css/dashboard.css

@@ -1 +1 @@
-.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format('embedded-opentype'),url(../fonts/WooCommerce.woff) format('woff'),url(../fonts/WooCommerce.ttf) format('truetype'),url(../fonts/WooCommerce.svg#WooCommerce) format('svg');font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"\e001";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}
+@charset "UTF-8";.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}ul.woocommerce_stats{overflow:hidden;zoom:1}ul.woocommerce_stats li{width:25%;padding:0 1em;float:left;font-size:.8em;border-left:1px solid #fff;border-right:1px solid #ececec;text-align:center;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}ul.woocommerce_stats li:first-child{border-left:0}ul.woocommerce_stats li:last-child{border-right:0}ul.woocommerce_stats strong{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:4em;line-height:1.2em;font-weight:400;text-align:center;display:block}#woocommerce_dashboard_status .inside{padding:0;margin:0}#woocommerce_dashboard_status .wc_status_list{overflow:hidden;margin:0}#woocommerce_dashboard_status .wc_status_list li{width:50%;float:left;padding:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin:0;border-top:1px solid #ececec;color:#aaa}#woocommerce_dashboard_status .wc_status_list li a{display:block;color:#aaa;padding:9px 12px;-webkit-transition:all ease .5s;position:relative;font-size:12px}#woocommerce_dashboard_status .wc_status_list li a .wc_sparkline{width:4em;height:2em;display:block;float:right;position:absolute;right:0;top:50%;margin-right:12px;margin-top:-1.25em}#woocommerce_dashboard_status .wc_status_list li a strong{font-size:18px;line-height:1.2em;font-weight:400;display:block;color:#21759b}#woocommerce_dashboard_status .wc_status_list li a:hover{color:#2ea2cc}#woocommerce_dashboard_status .wc_status_list li a:hover strong,#woocommerce_dashboard_status .wc_status_list li a:hover:before{color:#2ea2cc!important}#woocommerce_dashboard_status .wc_status_list li a:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0 12px 12px 0;text-indent:0;top:0;left:0;height:100%;text-align:center;content:"";font-size:2em;position:relative;width:auto;line-height:1.2em;color:#464646;float:left}#woocommerce_dashboard_status .wc_status_list li:first-child{border-top:0}#woocommerce_dashboard_status .wc_status_list li.sales-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.sales-this-month a:before{content:"\e01f"}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month{width:100%}#woocommerce_dashboard_status .wc_status_list li.best-seller-this-month a:before{content:"\e006"}#woocommerce_dashboard_status .wc_status_list li.processing-orders{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.processing-orders a:before{content:"\e011";color:#7ad03a}#woocommerce_dashboard_status .wc_status_list li.on-hold-orders a:before{content:"\e033";color:#999}#woocommerce_dashboard_status .wc_status_list li.low-in-stock{border-right:1px solid #ececec}#woocommerce_dashboard_status .wc_status_list li.low-in-stock a:before{content:"\e02c";color:#ffba00}#woocommerce_dashboard_status .wc_status_list li.out-of-stock a:before{content:"\e02c";color:#a00}#woocommerce_dashboard_recent_reviews li{line-height:1.5em;margin-bottom:12px}#woocommerce_dashboard_recent_reviews h4.meta{line-height:1.4;margin:-.2em 0 0;font-weight:400;color:#999}#woocommerce_dashboard_recent_reviews blockquote{padding:0;margin:0}#woocommerce_dashboard_recent_reviews .avatar{float:left;margin:0 10px 5px 0}#woocommerce_dashboard_recent_reviews .star-rating{float:right;overflow:hidden;position:relative;height:1.5em;line-height:1.5;margin-left:.5em;width:5.4em;font-family:WooCommerce!important}#woocommerce_dashboard_recent_reviews .star-rating:before{content:"\e021\e021\e021\e021\e021";color:#b3b3b3;float:left;top:0;left:0;position:absolute;letter-spacing:.1em}#woocommerce_dashboard_recent_reviews .star-rating span{overflow:hidden;float:left;top:0;left:0;position:absolute;padding-top:1.5em}#woocommerce_dashboard_recent_reviews .star-rating span:before{content:"\e020\e020\e020\e020\e020";top:0;position:absolute;left:0;letter-spacing:.1em;color:#9c5d90}#dash-right-now li.product-count a:before{font-family:WooCommerce;content:"\e01d"}

assets/css/dashboard.scss

@@ -1,4 +1,4 @@
-@import 'mixins.less';
+@import 'mixins';
 
 @font-face {
 	font-family: 'WooCommerce';
@@ -99,7 +99,7 @@ ul.woocommerce_stats {
 				}
 
 				&:before {
-					.icon();
+					@include icon();
 					font-size: 2em;
 					position: relative;
 					width: auto;
@@ -132,7 +132,7 @@ ul.woocommerce_stats {
 			border-right: 1px solid #ececec;
 			a:before {
 				content: "\e011";
-				color: @green;
+				color: $green;
 			}
 		}
 		li.on-hold-orders {
@@ -145,13 +145,13 @@ ul.woocommerce_stats {
 			border-right: 1px solid #ececec;
 			a:before {
 				content: "\e02c";
-				color: @orange;
+				color: $orange;
 			}
 		}
 		li.out-of-stock {
 			a:before {
 				content: "\e02c";
-				color: @red;
+				color: $red;
 			}
 		}
 	}
@@ -187,7 +187,7 @@ ul.woocommerce_stats {
 		font-family: 'WooCommerce' !important;
 		&:before {
 			content: "\e021\e021\e021\e021\e021";
-			color: darken( #ccc, 10 );
+			color: darken( #ccc, 10% );
 			float: left;
 			top: 0;
 			left: 0;

assets/css/menu.css

@@ -1 +1 @@
-.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format('embedded-opentype'),url(../fonts/WooCommerce.woff) format('woff'),url(../fonts/WooCommerce.ttf) format('truetype'),url(../fonts/WooCommerce.svg#WooCommerce) format('svg');font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"\e01d";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}
+@charset "UTF-8";.clear{clear:both}.nobr{white-space:nowrap}@font-face{font-family:WooCommerce;src:url(../fonts/WooCommerce.eot);src:url(../fonts/WooCommerce.eot?#iefix) format("embedded-opentype"),url(../fonts/WooCommerce.woff) format("woff"),url(../fonts/WooCommerce.ttf) format("truetype"),url(../fonts/WooCommerce.svg#WooCommerce) format("svg");font-weight:400;font-style:normal}#adminmenu #toplevel_page_woocommerce .menu-icon-generic div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e03d";font-size:1.3em!important}#adminmenu #menu-posts-product .menu-icon-post div.wp-menu-image:before{font-family:WooCommerce!important;content:"\e01d";font-size:1.3em!important}span.mce_woocommerce_shortcodes_button{background-image:none!important;display:block;text-indent:-9999px;position:relative;height:1em;width:1em}span.mce_woocommerce_shortcodes_button:before{font-family:WooCommerce;speak:none;font-weight:400;font-variant:normal;text-transform:none;-webkit-font-smoothing:antialiased;margin:0;text-indent:0;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;content:"";font-size:.9em;line-height:1.2}.wc_plugin_upgrade_notice{font-weight:400;color:#fff;background:#d54d21;padding:1em;margin:9px 0}.wc_plugin_upgrade_notice a{color:#fff;text-decoration:underline}.wc_plugin_upgrade_notice:before{content:"\f348";display:inline-block;font:400 18px/1 dashicons;speak:none;margin:0 8px 0 -2px;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;vertical-align:top}

assets/css/menu.scss

@@ -1,6 +1,6 @@
 /* =Mixins
 -------------------------------------------------------------- */
-@import "mixins.less";
+@import 'mixins';
 
 /* Icon Font */
 @font-face {
@@ -28,9 +28,9 @@
 
 span.mce_woocommerce_shortcodes_button {
 	background-image: none !important;
-	.ir;
+	@include ir();
 	&:before {
-		.icon( "\e01d" );
+		@include icon( "\e01d" );
 		font-size:.9em;
 		line-height: 1.2;
 	}

assets/css/mixins.less

@@ -1,166 +0,0 @@
-@woocommerce:   #ad74a2;
-@green:         #7ad03a;
-@red:           #a00;
-@orange:        #ffba00;
-@blue:          #2ea2cc;
-
-.clearfix() {
-	*zoom:1;
-	&:before,
-	&:after {
-		content: " ";
-		display: table;
-	}
-	&:after {
-		clear: both;
-	}
-}
-.border_radius(@radius:4px) {
-	-webkit-border-radius:@radius;
-	border-radius:@radius;
-}
-.border_radius_right(@radius:4px) {
-	-webkit-border-top-right-radius: @radius;
-	-webkit-border-bottom-right-radius: @radius;
-	border-top-right-radius: @radius;
-	border-bottom-right-radius: @radius;
-}
-.border_radius_left(@radius:4px) {
-	-webkit-border-top-left-radius: @radius;
-	-webkit-border-bottom-left-radius: @radius;
-	border-top-left-radius: @radius;
-	border-bottom-left-radius: @radius;
-}
-.border_radius_bottom(@radius:4px) {
-	-webkit-border-bottom-left-radius: @radius;
-	-webkit-border-bottom-right-radius: @radius;
-	border-bottom-left-radius: @radius;
-	border-bottom-right-radius: @radius;
-}
-.border_radius_top(@radius:4px) {
-	-webkit-border-top-left-radius: @radius;
-	-webkit-border-top-right-radius: @radius;
-	border-top-left-radius: @radius;
-	border-top-right-radius: @radius;
-}
-.opacity(@opacity:0.75) {
-	filter:~"alpha(opacity=@opacity * 100)";
-	-moz-opacity:@opacity;
-	-khtml-opacity: @opacity;
-	opacity: @opacity;
-}
-.box_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_in:3px, @shadow_color:#888) {
-	box-shadow:@shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-	-webkit-box-shadow:@shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-}
-.inset_box_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_in:3px, @shadow_color:#888) {
-	box-shadow:inset @shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-	-webkit-box-shadow:inset @shadow_x @shadow_y @shadow_rad @shadow_in @shadow_color;
-}
-.text_shadow(@shadow_x:3px, @shadow_y:3px, @shadow_rad:3px, @shadow_color:#fff) {
-	text-shadow:@shadow_x @shadow_y @shadow_rad @shadow_color;
-}
-.vertical_gradient(@from: #000, @to: #FFF) {
-	background: @from;
-	background: -webkit-gradient(linear, left top, left bottom, from(@from), to(@to));
-	background: -webkit-linear-gradient(@from, @to);
-	background: -moz-linear-gradient(center top, @from 0%, @to 100%);
-	background: -moz-gradient(center top, @from 0%, @to 100%);
-}
-.transition(@selector:all, @animation:ease-in-out, @duration:.2s) {
-	-webkit-transition:@selector @animation @duration;
-	-moz-transition:@selector @animation @duration;
-	-o-transition:@selector @animation @duration;
-	transition:@selector @animation @duration;
-}
-
-.scale(@ratio:1.5){
-	-webkit-transform:scale(@ratio);
-	-moz-transform:scale(@ratio);
-	-ms-transform:scale(@ratio);
-	-o-transform:scale(@ratio);
-	transform:scale(@ratio);
-}
-
-.borderbox () {
-	-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-	-moz-box-sizing: border-box;    /* Firefox, other Gecko */
-	box-sizing: border-box;         /* Opera/IE 8+ */
-}
-
-.clear { clear: both; }
-.nobr { white-space: nowrap; }
-
-.darkorlighttextshadow ( @a, @opacity: 0.8 ) when (lightness(@a) >= 65%) { .text_shadow( 0, -1px, 0, rgba(0,0,0,@opacity) ); }
-.darkorlighttextshadow ( @a, @opacity: 0.8 ) when (lightness(@a) < 65%) { .text_shadow( 0, 1px, 0, rgba(255,255,255,@opacity) ); }
-
-/**
- * Objects
- */
-.menu() {
-	.clearfix;
-	li {
-		display: inline-block;
-	}
-}
-.mediaright() {
-	.clearfix;
-	img {
-		float:right;
-		height:auto;
-	}
-}
-.medialeft() {
-	.clearfix;
-	img {
-		float:right;
-		height:auto;
-	}
-}
-.ir() {
-	display: block;
-	text-indent: -9999px;
-	position: relative;
-	height:1em;
-	width:1em;
-}
-.icon( @glyph: "\e001" ) {
-	font-family: 'WooCommerce';
-	speak: none;
-	font-weight: normal;
-	font-variant: normal;
-	text-transform: none;
-	line-height: 1;
-	-webkit-font-smoothing: antialiased;
-	margin:0;
-	text-indent: 0;
-	position: absolute;
-	top:0;
-	left:0;
-	width:100%;
-	height: 100%;
-	text-align: center;
-	content: @glyph;
-}
-.iconbefore( @glyph: "\e001" ) {
-	font-family: 'WooCommerce';
-	speak: none;
-	font-weight: normal;
-	font-variant: normal;
-	text-transform: none;
-	line-height: 1;
-	-webkit-font-smoothing: antialiased;
-	margin-right:7px;
-	content: @glyph;
-}
-.iconafter( @glyph: "\e001" ) {
-	font-family: 'WooCommerce';
-	speak: none;
-	font-weight: normal;
-	font-variant: normal;
-	text-transform: none;
-	line-height: 1;
-	-webkit-font-smoothing: antialiased;
-	margin-left:7px;
-	content: @glyph;
-}

assets/css/prettyPhoto.scss

@@ -1,4 +1,4 @@
-@import 'mixins.less';
+@import 'mixins';
 
 // Load the WooCommerce font
 @font-face {
@@ -12,9 +12,9 @@
 	font-style: normal;
 }
 
-// Functions
+// Mixins
-.button() {
+@mixin button() {
-	.border_radius(100%);
+	@include border_radius(100%);
 	height:1em;
 	width:1em;
 	text-shadow:0 1px 2px rgba(0,0,0,0.5);
@@ -22,7 +22,7 @@
 	color: #fff !important;
 	font-size:16px !important;
 	line-height: 1em;
-	.transition;
+	@include transition();
 	&:hover {
 		background-color: #000;
 	}
@@ -32,10 +32,10 @@
 div.pp_woocommerce {
 	.pp_content_container {
 		background: #fff;
-		.border_radius(3px);
+		@include border_radius(3px);
-		.box_shadow(0,1px,30px,0,rgba(0,0,0,0.25));
+		@include box_shadow(0,1px,30px,0,rgba(0,0,0,0.25));
 		padding:20px 0;
-		.clearfix;
+		@include clearfix();
 	}
 	.pp_loaderIcon {
 		background: url(../images/ajax-loader.gif) center no-repeat;
@@ -49,8 +49,8 @@ div.pp_woocommerce {
 				a {
 					border:1px solid rgba(0,0,0,0.5);
 					background: #fff;
-					.box_shadow(0,1px,2px,0,rgba(0,0,0,0.2));
+					@include box_shadow(0,1px,2px,0,rgba(0,0,0,0.2));
-					.border_radius(2px);
+					@include border_radius(2px);
 					display: block;
 					&:hover {
 						border-color:#000;
@@ -68,7 +68,7 @@ div.pp_woocommerce {
 	// Next / Previous
 	.pp_previous, .pp_next {
 		&:before {
-			.button;
+			@include button();
 			font-family: 'WooCommerce';
 			content: "\e00b";
 			text-indent: 0;
@@ -114,7 +114,7 @@ div.pp_woocommerce {
 		position: relative;
 	}
 	.pp_close {
-		.button;
+		@include button();
 		top:-.5em;
 		right:-.5em;
 		font-size:1.618em !important;
@@ -133,7 +133,7 @@ div.pp_woocommerce {
 	}
 	// Buttons
 	.pp_arrow_previous, .pp_arrow_next {
-		.button;
+		@include button();
 		position: relative;
 		margin-top:-1px;
 		&:before {
@@ -159,7 +159,7 @@ div.pp_woocommerce {
 		}
 	}
 	a.pp_expand, a.pp_contract {
-		.button;
+		@include button();
 		right:auto;
 		left:-.5em;
 		top:-.5em;
@@ -202,7 +202,7 @@ div.pp_woocommerce {
 	div.pp_woocommerce {
 		left: 5% !important;
 		right:5% !important;
-		.borderbox;
+		@include borderbox();
 		width: 90% !important;
 		.pp_gallery, .pp_previous, .pp_next, .pp_expand, .pp_contract {
 			display: none !important;
@@ -228,10 +228,12 @@ div.pp_woocommerce {
 	}
 	.pp_content {
 		width:100% !important;
-		img {
+        #pp_full_res{
-			width:100% !important;
+          & > img{
-			height:auto !important;
+            width:100% !important;
-		}
+            height:auto !important;
+          }
+        }
 	}
 	.currentTextHolder {
 		line-height: 3;

assets/css/woocommerce-base.less

@@ -1,11 +0,0 @@
-@primary:           #ad74a2;                                    /* Primary colour for buttons (alt) */
-@primarytext:       desaturate(lighten(@primary,50%),18%);      /* Text on primary colour bg */
-
-@secondary:         desaturate(lighten(@primary,40%),18%);      /* Secondary buttons */
-@secondarytext:     desaturate(darken(@secondary,60%),18%);     /* Text on secondary colour bg */
-
-@highlight:         spin( @primary, 150 );                      /* Prices, In stock labels, sales flash */
-@highlightext:      desaturate(lighten(@highlight,50%),18%);    /* Text on highlight colour bg */
-
-@contentbg:         #fff;                                       /* Content BG - Tabs (active state) */
-@subtext:           #777;                                       /* small, breadcrumbs etc */

assets/css/woocommerce-layout.scss

@@ -1,5 +1,5 @@
-@import "mixins.less";
+@import 'mixins';
-@import "woocommerce-base.less"; /* Contains base colours like @primary */
+@import 'woocommerce-base'; // Contains base colours like $primary
 
 .woocommerce, .woocommerce-page {
 
@@ -7,7 +7,7 @@
 	-------------------------------------------------------------- */
 
 	.col2-set {
-		.clearfix;
+		@include clearfix();
 		width: 100%;
 		.col-1 {
 			float:left;
@@ -33,7 +33,7 @@
 			width: 48%;
 		}
 		div.thumbnails {
-			.clearfix;
+			@include clearfix();
 			a {
 				float:left;
 				width: 30.75%;
@@ -54,12 +54,12 @@
 		.woocommerce-tabs {
 			clear:both;
 			ul.tabs {
-				.menu;
+				@include menu();
 			}
 		}
 		#reviews {
 			.comment {
-				.mediaright;
+				@include mediaright();
 			}
 		}
 	}
@@ -74,7 +74,9 @@
 	-------------------------------------------------------------- */
 
 	.related, .upsells.products {
-		.clearfix();
+		@include clearfix();
+		clear: both;
+
 		ul.products, ul {
 			float:none;
 			li.product {
@@ -89,7 +91,7 @@
 
 	ul.products {
 		clear:both;
-		.clearfix;
+		@include clearfix();
 		li.product {
 			float:left;
 			margin: 0 3.8% 2.992em 0;
@@ -156,7 +158,7 @@
 
 	.woocommerce-pagination {
 		ul.page-numbers {
-			.menu;
+			@include menu();
 		}
 	}
 
@@ -182,7 +184,7 @@
 	}
 
 	.cart-collaterals {
-		.clearfix;
+		@include clearfix();
 		width: 100%;
 		.related {
 			width: 30.75%;
@@ -203,7 +205,7 @@
 		}
 		.shipping_calculator {
 			width: 48%;
-			.clearfix;
+			@include clearfix();
 			clear: right;
 			float: right;
 			.col2-set {
@@ -224,7 +226,7 @@
 
 	ul.cart_list, ul.product_list_widget {
 		li {
-			.mediaright;
+			@include mediaright();
 		}
 	}
 
@@ -233,7 +235,7 @@
 
 	form {
 		.form-row {
-			.clearfix;
+			@include clearfix();
 			label {
 				display:block;
 				&.checkbox {
@@ -244,7 +246,7 @@
 				width: 100%;
 			}
 			.input-text {
-				.borderbox;
+				@include borderbox();
 				width:100%;
 			}
 		}

assets/css/woocommerce-smallscreen.scss

@@ -2,7 +2,7 @@
  * This stylesheet optimises the default WooCommerce layout when viewed on smaller screens.
  */
 
-@import "mixins.less";
+@import 'mixins';
 
 .woocommerce, .woocommerce-page {
 
@@ -53,12 +53,12 @@
 			text-align: left;
 			.coupon {
 				float:none;
-				.clearfix;
+				@include clearfix();
 				padding-bottom:.5em;
 			}
 			input, .button, .input-text {
 				width:48%;
-				.borderbox;
+				@include borderbox();
 			}
 			.input-text + .button, .button.alt {
 				float: right;
@@ -93,7 +93,7 @@
 		#place_order {
 			float: none;
 			width:100%;
-			.borderbox;
+			@include borderbox();
 			margin-bottom:1em;
 		}
 	}

assets/css/woocommerce.scss

@@ -1,10 +1,10 @@
-@import "mixins.less";
+@import 'mixins';
-@import "woocommerce-base.less"; /* Contains base colours like @primary */
+@import 'woocommerce-base'; // Contains base colours like $primary
 
-/* Colours */
+// Colours
-@tertiary:       @primary;                                    /* Price slider bar / layered nav UI */
+$tertiary:       $primary;                                    // Price slider bar / layered nav UI
-@tertiarytext:   @primarytext;                                /* Text on tertiary colour bg */
+$tertiarytext:   $primarytext;                                // Text on tertiary colour bg
-@quaternary:     desaturate( darken( @tertiary, 45%), 40% );  /* Price slider bg */
+$quaternary:     desaturate(darken($tertiary, 45%), 40%);  // Price slider bg
 
 /* =Custom Font
 -------------------------------------------------------------- */
@@ -41,11 +41,11 @@ p.demo_store {
 	font-size: 1em;
 	padding: .5em 0;
 	text-align: center;
-	.vertical_gradient( @primary, darken(@primary, 10) );
+	@include vertical_gradient( $primary, darken($primary, 10%) );
-	border: 1px solid darken(@primary, 10);
+	border: 1px solid darken($primary, 10%);
-	color: @primarytext;
+	color: $primarytext;
 	z-index: 99998;
-	.inset_box_shadow( 0, 0, 0, 3px, rgba(255,255,255,0.2) );
+	@include inset_box_shadow( 0, 0, 0, 3px, rgba(255,255,255,0.2) );
 }
 
 .admin-bar { // Styles applied when the admin bar is present
@@ -58,13 +58,13 @@ p.demo_store {
 -------------------------------------------------------------- */
 .wc-forward, .wc-forward a {
 	&:after {
-		.iconafter( "\e029" );
+		@include iconafter( "\e029" );
 		font-size:.75em;
 	}
 }
 .wc-backward, .wc-backward a {
 	&:before {
-		.iconbefore( "\e02f" );
+		@include iconbefore( "\e02f" );
 		font-size:.75em;
 	}
 }
@@ -77,12 +77,12 @@ p.demo_store {
 		padding: 1em 1em 1em 3.5em !important;
 		margin: 0 0 2em !important;
 		position: relative;
-		.border_radius(4px);
+		@include border_radius(4px);
-		.vertical_gradient( lighten( @secondary, 2 ), @secondary );
+		@include vertical_gradient( lighten( $secondary, 2% ), $secondary );
-		color: @secondarytext;
+		color: $secondarytext;
-		.text_shadow( 0, 1px, 0, lighten( @secondary, 4 ) );
+		@include text_shadow( 0, 1px, 0, lighten( $secondary, 4% ) );
 		list-style:none outside !important;
-		.clearfix();
+		@include clearfix();
 		width: auto;
 		-webkit-box-shadow:
 			inset 0 -2px 6px rgba(0,0,0,0.05),
@@ -110,8 +110,8 @@ p.demo_store {
 			color: #fff;
 			text-shadow:0 1px 0 rgba(0,0,0,0.2);
 			padding-top:1em;
-			.border_radius_bottom(4px);
+			@include border_radius_bottom(4px);
-			.inset_box_shadow(0,-1px,0,0,rgba(0,0,0,0.1));
+			@include inset_box_shadow(0,-1px,0,0,rgba(0,0,0,0.1));
 		}
 
 		.button {
@@ -152,20 +152,20 @@ p.demo_store {
 
 	small.note {
 		display:block;
-		color: @subtext;
+		color: $subtext;
 		font-size: 11px;
 		line-height: 21px;
 		margin-top: 10px;
 	}
 
 	.woocommerce-breadcrumb{
-		.clearfix();
+		@include clearfix();
 		margin: 0 0 1em;
 		padding: 0;
 		font-size: 0.92em;
-		color: @subtext;
+		color: $subtext;
 		a {
-			color: @subtext;
+			color: $subtext;
 		}
 	}
 
@@ -185,14 +185,14 @@ p.demo_store {
 
 		/* Price */
 		span.price, p.price {
-			color: @highlight;
+			color: $highlight;
 			font-size: 1.25em;
 			ins {
 				background: inherit;
 			}
 			del {
 				font-size: 0.67em;
-				color:fade( desaturate( @highlight, 75% ), 50% );
+				color: rgba(desaturate($highlight, 75%), 0.5);
 			}
 		}
 
@@ -201,7 +201,7 @@ p.demo_store {
 			font-size: 0.92em;
 		}
 		.stock {
-			color: @highlight;
+			color: $highlight;
 		}
 		.out-of-stock {
 			color: red;
@@ -214,8 +214,8 @@ p.demo_store {
 				display:block;
 				width: 100%;
 				height:auto;
-				.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
+				@include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
-				.transition();
+				@include transition();
 			}
 			div.thumbnails {
 				padding-top: 1em;
@@ -258,12 +258,12 @@ p.demo_store {
 				position: relative;
 
 				li {
-					border: 1px solid darken( @secondary, 10 );
+					border: 1px solid darken( $secondary, 10% );
-					.vertical_gradient( @secondary, darken( @secondary, 10 ) );
+					@include vertical_gradient( $secondary, darken( $secondary, 10% ) );
 					display: inline-block;
 					position: relative;
 					z-index: 0;
-					.border_radius_top(4px);
+					@include border_radius_top(4px);
 					box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2), inset 0 1px 0 rgba(255,255,255,0.6);
 					margin: 0 -5px;
 					padding: 0 1em;
@@ -272,20 +272,20 @@ p.demo_store {
 						display: inline-block;
 						padding: .5em 0;
 						font-weight:bold;
-						color: @secondarytext;
+						color: $secondarytext;
-						.darkorlighttextshadow( @secondarytext );
+						@include darkorlighttextshadow( $secondarytext );
 						text-decoration: none;
 
 						&:hover {
 							text-decoration:none;
-							color: lighten( @secondarytext, 10 );
+							color: lighten( $secondarytext, 10% );
 						}
 					}
 
 					&.active {
-						background: @contentbg;
+						background: $contentbg;
 						z-index: 2;
-						border-bottom-color: @contentbg;
+						border-bottom-color: $contentbg;
 
 						a {
 							color: inherit;
@@ -293,15 +293,15 @@ p.demo_store {
 						}
 
 						&:before {
-							box-shadow: 2px 2px 0 @contentbg;
+							box-shadow: 2px 2px 0 $contentbg;
 						}
 
 						&:after {
-							box-shadow: -2px 2px 0 @contentbg;
+							box-shadow: -2px 2px 0 $contentbg;
 						}
 					}
 					&:before, &:after {
-						border: 1px solid darken( @secondary, 10 );
+						border: 1px solid darken( $secondary, 10% );
 						position:absolute;
 						bottom: -1px;
 						width: 5px;
@@ -314,7 +314,7 @@ p.demo_store {
 						-moz-border-bottom-right-radius: 4px;
 						border-bottom-right-radius: 4px;
 						border-width: 0 1px 1px 0;
-						box-shadow: 2px 2px 0 darken( @secondary, 10 );
+						box-shadow: 2px 2px 0 darken( $secondary, 10% );
 					}
 					&:after {
 						right: -6px;
@@ -322,7 +322,7 @@ p.demo_store {
 						-moz-border-bottom-left-radius: 4px;
 						border-bottom-left-radius: 4px;
 						border-width: 0 0 1px 1px;
-						box-shadow: -2px 2px 0 darken( @secondary, 10 );
+						box-shadow: -2px 2px 0 darken( $secondary, 10% );
 					}
 				}
 				&:before {
@@ -331,7 +331,7 @@ p.demo_store {
 					width: 100%;
 					bottom: 0;
 					left: 0;
-					border-bottom: 1px solid darken( @secondary, 10 );
+					border-bottom: 1px solid darken( $secondary, 10% );
 					z-index: 1;
 				}
 			}
@@ -344,13 +344,13 @@ p.demo_store {
 		/* Cart button */
 		p.cart {
 			margin-bottom: 2em;
-			.clearfix();
+			@include clearfix();
 		}
 
 		/* add to cart forms */
 		form.cart {
 			margin-bottom: 2em;
-			.clearfix();
+			@include clearfix();
 			div.quantity {
 				float:left;
 				margin: 0 4px 0 0;
@@ -416,10 +416,10 @@ p.demo_store {
 		top: 6px;
 		left: 6px;
 		margin: 0;
-		.border_radius(20px);
+		@include border_radius(20px);
-		.vertical_gradient( lighten( @highlight, 10), @highlight );
+		@include vertical_gradient( lighten( $highlight, 10%), $highlight );
-		.text_shadow( 0, -1px, 0, @highlight );
+		@include text_shadow( 0, -1px, 0, $highlight );
-		color: @highlightext;
+		color: $highlightext;
 		-webkit-box-shadow:
 			inset 0 1px 0 rgba(255,255,255,0.3),
 			inset 0 -1px 0 rgba(0,0,0,0.2),
@@ -442,7 +442,7 @@ p.demo_store {
 		padding: 0;
 		list-style:none outside;
 		clear:both;
-		.clearfix();
+		@include clearfix();
 		li {
 			list-style:none outside;
 		}
@@ -469,23 +469,23 @@ p.demo_store {
 				height:auto;
 				display:block;
 				margin: 0 0 8px;
-				.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
+				@include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
-				.transition();
+				@include transition();
 			}
 			a:hover img {
-				.box_shadow(0,1px,3px,0,rgba(0,0,0,0.4));
+				@include box_shadow(0,1px,3px,0,rgba(0,0,0,0.4));
 			}
 			strong {
 				display:block;
 			}
 			.price {
-				color: @highlight;
+				color: $highlight;
-				display:block;
+				display: block;
-				font-weight:normal;
+				font-weight: normal;
 				margin-bottom: .5em;
 				del {
 					font-size: 0.67em;
-					color:fade( desaturate( @highlight, 75% ), 50% );
+					color: rgba(desaturate($highlight, 75%), 0.5);
 					margin: -2px 0 0 0;
 				}
 				ins {
@@ -495,7 +495,7 @@ p.demo_store {
 					font-size: 0.67em;
 					margin: -2px 0 0 0;
 					text-transform: uppercase;
-					color:fade( desaturate( @highlight, 75% ), 50% );
+					color: rgba(desaturate($highlight, 75%), 0.5);
 				}
 			}
 		}
@@ -517,11 +517,11 @@ p.demo_store {
 			white-space: nowrap;
 			padding:0;
 			clear: both;
-			border: 1px solid darken( @secondary, 10 );
+			border: 1px solid darken( $secondary, 10% );
 			border-right: 0;
 			margin: 1px;
 			li {
-				border-right: 1px solid darken( @secondary, 10 );
+				border-right: 1px solid darken( $secondary, 10% );
 				padding: 0;
 				margin: 0;
 				float: left;
@@ -539,8 +539,8 @@ p.demo_store {
 					display: block;
 				}
 				span.current, a:hover, a:focus {
-					background: @secondary;
+					background: $secondary;
-					color: darken( @secondary, 40 );
+					color: darken( $secondary, 40% );
 				}
 			}
 		}
@@ -561,13 +561,13 @@ p.demo_store {
 		padding: 6px 10px;
 		text-decoration:none;
 		font-weight:bold;
-		.border_radius(2px);
+		@include border_radius(2px);
 		left: auto;
-		text-shadow:0 1px 0 @secondary + #111;
+		text-shadow:0 1px 0 $secondary + #111;
-		color: @secondarytext;
+		color: $secondarytext;
-		.darkorlighttextshadow( @secondarytext );
+		@include darkorlighttextshadow( $secondarytext );
-		border: 1px solid darken( @secondary, 20 );
+		border: 1px solid darken( $secondary, 20% );
-		.vertical_gradient( @secondary, darken( @secondary, 10 ) );
+		@include vertical_gradient( $secondary, darken( $secondary, 10% ) );
 		white-space: nowrap;
 		display: inline-block;
 
@@ -585,8 +585,8 @@ p.demo_store {
 			0 1px 2px rgba(0,0,0,0.1);
 
 		&.loading {
-			color: lighten( @secondarytext, 10 );
+			color: lighten( $secondarytext, 10% );
-			border: 1px solid @secondary;
+			border: 1px solid $secondary;
 
 			&:before {
 				content: "";
@@ -613,7 +613,7 @@ p.demo_store {
 		}
 
 		&:hover {
-			.vertical_gradient( @secondary, darken( @secondary, 15 ) );
+			@include vertical_gradient( $secondary, darken( $secondary, 15% ) );
 			text-decoration:none;
 		}
 
@@ -622,24 +622,24 @@ p.demo_store {
 		}
 
 		&.alt {
-			.vertical_gradient( @primary, darken( @primary, 10 ) );
+			@include vertical_gradient( $primary, darken( $primary, 10% ) );
-			border-color: darken(@primary, 20);
+			border-color: darken($primary, 20%);
-			color: @primarytext;
+			color: $primarytext;
-			.darkorlighttextshadow( @primarytext, 0.6 );
+			@include darkorlighttextshadow( $primarytext, 0.6 );
 
 			&:hover {
-				.vertical_gradient( @primary, darken( @primary, 15 ) );
+				@include vertical_gradient( $primary, darken( $primary, 15% ) );
-				color:@primarytext + #111;
+				color:$primarytext + #111;
-				.darkorlighttextshadow( @primarytext + #111, 0.6 );
+				@include darkorlighttextshadow( $primarytext + #111, 0.6 );
 			}
 		}
 
 		&:disabled,
 		&.disabled {
-			color: lighten( @secondarytext, 30 );
+			color: lighten( $secondarytext, 30% );
-			border: 1px solid darken( @secondary, 10 );
+			border: 1px solid darken( $secondary, 10% );
 
-			background: @secondary;
+			background: $secondary;
 			-webkit-box-shadow: none;
 			-moz-box-shadow: none;
 			box-shadow: none;
@@ -678,12 +678,12 @@ p.demo_store {
 			padding: 0;
 			margin: 0;
 			text-align: center;
-			border: 1px solid darken( @secondary, 20 );
+			border: 1px solid darken( $secondary, 20% );
 			border-right: 0;
-			.border_radius_right(0);
+			@include border_radius_right(0);
-			.inset_box_shadow( 0, 0, 2px, 0, @secondary );
+			@include inset_box_shadow( 0, 0, 2px, 0, $secondary );
 			font-weight:bold;
-			.border_radius_left(2px);
+			@include border_radius_left(2px);
 			-moz-appearance: textfield; /* Hide buttons for Firefox 29 and later */
 		}
 
@@ -708,12 +708,12 @@ p.demo_store {
 			cursor: pointer;
 			line-height: 13px;
 			font-size: 12px;
-			.border_radius(2px);
+			@include border_radius(2px);
 
-			color: @secondarytext;
+			color: $secondarytext;
-			.darkorlighttextshadow( @secondarytext );
+			@include darkorlighttextshadow( $secondarytext );
-			border: 1px solid darken( @secondary, 20 );
+			border: 1px solid darken( $secondary, 20% );
-			.vertical_gradient( @secondary, darken( @secondary, 10 ) );
+			@include vertical_gradient( $secondary, darken( $secondary, 10% ) );
 
 			-webkit-box-shadow:
 				inset 0 -1px 0 rgba(0,0,0,0.075),
@@ -729,7 +729,7 @@ p.demo_store {
 				0 1px 2px rgba(0,0,0,0.1);
 
 			&:hover {
-				.vertical_gradient( @secondary, darken( @secondary, 15 ) );
+				@include vertical_gradient( $secondary, darken( $secondary, 15% ) );
 			}
 		}
 
@@ -737,13 +737,13 @@ p.demo_store {
 			top: 0;
 			right: 0;
 			border-bottom: 0;
-			.border_radius_bottom(0);
+			@include border_radius_bottom(0);
 		}
 
 		.minus {
 			bottom: 0;
 			right: 0;
-			.border_radius_top(0);
+			@include border_radius_top(0);
 		}
 	}
 
@@ -752,13 +752,13 @@ p.demo_store {
 	#reviews {
 		h2 small {
 			float: right;
-			color: @subtext;
+			color: $subtext;
 			font-size: 15px;
 			line-height: 21px;
 			margin: 10px 0 0 0;
 			a {
 				text-decoration:none;
-				color: @subtext;
+				color: $subtext;
 			}
 		}
 		h3 {
@@ -774,13 +774,13 @@ p.demo_store {
 		}
 		#comments {
 			.add_review {
-				.clearfix();
+				@include clearfix();
 			}
 			h2 {
 				clear:none;
 			}
 			ol.commentlist {
-				.clearfix();
+				@include clearfix();
 				margin: 0;
 				width: 100%;
 				background:none;
@@ -793,7 +793,7 @@ p.demo_store {
 					background: 0;
 					border: 0;
 					.meta {
-						color: @subtext;
+						color: $subtext;
 						font-size: 0.75em;
 					}
 					img.avatar {
@@ -804,17 +804,17 @@ p.demo_store {
 						padding: 3px;
 						width: 32px;
 						height:auto;
-						background: @secondary;
+						background: $secondary;
-						border: 1px solid darken( @secondary, 3 );
+						border: 1px solid darken( $secondary, 3% );
 						margin: 0;
 						line-height: 1;
 					}
 					.comment-text {
 						margin: 0 0 0 50px;
-						border: 1px solid darken( @secondary, 3 );
+						border: 1px solid darken( $secondary, 3% );
-						.border_radius(4px);
+						@include border_radius(4px);
 						padding: 1em 1em 0;
-						.clearfix();
+						@include clearfix();
 						p {
 							margin: 0 0 1em;
 						}
@@ -832,8 +832,8 @@ p.demo_store {
 					}
 				}
 				#respond {
-					border: 1px solid darken( @secondary, 3 );
+					border: 1px solid darken( $secondary, 3% );
-					.border_radius(4px);
+					@include border_radius(4px);
 					padding: 1em 1em 0;
 					margin: 20px 0 0 50px;
 				}
@@ -856,7 +856,7 @@ p.demo_store {
 		font-family: 'star';
 		&:before {
 			content: "\73\73\73\73\73";
-			color: darken( @secondary, 10 );
+			color: darken( $secondary, 10% );
 			float: left;
 			top: 0;
 			left: 0;
@@ -904,7 +904,7 @@ p.demo_store {
 
 	#review_form {
 		#respond {
-			.clearfix();
+			@include clearfix();
 			position: static;
 			margin: 0;
 			width: auto;
@@ -1069,7 +1069,7 @@ p.demo_store {
 		text-align:left;
 		width: 100%;
 		border-collapse: separate;
-		.border_radius(5px);
+		@include border_radius(5px);
 		th {
 			font-weight:bold;
 			line-height: 18px;
@@ -1109,7 +1109,7 @@ p.demo_store {
 	td.product-name {
 		dl.variation {
 			margin: .25em 0;
-			.clearfix;
+			@include clearfix();
 
 			dt, dd {
 				display: inline-block;
@@ -1158,7 +1158,7 @@ p.demo_store {
 			width:1em;
 			text-align: center;
 			line-height: 1;
-			.border_radius(100%);
+			@include border_radius(100%);
 			color: red;
 			text-decoration: none;
 			font-weight: bold;
@@ -1175,9 +1175,9 @@ p.demo_store {
 					-moz-box-sizing:border-box;
 					box-sizing:border-box;
 
-					.inset_box_shadow(0, 1px, 4px, 0, rgba(0,0,0,0.1));
+					@include inset_box_shadow(0, 1px, 4px, 0, rgba(0,0,0,0.1));
 
-					border: 1px solid darken( @secondary, 10 );
+					border: 1px solid darken( $secondary, 10% );
 					padding: 6px 6px 5px;
 					margin: 0 4px 0 0;
 					outline: 0;
@@ -1203,7 +1203,7 @@ p.demo_store {
 		li {
 			padding: 4px 0;
 			margin: 0;
-			.clearfix;
+			@include clearfix();
 			list-style:none;
 			a {
 				display:block;
@@ -1214,13 +1214,13 @@ p.demo_store {
 				margin-left: 4px;
 				width: 32px;
 				height:auto;
-				.box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
+				@include box_shadow(0,1px,2px,0,rgba(0,0,0,0.3));
 			}
 			dl {
 				margin: 0;
 				padding-left: 1em;
 				border-left: 2px solid rgba(0,0,0,0.1);
-				.clearfix;
+				@include clearfix();
 
 				dt, dd {
 					display: inline-block;
@@ -1248,7 +1248,7 @@ p.demo_store {
 
 	&.widget_shopping_cart, .widget_shopping_cart {
 		.total {
-			border-top: 3px double @secondary;
+			border-top: 3px double $secondary;
 			padding: 4px 0 0;
 			strong {
 				min-width: 40px;
@@ -1256,7 +1256,7 @@ p.demo_store {
 			}
 		}
 		.buttons {
-			.clearfix;
+			@include clearfix();
 		}
 	}
 
@@ -1273,7 +1273,7 @@ p.demo_store {
 			}
 			.shipping-calculator-button {
 				&:after {
-					.iconafter( "\e02e" );
+					@include iconafter( "\e02e" );
 				}
 			}
 		}
@@ -1281,13 +1281,13 @@ p.demo_store {
 			p {
 				margin: 0;
 				small {
-					color: @subtext;
+					color: $subtext;
 					font-size: 0.83em;
 				}
 			}
 			table {
 				border-collapse: separate;
-				.border_radius(5px);
+				@include border_radius(5px);
 				margin: 0 0 6px;
 				padding: 0;
 				tr:first-child {
@@ -1307,17 +1307,17 @@ p.demo_store {
 				}
 				small {
 					display:block;
-					color: @subtext;
+					color: $subtext;
 				}
 				select {
 					width: 100%;
 				}
 			}
 			.discount td {
-				color: @highlight;
+				color: $highlight;
 			}
 			tr td, tr th {
-				border-top: 1px solid @secondary;
+				border-top: 1px solid $secondary;
 			}
 			a.button.alt {
 				display: inline-block;
@@ -1371,7 +1371,7 @@ p.demo_store {
 				vertical-align: middle;
 			}
 			input.input-text, textarea {
-				.borderbox;
+				@include borderbox();
 				width: 100%;
 				margin: 0;
 				outline: 0;
@@ -1403,11 +1403,11 @@ p.demo_store {
 	}
 
 	form.login, form.checkout_coupon, form.register {
-		border: 1px solid darken( @secondary, 10 );
+		border: 1px solid darken( $secondary, 10% );
 		padding: 20px;
 		margin: 2em 0 2em 0px;
 		text-align:left;
-		.border_radius(5px);
+		@include border_radius(5px);
 	}
 
 	ul#shipping_method {
@@ -1448,7 +1448,7 @@ p.demo_store {
 		}
 		.create-account small {
 			font-size: 11px;
-			color: @subtext;
+			color: $subtext;
 			line-height: 13px;
 			font-weight:normal;
 		}
@@ -1464,14 +1464,14 @@ p.demo_store {
 
 	/* Payment box - appears on checkout and page page */
 	#payment {
-		background: @secondary;
+		background: $secondary;
-		.border_radius(5px);
+		@include border_radius(5px);
 
 		ul.payment_methods {
-			.clearfix;
+			@include clearfix();
 			text-align:left;
 			padding: 1em;
-			border-bottom: 1px solid darken( @secondary, 10 );
+			border-bottom: 1px solid darken( $secondary, 10% );
 			margin: 0;
 			list-style:none outside;
 			li {
@@ -1497,7 +1497,7 @@ p.demo_store {
 
 		div.form-row {
 			padding: 1em;
-			border-top: 1px solid lighten( @secondary, 5 );
+			border-top: 1px solid lighten( $secondary, 5% );
 		}
 		div.payment_box {
 			position: relative;
@@ -1505,26 +1505,26 @@ p.demo_store {
 			padding: 1em 2%;
 			margin: 1em 0 1em 0;
 			font-size: 0.92em;
-			.border_radius(2px);
+			@include border_radius(2px);
 			line-height: 1.5em;
-			.vertical_gradient( darken( @secondary, 5 ), darken( @secondary, 10 ) );
+			@include vertical_gradient( darken( $secondary, 5% ), darken( $secondary, 10% ) );
-			.box_shadow(0,1px,2px,0,rgba(0,0,0,0.25));
+			@include box_shadow(0,1px,2px,0,rgba(0,0,0,0.25));
-			color: @secondarytext;
+			color: $secondarytext;
-			.darkorlighttextshadow( @secondarytext );
+			@include darkorlighttextshadow( $secondarytext );
 
 			input.input-text, textarea {
-				border-color: darken( @secondary, 15 );
+				border-color: darken( $secondary, 15% );
-				border-top-color: darken( @secondary, 20 );
+				border-top-color: darken( $secondary, 20% );
-				.box_shadow( 0, 1px, 0, 0, rgba( 255,255,255,0.4 ) );
+				@include box_shadow( 0, 1px, 0, 0, rgba( 255,255,255,0.4 ) );
 			}
 			::-webkit-input-placeholder {
-				color: darken( @secondary, 20 );
+				color: darken( $secondary, 20% );
 			}
 			:-moz-placeholder {
-				color: darken( @secondary, 20 );
+				color: darken( $secondary, 20% );
 			}
 			:-ms-input-placeholder {
-				color: darken( @secondary, 20 );
+				color: darken( $secondary, 20% );
 			}
 			.wc-credit-card-form-card-number,
 			.wc-credit-card-form-card-expiry,
@@ -1561,7 +1561,7 @@ p.demo_store {
 			}
 			span.help {
 				font-size: 11px;
-				color: @subtext;
+				color: $subtext;
 				line-height: 13px;
 				font-weight:normal;
 			}
@@ -1574,7 +1574,7 @@ p.demo_store {
 			&:after {
 				content: "";
 				display:block;
-				border: 8px solid darken( @secondary, 5 ); /* arrow size / color */
+				border: 8px solid darken( $secondary, 5% ); /* arrow size / color */
 				border-right-color: transparent;
 				border-left-color: transparent;
 				border-top-color: transparent;
@@ -1584,13 +1584,24 @@ p.demo_store {
 				margin: -1em 0 0 2em;
 			}
 		}
+		.payment_method_paypal {
+			.about_paypal {
+				float: right;
+				line-height: 52px;
+				font-size: 0.83em;
+			}
+			img {
+				max-height: 52px;
+				vertical-align: middle;
+			}
+		}
 	}
 
 	/* =Order Page
 	-------------------------------------------------------------- */
 
 	.order_details {
-		.clearfix();
+		@include clearfix();
 		margin: 0 0 1.5em;
 		list-style:none;
 
@@ -1600,7 +1611,7 @@ p.demo_store {
 			text-transform: uppercase;
 			font-size: 0.715em;
 			line-height: 1em;
-			border-right: 1px dashed darken( @secondary, 10 );
+			border-right: 1px dashed darken( $secondary, 10% );
 			padding-right: 2em;
 
 			strong {
@@ -1621,7 +1632,7 @@ p.demo_store {
 
 	.addresses {
 		.title {
-			.clearfix();
+			@include clearfix();
 
 			h3 {
 				float:left;
@@ -1654,7 +1665,7 @@ p.demo_store {
 			margin-left: 0;
 			padding-left: 0;
 			&:before {
-				.iconbefore( "\e00a" );
+				@include iconbefore( "\e00a" );
 			}
 			.count {
 				float: right;
@@ -1672,7 +1683,7 @@ p.demo_store {
 			border: 0;
 			list-style:none outside;
 			li {
-				.clearfix();
+				@include clearfix();
 				padding: 0 0 1px;
 				list-style:none;
 				a, span {
@@ -1684,13 +1695,13 @@ p.demo_store {
 				a {
 					padding:0 6px;
 					text-decoration: none;
-					border: 1px solid @tertiary;
+					border: 1px solid $tertiary;
-					background: @tertiary;
+					background: $tertiary;
-					.inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
+					@include inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
-					color: @tertiarytext;
+					color: $tertiarytext;
-					.border_radius(3px);
+					@include border_radius(3px);
 					&:before {
-						.iconbefore( "\e013" );
+						@include iconbefore( "\e013" );
 					}
 				}
 			}
@@ -1699,7 +1710,7 @@ p.demo_store {
 				margin-left: 6px;
 				font-size: 1em;
 				padding: 1px 0;
-				color: @subtext;
+				color: $subtext;
 			}
 		}
 	}
@@ -1719,14 +1730,14 @@ p.demo_store {
 				a {
 					padding:0 6px;
 					text-decoration: none;
-					border: 1px solid @tertiary;
+					border: 1px solid $tertiary;
-					background: @tertiary;
+					background: $tertiary;
-					.inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
+					@include inset_box_shadow(0, 1px, 1px, rgba(255,255,255,0.5));
-					color: @tertiarytext;
+					color: $tertiarytext;
-					.border_radius(3px);
+					@include border_radius(3px);
 					float: left;
 					&:before {
-						.iconbefore( "\e013" );
+						@include iconbefore( "\e013" );
 					}
 				}
 			}
@@ -1760,10 +1771,10 @@ p.demo_store {
 			z-index: 2;
 			width: 0.9em;
 			height: 0.9em;
-			.border_radius(1em);
+			@include border_radius(1em);
-			border: 1px solid darken( @tertiary, 50 );
+			border: 1px solid darken( $tertiary, 50% );
 			cursor: pointer;
-			.vertical_gradient( @tertiary, darken( @tertiary, 10 ));
+			@include vertical_gradient( $tertiary, darken( $tertiary, 10% ));
 			outline:none;
 			top: -.3em;
 			-webkit-box-shadow:
@@ -1786,13 +1797,13 @@ p.demo_store {
 			font-size: .7em;
 			display:block;
 			border: 0;
-			background: @tertiary url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAFUlEQVQIHWP4//9/PRMDA8NzEPEMADLLBU76a5idAAAAAElFTkSuQmCC) top repeat-x; /* transparent png */
+			background: $tertiary url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAADCAYAAABS3WWCAAAAFUlEQVQIHWP4//9/PRMDA8NzEPEMADLLBU76a5idAAAAAElFTkSuQmCC) top repeat-x; /* transparent png */
-			.inset_box_shadow(0,0,0,1px,rgba(0,0,0,0.5));
+			@include inset_box_shadow(0,0,0,1px,rgba(0,0,0,0.5));
-			.border_radius(1em);
+			@include border_radius(1em);
 		}
 		.price_slider_wrapper .ui-widget-content {
-			.border_radius(1em);
+			@include border_radius(1em);
-			.vertical_gradient( @quaternary, lighten( @quaternary, 30 ) );
+			@include vertical_gradient( $quaternary, lighten( $quaternary, 30% ) );
 		}
 		.ui-slider-horizontal {
 			height: .5em;

assets/js/admin/meta-boxes-product-variation.js

@@ -250,7 +250,13 @@ jQuery( function ( $ ) {
 					edit_field = 'variable_sale_price';
 				}
 
-				value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent ).toString();
+				value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value_fixed_or_percent );
+
+				if ( value == null ) {
+					return;
+				} else {
+					value = value.toString();
+				}
 
 				$( ':input[name^="' + edit_field + '"]' ).each( function() {
 					var current_value = accounting.unformat( $( this ).val(), woocommerce_admin.mon_decimal_point ),
@@ -288,7 +294,9 @@ jQuery( function ( $ ) {
 			case 'variable_download_expiry' :
 				value = window.prompt( woocommerce_admin_meta_boxes_variations.i18n_enter_a_value );
 
-				$( ':input[name^="' + bulk_edit + '"]').not('[name*="dates"]').val( value ).change();
+				if ( value != null ) {
+					$( ':input[name^="' + bulk_edit + '"]').not('[name*="dates"]').val( value ).change();
+				}
 			break;
 			default:
 				$( 'select#field_to_edit' ).trigger( bulk_edit );

assets/js/frontend/add-to-cart-variation.js

@@ -243,7 +243,10 @@
 
 					current_attr_select.find( 'option:gt(0)' ).remove();
 					current_attr_select.append( current_attr_select.data( 'attribute_options' ) );
-					current_attr_select.find( 'option:gt(0)' ).removeClass( 'active' );
+					current_attr_select.find( 'option:gt(0)' ).removeClass( 'attached' );
+
+					current_attr_select.find( 'option:gt(0)' ).removeClass( 'enabled' );
+					current_attr_select.find( 'option:gt(0)' ).removeAttr( 'disabled' );
 
 					// Get name
 					var current_attr_name = current_attr_select.attr( 'name' );
@@ -261,6 +264,11 @@
 
 									if ( attr_name == current_attr_name ) {
 
+										if ( variations[ num ].variation_is_active )
+											variation_active = 'enabled';
+										else
+											variation_active = '';
+
 										if ( attr_val ) {
 
 											// Decode entities
@@ -271,11 +279,11 @@
 											attr_val = attr_val.replace( /"/g, "\\\"" );
 
 											// Compare the meerkat
-											current_attr_select.find( 'option[value="' + attr_val + '"]' ).addClass( 'active' );
+											current_attr_select.find( 'option[value="' + attr_val + '"]' ).addClass( 'attached ' + variation_active );
 
 										} else {
 
-											current_attr_select.find( 'option:gt(0)' ).addClass( 'active' );
+											current_attr_select.find( 'option:gt(0)' ).addClass( 'attached ' + variation_active );
 
 										}
 									}
@@ -284,8 +292,11 @@
 						}
 					}
 
-					// Detach inactive
+					// Detach unattached
-					current_attr_select.find( 'option:gt(0):not(.active)' ).remove();
+					current_attr_select.find( 'option:gt(0):not(.attached)' ).remove();
+
+					// Grey out disabled
+					current_attr_select.find( 'option:gt(0):not(.enabled)' ).attr( 'disabled', 'disabled' );
 
 				});
 

i18n/countries.php

@@ -4,13 +4,15 @@
  *
  * Returns an array of countries and codes.
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.2.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 return array(
 	'AF' => __( 'Afghanistan', 'woocommerce' ),

i18n/languages/README.md

@@ -0,0 +1,9 @@
+# WARNING! DO NOT PUT CUSTOM TRANSLATIONS HERE!
+
+WooCommerce will delete all custom translations placed in this directory.
+
+## Translating WooCommerce
+Put your custom WooCommerce translations in your WordPress language directory, located at: WP_LANG_DIR . "/woocommerce/{$textdomain}-{$locale}.mo";
+
+## Contributing your translating to WooCommerce
+If you want to help translate WooCommerce, please visit our [translation page](https://www.transifex.com/projects/p/woocommerce/).

i18n/languages/woocommerce-admin.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the WooCommerce package.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce 2.2.3 Admin\n"
+"Project-Id-Version: WooCommerce 2.2.4 Admin\n"
 "Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2014-09-16 12:34:12+00:00\n"
+"POT-Creation-Date: 2014-09-18 12:40:25+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1270,10 +1270,10 @@ msgstr ""
 
 #: includes/admin/class-wc-admin-post-types.php:1982
 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:177
-#: includes/admin/meta-boxes/views/html-order-items.php:234
+#: includes/admin/meta-boxes/views/html-order-items.php:236
-#: includes/admin/meta-boxes/views/html-order-items.php:273
+#: includes/admin/meta-boxes/views/html-order-items.php:275
-#: includes/admin/meta-boxes/views/html-order-items.php:293
+#: includes/admin/meta-boxes/views/html-order-items.php:295
-#: includes/admin/meta-boxes/views/html-order-items.php:348
+#: includes/admin/meta-boxes/views/html-order-items.php:350
 msgid "Cancel"
 msgstr ""
 
@@ -2079,7 +2079,7 @@ msgstr ""
 #: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:101
 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:608
 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:628
-#: includes/admin/meta-boxes/views/html-order-items.php:288
+#: includes/admin/meta-boxes/views/html-order-items.php:290
 #: includes/admin/reports/class-wc-report-sales-by-product.php:181
 msgid "Search for a product…"
 msgstr ""
@@ -2377,8 +2377,8 @@ msgstr ""
 
 #: includes/admin/meta-boxes/class-wc-meta-box-order-notes.php:74
 #: includes/admin/meta-boxes/class-wc-meta-box-product-data.php:584
-#: includes/admin/meta-boxes/views/html-order-items.php:294
+#: includes/admin/meta-boxes/views/html-order-items.php:296
-#: includes/admin/meta-boxes/views/html-order-items.php:349
+#: includes/admin/meta-boxes/views/html-order-items.php:351
 msgid "Add"
 msgstr ""
 
@@ -3037,93 +3037,101 @@ msgstr ""
 msgid "Add line item(s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:219
+#: includes/admin/meta-boxes/views/html-order-items.php:218
+msgid "To edit this order change the status back to \"Pending\""
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:218
+msgid "This order has been paid for and is no longer editable"
+msgstr ""
+
+#: includes/admin/meta-boxes/views/html-order-items.php:221
 msgid "Add Tax"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:222
+#: includes/admin/meta-boxes/views/html-order-items.php:224
 #: includes/admin/meta-boxes/views/html-order-refund.php:14
 msgid "Refund"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:225
+#: includes/admin/meta-boxes/views/html-order-items.php:227
 msgid "Calculate Taxes"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:226
+#: includes/admin/meta-boxes/views/html-order-items.php:228
 msgid "Calculate Total"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:231
+#: includes/admin/meta-boxes/views/html-order-items.php:233
 msgid "Add product(s)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:232
+#: includes/admin/meta-boxes/views/html-order-items.php:234
 msgid "Add fee"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:233
+#: includes/admin/meta-boxes/views/html-order-items.php:235
 msgid "Add shipping cost"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:235
+#: includes/admin/meta-boxes/views/html-order-items.php:237
 msgid "Save"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:241
+#: includes/admin/meta-boxes/views/html-order-items.php:243
 msgid "Restock refunded items"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:245
+#: includes/admin/meta-boxes/views/html-order-items.php:247
 msgid "Amount already refunded"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:249
+#: includes/admin/meta-boxes/views/html-order-items.php:251
 msgid "Total available to refund"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:253
+#: includes/admin/meta-boxes/views/html-order-items.php:255
 msgid "Refund amount"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:260
+#: includes/admin/meta-boxes/views/html-order-items.php:262
 msgid "Reason for refund (optional)"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:272
+#: includes/admin/meta-boxes/views/html-order-items.php:274
 msgid "Refund manually"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:284
+#: includes/admin/meta-boxes/views/html-order-items.php:286
 msgid "Add products"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:308
+#: includes/admin/meta-boxes/views/html-order-items.php:310
 msgid "Add tax"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:316
+#: includes/admin/meta-boxes/views/html-order-items.php:318
 msgid "Rate name"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:317
+#: includes/admin/meta-boxes/views/html-order-items.php:319
 msgid "Tax class"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:318
+#: includes/admin/meta-boxes/views/html-order-items.php:320
 msgid "Rate code"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:319
+#: includes/admin/meta-boxes/views/html-order-items.php:321
 #: includes/admin/settings/class-wc-settings-tax.php:392
 msgid "Rate %"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:340
+#: includes/admin/meta-boxes/views/html-order-items.php:342
 msgid "Or, enter tax rate ID:"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:341
+#: includes/admin/meta-boxes/views/html-order-items.php:343
 msgid "Optional"
 msgstr ""
 
@@ -3616,7 +3624,7 @@ msgid "This is the total tax for the rate (shipping tax + product tax)."
 msgstr ""
 
 #: includes/admin/reports/class-wc-report-taxes-by-code.php:182
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:163
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:164
 msgid "No taxes found in this period"
 msgstr ""
 
@@ -3652,7 +3660,7 @@ msgstr ""
 msgid "Total sales minus shipping and tax."
 msgstr ""
 
-#: includes/admin/reports/class-wc-report-taxes-by-date.php:152
+#: includes/admin/reports/class-wc-report-taxes-by-date.php:153
 msgid "Totals"
 msgstr ""
 
@@ -5560,7 +5568,7 @@ msgctxt "Tax status"
 msgid "None"
 msgstr ""
 
-#: includes/admin/meta-boxes/views/html-order-items.php:270
+#: includes/admin/meta-boxes/views/html-order-items.php:272
 msgctxt "Refund $amount"
 msgid "Refund %s via %s"
 msgstr ""

i18n/languages/woocommerce.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the same license as the WooCommerce package.
 msgid ""
 msgstr ""
-"Project-Id-Version: WooCommerce 2.2.3 Frontend\n"
+"Project-Id-Version: WooCommerce 2.2.4 Frontend\n"
 "Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2014-09-16 12:34:12+00:00\n"
+"POT-Creation-Date: 2014-09-18 12:40:24+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1413,7 +1413,7 @@ msgstr ""
 msgid "Ceará"
 msgstr ""
 
-#: i18n/states/BR.php:19
+#: i18n/states/BR.php:19 i18n/states/MX.php:13
 msgid "Distrito Federal"
 msgstr ""
 
@@ -3005,6 +3005,130 @@ msgstr ""
 msgid "Okinawa"
 msgstr ""
 
+#: i18n/states/MX.php:14
+msgid "Jalisco"
+msgstr ""
+
+#: i18n/states/MX.php:15
+msgid "Nuevo León"
+msgstr ""
+
+#: i18n/states/MX.php:16
+msgid "Aguascalientes"
+msgstr ""
+
+#: i18n/states/MX.php:17
+msgid "Baja California Norte"
+msgstr ""
+
+#: i18n/states/MX.php:18
+msgid "Baja California Sur"
+msgstr ""
+
+#: i18n/states/MX.php:19
+msgid "Campeche"
+msgstr ""
+
+#: i18n/states/MX.php:20
+msgid "Chiapas"
+msgstr ""
+
+#: i18n/states/MX.php:21
+msgid "Chihuahua"
+msgstr ""
+
+#: i18n/states/MX.php:22
+msgid "Coahuila"
+msgstr ""
+
+#: i18n/states/MX.php:23
+msgid "Colima"
+msgstr ""
+
+#: i18n/states/MX.php:24
+msgid "Durango"
+msgstr ""
+
+#: i18n/states/MX.php:25
+msgid "Guanajuato"
+msgstr ""
+
+#: i18n/states/MX.php:26
+msgid "Guerrero"
+msgstr ""
+
+#: i18n/states/MX.php:27
+msgid "Hidalgo"
+msgstr ""
+
+#: i18n/states/MX.php:28
+msgid "Edo. de México"
+msgstr ""
+
+#: i18n/states/MX.php:29
+msgid "Michoacán"
+msgstr ""
+
+#: i18n/states/MX.php:30
+msgid "Morelos"
+msgstr ""
+
+#: i18n/states/MX.php:31
+msgid "Nayarit"
+msgstr ""
+
+#: i18n/states/MX.php:32
+msgid "Oaxaca"
+msgstr ""
+
+#: i18n/states/MX.php:33
+msgid "Puebla"
+msgstr ""
+
+#: i18n/states/MX.php:34
+msgid "Querétaro"
+msgstr ""
+
+#: i18n/states/MX.php:35
+msgid "Quintana Roo"
+msgstr ""
+
+#: i18n/states/MX.php:36
+msgid "San Luis Potosí"
+msgstr ""
+
+#: i18n/states/MX.php:37
+msgid "Sinaloa"
+msgstr ""
+
+#: i18n/states/MX.php:38
+msgid "Sonora"
+msgstr ""
+
+#: i18n/states/MX.php:39
+msgid "Tabasco"
+msgstr ""
+
+#: i18n/states/MX.php:40
+msgid "Tamaulipas"
+msgstr ""
+
+#: i18n/states/MX.php:41
+msgid "Tlaxcala"
+msgstr ""
+
+#: i18n/states/MX.php:42
+msgid "Veracruz"
+msgstr ""
+
+#: i18n/states/MX.php:43
+msgid "Yucatán"
+msgstr ""
+
+#: i18n/states/MX.php:44
+msgid "Zacatecas"
+msgstr ""
+
 #: i18n/states/MY.php:13
 msgid "Johor"
 msgstr ""
@@ -3069,6 +3193,306 @@ msgstr ""
 msgid "W.P. Putrajaya"
 msgstr ""
 
+#: i18n/states/NP.php:15
+msgid "Illam"
+msgstr ""
+
+#: i18n/states/NP.php:16
+msgid "Jhapa"
+msgstr ""
+
+#: i18n/states/NP.php:17
+msgid "Panchthar"
+msgstr ""
+
+#: i18n/states/NP.php:18
+msgid "Taplejung"
+msgstr ""
+
+#: i18n/states/NP.php:21
+msgid "Bhojpur"
+msgstr ""
+
+#: i18n/states/NP.php:22
+msgid "Dhankuta"
+msgstr ""
+
+#: i18n/states/NP.php:23
+msgid "Morang"
+msgstr ""
+
+#: i18n/states/NP.php:24
+msgid "Sunsari"
+msgstr ""
+
+#: i18n/states/NP.php:25
+msgid "Sankhuwa"
+msgstr ""
+
+#: i18n/states/NP.php:26
+msgid "Terhathum"
+msgstr ""
+
+#: i18n/states/NP.php:29
+msgid "Khotang"
+msgstr ""
+
+#: i18n/states/NP.php:30
+msgid "Okhaldhunga"
+msgstr ""
+
+#: i18n/states/NP.php:31
+msgid "Saptari"
+msgstr ""
+
+#: i18n/states/NP.php:32
+msgid "Siraha"
+msgstr ""
+
+#: i18n/states/NP.php:33
+msgid "Solukhumbu"
+msgstr ""
+
+#: i18n/states/NP.php:34
+msgid "Udayapur"
+msgstr ""
+
+#: i18n/states/NP.php:37
+msgid "Dhanusa"
+msgstr ""
+
+#: i18n/states/NP.php:38
+msgid "Dolakha"
+msgstr ""
+
+#: i18n/states/NP.php:39
+msgid "Mohottari"
+msgstr ""
+
+#: i18n/states/NP.php:40
+msgid "Ramechha"
+msgstr ""
+
+#: i18n/states/NP.php:41
+msgid "Sarlahi"
+msgstr ""
+
+#: i18n/states/NP.php:42
+msgid "Sindhuli"
+msgstr ""
+
+#: i18n/states/NP.php:45
+msgid "Bhaktapur"
+msgstr ""
+
+#: i18n/states/NP.php:46
+msgid "Dhading"
+msgstr ""
+
+#: i18n/states/NP.php:47
+msgid "Kathmandu"
+msgstr ""
+
+#: i18n/states/NP.php:48
+msgid "Kavrepalanchowk"
+msgstr ""
+
+#: i18n/states/NP.php:49
+msgid "Lalitpur"
+msgstr ""
+
+#: i18n/states/NP.php:50
+msgid "Nuwakot"
+msgstr ""
+
+#: i18n/states/NP.php:51
+msgid "Rasuwa"
+msgstr ""
+
+#: i18n/states/NP.php:52
+msgid "Sindhupalchowk"
+msgstr ""
+
+#: i18n/states/NP.php:55
+msgid "Bara"
+msgstr ""
+
+#: i18n/states/NP.php:56
+msgid "Chitwan"
+msgstr ""
+
+#: i18n/states/NP.php:57
+msgid "Makwanpur"
+msgstr ""
+
+#: i18n/states/NP.php:58
+msgid "Parsa"
+msgstr ""
+
+#: i18n/states/NP.php:59
+msgid "Rautahat"
+msgstr ""
+
+#: i18n/states/NP.php:62
+msgid "Gorkha"
+msgstr ""
+
+#: i18n/states/NP.php:63
+msgid "Kaski"
+msgstr ""
+
+#: i18n/states/NP.php:64
+msgid "Lamjung"
+msgstr ""
+
+#: i18n/states/NP.php:65
+msgid "Manang"
+msgstr ""
+
+#: i18n/states/NP.php:66
+msgid "Syangja"
+msgstr ""
+
+#: i18n/states/NP.php:67
+msgid "Tanahun"
+msgstr ""
+
+#: i18n/states/NP.php:70
+msgid "Baglung"
+msgstr ""
+
+#: i18n/states/NP.php:71
+msgid "Parbat"
+msgstr ""
+
+#: i18n/states/NP.php:72
+msgid "Mustang"
+msgstr ""
+
+#: i18n/states/NP.php:73
+msgid "Myagdi"
+msgstr ""
+
+#: i18n/states/NP.php:76
+msgid "Agrghakanchi"
+msgstr ""
+
+#: i18n/states/NP.php:77
+msgid "Gulmi"
+msgstr ""
+
+#: i18n/states/NP.php:78
+msgid "Kapilbastu"
+msgstr ""
+
+#: i18n/states/NP.php:79
+msgid "Nawalparasi"
+msgstr ""
+
+#: i18n/states/NP.php:80
+msgid "Palpa"
+msgstr ""
+
+#: i18n/states/NP.php:81
+msgid "Rupandehi"
+msgstr ""
+
+#: i18n/states/NP.php:84
+msgid "Dang"
+msgstr ""
+
+#: i18n/states/NP.php:85
+msgid "Pyuthan"
+msgstr ""
+
+#: i18n/states/NP.php:86
+msgid "Rolpa"
+msgstr ""
+
+#: i18n/states/NP.php:87
+msgid "Rukum"
+msgstr ""
+
+#: i18n/states/NP.php:88
+msgid "Salyan"
+msgstr ""
+
+#: i18n/states/NP.php:91
+msgid "Banke"
+msgstr ""
+
+#: i18n/states/NP.php:92
+msgid "Bardiya"
+msgstr ""
+
+#: i18n/states/NP.php:93
+msgid "Dailekh"
+msgstr ""
+
+#: i18n/states/NP.php:94
+msgid "Jajarkot"
+msgstr ""
+
+#: i18n/states/NP.php:95
+msgid "Surkhet"
+msgstr ""
+
+#: i18n/states/NP.php:98
+msgid "Dolpa"
+msgstr ""
+
+#: i18n/states/NP.php:99
+msgid "Humla"
+msgstr ""
+
+#: i18n/states/NP.php:100
+msgid "Jumla"
+msgstr ""
+
+#: i18n/states/NP.php:101
+msgid "Kalikot"
+msgstr ""
+
+#: i18n/states/NP.php:102
+msgid "Mugu"
+msgstr ""
+
+#: i18n/states/NP.php:105
+msgid "Achham"
+msgstr ""
+
+#: i18n/states/NP.php:106
+msgid "Bajhang"
+msgstr ""
+
+#: i18n/states/NP.php:107
+msgid "Bajura"
+msgstr ""
+
+#: i18n/states/NP.php:108
+msgid "Doti"
+msgstr ""
+
+#: i18n/states/NP.php:109
+msgid "Kailali"
+msgstr ""
+
+#: i18n/states/NP.php:112
+msgid "Baitadi"
+msgstr ""
+
+#: i18n/states/NP.php:113
+msgid "Dadeldhura"
+msgstr ""
+
+#: i18n/states/NP.php:114
+msgid "Darchula"
+msgstr ""
+
+#: i18n/states/NP.php:115
+msgid "Kanchanpur"
+msgstr ""
+
 #: i18n/states/NZ.php:13
 msgid "Northland"
 msgstr ""
@@ -4371,16 +4795,16 @@ msgstr ""
 msgid "WooCommerce"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2075
+#: includes/abstracts/abstract-wc-order.php:2080
 msgid "Order status changed from %s to %s."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2338
+#: includes/abstracts/abstract-wc-order.php:2343
 #: includes/class-wc-ajax.php:1167 includes/class-wc-ajax.php:1168
 msgid "Item #%s stock reduced from %s to %s."
 msgstr ""
 
-#: includes/abstracts/abstract-wc-order.php:2348
+#: includes/abstracts/abstract-wc-order.php:2353
 msgid "Order item stock reduced successfully."
 msgstr ""
 
@@ -4453,18 +4877,18 @@ msgstr ""
 msgid "Out of stock"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1015
+#: includes/abstracts/abstract-wc-product.php:1021
 #: templates/single-product/rating.php:23
 msgid "Rated %s out of 5"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1017
+#: includes/abstracts/abstract-wc-product.php:1023
 #: templates/single-product/rating.php:25
 #: templates/single-product/review.php:27
 msgid "out of 5"
 msgstr ""
 
-#: includes/abstracts/abstract-wc-product.php:1371
+#: includes/abstracts/abstract-wc-product.php:1377
 msgid "%s – %s"
 msgstr ""
 
@@ -4873,7 +5297,7 @@ msgstr ""
 msgid "Zero size file downloaded"
 msgstr ""
 
-#: includes/api/class-wc-api-reports.php:469
+#: includes/api/class-wc-api-reports.php:471
 #: includes/api/v1/class-wc-api-reports.php:470
 msgid "You do not have permission to read this report"
 msgstr ""
@@ -9189,8 +9613,8 @@ msgstr ""
 
 #: includes/class-wc-post-types.php:220
 #: includes/updates/woocommerce-update-2.0.php:53
-#: includes/wc-core-functions.php:506 includes/wc-core-functions.php:525
+#: includes/wc-core-functions.php:507 includes/wc-core-functions.php:526
-#: includes/wc-core-functions.php:559
+#: includes/wc-core-functions.php:560
 msgctxt "slug"
 msgid "product"
 msgstr ""

i18n/states/AU.php

@@ -2,9 +2,9 @@
 /**
  * Australian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/BD.php

@@ -2,10 +2,10 @@
 /**
  * Bangladeshi states (districts)
  *
- * @author        Md Ariful Haque Khan
+ * @author      WooThemes
- * @category      i18n
+ * @category    i18n
- * @package       WooCommerce/i18n
+ * @package     WooCommerce/i18n
- * @version       2.0.0
+ * @version     2.0.0
  */
 global $states;
 

i18n/states/BG.php

@@ -2,40 +2,40 @@
 /**
  * Bulgarian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['BG'] = array(
-  'BG-01' => __( 'Blagoevgrad', 'woocommerce' ),
+	'BG-01' => __( 'Blagoevgrad', 'woocommerce' ),
-  'BG-02' => __( 'Burgas', 'woocommerce' ),
+	'BG-02' => __( 'Burgas', 'woocommerce' ),
-  'BG-08' => __( 'Dobrich', 'woocommerce' ),
+	'BG-08' => __( 'Dobrich', 'woocommerce' ),
-  'BG-07' => __( 'Gabrovo', 'woocommerce' ),
+	'BG-07' => __( 'Gabrovo', 'woocommerce' ),
-  'BG-26' => __( 'Haskovo', 'woocommerce' ),
+	'BG-26' => __( 'Haskovo', 'woocommerce' ),
-  'BG-09' => __( 'Kardzhali', 'woocommerce' ),
+	'BG-09' => __( 'Kardzhali', 'woocommerce' ),
-  'BG-10' => __( 'Kyustendil', 'woocommerce' ),
+	'BG-10' => __( 'Kyustendil', 'woocommerce' ),
-  'BG-11' => __( 'Lovech', 'woocommerce' ),
+	'BG-11' => __( 'Lovech', 'woocommerce' ),
-  'BG-12' => __( 'Montana', 'woocommerce' ),
+	'BG-12' => __( 'Montana', 'woocommerce' ),
-  'BG-13' => __( 'Pazardzhik', 'woocommerce' ),
+	'BG-13' => __( 'Pazardzhik', 'woocommerce' ),
-  'BG-14' => __( 'Pernik', 'woocommerce' ),
+	'BG-14' => __( 'Pernik', 'woocommerce' ),
-  'BG-15' => __( 'Pleven', 'woocommerce' ),
+	'BG-15' => __( 'Pleven', 'woocommerce' ),
-  'BG-16' => __( 'Plovdiv', 'woocommerce' ),
+	'BG-16' => __( 'Plovdiv', 'woocommerce' ),
-  'BG-17' => __( 'Razgrad', 'woocommerce' ),
+	'BG-17' => __( 'Razgrad', 'woocommerce' ),
-  'BG-18' => __( 'Ruse', 'woocommerce' ),
+	'BG-18' => __( 'Ruse', 'woocommerce' ),
-  'BG-27' => __( 'Shumen', 'woocommerce' ),
+	'BG-27' => __( 'Shumen', 'woocommerce' ),
-  'BG-19' => __( 'Silistra', 'woocommerce' ),
+	'BG-19' => __( 'Silistra', 'woocommerce' ),
-  'BG-20' => __( 'Sliven', 'woocommerce' ),
+	'BG-20' => __( 'Sliven', 'woocommerce' ),
-  'BG-21' => __( 'Smolyan', 'woocommerce' ),
+	'BG-21' => __( 'Smolyan', 'woocommerce' ),
-  'BG-23' => __( 'Sofia', 'woocommerce' ),
+	'BG-23' => __( 'Sofia', 'woocommerce' ),
-  'BG-22' => __( 'Sofia-Grad', 'woocommerce' ),
+	'BG-22' => __( 'Sofia-Grad', 'woocommerce' ),
-  'BG-24' => __( 'Stara Zagora', 'woocommerce' ),
+	'BG-24' => __( 'Stara Zagora', 'woocommerce' ),
-  'BG-25' => __( 'Targovishte', 'woocommerce' ),
+	'BG-25' => __( 'Targovishte', 'woocommerce' ),
-  'BG-03' => __( 'Varna', 'woocommerce' ),
+	'BG-03' => __( 'Varna', 'woocommerce' ),
-  'BG-04' => __( 'Veliko Tarnovo', 'woocommerce' ),
+	'BG-04' => __( 'Veliko Tarnovo', 'woocommerce' ),
-  'BG-05' => __( 'Vidin', 'woocommerce' ),
+	'BG-05' => __( 'Vidin', 'woocommerce' ),
-  'BG-06' => __( 'Vratsa', 'woocommerce' ),
+	'BG-06' => __( 'Vratsa', 'woocommerce' ),
-  'BG-28' => __( 'Yambol', 'woocommerce' ),
+	'BG-28' => __( 'Yambol', 'woocommerce' ),
 );

i18n/states/BR.php

@@ -2,9 +2,9 @@
 /**
  * Brazillian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/CA.php

@@ -2,9 +2,9 @@
 /**
  * Canadian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/CN.php

@@ -2,44 +2,44 @@
 /**
  * Chinese states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['CN'] = array(
-    'CN1'  => __( 'Yunnan / 云南', 'woocommerce' ),
+	'CN1'  => __( 'Yunnan / 云南', 'woocommerce' ),
-    'CN2'  => __( 'Beijing / 北京', 'woocommerce' ),
+	'CN2'  => __( 'Beijing / 北京', 'woocommerce' ),
-    'CN3'  => __( 'Tianjin / 天津', 'woocommerce' ),
+	'CN3'  => __( 'Tianjin / 天津', 'woocommerce' ),
-    'CN4'  => __( 'Hebei / 河北', 'woocommerce' ),
+	'CN4'  => __( 'Hebei / 河北', 'woocommerce' ),
-    'CN5'  => __( 'Shanxi / 山西', 'woocommerce' ),
+	'CN5'  => __( 'Shanxi / 山西', 'woocommerce' ),
-    'CN6'  => __( 'Inner Mongolia / 內蒙古', 'woocommerce' ),
+	'CN6'  => __( 'Inner Mongolia / 內蒙古', 'woocommerce' ),
-    'CN7'  => __( 'Liaoning / 辽宁', 'woocommerce' ),
+	'CN7'  => __( 'Liaoning / 辽宁', 'woocommerce' ),
-    'CN8'  => __( 'Jilin / 吉林', 'woocommerce' ),
+	'CN8'  => __( 'Jilin / 吉林', 'woocommerce' ),
-    'CN9'  => __( 'Heilongjiang / 黑龙江', 'woocommerce' ),
+	'CN9'  => __( 'Heilongjiang / 黑龙江', 'woocommerce' ),
-    'CN10' => __( 'Shanghai / 上海', 'woocommerce' ),
+	'CN10' => __( 'Shanghai / 上海', 'woocommerce' ),
-    'CN11' => __( 'Jiangsu / 江苏', 'woocommerce' ),
+	'CN11' => __( 'Jiangsu / 江苏', 'woocommerce' ),
-    'CN12' => __( 'Zhejiang / 浙江', 'woocommerce' ),
+	'CN12' => __( 'Zhejiang / 浙江', 'woocommerce' ),
-    'CN13' => __( 'Anhui / 安徽', 'woocommerce' ),
+	'CN13' => __( 'Anhui / 安徽', 'woocommerce' ),
-    'CN14' => __( 'Fujian / 福建', 'woocommerce' ),
+	'CN14' => __( 'Fujian / 福建', 'woocommerce' ),
-    'CN15' => __( 'Jiangxi / 江西', 'woocommerce' ),
+	'CN15' => __( 'Jiangxi / 江西', 'woocommerce' ),
-    'CN16' => __( 'Shandong / 山东', 'woocommerce' ),
+	'CN16' => __( 'Shandong / 山东', 'woocommerce' ),
-    'CN17' => __( 'Henan / 河南', 'woocommerce' ),
+	'CN17' => __( 'Henan / 河南', 'woocommerce' ),
-    'CN18' => __( 'Hubei / 湖北', 'woocommerce' ),
+	'CN18' => __( 'Hubei / 湖北', 'woocommerce' ),
-    'CN19' => __( 'Hunan / 湖南', 'woocommerce' ),
+	'CN19' => __( 'Hunan / 湖南', 'woocommerce' ),
-    'CN20' => __( 'Guangdong / 广东', 'woocommerce' ),
+	'CN20' => __( 'Guangdong / 广东', 'woocommerce' ),
-    'CN21' => __( 'Guangxi Zhuang / 广西壮族', 'woocommerce' ),
+	'CN21' => __( 'Guangxi Zhuang / 广西壮族', 'woocommerce' ),
-    'CN22' => __( 'Hainan / 海南', 'woocommerce' ),
+	'CN22' => __( 'Hainan / 海南', 'woocommerce' ),
-    'CN23' => __( 'Chongqing / 重庆', 'woocommerce' ),
+	'CN23' => __( 'Chongqing / 重庆', 'woocommerce' ),
-    'CN24' => __( 'Sichuan / 四川', 'woocommerce' ),
+	'CN24' => __( 'Sichuan / 四川', 'woocommerce' ),
-    'CN25' => __( 'Guizhou / 贵州', 'woocommerce' ),
+	'CN25' => __( 'Guizhou / 贵州', 'woocommerce' ),
-    'CN26' => __( 'Shaanxi / 陕西', 'woocommerce' ),
+	'CN26' => __( 'Shaanxi / 陕西', 'woocommerce' ),
-    'CN27' => __( 'Gansu / 甘肃', 'woocommerce' ),
+	'CN27' => __( 'Gansu / 甘肃', 'woocommerce' ),
-    'CN28' => __( 'Qinghai / 青海', 'woocommerce' ),
+	'CN28' => __( 'Qinghai / 青海', 'woocommerce' ),
-    'CN29' => __( 'Ningxia Hui / 宁夏', 'woocommerce' ),
+	'CN29' => __( 'Ningxia Hui / 宁夏', 'woocommerce' ),
-    'CN30' => __( 'Macau / 澳门', 'woocommerce' ),
+	'CN30' => __( 'Macau / 澳门', 'woocommerce' ),
-    'CN31' => __( 'Tibet / 西藏', 'woocommerce' ),
+	'CN31' => __( 'Tibet / 西藏', 'woocommerce' ),
-    'CN32' => __( 'Xinjiang / 新疆', 'woocommerce' )
+	'CN32' => __( 'Xinjiang / 新疆', 'woocommerce' )
 );

i18n/states/ES.php

@@ -2,64 +2,64 @@
 /**
  * Spain states
  *
- * @author   	Samuel Aguilera
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.11
  */
 global $states;
 
-$states["ES"] = array(
+$states['ES'] = array(
-    'C' => __('A Coruña', 'woocommerce'),
+	'C'  => __( 'A Coruña', 'woocommerce' ),
-    'VI' => __('Araba/Álava', 'woocommerce'),
+	'VI' => __( 'Araba/Álava', 'woocommerce' ),
-    'AB' => __('Albacete', 'woocommerce'),
+	'AB' => __( 'Albacete', 'woocommerce' ),
-    'A' => __('Alicante', 'woocommerce'),
+	'A'  => __( 'Alicante', 'woocommerce' ),
-    'AL' => __('Almería', 'woocommerce'),
+	'AL' => __( 'Almería', 'woocommerce' ),
-    'O' => __('Asturias', 'woocommerce'),
+	'O'  => __( 'Asturias', 'woocommerce' ),
-    'AV' => __('Ávila', 'woocommerce'),
+	'AV' => __( 'Ávila', 'woocommerce' ),
-    'BA' => __('Badajoz', 'woocommerce'),
+	'BA' => __( 'Badajoz', 'woocommerce' ),
-    'PM' => __('Baleares', 'woocommerce'),
+	'PM' => __( 'Baleares', 'woocommerce' ),
-    'B' => __('Barcelona', 'woocommerce'),
+	'B'  => __( 'Barcelona', 'woocommerce' ),
-    'BU' => __('Burgos', 'woocommerce'),
+	'BU' => __( 'Burgos', 'woocommerce' ),
-    'CC' => __('Cáceres', 'woocommerce'),
+	'CC' => __( 'Cáceres', 'woocommerce' ),
-    'CA' => __('Cádiz', 'woocommerce'),
+	'CA' => __( 'Cádiz', 'woocommerce' ),
-    'S' => __('Cantabria', 'woocommerce'),
+	'S'  => __( 'Cantabria', 'woocommerce' ),
-    'CS' => __('Castellón', 'woocommerce'),
+	'CS' => __( 'Castellón', 'woocommerce' ),
-    'CE' => __('Ceuta', 'woocommerce'),
+	'CE' => __( 'Ceuta', 'woocommerce' ),
-    'CR' => __('Ciudad Real', 'woocommerce'),
+	'CR' => __( 'Ciudad Real', 'woocommerce' ),
-    'CO' => __('Córdoba', 'woocommerce'),
+	'CO' => __( 'Córdoba', 'woocommerce' ),
-    'CU' => __('Cuenca', 'woocommerce'),
+	'CU' => __( 'Cuenca', 'woocommerce' ),
-    'GI' => __('Girona', 'woocommerce'),
+	'GI' => __( 'Girona', 'woocommerce' ),
-    'GR' => __('Granada', 'woocommerce'),
+	'GR' => __( 'Granada', 'woocommerce' ),
-    'GU' => __('Guadalajara', 'woocommerce'),
+	'GU' => __( 'Guadalajara', 'woocommerce' ),
-    'SS' => __('Gipuzkoa', 'woocommerce'),
+	'SS' => __( 'Gipuzkoa', 'woocommerce' ),
-    'H' => __('Huelva', 'woocommerce'),
+	'H'  => __( 'Huelva', 'woocommerce' ),
-    'HU' => __('Huesca', 'woocommerce'),
+	'HU' => __( 'Huesca', 'woocommerce' ),
-    'J' => __('Jaén', 'woocommerce'),
+	'J'  => __( 'Jaén', 'woocommerce' ),
-    'LO' => __('La Rioja', 'woocommerce'),
+	'LO' => __( 'La Rioja', 'woocommerce' ),
-    'GC' => __('Las Palmas', 'woocommerce'),
+	'GC' => __( 'Las Palmas', 'woocommerce' ),
-    'LE' => __('León', 'woocommerce'),
+	'LE' => __( 'León', 'woocommerce' ),
-    'L' => __('Lleida', 'woocommerce'),
+	'L'  => __( 'Lleida', 'woocommerce' ),
-    'LU' => __('Lugo', 'woocommerce'),
+	'LU' => __( 'Lugo', 'woocommerce' ),
-    'M' => __('Madrid', 'woocommerce'),
+	'M'  => __( 'Madrid', 'woocommerce' ),
-    'MA' => __('Málaga', 'woocommerce'),
+	'MA' => __( 'Málaga', 'woocommerce' ),
-    'ML' => __('Melilla', 'woocommerce'),
+	'ML' => __( 'Melilla', 'woocommerce' ),
-    'MU' => __('Murcia', 'woocommerce'),
+	'MU' => __( 'Murcia', 'woocommerce' ),
-    'NA' => __('Navarra', 'woocommerce'),
+	'NA' => __( 'Navarra', 'woocommerce' ),
-    'OR' => __('Ourense', 'woocommerce'),
+	'OR' => __( 'Ourense', 'woocommerce' ),
-    'P' => __('Palencia', 'woocommerce'),
+	'P'  => __( 'Palencia', 'woocommerce' ),
-    'PO' => __('Pontevedra', 'woocommerce'),
+	'PO' => __( 'Pontevedra', 'woocommerce' ),
-    'SA' => __('Salamanca', 'woocommerce'),
+	'SA' => __( 'Salamanca', 'woocommerce' ),
-    'TF' => __('Santa Cruz de Tenerife', 'woocommerce'),
+	'TF' => __( 'Santa Cruz de Tenerife', 'woocommerce' ),
-    'SG' => __('Segovia', 'woocommerce'),
+	'SG' => __( 'Segovia', 'woocommerce' ),
-    'SE' => __('Sevilla', 'woocommerce'),
+	'SE' => __( 'Sevilla', 'woocommerce' ),
-    'SO' => __('Soria', 'woocommerce'),
+	'SO' => __( 'Soria', 'woocommerce' ),
-    'T' => __('Tarragona', 'woocommerce'),
+	'T'  => __( 'Tarragona', 'woocommerce' ),
-    'TE' => __('Teruel', 'woocommerce'),
+	'TE' => __( 'Teruel', 'woocommerce' ),
-    'TO' => __('Toledo', 'woocommerce'),
+	'TO' => __( 'Toledo', 'woocommerce' ),
-    'V' => __('Valencia', 'woocommerce'),
+	'V'  => __( 'Valencia', 'woocommerce' ),
-    'VA' => __('Valladolid', 'woocommerce'),
+	'VA' => __( 'Valladolid', 'woocommerce' ),
-    'BI' => __('Bizkaia', 'woocommerce'),
+	'BI' => __( 'Bizkaia', 'woocommerce' ),
-    'ZA' => __('Zamora', 'woocommerce'),
+	'ZA' => __( 'Zamora', 'woocommerce' ),
-    'Z' => __('Zaragoza', 'woocommerce')
+	'Z'  => __( 'Zaragoza', 'woocommerce' )
 );

i18n/states/HK.php

@@ -2,9 +2,9 @@
 /**
  * Hong Kong states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/HU.php

@@ -2,9 +2,9 @@
 /**
  * Hungary states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/ID.php

@@ -2,46 +2,46 @@
 /**
  * Indonesia Provinces
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['ID'] = array(
-	'AC'    => __( 'Daerah Istimewa Aceh', 'woocommerce' ),
+	'AC' => __( 'Daerah Istimewa Aceh', 'woocommerce' ),
-    'SU' => __( 'Sumatera Utara', 'woocommerce' ),
+	'SU' => __( 'Sumatera Utara', 'woocommerce' ),
-    'SB' => __( 'Sumatera Barat', 'woocommerce' ),
+	'SB' => __( 'Sumatera Barat', 'woocommerce' ),
-    'RI' => __( 'Riau', 'woocommerce' ),
+	'RI' => __( 'Riau', 'woocommerce' ),
-    'KR' => __( 'Kepulauan Riau', 'woocommerce' ),
+	'KR' => __( 'Kepulauan Riau', 'woocommerce' ),
-    'JA' => __( 'Jambi', 'woocommerce' ),
+	'JA' => __( 'Jambi', 'woocommerce' ),
-    'SS' => __( 'Sumatera Selatan', 'woocommerce' ),
+	'SS' => __( 'Sumatera Selatan', 'woocommerce' ),
-    'BB' => __( 'Bangka Belitung', 'woocommerce' ),
+	'BB' => __( 'Bangka Belitung', 'woocommerce' ),
-    'BE' => __( 'Bengkulu', 'woocommerce' ),
+	'BE' => __( 'Bengkulu', 'woocommerce' ),
-    'LA' => __( 'Lampung', 'woocommerce' ),
+	'LA' => __( 'Lampung', 'woocommerce' ),
-    'JK' => __( 'DKI Jakarta', 'woocommerce' ),
+	'JK' => __( 'DKI Jakarta', 'woocommerce' ),
-    'JB' => __( 'Jawa Barat', 'woocommerce' ),
+	'JB' => __( 'Jawa Barat', 'woocommerce' ),
-    'BT' => __( 'Banten', 'woocommerce' ),
+	'BT' => __( 'Banten', 'woocommerce' ),
-    'JT' => __( 'Jawa Tengah', 'woocommerce' ),
+	'JT' => __( 'Jawa Tengah', 'woocommerce' ),
-    'JI' => __( 'Jawa Timur', 'woocommerce' ),
+	'JI' => __( 'Jawa Timur', 'woocommerce' ),
-    'YO' => __( 'Daerah Istimewa Yogyakarta', 'woocommerce' ),
+	'YO' => __( 'Daerah Istimewa Yogyakarta', 'woocommerce' ),
-    'BA' => __( 'Bali', 'woocommerce' ),
+	'BA' => __( 'Bali', 'woocommerce' ),
-    'NB' => __( 'Nusa Tenggara Barat', 'woocommerce' ),
+	'NB' => __( 'Nusa Tenggara Barat', 'woocommerce' ),
-    'NT' => __( 'Nusa Tenggara Timur', 'woocommerce' ),
+	'NT' => __( 'Nusa Tenggara Timur', 'woocommerce' ),
-    'KB' => __( 'Kalimantan Barat', 'woocommerce' ),
+	'KB' => __( 'Kalimantan Barat', 'woocommerce' ),
-    'KT' => __( 'Kalimantan Tengah', 'woocommerce' ),
+	'KT' => __( 'Kalimantan Tengah', 'woocommerce' ),
-    'KI' => __( 'Kalimantan Timur', 'woocommerce' ),
+	'KI' => __( 'Kalimantan Timur', 'woocommerce' ),
-    'KS' => __( 'Kalimantan Selatan', 'woocommerce' ),
+	'KS' => __( 'Kalimantan Selatan', 'woocommerce' ),
-    'KU' => __( 'Kalimantan Utara', 'woocommerce' ),
+	'KU' => __( 'Kalimantan Utara', 'woocommerce' ),
-    'SA' => __( 'Sulawesi Utara', 'woocommerce' ),
+	'SA' => __( 'Sulawesi Utara', 'woocommerce' ),
-    'ST' => __( 'Sulawesi Tengah', 'woocommerce' ),
+	'ST' => __( 'Sulawesi Tengah', 'woocommerce' ),
-    'SG' => __( 'Sulawesi Tenggara', 'woocommerce' ),
+	'SG' => __( 'Sulawesi Tenggara', 'woocommerce' ),
-    'SR' => __( 'Sulawesi Barat', 'woocommerce' ),
+	'SR' => __( 'Sulawesi Barat', 'woocommerce' ),
-    'SN' => __( 'Sulawesi Selatan', 'woocommerce' ),
+	'SN' => __( 'Sulawesi Selatan', 'woocommerce' ),
-    'GO' => __( 'Gorontalo', 'woocommerce' ),
+	'GO' => __( 'Gorontalo', 'woocommerce' ),
-    'MA' => __( 'Maluku', 'woocommerce' ),
+	'MA' => __( 'Maluku', 'woocommerce' ),
-    'MU' => __( 'Maluku Utara', 'woocommerce' ),
+	'MU' => __( 'Maluku Utara', 'woocommerce' ),
-    'PA' => __( 'Papua', 'woocommerce' ),
+	'PA' => __( 'Papua', 'woocommerce' ),
-    'PB' => __( 'Papua Barat', 'woocommerce' )
+	'PB' => __( 'Papua Barat', 'woocommerce' )
 );

i18n/states/IN.php

@@ -2,9 +2,9 @@
 /**
  * Indian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/IR.php

@@ -2,43 +2,43 @@
 /**
  * Iran States
  *
- * @author    Khalil Delavaran
+ * @author      WooThemes
- * @category  i18n
+ * @category    i18n
- * @package   WooCommerce/i18n
+ * @package     WooCommerce/i18n
- * @version   2.2.3
+ * @version     2.2.3
  */
 global $states;
 
 $states['IR'] = array(
-	'KHZ'  => __( 'Khuzestan  (خوزستان)', 'woocommerce' ),
+	'KHZ' => __( 'Khuzestan  (خوزستان)', 'woocommerce' ),
-	'THR'  => __( 'Tehran  (تهران)', 'woocommerce' ),
+	'THR' => __( 'Tehran  (تهران)', 'woocommerce' ),
-	'ILM'  => __( 'Ilaam (ایلام)', 'woocommerce' ),
+	'ILM' => __( 'Ilaam (ایلام)', 'woocommerce' ),
-	'BHR'  => __( 'Bushehr (بوشهر)', 'woocommerce' ),
+	'BHR' => __( 'Bushehr (بوشهر)', 'woocommerce' ),
-	'ADL'  => __( 'Ardabil (اردبیل)', 'woocommerce' ),
+	'ADL' => __( 'Ardabil (اردبیل)', 'woocommerce' ),
-	'ESF'  => __( 'Isfahan (اصفهان)', 'woocommerce' ),
+	'ESF' => __( 'Isfahan (اصفهان)', 'woocommerce' ),
-	'YZD'  => __( 'Yazd (یزد)', 'woocommerce' ),
+	'YZD' => __( 'Yazd (یزد)', 'woocommerce' ),
-	'KRH'  => __( 'Kermanshah (کرمانشاه)', 'woocommerce' ),
+	'KRH' => __( 'Kermanshah (کرمانشاه)', 'woocommerce' ),
-	'KRN'  => __( 'Kerman (کرمان)', 'woocommerce' ),
+	'KRN' => __( 'Kerman (کرمان)', 'woocommerce' ),
-	'HDN'  => __( 'Hamadan (همدان)', 'woocommerce' ),
+	'HDN' => __( 'Hamadan (همدان)', 'woocommerce' ),
-	'GZN'  => __( 'Ghazvin (قزوین)', 'woocommerce' ),
+	'GZN' => __( 'Ghazvin (قزوین)', 'woocommerce' ),
-	'ZJN'  => __( 'Zanjan (زنجان)', 'woocommerce' ),
+	'ZJN' => __( 'Zanjan (زنجان)', 'woocommerce' ),
-	'LRS'  => __( 'Luristan (لرستان)', 'woocommerce' ),
+	'LRS' => __( 'Luristan (لرستان)', 'woocommerce' ),
-	'ABZ'  => __( 'Alborz (البرز)', 'woocommerce' ),
+	'ABZ' => __( 'Alborz (البرز)', 'woocommerce' ),
-	'EAZ'  => __( 'East Azarbaijan (آذربایجان شرقی)', 'woocommerce' ),
+	'EAZ' => __( 'East Azarbaijan (آذربایجان شرقی)', 'woocommerce' ),
-	'WAZ'  => __( 'West Azarbaijan (آذربایجان غربی)', 'woocommerce' ),
+	'WAZ' => __( 'West Azarbaijan (آذربایجان غربی)', 'woocommerce' ),
-	'CHB'  => __( 'Chaharmahal and Bakhtiari (چهارمحال و بختیاری)', 'woocommerce' ),
+	'CHB' => __( 'Chaharmahal and Bakhtiari (چهارمحال و بختیاری)', 'woocommerce' ),
-	'SKH'  => __( 'South Khorasan (خراسان جنوبی)', 'woocommerce' ),
+	'SKH' => __( 'South Khorasan (خراسان جنوبی)', 'woocommerce' ),
-	'RKH'  => __( 'Razavi Khorasan (خراسان رضوی)', 'woocommerce' ),
+	'RKH' => __( 'Razavi Khorasan (خراسان رضوی)', 'woocommerce' ),
-	'NKH'  => __( 'North Khorasan (خراسان جنوبی)', 'woocommerce' ),
+	'NKH' => __( 'North Khorasan (خراسان جنوبی)', 'woocommerce' ),
-	'SMN'  => __( 'Semnan (سمنان)', 'woocommerce' ),
+	'SMN' => __( 'Semnan (سمنان)', 'woocommerce' ),
-	'FRS'  => __( 'Fars (فارس)', 'woocommerce' ),
+	'FRS' => __( 'Fars (فارس)', 'woocommerce' ),
-	'QHM'  => __( 'Qom (قم)', 'woocommerce' ),
+	'QHM' => __( 'Qom (قم)', 'woocommerce' ),
-	'KRD'  => __( 'Kurdistan / کردستان)', 'woocommerce' ),
+	'KRD' => __( 'Kurdistan / کردستان)', 'woocommerce' ),
-	'KBD'  => __( 'Kohgiluyeh and BoyerAhmad (کهگیلوییه و بویراحمد)', 'woocommerce' ),
+	'KBD' => __( 'Kohgiluyeh and BoyerAhmad (کهگیلوییه و بویراحمد)', 'woocommerce' ),
-	'GLS'  => __( 'Golestan (گلستان)', 'woocommerce' ),
+	'GLS' => __( 'Golestan (گلستان)', 'woocommerce' ),
-	'GIL'  => __( 'Gilan (گیلان)', 'woocommerce' ),
+	'GIL' => __( 'Gilan (گیلان)', 'woocommerce' ),
-	'MZN'  => __( 'Mazandaran (مازندران)', 'woocommerce' ),
+	'MZN' => __( 'Mazandaran (مازندران)', 'woocommerce' ),
-	'MKZ'  => __( 'Markazi (مرکزی)', 'woocommerce' ),
+	'MKZ' => __( 'Markazi (مرکزی)', 'woocommerce' ),
-	'HRZ'  => __( 'Hormozgan (هرمزگان)', 'woocommerce' ),
+	'HRZ' => __( 'Hormozgan (هرمزگان)', 'woocommerce' ),
-	'SBN'  => __( 'Sistan and Baluchestan (سیستان و بلوچستان)', 'woocommerce' )
+	'SBN' => __( 'Sistan and Baluchestan (سیستان و بلوچستان)', 'woocommerce' )
 );

i18n/states/IT.php

@@ -2,122 +2,122 @@
 /**
  * Italy Provinces
  *
- * @author 		Teo Maragakis
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['IT'] = array(
-	'AG'    => __( 'Agrigento', 'woocommerce' ),
+	'AG' => __( 'Agrigento', 'woocommerce' ),
-    'AL' => __( 'Alessandria', 'woocommerce' ),
+	'AL' => __( 'Alessandria', 'woocommerce' ),
-    'AN' => __( 'Ancona', 'woocommerce' ),
+	'AN' => __( 'Ancona', 'woocommerce' ),
-    'AO' => __( 'Aosta', 'woocommerce' ),
+	'AO' => __( 'Aosta', 'woocommerce' ),
-    'AR' => __( 'Arezzo', 'woocommerce' ),
+	'AR' => __( 'Arezzo', 'woocommerce' ),
-    'AP' => __( 'Ascoli Piceno', 'woocommerce' ),
+	'AP' => __( 'Ascoli Piceno', 'woocommerce' ),
-    'AT' => __( 'Asti', 'woocommerce' ),
+	'AT' => __( 'Asti', 'woocommerce' ),
-    'AV' => __( 'Avellino', 'woocommerce' ),
+	'AV' => __( 'Avellino', 'woocommerce' ),
-    'BA' => __( 'Bari', 'woocommerce' ),
+	'BA' => __( 'Bari', 'woocommerce' ),
-    'BT' => __( 'Barletta-Andria-Trani', 'woocommerce' ),
+	'BT' => __( 'Barletta-Andria-Trani', 'woocommerce' ),
-    'BL' => __( 'Belluno', 'woocommerce' ),
+	'BL' => __( 'Belluno', 'woocommerce' ),
-    'BN' => __( 'Benevento', 'woocommerce' ),
+	'BN' => __( 'Benevento', 'woocommerce' ),
-    'BG' => __( 'Bergamo', 'woocommerce' ),
+	'BG' => __( 'Bergamo', 'woocommerce' ),
-    'BI' => __( 'Biella', 'woocommerce' ),
+	'BI' => __( 'Biella', 'woocommerce' ),
-    'BO' => __( 'Bologna', 'woocommerce' ),
+	'BO' => __( 'Bologna', 'woocommerce' ),
-    'BZ' => __( 'Bolzano', 'woocommerce' ),
+	'BZ' => __( 'Bolzano', 'woocommerce' ),
-    'BS' => __( 'Brescia', 'woocommerce' ),
+	'BS' => __( 'Brescia', 'woocommerce' ),
-    'BR' => __( 'Brindisi', 'woocommerce' ),
+	'BR' => __( 'Brindisi', 'woocommerce' ),
-    'CA' => __( 'Cagliari', 'woocommerce' ),
+	'CA' => __( 'Cagliari', 'woocommerce' ),
-    'CL' => __( 'Caltanissetta', 'woocommerce' ),
+	'CL' => __( 'Caltanissetta', 'woocommerce' ),
-    'CB' => __( 'Campobasso', 'woocommerce' ),
+	'CB' => __( 'Campobasso', 'woocommerce' ),
-    'CI' => __( 'Carbonia-Iglesias', 'woocommerce' ),
+	'CI' => __( 'Carbonia-Iglesias', 'woocommerce' ),
-    'CE' => __( 'Caserta', 'woocommerce' ),
+	'CE' => __( 'Caserta', 'woocommerce' ),
-    'CT' => __( 'Catania', 'woocommerce' ),
+	'CT' => __( 'Catania', 'woocommerce' ),
-    'CZ' => __( 'Catanzaro', 'woocommerce' ),
+	'CZ' => __( 'Catanzaro', 'woocommerce' ),
-    'CH' => __( 'Chieti', 'woocommerce' ),
+	'CH' => __( 'Chieti', 'woocommerce' ),
-    'CO' => __( 'Como', 'woocommerce' ),
+	'CO' => __( 'Como', 'woocommerce' ),
-    'CS' => __( 'Cosenza', 'woocommerce' ),
+	'CS' => __( 'Cosenza', 'woocommerce' ),
-    'CR' => __( 'Cremona', 'woocommerce' ),
+	'CR' => __( 'Cremona', 'woocommerce' ),
-    'KR' => __( 'Crotone', 'woocommerce' ),
+	'KR' => __( 'Crotone', 'woocommerce' ),
-    'CN' => __( 'Cuneo', 'woocommerce' ),
+	'CN' => __( 'Cuneo', 'woocommerce' ),
-    'EN' => __( 'Enna', 'woocommerce' ),
+	'EN' => __( 'Enna', 'woocommerce' ),
-    'FM' => __( 'Fermo', 'woocommerce' ),
+	'FM' => __( 'Fermo', 'woocommerce' ),
-    'FE' => __( 'Ferrara', 'woocommerce' ),
+	'FE' => __( 'Ferrara', 'woocommerce' ),
-    'FI' => __( 'Firenze', 'woocommerce' ),
+	'FI' => __( 'Firenze', 'woocommerce' ),
-    'FG' => __( 'Foggia', 'woocommerce' ),
+	'FG' => __( 'Foggia', 'woocommerce' ),
-    'FC' => __( 'Forlì-Cesena', 'woocommerce' ),
+	'FC' => __( 'Forlì-Cesena', 'woocommerce' ),
-    'FR' => __( 'Frosinone', 'woocommerce' ),
+	'FR' => __( 'Frosinone', 'woocommerce' ),
-    'GE' => __( 'Genova', 'woocommerce' ),
+	'GE' => __( 'Genova', 'woocommerce' ),
-    'GO' => __( 'Gorizia', 'woocommerce' ),
+	'GO' => __( 'Gorizia', 'woocommerce' ),
-    'GR' => __( 'Grosseto', 'woocommerce' ),
+	'GR' => __( 'Grosseto', 'woocommerce' ),
-    'IM' => __( 'Imperia', 'woocommerce' ),
+	'IM' => __( 'Imperia', 'woocommerce' ),
-    'IS' => __( 'Isernia', 'woocommerce' ),
+	'IS' => __( 'Isernia', 'woocommerce' ),
-    'SP' => __( 'La Spezia', 'woocommerce' ),
+	'SP' => __( 'La Spezia', 'woocommerce' ),
-    'AQ' => __( 'L'Aquila', 'woocommerce' ),
+	'AQ' => __( 'L'Aquila', 'woocommerce' ),
-    'LT' => __( 'Latina', 'woocommerce' ),
+	'LT' => __( 'Latina', 'woocommerce' ),
-    'LE' => __( 'Lecce', 'woocommerce' ),
+	'LE' => __( 'Lecce', 'woocommerce' ),
-    'LC' => __( 'Lecco', 'woocommerce' ),
+	'LC' => __( 'Lecco', 'woocommerce' ),
-    'LI' => __( 'Livorno', 'woocommerce' ),
+	'LI' => __( 'Livorno', 'woocommerce' ),
-    'LO' => __( 'Lodi', 'woocommerce' ),
+	'LO' => __( 'Lodi', 'woocommerce' ),
-    'LU' => __( 'Lucca', 'woocommerce' ),
+	'LU' => __( 'Lucca', 'woocommerce' ),
-    'MC' => __( 'Macerata', 'woocommerce' ),
+	'MC' => __( 'Macerata', 'woocommerce' ),
-    'MN' => __( 'Mantova', 'woocommerce' ),
+	'MN' => __( 'Mantova', 'woocommerce' ),
-    'MS' => __( 'Massa-Carrara', 'woocommerce' ),
+	'MS' => __( 'Massa-Carrara', 'woocommerce' ),
-    'MT' => __( 'Matera', 'woocommerce' ),
+	'MT' => __( 'Matera', 'woocommerce' ),
-    'ME' => __( 'Messina', 'woocommerce' ),
+	'ME' => __( 'Messina', 'woocommerce' ),
-    'MI' => __( 'Milano', 'woocommerce' ),
+	'MI' => __( 'Milano', 'woocommerce' ),
-    'MO' => __( 'Modena', 'woocommerce' ),
+	'MO' => __( 'Modena', 'woocommerce' ),
-    'MB' => __( 'Monza e della Brianza', 'woocommerce' ),
+	'MB' => __( 'Monza e della Brianza', 'woocommerce' ),
-    'NA' => __( 'Napoli', 'woocommerce' ),
+	'NA' => __( 'Napoli', 'woocommerce' ),
-    'NO' => __( 'Novara', 'woocommerce' ),
+	'NO' => __( 'Novara', 'woocommerce' ),
-    'NU' => __( 'Nuoro', 'woocommerce' ),
+	'NU' => __( 'Nuoro', 'woocommerce' ),
-    'OT' => __( 'Olbia-Tempio', 'woocommerce' ),
+	'OT' => __( 'Olbia-Tempio', 'woocommerce' ),
-    'OR' => __( 'Oristano', 'woocommerce' ),
+	'OR' => __( 'Oristano', 'woocommerce' ),
-    'PD' => __( 'Padova', 'woocommerce' ),
+	'PD' => __( 'Padova', 'woocommerce' ),
-    'PA' => __( 'Palermo', 'woocommerce' ),
+	'PA' => __( 'Palermo', 'woocommerce' ),
-    'PR' => __( 'Parma', 'woocommerce' ),
+	'PR' => __( 'Parma', 'woocommerce' ),
-    'PV' => __( 'Pavia', 'woocommerce' ),
+	'PV' => __( 'Pavia', 'woocommerce' ),
-    'PG' => __( 'Perugia', 'woocommerce' ),
+	'PG' => __( 'Perugia', 'woocommerce' ),
-    'PU' => __( 'Pesaro e Urbino', 'woocommerce' ),
+	'PU' => __( 'Pesaro e Urbino', 'woocommerce' ),
-    'PE' => __( 'Pescara', 'woocommerce' ),
+	'PE' => __( 'Pescara', 'woocommerce' ),
-    'PC' => __( 'Piacenza', 'woocommerce' ),
+	'PC' => __( 'Piacenza', 'woocommerce' ),
-    'PI' => __( 'Pisa', 'woocommerce' ),
+	'PI' => __( 'Pisa', 'woocommerce' ),
-    'PT' => __( 'Pistoia', 'woocommerce' ),
+	'PT' => __( 'Pistoia', 'woocommerce' ),
-    'PN' => __( 'Pordenone', 'woocommerce' ),
+	'PN' => __( 'Pordenone', 'woocommerce' ),
-    'PZ' => __( 'Potenza', 'woocommerce' ),
+	'PZ' => __( 'Potenza', 'woocommerce' ),
-    'PO' => __( 'Prato', 'woocommerce' ),
+	'PO' => __( 'Prato', 'woocommerce' ),
-    'RG' => __( 'Ragusa', 'woocommerce' ),
+	'RG' => __( 'Ragusa', 'woocommerce' ),
-    'RA' => __( 'Ravenna', 'woocommerce' ),
+	'RA' => __( 'Ravenna', 'woocommerce' ),
-    'RC' => __( 'Reggio Calabria', 'woocommerce' ),
+	'RC' => __( 'Reggio Calabria', 'woocommerce' ),
-    'RE' => __( 'Reggio Emilia', 'woocommerce' ),
+	'RE' => __( 'Reggio Emilia', 'woocommerce' ),
-    'RI' => __( 'Rieti', 'woocommerce' ),
+	'RI' => __( 'Rieti', 'woocommerce' ),
-    'RN' => __( 'Rimini', 'woocommerce' ),
+	'RN' => __( 'Rimini', 'woocommerce' ),
-    'RM' => __( 'Roma', 'woocommerce' ),
+	'RM' => __( 'Roma', 'woocommerce' ),
-    'RO' => __( 'Rovigo', 'woocommerce' ),
+	'RO' => __( 'Rovigo', 'woocommerce' ),
-    'SA' => __( 'Salerno', 'woocommerce' ),
+	'SA' => __( 'Salerno', 'woocommerce' ),
-    'VS' => __( 'Medio Campidano', 'woocommerce' ),
+	'VS' => __( 'Medio Campidano', 'woocommerce' ),
-    'SS' => __( 'Sassari', 'woocommerce' ),
+	'SS' => __( 'Sassari', 'woocommerce' ),
-    'SV' => __( 'Savona', 'woocommerce' ),
+	'SV' => __( 'Savona', 'woocommerce' ),
-    'SI' => __( 'Siena', 'woocommerce' ),
+	'SI' => __( 'Siena', 'woocommerce' ),
-    'SR' => __( 'Siracusa', 'woocommerce' ),
+	'SR' => __( 'Siracusa', 'woocommerce' ),
-    'SO' => __( 'Sondrio', 'woocommerce' ),
+	'SO' => __( 'Sondrio', 'woocommerce' ),
-    'TA' => __( 'Taranto', 'woocommerce' ),
+	'TA' => __( 'Taranto', 'woocommerce' ),
-    'TE' => __( 'Teramo', 'woocommerce' ),
+	'TE' => __( 'Teramo', 'woocommerce' ),
-    'TR' => __( 'Terni', 'woocommerce' ),
+	'TR' => __( 'Terni', 'woocommerce' ),
-    'TO' => __( 'Torino', 'woocommerce' ),
+	'TO' => __( 'Torino', 'woocommerce' ),
-    'OG' => __( 'Ogliastra', 'woocommerce' ),
+	'OG' => __( 'Ogliastra', 'woocommerce' ),
-    'TP' => __( 'Trapani', 'woocommerce' ),
+	'TP' => __( 'Trapani', 'woocommerce' ),
-    'TN' => __( 'Trento', 'woocommerce' ),
+	'TN' => __( 'Trento', 'woocommerce' ),
-    'TV' => __( 'Treviso', 'woocommerce' ),
+	'TV' => __( 'Treviso', 'woocommerce' ),
-    'TS' => __( 'Trieste', 'woocommerce' ),
+	'TS' => __( 'Trieste', 'woocommerce' ),
-    'UD' => __( 'Udine', 'woocommerce' ),
+	'UD' => __( 'Udine', 'woocommerce' ),
-    'VA' => __( 'Varese', 'woocommerce' ),
+	'VA' => __( 'Varese', 'woocommerce' ),
-    'VE' => __( 'Venezia', 'woocommerce' ),
+	'VE' => __( 'Venezia', 'woocommerce' ),
-    'VB' => __( 'Verbano-Cusio-Ossola', 'woocommerce' ),
+	'VB' => __( 'Verbano-Cusio-Ossola', 'woocommerce' ),
-    'VC' => __( 'Vercelli', 'woocommerce' ),
+	'VC' => __( 'Vercelli', 'woocommerce' ),
-    'VR' => __( 'Verona', 'woocommerce' ),
+	'VR' => __( 'Verona', 'woocommerce' ),
-    'VV' => __( 'Vibo Valentia', 'woocommerce' ),
+	'VV' => __( 'Vibo Valentia', 'woocommerce' ),
-    'VI' => __( 'Vicenza', 'woocommerce' ),
+	'VI' => __( 'Vicenza', 'woocommerce' ),
-    'VT' => __( 'Viterbo', 'woocommerce' )
+	'VT' => __( 'Viterbo', 'woocommerce' )
 );

i18n/states/JP.php

@@ -1,10 +1,10 @@
 <?php
 /**
- * Japan
+ * Japan States
  *
- * @author 		Kiyoshi Tsuji
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/MX.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Mexico States
+ *
+ * @author      WooThemes
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     2.2.3
+ */
+global $states;
+
+$states['MX'] = array(
+	'DIF' => __( 'Distrito Federal', 'woocommerce' ),
+	'JAL' => __( 'Jalisco', 'woocommerce' ),
+	'NLE' => __( 'Nuevo León', 'woocommerce' ),
+	'AGU' => __( 'Aguascalientes', 'woocommerce' ),
+	'BCN' => __( 'Baja California Norte', 'woocommerce' ),
+	'BCS' => __( 'Baja California Sur', 'woocommerce' ),
+	'CAM' => __( 'Campeche', 'woocommerce' ),
+	'CHP' => __( 'Chiapas', 'woocommerce' ),
+	'CHH' => __( 'Chihuahua', 'woocommerce' ),
+	'COA' => __( 'Coahuila', 'woocommerce' ),
+	'COL' => __( 'Colima', 'woocommerce' ),
+	'DUR' => __( 'Durango', 'woocommerce' ),
+	'GUA' => __( 'Guanajuato', 'woocommerce' ),
+	'GRO' => __( 'Guerrero', 'woocommerce' ),
+	'HID' => __( 'Hidalgo', 'woocommerce' ),
+	'MEX' => __( 'Edo. de México', 'woocommerce' ),
+	'MIC' => __( 'Michoacán', 'woocommerce' ),
+	'MOR' => __( 'Morelos', 'woocommerce' ),
+	'NAY' => __( 'Nayarit', 'woocommerce' ),
+	'OAX' => __( 'Oaxaca', 'woocommerce' ),
+	'PUE' => __( 'Puebla', 'woocommerce' ),
+	'QUE' => __( 'Querétaro', 'woocommerce' ),
+	'ROO' => __( 'Quintana Roo', 'woocommerce' ),
+	'SLP' => __( 'San Luis Potosí', 'woocommerce' ),
+	'SIN' => __( 'Sinaloa', 'woocommerce' ),
+	'SON' => __( 'Sonora', 'woocommerce' ),
+	'TAB' => __( 'Tabasco', 'woocommerce' ),
+	'TAM' => __( 'Tamaulipas', 'woocommerce' ),
+	'TLA' => __( 'Tlaxcala', 'woocommerce' ),
+	'VER' => __( 'Veracruz', 'woocommerce' ),
+	'YUC' => __( 'Yucatán', 'woocommerce' ),
+	'ZAC' => __( 'Zacatecas', 'woocommerce' )
+);

i18n/states/MY.php

@@ -2,9 +2,9 @@
 /**
  * Malaysian states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/NP.php

@@ -0,0 +1,116 @@
+<?php
+/**
+ * Nepal states (Districts)
+ *
+ * @author      WooThemes
+ * @category    i18n
+ * @package     WooCommerce/i18n
+ * @version     2.2.3
+ */
+global $states;
+
+$states['NP'] = array(
+
+	// Mechi
+	'ILL' => __( 'Illam', 'woocommerce' ),
+	'JHA' => __( 'Jhapa', 'woocommerce' ),
+	'PAN' => __( 'Panchthar', 'woocommerce' ),
+	'TAP' => __( 'Taplejung', 'woocommerce' ),
+
+	// Koshi
+	'BHO' => __( 'Bhojpur', 'woocommerce' ),
+	'DKA' => __( 'Dhankuta', 'woocommerce' ),
+	'MOR' => __( 'Morang', 'woocommerce' ),
+	'SUN' => __( 'Sunsari', 'woocommerce' ),
+	'SAN' => __( 'Sankhuwa', 'woocommerce' ),
+	'TER' => __( 'Terhathum', 'woocommerce' ),
+
+	// Sagarmatha
+	'KHO' => __( 'Khotang', 'woocommerce' ),
+	'OKH' => __( 'Okhaldhunga', 'woocommerce' ),
+	'SAP' => __( 'Saptari', 'woocommerce' ),
+	'SIR' => __( 'Siraha', 'woocommerce' ),
+	'SOL' => __( 'Solukhumbu', 'woocommerce' ),
+	'UDA' => __( 'Udayapur', 'woocommerce' ),
+
+	// Janakpur
+	'DHA' => __( 'Dhanusa', 'woocommerce' ),
+	'DLK' => __( 'Dolakha', 'woocommerce' ),
+	'MOH' => __( 'Mohottari', 'woocommerce' ),
+	'RAM' => __( 'Ramechha', 'woocommerce' ),
+	'SAR' => __( 'Sarlahi', 'woocommerce' ),
+	'SIN' => __( 'Sindhuli', 'woocommerce' ),
+
+	// Bagmati
+	'BHA' => __( 'Bhaktapur', 'woocommerce' ),
+	'DHD' => __( 'Dhading', 'woocommerce' ),
+	'KTM' => __( 'Kathmandu', 'woocommerce' ),
+	'KAV' => __( 'Kavrepalanchowk', 'woocommerce' ),
+	'LAL' => __( 'Lalitpur', 'woocommerce' ),
+	'NUW' => __( 'Nuwakot', 'woocommerce' ),
+	'RAS' => __( 'Rasuwa', 'woocommerce' ),
+	'SPC' => __( 'Sindhupalchowk', 'woocommerce' ),
+
+	// Narayani
+	'BAR' => __( 'Bara', 'woocommerce' ),
+	'CHI' => __( 'Chitwan', 'woocommerce' ),
+	'MAK' => __( 'Makwanpur', 'woocommerce' ),
+	'PAR' => __( 'Parsa', 'woocommerce' ),
+	'RAU' => __( 'Rautahat', 'woocommerce' ),
+
+	// Gandaki
+	'GOR' => __( 'Gorkha', 'woocommerce' ),
+	'KAS' => __( 'Kaski', 'woocommerce' ),
+	'LAM' => __( 'Lamjung', 'woocommerce' ),
+	'MAN' => __( 'Manang', 'woocommerce' ),
+	'SYN' => __( 'Syangja', 'woocommerce' ),
+	'TAN' => __( 'Tanahun', 'woocommerce' ),
+
+	// Dhawalagiri
+	'BAG' => __( 'Baglung', 'woocommerce' ),
+	'PBT' => __( 'Parbat', 'woocommerce' ),
+	'MUS' => __( 'Mustang', 'woocommerce' ),
+	'MYG' => __( 'Myagdi', 'woocommerce' ),
+
+	// Lumbini
+	'AGR' => __( 'Agrghakanchi', 'woocommerce' ),
+	'GUL' => __( 'Gulmi', 'woocommerce' ),
+	'KAP' => __( 'Kapilbastu', 'woocommerce' ),
+	'NAW' => __( 'Nawalparasi', 'woocommerce' ),
+	'PAL' => __( 'Palpa', 'woocommerce' ),
+	'RUP' => __( 'Rupandehi', 'woocommerce' ),
+
+	// Rapti
+	'DAN' => __( 'Dang', 'woocommerce' ),
+	'PYU' => __( 'Pyuthan', 'woocommerce' ),
+	'ROL' => __( 'Rolpa', 'woocommerce' ),
+	'RUK' => __( 'Rukum', 'woocommerce' ),
+	'SAL' => __( 'Salyan', 'woocommerce' ),
+
+	// Bheri
+	'BAN' => __( 'Banke', 'woocommerce' ),
+	'BDA' => __( 'Bardiya', 'woocommerce' ),
+	'DAI' => __( 'Dailekh', 'woocommerce' ),
+	'JAJ' => __( 'Jajarkot', 'woocommerce' ),
+	'SUR' => __( 'Surkhet', 'woocommerce' ),
+
+	// Karnali
+	'DOL' => __( 'Dolpa', 'woocommerce' ),
+	'HUM' => __( 'Humla', 'woocommerce' ),
+	'JUM' => __( 'Jumla', 'woocommerce' ),
+	'KAL' => __( 'Kalikot', 'woocommerce' ),
+	'MUG' => __( 'Mugu', 'woocommerce' ),
+
+	// Seti
+	'ACH' => __( 'Achham', 'woocommerce' ),
+	'BJH' => __( 'Bajhang', 'woocommerce' ),
+	'BJU' => __( 'Bajura', 'woocommerce' ),
+	'DOT' => __( 'Doti', 'woocommerce' ),
+	'KAI' => __( 'Kailali', 'woocommerce' ),
+
+	// Mahakali
+	'BAI' => __( 'Baitadi', 'woocommerce' ),
+	'DAD' => __( 'Dadeldhura', 'woocommerce' ),
+	'DAR' => __( 'Darchula', 'woocommerce' ),
+	'KAN' => __( 'Kanchanpur', 'woocommerce' )
+);

i18n/states/NZ.php

@@ -1,10 +1,10 @@
 <?php
 /**
- * NZ states
+ * New Zealand States
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/PE.php

@@ -2,9 +2,9 @@
 /**
  * Peru states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.1.0
  */
 global $states;

i18n/states/TH.php

@@ -2,9 +2,9 @@
 /**
  * Thailand states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/TR.php

@@ -1,94 +1,94 @@
 <?php
 /**
- * Turkey
+ * Turkey States
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['TR'] = array(
-'TR01' => __( 'Adana', 'woocommerce' ),
+	'TR01' => __( 'Adana', 'woocommerce' ),
-'TR02' => __( 'Ad&#305;yaman', 'woocommerce' ),
+	'TR02' => __( 'Ad&#305;yaman', 'woocommerce' ),
-'TR03' => __( 'Afyon', 'woocommerce' ),
+	'TR03' => __( 'Afyon', 'woocommerce' ),
-'TR04' => __( 'A&#287;r&#305;', 'woocommerce' ),
+	'TR04' => __( 'A&#287;r&#305;', 'woocommerce' ),
-'TR05' => __( 'Amasya', 'woocommerce' ),
+	'TR05' => __( 'Amasya', 'woocommerce' ),
-'TR06' => __( 'Ankara', 'woocommerce' ),
+	'TR06' => __( 'Ankara', 'woocommerce' ),
-'TR07' => __( 'Antalya', 'woocommerce' ),
+	'TR07' => __( 'Antalya', 'woocommerce' ),
-'TR08' => __( 'Artvin', 'woocommerce' ),
+	'TR08' => __( 'Artvin', 'woocommerce' ),
-'TR09' => __( 'Ayd&#305;n', 'woocommerce' ),
+	'TR09' => __( 'Ayd&#305;n', 'woocommerce' ),
-'TR10' => __( 'Bal&#305;kesir', 'woocommerce' ),
+	'TR10' => __( 'Bal&#305;kesir', 'woocommerce' ),
-'TR11' => __( 'Bilecik', 'woocommerce' ),
+	'TR11' => __( 'Bilecik', 'woocommerce' ),
-'TR12' => __( 'Bing&#246;l', 'woocommerce' ),
+	'TR12' => __( 'Bing&#246;l', 'woocommerce' ),
-'TR13' => __( 'Bitlis', 'woocommerce' ),
+	'TR13' => __( 'Bitlis', 'woocommerce' ),
-'TR14' => __( 'Bolu', 'woocommerce' ),
+	'TR14' => __( 'Bolu', 'woocommerce' ),
-'TR15' => __( 'Burdur', 'woocommerce' ),
+	'TR15' => __( 'Burdur', 'woocommerce' ),
-'TR16' => __( 'Bursa', 'woocommerce' ),
+	'TR16' => __( 'Bursa', 'woocommerce' ),
-'TR17' => __( '&#199;anakkale', 'woocommerce' ),
+	'TR17' => __( '&#199;anakkale', 'woocommerce' ),
-'TR18' => __( '&#199;ank&#305;r&#305;', 'woocommerce' ),
+	'TR18' => __( '&#199;ank&#305;r&#305;', 'woocommerce' ),
-'TR19' => __( '&#199;orum', 'woocommerce' ),
+	'TR19' => __( '&#199;orum', 'woocommerce' ),
-'TR20' => __( 'Denizli', 'woocommerce' ),
+	'TR20' => __( 'Denizli', 'woocommerce' ),
-'TR21' => __( 'Diyarbak&#305;r', 'woocommerce' ),
+	'TR21' => __( 'Diyarbak&#305;r', 'woocommerce' ),
-'TR22' => __( 'Edirne', 'woocommerce' ),
+	'TR22' => __( 'Edirne', 'woocommerce' ),
-'TR23' => __( 'Elaz&#305;&#287;', 'woocommerce' ),
+	'TR23' => __( 'Elaz&#305;&#287;', 'woocommerce' ),
-'TR24' => __( 'Erzincan', 'woocommerce' ),
+	'TR24' => __( 'Erzincan', 'woocommerce' ),
-'TR25' => __( 'Erzurum', 'woocommerce' ),
+	'TR25' => __( 'Erzurum', 'woocommerce' ),
-'TR26' => __( 'Eski&#351;ehir', 'woocommerce' ),
+	'TR26' => __( 'Eski&#351;ehir', 'woocommerce' ),
-'TR27' => __( 'Gaziantep', 'woocommerce' ),
+	'TR27' => __( 'Gaziantep', 'woocommerce' ),
-'TR28' => __( 'Giresun', 'woocommerce' ),
+	'TR28' => __( 'Giresun', 'woocommerce' ),
-'TR29' => __( 'G&#252;m&#252;&#351;hane', 'woocommerce' ),
+	'TR29' => __( 'G&#252;m&#252;&#351;hane', 'woocommerce' ),
-'TR30' => __( 'Hakkari', 'woocommerce' ),
+	'TR30' => __( 'Hakkari', 'woocommerce' ),
-'TR31' => __( 'Hatay', 'woocommerce' ),
+	'TR31' => __( 'Hatay', 'woocommerce' ),
-'TR32' => __( 'Isparta', 'woocommerce' ),
+	'TR32' => __( 'Isparta', 'woocommerce' ),
-'TR33' => __( '&#304;&#231;el', 'woocommerce' ),
+	'TR33' => __( '&#304;&#231;el', 'woocommerce' ),
-'TR34' => __( '&#304;stanbul', 'woocommerce' ),
+	'TR34' => __( '&#304;stanbul', 'woocommerce' ),
-'TR35' => __( '&#304;zmir', 'woocommerce' ),
+	'TR35' => __( '&#304;zmir', 'woocommerce' ),
-'TR36' => __( 'Kars', 'woocommerce' ),
+	'TR36' => __( 'Kars', 'woocommerce' ),
-'TR37' => __( 'Kastamonu', 'woocommerce' ),
+	'TR37' => __( 'Kastamonu', 'woocommerce' ),
-'TR38' => __( 'Kayseri', 'woocommerce' ),
+	'TR38' => __( 'Kayseri', 'woocommerce' ),
-'TR39' => __( 'K&#305;rklareli', 'woocommerce' ),
+	'TR39' => __( 'K&#305;rklareli', 'woocommerce' ),
-'TR40' => __( 'K&#305;r&#351;ehir', 'woocommerce' ),
+	'TR40' => __( 'K&#305;r&#351;ehir', 'woocommerce' ),
-'TR41' => __( 'Kocaeli', 'woocommerce' ),
+	'TR41' => __( 'Kocaeli', 'woocommerce' ),
-'TR42' => __( 'Konya', 'woocommerce' ),
+	'TR42' => __( 'Konya', 'woocommerce' ),
-'TR43' => __( 'K&#252;tahya', 'woocommerce' ),
+	'TR43' => __( 'K&#252;tahya', 'woocommerce' ),
-'TR44' => __( 'Malatya', 'woocommerce' ),
+	'TR44' => __( 'Malatya', 'woocommerce' ),
-'TR45' => __( 'Manisa', 'woocommerce' ),
+	'TR45' => __( 'Manisa', 'woocommerce' ),
-'TR46' => __( 'Kahramanmara&#351;', 'woocommerce' ),
+	'TR46' => __( 'Kahramanmara&#351;', 'woocommerce' ),
-'TR47' => __( 'Mardin', 'woocommerce' ),
+	'TR47' => __( 'Mardin', 'woocommerce' ),
-'TR48' => __( 'Mu&#287;la', 'woocommerce' ),
+	'TR48' => __( 'Mu&#287;la', 'woocommerce' ),
-'TR49' => __( 'Mu&#351;', 'woocommerce' ),
+	'TR49' => __( 'Mu&#351;', 'woocommerce' ),
-'TR50' => __( 'Nev&#351;ehir', 'woocommerce' ),
+	'TR50' => __( 'Nev&#351;ehir', 'woocommerce' ),
-'TR51' => __( 'Ni&#287;de', 'woocommerce' ),
+	'TR51' => __( 'Ni&#287;de', 'woocommerce' ),
-'TR52' => __( 'Ordu', 'woocommerce' ),
+	'TR52' => __( 'Ordu', 'woocommerce' ),
-'TR53' => __( 'Rize', 'woocommerce' ),
+	'TR53' => __( 'Rize', 'woocommerce' ),
-'TR54' => __( 'Sakarya', 'woocommerce' ),
+	'TR54' => __( 'Sakarya', 'woocommerce' ),
-'TR55' => __( 'Samsun', 'woocommerce' ),
+	'TR55' => __( 'Samsun', 'woocommerce' ),
-'TR56' => __( 'Siirt', 'woocommerce' ),
+	'TR56' => __( 'Siirt', 'woocommerce' ),
-'TR57' => __( 'Sinop', 'woocommerce' ),
+	'TR57' => __( 'Sinop', 'woocommerce' ),
-'TR58' => __( 'Sivas', 'woocommerce' ),
+	'TR58' => __( 'Sivas', 'woocommerce' ),
-'TR59' => __( 'Tekirda&#287;', 'woocommerce' ),
+	'TR59' => __( 'Tekirda&#287;', 'woocommerce' ),
-'TR60' => __( 'Tokat', 'woocommerce' ),
+	'TR60' => __( 'Tokat', 'woocommerce' ),
-'TR61' => __( 'Trabzon', 'woocommerce' ),
+	'TR61' => __( 'Trabzon', 'woocommerce' ),
-'TR62' => __( 'Tunceli', 'woocommerce' ),
+	'TR62' => __( 'Tunceli', 'woocommerce' ),
-'TR63' => __( '&#350;anl&#305;urfa', 'woocommerce' ),
+	'TR63' => __( '&#350;anl&#305;urfa', 'woocommerce' ),
-'TR64' => __( 'U&#351;ak', 'woocommerce' ),
+	'TR64' => __( 'U&#351;ak', 'woocommerce' ),
-'TR65' => __( 'Van', 'woocommerce' ),
+	'TR65' => __( 'Van', 'woocommerce' ),
-'TR66' => __( 'Yozgat', 'woocommerce' ),
+	'TR66' => __( 'Yozgat', 'woocommerce' ),
-'TR67' => __( 'Zonguldak', 'woocommerce' ),
+	'TR67' => __( 'Zonguldak', 'woocommerce' ),
-'TR68' => __( 'Aksaray', 'woocommerce' ),
+	'TR68' => __( 'Aksaray', 'woocommerce' ),
-'TR69' => __( 'Bayburt', 'woocommerce' ),
+	'TR69' => __( 'Bayburt', 'woocommerce' ),
-'TR70' => __( 'Karaman', 'woocommerce' ),
+	'TR70' => __( 'Karaman', 'woocommerce' ),
-'TR71' => __( 'K&#305;r&#305;kkale', 'woocommerce' ),
+	'TR71' => __( 'K&#305;r&#305;kkale', 'woocommerce' ),
-'TR72' => __( 'Batman', 'woocommerce' ),
+	'TR72' => __( 'Batman', 'woocommerce' ),
-'TR73' => __( '&#350;&#305;rnak', 'woocommerce' ),
+	'TR73' => __( '&#350;&#305;rnak', 'woocommerce' ),
-'TR74' => __( 'Bart&#305;n', 'woocommerce' ),
+	'TR74' => __( 'Bart&#305;n', 'woocommerce' ),
-'TR75' => __( 'Ardahan', 'woocommerce' ),
+	'TR75' => __( 'Ardahan', 'woocommerce' ),
-'TR76' => __( 'I&#287;d&#305;r', 'woocommerce' ),
+	'TR76' => __( 'I&#287;d&#305;r', 'woocommerce' ),
-'TR77' => __( 'Yalova', 'woocommerce' ),
+	'TR77' => __( 'Yalova', 'woocommerce' ),
-'TR78' => __( 'Karab&#252;k', 'woocommerce' ),
+	'TR78' => __( 'Karab&#252;k', 'woocommerce' ),
-'TR79' => __( 'Kilis', 'woocommerce' ),
+	'TR79' => __( 'Kilis', 'woocommerce' ),
-'TR80' => __( 'Osmaniye', 'woocommerce' ),
+	'TR80' => __( 'Osmaniye', 'woocommerce' ),
-'TR81' => __( 'D&#252;zce', 'woocommerce' ),
+	'TR81' => __( 'D&#252;zce', 'woocommerce' ),
 );

i18n/states/US.php

@@ -2,9 +2,9 @@
 /**
  * United States
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;

i18n/states/ZA.php

@@ -2,21 +2,21 @@
 /**
  * South African states
  *
- * @author 		WooThemes
+ * @author      WooThemes
- * @category 	i18n
+ * @category    i18n
- * @package 	WooCommerce/i18n
+ * @package     WooCommerce/i18n
  * @version     2.0.0
  */
 global $states;
 
 $states['ZA'] = array(
-	'EC'  => __( 'Eastern Cape', 'woocommerce' ) ,
+	'EC'  => __( 'Eastern Cape', 'woocommerce' ),
-	'FS'  => __( 'Free State', 'woocommerce' ) ,
+	'FS'  => __( 'Free State', 'woocommerce' ),
-	'GP'  => __( 'Gauteng', 'woocommerce' ) ,
+	'GP'  => __( 'Gauteng', 'woocommerce' ),
-	'KZN' => __( 'KwaZulu-Natal', 'woocommerce' ) ,
+	'KZN' => __( 'KwaZulu-Natal', 'woocommerce' ),
-	'LP'  => __( 'Limpopo', 'woocommerce' ) ,
+	'LP'  => __( 'Limpopo', 'woocommerce' ),
-	'MP'  => __( 'Mpumalanga', 'woocommerce' ) ,
+	'MP'  => __( 'Mpumalanga', 'woocommerce' ),
-	'NC'  => __( 'Northern Cape', 'woocommerce' ) ,
+	'NC'  => __( 'Northern Cape', 'woocommerce' ),
-	'NW'  => __( 'North West', 'woocommerce' ) ,
+	'NW'  => __( 'North West', 'woocommerce' ),
 	'WC'  => __( 'Western Cape', 'woocommerce' )
 );

includes/abstracts/abstract-wc-email.php

@@ -1,6 +1,8 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * Abstract Email Class

includes/abstracts/abstract-wc-integration.php

@@ -1,6 +1,8 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WooCommerce Integration class

includes/abstracts/abstract-wc-order.php

@@ -2062,11 +2062,16 @@ abstract class WC_Abstract_Order {
 	 */
 	public function update_status( $new_status, $note = '' ) {
 
-		$old_status = $this->get_status();
+		if ( ! $this->id ) {
-		$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
+			return;
+		}
 
-		// Only update if they differ
+		// Standardise status names.
-		if ( $this->id && $new_status !== $old_status ) {
+		$new_status = 'wc-' === substr( $new_status, 0, 3 ) ? substr( $new_status, 3 ) : $new_status;
+		$old_status = $this->get_status();
+
+		// Only update if they differ - and ensure post_status is a 'wc' status.
+		if ( $new_status !== $old_status || ! in_array( $this->post_status, array_keys( wc_get_order_statuses() ) ) ) {
 
 			// Update the order
 			wp_update_post( array( 'ID' => $this->id, 'post_status' => 'wc-' . $new_status ) );

includes/abstracts/abstract-wc-payment-gateway.php

@@ -1,6 +1,8 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WooCommerce Payment Gateway class

includes/abstracts/abstract-wc-product.php

@@ -975,24 +975,30 @@ class WC_Product {
 	/**
 	 * get_rating_count function.
 	 *
+	 * @param  int $value Optional. Rating value to get the count for. By default
+	 *                              returns the count of all rating values.
 	 * @return int
 	 */
-	public function get_rating_count() {
+	public function get_rating_count( $value = null ) {
 
-		if ( false === ( $count = get_transient( 'wc_rating_count_' . $this->id ) ) ) {
+		$value = intval( $value );
+		$value_suffix = $value ? '_' . $value : '';
+
+		if ( false === ( $count = get_transient( 'wc_rating_count_' . $this->id . $value_suffix ) ) ) {
 
 			global $wpdb;
 
+			$where_meta_value = $value ? $wpdb->prepare( " AND meta_value = %d", $value ) : " AND meta_value > 0";
+
 			$count = $wpdb->get_var( $wpdb->prepare("
 				SELECT COUNT(meta_value) FROM $wpdb->commentmeta
 				LEFT JOIN $wpdb->comments ON $wpdb->commentmeta.comment_id = $wpdb->comments.comment_ID
 				WHERE meta_key = 'rating'
 				AND comment_post_ID = %d
 				AND comment_approved = '1'
-				AND meta_value > 0
+			", $this->id ) . $where_meta_value );
-			", $this->id ) );
 
-			set_transient( 'wc_rating_count_' . $this->id, $count, YEAR_IN_SECONDS );
+			set_transient( 'wc_rating_count_' . $this->id . $value_suffix, $count, YEAR_IN_SECONDS );
 		}
 
 		return $count;

includes/abstracts/abstract-wc-shipping-method.php

@@ -1,6 +1,8 @@
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WooCommerce Shipping Method Class

includes/admin/class-wc-admin-addons.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WC_Admin_Addons Class

includes/admin/class-wc-admin-assets.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Assets' ) ) :
 

includes/admin/class-wc-admin-attributes.php

@@ -10,7 +10,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WC_Admin_Attributes Class

includes/admin/class-wc-admin-dashboard.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Dashboard' ) ) :
 

includes/admin/class-wc-admin-duplicate-product.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Duplicate_Product' ) ) :
 

includes/admin/class-wc-admin-help.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Help' ) ) :
 

includes/admin/class-wc-admin-importers.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Importers' ) ) :
 

includes/admin/class-wc-admin-meta-boxes.php

@@ -10,7 +10,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WC_Admin_Meta_Boxes

includes/admin/class-wc-admin-notices.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Notices' ) ) :
 

includes/admin/class-wc-admin-permalink-settings.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Permalink_Settings' ) ) :
 

includes/admin/class-wc-admin-post-types.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Post_Types' ) ) :
 
@@ -355,13 +357,17 @@ class WC_Admin_Post_Types {
 				$post_type_object = get_post_type_object( $post->post_type );
 				$can_edit_post = current_user_can( $post_type_object->cap->edit_post, $post->ID );
 
-				echo '<div class="code tips" data-tip="' . __( 'Edit coupon', 'woocommerce' ) . '"><a href="' . esc_attr( $edit_link ) . '"><span>' . esc_html( $title ). '</span></a></div>';
+				echo '<a href="' . esc_attr( $edit_link ) . '">' . esc_html( $title ). '</a>';
 
 				_post_states( $post );
 
 				// Get actions
 				$actions = array();
 
+				if ( current_user_can( $post_type_object->cap->edit_post, $post->ID ) ) {
+					$actions['edit'] = '<a href="' . admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=edit', $post->ID ) ) . '">' . __( 'Edit', 'woocommerce' ) . '</a>';
+				}
+
 				if ( current_user_can( $post_type_object->cap->delete_post, $post->ID ) ) {
 					if ( 'trash' == $post->post_status )
 						$actions['untrash'] = "<a title='" . esc_attr( __( 'Restore this item from the Trash', 'woocommerce' ) ) . "' href='" . wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ) . "'>" . __( 'Restore', 'woocommerce' ) . "</a>";
@@ -851,7 +857,11 @@ class WC_Admin_Post_Types {
 		}
 
 		if ( isset( $_REQUEST['_featured'] ) ) {
-			if ( update_post_meta( $post_id, '_featured', isset( $_REQUEST['_featured'] ) ? 'yes' : 'no' ) ) {
+			if ( update_post_meta( $post_id, '_featured', 'yes' ) ) {
+				delete_transient( 'wc_featured_products' );
+			}
+		} else {
+			if ( update_post_meta( $post_id, '_featured', 'no' ) ) {
 				delete_transient( 'wc_featured_products' );
 			}
 		}
@@ -1012,9 +1022,9 @@ class WC_Admin_Post_Types {
 					case 3 :
 						if ( strstr( $regular_price, '%' ) ) {
 							$percent = str_replace( '%', '', $regular_price ) / 100;
-							$new_price = $old_regular_price - ( round ( $old_regular_price * $percent, absint( get_option( 'woocommerce_price_num_decimals' ) ) ) );
+							$new_price = max( 0, $old_regular_price - ( round ( $old_regular_price * $percent, absint( get_option( 'woocommerce_price_num_decimals' ) ) ) ) );
 						} else {
-							$new_price = $old_regular_price - $regular_price;
+							$new_price = max( 0, $old_regular_price - $regular_price );
 						}
 						break;
 
@@ -1033,7 +1043,7 @@ class WC_Admin_Post_Types {
 			if ( ! empty( $_REQUEST['change_sale_price'] ) ) {
 
 				$change_sale_price = absint( $_REQUEST['change_sale_price'] );
-				$sale_price = esc_attr( stripslashes( $_REQUEST['_sale_price'] ) );
+				$sale_price        = esc_attr( stripslashes( $_REQUEST['_sale_price'] ) );
 
 				switch ( $change_sale_price ) {
 					case 1 :
@@ -1050,17 +1060,17 @@ class WC_Admin_Post_Types {
 					case 3 :
 						if ( strstr( $sale_price, '%' ) ) {
 							$percent = str_replace( '%', '', $sale_price ) / 100;
-							$new_price = $old_sale_price - ( $old_sale_price * $percent );
+							$new_price = max( 0, $old_sale_price - ( $old_sale_price * $percent ) );
 						} else {
-							$new_price = $old_sale_price - $sale_price;
+							$new_price = max( 0, $old_sale_price - $sale_price );
 						}
 						break;
 					case 4 :
 						if ( strstr( $sale_price, '%' ) ) {
 							$percent = str_replace( '%', '', $sale_price ) / 100;
-							$new_price = $product->regular_price - ( $product->regular_price * $percent );
+							$new_price = max( 0, $product->regular_price - ( $product->regular_price * $percent ) );
 						} else {
-							$new_price = $product->regular_price - $sale_price;
+							$new_price = max( 0, $product->regular_price - $sale_price );
 						}
 						break;
 
@@ -1337,13 +1347,15 @@ class WC_Admin_Post_Types {
 		switch ( $typenow ) {
 			case 'product' :
 				$this->product_filters();
-			break;
+				break;
-			case 'product' :
+			case 'shop_coupon' :
 				$this->shop_coupon_filters();
-			break;
+				break;
-			case 'product' :
+			case 'shop_order' :
 				$this->shop_order_filters();
-			break;
+				break;
+			default :
+				break;
 		}
 	}
 

includes/admin/class-wc-admin-profile.php

@@ -8,7 +8,9 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Profile' ) ) :
 

includes/admin/class-wc-admin-reports.php

@@ -10,7 +10,9 @@
  * @version     2.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( ! class_exists( 'WC_Admin_Reports' ) ) :
 

includes/admin/class-wc-admin-status.php

@@ -8,7 +8,9 @@
  * @version     2.2.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WC_Admin_Status Class

includes/admin/class-wc-admin-taxonomies.php

@@ -1,8 +1,4 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
 /**
  * Handles taxonomies in admin
  *
@@ -12,6 +8,14 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @category	Class
  * @author 		WooThemes
  */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WC_Admin_Taxonomies class.
+ */
 class WC_Admin_Taxonomies {
 
 	/**

includes/admin/class-wc-admin-welcome.php

@@ -12,7 +12,9 @@
  * @version     2.1.0
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * WC_Admin_Welcome class.

includes/admin/class-wc-admin.php

@@ -1,8 +1,4 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
-}
-
 /**
  * WooCommerce Admin.
  *
@@ -12,6 +8,14 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @package 	WooCommerce/Admin
  * @version     2.1.0
  */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
+/**
+ * WC_Admin class.
+ */
 class WC_Admin {
 
 	/**

includes/admin/importers/class-wc-tax-rate-importer.php

@@ -8,7 +8,9 @@
  * @version     2.0.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 if ( class_exists( 'WP_Importer' ) ) {
 	class WC_Tax_Rate_Importer extends WP_Importer {

includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php

@@ -10,10 +10,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Coupon_Data
+ * WC_Meta_Box_Coupon_Data Class
  */
 class WC_Meta_Box_Coupon_Data {
 

includes/admin/meta-boxes/class-wc-meta-box-order-actions.php

@@ -10,8 +10,13 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
+/**
+ * WC_Meta_Box_Order_Actions Class
+ */
 class WC_Meta_Box_Order_Actions {
 
 	/**

includes/admin/meta-boxes/class-wc-meta-box-order-data.php

@@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 /**
- * WC_Meta_Box_Order_Data
+ * WC_Meta_Box_Order_Data Class
  */
 class WC_Meta_Box_Order_Data {
 
@@ -247,10 +247,12 @@ class WC_Meta_Box_Order_Data {
 
 								switch ( $field['type'] ) {
 									case 'select' :
-										woocommerce_wp_select( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'options' => $field['options'] ) );
+										// allow for setting a default value programaticaly, and draw the selectbox
+										woocommerce_wp_select( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'options' => $field['options'], 'value' => isset( $field['value'] ) ? $field['value'] : '' ) );
 									break;
 									default :
-										woocommerce_wp_text_input( array( 'id' => '_billing_' . $key, 'label' => $field['label'] ) );
+										// allow for setting a default value programaticaly, and draw the textbox
+										woocommerce_wp_text_input( array( 'id' => '_billing_' . $key, 'label' => $field['label'], 'value' => isset( $field['value'] ) ? $field['value'] : '' ) );
 									break;
 								}
 							}

includes/admin/meta-boxes/class-wc-meta-box-order-downloads.php

@@ -8,10 +8,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Order_Downloads
+ * WC_Meta_Box_Order_Downloads Class
  */
 class WC_Meta_Box_Order_Downloads {
 

includes/admin/meta-boxes/class-wc-meta-box-order-items.php

@@ -10,8 +10,13 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
+/**
+ * WC_Meta_Box_Order_Items Class
+ */
 class WC_Meta_Box_Order_Items {
 
 	/**

includes/admin/meta-boxes/class-wc-meta-box-order-notes.php

@@ -8,10 +8,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Order_Notes
+ * WC_Meta_Box_Order_Notes Class
  */
 class WC_Meta_Box_Order_Notes {
 

includes/admin/meta-boxes/class-wc-meta-box-order-reviews.php

@@ -10,10 +10,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Order_Reviews
+ * WC_Meta_Box_Order_Reviews Class
  */
 class WC_Meta_Box_Order_Reviews {
 

includes/admin/meta-boxes/class-wc-meta-box-product-data.php

@@ -15,7 +15,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 }
 
 /**
- * WC_Meta_Box_Product_Data
+ * WC_Meta_Box_Product_Data Class
  */
 class WC_Meta_Box_Product_Data {
 
@@ -1267,7 +1267,6 @@ class WC_Meta_Box_Product_Data {
 
 			if ( $clear_parent_ids ) {
 				foreach ( $clear_parent_ids as $clear_id ) {
-
 					$children_by_price = get_posts( array(
 						'post_parent'    => $clear_id,
 						'orderby'        => 'meta_value_num',
@@ -1279,12 +1278,13 @@ class WC_Meta_Box_Product_Data {
 					) );
 
 					if ( $children_by_price ) {
-
 						foreach ( $children_by_price as $child ) {
 							$child_price = get_post_meta( $child, '_price', true );
 							update_post_meta( $clear_id, '_price', $child_price );
 						}
 					}
+
+					wc_delete_product_transients( $clear_id );
 				}
 			}
 		}

includes/admin/meta-boxes/class-wc-meta-box-product-images.php

@@ -10,10 +10,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Product_Images
+ * WC_Meta_Box_Product_Images Class
  */
 class WC_Meta_Box_Product_Images {
 

includes/admin/meta-boxes/class-wc-meta-box-product-short-description.php

@@ -10,10 +10,12 @@
  * @version     2.1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
- * WC_Meta_Box_Product_Short_Description
+ * WC_Meta_Box_Product_Short_Description Class
  */
 class WC_Meta_Box_Product_Short_Description {
 

includes/admin/meta-boxes/views/html-order-download-permission.php

@@ -1,5 +1,9 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 ?>
 <div class="wc-metabox closed">
 	<h3 class="fixed">

includes/admin/meta-boxes/views/html-order-fee.php

@@ -1,7 +1,9 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
+
 ?>
 <tr class="fee <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_item_id="<?php echo $item_id; ?>">
 	<td class="check-column"><input type="checkbox" /></td>
@@ -42,7 +44,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
+		if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
 			$tax_data      = maybe_unserialize( $line_tax_data );
 

includes/admin/meta-boxes/views/html-order-item.php

@@ -1,7 +1,9 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
+
 ?>
 <tr class="item <?php echo apply_filters( 'woocommerce_admin_html_order_item_class', ( ! empty( $class ) ? $class : '' ), $item ); ?>" data-order_item_id="<?php echo $item_id; ?>">
 	<td class="check-column"><input type="checkbox" /></td>
@@ -45,6 +47,8 @@ if ( ! defined( 'ABSPATH' ) ) {
 		<input type="hidden" class="order_item_id" name="order_item_id[]" value="<?php echo esc_attr( $item_id ); ?>" />
 		<input type="hidden" name="order_item_tax_class[<?php echo absint( $item_id ); ?>]" value="<?php echo isset( $item['tax_class'] ) ? esc_attr( $item['tax_class'] ) : ''; ?>" />
 
+		<?php do_action( 'woocommerce_before_order_itemmeta', $item_id, $item, $_product ) ?>
+
 		<div class="view">
 			<?php
 				global $wpdb;
@@ -144,6 +148,9 @@ if ( ! defined( 'ABSPATH' ) ) {
 				</tfoot>
 			</table>
 		</div>
+
+		<?php do_action( 'woocommerce_after_order_itemmeta', $item_id, $item, $_product ) ?>
+
 	</td>
 
 	<?php do_action( 'woocommerce_admin_order_item_values', $_product, $item, absint( $item_id ) ); ?>
@@ -198,7 +205,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
+		if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 			$line_tax_data = isset( $item['line_tax_data'] ) ? $item['line_tax_data'] : '';
 			$tax_data      = maybe_unserialize( $line_tax_data );
 

includes/admin/meta-boxes/views/html-order-items.php

@@ -1,4 +1,5 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
@@ -56,7 +57,7 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
 				<th class="line_cost"><?php _e( 'Total', 'woocommerce' ); ?></th>
 
 				<?php
-					if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
+					if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 						foreach ( $order_taxes as $tax_id => $tax_item ) :
 							$tax_class      = wc_get_tax_class_by_tax_id( $tax_item['rate_id'] );
 							$tax_class_name = isset( $classes_options[ $tax_class ] ) ? $classes_options[ $tax_class ] : __( 'Tax', 'woocommerce' );
@@ -214,6 +215,8 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
 	<p class="add-items">
 		<?php if ( $order->is_editable() ) : ?>
 			<button type="button" class="button add-line-item"><?php _e( 'Add line item(s)', 'woocommerce' ); ?></button>
+		<?php else : ?>
+			<span class="description tips" data-tip="<?php esc_attr_e( 'To edit this order change the status back to "Pending"', 'woocommerce' ); ?>"><?php _e( 'This order has been paid for and is no longer editable', 'woocommerce' ); ?></span>
 		<?php endif; ?>
 		<?php if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) && $order->is_editable() ) : ?>
 			<button type="button" class="button add-order-tax"><?php _e( 'Add Tax', 'woocommerce' ); ?></button>
@@ -233,6 +236,10 @@ if ( 'yes' == get_option( 'woocommerce_calc_taxes' ) ) {
 	<button type="button" class="button add-order-shipping"><?php _e( 'Add shipping cost', 'woocommerce' ); ?></button>
 	<button type="button" class="button cancel-action"><?php _e( 'Cancel', 'woocommerce' ); ?></button>
 	<button type="button" class="button button-primary save-action"><?php _e( 'Save', 'woocommerce' ); ?></button>
+	<?php
+		// allow adding custom buttons
+		do_action( 'woocommerce_order_item_add_line_buttons', $order );
+	?>
 </div>
 <?php if ( ( $order->get_total() - $order->get_total_refunded() ) > 0 ) : ?>
 <div class="wc-order-data-row wc-order-refund-items" style="display: none;">

includes/admin/meta-boxes/views/html-order-refund.php

@@ -1,7 +1,9 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
+
 $who_refunded = new WP_User( $refund->post->post_author );
 ?>
 <tr class="refund <?php echo ( ! empty( $class ) ) ? $class : ''; ?>" data-order_refund_id="<?php echo $refund->id; ?>">

includes/admin/meta-boxes/views/html-order-shipping.php

@@ -1,4 +1,5 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }
@@ -67,7 +68,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	</td>
 
 	<?php
-		if ( isset( $legacy_order ) && ! $legacy_order && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
+		if ( empty( $legacy_order ) && 'yes' == get_option( 'woocommerce_calc_taxes' ) ) :
 			$shipping_taxes = isset( $item['taxes'] ) ? $item['taxes'] : '';
 			$tax_data       = maybe_unserialize( $shipping_taxes );
 

includes/admin/meta-boxes/views/html-variation-admin.php

@@ -1,5 +1,9 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
+
 ?>
 <div class="woocommerce_variation wc-metabox closed">
 	<h3>

includes/admin/reports/class-wc-admin-report.php

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit; // Exit if accessed directly
+}
 
 /**
  * Admin Report

includes/admin/reports/class-wc-report-customer-list.php

@@ -1,4 +1,5 @@
 <?php
+
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
 }