Merge commit 'fc503d13ee4b4ca4891998c301a0d7c9bec5dfd6' into merge-lang-updates

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc lang/Lib/gflanguages/data/languages/nst_Tnsa.textproto
index 0000000000000000000000000000000000000000,53afc6bcd0dea53113a70c4aefa9ea83d78b1499..53afc6bcd0dea53113a70c4aefa9ea83d78b1499
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/gflanguages/data/languages/nst_Tnsa.textproto
+++ b/lang/Lib/gflanguages/data/languages/nst_Tnsa.textproto

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc lang/Lib/gflanguages/data/languages/txo_Toto.textproto
index 0000000000000000000000000000000000000000,a31c033d905648c1e3bcefdc5fb2a708d7c359f2..a31c033d905648c1e3bcefdc5fb2a708d7c359f2
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/gflanguages/data/languages/txo_Toto.textproto
+++ b/lang/Lib/gflanguages/data/languages/txo_Toto.textproto

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

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

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

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

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

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

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

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

diff --cc lang/Lib/gflanguages/data/languages/yo_Latn.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/zgh_Tfng.textproto
Simple merge

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

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

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

diff --cc lang/Lib/gflanguages/data/scripts/Tnsa.textproto
index 0000000000000000000000000000000000000000,6226fdc89c31074a5b12fe4f90e09332cc1233a1..6226fdc89c31074a5b12fe4f90e09332cc1233a1
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/gflanguages/data/scripts/Tnsa.textproto
+++ b/lang/Lib/gflanguages/data/scripts/Tnsa.textproto

diff --cc lang/Lib/gflanguages/data/scripts/Toto.textproto
index 0000000000000000000000000000000000000000,bdd969380bf1c629cc711b0d7e68039ec0586f39..bdd969380bf1c629cc711b0d7e68039ec0586f39
mode 000000,100644..100644
--- /dev/null
--- 2/Lib/gflanguages/data/scripts/Toto.textproto
+++ b/lang/Lib/gflanguages/data/scripts/Toto.textproto

diff --cc lang/dev-requirements.txt
index 0000000000000000000000000000000000000000,9acb19bea6947930b8fea05cf50fc7ece2946d4b..9acb19bea6947930b8fea05cf50fc7ece2946d4b
mode 000000,100644..100644
--- /dev/null
--- 2/dev-requirements.txt
+++ b/lang/dev-requirements.txt

diff --cc lang/setup.py
Simple merge

diff --cc lang/snippets/fix-exemplars-duplicates.py
index 0000000000000000000000000000000000000000,fdc0f6a4adfefa12440af4da6c416071fcfaedd6..fdc0f6a4adfefa12440af4da6c416071fcfaedd6
mode 000000,100644..100644
--- /dev/null
--- 2/snippets/fix-exemplars-duplicates.py
+++ b/lang/snippets/fix-exemplars-duplicates.py

diff --cc lang/tests/test_data_languages.py
index 0000000000000000000000000000000000000000,0a244af7ef2ab30d80c4f8d3fc6da0e9adbb462a..0a244af7ef2ab30d80c4f8d3fc6da0e9adbb462a
mode 000000,100644..100644
--- /dev/null
--- 2/tests/test_data_languages.py
+++ b/lang/tests/test_data_languages.py

diff --cc lang/tests/test_dottedcircle.py
index 0000000000000000000000000000000000000000,b3e3603296da239619902e643b2e6e5382fa0f00..b3e3603296da239619902e643b2e6e5382fa0f00
mode 000000,100644..100644
--- /dev/null
--- 2/tests/test_dottedcircle.py
+++ b/lang/tests/test_dottedcircle.py

diff --cc lang/tox.ini
Simple merge