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 SBRS v45 merge one more maint/maint-44 fix back to main #3395

Merged
merged 1 commit into from
Nov 29, 2023
Merged

CLDR-17220 SBRS v45 merge one more maint/maint-44 fix back to main #3395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion common/main/fr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11702,7 +11702,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<unit type="energy-foodcalorie">
<displayName>↑↑↑</displayName>
<unitPattern count="one">{0} kcal</unitPattern>
<unitPattern count="other">{0}  kcal</unitPattern>
<unitPattern count="other">{0} kcal</unitPattern>
</unit>
<unit type="energy-kilojoule">
<displayName>↑↑↑</displayName>
Expand Down
10 changes: 5 additions & 5 deletions common/main/hi_Latn.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2211,14 +2211,14 @@ annotations.
<intervalFormatItem id="GyMMMd">
<greatestDifference id="d">G y MMM d–d</greatestDifference>
<greatestDifference id="G">G y MMM d – G y MMM d</greatestDifference>
<greatestDifference id="M">G y MMM d  – MMM d</greatestDifference>
<greatestDifference id="y">G y MMM d –  y d MMM</greatestDifference>
<greatestDifference id="M">G y MMM d – MMM d</greatestDifference>
<greatestDifference id="y">G y MMM d – y d MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMMEd">
<greatestDifference id="d">G y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="G">G y MMM d, E –  G y MMM d, E</greatestDifference>
<greatestDifference id="M">G y MMM d, E –  MMM d, E</greatestDifference>
<greatestDifference id="y">G y MMM d, E –  y MMM d, E</greatestDifference>
<greatestDifference id="G">G y MMM d, E – G y MMM d, E</greatestDifference>
<greatestDifference id="M">G y MMM d, E – MMM d, E</greatestDifference>
<greatestDifference id="y">G y MMM d, E – y MMM d, E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="h">
<greatestDifference id="a">↑↑↑</greatestDifference>
Expand Down
12 changes: 6 additions & 6 deletions common/main/ku.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,9 +1186,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<greatestDifference id="y">G d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMEd">
<greatestDifference id="d">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="M">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="y">G d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="d">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="M">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="y">G d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMM">
<greatestDifference id="M">G MMMM – MMMM y</greatestDifference>
Expand Down Expand Up @@ -1722,9 +1722,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<greatestDifference id="y">d'ê' MMM'a' y'an' – d'ê' MMM'a' y'an'</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMEd">
<greatestDifference id="d">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="M">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="y">d'ê' MMM'a' y'an' E  – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="d">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="M">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
<greatestDifference id="y">d'ê' MMM'a' y'an' E – d'ê' MMM'a' y'an' E</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMM">
<greatestDifference id="M">MMMM – MMMM y</greatestDifference>
Expand Down
4 changes: 2 additions & 2 deletions common/main/pap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</intervalFormatItem>
<intervalFormatItem id="GyMMMEd">
<greatestDifference id="d" draft="unconfirmed">E, d MMM – d MMM y G</greatestDifference>
<greatestDifference id="G" draft="unconfirmed">E, d MMM y G  – E, d MMM y G</greatestDifference>
<greatestDifference id="G" draft="unconfirmed">E, d MMM y G – E, d MMM y G</greatestDifference>
<greatestDifference id="M" draft="unconfirmed">E, d MMM – E, d MMM y G</greatestDifference>
<greatestDifference id="y" draft="unconfirmed">E, d MMM y – E, d MMM y G</greatestDifference>
</intervalFormatItem>
Expand Down Expand Up @@ -905,7 +905,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
</intervalFormatItem>
<intervalFormatItem id="MMMd">
<greatestDifference id="d" draft="unconfirmed">d–d MMM</greatestDifference>
<greatestDifference id="M" draft="unconfirmed">d MMM  – d MMM</greatestDifference>
<greatestDifference id="M" draft="unconfirmed">d MMM – d MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMEd">
<greatestDifference id="d" draft="unconfirmed">E, d MMM – E, d MMM</greatestDifference>
Expand Down
24 changes: 12 additions & 12 deletions common/main/root.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2907,6 +2907,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<zone type="America/St_Johns">
<exemplarCity>St. John’s</exemplarCity>
</zone>
<zone type="America/Curacao">
<exemplarCity>Curaçao</exemplarCity>
</zone>
<zone type="Africa/Asmera">
<exemplarCity>Asmara</exemplarCity>
</zone>
Expand Down Expand Up @@ -2955,9 +2958,18 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<zone type="Asia/Katmandu">
<exemplarCity>Kathmandu</exemplarCity>
</zone>
<zone type="America/Asuncion">
<exemplarCity>Asunción</exemplarCity>
</zone>
<zone type="Indian/Reunion">
<exemplarCity>Réunion</exemplarCity>
</zone>
<zone type="Atlantic/St_Helena">
<exemplarCity>St. Helena</exemplarCity>
</zone>
<zone type="Africa/Sao_Tome">
<exemplarCity>São Tomé</exemplarCity>
</zone>
<zone type="America/Lower_Princes">
<exemplarCity>Lower Prince’s Quarter</exemplarCity>
</zone>
Expand Down Expand Up @@ -3006,18 +3018,6 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<zone type="Asia/Saigon">
<exemplarCity>Ho Chi Minh</exemplarCity>
</zone>
<zone type="America/Curacao">
<exemplarCity>Curaçao</exemplarCity>
</zone>
<zone type="America/Asuncion">
<exemplarCity>Asunción</exemplarCity>
</zone>
<zone type="Indian/Reunion">
<exemplarCity>Réunion</exemplarCity>
</zone>
<zone type="Africa/Sao_Tome">
<exemplarCity>São Tomé</exemplarCity>
</zone>
</timeZoneNames>
</dates>
<numbers>
Expand Down
2 changes: 1 addition & 1 deletion common/main/syr.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic
<appendItem request="Timezone">↑↑↑</appendItem>
</appendItems>
<intervalFormats>
<intervalFormatFallback>{0}  –  {1}</intervalFormatFallback>
<intervalFormatFallback>{0} – {1}</intervalFormatFallback>
<intervalFormatItem id="Bh">
<greatestDifference id="B">↑↑↑</greatestDifference>
<greatestDifference id="h">↑↑↑</greatestDifference>
Expand Down
90 changes: 45 additions & 45 deletions common/main/vi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,15 +2523,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
</intervalFormatItem>
<intervalFormatItem id="GyMd">
<greatestDifference id="d">d/M/y – d/M/y GGGGG</greatestDifference>
<greatestDifference id="G">d/M/y GGGGG  –  d/M/y GGGGG</greatestDifference>
<greatestDifference id="G">d/M/y GGGGG – d/M/y GGGGG</greatestDifference>
<greatestDifference id="M">d/M/y – d/M/y GGGGG</greatestDifference>
<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
<greatestDifference id="d">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="G">E, d/M/y GGGGG  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="M">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="y">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="G">E, d/M/y GGGGG – E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
Expand Down Expand Up @@ -2590,19 +2590,19 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<greatestDifference id="M">d/M – d/M</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MEd">
<greatestDifference id="d">E, d/M  –  E, d/M</greatestDifference>
<greatestDifference id="M">E, d/M  –  E, d/M</greatestDifference>
<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMM">
<greatestDifference id="M">MMM  –  MMM</greatestDifference>
<greatestDifference id="M">MMM – MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMd">
<greatestDifference id="d">d – d MMM</greatestDifference>
<greatestDifference id="M">d MMM  –  d MMM</greatestDifference>
<greatestDifference id="M">d MMM – d MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMEd">
<greatestDifference id="d">E, d MMM  –  E, d MMM</greatestDifference>
<greatestDifference id="M">E, d MMM  –  E, d MMM</greatestDifference>
<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
<greatestDifference id="M">E, d MMM – E, d MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="y">
<greatestDifference id="y">y–y G</greatestDifference>
Expand All @@ -2617,26 +2617,26 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<greatestDifference id="y">d/M/y – d/M/y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMEd">
<greatestDifference id="d">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="M">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="y">E, d/M/y  –  E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="d">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="M">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
<greatestDifference id="y">E, d/M/y – E, d/M/y GGGGG</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMM">
<greatestDifference id="M">MMM  –  MMM y G</greatestDifference>
<greatestDifference id="y">MMM y  –  MMM y G</greatestDifference>
<greatestDifference id="M">MMM – MMM y G</greatestDifference>
<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMd">
<greatestDifference id="d">d – d MMM, y G</greatestDifference>
<greatestDifference id="M">d MMM  –  d MMM, y G</greatestDifference>
<greatestDifference id="y">d MMM, y  –  d MMM, y G</greatestDifference>
<greatestDifference id="M">d MMM – d MMM, y G</greatestDifference>
<greatestDifference id="y">d MMM, y – d MMM, y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMEd">
<greatestDifference id="d">E, d MMM  –  E, d MMM, y G</greatestDifference>
<greatestDifference id="M">E, d MMM  –  E, d MMM, y G</greatestDifference>
<greatestDifference id="y">E, d MMM, y  –  E, d MMM, y G</greatestDifference>
<greatestDifference id="d">E, d MMM – E, d MMM, y G</greatestDifference>
<greatestDifference id="M">E, d MMM – E, d MMM, y G</greatestDifference>
<greatestDifference id="y">E, d MMM, y – E, d MMM, y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMM">
<greatestDifference id="M">MMMM  –  MMMM y G</greatestDifference>
<greatestDifference id="M">MMMM – MMMM y G</greatestDifference>
<greatestDifference id="y">MMMM y – MMMM y G</greatestDifference>
</intervalFormatItem>
</intervalFormats>
Expand Down Expand Up @@ -3081,7 +3081,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<intervalFormats>
<intervalFormatFallback>↑↑↑</intervalFormatFallback>
<intervalFormatItem id="Bh">
<greatestDifference id="B">h 'giờ' B  –  h 'giờ' B</greatestDifference>
<greatestDifference id="B">h 'giờ' B – h 'giờ' B</greatestDifference>
<greatestDifference id="h">h – h 'giờ' B</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="Bhm">
Expand All @@ -3097,24 +3097,24 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<greatestDifference id="y">y – y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyM">
<greatestDifference id="G">M/y G  –  M/y G</greatestDifference>
<greatestDifference id="G">M/y G – M/y G</greatestDifference>
<greatestDifference id="M">M/y– M/y G</greatestDifference>
<greatestDifference id="y">M/y – M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMd">
<greatestDifference id="d">d/M/y – d/M/y G</greatestDifference>
<greatestDifference id="G">d/M/y G  –  d/M/y G</greatestDifference>
<greatestDifference id="G">d/M/y G – d/M/y G</greatestDifference>
<greatestDifference id="M">d/M/y – d/M/y G</greatestDifference>
<greatestDifference id="y">d/M/y – d/M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMEd">
<greatestDifference id="d">E, d/M/y  –  E, d/M/y G</greatestDifference>
<greatestDifference id="G">E, d/M/y G  –  E, d/M/y G</greatestDifference>
<greatestDifference id="M">E, d/M/y  –  E, d/M/y G</greatestDifference>
<greatestDifference id="y">E, d/M/y  –  E, d/M/y G</greatestDifference>
<greatestDifference id="d">E, d/M/y – E, d/M/y G</greatestDifference>
<greatestDifference id="G">E, d/M/y G – E, d/M/y G</greatestDifference>
<greatestDifference id="M">E, d/M/y – E, d/M/y G</greatestDifference>
<greatestDifference id="y">E, d/M/y – E, d/M/y G</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="GyMMM">
<greatestDifference id="G">MMM y G  –  MMM y G</greatestDifference>
<greatestDifference id="G">MMM y G – MMM y G</greatestDifference>
<greatestDifference id="M">MMM – MMM y G</greatestDifference>
<greatestDifference id="y">MMM y – MMM y G</greatestDifference>
</intervalFormatItem>
Expand Down Expand Up @@ -3170,15 +3170,15 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<greatestDifference id="M">d/M – d/M</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MEd">
<greatestDifference id="d">E, d/M  –  E, d/M</greatestDifference>
<greatestDifference id="M">E, d/M  –  E, d/M</greatestDifference>
<greatestDifference id="d">E, d/M – E, d/M</greatestDifference>
<greatestDifference id="M">E, d/M – E, d/M</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMM">
<greatestDifference id="M">MMM – MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMd">
<greatestDifference id="d">d – d MMM</greatestDifference>
<greatestDifference id="M">d MMM  –  d MMM</greatestDifference>
<greatestDifference id="M">d MMM – d MMM</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="MMMEd">
<greatestDifference id="d">E, d MMM – E, d MMM</greatestDifference>
Expand All @@ -3197,27 +3197,27 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/
<greatestDifference id="y">d/M/y – d/M/y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMEd">
<greatestDifference id="d">E, d/M/y  –  E, d/M/y</greatestDifference>
<greatestDifference id="M">E, d/M/y  –  E, d/M/y</greatestDifference>
<greatestDifference id="y">E, d/M/y  –  E, d/M/y</greatestDifference>
<greatestDifference id="d">E, d/M/y – E, d/M/y</greatestDifference>
<greatestDifference id="M">E, d/M/y – E, d/M/y</greatestDifference>
<greatestDifference id="y">E, d/M/y – E, d/M/y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMM">
<greatestDifference id="M">MMM  –  MMM y</greatestDifference>
<greatestDifference id="y">MMM y  –  MMM y</greatestDifference>
<greatestDifference id="M">MMM – MMM y</greatestDifference>
<greatestDifference id="y">MMM y – MMM y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMd">
<greatestDifference id="d">d – d MMM, y</greatestDifference>
<greatestDifference id="M">d MMM  –  d MMM, y</greatestDifference>
<greatestDifference id="y">d MMM, y  –  d MMM, y</greatestDifference>
<greatestDifference id="M">d MMM – d MMM, y</greatestDifference>
<greatestDifference id="y">d MMM, y – d MMM, y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMEd">
<greatestDifference id="d">E, d MMM  –  E, d MMM, y</greatestDifference>
<greatestDifference id="M">E, d MMM  –  E, d MMM, y</greatestDifference>
<greatestDifference id="y">E, d MMM, y  –  E, d MMM, y</greatestDifference>
<greatestDifference id="d">E, d MMM – E, d MMM, y</greatestDifference>
<greatestDifference id="M">E, d MMM – E, d MMM, y</greatestDifference>
<greatestDifference id="y">E, d MMM, y – E, d MMM, y</greatestDifference>
</intervalFormatItem>
<intervalFormatItem id="yMMMM">
<greatestDifference id="M">MMMM  –  MMMM 'năm' y</greatestDifference>
<greatestDifference id="y">MMMM 'năm' y  –  MMMM 'năm' y</greatestDifference>
<greatestDifference id="M">MMMM – MMMM 'năm' y</greatestDifference>
<greatestDifference id="y">MMMM 'năm' y – MMMM 'năm' y</greatestDifference>
</intervalFormatItem>
</intervalFormats>
</dateTimeFormats>
Expand Down
Loading
Loading