Merge commit 'f6a234f61ded3f2c386870192ad701f47105c23b' into lang-v062

# Conflicts:
#	lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
#	lang/Lib/gflanguages/data/languages/gan_Hant.textproto
#	lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
#	lang/Lib/gflanguages/data/languages/wuu_Hant.textproto

diff --cc lang/Lib/gflanguages/data/languages/cjy_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
index fb9faa03c8a13f7f160c5cde00db3e685c40f6c9,f0f9cbaa02065ce8809b6db045db7d14d4667232..f8b8e79f244ebb1b616065b045d2c2ec090ca614
--- 1/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
--- 2/Lib/gflanguages/data/languages/cjy_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/cjy_Hant.textproto
@@@ -1,8 -1,8 +1,13 @@@
  id: "cjy_Hant"
  language: "cjy"
  script: "Hant"
++<<<<<<< HEAD
 +name: "Chinese, Jinyu"
 +autonym: "Jinyu Chinese（Traditional）"
++=======
+ name: "Jin Chinese"
+ autonym: "晉語"
++>>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
  region: "CN"
  sample_text {
    masthead_full: "人生而自"

diff --cc lang/Lib/gflanguages/data/languages/gan_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/gan_Hant.textproto
index 28ba09f1d6d579b030cdf5ca675bb1491fa630a2,6a985c1866fb2d8aa3db3fa5555fa2c903122df7..46d75e5bd63627debf68263196bbe959854f94f0
--- 1/lang/Lib/gflanguages/data/languages/gan_Hant.textproto
--- 2/Lib/gflanguages/data/languages/gan_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/gan_Hant.textproto
@@@ -2,8 -2,8 +2,13 @@@ id: "gan_Hant
  language: "gan"
  script: "Hant"
  name: "Gan Chinese"
++<<<<<<< HEAD
 +preferred_name: "Gan"
 +autonym: "Gan Chinese（Traditional）"
++=======
+ preferred_name: "Gan Chinese"
+ autonym: "贛語"
++>>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
  population: 23698340
  region: "CN"
  sample_text {

diff --cc lang/Lib/gflanguages/data/languages/hak_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/hak_Hant.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/hak_Latn.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/hsn_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
index 9b30a06085e8171e628e9ee77f9627157993133a,aa1c89134805794700384d050ddf421943748f4e..5c4648e3fb801cf9ed069336223d527497da319e
--- 1/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
--- 2/Lib/gflanguages/data/languages/hsn_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/hsn_Hant.textproto
@@@ -2,7 -2,7 +2,11 @@@ id: "hsn_Hant
  language: "hsn"
  script: "Hant"
  name: "Xiang Chinese"
++<<<<<<< HEAD
 +autonym: "Xiang Chinese（Traditional）"
++=======
+ autonym: "湘語"
++>>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
  population: 40426580
  region: "CN"
  sample_text {

diff --cc lang/Lib/gflanguages/data/languages/lzh_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/lzh_Hant.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/nan_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/nan_Hant.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/nan_Latn.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/wuu_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
index 6adbbd0e6b51ad9da25fe437d16f3552ac7629e5,ba0cd4b28dad0428b467eb671f2aae1e6a5187f6..8b60d5e6bdcf1e716714396b49fed6768b300685
--- 1/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
--- 2/Lib/gflanguages/data/languages/wuu_Hant.textproto
+++ b/lang/Lib/gflanguages/data/languages/wuu_Hant.textproto
@@@ -2,7 -2,8 +2,12 @@@ id: "wuu_Hant
  language: "wuu"
  script: "Hant"
  name: "Wu Chinese"
++<<<<<<< HEAD
 +autonym: "Wu Chinese（Traditional）"
++=======
+ preferred_name: "Shanghainese"
+ autonym: "吳語"
++>>>>>>> f6a234f61ded3f2c386870192ad701f47105c23b
  population: 83641200
  region: "CN"
  sample_text {

diff --cc lang/Lib/gflanguages/data/languages/yue_Hani.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/yue_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/yue_Hant.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/za_Hans.textproto
Simple merge

diff --cc lang/Lib/gflanguages/data/languages/za_Hant.textproto
Simple merge