Merge branch '4.6RC'4.6

1 files changed, 23 insertions, 20 deletions

diff --git a/vendor/commerceguys/intl/resources/currency/tk.json b/vendor/commerceguys/intl/resources/currency/tk.json
index 0f000326c..bdecdd714 100644
--- a/vendor/commerceguys/intl/resources/currency/tk.json
+++ b/vendor/commerceguys/intl/resources/currency/tk.json
@@ -10,7 +10,7 @@
 		"name": "Alžir dinary"
 	},
 	"AOA": {
-		"name": "Angol kwanzasy"
+		"name": "Angola kwanzasy"
 	},
 	"ARS": {
 		"name": "Argentin pesosy"
@@ -228,7 +228,7 @@
 		"name": "Kongo franky"
 	},
 	"BAM": {
-		"name": "Konwertirlenýän Bosniýa we Gersogowina markasy"
+		"name": "Konwertirlenýän Bosniýa we Gersegowina markasy"
 	},
 	"CUC": {
 		"name": "Konwertirlenýän kuba pesosy"
@@ -281,7 +281,7 @@
 	"MUR": {
 		"name": "Mawrikiý rupiýasy"
 	},
-	"MRO": {
+	"MRU": {
 		"name": "Mawritan ugiýasy"
 	},
 	"MXN": {
@@ -330,9 +330,6 @@
 	"UZS": {
 		"name": "Özbek somy"
 	},
-	"PKR": {
-		"name": "Päkistan rupiýasy"
-	},
 	"PAB": {
 		"name": "Panama balboasy"
 	},
@@ -345,6 +342,9 @@
 	"PEN": {
 		"name": "Peru soly"
 	},
+	"PKR": {
+		"name": "Päkistan rupiýasy"
+	},
 	"PLN": {
 		"name": "Polýak zlotysy"
 	},
@@ -363,7 +363,7 @@
 	"WST": {
 		"name": "Samoa talasy"
 	},
-	"STD": {
+	"STN": {
 		"name": "San-Tome we Prinsipi dobrasy"
 	},
 	"SAR": {
@@ -387,9 +387,6 @@
 	"SOS": {
 		"name": "Somali şillingi"
 	},
-	"LKR": {
-		"name": "Şri-Lanka rupiýasy"
-	},
 	"SDG": {
 		"name": "Sudan funty"
 	},
@@ -399,24 +396,27 @@
 	"SZL": {
 		"name": "Swazi lilangeni"
 	},
+	"SLL": {
+		"name": "Sýerra-Leone leony"
+	},
+	"LKR": {
+		"name": "Şri-Lanka rupiýasy"
+	},
 	"SEK": {
 		"name": "Şwed kronasy"
 	},
 	"CHF": {
 		"name": "Şweýsar franky"
 	},
-	"SLL": {
-		"name": "Sýerra-Leone leony"
-	},
-	"TJS": {
-		"name": "Täjik somonisy"
-	},
 	"TZS": {
 		"name": "Tanzaniýa şillingi"
 	},
 	"THB": {
 		"name": "Taýland baty"
 	},
+	"TJS": {
+		"name": "Täjik somonisi"
+	},
 	"TWD": {
 		"name": "Täze Taýwan dollary",
 		"symbol": "NT$"
@@ -450,13 +450,16 @@
 	"UAH": {
 		"name": "Ukrain griwnasy"
 	},
+	"UYW": {
+		"name": "Uruguayan Nominal Wage Index Unit"
+	},
 	"UYU": {
 		"name": "Urugwaý pesosy"
 	},
 	"VUV": {
 		"name": "Wanuatu watusy"
 	},
-	"VEF": {
+	"VES": {
 		"name": "Wenesuela boliwary"
 	},
 	"HUF": {
@@ -466,6 +469,9 @@
 		"name": "Wýetnam dongy",
 		"symbol": "₫"
 	},
+	"IQD": {
+		"name": "Yrak dinary"
+	},
 	"JMD": {
 		"name": "Ýamaýka dollary"
 	},
@@ -479,9 +485,6 @@
 	"EUR": {
 		"name": "Ýewro"
 	},
-	"IQD": {
-		"name": "Yrak dinary"
-	},
 	"ZMW": {
 		"name": "Zambiýa kwaçasy"
 	},