diff --git a/i18n/languages/woocommerce-admin.pot b/i18n/languages/woocommerce-admin.pot
index 8802caafd41..ea725da2d30 100644
--- a/i18n/languages/woocommerce-admin.pot
+++ b/i18n/languages/woocommerce-admin.pot
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.1-bleeding Admin\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2013-09-16 23:40:17+00:00\n"
+"POT-Creation-Date: 2013-09-22 23:32:42+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -708,8 +708,8 @@ msgstr ""
#: includes/admin/class-wc-admin-profile.php:111
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php:49
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-order-data.php:96
-#: includes/admin/settings/class-wc-settings-tax.php:223
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:242
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "City"
msgstr ""
@@ -2095,8 +2095,8 @@ msgstr ""
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-order-items.php:46
#: includes/admin/reports/class-wc-report-taxes-by-code.php:118
#: includes/admin/settings/class-wc-settings-tax.php:25
-#: includes/admin/settings/class-wc-settings-tax.php:517
-#: includes/admin/settings/class-wc-settings-tax.php:605
+#: includes/admin/settings/class-wc-settings-tax.php:536
+#: includes/admin/settings/class-wc-settings-tax.php:624
msgid "Tax"
msgstr ""
@@ -2165,8 +2165,8 @@ msgstr ""
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-order-totals.php:62
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-product-data.php:94
#: includes/admin/settings/class-wc-settings-shipping.php:25
-#: includes/admin/settings/class-wc-settings-tax.php:233
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:252
+#: includes/admin/settings/class-wc-settings-tax.php:369
#: includes/admin/views/html-admin-page-addons.php:13
msgid "Shipping"
msgstr ""
@@ -2394,14 +2394,14 @@ msgstr ""
#: includes/admin/post-types/meta-boxes/views/html-order-item.php:123
#: includes/admin/post-types/meta-boxes/views/html-order-item.php:134
#: includes/admin/settings/class-wc-settings-tax.php:122
-#: includes/admin/settings/class-wc-settings-tax.php:210
+#: includes/admin/settings/class-wc-settings-tax.php:229
#: includes/admin/views/html-bulk-edit-product.php:83
#: includes/admin/views/html-quick-edit-product.php:61
msgid "Standard"
msgstr ""
#: includes/admin/post-types/meta-boxes/class-wc-meta-box-product-data.php:235
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:369
#: includes/admin/views/html-bulk-edit-product.php:77
#: includes/admin/views/html-quick-edit-product.php:56
msgid "Tax Class"
@@ -2989,7 +2989,7 @@ msgstr ""
#: includes/admin/reports/class-wc-report-sales-by-product.php:326
#: includes/admin/reports/class-wc-report-taxes-by-code.php:29
#: includes/admin/reports/class-wc-report-taxes-by-date.php:29
-#: includes/admin/settings/class-wc-settings-tax.php:256
+#: includes/admin/settings/class-wc-settings-tax.php:275
msgid "Export CSV"
msgstr ""
@@ -4256,121 +4256,135 @@ msgid "Reduced Rate%sZero Rate"
msgstr ""
#: includes/admin/settings/class-wc-settings-tax.php:144
-msgid "Display prices during cart/checkout:"
+msgid "Display prices in the shop:"
msgstr ""
#: includes/admin/settings/class-wc-settings-tax.php:149
+#: includes/admin/settings/class-wc-settings-tax.php:168
msgid "Including tax"
msgstr ""
#: includes/admin/settings/class-wc-settings-tax.php:150
+#: includes/admin/settings/class-wc-settings-tax.php:169
msgid "Excluding tax"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:210
+#: includes/admin/settings/class-wc-settings-tax.php:155
+msgid "Price display suffix:"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:159
+msgid "Define text to show after your product prices. This could be, for example, \"inc. Vat\" to explain your pricing. You can also have prices substituted here using one of the following: {price_including_tax}, {price_excluding_tax}."
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:163
+msgid "Display prices during cart/checkout:"
+msgstr ""
+
+#: includes/admin/settings/class-wc-settings-tax.php:229
msgid "Tax Rates for the \"%s\" Class"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:211
+#: includes/admin/settings/class-wc-settings-tax.php:230
msgid "Define tax rates for countries and states below. See here for available alpha-2 country codes."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:217
+#: includes/admin/settings/class-wc-settings-tax.php:236
msgid "Country Code"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:217
+#: includes/admin/settings/class-wc-settings-tax.php:236
msgid "A 2 digit country code, e.g. US. Leave blank to apply to all."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:219
+#: includes/admin/settings/class-wc-settings-tax.php:238
msgid "State Code"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:219
+#: includes/admin/settings/class-wc-settings-tax.php:238
msgid "A 2 digit state code, e.g. AL. Leave blank to apply to all."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:221
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:240
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "ZIP/Postcode"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:221
+#: includes/admin/settings/class-wc-settings-tax.php:240
msgid "Postcode for this rule. Semi-colon (;) separate multiple values. Leave blank to apply to all areas. Wildcards (*) can be used. Ranges for numeric postcodes (e.g. 12345-12350) will be expanded into individual postcodes."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:223
+#: includes/admin/settings/class-wc-settings-tax.php:242
msgid "Cities for this rule. Semi-colon (;) separate multiple values. Leave blank to apply to all cities."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:225
+#: includes/admin/settings/class-wc-settings-tax.php:244
msgid "Rate %"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:225
+#: includes/admin/settings/class-wc-settings-tax.php:244
msgid "Enter a tax rate (percentage) to 4 decimal places."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:227
+#: includes/admin/settings/class-wc-settings-tax.php:246
msgid "Tax Name"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:227
+#: includes/admin/settings/class-wc-settings-tax.php:246
msgid "Enter a name for this tax rate."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:229
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:248
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "Priority"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:229
+#: includes/admin/settings/class-wc-settings-tax.php:248
msgid "Choose a priority for this tax rate. Only 1 matching rate per priority will be used. To define multiple tax rates for a single area you need to specify a different priority per rate."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:231
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:250
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "Compound"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:231
+#: includes/admin/settings/class-wc-settings-tax.php:250
msgid "Choose whether or not this is a compound rate. Compound tax rates are applied on top of other tax rates."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:233
+#: includes/admin/settings/class-wc-settings-tax.php:252
msgid "Choose whether or not this tax rate also gets applied to shipping."
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:240
+#: includes/admin/settings/class-wc-settings-tax.php:259
msgid "Insert row"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:241
+#: includes/admin/settings/class-wc-settings-tax.php:260
msgid "Remove selected row(s)"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:257
+#: includes/admin/settings/class-wc-settings-tax.php:276
msgid "Import CSV"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:343
+#: includes/admin/settings/class-wc-settings-tax.php:362
msgid "No row(s) selected"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "Country Code"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "State Code"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "Rate %"
msgstr ""
-#: includes/admin/settings/class-wc-settings-tax.php:350
+#: includes/admin/settings/class-wc-settings-tax.php:369
msgid "Tax Name"
msgstr ""
diff --git a/i18n/languages/woocommerce.pot b/i18n/languages/woocommerce.pot
index 366bf617724..bbe5aa5a823 100644
--- a/i18n/languages/woocommerce.pot
+++ b/i18n/languages/woocommerce.pot
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WooCommerce 2.1-bleeding Front-end\n"
"Report-Msgid-Bugs-To: https://github.com/woothemes/woocommerce/issues\n"
-"POT-Creation-Date: 2013-09-16 23:40:16+00:00\n"
+"POT-Creation-Date: 2013-09-22 23:32:41+00:00\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -2174,32 +2174,32 @@ msgstr ""
msgid "Out of stock"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:792
-#: includes/abstracts/abstract-wc-product.php:798
+#: includes/abstracts/abstract-wc-product.php:828
+#: includes/abstracts/abstract-wc-product.php:834
#: includes/class-wc-cart.php:1831 includes/class-wc-order.php:757
-#: includes/class-wc-product-variable.php:233
-#: includes/class-wc-product-variable.php:239
-#: includes/class-wc-product-variation.php:247
+#: includes/class-wc-product-variable.php:237
+#: includes/class-wc-product-variable.php:243
+#: includes/class-wc-product-variation.php:254
msgid "Free!"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:815
+#: includes/abstracts/abstract-wc-product.php:851
msgctxt "min_price"
msgid "From:"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:923
+#: includes/abstracts/abstract-wc-product.php:959
#: templates/single-product-reviews.php:28
msgid "Rated %s out of 5"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:925
+#: includes/abstracts/abstract-wc-product.php:961
#: templates/single-product/review.php:27
#: templates/single-product-reviews.php:28
msgid "out of 5"
msgstr ""
-#: includes/abstracts/abstract-wc-product.php:1237
+#: includes/abstracts/abstract-wc-product.php:1273
msgid "%s – %s"
msgstr ""
@@ -2302,39 +2302,40 @@ msgstr ""
msgid "Sorry, your session has expired. Return to homepage →"
msgstr ""
-#: includes/class-wc-checkout.php:481 includes/class-wc-form-handler.php:78
+#: includes/class-wc-checkout.php:481 includes/class-wc-form-handler.php:81
msgid "is a required field."
msgstr ""
-#: includes/class-wc-checkout.php:494
-msgid "(%s) is not a valid postcode/ZIP."
+#: includes/class-wc-checkout.php:493 includes/class-wc-form-handler.php:91
+#: includes/shortcodes/class-wc-shortcode-cart.php:52
+msgid "Please enter a valid postcode/ZIP."
msgstr ""
-#: includes/class-wc-checkout.php:515
-msgid "is not valid. Please enter one of the following:"
+#: includes/class-wc-checkout.php:502 includes/class-wc-form-handler.php:100
+msgid "is not a valid phone number."
msgstr ""
-#: includes/class-wc-checkout.php:523
-msgid "is not a valid number."
-msgstr ""
-
-#: includes/class-wc-checkout.php:530
+#: includes/class-wc-checkout.php:508 includes/class-wc-form-handler.php:106
msgid "is not a valid email address."
msgstr ""
-#: includes/class-wc-checkout.php:573
+#: includes/class-wc-checkout.php:523
+msgid "is not valid. Please enter one of the following:"
+msgstr ""
+
+#: includes/class-wc-checkout.php:568
msgid "You must accept our Terms & Conditions."
msgstr ""
-#: includes/class-wc-checkout.php:578
+#: includes/class-wc-checkout.php:573
msgid "Unfortunately we do not ship to %s. Please enter an alternative shipping address."
msgstr ""
-#: includes/class-wc-checkout.php:586
+#: includes/class-wc-checkout.php:581
msgid "Invalid shipping method."
msgstr ""
-#: includes/class-wc-checkout.php:599
+#: includes/class-wc-checkout.php:594
msgid "Invalid payment method."
msgstr ""
@@ -3392,56 +3393,56 @@ msgstr ""
msgid "State / County"
msgstr ""
-#: includes/class-wc-countries.php:744 includes/class-wc-countries.php:745
+#: includes/class-wc-countries.php:745 includes/class-wc-countries.php:746
#: templates/cart/shipping-calculator.php:80
msgid "Postcode / Zip"
msgstr ""
-#: includes/class-wc-countries.php:787 includes/class-wc-countries.php:797
-#: includes/class-wc-countries.php:817 includes/class-wc-countries.php:872
-#: includes/class-wc-countries.php:891 includes/class-wc-countries.php:919
-#: includes/class-wc-countries.php:969 includes/class-wc-countries.php:993
-#: includes/class-wc-countries.php:1034
+#: includes/class-wc-countries.php:789 includes/class-wc-countries.php:799
+#: includes/class-wc-countries.php:819 includes/class-wc-countries.php:874
+#: includes/class-wc-countries.php:893 includes/class-wc-countries.php:921
+#: includes/class-wc-countries.php:971 includes/class-wc-countries.php:995
+#: includes/class-wc-countries.php:1036
msgid "Province"
msgstr ""
-#: includes/class-wc-countries.php:803
+#: includes/class-wc-countries.php:805
msgid "Canton"
msgstr ""
-#: includes/class-wc-countries.php:812 includes/class-wc-countries.php:975
+#: includes/class-wc-countries.php:814 includes/class-wc-countries.php:977
msgid "Municipality"
msgstr ""
-#: includes/class-wc-countries.php:859
+#: includes/class-wc-countries.php:861
msgid "Town / District"
msgstr ""
-#: includes/class-wc-countries.php:862
+#: includes/class-wc-countries.php:864
msgid "Region"
msgstr ""
-#: includes/class-wc-countries.php:867 includes/class-wc-countries.php:1009
+#: includes/class-wc-countries.php:869 includes/class-wc-countries.php:1011
msgid "County"
msgstr ""
-#: includes/class-wc-countries.php:998
+#: includes/class-wc-countries.php:1000
msgid "Zip"
msgstr ""
-#: includes/class-wc-countries.php:1001
+#: includes/class-wc-countries.php:1003
msgid "State"
msgstr ""
-#: includes/class-wc-countries.php:1006
+#: includes/class-wc-countries.php:1008
msgid "Postcode"
msgstr ""
-#: includes/class-wc-countries.php:1114
+#: includes/class-wc-countries.php:1116
msgid "Email Address"
msgstr ""
-#: includes/class-wc-countries.php:1120
+#: includes/class-wc-countries.php:1122
msgid "Phone"
msgstr ""
@@ -3545,7 +3546,7 @@ msgid "Product no longer exists."
msgstr ""
#: includes/class-wc-download-handler.php:87
-#: includes/class-wc-form-handler.php:422
+#: includes/class-wc-form-handler.php:443
#: includes/shortcodes/class-wc-shortcode-checkout.php:87
#: includes/shortcodes/class-wc-shortcode-checkout.php:168
#: includes/shortcodes/class-wc-shortcode-my-account.php:102
@@ -3607,118 +3608,113 @@ msgstr ""
msgid "%s units of %s have been backordered in order %s."
msgstr ""
-#: includes/class-wc-form-handler.php:83
-#: includes/shortcodes/class-wc-shortcode-cart.php:52
-msgid "Please enter a valid postcode/ZIP."
-msgstr ""
-
-#: includes/class-wc-form-handler.php:97
+#: includes/class-wc-form-handler.php:118
msgid "Address changed successfully."
msgstr ""
-#: includes/class-wc-form-handler.php:145
+#: includes/class-wc-form-handler.php:166
msgid "Please enter your name."
msgstr ""
-#: includes/class-wc-form-handler.php:148 includes/wc-customer-functions.php:46
+#: includes/class-wc-form-handler.php:169 includes/wc-customer-functions.php:46
msgid "Please provide a valid email address."
msgstr ""
-#: includes/class-wc-form-handler.php:151
+#: includes/class-wc-form-handler.php:172
msgid "This email address is already registered."
msgstr ""
-#: includes/class-wc-form-handler.php:154
+#: includes/class-wc-form-handler.php:175
msgid "Please re-enter your password."
msgstr ""
-#: includes/class-wc-form-handler.php:157
-#: includes/class-wc-form-handler.php:695
+#: includes/class-wc-form-handler.php:178
+#: includes/class-wc-form-handler.php:716
msgid "Passwords do not match."
msgstr ""
-#: includes/class-wc-form-handler.php:170
+#: includes/class-wc-form-handler.php:191
msgid "Account details changed successfully."
msgstr ""
-#: includes/class-wc-form-handler.php:276
-#: includes/class-wc-form-handler.php:323
+#: includes/class-wc-form-handler.php:297
+#: includes/class-wc-form-handler.php:344
msgid "Cart updated."
msgstr ""
-#: includes/class-wc-form-handler.php:307
+#: includes/class-wc-form-handler.php:328
msgid "You can only have 1 %s in your cart."
msgstr ""
-#: includes/class-wc-form-handler.php:385
+#: includes/class-wc-form-handler.php:406
msgid "The cart has been filled with the items from your previous order."
msgstr ""
-#: includes/class-wc-form-handler.php:409
+#: includes/class-wc-form-handler.php:430
msgid "Order cancelled by customer."
msgstr ""
-#: includes/class-wc-form-handler.php:412
+#: includes/class-wc-form-handler.php:433
msgid "Your order was cancelled."
msgstr ""
-#: includes/class-wc-form-handler.php:418
+#: includes/class-wc-form-handler.php:439
msgid "Your order is no longer pending and could not be cancelled. Please contact us if you need assistance."
msgstr ""
-#: includes/class-wc-form-handler.php:459
-#: includes/class-wc-form-handler.php:517
+#: includes/class-wc-form-handler.php:480
+#: includes/class-wc-form-handler.php:538
msgid "Please choose product options…"
msgstr ""
-#: includes/class-wc-form-handler.php:550
+#: includes/class-wc-form-handler.php:571
msgid "Please choose the quantity of items you wish to add to your cart…"
msgstr ""
-#: includes/class-wc-form-handler.php:557
+#: includes/class-wc-form-handler.php:578
msgid "Please choose a product to add to your cart…"
msgstr ""
-#: includes/class-wc-form-handler.php:614
-#: includes/class-wc-form-handler.php:616
-#: includes/class-wc-form-handler.php:624
+#: includes/class-wc-form-handler.php:635
+#: includes/class-wc-form-handler.php:637
+#: includes/class-wc-form-handler.php:645
msgid "Error"
msgstr ""
-#: includes/class-wc-form-handler.php:614
+#: includes/class-wc-form-handler.php:635
msgid "Username is required."
msgstr ""
-#: includes/class-wc-form-handler.php:616
+#: includes/class-wc-form-handler.php:637
msgid "Password is required."
msgstr ""
-#: includes/class-wc-form-handler.php:624
+#: includes/class-wc-form-handler.php:645
msgid "A user could not be found with this email address."
msgstr ""
-#: includes/class-wc-form-handler.php:647
+#: includes/class-wc-form-handler.php:668
msgid "You are now logged in as %s"
msgstr ""
-#: includes/class-wc-form-handler.php:690
+#: includes/class-wc-form-handler.php:711
msgid "Please enter your password."
msgstr ""
-#: includes/class-wc-form-handler.php:705
+#: includes/class-wc-form-handler.php:726
msgid "Your password has been reset."
msgstr ""
-#: includes/class-wc-form-handler.php:705
+#: includes/class-wc-form-handler.php:726
msgid "Log in"
msgstr ""
-#: includes/class-wc-form-handler.php:729
+#: includes/class-wc-form-handler.php:750
#: includes/wc-customer-functions.php:107
msgid "ERROR"
msgstr ""
-#: includes/class-wc-form-handler.php:729
+#: includes/class-wc-form-handler.php:750
msgid "Anti-spam field was filled in."
msgstr ""
@@ -4202,7 +4198,7 @@ msgstr ""
msgid "Buy product"
msgstr ""
-#: includes/class-wc-product-variation.php:448
+#: includes/class-wc-product-variation.php:456
msgid "%s – %s%s"
msgstr ""
@@ -4364,7 +4360,7 @@ msgid "New order"
msgstr ""
#: includes/emails/class-wc-email-new-order.php:27
-msgid "New order emails are sent when an order is received/paid by a customer."
+msgid "New order emails are sent when an order is received."
msgstr ""
#: includes/emails/class-wc-email-new-order.php:29
@@ -5349,50 +5345,48 @@ msgid "The order totals have been updated. Please confirm your order by pressing
msgstr ""
#: includes/shortcodes/class-wc-shortcode-my-account.php:109
-#: includes/shortcodes/class-wc-shortcode-view-order.php:57
+#: templates/myaccount/view-order.php:13
msgid "Order %s made on %s"
msgstr ""
#: includes/shortcodes/class-wc-shortcode-my-account.php:110
-#: includes/shortcodes/class-wc-shortcode-view-order.php:58
+#: templates/myaccount/view-order.php:14
msgid "Order status: %s"
msgstr ""
#: includes/shortcodes/class-wc-shortcode-my-account.php:115
-#: includes/shortcodes/class-wc-shortcode-view-order.php:64
-#: templates/order/tracking.php:31
+#: templates/myaccount/view-order.php:20 templates/order/tracking.php:31
msgid "Order Updates"
msgstr ""
#: includes/shortcodes/class-wc-shortcode-my-account.php:121
-#: includes/shortcodes/class-wc-shortcode-view-order.php:70
-#: templates/order/tracking.php:37
+#: templates/myaccount/view-order.php:26 templates/order/tracking.php:37
msgid "l jS \\o\\f F Y, h:ia"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:203
+#: includes/shortcodes/class-wc-shortcode-my-account.php:228
msgid "Enter a username or e-mail address."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:210
+#: includes/shortcodes/class-wc-shortcode-my-account.php:235
msgid "There is no user registered with that email address."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:225
+#: includes/shortcodes/class-wc-shortcode-my-account.php:250
msgid "Invalid username or e-mail."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:239
+#: includes/shortcodes/class-wc-shortcode-my-account.php:264
msgid "Password reset is not allowed for this user"
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:267
+#: includes/shortcodes/class-wc-shortcode-my-account.php:292
msgid "Check your e-mail for the confirmation link."
msgstr ""
-#: includes/shortcodes/class-wc-shortcode-my-account.php:287
-#: includes/shortcodes/class-wc-shortcode-my-account.php:292
-#: includes/shortcodes/class-wc-shortcode-my-account.php:299
+#: includes/shortcodes/class-wc-shortcode-my-account.php:312
+#: includes/shortcodes/class-wc-shortcode-my-account.php:317
+#: includes/shortcodes/class-wc-shortcode-my-account.php:324
msgid "Invalid key"
msgstr ""
@@ -6120,7 +6114,7 @@ msgid "Billing & Shipping"
msgstr ""
#: templates/checkout/form-billing.php:21
-#: templates/myaccount/form-edit-address.php:27
+#: templates/myaccount/form-edit-address.php:14
#: templates/myaccount/my-address.php:19 templates/myaccount/my-address.php:25
#: templates/order/order-details.php:119
msgid "Billing Address"
@@ -6496,12 +6490,12 @@ msgstr ""
msgid "Save changes"
msgstr ""
-#: templates/myaccount/form-edit-address.php:27
+#: templates/myaccount/form-edit-address.php:14
#: templates/myaccount/my-address.php:20 templates/order/order-details.php:134
msgid "Shipping Address"
msgstr ""
-#: templates/myaccount/form-edit-address.php:43
+#: templates/myaccount/form-edit-address.php:38
msgid "Save Address"
msgstr ""