Skip to content

Commit 95182a3

Browse files
DraganBesevicDraganBesevic
authored
Merge pull request #213 from unicode-org/CLDR-19083-cldr48-final-production-data
CLDR-19083 CLDR 48 final production data update
2 parents cadb9a8 + 209a64a commit 95182a3

5 files changed

Lines changed: 13 additions & 85 deletions

File tree

‎production/common/dtd/cldrTest.dtd‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
<!--
2-
Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
3-
4-
Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
5-
6-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
7-
8-
Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
2+
Copyright © 1991-2025 Unicode, Inc.
3+
For terms of use, see http://www.unicode.org/copyright.html
4+
SPDX-License-Identifier: Unicode-3.0
5+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
96
-->
107

8+
<!-- This is only referenced by the deprecated GenerateLikelySubtagTests.java - see CLDR-17535 -->
9+
1110
<!ELEMENT cldrTest ((number | date | zoneFields | collation | likelySubtags)*) >
1211
<!ATTLIST cldrTest version CDATA #REQUIRED>
1312
<!ATTLIST cldrTest base CDATA #REQUIRED>
@@ -48,4 +47,3 @@ Except as contained in this notice, the name of a copyright holder shall not be
4847
<!-- likelySubtags result attributes -->
4948
<!ATTLIST result add NMTOKEN #IMPLIED>
5049
<!ATTLIST result remove NMTOKEN #IMPLIED>
51-

‎production/common/dtd/ldmlOpenOffice.dtd‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<!--
2-
Copyright © 2003-2010 Unicode, Inc. and others. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
3-
4-
Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that (a) the above copyright notice(s) and this permission notice appear with all copies of the Data Files or Software, (b) both the above copyright notice(s) and this permission notice appear in associated documentation, and (c) there is clear notice in each modified Data File or in the Software as well as in the documentation associated with the Data File(s) or Software that the data or software has been modified.
5-
6-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
7-
8-
Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
2+
Copyright © 1991-2025 Unicode, Inc.
3+
For terms of use, see http://www.unicode.org/copyright.html
4+
SPDX-License-Identifier: Unicode-3.0
5+
CLDR data files are interpreted according to the LDML specification (http://unicode.org/reports/tr35/)
96
-->
107

118
<!-- OpenOffice.org Specific elements -->
@@ -60,7 +57,7 @@ openOffice:quarter4Abbreviation?)>
6057
<!ELEMENT openOffice:belowWord (#PCDATA)>
6158

6259
<!-- START_DEPRECATED -->
63-
<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>
60+
<!ELEMENT openOffice:quarter1Abbreviation (#PCDATA)>
6461
<!ELEMENT openOffice:quarter2Abbreviation (#PCDATA)>
6562
<!ELEMENT openOffice:quarter3Abbreviation (#PCDATA)>
6663
<!ELEMENT openOffice:quarter4Abbreviation (#PCDATA)>

‎production/common/dtd/ldmlSupplemental.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2183,9 +2183,9 @@ Note: DTD @-annotations are not currently converted to .xsd. For full CLDR file
21832183
<xs:complexType>
21842184
<xs:attribute name="from"/>
21852185
<xs:attribute name="to"/>
2186+
<xs:attribute name="mzone" type="xs:NMTOKEN" use="required"/>
21862187
<xs:attribute name="stdOffset"/>
21872188
<xs:attribute name="dstOffset"/>
2188-
<xs:attribute name="mzone" type="xs:NMTOKEN" use="required"/>
21892189
</xs:complexType>
21902190
</xs:element>
21912191

‎production/common/main/de.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2535,7 +2535,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
25352535
<pattern>{1} 'um' {0}</pattern>
25362536
</dateTimeFormat>
25372537
<dateTimeFormat type="relative">
2538-
<pattern draft="contributed">{1} 'at' {0}</pattern>
2538+
<pattern draft="contributed">{1} 'um' {0}</pattern>
25392539
</dateTimeFormat>
25402540
</dateTimeFormatLength>
25412541
<dateTimeFormatLength type="medium">

‎production/common/main/de_CH.xml‎

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -85,74 +85,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
8585
</dayWidth>
8686
</dayContext>
8787
</days>
88-
<dateFormats>
89-
<dateFormatLength type="full">
90-
<dateFormat>
91-
<pattern>EEEE, d. MMMM y</pattern>
92-
</dateFormat>
93-
</dateFormatLength>
94-
<dateFormatLength type="long">
95-
<dateFormat>
96-
<pattern>d. MMMM y</pattern>
97-
</dateFormat>
98-
</dateFormatLength>
99-
<dateFormatLength type="medium">
100-
<dateFormat>
101-
<pattern>dd.MM.y</pattern>
102-
</dateFormat>
103-
</dateFormatLength>
104-
<dateFormatLength type="short">
105-
<dateFormat>
106-
<pattern>dd.MM.yy</pattern>
107-
</dateFormat>
108-
</dateFormatLength>
109-
</dateFormats>
110-
<timeFormats>
111-
<timeFormatLength type="full">
112-
<timeFormat>
113-
<pattern>HH:mm:ss zzzz</pattern>
114-
</timeFormat>
115-
</timeFormatLength>
116-
<timeFormatLength type="long">
117-
<timeFormat>
118-
<pattern>HH:mm:ss z</pattern>
119-
</timeFormat>
120-
</timeFormatLength>
121-
<timeFormatLength type="medium">
122-
<timeFormat>
123-
<pattern>HH:mm:ss</pattern>
124-
</timeFormat>
125-
</timeFormatLength>
126-
<timeFormatLength type="short">
127-
<timeFormat>
128-
<pattern>HH:mm</pattern>
129-
</timeFormat>
130-
</timeFormatLength>
131-
</timeFormats>
13288
<dateTimeFormats>
133-
<dateTimeFormatLength type="full">
134-
<dateTimeFormat>
135-
<pattern>{1}, {0}</pattern>
136-
</dateTimeFormat>
137-
</dateTimeFormatLength>
138-
<dateTimeFormatLength type="long">
139-
<dateTimeFormat>
140-
<pattern>{1}, {0}</pattern>
141-
</dateTimeFormat>
142-
<dateTimeFormat type="relative">
143-
<pattern draft="contributed">{1} 'um' {0}</pattern>
144-
</dateTimeFormat>
145-
</dateTimeFormatLength>
146-
<dateTimeFormatLength type="medium">
147-
<dateTimeFormat>
148-
<pattern>{1}, {0}</pattern>
149-
</dateTimeFormat>
150-
</dateTimeFormatLength>
151-
<dateTimeFormatLength type="short">
152-
<dateTimeFormat>
153-
<pattern>{1}, {0}</pattern>
154-
</dateTimeFormat>
155-
</dateTimeFormatLength>
15689
<availableFormats>
15790
<dateFormatItem id="GyM">M/y G</dateFormatItem>
15891
<dateFormatItem id="GyMd">dd.MM.y GGGGG</dateFormatItem>

0 commit comments

Comments
 (0)