Merge branch '3.4RC'3.4

1 files changed, 74 insertions, 65 deletions

diff --git a/vendor/commerceguys/intl/resources/language/uz.json b/vendor/commerceguys/intl/resources/language/uz.json
index 35118cc23..ef7ca200f 100644
--- a/vendor/commerceguys/intl/resources/language/uz.json
+++ b/vendor/commerceguys/intl/resources/language/uz.json
@@ -36,7 +36,7 @@
 		"name": "bambara"
 	},
 	"bas": {
-		"name": "Basaa"
+		"name": "basa"
 	},
 	"eu": {
 		"name": "bask"
@@ -68,20 +68,8 @@
 	"br": {
 		"name": "breton"
 	},
-	"ce": {
-		"name": "chechen"
-	},
-	"chr": {
-		"name": "cheroki"
-	},
-	"cs": {
-		"name": "chex"
-	},
-	"cgg": {
-		"name": "chiga"
-	},
 	"da": {
-		"name": "dat"
+		"name": "dan"
 	},
 	"dyo": {
 		"name": "diola-fogni"
@@ -105,7 +93,7 @@
 		"name": "eve"
 	},
 	"ewo": {
-		"name": "Ewondo"
+		"name": "evondo"
 	},
 	"fo": {
 		"name": "farercha"
@@ -132,13 +120,10 @@
 		"name": "fransuzcha"
 	},
 	"fur": {
-		"name": "Friulian"
+		"name": "friul"
 	},
 	"ff": {
-		"name": "Fulah"
-	},
-	"fy": {
-		"name": "g‘arbiy friz"
+		"name": "fula"
 	},
 	"gl": {
 		"name": "galisiy"
@@ -170,9 +155,6 @@
 	"hi": {
 		"name": "hind"
 	},
-	"he": {
-		"name": "ibroniy"
-	},
 	"yi": {
 		"name": "idish"
 	},
@@ -212,6 +194,9 @@
 	"it": {
 		"name": "italyan"
 	},
+	"he": {
+		"name": "ivrit"
+	},
 	"kab": {
 		"name": "kabil"
 	},
@@ -230,15 +215,12 @@
 	"kn": {
 		"name": "kannada"
 	},
-	"yue": {
-		"name": "kanton"
+	"ca": {
+		"name": "katalan"
 	},
 	"ks": {
 		"name": "kashmircha"
 	},
-	"ca": {
-		"name": "katalan"
-	},
 	"qu": {
 		"name": "kechua"
 	},
@@ -299,9 +281,6 @@
 	"lb": {
 		"name": "lyuksemburgcha"
 	},
-	"jmc": {
-		"name": "machame"
-	},
 	"mk": {
 		"name": "makedon"
 	},
@@ -332,6 +311,9 @@
 	"mgh": {
 		"name": "maxuva-mitto"
 	},
+	"jmc": {
+		"name": "machame"
+	},
 	"gv": {
 		"name": "men"
 	},
@@ -341,9 +323,6 @@
 	"mgo": {
 		"name": "meta"
 	},
-	"mn": {
-		"name": "mo‘g‘ul"
-	},
 	"ro-MD": {
 		"name": "moldovan"
 	},
@@ -356,6 +335,9 @@
 	"mua": {
 		"name": "mundang"
 	},
+	"mn": {
+		"name": "mo‘g‘ul"
+	},
 	"naq": {
 		"name": "nama"
 	},
@@ -389,9 +371,6 @@
 	"nyn": {
 		"name": "nyankole"
 	},
-	"uz": {
-		"name": "o‘zbek"
-	},
 	"or": {
 		"name": "oriya"
 	},
@@ -467,39 +446,21 @@
 	"sah": {
 		"name": "saxa"
 	},
-	"gd": {
-		"name": "Scottish Gaelic"
-	},
 	"seh": {
 		"name": "sena"
 	},
 	"sr": {
 		"name": "serbcha"
 	},
-	"ksb": {
-		"name": "shambala"
-	},
-	"lrc": {
-		"name": "shimoliy luri"
-	},
-	"nd": {
-		"name": "shimoliy ndebele"
-	},
-	"se": {
-		"name": "shimoliy saam"
+	"sd": {
+		"name": "sindxi"
 	},
-	"sn": {
-		"name": "shona"
-	},
-	"sv": {
-		"name": "shved"
+	"si": {
+		"name": "singal"
 	},
 	"ii": {
 		"name": "sichuan"
 	},
-	"si": {
-		"name": "singal"
-	},
 	"cu": {
 		"name": "slavyan (cherkov)"
 	},
@@ -536,12 +497,15 @@
 	"twq": {
 		"name": "tasavak"
 	},
-	"shi": {
-		"name": "tashelxit"
+	"tt": {
+		"name": "tatar"
 	},
 	"th": {
 		"name": "tay"
 	},
+	"shi": {
+		"name": "tashelxit"
+	},
 	"te": {
 		"name": "telugu"
 	},
@@ -554,6 +518,9 @@
 	"ti": {
 		"name": "tigrinya"
 	},
+	"tg": {
+		"name": "tojik"
+	},
 	"to": {
 		"name": "tongan"
 	},
@@ -575,6 +542,9 @@
 	"vai": {
 		"name": "Vai"
 	},
+	"wae": {
+		"name": "valis"
+	},
 	"cy": {
 		"name": "valliy"
 	},
@@ -584,15 +554,15 @@
 	"vo": {
 		"name": "volapyuk"
 	},
+	"wo": {
+		"name": "volof"
+	},
 	"vun": {
 		"name": "vunjo"
 	},
 	"vi": {
 		"name": "vyetnam"
 	},
-	"wae": {
-		"name": "Walser"
-	},
 	"ha": {
 		"name": "xausa"
 	},
@@ -606,7 +576,7 @@
 		"name": "xitoy (soddalashgan)"
 	},
 	"km": {
-		"name": "xmercha"
+		"name": "xmer"
 	},
 	"hr": {
 		"name": "xorvat"
@@ -631,5 +601,44 @@
 	},
 	"zu": {
 		"name": "zulu"
+	},
+	"uz": {
+		"name": "o‘zbek"
+	},
+	"fy": {
+		"name": "g‘arbiy friz"
+	},
+	"ksb": {
+		"name": "shambala"
+	},
+	"lrc": {
+		"name": "shimoliy luri"
+	},
+	"nd": {
+		"name": "shimoliy ndebele"
+	},
+	"se": {
+		"name": "shimoliy saam"
+	},
+	"sn": {
+		"name": "shona"
+	},
+	"gd": {
+		"name": "shotland-gel"
+	},
+	"sv": {
+		"name": "shved"
+	},
+	"chr": {
+		"name": "cheroki"
+	},
+	"cs": {
+		"name": "chex"
+	},
+	"ce": {
+		"name": "chechen"
+	},
+	"cgg": {
+		"name": "chiga"
 	}
 }
\ No newline at end of file