Skip to content

Commit 13c6975

Browse files
authored
Merge branch 'unicode-org:main' into main
2 parents e7cd200 + b61adb8 commit 13c6975

File tree

401 files changed

+21380
-16722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

401 files changed

+21380
-16722
lines changed

.github/dependabot.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ updates:
1010
interval: "monthly"
1111
commit-message:
1212
include: scope
13-
prefix: "CLDR-18356 gh:"
13+
prefix: "CLDR-19055 gh:"
1414
assignees:
1515
- btangmu
1616
- srl295
@@ -25,21 +25,21 @@ updates:
2525
interval: "monthly"
2626
commit-message:
2727
include: scope
28-
prefix: "CLDR-18356 js:"
28+
prefix: "CLDR-19055 js:"
2929
assignees:
3030
- btangmu
3131
- srl295
3232
reviewers:
3333
- btangmu
3434
- srl295
35-
35+
3636
- package-ecosystem: "npm"
3737
directory: "/tools/scripts/jira-updater"
3838
schedule:
3939
interval: "monthly"
4040
commit-message:
4141
include: scope
42-
prefix: "CLDR-18356 js:"
42+
prefix: "CLDR-19055 js:"
4343
assignees:
4444
- btangmu
4545
- srl295
@@ -53,7 +53,7 @@ updates:
5353
interval: "monthly"
5454
commit-message:
5555
include: scope
56-
prefix: "CLDR-18356 tr:"
56+
prefix: "CLDR-19055 tr:"
5757
assignees:
5858
- btangmu
5959
- srl295
@@ -67,7 +67,7 @@ updates:
6767
interval: "monthly"
6868
commit-message:
6969
include: scope
70-
prefix: "CLDR-18356 site:"
70+
prefix: "CLDR-19055 site:"
7171
assignees:
7272
- btangmu
7373
- srl295
@@ -81,7 +81,7 @@ updates:
8181
interval: "monthly"
8282
commit-message:
8383
include: scope
84-
prefix: "CLDR-18356 exporter:"
84+
prefix: "CLDR-19055 exporter:"
8585
assignees:
8686
- srl295
8787
reviewers:
@@ -94,7 +94,7 @@ updates:
9494
interval: "monthly"
9595
commit-message:
9696
include: scope
97-
prefix: "CLDR-18356 kbd:"
97+
prefix: "CLDR-19055 kbd:"
9898
assignees:
9999
- srl295
100100
reviewers:
@@ -108,7 +108,7 @@ updates:
108108
interval: "monthly"
109109
commit-message:
110110
include: scope
111-
prefix: "CLDR-18356 kbd:"
111+
prefix: "CLDR-19055 kbd:"
112112
assignees:
113113
- srl295
114114
reviewers:
@@ -123,7 +123,7 @@ updates:
123123
interval: "monthly"
124124
commit-message:
125125
include: scope
126-
prefix: "CLDR-18356 j:"
126+
prefix: "CLDR-19055 j:"
127127
assignees:
128128
- btangmu
129129
- srl295

.github/workflows/gh-pages.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
name: gh-pages
32

