Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17220 SBRSv45 Merge last two maint-44 fixes to main #3414

Merged
merged 2 commits into from
Dec 8, 2023
Merged

CLDR-17220 SBRSv45 Merge last two maint-44 fixes to main #3414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb71a02
CLDR-17194 Further clarifications of dx (#3411)
macchiati Dec 6, 2023
5b6c4ed
CLDR-17230 v44.x: add right-facing derived names and annotations (#3410)
macchiati Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
216 changes: 216 additions & 0 deletions common/annotationsDerived/af.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/ar.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/as.xml
View file
Open in desktop

Large diffs are not rendered by default.

236 changes: 226 additions & 10 deletions common/annotationsDerived/az.xml
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 221 additions & 5 deletions common/annotationsDerived/be.xml
View file
Open in desktop

Large diffs are not rendered by default.

626 changes: 421 additions & 205 deletions common/annotationsDerived/bg.xml
View file
Open in desktop

Large diffs are not rendered by default.

556 changes: 386 additions & 170 deletions common/annotationsDerived/bn.xml
View file
Open in desktop

Large diffs are not rendered by default.

236 changes: 226 additions & 10 deletions common/annotationsDerived/bs.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/ca.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/chr.xml
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 221 additions & 5 deletions common/annotationsDerived/cs.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/cy.xml
View file
Open in desktop

Large diffs are not rendered by default.

316 changes: 266 additions & 50 deletions common/annotationsDerived/da.xml
View file
Open in desktop

Large diffs are not rendered by default.

286 changes: 251 additions & 35 deletions common/annotationsDerived/de.xml
View file
Open in desktop

Large diffs are not rendered by default.

198 changes: 123 additions & 75 deletions common/annotationsDerived/de_CH.xml
View file
Open in desktop

Large diffs are not rendered by default.

366 changes: 291 additions & 75 deletions common/annotationsDerived/dsb.xml
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 241 additions & 25 deletions common/annotationsDerived/el.xml
View file
Open in desktop

Large diffs are not rendered by default.

216 changes: 216 additions & 0 deletions common/annotationsDerived/en.xml
View file
Open in desktop

Large diffs are not rendered by default.

242 changes: 157 additions & 85 deletions common/annotationsDerived/en_001.xml
View file
Open in desktop

Large diffs are not rendered by default.

318 changes: 183 additions & 135 deletions common/annotationsDerived/en_AU.xml
View file
Open in desktop

Large diffs are not rendered by default.

180 changes: 90 additions & 90 deletions common/annotationsDerived/en_CA.xml
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 21 additions & 15 deletions common/annotationsDerived/en_GB.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<territory type="GB"/>
</identity>
<annotations>
<annotation cp="🧑🏻‍🌾">farmer | gardener | light skin tone</annotation>
<annotation cp="🧑🏼‍🌾">farmer | gardener | medium-light skin tone</annotation>
<annotation cp="🧑🏽‍🌾">farmer | gardener | medium skin tone</annotation>
<annotation cp="🧑🏾‍🌾">farmer | gardener | medium-dark skin tone</annotation>
<annotation cp="🧑🏿‍🌾">dark skin tone | farmer | gardener</annotation>
<annotation cp="👨🏻‍🌾">farmer | gardener | light skin tone | man</annotation>
<annotation cp="👨🏼‍🌾">farmer | gardener | man | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🌾">farmer | gardener | man | medium skin tone</annotation>
<annotation cp="👨🏾‍🌾">farmer | gardener | man | medium-dark skin tone</annotation>
<annotation cp="👨🏿‍🌾">dark skin tone | farmer | gardener | man</annotation>
<annotation cp="👩🏻‍🌾">farmer | gardener | light skin tone | woman</annotation>
<annotation cp="👩🏼‍🌾">farmer | gardener | medium-light skin tone | woman</annotation>
<annotation cp="👩🏽‍🌾">farmer | gardener | medium skin tone | woman</annotation>
<annotation cp="👩🏾‍🌾">farmer | gardener | medium-dark skin tone | woman</annotation>
<annotation cp="👩🏿‍🌾">dark skin tone | farmer | gardener | woman</annotation>
<annotation cp="🧑🏻‍🌾">farmer | farmer: light skin tone | gardener | light skin tone</annotation>
<annotation cp="🧑🏼‍🌾">farmer | farmer: medium-light skin tone | gardener | medium-light skin tone</annotation>
<annotation cp="🧑🏽‍🌾">farmer | farmer: medium skin tone | gardener | medium skin tone</annotation>
<annotation cp="🧑🏾‍🌾">farmer | farmer: medium-dark skin tone | gardener | medium-dark skin tone</annotation>
<annotation cp="🧑🏿‍🌾">dark skin tone | farmer | farmer: dark skin tone | gardener</annotation>
<annotation cp="👨🏻‍🌾">farmer | gardener | light skin tone | man | man farmer: light skin tone</annotation>
<annotation cp="👨🏼‍🌾">farmer | gardener | man | man farmer: medium-light skin tone | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🌾">farmer | gardener | man | man farmer: medium skin tone | medium skin tone</annotation>
<annotation cp="👨🏾‍🌾">farmer | gardener | man | man farmer: medium-dark skin tone | medium-dark skin tone</annotation>
<annotation cp="👨🏿‍🌾">dark skin tone | farmer | gardener | man | man farmer: dark skin tone</annotation>
<annotation cp="👩🏻‍🌾">farmer | gardener | light skin tone | woman | woman farmer: light skin tone</annotation>
<annotation cp="👩🏼‍🌾">farmer | gardener | medium-light skin tone | woman | woman farmer: medium-light skin tone</annotation>
<annotation cp="👩🏽‍🌾">farmer | gardener | medium skin tone | woman | woman farmer: medium skin tone</annotation>
<annotation cp="👩🏾‍🌾">farmer | gardener | medium-dark skin tone | woman | woman farmer: medium-dark skin tone</annotation>
<annotation cp="👩🏿‍🌾">dark skin tone | farmer | gardener | woman | woman farmer: dark skin tone</annotation>
<annotation cp="👨🏻‍🚒">fire truck | firefighter | light skin tone | man</annotation>
<annotation cp="👨🏼‍🚒">fire truck | firefighter | man | medium-light skin tone</annotation>
<annotation cp="👨🏽‍🚒">fire truck | firefighter | man | medium skin tone</annotation>
Expand Down Expand Up @@ -59,5 +59,11 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<annotation cp="🧑🏽‍🦼">accessibility | medium skin tone | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏾‍🦼">accessibility | medium-dark skin tone | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏿‍🦼">accessibility | dark skin tone | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏻‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏼‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏽‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏾‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
<annotation cp="🧑🏿‍🦼‍➡">accessibility | person in motorised wheelchair | person in powered wheelchair | wheelchair</annotation>
</annotations>
</ldml>
50 changes: 25 additions & 25 deletions common/annotationsDerived/en_IN.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,30 @@ Derived short names and annotations, using GenerateDerivedAnnotations.java. See
<territory type="IN"/>
</identity>
<annotations>
<annotation cp="👫🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏼">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏽">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏾">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏻‍🤝‍👨🏿">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏼">couple | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏼‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏽‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏾‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏻">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏼">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏽">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👩🏿‍🤝‍👨🏾">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands</annotation>
<annotation cp="👫🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | woman | woman and man holding hands</annotation>
<annotation cp="👫🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: light skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏼">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏽">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏾">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: light skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏻‍🤝‍👨🏿">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: light skin tone, dark skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, light skin tone</annotation>
<annotation cp="👫🏼">couple | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, medium skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏼‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-light skin tone, dark skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, light skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, medium-light skin tone</annotation>
<annotation cp="👫🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏾">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, medium-dark skin tone</annotation>
<annotation cp="👩🏽‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: medium skin tone, dark skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏻">couple | hand | hold | light skin tone | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, light skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏼">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏽">couple | hand | hold | man | man and woman holding hands | medium skin tone | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, medium skin tone</annotation>
<annotation cp="👫🏾">couple | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone</annotation>
<annotation cp="👩🏾‍🤝‍👨🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: medium-dark skin tone, dark skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏻">couple | dark skin tone | hand | hold | light skin tone | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: dark skin tone, light skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏼">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-light skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium-light skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏽">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium skin tone</annotation>
<annotation cp="👩🏿‍🤝‍👨🏾">couple | dark skin tone | hand | hold | man | man and woman holding hands | medium-dark skin tone | woman | woman and man holding hands | woman and man holding hands: dark skin tone, medium-dark skin tone</annotation>
<annotation cp="👫🏿">couple | dark skin tone | hand | hold | man | man and woman holding hands | woman | woman and man holding hands | woman and man holding hands: dark skin tone</annotation>
</annotations>
</ldml>
Loading
Loading