From 91cb12ed98adff86fed0cef4486eb780fc296436 Mon Sep 17 00:00:00 2001 From: pedberg-icu <42151464+pedberg-icu@users.noreply.github.com> Date: Thu, 5 Mar 2020 09:13:14 -0800 Subject: [PATCH] CLDR-13431 v36.1 final: update readme; copy emoji collation & annotations (#376) from master @d3ffc1b437c7b51ca5dad0051ac7dbd5674aa785 --- common/annotations/af.xml | 250 ++-- common/annotations/am.xml | 242 +-- common/annotations/ar.xml | 256 ++-- common/annotations/as.xml | 266 ++-- common/annotations/az.xml | 260 ++-- common/annotations/be.xml | 246 +-- common/annotations/bg.xml | 252 ++-- common/annotations/bn.xml | 268 ++-- common/annotations/br.xml | 30 +- common/annotations/bs.xml | 282 ++-- common/annotations/ca.xml | 250 ++-- common/annotations/chr.xml | 242 +-- common/annotations/cs.xml | 250 ++-- common/annotations/cy.xml | 265 ++-- common/annotations/da.xml | 254 ++-- common/annotations/de.xml | 250 ++-- common/annotations/de_CH.xml | 111 +- common/annotations/el.xml | 254 ++-- common/annotations/en.xml | 285 ++-- common/annotations/en_001.xml | 50 +- common/annotations/en_AU.xml | 236 ++- common/annotations/en_CA.xml | 296 ++-- common/annotations/en_GB.xml | 268 ++-- common/annotations/en_IN.xml | 173 ++- common/annotations/es.xml | 258 ++-- common/annotations/es_419.xml | 906 +++++------ common/annotations/es_MX.xml | 514 ++++--- common/annotations/es_US.xml | 400 ++--- common/annotations/et.xml | 260 ++-- common/annotations/eu.xml | 266 ++-- common/annotations/fa.xml | 262 ++-- common/annotations/fi.xml | 246 +-- common/annotations/fil.xml | 248 +-- common/annotations/fo.xml | 254 ++-- common/annotations/fr.xml | 258 ++-- common/annotations/fr_CA.xml | 834 ++++++----- common/annotations/ga.xml | 241 +-- common/annotations/gd.xml | 260 ++-- common/annotations/gl.xml | 278 ++-- common/annotations/gu.xml | 270 ++-- common/annotations/he.xml | 242 +-- common/annotations/hi.xml | 262 ++-- common/annotations/hr.xml | 246 +-- common/annotations/hu.xml | 266 ++-- common/annotations/hy.xml | 254 ++-- common/annotations/ia.xml | 10 +- common/annotations/id.xml | 242 +-- common/annotations/is.xml | 244 +-- common/annotations/it.xml | 250 ++-- common/annotations/ja.xml | 250 ++-- common/annotations/jv.xml | 246 +-- common/annotations/ka.xml | 266 ++-- common/annotations/kk.xml | 288 ++-- common/annotations/km.xml | 262 ++-- common/annotations/kn.xml | 278 ++-- common/annotations/ko.xml | 250 ++-- common/annotations/kok.xml | 474 +++--- common/annotations/ky.xml | 262 ++-- common/annotations/lo.xml | 258 ++-- common/annotations/lt.xml | 246 +-- common/annotations/lv.xml | 272 ++-- common/annotations/mk.xml | 262 ++-- common/annotations/ml.xml | 209 ++- common/annotations/mn.xml | 268 ++-- common/annotations/mr.xml | 280 ++-- common/annotations/ms.xml | 268 ++-- common/annotations/my.xml | 274 ++-- common/annotations/nb.xml | 250 ++-- common/annotations/ne.xml | 274 ++-- common/annotations/nl.xml | 274 ++-- common/annotations/or.xml | 262 ++-- common/annotations/pa.xml | 262 ++-- common/annotations/pl.xml | 250 ++-- common/annotations/ps.xml | 245 +-- common/annotations/pt.xml | 246 +-- common/annotations/pt_PT.xml | 746 ++++----- common/annotations/ro.xml | 264 ++-- common/annotations/root.xml | 243 +-- common/annotations/ru.xml | 242 +-- common/annotations/sd.xml | 254 ++-- common/annotations/si.xml | 266 ++-- common/annotations/sk.xml | 258 ++-- common/annotations/sl.xml | 266 ++-- common/annotations/so.xml | 178 ++- common/annotations/sq.xml | 254 ++-- common/annotations/sr.xml | 244 +-- common/annotations/sr_Latn.xml | 242 +-- common/annotations/sv.xml | 284 ++-- common/annotations/sw.xml | 256 ++-- common/annotations/sw_KE.xml | 246 +-- common/annotations/ta.xml | 272 ++-- common/annotations/te.xml | 276 ++-- common/annotations/th.xml | 242 +-- common/annotations/tk.xml | 242 +-- common/annotations/to.xml | 222 +-- common/annotations/tr.xml | 246 +-- common/annotations/uk.xml | 258 ++-- common/annotations/ur.xml | 249 +-- common/annotations/uz.xml | 278 ++-- common/annotations/vi.xml | 242 +-- common/annotations/yue.xml | 242 +-- common/annotations/yue_Hans.xml | 239 +-- common/annotations/zh.xml | 256 ++-- common/annotations/zh_Hant.xml | 260 ++-- common/annotations/zh_Hant_HK.xml | 350 +++-- common/annotations/zu.xml | 273 ++-- common/annotationsDerived/af.xml | 642 +++++--- common/annotationsDerived/am.xml | 342 +++-- common/annotationsDerived/ar.xml | 312 +++- common/annotationsDerived/as.xml | 262 +++- common/annotationsDerived/az.xml | 232 ++- common/annotationsDerived/be.xml | 412 +++-- common/annotationsDerived/bg.xml | 342 +++-- common/annotationsDerived/bn.xml | 312 +++- common/annotationsDerived/bs.xml | 322 ++-- common/annotationsDerived/ca.xml | 272 +++- common/annotationsDerived/chr.xml | 422 ++++-- common/annotationsDerived/cs.xml | 362 +++-- common/annotationsDerived/cy.xml | 332 ++-- common/annotationsDerived/da.xml | 332 ++-- common/annotationsDerived/de.xml | 372 +++-- common/annotationsDerived/de_CH.xml | 47 +- common/annotationsDerived/el.xml | 302 +++- common/annotationsDerived/en.xml | 332 ++-- common/annotationsDerived/en_001.xml | 27 +- common/annotationsDerived/en_AU.xml | 102 +- common/annotationsDerived/en_CA.xml | 122 +- common/annotationsDerived/en_IN.xml | 52 +- common/annotationsDerived/es.xml | 858 ++++++----- common/annotationsDerived/es_419.xml | 488 +++--- common/annotationsDerived/es_MX.xml | 653 ++++---- common/annotationsDerived/es_US.xml | 428 +++--- common/annotationsDerived/et.xml | 412 +++-- common/annotationsDerived/eu.xml | 408 +++-- common/annotationsDerived/fa.xml | 352 +++-- common/annotationsDerived/fi.xml | 282 +++- common/annotationsDerived/fil.xml | 262 +++- common/annotationsDerived/fo.xml | 702 +++++---- common/annotationsDerived/fr.xml | 732 +++++---- common/annotationsDerived/fr_CA.xml | 697 +++++---- common/annotationsDerived/ga.xml | 342 +++-- common/annotationsDerived/gd.xml | 332 ++-- common/annotationsDerived/gl.xml | 870 ++++++----- common/annotationsDerived/gu.xml | 342 +++-- common/annotationsDerived/he.xml | 520 ++++--- common/annotationsDerived/hi.xml | 262 +++- common/annotationsDerived/hr.xml | 332 ++-- common/annotationsDerived/hu.xml | 332 ++-- common/annotationsDerived/hy.xml | 312 +++- common/annotationsDerived/ia.xml | 12 +- common/annotationsDerived/id.xml | 242 ++- common/annotationsDerived/is.xml | 262 +++- common/annotationsDerived/it.xml | 302 +++- common/annotationsDerived/ja.xml | 432 ++++-- common/annotationsDerived/ka.xml | 302 +++- common/annotationsDerived/kk.xml | 272 +++- common/annotationsDerived/km.xml | 668 +++++---- common/annotationsDerived/kn.xml | 262 +++- common/annotationsDerived/ko.xml | 242 ++- common/annotationsDerived/ky.xml | 342 +++-- common/annotationsDerived/lo.xml | 222 ++- common/annotationsDerived/lt.xml | 352 +++-- common/annotationsDerived/lv.xml | 512 ++++--- common/annotationsDerived/mk.xml | 262 +++- common/annotationsDerived/ml.xml | 352 ++++- common/annotationsDerived/mn.xml | 272 +++- common/annotationsDerived/mr.xml | 352 +++-- common/annotationsDerived/ms.xml | 282 +++- common/annotationsDerived/my.xml | 372 +++-- common/annotationsDerived/nb.xml | 744 +++++---- common/annotationsDerived/ne.xml | 242 ++- common/annotationsDerived/nl.xml | 432 ++++-- common/annotationsDerived/nn.xml | 4 +- common/annotationsDerived/or.xml | 462 ++++-- common/annotationsDerived/pa.xml | 362 +++-- common/annotationsDerived/pl.xml | 302 +++- common/annotationsDerived/pt.xml | 432 ++++-- common/annotationsDerived/pt_PT.xml | 718 +++++---- common/annotationsDerived/ro.xml | 542 ++++--- common/annotationsDerived/ru.xml | 472 ++++-- common/annotationsDerived/sd.xml | 242 ++- common/annotationsDerived/si.xml | 528 ++++--- common/annotationsDerived/sk.xml | 502 ++++--- common/annotationsDerived/sl.xml | 402 +++-- common/annotationsDerived/sq.xml | 362 +++-- common/annotationsDerived/sr.xml | 352 +++-- common/annotationsDerived/sr_Cyrl.xml | 352 +++-- common/annotationsDerived/sr_Latn.xml | 342 +++-- common/annotationsDerived/sv.xml | 282 +++- common/annotationsDerived/sw.xml | 402 +++-- common/annotationsDerived/sw_KE.xml | 12 +- common/annotationsDerived/ta.xml | 222 ++- common/annotationsDerived/te.xml | 312 +++- common/annotationsDerived/th.xml | 222 ++- common/annotationsDerived/tk.xml | 302 +++- common/annotationsDerived/to.xml | 172 ++- common/annotationsDerived/tr.xml | 222 ++- common/annotationsDerived/uk.xml | 1332 +++++++++-------- common/annotationsDerived/ur.xml | 362 +++-- common/annotationsDerived/uz.xml | 690 +++++---- common/annotationsDerived/vi.xml | 262 +++- common/annotationsDerived/yue.xml | 212 ++- common/annotationsDerived/yue_Hans.xml | 212 ++- common/annotationsDerived/zh.xml | 222 ++- common/annotationsDerived/zh_Hant.xml | 262 +++- common/annotationsDerived/zh_Hant_HK.xml | 308 ++-- common/annotationsDerived/zu.xml | 342 ++++- common/collation/root.xml | 84 +- readme.html | 8 +- .../images/emoji/emoji_1f408_200d_2b1b.png | Bin 0 -> 2818 bytes .../images/emoji/emoji_1f43b_200d_2744.png | Bin 0 -> 1325 bytes .../images/emoji/emoji_1f468_200d_1f37c.png | Bin 0 -> 4442 bytes .../images/emoji/emoji_1f469_200d_1f37c.png | Bin 0 -> 4670 bytes .../WebContent/images/emoji/emoji_1f470.png | Bin 2199 -> 21783 bytes .../images/emoji/emoji_1f470_200d_2640.png | Bin 0 -> 8042 bytes .../images/emoji/emoji_1f470_200d_2642.png | Bin 0 -> 6872 bytes .../WebContent/images/emoji/emoji_1f935.png | Bin 1715 -> 21138 bytes .../images/emoji/emoji_1f935_200d_2640.png | Bin 0 -> 5621 bytes .../images/emoji/emoji_1f935_200d_2642.png | Bin 0 -> 6467 bytes .../images/emoji/emoji_1f9d1_200d_1f37c.png | Bin 0 -> 4972 bytes .../images/emoji/emoji_1f9d1_200d_1f384.png | Bin 0 -> 5877 bytes .../unicode/cldr/unittest/TestPathHeader.java | 4 +- tools/java/org/unicode/cldr/util/Emoji.java | 2 +- .../cldr/util/data/emoji/emoji-test.txt | 614 +++++--- 224 files changed, 41286 insertions(+), 24733 deletions(-) create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f408_200d_2b1b.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f43b_200d_2744.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f468_200d_1f37c.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f469_200d_1f37c.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f470_200d_2640.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f470_200d_2642.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f935_200d_2640.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f935_200d_2642.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f9d1_200d_1f37c.png create mode 100644 tools/cldr-apps/WebContent/images/emoji/emoji_1f9d1_200d_1f384.png diff --git a/common/annotations/af.xml b/common/annotations/af.xml index acff647a34e..0c6eb8ddc50 100644 --- a/common/annotations/af.xml +++ b/common/annotations/af.xml @@ -1,6 +1,6 @@ - + person feeding baby + Claus, christmas | mx claus + mx claus adult | man man beard | man | man: beard | person man: beard blond | blond-haired man | hair | man | man: blond hair man: blond hair + baby | feeding | man | nursing + man feeding baby adult | woman woman blond-haired woman | blonde | hair | woman | woman: blond hair woman: blond hair + baby | feeding | nursing | woman + woman feeding baby adult | gender-neutral | old | older person | unspecified gender older person adult | man | old @@ -640,14 +758,23 @@ annotations. man wearing turban turban | woman | woman wearing turban woman wearing turban - cap | gua pi mao | hat | man | man with skullcap | skullcap - man with skullcap + cap | gua pi mao | hat | person | person with skullcap | skullcap + person with skullcap headscarf | hijab | mantilla | tichel | woman with headscarf woman with headscarf - groom | man | man in tuxedo | tuxedo - man in tuxedo - bride | bride with veil | veil | wedding - bride with veil + groom | person | person in tuxedo | tuxedo + person in tuxedo + tuxedo | woman | woman in tuxedo + woman in tuxedo + + man | man in tuxedo | tuxedo + man in tuxedo + bride | person | person with veil | veil | wedding + person with veil + veil | woman | woman with veil + woman with veil + man | man with veil | veil + man with veil pregnant | woman pregnant woman baby | breast | breast-feeding | nursing @@ -742,12 +869,12 @@ annotations. man kneeling kneeling | woman woman kneeling - accessibility | blind | person with probing cane - person with probing cane - accessibility | blind | man | man with probing cane - man with probing cane - accessibility | blind | woman | woman with probing cane - woman with probing cane + accessibility | blind | person with white cane + person with white cane + accessibility | blind | man | man with white cane + man with white cane + accessibility | blind | woman | woman with white cane + woman with white cane accessibility | person in motorized wheelchair | wheelchair person in motorized wheelchair accessibility | man | man in motorized wheelchair | wheelchair @@ -770,8 +897,8 @@ annotations. woman dancing dance | man | man dancing man dancing - business | man | man in suit levitating | suit - man in suit levitating + business | person | person in suit levitating | suit + person in suit levitating bunny ear | dancer | partying | people with bunny ears people with bunny ears bunny ear | dancer | men | men with bunny ears | partying @@ -944,6 +1071,8 @@ annotations. cat face cat | pet cat + black | cat | unlucky + black cat face | Leo | lion | zodiac lion face | tiger @@ -1018,6 +1147,8 @@ annotations. bat bear | face bear + arctic | bear | polar bear | white + polar bear bear | koala koala face | panda @@ -2380,8 +2511,8 @@ annotations. clamp balance | justice | Libra | scale | zodiac balance scale - accessibility | blind | probing cane - probing cane + accessibility | blind | white cane + white cane link link chain | chains @@ -2675,17 +2806,17 @@ annotations. ✓ | check | mark check mark × | cancel | multiplication | multiply | sign | x - multiplication sign + multiply × | cancel | cross | mark | multiplication | multiply | x cross mark × | cross mark button | mark | square | x cross mark button + | math | plus | sign - plus sign + plus - | − | math | minus | sign - minus sign - ÷ | division | math | sign - division sign + minus + ÷ | divide | division | math | sign + divide curl | curly loop | loop curly loop curl | double | double curly loop | loop @@ -2880,115 +3011,5 @@ annotations. rainbow flag Jolly Roger | pirate | pirate flag | plunder | treasure pirate flag - house | hut | roundhouse | yurt - hut - accessibility | elevator | hoist | lift - elevator - pick-up | pickup | truck - pickup truck - roller | skate - roller skate - fingers | hand gesture | interrogation | pinched | sarcastic - pinched fingers - grateful | proud | relieved | smiling | smiling face with tear | tear | touched - smiling face with tear - fighter | hidden | ninja | stealth - ninja - disguise | disguised face | face | glasses | incognito | nose - disguised face - extinction | large | mammoth | tusk | woolly - mammoth - dodo | extinction | large | Mauritius - dodo - beaver | dam - beaver - bison | buffalo | herd | wisent - bison - sea Lion | seal - seal - bubble | milk | pearl | tea - bubble tea - beach sandals | sandals | thong sandal | thong sandals | thongs | zōri - thong sandal - australia | boomerang | rebound | repercussion - boomerang - magic | magic wand | witch | wizard - magic wand - celebration | party | piñata - piñata - doll | nesting | nesting dolls | russia - nesting dolls - army | helmet | military | soldier | warrior - military helmet - accordian | accordion | concertina | squeeze box - accordion - beat | conga | drum | long drum | rhythm - long drum - coin | gold | metal | money | silver | treasure - coin - carpenter | carpentry saw | lumber | saw | tool - carpentry saw - screw | screwdriver | tool - screwdriver - climb | ladder | rung | step - ladder - catch | crook | curve | ensnare | hook | selling point - hook - mirror | reflection | reflector | speculum - mirror - frame | fresh air | opening | transparent | view | window - window - force cup | plumber | plunger | suction | toilet - plunger - embroidery | needle | sewing | stitches | sutures | tailoring - sewing needle - knot | rope | tangled | tie | twine | twist - knot - bucket | cask | pail | vat - bucket - bait | mouse trap | mousetrap | snare | trap - mouse trap - bathroom | brush | clean | dental | hygiene | teeth | toothbrush - toothbrush - cemetery | grave | graveyard | headstone | tombstone - headstone - demonstration | picket | placard | protest | sign - placard - boulder | heavy | rock | solid | stone - rock - disease | fly | maggot | pest | rotting - fly - annelid | earthworm | parasite | worm - worm - beetle | bug | insect - beetle - cockroach | insect | pest | roach - cockroach - boring | grow | house | nurturing | plant | potted plant | useless - potted plant - log | lumber | timber | wood - wood - bird | feather | flight | light | plumage - feather - anatomical | cardiology | heart | organ | pulse - anatomical heart - breath | exhalation | inhalation | lungs | organ | respiration - lungs - goodbye | hello | hug | people hugging | thanks - people hugging - berry | bilberry | blue | blueberries | blueberry - blueberries - bell pepper | capsicum | pepper | vegetable - bell pepper - food | olive - olive - arepa | flatbread | lavash | naan | pita - flatbread - mexican | tamale | wrapped - tamale - cheese | chocolate | fondue | melted | pot | Swiss - fondue - drink | pot | tea | teapot - teapot diff --git a/common/annotations/en_001.xml b/common/annotations/en_001.xml index d8f1c077bbc..6e84e5cff89 100644 --- a/common/annotations/en_001.xml +++ b/common/annotations/en_001.xml @@ -1,6 +1,6 @@ - + E13-083 + E13-084 + E13-084 E10-549 E10-549 E10-1125 E10-1125 E10-1195 E10-1195 + E13-082 + E13-082 E10-550 E10-550 E10-1194 E10-1194 + E13-081 + E13-081 E10-1124 E10-1124 E10-561 @@ -647,8 +765,17 @@ for derived annotations. E10-1126 E10-1047 E10-1047 + E13-078 + E13-078 + + E13-077 + E13-077 E10-557 E10-557 + E13-079 + E13-079 + E13-080 + E13-080 E10-1042 E10-1042 E10-1043 @@ -945,6 +1072,8 @@ for derived annotations. E10-494 E10-453 E10-453 + E13-085 + E13-085 E10-1097 E10-1097 E10-492 @@ -1019,6 +1148,8 @@ for derived annotations. E10-1103 E10-504 E10-504 + E13-086 + E13-086 E10-485 E10-485 E10-505 @@ -2881,115 +3012,5 @@ for derived annotations. E10-1156 E11-003 E11-003 - E13-046 - E13-046 - E13-066 - E13-066 - E13-049 - E13-049 - E13-050 - E13-050 - E13-004 - E13-004 - E13-001 - E13-001 - E13-002 - E13-002 - E13-003 - E13-003 - E13-028 - E13-028 - E13-031 - E13-031 - E13-029 - E13-029 - E13-027 - E13-027 - E13-032 - E13-032 - E13-045 - E13-045 - E13-056 - E13-056 - E13-062 - E13-062 - E13-051 - E13-051 - E13-052 - E13-052 - E13-053 - E13-053 - E13-057 - E13-057 - E13-058 - E13-058 - E13-059 - E13-059 - E13-060 - E13-060 - E13-061 - E13-061 - E13-063 - E13-063 - E13-064 - E13-064 - E13-065 - E13-065 - E13-067 - E13-067 - E13-068 - E13-068 - E13-069 - E13-069 - E13-054 - E13-054 - E13-055 - E13-055 - E13-071 - E13-071 - E13-070 - E13-070 - E13-072 - E13-072 - E13-073 - E13-073 - E13-074 - E13-074 - E13-048 - E13-048 - E13-035 - E13-035 - E13-036 - E13-036 - E13-033 - E13-033 - E13-034 - E13-034 - E13-037 - E13-037 - E13-047 - E13-047 - E13-030 - E13-030 - E13-005 - E13-005 - E13-006 - E13-006 - E13-026 - E13-026 - E13-038 - E13-038 - E13-040 - E13-040 - E13-039 - E13-039 - E13-041 - E13-041 - E13-042 - E13-042 - E13-043 - E13-043 - E13-044 - E13-044 diff --git a/common/annotations/ru.xml b/common/annotations/ru.xml index 71608efaf22..86e87d3654d 100644 --- a/common/annotations/ru.xml +++ b/common/annotations/ru.xml @@ -1,6 +1,6 @@ - +

Unicode Common Locale Data Repository (CLDR)

ReadMe for Unicode CLDR version 36.1

-

Last updated: 2020-Feb-16

+

Last updated: 2020-Mar-04

-

Note: This is a pre-release candidate version of CLDR 36.1, intended for testing. - It is not recommended for production use.

- + +

This is the final release version of CLDR 36.1.

Important notes for CLDR 36 and later: