Merge branch '3.4RC'3.4

1 files changed, 15 insertions, 18 deletions

diff --git a/vendor/commerceguys/intl/resources/currency/es-US.json b/vendor/commerceguys/intl/resources/currency/es-US.json
index 3241eee20..c3e21b38d 100644
--- a/vendor/commerceguys/intl/resources/currency/es-US.json
+++ b/vendor/commerceguys/intl/resources/currency/es-US.json
@@ -192,11 +192,11 @@
 	"BIF": {
 		"name": "franco burundés"
 	},
-	"XOF": {
-		"name": "franco CFA BCEAO"
-	},
 	"XAF": {
-		"name": "franco CFA BEAC"
+		"name": "franco CFA de África central"
+	},
+	"XOF": {
+		"name": "franco CFA de África Occidental"
 	},
 	"XPF": {
 		"name": "franco CFP",
@@ -241,9 +241,6 @@
 	"LAK": {
 		"name": "kip"
 	},
-	"ZMW": {
-		"name": "kuacha zambiano"
-	},
 	"AOA": {
 		"name": "kuanza"
 	},
@@ -253,6 +250,9 @@
 	"MWK": {
 		"name": "kwacha malauí"
 	},
+	"ZMW": {
+		"name": "kwacha zambiano"
+	},
 	"GEL": {
 		"name": "lari"
 	},
@@ -274,15 +274,15 @@
 	"BGN": {
 		"name": "lev búlgaro"
 	},
-	"GBP": {
-		"name": "libra británica"
-	},
 	"SHP": {
 		"name": "libra de Santa Elena"
 	},
 	"EGP": {
 		"name": "libra egipcia"
 	},
+	"GBP": {
+		"name": "libra esterlina"
+	},
 	"GIP": {
 		"name": "libra gibraltareña"
 	},
@@ -311,13 +311,13 @@
 		"name": "loti lesothense"
 	},
 	"AZN": {
-		"name": "manat azerí"
+		"name": "manat azerbaiyano"
 	},
 	"TMT": {
 		"name": "manat turcomano"
 	},
 	"BAM": {
-		"name": "marco convertible de Bosnia-Herzegovina"
+		"name": "marco convertible de Bosnia y Herzegovina"
 	},
 	"MZN": {
 		"name": "metical"
@@ -334,9 +334,6 @@
 	"ILS": {
 		"name": "nuevo séquel israelí"
 	},
-	"PEN": {
-		"name": "nuevo sol peruano"
-	},
 	"TOP": {
 		"name": "paanga"
 	},
@@ -406,9 +403,6 @@
 	"BYN": {
 		"name": "rublo bielorruso"
 	},
-	"BYR": {
-		"name": "rublo bielorruso (2000–2016)"
-	},
 	"RUB": {
 		"name": "rublo ruso"
 	},
@@ -436,6 +430,9 @@
 	"SCR": {
 		"name": "rupia seychellense"
 	},
+	"PEN": {
+		"name": "sol peruano"
+	},
 	"KGS": {
 		"name": "som"
 	},