Merge branch '4.6RC'4.6

1 files changed, 21 insertions, 18 deletions

diff --git a/vendor/commerceguys/intl/resources/currency/es-VE.json b/vendor/commerceguys/intl/resources/currency/es-VE.json
index 8cc486914..12e3d616f 100644
--- a/vendor/commerceguys/intl/resources/currency/es-VE.json
+++ b/vendor/commerceguys/intl/resources/currency/es-VE.json
@@ -5,18 +5,18 @@
 	"MGA": {
 		"name": "ariari"
 	},
+	"THB": {
+		"name": "baht tailandes"
+	},
 	"PAB": {
 		"name": "balboa panameño"
 	},
-	"THB": {
-		"name": "bat"
-	},
 	"ETB": {
 		"name": "bir"
 	},
-	"VEF": {
-		"name": "bolívar venezolano",
-		"symbol": "Bs."
+	"VES": {
+		"name": "bolívar soberano",
+		"symbol": "Bs.S"
 	},
 	"BOB": {
 		"name": "boliviano"
@@ -96,7 +96,7 @@
 	"MAD": {
 		"name": "dírham marroquí"
 	},
-	"STD": {
+	"STN": {
 		"name": "dobra"
 	},
 	"AUD": {
@@ -169,7 +169,7 @@
 		"name": "dong"
 	},
 	"AMD": {
-		"name": "dram armenio"
+		"name": "dram"
 	},
 	"CVE": {
 		"name": "escudo de Cabo Verde"
@@ -241,6 +241,9 @@
 	"LAK": {
 		"name": "kip"
 	},
+	"ZMW": {
+		"name": "kuacha zambiano"
+	},
 	"AOA": {
 		"name": "kuanza"
 	},
@@ -250,9 +253,6 @@
 	"MWK": {
 		"name": "kwacha malauí"
 	},
-	"ZMW": {
-		"name": "kwacha zambiano"
-	},
 	"GEL": {
 		"name": "lari"
 	},
@@ -322,12 +322,12 @@
 	"MZN": {
 		"name": "metical"
 	},
-	"ERN": {
-		"name": "nafka"
-	},
 	"NGN": {
 		"name": "naira"
 	},
+	"ERN": {
+		"name": "nakfa"
+	},
 	"TWD": {
 		"name": "nuevo dólar taiwanés"
 	},
@@ -436,12 +436,12 @@
 	"KGS": {
 		"name": "som"
 	},
+	"UZS": {
+		"name": "som uzbeko"
+	},
 	"TJS": {
 		"name": "somoni tayiko"
 	},
-	"UZS": {
-		"name": "sum"
-	},
 	"BDT": {
 		"name": "taka"
 	},
@@ -454,9 +454,12 @@
 	"MNT": {
 		"name": "tugrik"
 	},
-	"MRO": {
+	"MRU": {
 		"name": "uguiya"
 	},
+	"UYW": {
+		"name": "unidad previsional uruguayo"
+	},
 	"VUV": {
 		"name": "vatu"
 	},