diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-01 03:02:09 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-01 03:02:09 +0000 |
| commit | eb0a117e201bdd6ff882da3869370b889137cc38 (patch) | |
| tree | 6abd21d8080d42134e40237fc66ae3bff29c93b1 | |
| parent | 433f8078509ef1fb033f96270dc9b3095d08dd99 (diff) | |
| parent | 53df4bb28ad77dbad83e10845ba7b52bfa61ca7b (diff) | |
| download | cldr-android12-d1-s4-release.tar.gz | |
Snap for 7328689 from 53df4bb28ad77dbad83e10845ba7b52bfa61ca7b to sc-d1-releaseandroid-12.0.0_r7android-12.0.0_r6android-12.0.0_r5android-12.0.0_r4android-12.0.0_r15android-12.0.0_r14android-12.0.0_r13android-12.0.0_r12android12-d1-s6-releaseandroid12-d1-s5-releaseandroid12-d1-s4-releaseandroid12-d1-s3-releaseandroid12-d1-s2-releaseandroid12-d1-s1-releaseandroid12-d1-release
Change-Id: I061898813fca7b8b9f70a351941bd908b0d9ec15
| -rw-r--r-- | common/main/ar.xml | 26 | ||||
| -rw-r--r-- | common/main/en_IN.xml | 47 | ||||
| -rw-r--r-- | common/main/es_419.xml | 2 | ||||
| -rw-r--r-- | common/main/es_MX.xml | 2 | ||||
| -rw-r--r-- | common/main/es_US.xml | 2 | ||||
| -rw-r--r-- | common/main/fa.xml | 266 | ||||
| -rw-r--r-- | common/main/ka.xml | 12 | ||||
| -rw-r--r-- | common/main/ko.xml | 2 | ||||
| -rw-r--r-- | common/main/zh.xml | 6 | ||||
| -rw-r--r-- | common/main/zh_Hant.xml | 2 |
10 files changed, 183 insertions, 184 deletions
diff --git a/common/main/ar.xml b/common/main/ar.xml index 79dc3bf2..ad212483 100644 --- a/common/main/ar.xml +++ b/common/main/ar.xml @@ -10737,13 +10737,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <unitPattern count="other">{0} تيرابت</unitPattern> </unit> <unit type="digital-gigabyte"> - <displayName>غيغابايت</displayName> - <unitPattern count="zero">{0} غيغابايت</unitPattern> - <unitPattern count="one">{0} غيغابايت</unitPattern> - <unitPattern count="two">{0} غيغابايت</unitPattern> - <unitPattern count="few">{0} غيغابايت</unitPattern> - <unitPattern count="many">{0} غيغابايت</unitPattern> - <unitPattern count="other">{0} غيغابايت</unitPattern> + <displayName>GB</displayName> + <unitPattern count="zero">{0} GB</unitPattern> + <unitPattern count="one">{0} GB</unitPattern> + <unitPattern count="two">{0} GB</unitPattern> + <unitPattern count="few">{0} GB</unitPattern> + <unitPattern count="many">{0} GB</unitPattern> + <unitPattern count="other">{0} GB</unitPattern> </unit> <unit type="digital-gigabit"> <displayName>غيغابت</displayName> @@ -10756,12 +10756,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="digital-megabyte"> <displayName>ميغابايت</displayName> - <unitPattern count="zero">{0} ميغابايت</unitPattern> - <unitPattern count="one">{0} ميغابايت</unitPattern> - <unitPattern count="two">{0} ميغابايت</unitPattern> - <unitPattern count="few">{0} ميغابايت</unitPattern> - <unitPattern count="many">{0} ميغابايت</unitPattern> - <unitPattern count="other">{0} ميغابايت</unitPattern> + <unitPattern count="zero">{0} MB</unitPattern> + <unitPattern count="one">{0} MB</unitPattern> + <unitPattern count="two">{0} MB</unitPattern> + <unitPattern count="few">{0} MB</unitPattern> + <unitPattern count="many">{0} MB</unitPattern> + <unitPattern count="other">{0} MB</unitPattern> </unit> <unit type="digital-megabit"> <displayName>ميغابت</displayName> diff --git a/common/main/en_IN.xml b/common/main/en_IN.xml index 5c9236d2..d4b6bb31 100644 --- a/common/main/en_IN.xml +++ b/common/main/en_IN.xml @@ -5204,30 +5204,29 @@ CLDR data files are interpreted according to the LDML specification (http://unic </decimalFormatLength> <decimalFormatLength type="short"> <decimalFormat> - <pattern type="1000" count="one">↑↑↑</pattern> - <pattern type="1000" count="other">↑↑↑</pattern> - <pattern type="10000" count="one">↑↑↑</pattern> - <pattern type="10000" count="other">↑↑↑</pattern> - <pattern type="100000" count="one">↑↑↑</pattern> - <pattern type="100000" count="other">↑↑↑</pattern> - <pattern type="1000000" count="one">↑↑↑</pattern> - <pattern type="1000000" count="other">↑↑↑</pattern> - <pattern type="10000000" count="one">↑↑↑</pattern> - <pattern type="10000000" count="other">↑↑↑</pattern> - <pattern type="100000000" count="one">↑↑↑</pattern> - <pattern type="100000000" count="other">↑↑↑</pattern> - <pattern type="1000000000" count="one">↑↑↑</pattern> - <pattern type="1000000000" count="other">↑↑↑</pattern> - <pattern type="10000000000" count="one">↑↑↑</pattern> - <pattern type="10000000000" count="other">↑↑↑</pattern> - <pattern type="100000000000" count="one">↑↑↑</pattern> - <pattern type="100000000000" count="other">↑↑↑</pattern> - <pattern type="1000000000000" count="one">↑↑↑</pattern> - <pattern type="1000000000000" count="other">↑↑↑</pattern> - <pattern type="10000000000000" count="one">↑↑↑</pattern> - <pattern type="10000000000000" count="other">↑↑↑</pattern> - <pattern type="100000000000000" count="one">↑↑↑</pattern> - <pattern type="100000000000000" count="other">↑↑↑</pattern> + <pattern type="1000" count="one" draft="contributed">0T</pattern> + <pattern type="1000" count="other" draft="contributed">0T</pattern> + <pattern type="10000" count="one" draft="contributed">00T</pattern> + <pattern type="10000" count="other" draft="contributed">00T</pattern> + <pattern type="100000" count="one" draft="contributed">0L</pattern> + <pattern type="100000" count="other" draft="contributed">0L</pattern> + <pattern type="1000000" count="one" draft="contributed">00L</pattern> + <pattern type="1000000" count="other" draft="contributed">00L</pattern> + <pattern type="10000000" count="one" draft="contributed">0Cr</pattern> + <pattern type="10000000" count="other" draft="contributed">0Cr</pattern> + <pattern type="100000000" count="one" draft="contributed">00Cr</pattern> + <pattern type="100000000" count="other" draft="contributed">00Cr</pattern> + <pattern type="1000000000" count="one" draft="contributed">000Cr</pattern> + <pattern type="1000000000" count="other" draft="contributed">000Cr</pattern> + <pattern type="10000000000" count="one" draft="contributed">0TCr</pattern> + <pattern type="10000000000" count="other" draft="contributed">0TCr</pattern> + <pattern type="100000000000" count="one" draft="contributed">00TCr</pattern> + <pattern type="100000000000" count="other" draft="contributed">00TCr</pattern> + <pattern type="1000000000000" count="one" draft="contributed">0LCr</pattern> + <pattern type="1000000000000" count="other" draft="contributed">0LCr</pattern> + <pattern type="10000000000000" count="one" draft="contributed">00LCr</pattern> + <pattern type="10000000000000" count="other" draft="contributed">00LCr</pattern> + <pattern type="100000000000000" count="one" draft="contributed">000LCr</pattern> </decimalFormat> </decimalFormatLength> </decimalFormats> diff --git a/common/main/es_419.xml b/common/main/es_419.xml index 343bb43e..c08e2786 100644 --- a/common/main/es_419.xml +++ b/common/main/es_419.xml @@ -5053,7 +5053,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <otherNumberingSystems> <native draft="contributed">latn</native> </otherNumberingSystems> - <minimumGroupingDigits draft="contributed">2</minimumGroupingDigits> + <minimumGroupingDigits draft="contributed">1</minimumGroupingDigits> <symbols numberSystem="latn"> <decimal>.</decimal> <group>,</group> diff --git a/common/main/es_MX.xml b/common/main/es_MX.xml index 5423b46c..c939ec49 100644 --- a/common/main/es_MX.xml +++ b/common/main/es_MX.xml @@ -4675,7 +4675,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <otherNumberingSystems> <native draft="contributed">↑↑↑</native> </otherNumberingSystems> - <minimumGroupingDigits draft="contributed">2</minimumGroupingDigits> + <minimumGroupingDigits draft="contributed">1</minimumGroupingDigits> <symbols numberSystem="latn"> <decimal>↑↑↑</decimal> <group>↑↑↑</group> diff --git a/common/main/es_US.xml b/common/main/es_US.xml index fde53dbb..44973faa 100644 --- a/common/main/es_US.xml +++ b/common/main/es_US.xml @@ -4742,7 +4742,7 @@ CLDR data files are interpreted according to the LDML specification (http://unic <otherNumberingSystems> <native draft="contributed">↑↑↑</native> </otherNumberingSystems> - <minimumGroupingDigits draft="contributed">2</minimumGroupingDigits> + <minimumGroupingDigits draft="contributed">1</minimumGroupingDigits> <symbols numberSystem="latn"> <decimal>↑↑↑</decimal> <group>↑↑↑</group> diff --git a/common/main/fa.xml b/common/main/fa.xml index 96e7ceb5..8bf732dd 100644 --- a/common/main/fa.xml +++ b/common/main/fa.xml @@ -8737,13 +8737,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </compoundUnit> <unit type="acceleration-g-force"> <displayName>گرانش</displayName> - <unitPattern count="one">{0} <LRM>G</unitPattern> - <unitPattern count="other">{0} <LRM>G</unitPattern> + <unitPattern count="one">{0} G</unitPattern> + <unitPattern count="other">{0} G</unitPattern> </unit> <unit type="acceleration-meter-per-square-second"> <displayName>متر/مجذور ثانیه</displayName> - <unitPattern count="one">{0}<LRM> m/s²</unitPattern> - <unitPattern count="other">{0}<LRM> m/s²</unitPattern> + <unitPattern count="one">{0} m/s²</unitPattern> + <unitPattern count="other">{0} m/s²</unitPattern> </unit> <unit type="angle-revolution"> <displayName>دور</displayName> @@ -8779,25 +8779,25 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <unit type="area-hectare"> <displayName>هکتار</displayName> <unitPattern count="one">{0} هک</unitPattern> - <unitPattern count="other">{0} <LRM>ha</unitPattern> + <unitPattern count="other">{0} ha</unitPattern> </unit> <unit type="area-square-meter"> <displayName>متر مربع</displayName> - <unitPattern count="one">{0} <LRM>m²</unitPattern> - <unitPattern count="other">{0} <LRM>m²</unitPattern> - <perUnitPattern>{0}<LRM>/m²</perUnitPattern> + <unitPattern count="one">{0} m²</unitPattern> + <unitPattern count="other">{0} m²</unitPattern> + <perUnitPattern>{0}/m²</perUnitPattern> </unit> <unit type="area-square-centimeter"> <displayName>↑↑↑</displayName> <unitPattern count="one">{0} cm²</unitPattern> <unitPattern count="other">{0} cm²</unitPattern> - <perUnitPattern>{0}<LRM>/cm²</perUnitPattern> + <perUnitPattern>{0}/cm²</perUnitPattern> </unit> <unit type="area-square-mile"> <displayName>مایل مربع</displayName> <unitPattern count="one">{0} مایل مربع</unitPattern> <unitPattern count="other">{0} مایل مربع</unitPattern> - <perUnitPattern>{0}<LRM>/mi²</perUnitPattern> + <perUnitPattern>{0}/mi²</perUnitPattern> </unit> <unit type="area-acre"> <displayName>جریب</displayName> @@ -8806,8 +8806,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="area-square-yard"> <displayName>یارد مربع</displayName> - <unitPattern count="one">{0} <LRM>yd²</unitPattern> - <unitPattern count="other">{0} <LRM>yd²</unitPattern> + <unitPattern count="one">{0} yd²</unitPattern> + <unitPattern count="other">{0} yd²</unitPattern> </unit> <unit type="area-square-foot"> <displayName>فوت مربع</displayName> @@ -8816,9 +8816,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="area-square-inch"> <displayName>اینچ مربع</displayName> - <unitPattern count="one">{0}<LRM>/in²</unitPattern> - <unitPattern count="other">{0}<LRM>/in²</unitPattern> - <perUnitPattern>{0}<LRM>/in²</perUnitPattern> + <unitPattern count="one">{0}/in²</unitPattern> + <unitPattern count="other">{0}/in²</unitPattern> + <perUnitPattern>{0}/in²</perUnitPattern> </unit> <unit type="area-dunam"> <displayName>دونوم</displayName> @@ -8887,48 +8887,48 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="digital-petabyte"> <displayName>پتابایت</displayName> - <unitPattern count="one">{0} <LRM>PB</unitPattern> - <unitPattern count="other">{0} <LRM>PB</unitPattern> + <unitPattern count="one">{0} PB</unitPattern> + <unitPattern count="other">{0} PB</unitPattern> </unit> <unit type="digital-terabyte"> <displayName>ترابایت</displayName> - <unitPattern count="one">{0} <LRM>TB</unitPattern> - <unitPattern count="other">{0} <LRM>TB</unitPattern> + <unitPattern count="one">{0} TB</unitPattern> + <unitPattern count="other">{0} TB</unitPattern> </unit> <unit type="digital-terabit"> <displayName>ترابیت</displayName> - <unitPattern count="one">{0} <LRM>Tb</unitPattern> - <unitPattern count="other">{0} <LRM>Tb</unitPattern> + <unitPattern count="one">{0} Tb</unitPattern> + <unitPattern count="other">{0} Tb</unitPattern> </unit> <unit type="digital-gigabyte"> - <displayName>گیگابایت</displayName> - <unitPattern count="one">{0} <LRM>GB</unitPattern> - <unitPattern count="other">{0} <LRM>GB</unitPattern> + <displayName>GB</displayName> + <unitPattern count="one">{0} GB</unitPattern> + <unitPattern count="other">{0} GB</unitPattern> </unit> <unit type="digital-gigabit"> <displayName>گیگابیت</displayName> - <unitPattern count="one">{0} <LRM>Gb</unitPattern> - <unitPattern count="other">{0} <LRM>Gb</unitPattern> + <unitPattern count="one">{0} Gb</unitPattern> + <unitPattern count="other">{0} Gb</unitPattern> </unit> <unit type="digital-megabyte"> - <displayName>مگابایت</displayName> - <unitPattern count="one">{0} <LRM>MB</unitPattern> - <unitPattern count="other">{0} <LRM>MB</unitPattern> + <displayName>MB</displayName> + <unitPattern count="one">{0} MB</unitPattern> + <unitPattern count="other">{0} MB</unitPattern> </unit> <unit type="digital-megabit"> <displayName>مگابیت</displayName> - <unitPattern count="one">{0} <LRM>Mb</unitPattern> - <unitPattern count="other">{0} <LRM>Mb</unitPattern> + <unitPattern count="one">{0} Mb</unitPattern> + <unitPattern count="other">{0} Mb</unitPattern> </unit> <unit type="digital-kilobyte"> <displayName>کیلوبایت</displayName> - <unitPattern count="one">{0} <LRM>kB</unitPattern> - <unitPattern count="other">{0} <LRM>kB</unitPattern> + <unitPattern count="one">{0} kB</unitPattern> + <unitPattern count="other">{0} kB</unitPattern> </unit> <unit type="digital-kilobit"> <displayName>کیلوبیت</displayName> - <unitPattern count="one">{0} <LRM>kb</unitPattern> - <unitPattern count="other">{0} <LRM>kb</unitPattern> + <unitPattern count="one">{0} kb</unitPattern> + <unitPattern count="other">{0} kb</unitPattern> </unit> <unit type="digital-byte"> <displayName>بایت</displayName> @@ -9000,12 +9000,12 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <unit type="duration-microsecond"> <displayName>میکروثانیه</displayName> <unitPattern count="one">{0} میکروثانیه</unitPattern> - <unitPattern count="other">{0} <LRM>µs</unitPattern> + <unitPattern count="other">{0} μs</unitPattern> </unit> <unit type="duration-nanosecond"> <displayName>نانوثانیه</displayName> - <unitPattern count="one">{0} <LRM>ns</unitPattern> - <unitPattern count="other">{0} <LRM>ns</unitPattern> + <unitPattern count="one">{0} ns</unitPattern> + <unitPattern count="other">{0} ns</unitPattern> </unit> <unit type="electric-ampere"> <displayName>آمپر</displayName> @@ -9104,38 +9104,38 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="graphics-em"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>em</unitPattern> - <unitPattern count="other">{0} <LRM>em</unitPattern> + <unitPattern count="one">{0} em</unitPattern> + <unitPattern count="other">{0} em</unitPattern> </unit> <unit type="graphics-pixel"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>px</unitPattern> - <unitPattern count="other">{0} <LRM>px</unitPattern> + <unitPattern count="one">{0} px</unitPattern> + <unitPattern count="other">{0} px</unitPattern> </unit> <unit type="graphics-megapixel"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>MP</unitPattern> - <unitPattern count="other">{0} <LRM>MP</unitPattern> + <unitPattern count="one">{0} MP</unitPattern> + <unitPattern count="other">{0} MP</unitPattern> </unit> <unit type="graphics-pixel-per-centimeter"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>ppcm</unitPattern> - <unitPattern count="other">{0} <LRM>ppcm</unitPattern> + <unitPattern count="one">{0} ppcm</unitPattern> + <unitPattern count="other">{0} ppcm</unitPattern> </unit> <unit type="graphics-pixel-per-inch"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>ppi</unitPattern> - <unitPattern count="other">{0} <LRM>ppi</unitPattern> + <unitPattern count="one">{0} ppi</unitPattern> + <unitPattern count="other">{0} ppi</unitPattern> </unit> <unit type="graphics-dot-per-centimeter"> <displayName>dpcm</displayName> - <unitPattern count="one">{0} <LRM>dpcm</unitPattern> - <unitPattern count="other">{0} <LRM>dpcm</unitPattern> + <unitPattern count="one">{0} dpcm</unitPattern> + <unitPattern count="other">{0} dpcm</unitPattern> </unit> <unit type="graphics-dot-per-inch"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>dpi</unitPattern> - <unitPattern count="other">{0} <LRM>dpi</unitPattern> + <unitPattern count="one">{0} dpi</unitPattern> + <unitPattern count="other">{0} dpi</unitPattern> </unit> <unit type="graphics-dot"> <displayName>نقطه</displayName> @@ -9144,103 +9144,103 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="length-earth-radius"> <displayName>R⊕</displayName> - <unitPattern count="one">{0} <LRM>R⊕</unitPattern> - <unitPattern count="other">{0} <LRM>R⊕</unitPattern> + <unitPattern count="one">{0} R⊕</unitPattern> + <unitPattern count="other">{0} R⊕</unitPattern> </unit> <unit type="length-kilometer"> <displayName>کیلومتر</displayName> - <unitPattern count="one">{0} <LRM>km</unitPattern> - <unitPattern count="other">{0} <LRM>km</unitPattern> - <perUnitPattern>{0}<LRM>/km</perUnitPattern> + <unitPattern count="one">{0} km</unitPattern> + <unitPattern count="other">{0} km</unitPattern> + <perUnitPattern>{0}/km</perUnitPattern> </unit> <unit type="length-meter"> <displayName>متر</displayName> - <unitPattern count="one">{0} <LRM>m</unitPattern> - <unitPattern count="other">{0} <LRM>m</unitPattern> - <perUnitPattern>{0}<LRM>/m</perUnitPattern> + <unitPattern count="one">{0} m</unitPattern> + <unitPattern count="other">{0} m</unitPattern> + <perUnitPattern>{0}/m</perUnitPattern> </unit> <unit type="length-decimeter"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>dm</unitPattern> - <unitPattern count="other">{0} <LRM>dm</unitPattern> + <unitPattern count="one">{0} dm</unitPattern> + <unitPattern count="other">{0} dm</unitPattern> </unit> <unit type="length-centimeter"> <displayName>cm</displayName> - <unitPattern count="one">{0} <LRM>cm</unitPattern> - <unitPattern count="other">{0} <LRM>cm</unitPattern> - <perUnitPattern>{0}<LRM>/cm</perUnitPattern> + <unitPattern count="one">{0} cm</unitPattern> + <unitPattern count="other">{0} cm</unitPattern> + <perUnitPattern>{0}/cm</perUnitPattern> </unit> <unit type="length-millimeter"> <displayName>mm</displayName> - <unitPattern count="one">{0} <LRM>mm</unitPattern> - <unitPattern count="other">{0} <LRM>mm</unitPattern> + <unitPattern count="one">{0} mm</unitPattern> + <unitPattern count="other">{0} mm</unitPattern> </unit> <unit type="length-micrometer"> <displayName>میکرومتر</displayName> - <unitPattern count="one">{0} <LRM>µm</unitPattern> - <unitPattern count="other">{0} <LRM>µm</unitPattern> + <unitPattern count="one">{0} μm</unitPattern> + <unitPattern count="other">{0} μm</unitPattern> </unit> <unit type="length-nanometer"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>nm</unitPattern> - <unitPattern count="other">{0} <LRM>nm</unitPattern> + <unitPattern count="one">{0} nm</unitPattern> + <unitPattern count="other">{0} nm</unitPattern> </unit> <unit type="length-picometer"> <displayName>pm</displayName> - <unitPattern count="one">{0} <LRM>pm</unitPattern> - <unitPattern count="other">{0} <LRM>pm</unitPattern> + <unitPattern count="one">{0} pm</unitPattern> + <unitPattern count="other">{0} pm</unitPattern> </unit> <unit type="length-mile"> <displayName>مایل</displayName> - <unitPattern count="one">{0} <LRM>mi</unitPattern> - <unitPattern count="other">{0} <LRM>mi</unitPattern> + <unitPattern count="one">{0} mi</unitPattern> + <unitPattern count="other">{0} mi</unitPattern> </unit> <unit type="length-yard"> <displayName>یارد</displayName> - <unitPattern count="one">{0} <LRM>yd</unitPattern> - <unitPattern count="other">{0} <LRM>yd</unitPattern> + <unitPattern count="one">{0} yd</unitPattern> + <unitPattern count="other">{0} yd</unitPattern> </unit> <unit type="length-foot"> <displayName>فوت</displayName> - <unitPattern count="one">{0} <LRM>ft</unitPattern> - <unitPattern count="other">{0} <LRM>ft</unitPattern> - <perUnitPattern>{0}<LRM>/ft</perUnitPattern> + <unitPattern count="one">{0} ft</unitPattern> + <unitPattern count="other">{0} ft</unitPattern> + <perUnitPattern>{0}/ft</perUnitPattern> </unit> <unit type="length-inch"> <displayName>اینچ</displayName> - <unitPattern count="one">{0} <LRM>in</unitPattern> - <unitPattern count="other">{0} <LRM>in</unitPattern> - <perUnitPattern>{0}<LRM>/in</perUnitPattern> + <unitPattern count="one">{0} in</unitPattern> + <unitPattern count="other">{0} in</unitPattern> + <perUnitPattern>{0}/in</perUnitPattern> </unit> <unit type="length-parsec"> <displayName>پارسک</displayName> - <unitPattern count="one">{0} <LRM>pc</unitPattern> - <unitPattern count="other">{0} <LRM>pc</unitPattern> + <unitPattern count="one">{0} pc</unitPattern> + <unitPattern count="other">{0} pc</unitPattern> </unit> <unit type="length-light-year"> <displayName>سال نوری</displayName> - <unitPattern count="one">{0} <LRM>ly</unitPattern> - <unitPattern count="other">{0} <LRM>ly</unitPattern> + <unitPattern count="one">{0} ly</unitPattern> + <unitPattern count="other">{0} ly</unitPattern> </unit> <unit type="length-astronomical-unit"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>au</unitPattern> - <unitPattern count="other">{0} <LRM>au</unitPattern> + <unitPattern count="one">{0} au</unitPattern> + <unitPattern count="other">{0} au</unitPattern> </unit> <unit type="length-furlong"> <displayName>فرلانگ</displayName> - <unitPattern count="one">{0} <LRM>fur</unitPattern> - <unitPattern count="other">{0} <LRM>fur</unitPattern> + <unitPattern count="one">{0} fur</unitPattern> + <unitPattern count="other">{0} fur</unitPattern> </unit> <unit type="length-fathom"> <displayName>فاتوم</displayName> - <unitPattern count="one">{0} <LRM>fth</unitPattern> - <unitPattern count="other">{0} <LRM>fth</unitPattern> + <unitPattern count="one">{0} fth</unitPattern> + <unitPattern count="other">{0} fth</unitPattern> </unit> <unit type="length-nautical-mile"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>nmi</unitPattern> - <unitPattern count="other">{0} <LRM>nmi</unitPattern> + <unitPattern count="one">{0} nmi</unitPattern> + <unitPattern count="other">{0} nmi</unitPattern> </unit> <unit type="length-mile-scandinavian"> <displayName>↑↑↑</displayName> @@ -9249,13 +9249,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="length-point"> <displayName>پوینت</displayName> - <unitPattern count="one">{0} <LRM>pt</unitPattern> - <unitPattern count="other">{0} <LRM>pt</unitPattern> + <unitPattern count="one">{0} pt</unitPattern> + <unitPattern count="other">{0} pt</unitPattern> </unit> <unit type="length-solar-radius"> <displayName>شعاع خورشید</displayName> - <unitPattern count="one">{0} <LRM>R☉</unitPattern> - <unitPattern count="other">{0} <LRM>R☉</unitPattern> + <unitPattern count="one">{0} R☉</unitPattern> + <unitPattern count="other">{0} R☉</unitPattern> </unit> <unit type="light-lux"> <displayName>لوکس</displayName> @@ -9279,14 +9279,14 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="mass-metric-ton"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>t</unitPattern> - <unitPattern count="other">{0} <LRM>t</unitPattern> + <unitPattern count="one">{0} t</unitPattern> + <unitPattern count="other">{0} t</unitPattern> </unit> <unit type="mass-kilogram"> <displayName>کیلوگرم</displayName> - <unitPattern count="one">{0} <LRM>kg</unitPattern> + <unitPattern count="one">{0} kg</unitPattern> <unitPattern count="other">{0} کیلوگرم</unitPattern> - <perUnitPattern>{0}<LRM>/kg</perUnitPattern> + <perUnitPattern>{0}/kg</perUnitPattern> </unit> <unit type="mass-gram"> <displayName>گرم</displayName> @@ -9296,13 +9296,13 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="mass-milligram"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>mg</unitPattern> - <unitPattern count="other">{0} <LRM>mg</unitPattern> + <unitPattern count="one">{0} mg</unitPattern> + <unitPattern count="other">{0} mg</unitPattern> </unit> <unit type="mass-microgram"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>µg</unitPattern> - <unitPattern count="other">{0} <LRM>µg</unitPattern> + <unitPattern count="one">{0} μg</unitPattern> + <unitPattern count="other">{0} μg</unitPattern> </unit> <unit type="mass-ton"> <displayName>تن</displayName> @@ -9418,8 +9418,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="pressure-pascal"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>Pa</unitPattern> - <unitPattern count="other">{0} <LRM>Pa</unitPattern> + <unitPattern count="one">{0} Pa</unitPattern> + <unitPattern count="other">{0} Pa</unitPattern> </unit> <unit type="pressure-hectopascal"> <displayName>هکتوپاسکال</displayName> @@ -9443,8 +9443,8 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="speed-meter-per-second"> <displayName>متر در ثانیه</displayName> - <unitPattern count="one">{0} <LRM>m/s</unitPattern> - <unitPattern count="other">{0} <LRM>m/s</unitPattern> + <unitPattern count="one">{0} m/s</unitPattern> + <unitPattern count="other">{0} m/s</unitPattern> </unit> <unit type="speed-mile-per-hour"> <displayName>مایل در ساعت</displayName> @@ -9493,9 +9493,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="volume-cubic-meter"> <displayName>متر مکعب</displayName> - <unitPattern count="one">{0} <LRM>m³</unitPattern> - <unitPattern count="other">{0} <LRM>m³</unitPattern> - <perUnitPattern>{0}<LRM>/m³</perUnitPattern> + <unitPattern count="one">{0} m³</unitPattern> + <unitPattern count="other">{0} m³</unitPattern> + <perUnitPattern>{0}/m³</perUnitPattern> </unit> <unit type="volume-cubic-centimeter"> <displayName>↑↑↑</displayName> @@ -9505,49 +9505,49 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </unit> <unit type="volume-cubic-mile"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>mi³</unitPattern> - <unitPattern count="other">{0} <LRM>mi³</unitPattern> + <unitPattern count="one">{0} mi³</unitPattern> + <unitPattern count="other">{0} mi³</unitPattern> </unit> <unit type="volume-cubic-yard"> <displayName>یارد مکعب</displayName> - <unitPattern count="one">{0} <LRM>yd³</unitPattern> - <unitPattern count="other">{0} <LRM>yd³</unitPattern> + <unitPattern count="one">{0} yd³</unitPattern> + <unitPattern count="other">{0} yd³</unitPattern> </unit> <unit type="volume-cubic-foot"> <displayName>فوت مکعب</displayName> - <unitPattern count="one">{0} <LRM>ft³</unitPattern> - <unitPattern count="other">{0} <LRM>ft³</unitPattern> + <unitPattern count="one">{0} ft³</unitPattern> + <unitPattern count="other">{0} ft³</unitPattern> </unit> <unit type="volume-cubic-inch"> <displayName>اینچ مکعب</displayName> - <unitPattern count="one">{0} <LRM>in³</unitPattern> - <unitPattern count="other">{0} <LRM>in³</unitPattern> + <unitPattern count="one">{0} in³</unitPattern> + <unitPattern count="other">{0} in³</unitPattern> </unit> <unit type="volume-megaliter"> <displayName>مگالیتر</displayName> - <unitPattern count="one">{0} <LRM>ML</unitPattern> - <unitPattern count="other">{0} <LRM>ML</unitPattern> + <unitPattern count="one">{0} ML</unitPattern> + <unitPattern count="other">{0} ML</unitPattern> </unit> <unit type="volume-hectoliter"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>hL</unitPattern> - <unitPattern count="other">{0} <LRM>hL</unitPattern> + <unitPattern count="one">{0} hL</unitPattern> + <unitPattern count="other">{0} hL</unitPattern> </unit> <unit type="volume-liter"> <displayName>لیتر</displayName> - <unitPattern count="one">{0} <LRM>L</unitPattern> - <unitPattern count="other">{0} <LRM>L</unitPattern> - <perUnitPattern>{0}<LRM>/L</perUnitPattern> + <unitPattern count="one">{0} L</unitPattern> + <unitPattern count="other">{0} L</unitPattern> + <perUnitPattern>{0}/L</perUnitPattern> </unit> <unit type="volume-deciliter"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>dL</unitPattern> - <unitPattern count="other">{0} <LRM>dL</unitPattern> + <unitPattern count="one">{0} dL</unitPattern> + <unitPattern count="other">{0} dL</unitPattern> </unit> <unit type="volume-centiliter"> <displayName>↑↑↑</displayName> - <unitPattern count="one">{0} <LRM>cL</unitPattern> - <unitPattern count="other">{0} <LRM>cL</unitPattern> + <unitPattern count="one">{0} cL</unitPattern> + <unitPattern count="other">{0} cL</unitPattern> </unit> <unit type="volume-milliliter"> <displayName>میلیلیتر</displayName> diff --git a/common/main/ka.xml b/common/main/ka.xml index dad99a31..f335e359 100644 --- a/common/main/ka.xml +++ b/common/main/ka.xml @@ -7886,9 +7886,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <unitPattern count="other">{0} ტბიტი</unitPattern> </unit> <unit type="digital-gigabyte"> - <displayName>გბაიტი</displayName> - <unitPattern count="one">{0} გბაიტი</unitPattern> - <unitPattern count="other">{0} გბაიტი</unitPattern> + <displayName>GB</displayName> + <unitPattern count="one">{0} GB</unitPattern> + <unitPattern count="other">{0} GB</unitPattern> </unit> <unit type="digital-gigabit"> <displayName>გბიტი</displayName> @@ -7896,9 +7896,9 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <unitPattern count="other">{0} გბიტი</unitPattern> </unit> <unit type="digital-megabyte"> - <displayName>მბაიტი</displayName> - <unitPattern count="one">{0} მბაიტი</unitPattern> - <unitPattern count="other">{0} მბაიტი</unitPattern> + <displayName>MB</displayName> + <unitPattern count="one">{0} MB</unitPattern> + <unitPattern count="other">{0} MB</unitPattern> </unit> <unit type="digital-megabit"> <displayName>მბიტი</displayName> diff --git a/common/main/ko.xml b/common/main/ko.xml index 029b83bf..ee5bb937 100644 --- a/common/main/ko.xml +++ b/common/main/ko.xml @@ -3423,7 +3423,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <era type="180">분쇼 (1466 ~ 1467)</era> <era type="181">오닌 (1467 ~ 1469)</era> <era type="182">분메이 (1469 ~ 1487)</era> - <era type="183">조쿄 (1487 ~ 1489)<</era> + <era type="183">조쿄 (1487 ~ 1489)</era> <era type="184">엔토쿠 (1489 ~ 1492)</era> <era type="185">메이오 (1492 ~ 1501)</era> <era type="186">분키 (1501 ~ 1504)</era> diff --git a/common/main/zh.xml b/common/main/zh.xml index 642c2720..74950552 100644 --- a/common/main/zh.xml +++ b/common/main/zh.xml @@ -3330,7 +3330,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ <dateTimeFormats> <dateTimeFormatLength type="full"> <dateTimeFormat> - <pattern>{1}{0}</pattern> + <pattern>{1} {0}</pattern> </dateTimeFormat> </dateTimeFormatLength> <dateTimeFormatLength type="long"> @@ -3340,7 +3340,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </dateTimeFormatLength> <dateTimeFormatLength type="medium"> <dateTimeFormat> - <pattern>{1}{0}</pattern> + <pattern>{1} {0}</pattern> </dateTimeFormat> </dateTimeFormatLength> <dateTimeFormatLength type="short"> @@ -7563,7 +7563,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </metazone> <metazone type="Indochina"> <long> - <standard>印度支那时间</standard> + <standard>中南半岛时间</standard> </long> </metazone> <metazone type="Indonesia_Central"> diff --git a/common/main/zh_Hant.xml b/common/main/zh_Hant.xml index 873ff4ee..8b96f83e 100644 --- a/common/main/zh_Hant.xml +++ b/common/main/zh_Hant.xml @@ -9656,7 +9656,7 @@ Warnings: All cp values have U+FE0F characters removed. See /annotationsDerived/ </metazone> <metazone type="Indochina"> <long> - <standard>印度支那時間</standard> + <standard>中南半島時間</standard> </long> </metazone> <metazone type="Indonesia_Central"> |