Merge branch 'cldr' into cldr_merge

# Conflicts: # sldr/a/aa.xml # sldr/a/aa_DJ.xml # sldr/a/aa_ER.xml # sldr/a/aa_ET.xml # sldr/a/af.xml # sldr/a/af_NA.xml # sldr/a/am.xml # sldr/a/ann.xml # sldr/a/apc.xml # sldr/a/ar.xml # sldr/a/ar_BH.xml # sldr/a/ar_EG.xml # sldr/a/ar_IL.xml # sldr/a/ar_IQ.xml # sldr/a/ar_JO.xml # sldr/a/ar_KM.xml # sldr/a/ar_KW.xml # sldr/a/ar_LY.xml # sldr/a/ar_OM.xml # sldr/a/ar_PS.xml # sldr/a/ar_QA.xml # sldr/a/ar_SD.xml # sldr/a/ar_SY.xml # sldr/a/ar_TD.xml # sldr/a/ar_YE.xml # sldr/a/arn.xml # sldr/a/as.xml # sldr/a/ast.xml # sldr/a/az.xml # sldr/a/az_Cyrl.xml # sldr/b/bal.xml # sldr/b/bal_Latn.xml # sldr/b/be.xml # sldr/b/be_TARASK.xml # sldr/b/bem.xml # sldr/b/bg.xml # sldr/b/bgc.xml # sldr/b/bho.xml # sldr/b/blo.xml # sldr/b/blt.xml # sldr/b/bm.xml # sldr/b/bn.xml # sldr/b/bn_IN.xml # sldr/b/br.xml # sldr/b/brx.xml # sldr/b/bs.xml # sldr/b/bs_Cyrl.xml # sldr/b/bss.xml # sldr/b/byn.xml # sldr/c/ca.xml # sldr/c/ca_ES_VALENCIA.xml # sldr/c/cch.xml # sldr/c/ccp.xml # sldr/c/ccp_IN.xml # sldr/c/ce.xml # sldr/c/ceb.xml # sldr/c/chr.xml # sldr/c/ckb.xml # sldr/c/cs.xml # sldr/c/cu.xml # sldr/c/cu_RU.xml # sldr/c/cv.xml # sldr/c/cy.xml # sldr/d/da.xml # sldr/d/dav.xml # sldr/d/de.xml # sldr/d/de_CH.xml # sldr/d/doi.xml # sldr/d/doi_IN.xml # sldr/d/dsb.xml # sldr/d/dv.xml # sldr/d/dz.xml # sldr/e/ebu.xml # sldr/e/ee.xml # sldr/e/el.xml # sldr/e/en.xml # sldr/e/en_150.xml # sldr/e/en_AE.xml # sldr/e/en_AT.xml # sldr/e/en_AU.xml # sldr/e/en_BB.xml # sldr/e/en_BE.xml # sldr/e/en_BM.xml # sldr/e/en_BW.xml # sldr/e/en_CA.xml # sldr/e/en_CH.xml # sldr/e/en_DE.xml # sldr/e/en_DK.xml # sldr/e/en_FI.xml # sldr/e/en_FJ.xml # sldr/e/en_GB.xml # sldr/e/en_GH.xml # sldr/e/en_GY.xml # sldr/e/en_IN.xml # sldr/e/en_JM.xml # sldr/e/en_LR.xml # sldr/e/en_LS.xml # sldr/e/en_MG.xml # sldr/e/en_MU.xml # sldr/e/en_MV.xml # sldr/e/en_MY.xml # sldr/e/en_NA.xml # sldr/e/en_NG.xml # sldr/e/en_NL.xml # sldr/e/en_PH.xml # sldr/e/en_PK.xml # sldr/e/en_RW.xml # sldr/e/en_SB.xml # sldr/e/en_SE.xml # sldr/e/en_SG.xml # sldr/e/en_SI.xml # sldr/e/en_TO.xml # sldr/e/en_TT.xml # sldr/e/en_US_POSIX.xml # sldr/e/en_ZA.xml # sldr/e/eo.xml # sldr/e/es.xml # sldr/e/es_419.xml # sldr/e/es_AR.xml # sldr/e/es_BZ.xml # sldr/e/es_CR.xml # sldr/e/es_GT.xml # sldr/e/es_HN.xml # sldr/e/es_MX.xml # sldr/e/es_NI.xml # sldr/e/es_PA.xml # sldr/e/es_PY.xml # sldr/e/es_SV.xml # sldr/e/es_US.xml # sldr/e/es_UY.xml # sldr/e/et.xml # sldr/e/eu.xml # sldr/f/fa.xml # sldr/f/fa_AF.xml # sldr/f/ff.xml # sldr/f/ff_Adlm.xml # sldr/f/ff_Adlm_GN.xml # sldr/f/ff_Latn_GH.xml # sldr/f/ff_Latn_GN.xml # sldr/f/ff_Latn_LR.xml # sldr/f/ff_Latn_NG.xml # sldr/f/fi.xml # sldr/f/fil.xml # sldr/f/fo.xml # sldr/f/fr.xml # sldr/f/fr_CA.xml # sldr/f/fr_CD.xml # sldr/f/fr_CH.xml # sldr/f/fr_GN.xml # sldr/f/fr_HT.xml # sldr/f/fr_MG.xml # sldr/f/fr_MU.xml # sldr/f/fr_RE.xml # sldr/f/fr_SN.xml # sldr/f/frr.xml # sldr/f/fy.xml # sldr/g/ga.xml # sldr/g/gaa.xml # sldr/g/gd.xml # sldr/g/gez.xml # sldr/g/gl.xml # sldr/g/gsw.xml # sldr/g/gu.xml # sldr/g/guz.xml # sldr/g/gv.xml # sldr/h/ha.xml # sldr/h/ha_Arab.xml # sldr/h/ha_NE.xml # sldr/h/haw.xml # sldr/h/he.xml # sldr/h/hi.xml # sldr/h/hi_Latn.xml # sldr/h/hr.xml # sldr/h/hr_BA.xml # sldr/h/hsb.xml # sldr/h/hu.xml # sldr/h/hy.xml # sldr/i/ia.xml # sldr/i/id.xml # sldr/i/ig.xml # sldr/i/ii.xml # sldr/i/is.xml # sldr/i/it.xml # sldr/i/iu.xml # sldr/j/ja.xml # sldr/j/jgo.xml # sldr/j/jv.xml # sldr/k/ka.xml # sldr/k/kab.xml # sldr/k/kaj.xml # sldr/k/kam.xml # sldr/k/kcg.xml # sldr/k/kde.xml # sldr/k/kea.xml # sldr/k/ken.xml # sldr/k/kgp.xml # sldr/k/ki.xml # sldr/k/kk.xml # sldr/k/kkj.xml # sldr/k/kl.xml # sldr/k/kln.xml # sldr/k/km.xml # sldr/k/kn.xml # sldr/k/ko.xml # sldr/k/kok.xml # sldr/k/kpe.xml # sldr/k/ks.xml # sldr/k/ks_Arab.xml # sldr/k/ks_Arab_IN.xml # sldr/k/ks_Deva.xml # sldr/k/ksh.xml # sldr/k/ku.xml # sldr/k/ky.xml # sldr/l/lb.xml # sldr/l/lkt.xml # sldr/l/ln.xml # sldr/l/ln_AO.xml # sldr/l/lo.xml # sldr/l/lrc.xml # sldr/l/lt.xml # sldr/l/lv.xml # sldr/m/mai.xml # sldr/m/mas.xml # sldr/m/mdf.xml # sldr/m/mer.xml # sldr/m/mg.xml # sldr/m/mgh.xml # sldr/m/mgo.xml # sldr/m/mi.xml # sldr/m/mic.xml # sldr/m/mk.xml # sldr/m/ml.xml # sldr/m/mn.xml # sldr/m/mni.xml # sldr/m/mr.xml # sldr/m/ms.xml # sldr/m/ms_Arab.xml # sldr/m/mt.xml # sldr/m/mua.xml # sldr/m/my.xml # sldr/m/mzn.xml # sldr/n/nb_NO.xml # sldr/n/nb_SJ.xml # sldr/n/nd.xml # sldr/n/nds.xml # sldr/n/nds_NL.xml # sldr/n/ne.xml # sldr/n/nl.xml # sldr/n/nl_BE.xml # sldr/n/nl_SR.xml # sldr/n/nn.xml # sldr/n/nn_NO.xml # sldr/n/nnh.xml # sldr/n/no.xml # sldr/n/nr.xml # sldr/n/nr_ZA.xml # sldr/n/nso.xml # sldr/n/nso_ZA.xml # sldr/n/nus.xml # sldr/n/ny.xml # sldr/o/oc.xml # sldr/o/oc_ES.xml # sldr/o/om.xml # sldr/o/or.xml # sldr/o/os.xml # sldr/p/pa.xml # sldr/p/pcm.xml # sldr/p/pis.xml # sldr/p/pl.xml # sldr/p/prg.xml # sldr/p/ps.xml # sldr/p/pt.xml # sldr/p/pt_PT.xml # sldr/p/pt_ST.xml # sldr/q/qu.xml # sldr/q/quc.xml # sldr/r/raj.xml # sldr/r/rif.xml # sldr/r/rm.xml # sldr/r/ro.xml # sldr/r/ro_MD.xml # sldr/r/root.xml # sldr/r/ru.xml # sldr/r/ru_KZ.xml # sldr/r/rw.xml # sldr/s/sa.xml # sldr/s/sah.xml # sldr/s/saq.xml # sldr/s/sbp.xml # sldr/s/sc.xml # sldr/s/sd.xml # sldr/s/sd_Deva.xml # sldr/s/se.xml # sldr/s/se_FI.xml # sldr/s/seh.xml # sldr/s/ses.xml # sldr/s/shn.xml # sldr/s/si.xml # sldr/s/sid.xml # sldr/s/sk.xml # sldr/s/skr.xml # sldr/s/sl.xml # sldr/s/smn.xml # sldr/s/sms.xml # sldr/s/sn.xml # sldr/s/so.xml # sldr/s/sq.xml # sldr/s/sr.xml # sldr/s/sr_Cyrl_BA.xml # sldr/s/sr_Cyrl_ME.xml # sldr/s/sr_Cyrl_XK.xml # sldr/s/sr_Latn.xml # sldr/s/sr_Latn_BA.xml # sldr/s/sr_Latn_ME.xml # sldr/s/sr_Latn_XK.xml # sldr/s/ss.xml # sldr/s/ss_SZ.xml # sldr/s/ss_ZA.xml # sldr/s/ssy.xml # sldr/s/ssy_ER.xml # sldr/s/st.xml # sldr/s/st_LS.xml # sldr/s/su.xml # sldr/s/sv.xml # sldr/s/sw.xml # sldr/s/sw_KE.xml # sldr/s/syr.xml # sldr/t/ta.xml # sldr/t/te.xml # sldr/t/teo.xml # sldr/t/tg.xml # sldr/t/th.xml # sldr/t/ti.xml # sldr/t/tig.xml # sldr/t/tk.xml # sldr/t/tn.xml # sldr/t/tn_BW.xml # sldr/t/tn_ZA.xml # sldr/t/to.xml # sldr/t/tok.xml # sldr/t/tok_001.xml # sldr/t/tpi.xml # sldr/t/tr.xml # sldr/t/trv.xml # sldr/t/trw.xml # sldr/t/ts.xml # sldr/t/ts_ZA.xml # sldr/t/tt.xml # sldr/u/ug.xml # sldr/u/uk.xml # sldr/u/ur.xml # sldr/u/uz.xml # sldr/u/uz_Arab_AF.xml # sldr/u/uz_Cyrl.xml # sldr/v/vai.xml # sldr/v/vai_Latn.xml # sldr/v/ve.xml # sldr/v/ve_ZA.xml # sldr/v/vec.xml # sldr/v/vi.xml # sldr/v/vo.xml # sldr/v/vo_001.xml # sldr/w/wa.xml # sldr/w/wal.xml # sldr/w/wbp.xml # sldr/w/wo.xml # sldr/x/xh.xml # sldr/y/yav.xml # sldr/y/yi.xml # sldr/y/yo.xml # sldr/y/yo_BJ.xml # sldr/y/yrl.xml # sldr/y/yrl_CO.xml # sldr/y/yrl_VE.xml # sldr/y/yue.xml # sldr/y/yue_Hans.xml # sldr/z/za.xml # sldr/z/zgh.xml # sldr/z/zh.xml # sldr/z/zh_Hant.xml # sldr/z/zh_Hant_HK.xml # sldr/z/zu.xml
silnrsi · Mar 6, 2024 · f383a46 · f383a46
2 parents 91b39e2 + e220cd1
commit f383a46
Show file tree

