From: Peter Edberg Date: Thu, 5 Mar 2020 18:47:56 +0000 (-0800) Subject: ICU-20980 integrate CLDR release-36-1 (final) to maint-66 X-Git-Tag: release-66-1~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad00acac128120cda4b90854a158db195692c2e8;p=icu ICU-20980 integrate CLDR release-36-1 (final) to maint-66 --- diff --git a/icu4c/source/data/coll/root.txt b/icu4c/source/data/coll/root.txt index bd25ca9cdf7..97a92b99122 100644 --- a/icu4c/source/data/coll/root.txt +++ b/icu4c/source/data/coll/root.txt @@ -13,13 +13,13 @@ root{ "& [last primary ignorable]<<*🦰🦱🦳🦲🏻🏼🏽🏾🏿" "& [before 1]﷑€" "<*😀😃😄😁😆😅🤣😂🙂🙃😉😊😇" - "<*🥰😍🤩😘😗☺😚😙" + "<*🥰😍🤩😘😗☺😚😙🥲" "<*😋😛😜🤪😝🤑" "<*🤗🤭🤫🤔" "<*🤐🤨😐😑😶😏😒🙄😬🤥" "<*😌😔😪🤤😴" "<*😷🤒🤕🤢🤮🤧🥵🥶🥴😵🤯" - "<*🤠🥳" + "<*🤠🥳🥸" "<*😎🤓🧐" "<*😕😟🙁☹😮😯😲😳🥺😦😧😨😰😥😢😭😱😖😣😞😓😩😫🥱" "<*😤😡😠🤬😈👿💀☠" @@ -30,16 +30,15 @@ root{ "< 👁‍🗨 = 👁️‍🗨" "<*🗨🗯💭💤" "<*👋🤚🖐✋🖖" - "<*👌🤏✌🤞🤟🤘🤙" + "<*👌🤌🤏✌🤞🤟🤘🤙" "<*👈👉👆🖕👇☝" "<*👍👎✊👊🤛🤜" "<*👏🙌👐🤲🤝🙏" "<*✍💅🤳" - "<*💪🦾🦿🦵🦶👂🦻👃🧠🦷🦴👀👁👅👄" - "<*👶🧒👦👧🧑👱👨🧔" - "< 👱‍♂ << 👱🏻‍♂ << 👱🏼‍♂ << 👱🏽‍♂ << 👱🏾‍♂ << 👱🏿‍♂" - "<*👩" + "<*💪🦾🦿🦵🦶👂🦻👃🧠🫀🫁🦷🦴👀👁👅👄" + "<*👶🧒👦👧🧑👱👨🧔👩" "< 👱‍♀ << 👱🏻‍♀ << 👱🏼‍♀ << 👱🏽‍♀ << 👱🏾‍♀ << 👱🏿‍♀" + "< 👱‍♂ << 👱🏻‍♂ << 👱🏼‍♂ << 👱🏽‍♂ << 👱🏾‍♂ << 👱🏿‍♂" "<*🧓👴👵" "<*🙍" "< 🙍‍♂ << 🙍🏻‍♂ << 🙍🏼‍♂ << 🙍🏽‍♂ << 🙍🏾‍♂ << 🙍🏿‍♂" @@ -128,14 +127,25 @@ root{ "<*💂" "< 💂‍♂ << 💂🏻‍♂ << 💂🏼‍♂ << 💂🏽‍♂ << 💂🏾‍♂ << 💂🏿‍♂" "< 💂‍♀ << 💂🏻‍♀ << 💂🏼‍♀ << 💂🏽‍♀ << 💂🏾‍♀ << 💂🏿‍♀" - "<*👷" + "<*🥷👷" "< 👷‍♂ << 👷🏻‍♂ << 👷🏼‍♂ << 👷🏽‍♂ << 👷🏾‍♂ << 👷🏿‍♂" "< 👷‍♀ << 👷🏻‍♀ << 👷🏼‍♀ << 👷🏽‍♀ << 👷🏾‍♀ << 👷🏿‍♀" "<*🤴👸👳" "< 👳‍♂ << 👳🏻‍♂ << 👳🏼‍♂ << 👳🏽‍♂ << 👳🏾‍♂ << 👳🏿‍♂" "< 👳‍♀ << 👳🏻‍♀ << 👳🏼‍♀ << 👳🏽‍♀ << 👳🏾‍♀ << 👳🏿‍♀" - "<*👲🧕🤵👰🤰🤱" - "<*👼🎅🤶🦸" + "<*👲🧕🤵" + "< 🤵‍♂ << 🤵🏻‍♂ << 🤵🏼‍♂ << 🤵🏽‍♂ << 🤵🏾‍♂ << 🤵🏿‍♂" + "< 🤵‍♀ << 🤵🏻‍♀ << 🤵🏼‍♀ << 🤵🏽‍♀ << 🤵🏾‍♀ << 🤵🏿‍♀" + "<*👰" + "< 👰‍♂ << 👰🏻‍♂ << 👰🏼‍♂ << 👰🏽‍♂ << 👰🏾‍♂ << 👰🏿‍♂" + "< 👰‍♀ << 👰🏻‍♀ << 👰🏼‍♀ << 👰🏽‍♀ << 👰🏾‍♀ << 👰🏿‍♀" + "<*🤰🤱" + "< 👩‍🍼 << 👩🏻‍🍼 << 👩🏼‍🍼 << 👩🏽‍🍼 << 👩🏾‍🍼 << 👩🏿‍🍼" + "< 👨‍🍼 << 👨🏻‍🍼 << 👨🏼‍🍼 << 👨🏽‍🍼 << 👨🏾‍🍼 << 👨🏿‍🍼" + "< 🧑‍🍼 << 🧑🏻‍🍼 << 🧑🏼‍🍼 << 🧑🏽‍🍼 << 🧑🏾‍🍼 << 🧑🏿‍🍼" + "<*👼🎅🤶" + "< 🧑‍🎄 << 🧑🏻‍🎄 << 🧑🏼‍🎄 << 🧑🏽‍🎄 << 🧑🏾‍🎄 << 🧑🏿‍🎄" + "<*🦸" "< 🦸‍♂ << 🦸🏻‍♂ << 🦸🏼‍♂ << 🦸🏽‍♂ << 🦸🏾‍♂ << 🦸🏿‍♂" "< 🦸‍♀ << 🦸🏻‍♀ << 🦸🏼‍♀ << 🦸🏽‍♀ << 🦸🏾‍♀ << 🦸🏿‍♀" "<*🦹" @@ -294,32 +304,36 @@ root{ "< 👩‍👧" "< 👩‍👧‍👦" "< 👩‍👧‍👧" - "<*🗣👤👥👣" + "<*🗣👤👥🫂👣" "<*🦰🦱🦳🦲" "<*🐵🐒🦍🦧🐶🐕🦮" "< 🐕‍🦺" - "<*🐩🐺🦊🦝🐱🐈🦁🐯🐅🐆🐴🐎🦄🦓🦌🐮🐂🐃🐄🐷🐖🐗🐽🐏🐑🐐🐪🐫🦙🦒🐘🦏🦛🐭🐁🐀🐹🐰🐇🐿🦔🦇🐻🐨🐼🦥🦦🦨🦘🦡🐾" - "<*🦃🐔🐓🐣🐤🐥🐦🐧🕊🦅🦆🦢🦉🦩🦚🦜" + "<*🐩🐺🦊🦝🐱🐈" + "< 🐈‍⬛" + "<*🦁🐯🐅🐆🐴🐎🦄🦓🦌🦬🐮🐂🐃🐄🐷🐖🐗🐽🐏🐑🐐🐪🐫🦙🦒🐘🦣🦏🦛🐭🐁🐀🐹🐰🐇🐿🦫🦔🦇🐻" + "< 🐻‍❄" + "<*🐨🐼🦥🦦🦨🦘🦡🐾" + "<*🦃🐔🐓🐣🐤🐥🐦🐧🕊🦅🦆🦢🦉🦤🪶🦩🦚🦜" "<*🐸" "<*🐊🐢🦎🐍🐲🐉🦕🦖" - "<*🐳🐋🐬🐟🐠🐡🦈🐙🐚" - "<*🐌🦋🐛🐜🐝🐞🦗🕷🕸🦂🦟🦠" + "<*🐳🐋🐬🦭🐟🐠🐡🦈🐙🐚" + "<*🐌🦋🐛🐜🐝🪲🐞🦗🪳🕷🕸🦂🦟🪰🪱🦠" "<*💐🌸💮🏵🌹🥀🌺🌻🌼🌷" - "<*🌱🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃" - "<*🍇🍈🍉🍊🍋🍌🍍🥭🍎🍏🍐🍑🍒🍓🥝🍅🥥" - "<*🥑🍆🥔🥕🌽🌶🥒🥬🥦🧄🧅🍄🥜🌰" - "<*🍞🥐🥖🥨🥯🥞🧇🧀🍖🍗🥩🥓🍔🍟🍕🌭🥪🌮🌯🥙🧆🥚🍳🥘🍲🥣🥗🍿🧈🧂🥫" + "<*🌱🪴🌲🌳🌴🌵🌾🌿☘🍀🍁🍂🍃" + "<*🍇🍈🍉🍊🍋🍌🍍🥭🍎🍏🍐🍑🍒🍓🫐🥝🍅🫒🥥" + "<*🥑🍆🥔🥕🌽🌶🫑🥒🥬🥦🧄🧅🍄🥜🌰" + "<*🍞🥐🥖🫓🥨🥯🥞🧇🧀🍖🍗🥩🥓🍔🍟🍕🌭🥪🌮🌯🫔🥙🧆🥚🍳🥘🍲🫕🥣🥗🍿🧈🧂🥫" "<*🍱🍘🍙🍚🍛🍜🍝🍠🍢🍣🍤🍥🥮🍡🥟🥠🥡" "<*🦀🦞🦐🦑🦪" "<*🍦🍧🍨🍩🍪🎂🍰🧁🥧🍫🍬🍭🍮🍯" - "<*🍼🥛☕🍵🍶🍾🍷🍸🍹🍺🍻🥂🥃🥤🧃🧉🧊" + "<*🍼🥛☕🫖🍵🍶🍾🍷🍸🍹🍺🍻🥂🥃🥤🧋🧃🧉🧊" "<*🥢🍽🍴🥄🔪🏺" "<*🌍🌎🌏🌐🗺🗾🧭" "<*🏔⛰🌋🗻🏕🏖🏜🏝🏞" - "<*🏟🏛🏗🧱🏘🏚🏠🏡🏢🏣🏤🏥🏦🏨🏩🏪🏫🏬🏭🏯🏰💒🗼🗽" + "<*🏟🏛🏗🧱🪨🪵🛖🏘🏚🏠🏡🏢🏣🏤🏥🏦🏨🏩🏪🏫🏬🏭🏯🏰💒🗼🗽" "<*⛪🕌🛕🕍⛩🕋" "<*⛲⛺🌁🌃🏙🌄🌅🌆🌇🌉♨🎠🎡🎢💈🎪" - "<*🚂🚃🚄🚅🚆🚇🚈🚉🚊🚝🚞🚋🚌🚍🚎🚐🚑🚒🚓🚔🚕🚖🚗🚘🚙🚚🚛🚜🏎🏍🛵🦽🦼🛺🚲🛴🛹🚏🛣🛤🛢⛽🚨🚥🚦🛑🚧" + "<*🚂🚃🚄🚅🚆🚇🚈🚉🚊🚝🚞🚋🚌🚍🚎🚐🚑🚒🚓🚔🚕🚖🚗🚘🚙🛻🚚🚛🚜🏎🏍🛵🦽🦼🛺🚲🛴🛹🛼🚏🛣🛤🛢⛽🚨🚥🚦🛑🚧" "<*⚓⛵🛶🚤🛳⛴🛥🚢" "<*✈🛩🛫🛬🪂💺🚁🚟🚠🚡🛰🚀🛸" "<*🛎🧳" @@ -328,34 +342,37 @@ root{ "<*🎃🎄🎆🎇🧨✨🎈🎉🎊🎋🎍🎎🎏🎐🎑🧧🎀🎁🎗🎟🎫" "<*🎖🏆🏅🥇🥈🥉" "<*⚽⚾🥎🏀🏐🏈🏉🎾🥏🎳🏏🏑🏒🥍🏓🏸🥊🥋🥅⛳⛸🎣🤿🎽🎿🛷🥌" - "<*🎯🪀🪁🎱🔮🧿🎮🕹🎰🎲🧩🧸♠♥♦♣♟🃏🀄🎴" - "<*🎭🖼🎨🧵🧶" - "<*👓🕶🥽🥼🦺👔👕👖🧣🧤🧥🧦👗👘🥻🩱🩲🩳👙👚👛👜👝🛍🎒👞👟🥾🥿👠👡🩰👢👑👒🎩🎓🧢⛑📿💄💍💎" + "<*🎯🪀🪁🎱🔮🪄🧿🎮🕹🎰🎲🧩🧸🪅🪆♠♥♦♣♟🃏🀄🎴" + "<*🎭🖼🎨🧵🪡🧶🪢" + "<*👓🕶🥽🥼🦺👔👕👖🧣🧤🧥🧦👗👘🥻🩱🩲🩳👙👚👛👜👝🛍🎒🩴👞👟🥾🥿👠👡🩰👢👑👒🎩🎓🧢🪖⛑📿💄💍💎" "<*🔇🔈🔉🔊📢📣📯🔔🔕" "<*🎼🎵🎶🎙🎚🎛🎤🎧📻" - "<*🎷🎸🎹🎺🎻🪕🥁" + "<*🎷🪗🎸🎹🎺🎻🪕🥁🪘" "<*📱📲☎📞📟📠" "<*🔋🔌💻🖥🖨⌨🖱🖲💽💾💿📀🧮" "<*🎥🎞📽🎬📺📷📸📹📼🔍🔎🕯💡🔦🏮🪔" "<*📔📕📖📗📘📙📚📓📒📃📜📄📰🗞📑🔖🏷" - "<*💰💴💵💶💷💸💳🧾💹💱💲" + "<*💰🪙💴💵💶💷💸💳🧾💹" "<*✉📧📨📩📤📥📦📫📪📬📭📮🗳" "<*✏✒🖋🖊🖌🖍📝" "<*💼📁📂🗂📅📆🗒🗓📇📈📉📊📋📌📍📎🖇📏📐✂🗃🗄🗑" "<*🔒🔓🔏🔐🔑🗝" - "<*🔨🪓⛏⚒🛠🗡⚔🔫🏹🛡🔧🔩⚙🗜⚖🦯🔗⛓🧰🧲" + "<*🔨🪓⛏⚒🛠🗡⚔🔫🪃🏹🛡🪚🔧🪛🔩⚙🗜⚖🦯🔗⛓🪝🧰🧲🪜" "<*⚗🧪🧫🧬🔬🔭📡" "<*💉🩸💊🩹🩺" - "<*🚪🛏🛋🪑🚽🚿🛁🪒🧴🧷🧹🧺🧻🧼🧽🧯🛒" - "<*🚬⚰⚱🗿" + "<*🚪🛗🪞🪟🛏🛋🪑🚽🪠🚿🛁🪤🪒🧴🧷🧹🧺🧻🪣🧼🪥🧽🧯🛒" + "<*🚬⚰🪦⚱🗿🪧" "<*🏧🚮🚰♿🚹🚺🚻🚼🚾🛂🛃🛄🛅" "<*⚠🚸⛔🚫🚳🚭🚯🚱🚷📵🔞☢☣" "<*⬆↗➡↘⬇↙⬅↖↕↔↩↪⤴⤵🔃🔄🔙🔚🔛🔜🔝" "<*🛐⚛🕉✡☸☯✝☦☪☮🕎🔯" "<*♈♉♊♋♌♍♎♏♐♑♒♓⛎" "<*🔀🔁🔂▶⏩⏭⏯◀⏪⏮🔼⏫🔽⏬⏸⏹⏺⏏🎦🔅🔆📶📳📴" - "<*♀♂" - "<*⚕♾♻⚜🔱📛🔰⭕✅☑✔✖❌❎➕➖➗➰➿〽✳✴❇‼⁉❓❔❕❗〰©®™" + "<*♀♂⚧" + "<*✖➕➖➗♾" + "<*‼⁉❓❔❕❗〰" + "<*💱💲" + "<*⚕♻⚜🔱📛🔰⭕✅☑✔❌❎➰➿〽✳✴❇©®™" "< '#⃣' = '#️⃣'" "< '*⃣' = '*️⃣'" "< 0⃣ = 0️⃣" @@ -373,6 +390,7 @@ root{ "<*🔴🟠🟡🟢🔵🟣🟤⚫⚪🟥🟧🟨🟩🟦🟪🟫⬛⬜◼◻◾◽▪▫🔶🔷🔸🔹🔺🔻💠🔘🔳🔲" "<*🏁🚩🎌🏴🏳" "< 🏳‍🌈 = 🏳️‍🌈" + "< 🏳‍⚧ = 🏳️‍⚧" "< 🏴‍☠" "<*🇦🇧🇨🇩🇪🇫🇬🇭🇮🇯🇰🇱🇲🇳🇴🇵🇶🇷🇸🇹🇺🇻🇼🇽🇾🇿" "< 🏴󠁧󠁢󠁥󠁮󠁧󠁿" diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index b40c5386577..411dd968ea8 100644 --- a/icu4j/main/shared/data/icudata.jar +++ b/icu4j/main/shared/data/icudata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b68da43f2161b1baa997c755b4d97dcf4117bc546210dc5623e69864c8af347c -size 12999317 +oid sha256:b3832f180ecc3a5624471f1e6b5a67c5b97a6fa71a2a3723c2f97aaa144476ef +size 13000263 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index e38925473cf..1f1f69a2007 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3abd55ac183151fdb12337ee60182c485a0fe141d6bdc260facecd197e23fc81 +oid sha256:e15b9985493afbf53cd0292c8e6bde8e4ff86fcdf4d3089b1680344f08545823 size 94279