43
# Note: we have a foot in two camps here, maybe more
@@ -27,7 +26,7 @@ on:
2726
paths:
2827
- "tools/scripts/tr-archive/**"
2928
- "docs/**"
30-
- '.github/workflows/gh-pages.yml'
29+
- ".github/workflows/gh-pages.yml"
3130
jobs:
3231
build:
3332
name: "Build Github Pages"
@@ -47,17 +46,18 @@ jobs:
4746
- uses: nodenv/actions/node-version@v4 # setup using .node-version
4847
- name: Run TR archiver
4948
# Note: will update ToC if out of date
50-
run: 'cd tools/scripts/tr-archive/ && npm ci && npm run build'
49+
run: "cd tools/scripts/tr-archive/ && npm ci && npm run build"
5150
- name: Run Kbd Charts
52-
run: 'cd docs/charts/keyboards && npm ci && npm run build'
51+
run: "cd docs/charts/keyboards && npm ci && npm run build"
5352
- name: Upload tr35.zip
5453
uses: actions/upload-artifact@v4
5554
with:
5655
name: tr35-spec
5756
path: tools/scripts/tr-archive/tr35.zip
58-
- name: 'Run TR link extractor (experimental)'
57+
- name: "Check internal anchors in spec"
5958
# Note: see CLDR-16526 for making this an error
60-
run: 'cd tools/scripts/tr-archive/ && npm run extract-link-targets || (echo Warning, please fix these ; true)'
59+
# see <tools/scripts/tr-archive/README.md> for instructions
60+
run: "cd tools/scripts/tr-archive/ && npm run extract-link-targets"
6161
- name: Lint Markdown
6262
# Warn, don't fail yet
6363
run: npx markdownlint-cli *.md {specs,docs}/*.md || (echo Warning, please fix these ; true)
@@ -73,10 +73,10 @@ jobs:
7373
- name: Run lychee
7474
uses: lycheeverse/lychee-action@v1
7575
with:
76-
args: "-n --cache --max-cache-age 10d docs/rfc docs/ldml"
77-
fail: false
78-
format: markdown
79-
output: linkcheck.md
76+
args: "-n --cache --max-cache-age 10d docs/rfc docs/ldml"
77+
fail: false
78+
format: markdown
79+
output: linkcheck.md
8080
- name: Link Checker Summary
8181
run: cat linkcheck.md >> $GITHUB_STEP_SUMMARY
8282
- uses: ruby/setup-ruby@v1
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
9292
- name: Rearrange stuff
93-
run: 'cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/'
93+
run: "cp -vr tools/scripts/tr-archive/dist/* ./_site/ldml/ && cp tools/scripts/tr-archive/reports-v2.css ./_site/"
9494
- name: Deploy to GitHub Pages (main)
9595
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
9696
uses: actions/upload-pages-artifact@v3

.github/workflows/maven.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
output: linkcheck.md
6161
- name: Link Checker Summary PathDescriptions.md
6262
run: cat linkcheck.md >> $GITHUB_STEP_SUMMARY
63+
- name: 'spec: Check that tr35-modifications.md was updated'
64+
if: github.event_name == 'pull_request'
65+
run: bash tools/scripts/tr-archive/check-mod-section.sh HEAD origin/${{ github.base_ref }}
6366
package:
6467
name: "Package up CLDR"
6568
runs-on: ubuntu-latest

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ For current CLDR release information, see [cldr.unicode.org](https://cldr.unicod
1010

1111
## Status
1212

13-
Update: 2025-09-17
13+
Update: 2025-10-27
1414

1515
<!-- [inapplicable lines are commented out.]-->
16-
<!-- **Note:** CLDR 48 is in development and not recommended for use at this stage. -->
17-
<!--**Note:** This is the milestone 1 version of CLDR 48, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
18-
**Note:** This is a preliminary version of CLDR 48, intended for those wishing to do pre-release testing. It is not recommended for production use.
19-
<!--**Note:** This is a pre-release candidate version of CLDR 48, intended for testing. It is not recommended for production use.-->
20-
<!--This is the final release version of CLDR 48.-->
16+
**Note:** CLDR 49 is in development and not recommended for use at this stage.
17+
<!--**Note:** This is the milestone 1 version of CLDR 49, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
18+
<!--**Note:** This is a preliminary version of CLDR 49, intended for those wishing to do pre-release testing. It is not recommended for production use.-->
19+
<!--**Note:** This is a pre-release candidate version of CLDR 49, intended for testing. It is not recommended for production use.-->
20+
<!--This is the final release version of CLDR 49.-->
2121

2222
### What is CLDR?
2323

common/annotations/af.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -711,20 +711,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
711711
<annotation cp="" type="tts">mol</annotation>
712712
<annotation cp="">kruis | musiek | noot</annotation>
713713
<annotation cp="" type="tts">kruis</annotation>
714-
<annotation cp="🪊">geelkoper | hartseer | instrument | jazz | musiek | skuif</annotation>
715-
<annotation cp="🪊" type="tts">tromboon</annotation>
716-
<annotation cp="🪎">buit | edelsteen | geld | goud | juweliersware | prys | rykdom | silwer | waardevolle items</annotation>
717-
<annotation cp="🪎" type="tts">skatkis</annotation>
718-
<annotation cp="🫈">grootpoot | harig | kriptied | reus | sasquatch | woud</annotation>
719-
<annotation cp="🫈" type="tts">harige skepsel</annotation>
720-
<annotation cp="🫍">marine | oseaan | walvis</annotation>
721-
<annotation cp="🫍" type="tts">moordvis</annotation>
722-
<annotation cp="🫪">angstigheid | geskok | opgeblasenheid | paniek | verbaas | weerloos</annotation>
723-
<annotation cp="🫪" type="tts">verwronge gesiggie</annotation>
724-
<annotation cp="🫯">argument | bakleiery | debat | geveg | meningsverskil | ruckus | stoei</annotation>
725-
<annotation cp="🫯" type="tts">bakleiwolkie</annotation>
726-
<annotation cp="🛘">aardbewing | berg | gevaar | klippe | modderstorting | ramp | sneeustorting</annotation>
727-
<annotation cp="🛘" type="tts">grondstorting</annotation>
728714
<annotation cp="😀">gelukkig | gesiggie | glimlag | glimlaggend | grinnik | grinnikend | lag | lekker | opgewek | tande | vrolik</annotation>
729715
<annotation cp="😀" type="tts">grinnikende gesig</annotation>
730716
<annotation cp="😃">fantasties | gelukkig | gesig | glimlag | glimlaggende gesig met oop mond | grinnik | joegaai | mond | oop | tande | wonderlik</annotation>
@@ -895,6 +881,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
895881
<annotation cp="😲" type="tts">verstomde gesig</annotation>
896882
<annotation cp="😳">beïndruk | blaam | blosend | blosende gesig | deur die wind | dis gek | dood | gesig | oefening | ongeloof | ongemaklik | stomgeslaan | verbysterd</annotation>
897883
<annotation cp="😳" type="tts">blosende gesig</annotation>
884+
<annotation cp="🫪">angstigheid | geskok | opgeblasenheid | paniek | verbaas | weerloos</annotation>
885+
<annotation cp="🫪" type="tts">verwronge gesiggie</annotation>
898886
<annotation cp="🥺">asseblief | genade | gesig | groot asseblief | groot oë | grootoog | hartseer | hondjie-ogies | ontferming | smeek | smekend | soebat | soebatgesig | waarom nie?</annotation>
899887
<annotation cp="🥺" type="tts">soebat gesig</annotation>
900888
<annotation cp="🥹">ag | ag tog | bewondering | dankbaar | dankbaarheid | gesig wat wil huil | hartseer | huil | kwaad | trane van vreugde | trots | verleë</annotation>
@@ -1041,6 +1029,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
10411029
<annotation cp="💯" type="tts">honderd punte</annotation>
10421030
<annotation cp="💢">kwaad | ontsteld | strokie | strokiesprent | woede | woedend | woedesimbool</annotation>
10431031
<annotation cp="💢" type="tts">woedesimbool</annotation>
1032+
<annotation cp="🫯">argument | bakleiery | debat | geveg | meningsverskil | ruckus | stoei</annotation>
1033+
<annotation cp="🫯" type="tts">bakleiwolkie</annotation>
10441034
<annotation cp="💥">boem | bom | bots | botsing | ontplof | strokiesprent</annotation>
10451035
<annotation cp="💥" type="tts">botsing</annotation>
10461036
<annotation cp="💫">duiselig | skitter | ster | sterre | strokiesprent | verskietend</annotation>
@@ -1197,8 +1187,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
11971187
<annotation cp="🧑" type="tts">volwassene</annotation>
11981188
<annotation cp="👱">blond | blonde kêrel | blondekop | Europeër | hare | man | mens | ou | persoon met blonde hare | plat bokant</annotation>
11991189
<annotation cp="👱" type="tts">persoon met blonde hare</annotation>
1200-
<annotation cp="🧑‍🩰">ballet | danser</annotation>
1201-
<annotation cp="🧑‍🩰" type="tts">balletdanser</annotation>
12021190
<annotation cp="👨">broer | kêrel | man | seun | volwassene | vriend</annotation>
12031191
<annotation cp="👨" type="tts">man</annotation>
12041192
<annotation cp="🧔">baard | bakkebaard | bebaarde persoon | gesnord | man | snor | wangbaard</annotation>
@@ -1507,6 +1495,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15071495
<annotation cp="🧟‍♀" type="tts">vroulike zombie</annotation>
15081496
<annotation cp="🧌">fantasie | feetjie | monster | trol | vertelling</annotation>
15091497
<annotation cp="🧌" type="tts">trol</annotation>
1498+
<annotation cp="🫈">grootpoot | harig | kriptied | reus | sasquatch | woud</annotation>
1499+
<annotation cp="🫈" type="tts">harige skepsel</annotation>
15101500
<annotation cp="💆">behandeling | gesig | gesigmassering | hoofpyn | masseer | ontspan | ontspanning | persoon kry massering | salon | spa | spanning | streel | terapie | vrou kry massering</annotation>
15111501
<annotation cp="💆" type="tts">persoon kry massering</annotation>
15121502
<annotation cp="💆‍♂">gesig | gesigmassering | kopseer | man kry massering | masseer | ontspan | ontspanning | salon | spanning | streel</annotation>
@@ -1561,6 +1551,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
15611551
<annotation cp="🏃‍♂" type="tts">man hardloop</annotation>
15621552
<annotation cp="🏃‍♀">draf | haastig | hardloop | hardloper | marathon | spoed | vinnig | vrou hardloop</annotation>
15631553
<annotation cp="🏃‍♀" type="tts">vrou hardloop</annotation>
1554+
<annotation cp="🧑‍🩰">ballet | danser</annotation>
1555+
<annotation cp="🧑‍🩰" type="tts">balletdanser</annotation>
15641556
<annotation cp="💃">dans | dansend | elegant | flair | flamenco | kom ons dans | tango | vrou</annotation>
15651557
<annotation cp="💃" type="tts">vrou dans</annotation>
15661558
<annotation cp="🕺">dans | dansend | dansende man | danser | elegant | feestelik | flamenco | kom ons dans | man | swier | tango</annotation>
@@ -1923,6 +1915,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
19231915
<annotation cp="🐋" type="tts">walvis</annotation>
19241916
<annotation cp="🐬">dier | dolfyn | oseaan | stertvin | strand | vin</annotation>
19251917
<annotation cp="🐬" type="tts">dolfyn</annotation>
1918+
<annotation cp="🫍">marine | oseaan | walvis</annotation>
1919+
<annotation cp="🫍" type="tts">moordvis</annotation>
19261920
<annotation cp="🦭">akwarium | dier | oseaan | rob | see | seedier | seeleeu | soogdier | visvreter | waterdier</annotation>
19271921
<annotation cp="🦭" type="tts">rob</annotation>
19281922
<annotation cp="🐟">aandete | dier | diereriem | Pisces | vis | visse | visvang</annotation>
@@ -2321,6 +2315,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
23212315
<annotation cp="🏔" type="tts">berg met sneeu op</annotation>
23222316
<annotation cp="">berg | bergklim | bergspits | natuur | voet van berg</annotation>
23232317
<annotation cp="" type="tts">berg</annotation>
2318+
<annotation cp="🛘">aardbewing | berg | gevaar | klippe | modderstorting | ramp | sneeustorting</annotation>
2319+
<annotation cp="🛘" type="tts">grondstorting</annotation>
23242320
<annotation cp="🌋">berg | lawa | natuur | uitbarsting | vulkaan | weer</annotation>
23252321
<annotation cp="🌋" type="tts">vulkaan</annotation>
23262322
<annotation cp="🗻">berg | foedji | Foedji | fuji | japan | Japan | natuur</annotation>
@@ -3041,14 +3037,16 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
30413037
<annotation cp="📻" type="tts">radio</annotation>
30423038
<annotation cp="🎷">blaasinstrument | instrument | koperblaser | musiek | saxofoon</annotation>
30433039
<annotation cp="🎷" type="tts">saxofoon</annotation>
3040+
<annotation cp="🎺">blaas | blaasinstrument | instrument | musiek | orkes | trompet</annotation>
3041+
<annotation cp="🎺" type="tts">trompet</annotation>
3042+
<annotation cp="🪊">geelkoper | hartseer | instrument | jazz | musiek | skuif</annotation>
3043+
<annotation cp="🪊" type="tts">tromboon</annotation>
30443044
<annotation cp="🪗">akkordion | instrument | knorkissie | konsertina | krismiswurm | musiek | musikant | pensklavier | trekklavier | trekorreltjie</annotation>
30453045
<annotation cp="🪗" type="tts">trekklavier</annotation>
30463046
<annotation cp="🎸">elektriese kitaar | ghitaar | instrument | kitaar | musiek | snaarinstrument</annotation>
30473047
<annotation cp="🎸" type="tts">kitaar</annotation>
30483048
<annotation cp="🎹">instrument | klavier | klawerbord | musiek | musikale toetsbord | orrel</annotation>
30493049
<annotation cp="🎹" type="tts">klawerbord</annotation>
3050-
<annotation cp="🎺">blaas | blaasinstrument | instrument | musiek | orkes | trompet</annotation>
3051-
<annotation cp="🎺" type="tts">trompet</annotation>
30523050
<annotation cp="🎻">instrument | musiek | Stradivarius | stryk | strykstok | viool</annotation>
30533051
<annotation cp="🎻" type="tts">viool</annotation>
30543052
<annotation cp="🪕">banjo | banjospeler | musiek | snaarinstrument | tokkel</annotation>
@@ -3169,10 +3167,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
31693167
<annotation cp="🔖" type="tts">boekmerk</annotation>
31703168
<annotation cp="🏷">etiket | modehuisetiket | posetiket | prysetiket | vervaardigersetiket</annotation>
31713169
<annotation cp="🏷" type="tts">etiket</annotation>
3172-
<annotation cp="💰">bank | betaal | boerpot | dollar | geld | geldsak | keer kontant uit | kontant | koste | miljard | miljoen | pot goud | ryk | sak | suinig | wen</annotation>
3173-
<annotation cp="💰" type="tts">geldsak</annotation>
31743170
<annotation cp="🪙">betaalmiddel | dollar | euro | geld | geldstuk | goud | munt | muntstuk | ryk | silwer | skat</annotation>
31753171
<annotation cp="🪙" type="tts">muntstuk</annotation>
3172+
<annotation cp="💰">bank | betaal | boerpot | dollar | geld | geldsak | keer kontant uit | kontant | koste | miljard | miljoen | pot goud | ryk | sak | suinig | wen</annotation>
3173+
<annotation cp="💰" type="tts">geldsak</annotation>
3174+
<annotation cp="🪎">buit | edelsteen | geld | goud | juweliersware | prys | rykdom | silwer | waardevolle items</annotation>
3175+
<annotation cp="🪎" type="tts">skatkis</annotation>
31763176
<annotation cp="💴">bank | banknoot | geld | geldeenheid | jen | jenbanknoot | noot</annotation>
31773177
<annotation cp="💴" type="tts">jenbanknoot</annotation>
31783178
<annotation cp="💵">bank | banknoot | dollar | dollarbanknoot | geld | geldeenheid | noot</annotation>

0 commit comments

Comments
 (0)