Hide file tree

Showing 1,044 changed files with 187,131 additions and 388,485 deletions.
diff --git a/sldr/a/aa.xml b/sldr/a/aa.xml
diff --git a/sldr/a/aa_DJ.xml b/sldr/a/aa_DJ.xml
@@ -1,50 +1,70 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
-		<language type="aa"/>
-		<territory type="DJ"/>
-		<special>
-			<sil:identity source="cldr" defaultRegion="DJ" script="Latn" draft="approved"/>
-		</special>
-	</identity>
-	<dates>
-		<calendars>
-			<calendar type="gregorian">
-				<months>
-					<monthContext type="format">
-						<monthWidth type="wide">
-							<month type="8" draft="unconfirmed">Leqeeni</month>
-						</monthWidth>
-					</monthContext>
-				</months>
-			</calendar>
-		</calendars>
-	</dates>
-	<numbers>
-		<currencies>
-			<currency type="DJF">
-				<symbol>Fdj</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<special>
-		<sil:external-resources>
-			<sil:font name="Charis SIL" types="default">
-				<sil:url>https://lff.api.languagetechnology.org/family/charissil</sil:url>
-			</sil:font>
-			<sil:font name="Noto Sans">
-				<!--types="ui"-->
-				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSans/NotoSans-Regular.ttf</sil:url>
-			</sil:font>
-			<sil:font name="Noto Serif">
-				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSerif/NotoSerif-Regular.ttf</sil:url>
-			</sil:font>
-		</sil:external-resources>
-	</special>
-</ldml>
+<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<version number="$Revision: 10669 $"/>
+		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
+		<language type="aa"/>
+		<territory type="DJ"/>
+		<special>
+			<sil:identity source="cldr" defaultRegion="DJ" script="Latn" draft="approved"/>
+=======
+<!-- Copyright © 1991-2023 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-DFS-2016
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<territory type="DJ"/>
+		<special>
+			<sil:identity source="cldr" defaultRegion="DJ" script="Latn"/>
+>>>>>>> cldr
+		</special>
+	</identity>
+	<dates>
+		<calendars>
+			<calendar type="gregorian">
+				<months>
+					<monthContext type="format">
+						<monthWidth type="wide">
+<<<<<<< HEAD
+							<month type="8" draft="unconfirmed">Leqeeni</month>
+=======
+							<month type="8">Leqeeni</month>
+>>>>>>> cldr
+						</monthWidth>
+					</monthContext>
+				</months>
+			</calendar>
+		</calendars>
+	</dates>
+	<numbers>
+		<currencies>
+			<currency type="DJF">
+				<symbol>Fdj</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+<<<<<<< HEAD
+	<special>
+		<sil:external-resources>
+			<sil:font name="Charis SIL" types="default">
+				<sil:url>https://lff.api.languagetechnology.org/family/charissil</sil:url>
+			</sil:font>
+			<sil:font name="Noto Sans">
+				<!--types="ui"-->
+				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSans/NotoSans-Regular.ttf</sil:url>
+			</sil:font>
+			<sil:font name="Noto Serif">
+				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSerif/NotoSerif-Regular.ttf</sil:url>
+			</sil:font>
+		</sil:external-resources>
+	</special>
+=======
+>>>>>>> cldr
+</ldml>
diff --git a/sldr/a/aa_ER.xml b/sldr/a/aa_ER.xml
@@ -1,37 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
-		<language type="aa"/>
-		<territory type="ER"/>
-		<special>
-			<sil:identity source="cldr" defaultRegion="ER" script="Latn" draft="approved"/>
-		</special>
-	</identity>
-	<numbers>
-		<currencies>
-			<currency type="ERN">
-				<symbol>Nfk</symbol>
-			</currency>
-		</currencies>
-	</numbers>
-	<special>
-		<sil:external-resources>
-			<sil:font name="Charis SIL" types="default">
-				<sil:url>https://lff.api.languagetechnology.org/family/charissil</sil:url>
-			</sil:font>
-			<sil:font name="Noto Sans">
-				<!--types="ui"-->
-				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSans/NotoSans-Regular.ttf</sil:url>
-			</sil:font>
-			<sil:font name="Noto Serif">
-				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSerif/NotoSerif-Regular.ttf</sil:url>
-			</sil:font>
-		</sil:external-resources>
-	</special>
-</ldml>
+<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<version number="$Revision: 10669 $"/>
+		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
+		<language type="aa"/>
+		<territory type="ER"/>
+		<special>
+			<sil:identity source="cldr" defaultRegion="ER" script="Latn" draft="approved"/>
+=======
+<!-- Copyright © 1991-2023 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-DFS-2016
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<territory type="ER"/>
+		<special>
+			<sil:identity source="cldr" defaultRegion="ER" script="Latn"/>
+>>>>>>> cldr
+		</special>
+	</identity>
+	<numbers>
+		<currencies>
+			<currency type="ERN">
+				<symbol>Nfk</symbol>
+			</currency>
+		</currencies>
+	</numbers>
+<<<<<<< HEAD
+	<special>
+		<sil:external-resources>
+			<sil:font name="Charis SIL" types="default">
+				<sil:url>https://lff.api.languagetechnology.org/family/charissil</sil:url>
+			</sil:font>
+			<sil:font name="Noto Sans">
+				<!--types="ui"-->
+				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSans/NotoSans-Regular.ttf</sil:url>
+			</sil:font>
+			<sil:font name="Noto Serif">
+				<sil:url>https://github.com/googlefonts/noto-fonts/raw/main/hinted/ttf/NotoSerif/NotoSerif-Regular.ttf</sil:url>
+			</sil:font>
+		</sil:external-resources>
+	</special>
+=======
+>>>>>>> cldr
+</ldml>
diff --git a/sldr/a/aa_ET.xml b/sldr/a/aa_ET.xml
@@ -1,16 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 1991-2014 Unicode, Inc.
-CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
-For terms of use, see http://www.unicode.org/copyright.html
--->
-<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
-	<identity>
-		<version number="$Revision: 10669 $"/>
-		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
-		<language type="aa"/>
-		<territory type="ET"/>
-		<special>
-			<sil:identity source="cldr" defaultRegion="ET" script="Latn" draft="approved"/>
-		</special>
-	</identity>
-</ldml>
+<?xml version="1.0" encoding="utf-8"?>
+<<<<<<< HEAD
+<!-- Copyright © 1991-2014 Unicode, Inc.
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+For terms of use, see http://www.unicode.org/copyright.html
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<version number="$Revision: 10669 $"/>
+		<generation date="$Date: 2014-07-23 21:10 +0000 $"/>
+		<language type="aa"/>
+		<territory type="ET"/>
+		<special>
+			<sil:identity source="cldr" defaultRegion="ET" script="Latn" draft="approved"/>
+		</special>
+=======
+<!-- Copyright © 1991-2023 Unicode, Inc.
+For terms of use, see http://www.unicode.org/copyright.html
+SPDX-License-Identifier: Unicode-DFS-2016
+CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
+-->
+<ldml xmlns:sil="urn://www.sil.org/ldml/0.1">
+	<identity>
+		<territory type="ET"/>
+>>>>>>> cldr
+	</identity>
+</ldml>