Merge branch 'dev' into oauth2

1 files changed, 17 insertions, 17 deletions

diff --git a/vendor/commerceguys/intl/resources/country/zh-Hant.json b/vendor/commerceguys/intl/resources/country/zh-Hant.json
index 93c51a231..c1b94b2fd 100644
--- a/vendor/commerceguys/intl/resources/country/zh-Hant.json
+++ b/vendor/commerceguys/intl/resources/country/zh-Hant.json
@@ -84,7 +84,7 @@
 		"name": "加彭"
 	},
 	"MP": {
-		"name": "北馬里亞納群島"
+		"name": "北馬利安納群島"
 	},
 	"KP": {
 		"name": "北韓"
@@ -179,12 +179,12 @@
 	"TG": {
 		"name": "多哥"
 	},
-	"AI": {
-		"name": "安圭拉"
-	},
 	"AG": {
 		"name": "安地卡及巴布達"
 	},
+	"AI": {
+		"name": "安奎拉"
+	},
 	"AO": {
 		"name": "安哥拉"
 	},
@@ -209,9 +209,6 @@
 	"HR": {
 		"name": "克羅埃西亞"
 	},
-	"SJ": {
-		"name": "冷岸及央棉"
-	},
 	"LY": {
 		"name": "利比亞"
 	},
@@ -282,7 +279,7 @@
 		"name": "法屬圭亞那"
 	},
 	"TF": {
-		"name": "法屬南方屬地"
+		"name": "法屬南部屬地"
 	},
 	"PF": {
 		"name": "法屬玻里尼西亞"
@@ -318,7 +315,7 @@
 		"name": "阿根廷"
 	},
 	"OM": {
-		"name": "阿曼王國"
+		"name": "阿曼"
 	},
 	"AF": {
 		"name": "阿富汗"
@@ -365,12 +362,12 @@
 	"BO": {
 		"name": "玻利維亞"
 	},
+	"CC": {
+		"name": "科克斯（基靈）群島"
+	},
 	"KW": {
 		"name": "科威特"
 	},
-	"CC": {
-		"name": "科科斯（基林）群島"
-	},
 	"XK": {
 		"name": "科索沃"
 	},
@@ -434,6 +431,9 @@
 	"NO": {
 		"name": "挪威"
 	},
+	"SJ": {
+		"name": "挪威屬斯瓦巴及尖棉"
+	},
 	"GG": {
 		"name": "根息"
 	},
@@ -486,7 +486,7 @@
 		"name": "索羅門群島"
 	},
 	"MQ": {
-		"name": "馬丁尼克島"
+		"name": "馬丁尼克"
 	},
 	"ML": {
 		"name": "馬利"
@@ -501,7 +501,7 @@
 		"name": "馬拉威"
 	},
 	"YT": {
-		"name": "馬約特"
+		"name": "馬約特島"
 	},
 	"MH": {
 		"name": "馬紹爾群島"
@@ -516,10 +516,10 @@
 		"name": "馬爾地夫"
 	},
 	"FM": {
-		"name": "密克羅尼西亞群島"
+		"name": "密克羅尼西亞"
 	},
 	"CZ": {
-		"name": "捷克共和國"
+		"name": "捷克"
 	},
 	"SY": {
 		"name": "敘利亞"
@@ -636,7 +636,7 @@
 		"name": "聖文森及格瑞那丁"
 	},
 	"PM": {
-		"name": "聖皮埃爾和密克隆群島"
+		"name": "聖皮埃與密克隆群島"
 	},
 	"ST": {
 		"name": "聖多美普林西比"