Merge branch '4.6RC'4.6

1 files changed, 12 insertions, 10 deletions

diff --git a/vendor/commerceguys/intl/resources/currency/ca.json b/vendor/commerceguys/intl/resources/currency/ca.json
index 1c2d49cbe..ceaf59540 100644
--- a/vendor/commerceguys/intl/resources/currency/ca.json
+++ b/vendor/commerceguys/intl/resources/currency/ca.json
@@ -15,7 +15,7 @@
 	"ETB": {
 		"name": "birr etíop"
 	},
-	"VEF": {
+	"VES": {
 		"name": "bolívar veneçolà"
 	},
 	"BOB": {
@@ -25,13 +25,13 @@
 		"name": "cedi ghanès"
 	},
 	"CRC": {
-		"name": "colón costa-riqueny"
+		"name": "colon costa-riqueny"
 	},
 	"SVC": {
-		"name": "colón salvadorenc"
+		"name": "colon salvadorenc"
 	},
 	"NIO": {
-		"name": "córdoba oro nicaragüenca"
+		"name": "córdoba nicaragüenc"
 	},
 	"DKK": {
 		"name": "corona danesa"
@@ -84,7 +84,7 @@
 	"MAD": {
 		"name": "dírham marroquí"
 	},
-	"STD": {
+	"STN": {
 		"name": "dobra de São Tomé i Príncipe"
 	},
 	"AUD": {
@@ -223,11 +223,10 @@
 	},
 	"JPY": {
 		"name": "ien japonès",
-		"symbol": "JP¥"
+		"symbol": "¥"
 	},
 	"CNY": {
-		"name": "iuan xinès",
-		"symbol": "¥"
+		"name": "iuan xinès"
 	},
 	"PGK": {
 		"name": "kina de Papua Nova Guinea"
@@ -300,7 +299,7 @@
 		"name": "lliura libanesa"
 	},
 	"SYP": {
-		"name": "lliura síria"
+		"name": "lliura siriana"
 	},
 	"SDG": {
 		"name": "lliura sudanesa"
@@ -337,7 +336,7 @@
 		"name": "nou xéquel israelià",
 		"symbol": "₪"
 	},
-	"MRO": {
+	"MRU": {
 		"name": "ouguiya maurità"
 	},
 	"TOP": {
@@ -461,6 +460,9 @@
 	"MNT": {
 		"name": "tögrög mongol"
 	},
+	"UYW": {
+		"name": "Uruguayan Nominal Wage Index Unit"
+	},
 	"VUV": {
 		"name": "vatu de Vanuatu"
 	},