diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9fc6868361b..fb7fef8d7d3 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,13 +8,13 @@
* Tweak - Define arg and return data types, added extra descriptions, and correctly cast IDs in the Rest API.
* Tweak - Handle custom error data in WC_REST_Exception.
* Tweak - Display conflicted product ID when using a duplicate SKU via the API.
-* Localisation - Add Finnish defaults to the installer.
+* Localization - Add Finnish defaults to the installer.
= 2.6.13 - 2017-01-18 =
* Fix - Demo store banner styling in 2017.
-* Fix - Removed default instructions from COD, BACS and Cheque gateways so displayed messages can be unset.
+* Fix - Removed default instructions from COD, BACS and Check gateways so displayed messages can be unset.
* Fix - Made variation options update on first load.
-* Localisation - Added Romanian locale to the installer.
+* Localization - Added Romanian locale to the installer.
= 2.6.12 - 2017-01-12 =
* Fix - Make images shown up on pageload when using ajax variations.
diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot
index 886296ecbae..2cd23013471 100644
--- a/i18n/languages/woocommerce.pot
+++ b/i18n/languages/woocommerce.pot
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.7.0-beta-4\n"
"Report-Msgid-Bugs-To: https://github.com/woocommerce/woocommerce/issues\n"
-"POT-Creation-Date: 2017-02-24 20:30:33+00:00\n"
+"POT-Creation-Date: 2017-02-27 22:59:14+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -462,7 +462,7 @@ msgid "Iraq"
msgstr ""
#: i18n/countries.php:124
-msgid "Republic of Ireland"
+msgid "Ireland"
msgstr ""
#: i18n/countries.php:125
@@ -5140,19 +5140,7 @@ msgstr ""
msgid "Shipping:"
msgstr ""
-#: includes/abstracts/abstract-wc-order.php:1480
-#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:328
-#: includes/shortcodes/class-wc-shortcode-checkout.php:149
-#: templates/checkout/thankyou.php:63
-msgid "Payment method:"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-order.php:1488
-#: includes/admin/meta-boxes/views/html-order-items.php:206
-msgid "Refund"
-msgstr ""
-
-#: includes/abstracts/abstract-wc-order.php:1495
+#: includes/abstracts/abstract-wc-order.php:1479
#: includes/admin/meta-boxes/views/html-order-item.php:97
#: includes/admin/meta-boxes/views/html-order-item.php:139
#: includes/shortcodes/class-wc-shortcode-checkout.php:144
@@ -6423,7 +6411,7 @@ msgstr ""
#: includes/admin/class-wc-admin-help.php:117
#: includes/admin/class-wc-admin-pointers.php:192
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:140
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:184
#: includes/class-wc-post-types.php:83
#: includes/widgets/class-wc-widget-product-categories.php:43
msgid "Product categories"
@@ -7212,7 +7200,7 @@ msgid "Coupon type"
msgstr ""
#: includes/admin/class-wc-admin-post-types.php:284
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:72
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:78
#: includes/admin/reports/class-wc-report-sales-by-date.php:636
msgid "Coupon amount"
msgstr ""
@@ -7656,13 +7644,13 @@ msgstr ""
#: includes/admin/class-wc-admin-profile.php:84
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:86
-#: includes/class-wc-countries.php:1078 includes/class-wc-emails.php:393
+#: includes/class-wc-countries.php:1078 includes/class-wc-emails.php:396
msgid "Phone"
msgstr ""
#: includes/admin/class-wc-admin-profile.php:88
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:83
-#: includes/class-wc-countries.php:1087 includes/class-wc-emails.php:386
+#: includes/class-wc-countries.php:1087 includes/class-wc-emails.php:389
#: includes/class-wc-form-handler.php:197
#: templates/myaccount/form-edit-account.php:40
#: templates/myaccount/form-login.php:91
@@ -8172,7 +8160,7 @@ msgstr ""
#: includes/admin/class-wc-admin-taxonomies.php:95
#: includes/admin/class-wc-admin-taxonomies.php:203
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:104
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:148
#: includes/admin/settings/class-wc-settings-products.php:28
#: includes/class-wc-post-types.php:258
#: includes/widgets/class-wc-widget-products.php:29
@@ -8495,19 +8483,19 @@ msgstr ""
msgid "Usage limits"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:69
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:71
msgid "Discount type"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:72
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:80
msgid "Value of the coupon."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:75
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:89
msgid "Allow free shipping"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:75
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:90
msgid ""
"Check this box if the coupon grants free shipping. A free shipping method must be enabled in your shipping "
@@ -8515,61 +8503,61 @@ msgid ""
"Shipping Requires\" setting)."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:79
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:99
msgid "Coupon expiry date"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:89
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:115
msgid "Minimum spend"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:89
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:116
msgid "No minimum"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:89
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:117
msgid ""
"This field allows you to set the minimum spend (subtotal, including taxes) "
"allowed to use the coupon."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:92
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:124
msgid "Maximum spend"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:92
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:125
msgid "No maximum"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:92
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:126
msgid ""
"This field allows you to set the maximum spend (subtotal, including taxes) "
"allowed when using the coupon."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:95
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:133
msgid "Individual use only"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:95
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:134
msgid ""
"Check this box if the coupon cannot be used in conjunction with other "
"coupons."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:98
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:140
msgid "Exclude sale items"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:98
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:141
msgid ""
"Check this box if the coupon should not apply to items on sale. Per-item "
"coupons will only work if the item is not on sale. Per-cart coupons will "
"only work if there are no sale items in the cart."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:105
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:122
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:149
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:166
#: includes/admin/meta-boxes/views/html-order-items.php:286
#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:6
#: includes/admin/meta-boxes/views/html-product-data-linked-products.php:22
@@ -8578,98 +8566,98 @@ msgstr ""
msgid "Search for a product…"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:116
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:160
msgid ""
"Products which need to be in the cart to use this coupon or, for \"Product "
"Discounts\", which products are discounted."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:121
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:165
msgid "Exclude products"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:133
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:177
msgid ""
"Products which must not be in the cart to use this coupon or, for \"Product "
"Discounts\", which products are not discounted."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:141
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:185
msgid "Any category"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:150
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:194
msgid ""
"A product must be in this category for the coupon to remain valid or, for "
"\"Product Discounts\", products in these categories will be discounted."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:155
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:199
msgid "Exclude categories"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:156
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:200
msgid "No categories"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:165
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:209
msgid ""
"Product must not be in this category for the coupon to remain valid or, for "
"\"Product Discounts\", products in these categories will not be discounted."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:173
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:217
msgid "Email restrictions"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:174
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:218
msgid "No restrictions"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:175
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:219
msgid ""
"List of allowed emails to check against the customer's billing email when "
"an order is placed. Separate email addresses with commas."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:197
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:241
msgid "Usage limit per coupon"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:198
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:230
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:242
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:274
msgid "Unlimited usage"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:199
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:243
msgid "How many times this coupon can be used before it is void."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:213
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:257
msgid "Limit usage to X items"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:214
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:258
msgid "Apply to all qualifying items in cart"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:215
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:259
msgid ""
"The maximum number of individual items this coupon can apply to when using "
"product discounts. Leave blank to apply to all qualifying items in cart."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:229
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:273
msgid "Usage limit per user"
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:231
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:275
msgid ""
"How many times this coupon can be used by an individual user. Uses billing "
"email for guests, and user ID for logged in users."
msgstr ""
-#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:267
+#: includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php:311
msgid ""
"Coupon code already exists - customers will use the latest coupon with this "
"code."
@@ -8772,6 +8760,13 @@ msgstr ""
msgid "No billing address set."
msgstr ""
+#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:328
+#: includes/class-wc-order.php:1701
+#: includes/shortcodes/class-wc-shortcode-checkout.php:149
+#: templates/checkout/thankyou.php:63
+msgid "Payment method:"
+msgstr ""
+
#: includes/admin/meta-boxes/class-wc-meta-box-order-data.php:330
#: includes/admin/meta-boxes/views/html-order-shipping.php:24
#: includes/admin/settings/class-wc-settings-emails.php:101
@@ -9108,6 +9103,11 @@ msgstr ""
msgid "Add tax"
msgstr ""
+#: includes/admin/meta-boxes/views/html-order-items.php:206
+#: includes/class-wc-order.php:1709
+msgid "Refund"
+msgstr ""
+
#: includes/admin/meta-boxes/views/html-order-items.php:213
msgid "Calculate taxes"
msgstr ""
@@ -11368,10 +11368,12 @@ msgid "Country code"
msgstr ""
#: includes/admin/settings/class-wc-settings-tax.php:171
+#: includes/admin/settings/views/html-settings-tax.php:25
msgid "State code"
msgstr ""
#: includes/admin/settings/class-wc-settings-tax.php:175
+#: includes/admin/settings/views/html-settings-tax.php:29
msgid "Tax name"
msgstr ""
@@ -11647,10 +11649,6 @@ msgstr ""
msgid "A 2 digit country code, e.g. US. Leave blank to apply to all."
msgstr ""
-#: includes/admin/settings/views/html-settings-tax.php:25
-msgid "State code"
-msgstr ""
-
#: includes/admin/settings/views/html-settings-tax.php:25
msgid "A 2 digit state code, e.g. AL. Leave blank to apply to all."
msgstr ""
@@ -11676,10 +11674,6 @@ msgstr ""
msgid "Enter a tax rate (percentage) to 4 decimal places."
msgstr ""
-#: includes/admin/settings/views/html-settings-tax.php:29
-msgid "Tax name"
-msgstr ""
-
#: includes/admin/settings/views/html-settings-tax.php:29
msgid "Enter a name for this tax rate."
msgstr ""
@@ -15818,7 +15812,7 @@ msgstr ""
#: includes/api/legacy/v2/class-wc-api-orders.php:1609
#: includes/api/legacy/v3/class-wc-api-orders.php:1655
-#: includes/wc-order-functions.php:629
+#: includes/wc-order-functions.php:634
msgid ""
"An error occurred while attempting to create the refund using the payment "
"gateway API."
@@ -17363,7 +17357,7 @@ msgstr ""
#: includes/data-stores/abstract-wc-order-data-store-cpt.php:86
#: includes/shortcodes/class-wc-shortcode-checkout.php:169
#: includes/shortcodes/class-wc-shortcode-my-account.php:118
-#: includes/wc-order-functions.php:610
+#: includes/wc-order-functions.php:615
msgid "Invalid order."
msgstr ""
@@ -17400,33 +17394,33 @@ msgstr ""
msgid "Go to shop"
msgstr ""
-#: includes/class-wc-emails.php:379
+#: includes/class-wc-emails.php:382
msgid "Note"
msgstr ""
-#: includes/class-wc-emails.php:432
+#: includes/class-wc-emails.php:438
msgid "Product low in stock"
msgstr ""
-#: includes/class-wc-emails.php:435
+#: includes/class-wc-emails.php:441
#. translators: 1: product name 2: items in stock
msgid "%1$s is low in stock. There are %2$d left."
msgstr ""
-#: includes/class-wc-emails.php:455
+#: includes/class-wc-emails.php:461
msgid "Product out of stock"
msgstr ""
-#: includes/class-wc-emails.php:457
+#: includes/class-wc-emails.php:463
#. translators: %s: product name
msgid "%s is out of stock."
msgstr ""
-#: includes/class-wc-emails.php:486
+#: includes/class-wc-emails.php:492
msgid "Product backorder"
msgstr ""
-#: includes/class-wc-emails.php:487
+#: includes/class-wc-emails.php:493
msgid "%1$s units of %2$s have been backordered in order #%3$s."
msgstr ""
@@ -18286,8 +18280,8 @@ msgstr ""
msgid "Invalid product."
msgstr ""
-#: includes/data-stores/class-wc-product-variation-data-store-cpt.php:77
-msgid "Variation #"
+#: includes/data-stores/class-wc-product-variable-data-store-cpt.php:316
+msgid "Auto Draft"
msgstr ""
#: includes/emails/class-wc-email-cancelled-order.php:27
@@ -20816,23 +20810,23 @@ msgstr ""
msgid "Invalid refund amount."
msgstr ""
-#: includes/wc-order-functions.php:619
+#: includes/wc-order-functions.php:624
msgid "The payment gateway for this order does not exist."
msgstr ""
-#: includes/wc-order-functions.php:623
+#: includes/wc-order-functions.php:628
msgid "The payment gateway for this order does not support automatic refunds."
msgstr ""
-#: includes/wc-order-functions.php:663
+#: includes/wc-order-functions.php:668
msgid "Item #%1$s stock increased from %2$s to %3$s."
msgstr ""
-#: includes/wc-order-functions.php:723 includes/wc-update-functions.php:773
+#: includes/wc-order-functions.php:728 includes/wc-update-functions.php:773
msgid "Order fully refunded"
msgstr ""
-#: includes/wc-order-functions.php:847
+#: includes/wc-order-functions.php:852
msgid "Unpaid order cancelled - time limit reached."
msgstr ""
diff --git a/includes/admin/settings/views/html-settings-tax.php b/includes/admin/settings/views/html-settings-tax.php
index dfa77cb2267..234024ad07b 100644
--- a/includes/admin/settings/views/html-settings-tax.php
+++ b/includes/admin/settings/views/html-settings-tax.php
@@ -22,11 +22,11 @@ if ( ! defined( 'ABSPATH' ) ) {
| |
- |
+ |
|
|
|
- |
+ |
|
|
|