diff --git a/icu4c/source/data/unit/af.txt b/icu4c/source/data/unit/af.txt index 0e22f0fd6fd..4421509e70f 100755 --- a/icu4c/source/data/unit/af.txt +++ b/icu4c/source/data/unit/af.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/af.xml // * // *************************************************************************** af{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -106,6 +106,13 @@ af{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter per 100 kilometers"} @@ -535,13 +542,6 @@ af{ other{"{0} pond per vierkante duim"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer per uur"} @@ -1042,6 +1042,13 @@ af{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kar."} + other{"{0} kar."} + } + } consumption{ liter-per-100kilometers{ dnam{"ℓ/100km"} @@ -1471,13 +1478,6 @@ af{ other{"{0} pd.vk.dm."} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kar."} - other{"{0} kar."} - } - } speed{ kilometer-per-hour{ dnam{"km/uur"} diff --git a/icu4c/source/data/unit/agq.txt b/icu4c/source/data/unit/agq.txt index 6793b4abf01..ac82790714c 100755 --- a/icu4c/source/data/unit/agq.txt +++ b/icu4c/source/data/unit/agq.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/agq.xml // * // *************************************************************************** agq{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ak.txt b/icu4c/source/data/unit/ak.txt index f3da5f7c8e8..552c7081066 100755 --- a/icu4c/source/data/unit/ak.txt +++ b/icu4c/source/data/unit/ak.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ak.xml // * // *************************************************************************** ak{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/am.txt b/icu4c/source/data/unit/am.txt index cf8e62fc672..3a008db438d 100755 --- a/icu4c/source/data/unit/am.txt +++ b/icu4c/source/data/unit/am.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/am.xml // * // *************************************************************************** am{ - Version{"2.1.19.96"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ am{ compound{ per{"{0} በ{1}"} } + concentr{ + karat{ + dnam{"ካራት"} + one{"{0} ካራት"} + other{"{0} ካራት"} + } + } consumption{ liter-per-100kilometers{ dnam{"ሊትሮች በ100 ኪሎሜትሮች"} @@ -535,13 +542,6 @@ am{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ካራት"} - one{"{0} ካራት"} - other{"{0} ካራት"} - } - } speed{ kilometer-per-hour{ dnam{"ኪሎሜትር በሰዓት"} @@ -1047,6 +1047,13 @@ am{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ካራት"} + one{"{0} ካራት"} + other{"{0} ካራት"} + } + } consumption{ liter-per-100kilometers{ dnam{"ሊትር በ100 ኪሎሜትሮች"} @@ -1476,13 +1483,6 @@ am{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ካራት"} - one{"{0} ካራት"} - other{"{0} ካራት"} - } - } speed{ kilometer-per-hour{ dnam{"ኪሎሜትር በሰዓት"} diff --git a/icu4c/source/data/unit/as.txt b/icu4c/source/data/unit/as.txt index 8560e5af11f..fad0aae3ca7 100755 --- a/icu4c/source/data/unit/as.txt +++ b/icu4c/source/data/unit/as.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/as.xml // * // *************************************************************************** as{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/asa.txt b/icu4c/source/data/unit/asa.txt index a9f62ceae7a..d7366098495 100755 --- a/icu4c/source/data/unit/asa.txt +++ b/icu4c/source/data/unit/asa.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/asa.xml // * // *************************************************************************** asa{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ast.txt b/icu4c/source/data/unit/ast.txt new file mode 100755 index 00000000000..ddbee33cd8e --- /dev/null +++ b/icu4c/source/data/unit/ast.txt @@ -0,0 +1,2161 @@ +// *************************************************************************** +// * +// * Copyright (C) 2016 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter +// * Source File: /common/main/ast.xml +// * +// *************************************************************************** +ast{ + Version{"2.1.23.94"} + durationUnits{ + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} + } + units{ + acceleration{ + g-force{ + dnam{"fuercia g"} + one{"{0} fuercia g"} + other{"{0} fuercies gues"} + } + meter-per-second-squared{ + dnam{"metros per segundu al cuadráu"} + one{"{0} metru per segundu al cuadráu"} + other{"{0} metros por segundu al cuadráu"} + } + } + angle{ + arc-minute{ + dnam{"minutos d’arcu"} + one{"{0} minutu d'arcu"} + other{"{0} minutos d'arcu"} + } + arc-second{ + dnam{"segundos d’arcu"} + one{"{0} segundu d'arcu"} + other{"{0} segundos d'arcu"} + } + degree{ + dnam{"graos"} + one{"{0} grau"} + other{"{0} graos"} + } + radian{ + dnam{"radianes"} + one{"{0} radián"} + other{"{0} radianes"} + } + revolution{ + dnam{"revolución"} + one{"{0} revolución"} + other{"{0} revoluciones"} + } + } + area{ + acre{ + dnam{"acres"} + one{"{0} acre"} + other{"{0} acres"} + } + hectare{ + dnam{"hectárees"} + one{"{0} hectárea"} + other{"{0} hectárees"} + } + square-centimeter{ + dnam{"centímetros cuadraos"} + one{"{0} centímetru cuadráu"} + other{"{0} centímetros cuadraos"} + per{"{0} per centímetru cuadráu"} + } + square-foot{ + dnam{"pies cuadraos"} + one{"{0} pie cuadráu"} + other{"{0} pies cuadraos"} + } + square-inch{ + dnam{"pulgaes cuadraes"} + one{"{0} pulgada cuadrada"} + other{"{0} pulgaes cuadraes"} + per{"{0} per pulgada cuadrada"} + } + square-kilometer{ + dnam{"kilómetros cuadraos"} + one{"{0} kilómetru cuadráu"} + other{"{0} kilómetros cuadraos"} + } + square-meter{ + dnam{"metros cuadraos"} + one{"{0} metru cuadráu"} + other{"{0} metros cuadraos"} + per{"{0} per metru cuadráu"} + } + square-mile{ + dnam{"milles cuadraes"} + one{"{0} milla cuadrada"} + other{"{0} milles cuadraes"} + } + square-yard{ + dnam{"yardes cuadraes"} + one{"{0} yarda cuadrada"} + other{"{0} yardes cuadraes"} + } + } + compound{ + per{"{0} per {1}"} + } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} quilate"} + other{"{0} quilates"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"llitros per 100 quilómetros"} + one{"{0} llitru per 100 quilómetros"} + other{"{0} llitros per 100 quilómetros"} + } + liter-per-kilometer{ + dnam{"llitros per quilómetru"} + one{"{0} llitru per quilómetru"} + other{"{0} llitros per quilómetru"} + } + mile-per-gallon{ + dnam{"milles per galón"} + one{"{0} milla per galón"} + other{"{0} milles per galón"} + } + } + coordinate{ + east{"{0}E"} + north{"{0}N"} + south{"{0}S"} + west{"{0}O"} + } + digital{ + bit{ + dnam{"bits"} + one{"{0} bit"} + other{"{0} bits"} + } + byte{ + dnam{"bytes"} + one{"{0} byte"} + other{"{0} bytes"} + } + gigabit{ + dnam{"gigabits"} + one{"{0} gigabit"} + other{"{0} gigabits"} + } + gigabyte{ + dnam{"gigabytes"} + one{"{0} gigabyte"} + other{"{0} gigabytes"} + } + kilobit{ + dnam{"kilobits"} + one{"{0} kilobit"} + other{"{0} kilobits"} + } + kilobyte{ + dnam{"kilobytes"} + one{"{0} kilobyte"} + other{"{0} kilobytes"} + } + megabit{ + dnam{"megabits"} + one{"{0} megabit"} + other{"{0} megabits"} + } + megabyte{ + dnam{"megabytes"} + one{"{0} megabyte"} + other{"{0} megabytes"} + } + terabit{ + dnam{"terabits"} + one{"{0} terabit"} + other{"{0} terabits"} + } + terabyte{ + dnam{"terabytes"} + one{"{0} terabyte"} + other{"{0} terabytes"} + } + } + duration{ + century{ + dnam{"sieglos"} + one{"{0} sieglu"} + other{"{0} sieglos"} + } + day{ + dnam{"díes"} + one{"{0} día"} + other{"{0} díes"} + per{"{0} per día"} + } + hour{ + dnam{"hores"} + one{"{0} hora"} + other{"{0} hores"} + per{"{0} per hora"} + } + microsecond{ + dnam{"microsegundos"} + one{"{0} microsegundu"} + other{"{0} microsegundos"} + } + millisecond{ + dnam{"milisegundos"} + one{"{0} milisegundu"} + other{"{0} milisegundos"} + } + minute{ + dnam{"minutos"} + one{"{0} minutu"} + other{"{0} minutos"} + per{"{0} per minutu"} + } + month{ + dnam{"meses"} + one{"{0} mes"} + other{"{0} meses"} + per{"{0} per mes"} + } + nanosecond{ + dnam{"nanosegundos"} + one{"{0} nanosegundu"} + other{"{0} nanosegundos"} + } + second{ + dnam{"segundos"} + one{"{0} segundu"} + other{"{0} segundos"} + per{"{0} per segundu"} + } + week{ + dnam{"selmanes"} + one{"{0} selmana"} + other{"{0} selmanes"} + per{"{0} per selmana"} + } + year{ + dnam{"años"} + one{"{0} añu"} + other{"{0} años"} + per{"{0} per añu"} + } + } + electric{ + ampere{ + dnam{"amperios"} + one{"{0} amperiu"} + other{"{0} amperios"} + } + milliampere{ + dnam{"miliamperios"} + one{"{0} milliamperiu"} + other{"{0} milliamperios"} + } + ohm{ + dnam{"ohmnios"} + one{"{0} ohmiu"} + other{"{0} ohmios"} + } + volt{ + dnam{"voltios"} + one{"{0} voltiu"} + other{"{0} voltios"} + } + } + energy{ + calorie{ + dnam{"caloríes"} + one{"{0} caloría"} + other{"{0} caloríes"} + } + foodcalorie{ + dnam{"Caloríes"} + one{"{0} Caloría"} + other{"{0} Caloríes"} + } + joule{ + dnam{"xulios"} + one{"{0} xuliu"} + other{"{0} xulios"} + } + kilocalorie{ + dnam{"quilocaloríes"} + one{"{0} quilocaloría"} + other{"{0} quilocaloríes"} + } + kilojoule{ + dnam{"quiloxulios"} + one{"{0} quiloxuliu"} + other{"{0} quiloxulios"} + } + kilowatt-hour{ + dnam{"quilovatios hora"} + one{"{0} quilovatiu hora"} + other{"{0} quilovatios hora"} + } + } + frequency{ + gigahertz{ + dnam{"gigahercios"} + one{"{0} gigaherciu"} + other{"{0} gigahercios"} + } + hertz{ + dnam{"hercios"} + one{"{0} herciu"} + other{"{0} hercios"} + } + kilohertz{ + dnam{"quilohercios"} + one{"{0} quiloherciu"} + other{"{0} kilohercios"} + } + megahertz{ + dnam{"megahercios"} + one{"{0} megaherciu"} + other{"{0} megahercios"} + } + } + length{ + astronomical-unit{ + dnam{"unidaes astronómiques"} + one{"{0} unidá astronómica"} + other{"{0} unidaes astronómiques"} + } + centimeter{ + dnam{"centímetros"} + one{"{0} centímetru"} + other{"{0} centímetros"} + per{"{0} por centímetru"} + } + decimeter{ + dnam{"decímetros"} + one{"{0} decímetru"} + other{"{0} decímetros"} + } + fathom{ + dnam{"fathoms"} + one{"{0} fathom"} + other{"{0} fathoms"} + } + foot{ + dnam{"pies"} + one{"{0} pie"} + other{"{0} pies"} + per{"{0} per pie"} + } + furlong{ + dnam{"furlongs"} + one{"{0} furlong"} + other{"{0} furlongs"} + } + inch{ + dnam{"pulgaes"} + one{"{0} pulgada"} + other{"{0} pulgaes"} + per{"{0} per pulgada"} + } + kilometer{ + dnam{"quilómetros"} + one{"{0} quilómetru"} + other{"{0} quilómetros"} + per{"{0} per quilómetru"} + } + light-year{ + dnam{"años lluz"} + one{"{0} añu lluz"} + other{"{0} años lluz"} + } + meter{ + dnam{"metros"} + one{"{0} metru"} + other{"{0} metros"} + per{"{0} per metru"} + } + micrometer{ + dnam{"micrómetros"} + one{"{0} micrómetru"} + other{"{0} micrómetros"} + } + mile{ + dnam{"milles"} + one{"{0} milla"} + other{"{0} milles"} + } + mile-scandinavian{ + dnam{"milla escandinava"} + one{"{0} milla escandinava"} + other{"{0} milles escandinaves"} + } + millimeter{ + dnam{"milímetros"} + one{"{0} milímetru"} + other{"{0} milímetros"} + } + nanometer{ + dnam{"nanómetros"} + one{"{0} nanómetru"} + other{"{0} nanómetros"} + } + nautical-mile{ + dnam{"milles náutiques"} + one{"{0} milla náutica"} + other{"{0} milles náutiques"} + } + parsec{ + dnam{"parsecs"} + one{"{0} parsec"} + other{"{0} parsecs"} + } + picometer{ + dnam{"picómetros"} + one{"{0} picómetru"} + other{"{0} picómetros"} + } + yard{ + dnam{"yardes"} + one{"{0} yarda"} + other{"{0} yardes"} + } + } + light{ + lux{ + dnam{"lux"} + one{"{0} lux"} + other{"{0} lux"} + } + } + mass{ + carat{ + dnam{"quilates"} + one{"{0} quilate"} + other{"{0} quilates"} + } + gram{ + dnam{"gramos"} + one{"{0} gramu"} + other{"{0} gramos"} + per{"{0} per gramu"} + } + kilogram{ + dnam{"quilogramos"} + one{"{0} quilogramu"} + other{"{0} quilogramos"} + per{"{0} per quilogramu"} + } + metric-ton{ + dnam{"tonelaes métriques"} + one{"{0} tonelada métrica"} + other{"{0} tonelaes métriques"} + } + microgram{ + dnam{"microgramos"} + one{"{0} microgramu"} + other{"{0} microgramos"} + } + milligram{ + dnam{"miligramos"} + one{"{0} miligramu"} + other{"{0} miligramos"} + } + ounce{ + dnam{"onces"} + one{"{0} onza"} + other{"{0} onces"} + per{"{0} per onza"} + } + ounce-troy{ + dnam{"onces troy"} + one{"{0} onza troy"} + other{"{0} onces troy"} + } + pound{ + dnam{"llibres"} + one{"{0} llibra"} + other{"{0} llibres"} + per{"{0} per llibra"} + } + stone{ + dnam{"piedres"} + one{"{0} piedra"} + other{"{0} piedres"} + } + ton{ + dnam{"tonelaes"} + one{"{0} tonelada"} + other{"{0} tonelaes"} + } + } + power{ + gigawatt{ + dnam{"gigavatios"} + one{"{0} gigavatiu"} + other{"{0} gigavatios"} + } + horsepower{ + dnam{"caballos de fuerza"} + one{"{0} caballu de fuerza"} + other{"{0} caballos de fuerza"} + } + kilowatt{ + dnam{"quilovatios"} + one{"{0} quilovatiu"} + other{"{0} quilovatios"} + } + megawatt{ + dnam{"megavatios"} + one{"{0} megavatiu"} + other{"{0} megavatios"} + } + milliwatt{ + dnam{"millivatios"} + one{"{0} millivatiu"} + other{"{0} millivatios"} + } + watt{ + dnam{"vatios"} + one{"{0} vatiu"} + other{"{0} vatios"} + } + } + pressure{ + hectopascal{ + dnam{"hectopascales"} + one{"{0} hectopascal"} + other{"{0} hectopascales"} + } + inch-hg{ + dnam{"pulgaes de mercuriu"} + one{"{0} pulgada de mercuriu"} + other{"{0} pulgaes de mercuriu"} + } + millibar{ + dnam{"milibares"} + one{"{0} milibar"} + other{"{0} milibares"} + } + millimeter-of-mercury{ + dnam{"milímetros de mercuriu"} + one{"{0} milímetru de mercuriu"} + other{"{0} milímetros de mercuriu"} + } + pound-per-square-inch{ + dnam{"llibres per pulgada cuadrada"} + one{"{0} llibra per pulgada cuadrada"} + other{"{0} llibres per pulgada cuadrada"} + } + } + speed{ + kilometer-per-hour{ + dnam{"quilómetros per hora"} + one{"{0} quilómetru per hora"} + other{"{0} quilómetros per hora"} + } + knot{ + dnam{"nuedu"} + one{"{0} nuedu"} + other{"{0} nuedos"} + } + meter-per-second{ + dnam{"metros per segundu"} + one{"{0} metru per segundu"} + other{"{0} metros per segundu"} + } + mile-per-hour{ + dnam{"milles per hora"} + one{"{0} milla per hora"} + other{"{0} milles per hora"} + } + } + temperature{ + celsius{ + dnam{"graos Celsius"} + one{"{0} grau Celsius"} + other{"{0} graos Celsius"} + } + fahrenheit{ + dnam{"graos Fahrenheit"} + one{"{0} grau Fahrenheit"} + other{"{0} graos Fahrenheit"} + } + generic{ + dnam{"°"} + one{"{0}°"} + other{"{0}°"} + } + kelvin{ + dnam{"kelvins"} + one{"{0} kelvin"} + other{"{0} kelvins"} + } + } + volume{ + acre-foot{ + dnam{"acre-pies"} + one{"{0} acre-pie"} + other{"{0} acre-pies"} + } + bushel{ + dnam{"bushels"} + one{"{0} bushel"} + other{"{0} bushels"} + } + centiliter{ + dnam{"centillitros"} + one{"{0} centillitru"} + other{"{0} centillitros"} + } + cubic-centimeter{ + dnam{"centímetros cúbicos"} + one{"{0} centímetru cúbicu"} + other{"{0} centímetros cúbicos"} + per{"{0} per centímetru cúbicu"} + } + cubic-foot{ + dnam{"pies cúbicos"} + one{"{0} pie cúbicu"} + other{"{0} pies cúbicos"} + } + cubic-inch{ + dnam{"pulgaes cúbiques"} + one{"{0} pulgada cúbica"} + other{"{0} pulgaes cúbiques"} + } + cubic-kilometer{ + dnam{"quilómetros cúbicos"} + one{"{0} quilómetru cúbicu"} + other{"{0} quilómetros cúbicos"} + } + cubic-meter{ + dnam{"metros cúbicos"} + one{"{0} metru cúbicu"} + other{"{0} metros cúbicos"} + per{"{0} per metru cúbicu"} + } + cubic-mile{ + dnam{"milles cúbiques"} + one{"{0} milla cúbica"} + other{"{0} milles cúbiques"} + } + cubic-yard{ + dnam{"yardes cúbiques"} + one{"{0} yarda cúbica"} + other{"{0} yardes cúbiques"} + } + cup{ + dnam{"taces"} + one{"{0} taza"} + other{"{0} taces"} + } + cup-metric{ + dnam{"taces métriques"} + one{"{0} taza métrica"} + other{"{0} taces métriques"} + } + deciliter{ + dnam{"decillitros"} + one{"{0} decillitru"} + other{"{0} decillitros"} + } + fluid-ounce{ + dnam{"onces de fluidos"} + one{"{0} onza de fluidos"} + other{"{0} onces de fluidos"} + } + gallon{ + dnam{"galones"} + one{"{0} galón"} + other{"{0} galones"} + per{"{0} per galón"} + } + hectoliter{ + dnam{"hectollitros"} + one{"{0} hectollitru"} + other{"{0} hectollitros"} + } + liter{ + dnam{"llitros"} + one{"{0} llitru"} + other{"{0} llitros"} + per{"{0} per llitru"} + } + megaliter{ + dnam{"megallitros"} + one{"{0} megallitru"} + other{"{0} megallitros"} + } + milliliter{ + dnam{"milillitros"} + one{"{0} milillitru"} + other{"{0} milillitros"} + } + pint{ + dnam{"pintes"} + one{"{0} pinta"} + other{"{0} pintes"} + } + pint-metric{ + dnam{"pintes métriques"} + one{"{0} pinta métrica"} + other{"{0} pintes métriques"} + } + quart{ + dnam{"cuartos"} + one{"{0} cuartu"} + other{"{0} cuartos"} + } + tablespoon{ + dnam{"cuyares"} + one{"{0} cuyar"} + other{"{0} cuyares"} + } + teaspoon{ + dnam{"cuyarines"} + one{"{0} cuyarina"} + other{"{0} cuyarines"} + } + } + } + unitsNarrow{ + acceleration{ + g-force{ + dnam{"fuercia g"} + one{"{0}G"} + other{"{0}Gs"} + } + meter-per-second-squared{ + dnam{"m/s²"} + one{"{0}m/s²"} + other{"{0}m/s²"} + } + } + angle{ + arc-minute{ + dnam{"arcmin"} + one{"{0}′"} + other{"{0}′"} + } + arc-second{ + dnam{"arcsecs"} + one{"{0}″"} + other{"{0}″"} + } + degree{ + dnam{"graos"} + one{"{0}°"} + other{"{0}°"} + } + radian{ + dnam{"rad"} + one{"{0}rad"} + other{"{0}rad"} + } + revolution{ + dnam{"rev"} + one{"{0}rev"} + other{"{0}rev"} + } + } + area{ + acre{ + dnam{"acre"} + one{"{0}ac"} + other{"{0}ac"} + } + hectare{ + dnam{"hectárea"} + one{"{0}ha"} + other{"{0}ha"} + } + square-centimeter{ + dnam{"cm²"} + one{"{0}cm²"} + other{"{0}cm²"} + per{"{0}/cm²"} + } + square-foot{ + dnam{"ft²"} + one{"{0}ft²"} + other{"{0}ft²"} + } + square-inch{ + dnam{"in²"} + one{"{0}in²"} + other{"{0}in²"} + per{"{0}/in²"} + } + square-kilometer{ + dnam{"km²"} + one{"{0} km²"} + other{"{0} km²"} + } + square-meter{ + dnam{"m²"} + one{"{0} m²"} + other{"{0} m²"} + per{"{0} per m²"} + } + square-mile{ + dnam{"mi²"} + one{"{0}mi²"} + other{"{0}mi²"} + } + square-yard{ + dnam{"yd²"} + one{"{0}yd²"} + other{"{0}yd²"} + } + } + compound{ + per{"{0}/{1}"} + } + concentr{ + karat{ + dnam{"quilate"} + one{"{0}kt"} + other{"{0}kt"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"L/100km"} + one{"{0}L/100km"} + other{"{0}L/100km"} + } + liter-per-kilometer{ + dnam{"L/km"} + one{"{0}L/km"} + other{"{0}L/km"} + } + mile-per-gallon{ + dnam{"mpg"} + one{"{0}mpg"} + other{"{0}mpg"} + } + } + coordinate{ + east{"{0}E"} + north{"{0}N"} + south{"{0}S"} + west{"{0}O"} + } + digital{ + bit{ + dnam{"bit"} + one{"{0}bit"} + other{"{0}bits"} + } + byte{ + dnam{"byte"} + one{"{0}byte"} + other{"{0}byte"} + } + gigabit{ + dnam{"Gbit"} + one{"{0}Gb"} + other{"{0}Gb"} + } + gigabyte{ + dnam{"GByte"} + one{"{0}GB"} + other{"{0}GB"} + } + kilobit{ + dnam{"kbit"} + one{"{0}kb"} + other{"{0}kb"} + } + kilobyte{ + dnam{"kByte"} + one{"{0}kB"} + other{"{0}kB"} + } + megabit{ + dnam{"Mbit"} + one{"{0}Mb"} + other{"{0}Mb"} + } + megabyte{ + dnam{"MByte"} + one{"{0}MB"} + other{"{0}MB"} + } + terabit{ + dnam{"Tbit"} + one{"{0}Tb"} + other{"{0}Tb"} + } + terabyte{ + dnam{"TByte"} + one{"{0}TB"} + other{"{0}TB"} + } + } + duration{ + century{ + dnam{"sgl"} + one{"{0} sgl"} + other{"{0} sgls"} + } + day{ + dnam{"día"} + one{"{0}día"} + other{"{0}díes"} + per{"{0}/día"} + } + hour{ + dnam{"hora"} + one{"{0}hr"} + other{"{0}hrs"} + per{"{0}/hr"} + } + microsecond{ + dnam{"μseg"} + one{"{0}μs"} + other{"{0}μs"} + } + millisecond{ + dnam{"mseg"} + one{"{0}ms"} + other{"{0}ms"} + } + minute{ + dnam{"min"} + one{"{0}min"} + other{"{0}mins"} + per{"{0}/min"} + } + month{ + dnam{"mes"} + one{"{0}mes"} + other{"{0}meses"} + per{"{0}/mes"} + } + nanosecond{ + dnam{"ns"} + one{"{0}ns"} + other{"{0}ns"} + } + second{ + dnam{"seg"} + one{"{0}seg"} + other{"{0}segs"} + per{"{0}/seg"} + } + week{ + dnam{"sel"} + one{"{0}sel"} + other{"{0}sels"} + per{"{0}/sel"} + } + year{ + dnam{"añ"} + one{"{0}añ"} + other{"{0}añs"} + per{"{0}/añ"} + } + } + electric{ + ampere{ + dnam{"amp"} + one{"{0}A"} + other{"{0}A"} + } + milliampere{ + dnam{"mA"} + one{"{0}mA"} + other{"{0}mA"} + } + ohm{ + dnam{"ohmnios"} + one{"{0}Ω"} + other{"{0}Ω"} + } + volt{ + dnam{"voltios"} + one{"{0}V"} + other{"{0}V"} + } + } + energy{ + calorie{ + dnam{"cal"} + one{"{0}cal"} + other{"{0}cal"} + } + foodcalorie{ + dnam{"Cal"} + one{"{0}Cal"} + other{"{0}Cal"} + } + joule{ + dnam{"xulios"} + one{"{0}J"} + other{"{0}J"} + } + kilocalorie{ + dnam{"kcal"} + one{"{0}kcal"} + other{"{0}kcal"} + } + kilojoule{ + dnam{"kJ"} + one{"{0}kJ"} + other{"{0}kJ"} + } + kilowatt-hour{ + dnam{"kWh"} + one{"{0}kWh"} + other{"{0}kWh"} + } + } + frequency{ + gigahertz{ + dnam{"GHz"} + one{"{0}GHz"} + other{"{0}GHz"} + } + hertz{ + dnam{"Hz"} + one{"{0}Hz"} + other{"{0}Hz"} + } + kilohertz{ + dnam{"kHz"} + one{"{0}kHz"} + other{"{0}kHz"} + } + megahertz{ + dnam{"MHz"} + one{"{0}MHz"} + other{"{0}MHz"} + } + } + length{ + astronomical-unit{ + dnam{"ua"} + one{"{0}ua"} + other{"{0}ua"} + } + centimeter{ + dnam{"cm"} + one{"{0}cm"} + other{"{0}cm"} + per{"{0}/cm"} + } + decimeter{ + dnam{"dm"} + one{"{0}dm"} + other{"{0}dm"} + } + fathom{ + dnam{"fathom"} + one{"{0}fm"} + other{"{0}fm"} + } + foot{ + dnam{"ft"} + one{"{0}′"} + other{"{0}′"} + per{"{0}/ft"} + } + furlong{ + dnam{"furlongs"} + one{"{0}fur"} + other{"{0}fur"} + } + inch{ + dnam{"in"} + one{"{0}″"} + other{"{0}″"} + per{"{0}/in"} + } + kilometer{ + dnam{"km"} + one{"{0}km"} + other{"{0}km"} + per{"{0}/km"} + } + light-year{ + dnam{"añ. lluz"} + one{"{0}ly"} + other{"{0}ly"} + } + meter{ + dnam{"metru"} + one{"{0}m"} + other{"{0}m"} + per{"{0}/m"} + } + micrometer{ + dnam{"µm"} + one{"{0}µm"} + other{"{0}µm"} + } + mile{ + dnam{"mi"} + one{"{0}mi"} + other{"{0}mi"} + } + mile-scandinavian{ + dnam{"smi"} + one{"{0}smi"} + other{"{0}smi"} + } + millimeter{ + dnam{"mm"} + one{"{0}mm"} + other{"{0}mm"} + } + nanometer{ + dnam{"nm"} + one{"{0}nm"} + other{"{0}nm"} + } + nautical-mile{ + dnam{"nmi"} + one{"{0}nmi"} + other{"{0}nmi"} + } + parsec{ + dnam{"parsec"} + one{"{0}pc"} + other{"{0}pc"} + } + picometer{ + dnam{"pm"} + one{"{0}pm"} + other{"{0}pm"} + } + yard{ + dnam{"yd"} + one{"{0}yd"} + other{"{0}yd"} + } + } + light{ + lux{ + dnam{"lux"} + one{"{0}lx"} + other{"{0}lx"} + } + } + mass{ + carat{ + dnam{"quilates"} + one{"{0}CD"} + other{"{0}CD"} + } + gram{ + dnam{"gramos"} + one{"{0}g"} + other{"{0}g"} + per{"{0}/g"} + } + kilogram{ + dnam{"kg"} + one{"{0}kg"} + other{"{0}kg"} + per{"{0}/kg"} + } + metric-ton{ + dnam{"t"} + one{"{0}t"} + other{"{0}t"} + } + microgram{ + dnam{"µg"} + one{"{0}µg"} + other{"{0}µg"} + } + milligram{ + dnam{"mg"} + one{"{0}mg"} + other{"{0}mg"} + } + ounce{ + dnam{"oz"} + one{"{0}oz"} + other{"{0}oz"} + per{"{0}/oz"} + } + ounce-troy{ + dnam{"oz t"} + one{"{0}oz t"} + other{"{0}oz t"} + } + pound{ + dnam{"lb"} + one{"{0}#"} + other{"{0}#"} + per{"{0}/lb"} + } + stone{ + dnam{"piedres"} + one{"{0}st"} + other{"{0}st"} + } + ton{ + dnam{"ton"} + one{"{0}tn"} + other{"{0}tn"} + } + } + power{ + gigawatt{ + dnam{"GW"} + one{"{0}GW"} + other{"{0}GW"} + } + horsepower{ + dnam{"hp"} + one{"{0}hp"} + other{"{0}hp"} + } + kilowatt{ + dnam{"kW"} + one{"{0}kW"} + other{"{0}kW"} + } + megawatt{ + dnam{"MW"} + one{"{0}MW"} + other{"{0}MW"} + } + milliwatt{ + dnam{"mW"} + one{"{0}mW"} + other{"{0}mW"} + } + watt{ + dnam{"vatios"} + one{"{0}W"} + other{"{0}W"} + } + } + pressure{ + hectopascal{ + dnam{"hPa"} + one{"{0}hPa"} + other{"{0}hPa"} + } + inch-hg{ + dnam{"″ Hg"} + one{"{0}″ Hg"} + other{"{0}″ Hg"} + } + millibar{ + dnam{"mbar"} + one{"{0}mb"} + other{"{0}mb"} + } + millimeter-of-mercury{ + dnam{"mm Hg"} + one{"{0}mm Hg"} + other{"{0}mm Hg"} + } + pound-per-square-inch{ + dnam{"psi"} + one{"{0}psi"} + other{"{0}psi"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/h"} + one{"{0}km/h"} + other{"{0}km/h"} + } + knot{ + dnam{"kn"} + one{"{0}kn"} + other{"{0}kn"} + } + meter-per-second{ + dnam{"m/s"} + one{"{0}m/s"} + other{"{0}m/s"} + } + mile-per-hour{ + dnam{"mi/h"} + one{"{0}mph"} + other{"{0}mph"} + } + } + temperature{ + celsius{ + dnam{"°C"} + one{"{0}°C"} + other{"{0}°C"} + } + fahrenheit{ + dnam{"°F"} + one{"{0}°F"} + other{"{0}°F"} + } + generic{ + dnam{"°"} + one{"{0}°"} + other{"{0}°"} + } + kelvin{ + dnam{"K"} + one{"{0}K"} + other{"{0}K"} + } + } + volume{ + acre-foot{ + dnam{"acre ft"} + one{"{0}ac ft"} + other{"{0}ac ft"} + } + bushel{ + dnam{"bushel"} + one{"{0}bu"} + other{"{0}bu"} + } + centiliter{ + dnam{"cL"} + one{"{0}cL"} + other{"{0}cL"} + } + cubic-centimeter{ + dnam{"cm³"} + one{"{0}cm³"} + other{"{0}cm³"} + per{"{0}/cm³"} + } + cubic-foot{ + dnam{"ft³"} + one{"{0}ft³"} + other{"{0}ft³"} + } + cubic-inch{ + dnam{"in³"} + one{"{0}in³"} + other{"{0}in³"} + } + cubic-kilometer{ + dnam{"km³"} + one{"{0}km³"} + other{"{0}km³"} + } + cubic-meter{ + dnam{"m³"} + one{"{0}m³"} + other{"{0}m³"} + per{"{0}/m³"} + } + cubic-mile{ + dnam{"mi³"} + one{"{0}mi³"} + other{"{0}mi³"} + } + cubic-yard{ + dnam{"yd³"} + one{"{0}yd³"} + other{"{0}yd³"} + } + cup{ + dnam{"taces"} + one{"{0}tz"} + other{"{0}tz"} + } + cup-metric{ + dnam{"taces mét."} + one{"{0}mc"} + other{"{0}mc"} + } + deciliter{ + dnam{"dL"} + one{"{0}dL"} + other{"{0}dL"} + } + fluid-ounce{ + dnam{"fl oz"} + one{"{0}fl oz"} + other{"{0}fl oz"} + } + gallon{ + dnam{"gal"} + one{"{0}gal"} + other{"{0}gal"} + per{"{0}/gal"} + } + hectoliter{ + dnam{"hL"} + one{"{0}hL"} + other{"{0}hL"} + } + liter{ + dnam{"llitru"} + one{"{0}l"} + other{"{0}l"} + per{"{0}/l"} + } + megaliter{ + dnam{"ML"} + one{"{0}ML"} + other{"{0}ML"} + } + milliliter{ + dnam{"mL"} + one{"{0}mL"} + other{"{0}mL"} + } + pint{ + dnam{"pt"} + one{"{0}pt"} + other{"{0}pt"} + } + pint-metric{ + dnam{"mpt"} + one{"{0}mpt"} + other{"{0}mpt"} + } + quart{ + dnam{"qt"} + one{"{0}qt"} + other{"{0}qt"} + } + tablespoon{ + dnam{"tbsp"} + one{"{0}tbsp"} + other{"{0}tbsp"} + } + teaspoon{ + dnam{"tsp"} + one{"{0}tsp"} + other{"{0}tsp"} + } + } + } + unitsShort{ + acceleration{ + g-force{ + dnam{"fuercia g"} + one{"{0} G"} + other{"{0} Gs"} + } + meter-per-second-squared{ + dnam{"m/s²"} + one{"{0} m/s²"} + other{"{0} m/s²"} + } + } + angle{ + arc-minute{ + dnam{"arcmins"} + one{"{0} arcmin"} + other{"{0} arcmins"} + } + arc-second{ + dnam{"arcsecs"} + one{"{0}″"} + other{"{0}″"} + } + degree{ + dnam{"graos"} + one{"{0}°"} + other{"{0}°"} + } + radian{ + dnam{"radianes"} + one{"{0} rad"} + other{"{0} rad"} + } + revolution{ + dnam{"rev"} + one{"{0} rev"} + other{"{0} rev"} + } + } + area{ + acre{ + dnam{"acre"} + one{"{0} ac"} + other{"{0} ac"} + } + hectare{ + dnam{"hectárees"} + one{"{0} ha"} + other{"{0} ha"} + } + square-centimeter{ + dnam{"cm²"} + one{"{0} cm²"} + other{"{0} cm²"} + per{"{0}/cm²"} + } + square-foot{ + dnam{"ft²"} + one{"{0} ft²"} + other{"{0} ft²"} + } + square-inch{ + dnam{"in²"} + one{"{0} in²"} + other{"{0} in²"} + per{"{0}/in²"} + } + square-kilometer{ + dnam{"km²"} + one{"{0} km²"} + other{"{0} km²"} + } + square-meter{ + dnam{"m²"} + one{"{0} m²"} + other{"{0} m²"} + per{"{0}/m²"} + } + square-mile{ + dnam{"mi²"} + one{"{0} mi²"} + other{"{0} mi²"} + } + square-yard{ + dnam{"yd²"} + one{"{0} yd²"} + other{"{0} yd²"} + } + } + compound{ + per{"{0}/{1}"} + } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} kt"} + other{"{0} kt"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"L/100km"} + one{"{0} L/100km"} + other{"{0} L/100km"} + } + liter-per-kilometer{ + dnam{"llitros/km"} + one{"{0} L/km"} + other{"{0} L/km"} + } + mile-per-gallon{ + dnam{"milles/gal"} + one{"{0} mpg"} + other{"{0} mpg"} + } + } + coordinate{ + east{"{0}E"} + north{"{0}N"} + south{"{0}S"} + west{"{0}O"} + } + digital{ + bit{ + dnam{"bit"} + one{"{0} bit"} + other{"{0} bit"} + } + byte{ + dnam{"byte"} + one{"{0} byte"} + other{"{0} byte"} + } + gigabit{ + dnam{"Gbit"} + one{"{0} Gb"} + other{"{0} Gb"} + } + gigabyte{ + dnam{"GByte"} + one{"{0} GB"} + other{"{0} GB"} + } + kilobit{ + dnam{"kbit"} + one{"{0} kb"} + other{"{0} kb"} + } + kilobyte{ + dnam{"kByte"} + one{"{0} kB"} + other{"{0} kB"} + } + megabit{ + dnam{"Mbit"} + one{"{0} Mb"} + other{"{0} Mb"} + } + megabyte{ + dnam{"MByte"} + one{"{0} MB"} + other{"{0} MB"} + } + terabit{ + dnam{"Tbit"} + one{"{0} Tb"} + other{"{0} Tb"} + } + terabyte{ + dnam{"TByte"} + one{"{0} TB"} + other{"{0} TB"} + } + } + duration{ + century{ + dnam{"sgl"} + one{"{0} sgl"} + other{"{0} sgls"} + } + day{ + dnam{"díes"} + one{"{0} día"} + other{"{0} díes"} + per{"{0}/día"} + } + hour{ + dnam{"hores"} + one{"{0} hr"} + other{"{0} hrs"} + per{"{0}/hr"} + } + microsecond{ + dnam{"μsegs"} + one{"{0} μs"} + other{"{0} μs"} + } + millisecond{ + dnam{"milisegs"} + one{"{0} ms"} + other{"{0} ms"} + } + minute{ + dnam{"mins"} + one{"{0} min"} + other{"{0} mins"} + per{"{0}/min"} + } + month{ + dnam{"meses"} + one{"{0} mes"} + other{"{0} meses"} + per{"{0}/mes"} + } + nanosecond{ + dnam{"nanosegs"} + one{"{0} ns"} + other{"{0} ns"} + } + second{ + dnam{"segs"} + one{"{0} seg"} + other{"{0} segs"} + per{"{0}/seg"} + } + week{ + dnam{"selmanes"} + one{"{0} sel"} + other{"{0} sels"} + per{"{0}/sel"} + } + year{ + dnam{"años"} + one{"{0} añ"} + other{"{0} añs"} + per{"{0}/añ"} + } + } + electric{ + ampere{ + dnam{"amps"} + one{"{0} A"} + other{"{0} A"} + } + milliampere{ + dnam{"miliamps"} + one{"{0} mA"} + other{"{0} mA"} + } + ohm{ + dnam{"ohmnios"} + one{"{0} Ω"} + other{"{0} Ω"} + } + volt{ + dnam{"voltios"} + one{"{0} V"} + other{"{0} V"} + } + } + energy{ + calorie{ + dnam{"cal"} + one{"{0} cal"} + other{"{0} cal"} + } + foodcalorie{ + dnam{"Cal"} + one{"{0} Cal"} + other{"{0} Cal"} + } + joule{ + dnam{"xulios"} + one{"{0} J"} + other{"{0} J"} + } + kilocalorie{ + dnam{"kcal"} + one{"{0} kcal"} + other{"{0} kcal"} + } + kilojoule{ + dnam{"quiloxuliu"} + one{"{0} kJ"} + other{"{0} kJ"} + } + kilowatt-hour{ + dnam{"kW-hora"} + one{"{0} kWh"} + other{"{0} kWh"} + } + } + frequency{ + gigahertz{ + dnam{"GHz"} + one{"{0} GHz"} + other{"{0} GHz"} + } + hertz{ + dnam{"Hz"} + one{"{0} Hz"} + other{"{0} Hz"} + } + kilohertz{ + dnam{"kHz"} + one{"{0} kHz"} + other{"{0} kHz"} + } + megahertz{ + dnam{"MHz"} + one{"{0} MHz"} + other{"{0} MHz"} + } + } + length{ + astronomical-unit{ + dnam{"ua"} + one{"{0} ua"} + other{"{0} ua"} + } + centimeter{ + dnam{"cm"} + one{"{0} cm"} + other{"{0} cm"} + per{"{0}/cm"} + } + decimeter{ + dnam{"dm"} + one{"{0} dm"} + other{"{0} dm"} + } + fathom{ + dnam{"fathoms"} + one{"{0} ftm"} + other{"{0} ftm"} + } + foot{ + dnam{"pies"} + one{"{0} ft"} + other{"{0} ft"} + per{"{0}/ft"} + } + furlong{ + dnam{"furlongs"} + one{"{0} fur"} + other{"{0} fur"} + } + inch{ + dnam{"pulgaes"} + one{"{0} in"} + other{"{0} in"} + per{"{0}/in"} + } + kilometer{ + dnam{"km"} + one{"{0} km"} + other{"{0} km"} + per{"{0}/km"} + } + light-year{ + dnam{"añ. lluz"} + one{"{0} ly"} + other{"{0} ly"} + } + meter{ + dnam{"metros"} + one{"{0} m"} + other{"{0} m"} + per{"{0}/m"} + } + micrometer{ + dnam{"µmetros"} + one{"{0} µm"} + other{"{0} µm"} + } + mile{ + dnam{"milles"} + one{"{0} mi"} + other{"{0} mi"} + } + mile-scandinavian{ + dnam{"smi"} + one{"{0} smi"} + other{"{0} smi"} + } + millimeter{ + dnam{"mm"} + one{"{0} mm"} + other{"{0} mm"} + } + nanometer{ + dnam{"nm"} + one{"{0} nm"} + other{"{0} nm"} + } + nautical-mile{ + dnam{"nmi"} + one{"{0} nmi"} + other{"{0} nmi"} + } + parsec{ + dnam{"pc"} + one{"{0} pc"} + other{"{0} pc"} + } + picometer{ + dnam{"pm"} + one{"{0} pm"} + other{"{0} pm"} + } + yard{ + dnam{"yd"} + one{"{0} yd"} + other{"{0} yd"} + } + } + light{ + lux{ + dnam{"lux"} + one{"{0} lx"} + other{"{0} lx"} + } + } + mass{ + carat{ + dnam{"quilates"} + one{"{0} CD"} + other{"{0} CD"} + } + gram{ + dnam{"gramos"} + one{"{0} g"} + other{"{0} g"} + per{"{0}/g"} + } + kilogram{ + dnam{"kg"} + one{"{0} kg"} + other{"{0} kg"} + per{"{0}/kg"} + } + metric-ton{ + dnam{"t"} + one{"{0} t"} + other{"{0} t"} + } + microgram{ + dnam{"µg"} + one{"{0} µg"} + other{"{0} µg"} + } + milligram{ + dnam{"mg"} + one{"{0} mg"} + other{"{0} mg"} + } + ounce{ + dnam{"oz"} + one{"{0} oz"} + other{"{0} oz"} + per{"{0}/oz"} + } + ounce-troy{ + dnam{"oz troy"} + one{"{0} oz t"} + other{"{0} oz t"} + } + pound{ + dnam{"llibres"} + one{"{0} lb"} + other{"{0} lbs"} + per{"{0}/lb"} + } + stone{ + dnam{"piedres"} + one{"{0} st"} + other{"{0} st"} + } + ton{ + dnam{"tonelaes"} + one{"{0} tn"} + other{"{0} tn"} + } + } + power{ + gigawatt{ + dnam{"GW"} + one{"{0} GW"} + other{"{0} GW"} + } + horsepower{ + dnam{"hp"} + one{"{0} hp"} + other{"{0} hp"} + } + kilowatt{ + dnam{"kW"} + one{"{0} kW"} + other{"{0} kW"} + } + megawatt{ + dnam{"MW"} + one{"{0} MW"} + other{"{0} MW"} + } + milliwatt{ + dnam{"mW"} + one{"{0} mW"} + other{"{0} mW"} + } + watt{ + dnam{"vatios"} + one{"{0} W"} + other{"{0} W"} + } + } + pressure{ + hectopascal{ + dnam{"hPa"} + one{"{0} hPa"} + other{"{0} hPa"} + } + inch-hg{ + dnam{"in Hg"} + one{"{0} inHg"} + other{"{0} inHg"} + } + millibar{ + dnam{"mbar"} + one{"{0} mbar"} + other{"{0} mbar"} + } + millimeter-of-mercury{ + dnam{"mm Hg"} + one{"{0} mm Hg"} + other{"{0} mm Hg"} + } + pound-per-square-inch{ + dnam{"psi"} + one{"{0} psi"} + other{"{0} psi"} + } + } + speed{ + kilometer-per-hour{ + dnam{"km/h"} + one{"{0} km/h"} + other{"{0} km/h"} + } + knot{ + dnam{"kn"} + one{"{0} kn"} + other{"{0} kn"} + } + meter-per-second{ + dnam{"metros/seg"} + one{"{0} m/s"} + other{"{0} m/s"} + } + mile-per-hour{ + dnam{"milles/hora"} + one{"{0} mi/h"} + other{"{0} mi/h"} + } + } + temperature{ + celsius{ + dnam{"°C"} + one{"{0}°C"} + other{"{0}°C"} + } + fahrenheit{ + dnam{"°F"} + one{"{0}°F"} + other{"{0}°F"} + } + generic{ + dnam{"°"} + one{"{0}°"} + other{"{0}°"} + } + kelvin{ + dnam{"K"} + one{"{0} K"} + other{"{0} K"} + } + } + volume{ + acre-foot{ + dnam{"ac ft"} + one{"{0} ac ft"} + other{"{0} ac ft"} + } + bushel{ + dnam{"bushels"} + one{"{0} bu"} + other{"{0} bu"} + } + centiliter{ + dnam{"cL"} + one{"{0} cL"} + other{"{0} cL"} + } + cubic-centimeter{ + dnam{"cm³"} + one{"{0} cm³"} + other{"{0} cm³"} + per{"{0}/cm³"} + } + cubic-foot{ + dnam{"ft³"} + one{"{0} ft³"} + other{"{0} ft³"} + } + cubic-inch{ + dnam{"pulgaes³"} + one{"{0} in³"} + other{"{0} in³"} + } + cubic-kilometer{ + dnam{"km³"} + one{"{0} km³"} + other{"{0} km³"} + } + cubic-meter{ + dnam{"m³"} + one{"{0} m³"} + other{"{0} m³"} + per{"{0}/m³"} + } + cubic-mile{ + dnam{"mi³"} + one{"{0} mi³"} + other{"{0} mi³"} + } + cubic-yard{ + dnam{"yd³"} + one{"{0} yd³"} + other{"{0} yd³"} + } + cup{ + dnam{"taces"} + one{"{0} tz"} + other{"{0} tz"} + } + cup-metric{ + dnam{"taces mét."} + one{"{0} mc"} + other{"{0} mc"} + } + deciliter{ + dnam{"dL"} + one{"{0} dL"} + other{"{0} dL"} + } + fluid-ounce{ + dnam{"fl oz"} + one{"{0} fl oz"} + other{"{0} fl oz"} + } + gallon{ + dnam{"gal"} + one{"{0} gal"} + other{"{0} gal"} + per{"{0}/gal"} + } + hectoliter{ + dnam{"hectollitros"} + one{"{0} hL"} + other{"{0} hL"} + } + liter{ + dnam{"llitros"} + one{"{0} l"} + other{"{0} l"} + per{"{0}/l"} + } + megaliter{ + dnam{"ML"} + one{"{0} ML"} + other{"{0} ML"} + } + milliliter{ + dnam{"mL"} + one{"{0} mL"} + other{"{0} mL"} + } + pint{ + dnam{"pintes"} + one{"{0} pt"} + other{"{0} pt"} + } + pint-metric{ + dnam{"mpt"} + one{"{0} mpt"} + other{"{0} mpt"} + } + quart{ + dnam{"cuartos"} + one{"{0} qt"} + other{"{0} qt"} + } + tablespoon{ + dnam{"cuyar"} + one{"{0} cuyar"} + other{"{0} cuyar"} + } + teaspoon{ + dnam{"cuyrn"} + one{"{0} cuyrn"} + other{"{0} cuyrn"} + } + } + } +} diff --git a/icu4c/source/data/unit/az.txt b/icu4c/source/data/unit/az.txt index 80cef4b4e08..e1b74127055 100755 --- a/icu4c/source/data/unit/az.txt +++ b/icu4c/source/data/unit/az.txt @@ -1,17 +1,17 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/az.xml // * // *************************************************************************** az{ - Version{"2.1.19.83"} + Version{"2.1.23.7"} durationUnits{ - hm{"st:dqdq"} - hms{"st:dqdq:snsn"} - ms{"dq:snsn"} + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} } units{ acceleration{ @@ -106,6 +106,13 @@ az{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -540,13 +547,6 @@ az{ other{"{0} funt/kvadrat düym"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometr/saat"} @@ -1050,6 +1050,13 @@ az{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1484,13 +1491,6 @@ az{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"kilometr/saat"} diff --git a/icu4c/source/data/unit/az_AZ.txt b/icu4c/source/data/unit/az_AZ.txt index 81e930aafd7..6aa038468b8 100755 --- a/icu4c/source/data/unit/az_AZ.txt +++ b/icu4c/source/data/unit/az_AZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/az_Cyrl.txt b/icu4c/source/data/unit/az_Cyrl.txt index 337ac252c32..68d79a5e556 100755 --- a/icu4c/source/data/unit/az_Cyrl.txt +++ b/icu4c/source/data/unit/az_Cyrl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/az_Cyrl.xml diff --git a/icu4c/source/data/unit/az_Latn.txt b/icu4c/source/data/unit/az_Latn.txt index d056ac20583..e49243f2629 100755 --- a/icu4c/source/data/unit/az_Latn.txt +++ b/icu4c/source/data/unit/az_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/az_Latn.xml diff --git a/icu4c/source/data/unit/az_Latn_AZ.txt b/icu4c/source/data/unit/az_Latn_AZ.txt index 8b8e5af6c6f..3abc5ac2290 100755 --- a/icu4c/source/data/unit/az_Latn_AZ.txt +++ b/icu4c/source/data/unit/az_Latn_AZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/bas.txt b/icu4c/source/data/unit/bas.txt index 4dbb517c4bb..38296a1d56d 100755 --- a/icu4c/source/data/unit/bas.txt +++ b/icu4c/source/data/unit/bas.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bas.xml // * // *************************************************************************** bas{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/be.txt b/icu4c/source/data/unit/be.txt index 3e85f491d37..17816325a29 100755 --- a/icu4c/source/data/unit/be.txt +++ b/icu4c/source/data/unit/be.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/be.xml // * // *************************************************************************** be{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"hh.mm"} hms{"hh.mm.ss"} @@ -138,6 +138,15 @@ be{ compound{ per{"{0} у {1}"} } + concentr{ + karat{ + dnam{"караты золата"} + few{"{0} караты золата"} + many{"{0} карат золата"} + one{"{0} карат золата"} + other{"{0} карата золата"} + } + } consumption{ liter-per-100kilometers{ dnam{"літры на 100 кіламетраў"} @@ -721,15 +730,6 @@ be{ other{"{0} фунта на квадратную цалю"} } } - proportion{ - karat{ - dnam{"караты золата"} - few{"{0} караты золата"} - many{"{0} карат золата"} - one{"{0} карат золата"} - other{"{0} карата золата"} - } - } speed{ kilometer-per-hour{ dnam{"кіламетраў у гадзіну"} @@ -1234,6 +1234,15 @@ be{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"кар золата"} + few{"{0} кар зол"} + many{"{0} кар зол"} + one{"{0} кар зол"} + other{"{0} кар зол"} + } + } consumption{ liter-per-100kilometers{ dnam{"л/100 км"} @@ -1817,15 +1826,6 @@ be{ other{"{0} фунта на кв. цалю"} } } - proportion{ - karat{ - dnam{"кар золата"} - few{"{0} кар зол"} - many{"{0} кар зол"} - one{"{0} кар зол"} - other{"{0} кар зол"} - } - } speed{ kilometer-per-hour{ dnam{"км/г"} diff --git a/icu4c/source/data/unit/bem.txt b/icu4c/source/data/unit/bem.txt index e1140a41b76..cc41700b73b 100755 --- a/icu4c/source/data/unit/bem.txt +++ b/icu4c/source/data/unit/bem.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bem.xml // * // *************************************************************************** bem{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/bez.txt b/icu4c/source/data/unit/bez.txt index 0e2ffe13f74..ed1ad096ab9 100755 --- a/icu4c/source/data/unit/bez.txt +++ b/icu4c/source/data/unit/bez.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bez.xml // * // *************************************************************************** bez{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/bg.txt b/icu4c/source/data/unit/bg.txt index e6cc4fb00c0..d87d0b3e807 100755 --- a/icu4c/source/data/unit/bg.txt +++ b/icu4c/source/data/unit/bg.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bg.xml // * // *************************************************************************** bg{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ bg{ compound{ per{"{0} в {1}"} } + concentr{ + karat{ + dnam{"карати"} + one{"{0} карат"} + other{"{0} карата"} + } + } consumption{ liter-per-100kilometers{ dnam{"литри на 100 километра"} @@ -533,13 +540,6 @@ bg{ other{"{0} фунта на квадратен инч"} } } - proportion{ - karat{ - dnam{"карати"} - one{"{0} карат"} - other{"{0} карата"} - } - } speed{ kilometer-per-hour{ dnam{"километри в час"} @@ -1040,6 +1040,13 @@ bg{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"К"} + one{"{0} карат"} + other{"{0} карата"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1469,13 +1476,6 @@ bg{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"К"} - one{"{0} карат"} - other{"{0} карата"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/bm.txt b/icu4c/source/data/unit/bm.txt index 0f624e57482..b9f3e3868ab 100755 --- a/icu4c/source/data/unit/bm.txt +++ b/icu4c/source/data/unit/bm.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bm.xml // * // *************************************************************************** bm{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/bn.txt b/icu4c/source/data/unit/bn.txt index 96fc2433e38..5400f61542e 100755 --- a/icu4c/source/data/unit/bn.txt +++ b/icu4c/source/data/unit/bn.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bn.xml // * // *************************************************************************** bn{ - Version{"2.1.19.17"} + Version{"2.1.23.6"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ bn{ compound{ per{"{1} প্রতি {0}"} } + concentr{ + karat{ + dnam{"ক্যারেট"} + one{"{0} ক্যারেট"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"লিটার, প্রতি 100 কিলোমিটারে"} @@ -532,13 +539,6 @@ bn{ other{"{0} বর্গইঞ্চি প্রতি পাউন্ড"} } } - proportion{ - karat{ - dnam{"ক্যারেট"} - one{"{0} ক্যারেট"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"ঘন্টা প্রতি কিলোমিটার"} @@ -1036,6 +1036,13 @@ bn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1461,13 +1468,6 @@ bn{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"ঘন্টা প্রতি কিলোমিটার"} diff --git a/icu4c/source/data/unit/bo.txt b/icu4c/source/data/unit/bo.txt index e2ec62c3cef..0f9eb925302 100755 --- a/icu4c/source/data/unit/bo.txt +++ b/icu4c/source/data/unit/bo.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bo.xml // * // *************************************************************************** bo{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/br.txt b/icu4c/source/data/unit/br.txt index 4519337c3b9..6481ba982cd 100755 --- a/icu4c/source/data/unit/br.txt +++ b/icu4c/source/data/unit/br.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/br.xml // * // *************************************************************************** br{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -114,6 +114,16 @@ br{ compound{ per{"{0} dre {1}"} } + concentr{ + karat{ + dnam{"karatoù"} + few{"{0} c'harat"} + many{"{0} a garatoù"} + one{"{0} c'harat"} + other{"{0} karat"} + two{"{0} garat"} + } + } consumption{ liter-per-100kilometers{ dnam{"litroù dre 100 kilometr"} @@ -726,16 +736,6 @@ br{ two{"{0} lur dre veutad karrez"} } } - proportion{ - karat{ - dnam{"karatoù"} - few{"{0} c'harat"} - many{"{0} a garatoù"} - one{"{0} c'harat"} - other{"{0} karat"} - two{"{0} garat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometroù dre eur"} @@ -1048,6 +1048,16 @@ br{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1452,16 +1462,6 @@ br{ two{"{0} lb/in²"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1760,6 +1760,16 @@ br{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -2389,16 +2399,6 @@ br{ two{"{0} lb/in²"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/brx.txt b/icu4c/source/data/unit/brx.txt index 091697a0555..a74c222c1e8 100755 --- a/icu4c/source/data/unit/brx.txt +++ b/icu4c/source/data/unit/brx.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/brx.xml // * // *************************************************************************** brx{ - Version{"2.1.19.74"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/bs.txt b/icu4c/source/data/unit/bs.txt index 4670482a5ba..c06e1cd5037 100755 --- a/icu4c/source/data/unit/bs.txt +++ b/icu4c/source/data/unit/bs.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bs.xml // * // *************************************************************************** bs{ - Version{"2.1.19.77"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -119,6 +119,14 @@ bs{ other{"{0} kvadratnih jarda"} } } + concentr{ + karat{ + dnam{"karati"} + few{"{0} karata"} + one{"{0} karat"} + other{"{0} karata"} + } + } consumption{ liter-per-100kilometers{ dnam{"litara na 100 kilometara"} @@ -622,14 +630,6 @@ bs{ other{"{0} funti po kvadratnom inču"} } } - proportion{ - karat{ - dnam{"karati"} - few{"{0} karata"} - one{"{0} karat"} - other{"{0} karata"} - } - } speed{ kilometer-per-hour{ dnam{"kilometara na sat"} @@ -1063,6 +1063,14 @@ bs{ other{"{0} yd²"} } } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1569,14 +1577,6 @@ bs{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/bs_BA.txt b/icu4c/source/data/unit/bs_BA.txt index db3b36ad1a9..c99b0e388f4 100755 --- a/icu4c/source/data/unit/bs_BA.txt +++ b/icu4c/source/data/unit/bs_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/bs_Cyrl.txt b/icu4c/source/data/unit/bs_Cyrl.txt index ef1d7a5a00c..d25c8f09a44 100755 --- a/icu4c/source/data/unit/bs_Cyrl.txt +++ b/icu4c/source/data/unit/bs_Cyrl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bs_Cyrl.xml @@ -8,7 +8,7 @@ // *************************************************************************** bs_Cyrl{ %%Parent{"root"} - Version{"2.1.19.90"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/bs_Latn.txt b/icu4c/source/data/unit/bs_Latn.txt index e0664cf56c0..3e9efec2e3d 100755 --- a/icu4c/source/data/unit/bs_Latn.txt +++ b/icu4c/source/data/unit/bs_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/bs_Latn.xml diff --git a/icu4c/source/data/unit/bs_Latn_BA.txt b/icu4c/source/data/unit/bs_Latn_BA.txt index ca3c38a7bc3..5afc1527e7f 100755 --- a/icu4c/source/data/unit/bs_Latn_BA.txt +++ b/icu4c/source/data/unit/bs_Latn_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ce.txt b/icu4c/source/data/unit/ce.txt index 0464abab7a4..da50524cba5 100755 --- a/icu4c/source/data/unit/ce.txt +++ b/icu4c/source/data/unit/ce.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ce.xml // * // *************************************************************************** ce{ - Version{"2.1.19.14"} + Version{"2.1.21.97"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/cgg.txt b/icu4c/source/data/unit/cgg.txt index 32d6ea3bed7..7b17dbd501f 100755 --- a/icu4c/source/data/unit/cgg.txt +++ b/icu4c/source/data/unit/cgg.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/cgg.xml // * // *************************************************************************** cgg{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/chr.txt b/icu4c/source/data/unit/chr.txt index 8cfb7906088..ce617b7975c 100755 --- a/icu4c/source/data/unit/chr.txt +++ b/icu4c/source/data/unit/chr.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/chr.xml // * // *************************************************************************** chr{ - Version{"2.1.19.77"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/cy.txt b/icu4c/source/data/unit/cy.txt index 9e4b6be6480..4dc16d2cf3d 100755 --- a/icu4c/source/data/unit/cy.txt +++ b/icu4c/source/data/unit/cy.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/cy.xml // * // *************************************************************************** cy{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -169,6 +169,17 @@ cy{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karatau"} + few{"{0} karat"} + many{"{0} karat"} + one{"{0} karat"} + other{"{0} karat"} + two{"{0} karat"} + zero{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"litrau wrth y 100 cilometr"} @@ -915,17 +926,6 @@ cy{ zero{"{0} pwys y fodfedd sgwar"} } } - proportion{ - karat{ - dnam{"karatau"} - few{"{0} karat"} - many{"{0} karat"} - one{"{0} karat"} - other{"{0} karat"} - two{"{0} karat"} - zero{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"cilometrau yr awr"} @@ -2329,6 +2329,17 @@ cy{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karatau"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + zero{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -3069,17 +3080,6 @@ cy{ zero{"{0} psi"} } } - proportion{ - karat{ - dnam{"karatau"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - zero{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/da.txt b/icu4c/source/data/unit/da.txt index aa36fa98c61..c61b1d97ad7 100755 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** da{ - Version{"2.1.22.93"} + Version{"2.1.23.87"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} diff --git a/icu4c/source/data/unit/dav.txt b/icu4c/source/data/unit/dav.txt index c8283e2fa42..f616215f869 100755 --- a/icu4c/source/data/unit/dav.txt +++ b/icu4c/source/data/unit/dav.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dav.xml // * // *************************************************************************** dav{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/de_CH.txt b/icu4c/source/data/unit/de_CH.txt index 2cb76be812e..c133b1d5c9f 100755 --- a/icu4c/source/data/unit/de_CH.txt +++ b/icu4c/source/data/unit/de_CH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/de_CH.xml diff --git a/icu4c/source/data/unit/dje.txt b/icu4c/source/data/unit/dje.txt index bca37800a38..771c250c0d0 100755 --- a/icu4c/source/data/unit/dje.txt +++ b/icu4c/source/data/unit/dje.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dje.xml // * // *************************************************************************** dje{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/dsb.txt b/icu4c/source/data/unit/dsb.txt index d972a0d0170..cc733be9763 100755 --- a/icu4c/source/data/unit/dsb.txt +++ b/icu4c/source/data/unit/dsb.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dsb.xml // * // *************************************************************************** dsb{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -125,6 +125,15 @@ dsb{ two{"{0} kwadratnej yarda"} } } + concentr{ + karat{ + dnam{"karaty"} + few{"{0} karaty"} + one{"{0} karat"} + other{"{0} karatow"} + two{"{0} karata"} + } + } consumption{ liter-per-kilometer{ dnam{"litry na kilometer"} @@ -667,15 +676,6 @@ dsb{ two{"{0} punta na kwadratny col"} } } - proportion{ - karat{ - dnam{"karaty"} - few{"{0} karaty"} - one{"{0} karat"} - other{"{0} karatow"} - two{"{0} karata"} - } - } speed{ kilometer-per-hour{ dnam{"kilometry na góźinu"} @@ -1301,6 +1301,15 @@ dsb{ two{"{0} yd²"} } } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"l/km"} @@ -1843,15 +1852,6 @@ dsb{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/dua.txt b/icu4c/source/data/unit/dua.txt index f462e3e7a6e..a04f9105887 100755 --- a/icu4c/source/data/unit/dua.txt +++ b/icu4c/source/data/unit/dua.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dua.xml // * // *************************************************************************** dua{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/dyo.txt b/icu4c/source/data/unit/dyo.txt index a518fab3fcd..2980eb55107 100755 --- a/icu4c/source/data/unit/dyo.txt +++ b/icu4c/source/data/unit/dyo.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dyo.xml diff --git a/icu4c/source/data/unit/dz.txt b/icu4c/source/data/unit/dz.txt index e8bd3dde238..a9caa5d86f1 100755 --- a/icu4c/source/data/unit/dz.txt +++ b/icu4c/source/data/unit/dz.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/dz.xml // * // *************************************************************************** dz{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/ebu.txt b/icu4c/source/data/unit/ebu.txt index 09b2932d278..6d720a5f733 100755 --- a/icu4c/source/data/unit/ebu.txt +++ b/icu4c/source/data/unit/ebu.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ebu.xml // * // *************************************************************************** ebu{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ee.txt b/icu4c/source/data/unit/ee.txt index 682839f541d..ca16d8b56cf 100755 --- a/icu4c/source/data/unit/ee.txt +++ b/icu4c/source/data/unit/ee.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ee.xml // * // *************************************************************************** ee{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index 7032f4aee2c..6dc1cee5ba0 100755 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** en{ - Version{"2.1.23.48"} + Version{"2.1.23.80"} units{ acceleration{ g-force{ diff --git a/icu4c/source/data/unit/en_001.txt b/icu4c/source/data/unit/en_001.txt index 531420e1774..abc0d1dce92 100755 --- a/icu4c/source/data/unit/en_001.txt +++ b/icu4c/source/data/unit/en_001.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** en_001{ - Version{"2.1.19.14"} + Version{"2.1.22.91"} units{ acceleration{ meter-per-second-squared{ diff --git a/icu4c/source/data/unit/en_150.txt b/icu4c/source/data/unit/en_150.txt index d495735e2cf..7a651bbc838 100755 --- a/icu4c/source/data/unit/en_150.txt +++ b/icu4c/source/data/unit/en_150.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_150.xml diff --git a/icu4c/source/data/unit/en_AG.txt b/icu4c/source/data/unit/en_AG.txt index d8319feb59d..6b1e510cb22 100755 --- a/icu4c/source/data/unit/en_AG.txt +++ b/icu4c/source/data/unit/en_AG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_AG.xml diff --git a/icu4c/source/data/unit/en_AI.txt b/icu4c/source/data/unit/en_AI.txt index 59088c45406..77a3fde9ba9 100755 --- a/icu4c/source/data/unit/en_AI.txt +++ b/icu4c/source/data/unit/en_AI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_AI.xml diff --git a/icu4c/source/data/unit/en_AT.txt b/icu4c/source/data/unit/en_AT.txt index 4db41f1251c..655f74ec895 100755 --- a/icu4c/source/data/unit/en_AT.txt +++ b/icu4c/source/data/unit/en_AT.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_AT.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_AT{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_AU.txt b/icu4c/source/data/unit/en_AU.txt index 23845318bdb..d13fe97c75c 100755 --- a/icu4c/source/data/unit/en_AU.txt +++ b/icu4c/source/data/unit/en_AU.txt @@ -17,16 +17,6 @@ en_AU{ west{"{0} west"} } energy{ - foodcalorie{ - dnam{"calories"} - one{"{0} calorie"} - other{"{0} calories"} - } - kilocalorie{ - dnam{"kilogram calories"} - one{"{0} kilogram calorie"} - other{"{0} kilogram calories"} - } kilowatt-hour{ dnam{"kilowatt hours"} one{"{0} kilowatt hour"} @@ -250,15 +240,6 @@ en_AU{ } } energy{ - foodcalorie{ - dnam{"cal"} - one{"{0} cal"} - } - kilocalorie{ - dnam{"Cal"} - one{"{0} Cal"} - other{"{0} Cal"} - } kilowatt-hour{ dnam{"kWh"} } @@ -284,6 +265,7 @@ en_AU{ other{"{0} CM"} } pound{ + one{"{0} lb"} other{"{0} lb"} } } diff --git a/icu4c/source/data/unit/en_BB.txt b/icu4c/source/data/unit/en_BB.txt index d6c5a73ee09..331ec091dae 100755 --- a/icu4c/source/data/unit/en_BB.txt +++ b/icu4c/source/data/unit/en_BB.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BB.xml diff --git a/icu4c/source/data/unit/en_BE.txt b/icu4c/source/data/unit/en_BE.txt index 5daae63ba35..d9234c211d0 100755 --- a/icu4c/source/data/unit/en_BE.txt +++ b/icu4c/source/data/unit/en_BE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BE.xml diff --git a/icu4c/source/data/unit/en_BM.txt b/icu4c/source/data/unit/en_BM.txt index 1228ab26ea1..98b6ebb6765 100755 --- a/icu4c/source/data/unit/en_BM.txt +++ b/icu4c/source/data/unit/en_BM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BM.xml diff --git a/icu4c/source/data/unit/en_BS.txt b/icu4c/source/data/unit/en_BS.txt index d40bab345ef..339c48d960b 100755 --- a/icu4c/source/data/unit/en_BS.txt +++ b/icu4c/source/data/unit/en_BS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BS.xml diff --git a/icu4c/source/data/unit/en_BW.txt b/icu4c/source/data/unit/en_BW.txt index 909ccf56d27..e66b5e763d7 100755 --- a/icu4c/source/data/unit/en_BW.txt +++ b/icu4c/source/data/unit/en_BW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BW.xml diff --git a/icu4c/source/data/unit/en_BZ.txt b/icu4c/source/data/unit/en_BZ.txt index 0bcfe6345b9..8aeb05ed63d 100755 --- a/icu4c/source/data/unit/en_BZ.txt +++ b/icu4c/source/data/unit/en_BZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_BZ.xml diff --git a/icu4c/source/data/unit/en_CC.txt b/icu4c/source/data/unit/en_CC.txt index 02ebbb5caf5..b6cc42b04f8 100755 --- a/icu4c/source/data/unit/en_CC.txt +++ b/icu4c/source/data/unit/en_CC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CC.xml diff --git a/icu4c/source/data/unit/en_CH.txt b/icu4c/source/data/unit/en_CH.txt index f5d7bc2db55..31c971e6b45 100755 --- a/icu4c/source/data/unit/en_CH.txt +++ b/icu4c/source/data/unit/en_CH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CH.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_CH{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_CK.txt b/icu4c/source/data/unit/en_CK.txt index c0bdd7a86c9..b1ec923e997 100755 --- a/icu4c/source/data/unit/en_CK.txt +++ b/icu4c/source/data/unit/en_CK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CK.xml diff --git a/icu4c/source/data/unit/en_CM.txt b/icu4c/source/data/unit/en_CM.txt index d93f02ccd69..e57b48e633e 100755 --- a/icu4c/source/data/unit/en_CM.txt +++ b/icu4c/source/data/unit/en_CM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CM.xml diff --git a/icu4c/source/data/unit/en_CX.txt b/icu4c/source/data/unit/en_CX.txt index ff73d0e0511..9763b485907 100755 --- a/icu4c/source/data/unit/en_CX.txt +++ b/icu4c/source/data/unit/en_CX.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CX.xml diff --git a/icu4c/source/data/unit/en_CY.txt b/icu4c/source/data/unit/en_CY.txt index 256939c26c2..cce78bb0318 100755 --- a/icu4c/source/data/unit/en_CY.txt +++ b/icu4c/source/data/unit/en_CY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_CY.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_CY{ %%Parent{"en_001"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_DE.txt b/icu4c/source/data/unit/en_DE.txt index 246db187cff..f06a35c4ceb 100755 --- a/icu4c/source/data/unit/en_DE.txt +++ b/icu4c/source/data/unit/en_DE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_DE.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_DE{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_DG.txt b/icu4c/source/data/unit/en_DG.txt index 29a90476cab..1a602cf822f 100755 --- a/icu4c/source/data/unit/en_DG.txt +++ b/icu4c/source/data/unit/en_DG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_DG.xml diff --git a/icu4c/source/data/unit/en_DK.txt b/icu4c/source/data/unit/en_DK.txt index a4cc99d51c7..5110c8b5943 100755 --- a/icu4c/source/data/unit/en_DK.txt +++ b/icu4c/source/data/unit/en_DK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_DK.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_DK{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_DM.txt b/icu4c/source/data/unit/en_DM.txt index cda28778d4e..2f505cdc47a 100755 --- a/icu4c/source/data/unit/en_DM.txt +++ b/icu4c/source/data/unit/en_DM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_DM.xml diff --git a/icu4c/source/data/unit/en_ER.txt b/icu4c/source/data/unit/en_ER.txt index 94a4bb18493..a8191bbe609 100755 --- a/icu4c/source/data/unit/en_ER.txt +++ b/icu4c/source/data/unit/en_ER.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_ER.xml diff --git a/icu4c/source/data/unit/en_FI.txt b/icu4c/source/data/unit/en_FI.txt index fcf3695bcbb..8ec7794d729 100755 --- a/icu4c/source/data/unit/en_FI.txt +++ b/icu4c/source/data/unit/en_FI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_FI.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_FI{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_FJ.txt b/icu4c/source/data/unit/en_FJ.txt index e2917a4a70d..f647821ef0f 100755 --- a/icu4c/source/data/unit/en_FJ.txt +++ b/icu4c/source/data/unit/en_FJ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_FJ.xml diff --git a/icu4c/source/data/unit/en_FK.txt b/icu4c/source/data/unit/en_FK.txt index 1aa4671e11d..68335848c92 100755 --- a/icu4c/source/data/unit/en_FK.txt +++ b/icu4c/source/data/unit/en_FK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_FK.xml diff --git a/icu4c/source/data/unit/en_FM.txt b/icu4c/source/data/unit/en_FM.txt index 3aeedc56c6c..3482b307b53 100755 --- a/icu4c/source/data/unit/en_FM.txt +++ b/icu4c/source/data/unit/en_FM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_FM.xml diff --git a/icu4c/source/data/unit/en_GB.txt b/icu4c/source/data/unit/en_GB.txt index 70a3603a400..1216fe8fffe 100755 --- a/icu4c/source/data/unit/en_GB.txt +++ b/icu4c/source/data/unit/en_GB.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GB.xml @@ -8,7 +8,7 @@ // *************************************************************************** en_GB{ %%Parent{"en_001"} - Version{"2.1.19.79"} + Version{"2.1.22.17"} units{ mass{ stone{ diff --git a/icu4c/source/data/unit/en_GD.txt b/icu4c/source/data/unit/en_GD.txt index 0ceb3946fa4..00c1e33fc1a 100755 --- a/icu4c/source/data/unit/en_GD.txt +++ b/icu4c/source/data/unit/en_GD.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GD.xml diff --git a/icu4c/source/data/unit/en_GG.txt b/icu4c/source/data/unit/en_GG.txt index 500a2a3cc3d..4cfaccdec3b 100755 --- a/icu4c/source/data/unit/en_GG.txt +++ b/icu4c/source/data/unit/en_GG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GG.xml diff --git a/icu4c/source/data/unit/en_GH.txt b/icu4c/source/data/unit/en_GH.txt index fdf39957fb7..75f45d289b8 100755 --- a/icu4c/source/data/unit/en_GH.txt +++ b/icu4c/source/data/unit/en_GH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GH.xml diff --git a/icu4c/source/data/unit/en_GI.txt b/icu4c/source/data/unit/en_GI.txt index a3337ef4ecb..035c94e4178 100755 --- a/icu4c/source/data/unit/en_GI.txt +++ b/icu4c/source/data/unit/en_GI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GI.xml diff --git a/icu4c/source/data/unit/en_GM.txt b/icu4c/source/data/unit/en_GM.txt index e5b72122f80..6603e38abe1 100755 --- a/icu4c/source/data/unit/en_GM.txt +++ b/icu4c/source/data/unit/en_GM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GM.xml diff --git a/icu4c/source/data/unit/en_GY.txt b/icu4c/source/data/unit/en_GY.txt index 04b6ead0e51..fff2e56ac19 100755 --- a/icu4c/source/data/unit/en_GY.txt +++ b/icu4c/source/data/unit/en_GY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_GY.xml diff --git a/icu4c/source/data/unit/en_HK.txt b/icu4c/source/data/unit/en_HK.txt index 7010efeecc8..034502e8474 100755 --- a/icu4c/source/data/unit/en_HK.txt +++ b/icu4c/source/data/unit/en_HK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_HK.xml diff --git a/icu4c/source/data/unit/en_IE.txt b/icu4c/source/data/unit/en_IE.txt index 5e94329cf72..a81f7653e63 100755 --- a/icu4c/source/data/unit/en_IE.txt +++ b/icu4c/source/data/unit/en_IE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_IE.xml diff --git a/icu4c/source/data/unit/en_IL.txt b/icu4c/source/data/unit/en_IL.txt index 7ad6b40e35e..84000ef1bf2 100755 --- a/icu4c/source/data/unit/en_IL.txt +++ b/icu4c/source/data/unit/en_IL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_IL.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_IL{ %%Parent{"en_001"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_IM.txt b/icu4c/source/data/unit/en_IM.txt index 4df3966544a..92aca3087f0 100755 --- a/icu4c/source/data/unit/en_IM.txt +++ b/icu4c/source/data/unit/en_IM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_IM.xml diff --git a/icu4c/source/data/unit/en_IN.txt b/icu4c/source/data/unit/en_IN.txt index af7604f3b8c..449a564295e 100755 --- a/icu4c/source/data/unit/en_IN.txt +++ b/icu4c/source/data/unit/en_IN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_IN.xml diff --git a/icu4c/source/data/unit/en_IO.txt b/icu4c/source/data/unit/en_IO.txt index b35b88566c4..67864304b78 100755 --- a/icu4c/source/data/unit/en_IO.txt +++ b/icu4c/source/data/unit/en_IO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_IO.xml diff --git a/icu4c/source/data/unit/en_JE.txt b/icu4c/source/data/unit/en_JE.txt index 271dc95ec7c..8c5ae3e6b1e 100755 --- a/icu4c/source/data/unit/en_JE.txt +++ b/icu4c/source/data/unit/en_JE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_JE.xml diff --git a/icu4c/source/data/unit/en_JM.txt b/icu4c/source/data/unit/en_JM.txt index 23793d60d16..c0b897e76f0 100755 --- a/icu4c/source/data/unit/en_JM.txt +++ b/icu4c/source/data/unit/en_JM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_JM.xml diff --git a/icu4c/source/data/unit/en_KE.txt b/icu4c/source/data/unit/en_KE.txt index a5bba108502..36021a496eb 100755 --- a/icu4c/source/data/unit/en_KE.txt +++ b/icu4c/source/data/unit/en_KE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_KE.xml diff --git a/icu4c/source/data/unit/en_KI.txt b/icu4c/source/data/unit/en_KI.txt index c054f5e2922..4674c312bfc 100755 --- a/icu4c/source/data/unit/en_KI.txt +++ b/icu4c/source/data/unit/en_KI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_KI.xml diff --git a/icu4c/source/data/unit/en_KN.txt b/icu4c/source/data/unit/en_KN.txt index ad4a4f8368a..f62606a8b47 100755 --- a/icu4c/source/data/unit/en_KN.txt +++ b/icu4c/source/data/unit/en_KN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_KN.xml diff --git a/icu4c/source/data/unit/en_KY.txt b/icu4c/source/data/unit/en_KY.txt index 6265803b677..c2bf053fca8 100755 --- a/icu4c/source/data/unit/en_KY.txt +++ b/icu4c/source/data/unit/en_KY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_KY.xml diff --git a/icu4c/source/data/unit/en_LC.txt b/icu4c/source/data/unit/en_LC.txt index 61c13ef64f8..ca25072a08d 100755 --- a/icu4c/source/data/unit/en_LC.txt +++ b/icu4c/source/data/unit/en_LC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_LC.xml diff --git a/icu4c/source/data/unit/en_LR.txt b/icu4c/source/data/unit/en_LR.txt index 4a52cf7c6c0..50f3fc687c8 100755 --- a/icu4c/source/data/unit/en_LR.txt +++ b/icu4c/source/data/unit/en_LR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_LR.xml diff --git a/icu4c/source/data/unit/en_LS.txt b/icu4c/source/data/unit/en_LS.txt index 742be06abb0..a2ff500b104 100755 --- a/icu4c/source/data/unit/en_LS.txt +++ b/icu4c/source/data/unit/en_LS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_LS.xml diff --git a/icu4c/source/data/unit/en_MG.txt b/icu4c/source/data/unit/en_MG.txt index af63e6586bf..1cd982590b3 100755 --- a/icu4c/source/data/unit/en_MG.txt +++ b/icu4c/source/data/unit/en_MG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MG.xml diff --git a/icu4c/source/data/unit/en_MO.txt b/icu4c/source/data/unit/en_MO.txt index 618b2bcc80d..b155af3166b 100755 --- a/icu4c/source/data/unit/en_MO.txt +++ b/icu4c/source/data/unit/en_MO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MO.xml diff --git a/icu4c/source/data/unit/en_MS.txt b/icu4c/source/data/unit/en_MS.txt index affa3ada4fa..94b58a5caa1 100755 --- a/icu4c/source/data/unit/en_MS.txt +++ b/icu4c/source/data/unit/en_MS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MS.xml diff --git a/icu4c/source/data/unit/en_MT.txt b/icu4c/source/data/unit/en_MT.txt index c3a322e52e2..97074f10ba8 100755 --- a/icu4c/source/data/unit/en_MT.txt +++ b/icu4c/source/data/unit/en_MT.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MT.xml diff --git a/icu4c/source/data/unit/en_MU.txt b/icu4c/source/data/unit/en_MU.txt index e80f3fa3342..ed7bf2d72d9 100755 --- a/icu4c/source/data/unit/en_MU.txt +++ b/icu4c/source/data/unit/en_MU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MU.xml diff --git a/icu4c/source/data/unit/en_MW.txt b/icu4c/source/data/unit/en_MW.txt index 1d13bc32d56..89d045118b4 100755 --- a/icu4c/source/data/unit/en_MW.txt +++ b/icu4c/source/data/unit/en_MW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MW.xml diff --git a/icu4c/source/data/unit/en_MY.txt b/icu4c/source/data/unit/en_MY.txt index af637718656..d8767be03cb 100755 --- a/icu4c/source/data/unit/en_MY.txt +++ b/icu4c/source/data/unit/en_MY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_MY.xml diff --git a/icu4c/source/data/unit/en_NA.txt b/icu4c/source/data/unit/en_NA.txt index abb5d9db050..3f5ab0ec81b 100755 --- a/icu4c/source/data/unit/en_NA.txt +++ b/icu4c/source/data/unit/en_NA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NA.xml diff --git a/icu4c/source/data/unit/en_NF.txt b/icu4c/source/data/unit/en_NF.txt index 69e80490c69..302573af29a 100755 --- a/icu4c/source/data/unit/en_NF.txt +++ b/icu4c/source/data/unit/en_NF.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NF.xml diff --git a/icu4c/source/data/unit/en_NG.txt b/icu4c/source/data/unit/en_NG.txt index 7b60ee7e101..0fddecc0b79 100755 --- a/icu4c/source/data/unit/en_NG.txt +++ b/icu4c/source/data/unit/en_NG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NG.xml diff --git a/icu4c/source/data/unit/en_NH.txt b/icu4c/source/data/unit/en_NH.txt index 188a668eaa8..00ee0b80397 100755 --- a/icu4c/source/data/unit/en_NH.txt +++ b/icu4c/source/data/unit/en_NH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/en_NL.txt b/icu4c/source/data/unit/en_NL.txt index b5e1b54040e..5ee1e0a0d6f 100755 --- a/icu4c/source/data/unit/en_NL.txt +++ b/icu4c/source/data/unit/en_NL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NL.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_NL{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_NR.txt b/icu4c/source/data/unit/en_NR.txt index b022c848838..80a9f4a2165 100755 --- a/icu4c/source/data/unit/en_NR.txt +++ b/icu4c/source/data/unit/en_NR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NR.xml diff --git a/icu4c/source/data/unit/en_NU.txt b/icu4c/source/data/unit/en_NU.txt index 3c32b367250..cffc2226a03 100755 --- a/icu4c/source/data/unit/en_NU.txt +++ b/icu4c/source/data/unit/en_NU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NU.xml diff --git a/icu4c/source/data/unit/en_NZ.txt b/icu4c/source/data/unit/en_NZ.txt index 0cc64fbeb74..fce53acba0f 100755 --- a/icu4c/source/data/unit/en_NZ.txt +++ b/icu4c/source/data/unit/en_NZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_NZ.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_NZ{ %%Parent{"en_001"} - Version{"2.1.19.14"} + Version{"2.1.22.95"} } diff --git a/icu4c/source/data/unit/en_PG.txt b/icu4c/source/data/unit/en_PG.txt index 56ede450467..d14bf07a161 100755 --- a/icu4c/source/data/unit/en_PG.txt +++ b/icu4c/source/data/unit/en_PG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_PG.xml diff --git a/icu4c/source/data/unit/en_PH.txt b/icu4c/source/data/unit/en_PH.txt index 427e7c98969..034717b44f2 100755 --- a/icu4c/source/data/unit/en_PH.txt +++ b/icu4c/source/data/unit/en_PH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_PH.xml diff --git a/icu4c/source/data/unit/en_PK.txt b/icu4c/source/data/unit/en_PK.txt index 2f4040c82da..511191ed904 100755 --- a/icu4c/source/data/unit/en_PK.txt +++ b/icu4c/source/data/unit/en_PK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_PK.xml diff --git a/icu4c/source/data/unit/en_PN.txt b/icu4c/source/data/unit/en_PN.txt index b7cc64dd64a..cefb035e74a 100755 --- a/icu4c/source/data/unit/en_PN.txt +++ b/icu4c/source/data/unit/en_PN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_PN.xml diff --git a/icu4c/source/data/unit/en_PW.txt b/icu4c/source/data/unit/en_PW.txt index 9d48c86b49a..17c408e1615 100755 --- a/icu4c/source/data/unit/en_PW.txt +++ b/icu4c/source/data/unit/en_PW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_PW.xml diff --git a/icu4c/source/data/unit/en_RH.txt b/icu4c/source/data/unit/en_RH.txt index 98ef7e5a52f..134987493e3 100755 --- a/icu4c/source/data/unit/en_RH.txt +++ b/icu4c/source/data/unit/en_RH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/en_RW.txt b/icu4c/source/data/unit/en_RW.txt index 3b39c479b49..73e0e1baa39 100755 --- a/icu4c/source/data/unit/en_RW.txt +++ b/icu4c/source/data/unit/en_RW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_RW.xml diff --git a/icu4c/source/data/unit/en_SB.txt b/icu4c/source/data/unit/en_SB.txt index 44aae422f5f..732ae5a3875 100755 --- a/icu4c/source/data/unit/en_SB.txt +++ b/icu4c/source/data/unit/en_SB.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SB.xml diff --git a/icu4c/source/data/unit/en_SC.txt b/icu4c/source/data/unit/en_SC.txt index e18ef558e00..f60fe42795a 100755 --- a/icu4c/source/data/unit/en_SC.txt +++ b/icu4c/source/data/unit/en_SC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SC.xml diff --git a/icu4c/source/data/unit/en_SD.txt b/icu4c/source/data/unit/en_SD.txt index 4fc77ca2ee3..d38d7034edb 100755 --- a/icu4c/source/data/unit/en_SD.txt +++ b/icu4c/source/data/unit/en_SD.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SD.xml diff --git a/icu4c/source/data/unit/en_SE.txt b/icu4c/source/data/unit/en_SE.txt index 9f48cf91182..d3e88d96ffa 100755 --- a/icu4c/source/data/unit/en_SE.txt +++ b/icu4c/source/data/unit/en_SE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SE.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_SE{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_SG.txt b/icu4c/source/data/unit/en_SG.txt index c13b7aa3a76..33534fec665 100755 --- a/icu4c/source/data/unit/en_SG.txt +++ b/icu4c/source/data/unit/en_SG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SG.xml diff --git a/icu4c/source/data/unit/en_SH.txt b/icu4c/source/data/unit/en_SH.txt index 10aedf11349..d9e0e0fbc87 100755 --- a/icu4c/source/data/unit/en_SH.txt +++ b/icu4c/source/data/unit/en_SH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SH.xml diff --git a/icu4c/source/data/unit/en_SI.txt b/icu4c/source/data/unit/en_SI.txt index f7f67e75155..9e8aa758232 100755 --- a/icu4c/source/data/unit/en_SI.txt +++ b/icu4c/source/data/unit/en_SI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SI.xml @@ -8,5 +8,5 @@ // *************************************************************************** en_SI{ %%Parent{"en_150"} - Version{"2.1.19.69"} + Version{"2.1.23.47"} } diff --git a/icu4c/source/data/unit/en_SL.txt b/icu4c/source/data/unit/en_SL.txt index fd66c4bd61c..66b84135627 100755 --- a/icu4c/source/data/unit/en_SL.txt +++ b/icu4c/source/data/unit/en_SL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SL.xml diff --git a/icu4c/source/data/unit/en_SS.txt b/icu4c/source/data/unit/en_SS.txt index 1884cbe9b5c..9c9370880b4 100755 --- a/icu4c/source/data/unit/en_SS.txt +++ b/icu4c/source/data/unit/en_SS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SS.xml diff --git a/icu4c/source/data/unit/en_SX.txt b/icu4c/source/data/unit/en_SX.txt index e3978c006f2..c7918090442 100755 --- a/icu4c/source/data/unit/en_SX.txt +++ b/icu4c/source/data/unit/en_SX.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SX.xml diff --git a/icu4c/source/data/unit/en_SZ.txt b/icu4c/source/data/unit/en_SZ.txt index 57cbe085b63..c04c69b2014 100755 --- a/icu4c/source/data/unit/en_SZ.txt +++ b/icu4c/source/data/unit/en_SZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_SZ.xml diff --git a/icu4c/source/data/unit/en_TC.txt b/icu4c/source/data/unit/en_TC.txt index 3e9ea32ef77..4ffde8974ca 100755 --- a/icu4c/source/data/unit/en_TC.txt +++ b/icu4c/source/data/unit/en_TC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TC.xml diff --git a/icu4c/source/data/unit/en_TK.txt b/icu4c/source/data/unit/en_TK.txt index d8a18adc4e9..af36a3e1fc1 100755 --- a/icu4c/source/data/unit/en_TK.txt +++ b/icu4c/source/data/unit/en_TK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TK.xml diff --git a/icu4c/source/data/unit/en_TO.txt b/icu4c/source/data/unit/en_TO.txt index f66d2e4206c..8168819590f 100755 --- a/icu4c/source/data/unit/en_TO.txt +++ b/icu4c/source/data/unit/en_TO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TO.xml diff --git a/icu4c/source/data/unit/en_TT.txt b/icu4c/source/data/unit/en_TT.txt index c59e01506ed..a6fa9db0f93 100755 --- a/icu4c/source/data/unit/en_TT.txt +++ b/icu4c/source/data/unit/en_TT.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TT.xml diff --git a/icu4c/source/data/unit/en_TV.txt b/icu4c/source/data/unit/en_TV.txt index f5710b1e0b0..743fd002b7a 100755 --- a/icu4c/source/data/unit/en_TV.txt +++ b/icu4c/source/data/unit/en_TV.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TV.xml diff --git a/icu4c/source/data/unit/en_TZ.txt b/icu4c/source/data/unit/en_TZ.txt index 85b78a2c5fa..c43275db870 100755 --- a/icu4c/source/data/unit/en_TZ.txt +++ b/icu4c/source/data/unit/en_TZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_TZ.xml diff --git a/icu4c/source/data/unit/en_UG.txt b/icu4c/source/data/unit/en_UG.txt index 8d0518d69c4..7a1be04f5ac 100755 --- a/icu4c/source/data/unit/en_UG.txt +++ b/icu4c/source/data/unit/en_UG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_UG.xml diff --git a/icu4c/source/data/unit/en_VC.txt b/icu4c/source/data/unit/en_VC.txt index b1b98faabe1..5a03ac959b5 100755 --- a/icu4c/source/data/unit/en_VC.txt +++ b/icu4c/source/data/unit/en_VC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_VC.xml diff --git a/icu4c/source/data/unit/en_VG.txt b/icu4c/source/data/unit/en_VG.txt index 119609a2056..1341bc49496 100755 --- a/icu4c/source/data/unit/en_VG.txt +++ b/icu4c/source/data/unit/en_VG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_VG.xml diff --git a/icu4c/source/data/unit/en_VU.txt b/icu4c/source/data/unit/en_VU.txt index fcd0650c1e0..504e18bba79 100755 --- a/icu4c/source/data/unit/en_VU.txt +++ b/icu4c/source/data/unit/en_VU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_VU.xml diff --git a/icu4c/source/data/unit/en_WS.txt b/icu4c/source/data/unit/en_WS.txt index 86283e79115..036a79bdcfb 100755 --- a/icu4c/source/data/unit/en_WS.txt +++ b/icu4c/source/data/unit/en_WS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_WS.xml diff --git a/icu4c/source/data/unit/en_ZA.txt b/icu4c/source/data/unit/en_ZA.txt index 03312abf60b..e4ccc57a0a8 100755 --- a/icu4c/source/data/unit/en_ZA.txt +++ b/icu4c/source/data/unit/en_ZA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_ZA.xml diff --git a/icu4c/source/data/unit/en_ZM.txt b/icu4c/source/data/unit/en_ZM.txt index 93f8048a7e9..a7e3e94ab77 100755 --- a/icu4c/source/data/unit/en_ZM.txt +++ b/icu4c/source/data/unit/en_ZM.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_ZM.xml diff --git a/icu4c/source/data/unit/en_ZW.txt b/icu4c/source/data/unit/en_ZW.txt index 0400cc01657..5823331235b 100755 --- a/icu4c/source/data/unit/en_ZW.txt +++ b/icu4c/source/data/unit/en_ZW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/en_ZW.xml diff --git a/icu4c/source/data/unit/eo.txt b/icu4c/source/data/unit/eo.txt index 7f83ca6d55e..5b5302d8e7c 100755 --- a/icu4c/source/data/unit/eo.txt +++ b/icu4c/source/data/unit/eo.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/eo.xml // * // *************************************************************************** eo{ - Version{"2.1.19.14"} + Version{"2.1.23.54"} unitsShort{ duration{ month{ diff --git a/icu4c/source/data/unit/es_419.txt b/icu4c/source/data/unit/es_419.txt index 6787e65bada..9da41ca8941 100755 --- a/icu4c/source/data/unit/es_419.txt +++ b/icu4c/source/data/unit/es_419.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_419.xml // * // *************************************************************************** es_419{ - Version{"2.1.19.14"} + Version{"2.1.21.97"} units{ volume{ acre-foot{ diff --git a/icu4c/source/data/unit/es_AR.txt b/icu4c/source/data/unit/es_AR.txt index 5009fa62ef4..37906d4c13f 100755 --- a/icu4c/source/data/unit/es_AR.txt +++ b/icu4c/source/data/unit/es_AR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_AR.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_AR{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} units{ duration{ year{ @@ -56,6 +56,7 @@ es_AR{ other{"{0}seg."} } year{ + one{"{0}a."} other{"{0}a."} } } diff --git a/icu4c/source/data/unit/es_BO.txt b/icu4c/source/data/unit/es_BO.txt index 80a27725115..b24a5855fce 100755 --- a/icu4c/source/data/unit/es_BO.txt +++ b/icu4c/source/data/unit/es_BO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_BO.xml diff --git a/icu4c/source/data/unit/es_CL.txt b/icu4c/source/data/unit/es_CL.txt index 1069a19875b..0123557d07f 100755 --- a/icu4c/source/data/unit/es_CL.txt +++ b/icu4c/source/data/unit/es_CL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_CL.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_CL{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.21.28"} durationUnits{ hms{"hh:mm:ss"} ms{"mm:ss"} diff --git a/icu4c/source/data/unit/es_CO.txt b/icu4c/source/data/unit/es_CO.txt index 2801fa578aa..212c372bded 100755 --- a/icu4c/source/data/unit/es_CO.txt +++ b/icu4c/source/data/unit/es_CO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_CO.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_CO{ %%Parent{"es_419"} - Version{"2.1.20.32"} + Version{"2.1.22.17"} units{ duration{ month{ diff --git a/icu4c/source/data/unit/es_CR.txt b/icu4c/source/data/unit/es_CR.txt index 728becad13d..6eb70611caa 100755 --- a/icu4c/source/data/unit/es_CR.txt +++ b/icu4c/source/data/unit/es_CR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_CR.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_CR{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/es_CU.txt b/icu4c/source/data/unit/es_CU.txt index 3d7a2ad2802..20e56c4fdc3 100755 --- a/icu4c/source/data/unit/es_CU.txt +++ b/icu4c/source/data/unit/es_CU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_CU.xml diff --git a/icu4c/source/data/unit/es_DO.txt b/icu4c/source/data/unit/es_DO.txt index 4b7806452f5..cd6a87241d8 100755 --- a/icu4c/source/data/unit/es_DO.txt +++ b/icu4c/source/data/unit/es_DO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_DO.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_DO{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} units{ electric{ ampere{ @@ -34,9 +34,11 @@ es_DO{ unitsNarrow{ duration{ day{ + one{"{0}d."} other{"{0}d."} } month{ + one{"{0}m."} other{"{0}m."} } } diff --git a/icu4c/source/data/unit/es_EC.txt b/icu4c/source/data/unit/es_EC.txt index 190c16d72f7..7b14ab2cd3e 100755 --- a/icu4c/source/data/unit/es_EC.txt +++ b/icu4c/source/data/unit/es_EC.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_EC.xml diff --git a/icu4c/source/data/unit/es_HN.txt b/icu4c/source/data/unit/es_HN.txt index e7702714baa..32b0a762bbc 100755 --- a/icu4c/source/data/unit/es_HN.txt +++ b/icu4c/source/data/unit/es_HN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_HN.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_HN{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/es_MX.txt b/icu4c/source/data/unit/es_MX.txt index 69dabcdd9f7..451005e11c6 100755 --- a/icu4c/source/data/unit/es_MX.txt +++ b/icu4c/source/data/unit/es_MX.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_MX.xml diff --git a/icu4c/source/data/unit/es_NI.txt b/icu4c/source/data/unit/es_NI.txt index cc67b2ef937..c89b9824851 100755 --- a/icu4c/source/data/unit/es_NI.txt +++ b/icu4c/source/data/unit/es_NI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_NI.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_NI{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/es_PA.txt b/icu4c/source/data/unit/es_PA.txt index 4d5df632ed2..cb4e66870d4 100755 --- a/icu4c/source/data/unit/es_PA.txt +++ b/icu4c/source/data/unit/es_PA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_PA.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_PA{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/es_PE.txt b/icu4c/source/data/unit/es_PE.txt index b519449479a..25a8d3dcbeb 100755 --- a/icu4c/source/data/unit/es_PE.txt +++ b/icu4c/source/data/unit/es_PE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_PE.xml diff --git a/icu4c/source/data/unit/es_PR.txt b/icu4c/source/data/unit/es_PR.txt index 41b668e1127..b795866a812 100755 --- a/icu4c/source/data/unit/es_PR.txt +++ b/icu4c/source/data/unit/es_PR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_PR.xml diff --git a/icu4c/source/data/unit/es_PY.txt b/icu4c/source/data/unit/es_PY.txt index f673f314052..8f0c41c85d9 100755 --- a/icu4c/source/data/unit/es_PY.txt +++ b/icu4c/source/data/unit/es_PY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_PY.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_PY{ %%Parent{"es_419"} - Version{"2.1.19.94"} + Version{"2.1.22.17"} units{ duration{ year{ diff --git a/icu4c/source/data/unit/es_SV.txt b/icu4c/source/data/unit/es_SV.txt index 13c4ed5bedf..0729c4f0086 100755 --- a/icu4c/source/data/unit/es_SV.txt +++ b/icu4c/source/data/unit/es_SV.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_SV.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_SV{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/es_US.txt b/icu4c/source/data/unit/es_US.txt index ef80ba3bea6..53b0523caeb 100755 --- a/icu4c/source/data/unit/es_US.txt +++ b/icu4c/source/data/unit/es_US.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_US.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_US{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} unitsNarrow{ temperature{ fahrenheit{ diff --git a/icu4c/source/data/unit/es_UY.txt b/icu4c/source/data/unit/es_UY.txt index 8d0ebb92c64..5b2cbd590a6 100755 --- a/icu4c/source/data/unit/es_UY.txt +++ b/icu4c/source/data/unit/es_UY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_UY.xml diff --git a/icu4c/source/data/unit/es_VE.txt b/icu4c/source/data/unit/es_VE.txt index 585dcfff1f2..0269d9f953c 100755 --- a/icu4c/source/data/unit/es_VE.txt +++ b/icu4c/source/data/unit/es_VE.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/es_VE.xml @@ -8,5 +8,5 @@ // *************************************************************************** es_VE{ %%Parent{"es_419"} - Version{"2.1.19.14"} + Version{"2.1.22.17"} } diff --git a/icu4c/source/data/unit/et.txt b/icu4c/source/data/unit/et.txt index 510e354acac..658ad6d3ec4 100755 --- a/icu4c/source/data/unit/et.txt +++ b/icu4c/source/data/unit/et.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/et.xml // * // *************************************************************************** et{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm.ss"} @@ -106,6 +106,13 @@ et{ compound{ per{"{0} {1} kohta"} } + concentr{ + karat{ + dnam{"karaadid"} + one{"{0} karaat"} + other{"{0} karaati"} + } + } consumption{ liter-per-100kilometers{ dnam{"liitrid 100 kilomeetri kohta"} @@ -550,13 +557,6 @@ et{ other{"{0} naela ruuttolli kohta"} } } - proportion{ - karat{ - dnam{"karaadid"} - one{"{0} karaat"} - other{"{0} karaati"} - } - } speed{ kilometer-per-hour{ dnam{"kilomeetrid tunnis"} @@ -1053,6 +1053,13 @@ et{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karaat"} + one{"{0} ct"} + other{"{0} ct"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1484,13 +1491,6 @@ et{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karaat"} - one{"{0} ct"} - other{"{0} ct"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/eu.txt b/icu4c/source/data/unit/eu.txt index 7eb062b1ca8..41fe591061b 100755 --- a/icu4c/source/data/unit/eu.txt +++ b/icu4c/source/data/unit/eu.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/eu.xml // * // *************************************************************************** eu{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -98,6 +98,13 @@ eu{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kilate"} + one{"{0} kilate"} + other{"{0} kilate"} + } + } consumption{ liter-per-kilometer{ dnam{"litro kilometroko"} @@ -492,13 +499,6 @@ eu{ other{"{0} libra hazbete karratuko"} } } - proportion{ - karat{ - dnam{"kilate"} - one{"{0} kilate"} - other{"{0} kilate"} - } - } speed{ kilometer-per-hour{ dnam{"kilometro orduko"} @@ -954,6 +954,13 @@ eu{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"l/km"} @@ -1348,13 +1355,6 @@ eu{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/ewo.txt b/icu4c/source/data/unit/ewo.txt index 026f092c370..8833b11ae6c 100755 --- a/icu4c/source/data/unit/ewo.txt +++ b/icu4c/source/data/unit/ewo.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ewo.xml // * // *************************************************************************** ewo{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/fa.txt b/icu4c/source/data/unit/fa.txt index d982ee5cf24..fc2a401c1be 100755 --- a/icu4c/source/data/unit/fa.txt +++ b/icu4c/source/data/unit/fa.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fa.xml // * // *************************************************************************** fa{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ fa{ compound{ per{"{0} در {1}"} } + concentr{ + karat{ + dnam{"عیار"} + one{"{0} عیار"} + other{"{0} عیار"} + } + } consumption{ liter-per-100kilometers{ dnam{"لیتر در ۱۰۰ کیلومتر"} @@ -535,13 +542,6 @@ fa{ other{"{0} پوند در اینچ مربع"} } } - proportion{ - karat{ - dnam{"عیار"} - one{"{0} عیار"} - other{"{0} عیار"} - } - } speed{ kilometer-per-hour{ dnam{"کیلومتر در ساعت"} @@ -1102,6 +1102,13 @@ fa{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"عیار"} + one{"{0} عیار"} + other{"{0} عیار"} + } + } consumption{ liter-per-100kilometers{ dnam{"لیتر/۱۰۰ کیلومتر"} @@ -1531,13 +1538,6 @@ fa{ other{"{0}‎ psi"} } } - proportion{ - karat{ - dnam{"عیار"} - one{"{0} عیار"} - other{"{0} عیار"} - } - } speed{ kilometer-per-hour{ dnam{"کیلومتر در ساعت"} diff --git a/icu4c/source/data/unit/ff.txt b/icu4c/source/data/unit/ff.txt index 2e174c4c84f..fd703d70519 100755 --- a/icu4c/source/data/unit/ff.txt +++ b/icu4c/source/data/unit/ff.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ff.xml // * // *************************************************************************** ff{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/fil.txt b/icu4c/source/data/unit/fil.txt index 664f2eefb50..bf0ef0d74cc 100755 --- a/icu4c/source/data/unit/fil.txt +++ b/icu4c/source/data/unit/fil.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fil.xml // * // *************************************************************************** fil{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ fil{ compound{ per{"{0} kada {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} na karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"litro kada 100 kilometro"} @@ -535,13 +542,6 @@ fil{ other{"{0} na libra kada pulgadang parisukat"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} na karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometro kada oras"} @@ -1042,6 +1042,13 @@ fil{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1471,13 +1478,6 @@ fil{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/hr"} diff --git a/icu4c/source/data/unit/fil_PH.txt b/icu4c/source/data/unit/fil_PH.txt index da9fecfb68a..2a848a3b539 100755 --- a/icu4c/source/data/unit/fil_PH.txt +++ b/icu4c/source/data/unit/fil_PH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/fo.txt b/icu4c/source/data/unit/fo.txt index 7ac2c71a0c6..bcc32b4e60c 100755 --- a/icu4c/source/data/unit/fo.txt +++ b/icu4c/source/data/unit/fo.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fo.xml // * // *************************************************************************** fo{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ fo{ compound{ per{"{0} á {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"litrar fyri hvørjar 100 kilometrar"} @@ -535,13 +542,6 @@ fo{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometrar um tíman"} @@ -986,6 +986,13 @@ fo{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1415,13 +1422,6 @@ fo{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"km/t"} diff --git a/icu4c/source/data/unit/fr.txt b/icu4c/source/data/unit/fr.txt index 4e1903dd1f9..19096559db7 100755 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** fr{ - Version{"2.1.22.93"} + Version{"2.1.23.79"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} diff --git a/icu4c/source/data/unit/fr_CA.txt b/icu4c/source/data/unit/fr_CA.txt index 311eef5954a..7499631337b 100755 --- a/icu4c/source/data/unit/fr_CA.txt +++ b/icu4c/source/data/unit/fr_CA.txt @@ -181,11 +181,6 @@ fr_CA{ other{"{0} psi"} } } - temperature{ - generic{ - one{"{0}°"} - } - } volume{ centiliter{ dnam{"cL"} diff --git a/icu4c/source/data/unit/fr_HT.txt b/icu4c/source/data/unit/fr_HT.txt index 49816c774e7..6d95abd409b 100755 --- a/icu4c/source/data/unit/fr_HT.txt +++ b/icu4c/source/data/unit/fr_HT.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fr_HT.xml diff --git a/icu4c/source/data/unit/fur.txt b/icu4c/source/data/unit/fur.txt index 5106c9e8b6a..7cdb9e6d1ab 100755 --- a/icu4c/source/data/unit/fur.txt +++ b/icu4c/source/data/unit/fur.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fur.xml // * // *************************************************************************** fur{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/fy.txt b/icu4c/source/data/unit/fy.txt index c5fa1f2bc25..321f4123886 100755 --- a/icu4c/source/data/unit/fy.txt +++ b/icu4c/source/data/unit/fy.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/fy.xml // * // *************************************************************************** fy{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/ga.txt b/icu4c/source/data/unit/ga.txt index a40b56fd261..6761790e275 100755 --- a/icu4c/source/data/unit/ga.txt +++ b/icu4c/source/data/unit/ga.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ga.xml // * // *************************************************************************** ga{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -154,6 +154,16 @@ ga{ compound{ per{"{0} sa {1}"} } + concentr{ + karat{ + dnam{"carait óir"} + few{"{0} charat óir"} + many{"{0} gcarat óir"} + one{"{0} charat óir"} + other{"{0} carat óir"} + two{"{0} charat óir"} + } + } consumption{ liter-per-100kilometers{ dnam{"lítir sa 100 ciliméadar"} @@ -838,16 +848,6 @@ ga{ two{"{0} phunt san orlach cearnach"} } } - proportion{ - karat{ - dnam{"carait óir"} - few{"{0} charat óir"} - many{"{0} gcarat óir"} - one{"{0} charat óir"} - other{"{0} carat óir"} - two{"{0} charat óir"} - } - } speed{ kilometer-per-hour{ dnam{"ciliméadair san uair"} @@ -1180,6 +1180,16 @@ ga{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0}kt"} + many{"{0}kt"} + one{"{0}kt"} + other{"{0}kt"} + two{"{0}kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1779,16 +1789,6 @@ ga{ two{"{0}psoc"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0}kt"} - many{"{0}kt"} - one{"{0}kt"} - other{"{0}kt"} - two{"{0}kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/u"} @@ -2063,6 +2063,16 @@ ga{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -2742,16 +2752,6 @@ ga{ two{"{0} psoc"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/uair"} diff --git a/icu4c/source/data/unit/gd.txt b/icu4c/source/data/unit/gd.txt index ce25d339332..c45bb5716ef 100755 --- a/icu4c/source/data/unit/gd.txt +++ b/icu4c/source/data/unit/gd.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/gd.xml // * // *************************************************************************** gd{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ gd{ compound{ per{"{0} / {1}"} } + concentr{ + karat{ + dnam{"karat"} + few{"{0} karat"} + one{"{0} karat"} + other{"{0} karat"} + two{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liotair sa 100 chilemeatair"} @@ -742,15 +751,6 @@ gd{ two{"{0} phunnd san òirleach cheàrnagach"} } } - proportion{ - karat{ - dnam{"karat"} - few{"{0} karat"} - one{"{0} karat"} - other{"{0} karat"} - two{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"cilemeatair san uair"} @@ -1111,6 +1111,15 @@ gd{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + few{"{0}kt"} + one{"{0}kt"} + other{"{0}kt"} + two{"{0}kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1715,15 +1724,6 @@ gd{ two{"{0}psi"} } } - proportion{ - karat{ - dnam{"karat"} - few{"{0}kt"} - one{"{0}kt"} - other{"{0}kt"} - two{"{0}kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -2084,6 +2084,15 @@ gd{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -2688,15 +2697,6 @@ gd{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/uair"} diff --git a/icu4c/source/data/unit/gl.txt b/icu4c/source/data/unit/gl.txt index 3f13e49183d..a86c50bd8c3 100755 --- a/icu4c/source/data/unit/gl.txt +++ b/icu4c/source/data/unit/gl.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/gl.xml // * // *************************************************************************** gl{ - Version{"2.1.19.94"} + Version{"2.1.23.76"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ gl{ compound{ per{"{0} por {1}"} } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} quilate"} + other{"{0} quilates"} + } + } consumption{ liter-per-100kilometers{ dnam{"litros por 100 quilómetros"} @@ -535,13 +542,6 @@ gl{ other{"{0} libras por polgada cadrada"} } } - proportion{ - karat{ - dnam{"quilates"} - one{"{0} quilate"} - other{"{0} quilates"} - } - } speed{ kilometer-per-hour{ dnam{"quilómetros por hora"} @@ -926,6 +926,13 @@ gl{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} ct"} + other{"{0} ct"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100 km"} @@ -1355,13 +1362,6 @@ gl{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"quilates"} - one{"{0} ct"} - other{"{0} ct"} - } - } speed{ kilometer-per-hour{ dnam{"km/hora"} diff --git a/icu4c/source/data/unit/gsw.txt b/icu4c/source/data/unit/gsw.txt index c47793e453b..f325dd328c7 100755 --- a/icu4c/source/data/unit/gsw.txt +++ b/icu4c/source/data/unit/gsw.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/gsw.xml // * // *************************************************************************** gsw{ - Version{"2.1.19.74"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/gu.txt b/icu4c/source/data/unit/gu.txt index 199a20298f1..0725f86525c 100755 --- a/icu4c/source/data/unit/gu.txt +++ b/icu4c/source/data/unit/gu.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/gu.xml // * // *************************************************************************** gu{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ gu{ compound{ per{"{0} પ્રતિ {1}"} } + concentr{ + karat{ + dnam{"કૅરેટ"} + one{"{0} કૅરેટ"} + other{"{0} કૅરેટ"} + } + } consumption{ liter-per-100kilometers{ dnam{"લિટર પ્રતિ 100 કિલોમીટર"} @@ -535,13 +542,6 @@ gu{ other{"{0} પાઉન્ડ પ્રતિ વર્ગ ઇંચ"} } } - proportion{ - karat{ - dnam{"કૅરેટ"} - one{"{0} કૅરેટ"} - other{"{0} કૅરેટ"} - } - } speed{ kilometer-per-hour{ dnam{"કિલોમીટર પ્રતિ કલાક"} @@ -1043,6 +1043,13 @@ gu{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"કૅરેટ"} + one{"{0} કૅરેટ"} + other{"{0} કૅરેટ"} + } + } consumption{ liter-per-100kilometers{ dnam{"લિ/100 કિમી"} @@ -1472,13 +1479,6 @@ gu{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"કૅરેટ"} - one{"{0} કૅરેટ"} - other{"{0} કૅરેટ"} - } - } speed{ kilometer-per-hour{ dnam{"કિમી/કલાક"} diff --git a/icu4c/source/data/unit/guz.txt b/icu4c/source/data/unit/guz.txt index 6dc8a4f7180..037887ab6f2 100755 --- a/icu4c/source/data/unit/guz.txt +++ b/icu4c/source/data/unit/guz.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/guz.xml // * // *************************************************************************** guz{ - Version{"2.1.19.14"} + Version{"2.1.23.13"} } diff --git a/icu4c/source/data/unit/gv.txt b/icu4c/source/data/unit/gv.txt index cdf55f87411..3e37aee1b8f 100755 --- a/icu4c/source/data/unit/gv.txt +++ b/icu4c/source/data/unit/gv.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/gv.xml // * // *************************************************************************** gv{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ha.txt b/icu4c/source/data/unit/ha.txt index c37267e4a7c..2b32b6ccaf4 100755 --- a/icu4c/source/data/unit/ha.txt +++ b/icu4c/source/data/unit/ha.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ha.xml // * // *************************************************************************** ha{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/haw.txt b/icu4c/source/data/unit/haw.txt index 23dc91254aa..36372edccc1 100755 --- a/icu4c/source/data/unit/haw.txt +++ b/icu4c/source/data/unit/haw.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/haw.xml diff --git a/icu4c/source/data/unit/he_IL.txt b/icu4c/source/data/unit/he_IL.txt index cb8324741ac..8e940f0c30b 100755 --- a/icu4c/source/data/unit/he_IL.txt +++ b/icu4c/source/data/unit/he_IL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/hsb.txt b/icu4c/source/data/unit/hsb.txt index bdf51126566..8b9c8c81dfc 100755 --- a/icu4c/source/data/unit/hsb.txt +++ b/icu4c/source/data/unit/hsb.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/hsb.xml // * // *************************************************************************** hsb{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -125,6 +125,15 @@ hsb{ two{"{0} kwadratnej yardaj"} } } + concentr{ + karat{ + dnam{"karaty"} + few{"{0} karaty"} + one{"{0} karat"} + other{"{0} karatow"} + two{"{0} karataj"} + } + } consumption{ liter-per-kilometer{ dnam{"litry na kilometer"} @@ -667,15 +676,6 @@ hsb{ two{"{0} puntaj na kwadratny cól"} } } - proportion{ - karat{ - dnam{"karaty"} - few{"{0} karaty"} - one{"{0} karat"} - other{"{0} karatow"} - two{"{0} karataj"} - } - } speed{ kilometer-per-hour{ dnam{"kilometry na hodźinu"} @@ -1301,6 +1301,15 @@ hsb{ two{"{0} yd²"} } } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"l/km"} @@ -1843,15 +1852,6 @@ hsb{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/hy.txt b/icu4c/source/data/unit/hy.txt index e11a6382971..89968db4cf0 100755 --- a/icu4c/source/data/unit/hy.txt +++ b/icu4c/source/data/unit/hy.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/hy.xml // * // *************************************************************************** hy{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -103,6 +103,13 @@ hy{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"կարատ"} + one{"{0} կարատ"} + other{"{0} կարատ"} + } + } consumption{ liter-per-100kilometers{ dnam{"լիտրեր 100 կիլոմետրում"} @@ -518,13 +525,6 @@ hy{ other{"{0} ֆունտ ըստ քառակուսի դյույմի"} } } - proportion{ - karat{ - dnam{"կարատ"} - one{"{0} կարատ"} - other{"{0} կարատ"} - } - } speed{ kilometer-per-hour{ dnam{"կիլոմետրեր ժամում"} @@ -1013,6 +1013,13 @@ hy{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"կար"} + one{"{0} կար"} + other{"{0} կար"} + } + } consumption{ liter-per-100kilometers{ dnam{"լ/100 կմ"} @@ -1434,13 +1441,6 @@ hy{ other{"{0} ֆ.ք.դյմ"} } } - proportion{ - karat{ - dnam{"կար"} - one{"{0} կար"} - other{"{0} կար"} - } - } speed{ kilometer-per-hour{ dnam{"կմ/ժ"} diff --git a/icu4c/source/data/unit/id_ID.txt b/icu4c/source/data/unit/id_ID.txt index eda7d2c6444..d704f9d301c 100755 --- a/icu4c/source/data/unit/id_ID.txt +++ b/icu4c/source/data/unit/id_ID.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ig.txt b/icu4c/source/data/unit/ig.txt index ef741b1f484..bca1e5a40bc 100755 --- a/icu4c/source/data/unit/ig.txt +++ b/icu4c/source/data/unit/ig.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ig.xml // * // *************************************************************************** ig{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ii.txt b/icu4c/source/data/unit/ii.txt index 2db0838d2b1..9e5dd3672ad 100755 --- a/icu4c/source/data/unit/ii.txt +++ b/icu4c/source/data/unit/ii.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ii.xml // * // *************************************************************************** ii{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/in.txt b/icu4c/source/data/unit/in.txt index c0a4278d56f..b575e2e2006 100755 --- a/icu4c/source/data/unit/in.txt +++ b/icu4c/source/data/unit/in.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/in_ID.txt b/icu4c/source/data/unit/in_ID.txt index 6c76c2eb474..db42db50ce2 100755 --- a/icu4c/source/data/unit/in_ID.txt +++ b/icu4c/source/data/unit/in_ID.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/is.txt b/icu4c/source/data/unit/is.txt index 0dd86c1d5a1..917cf27cce6 100755 --- a/icu4c/source/data/unit/is.txt +++ b/icu4c/source/data/unit/is.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/is.xml // * // *************************************************************************** is{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ is{ compound{ per{"{0} á {1}"} } + concentr{ + karat{ + dnam{"karöt"} + one{"{0} karat"} + other{"{0} karöt"} + } + } consumption{ liter-per-100kilometers{ dnam{"lítrar á 100 kílómetra"} @@ -528,13 +535,6 @@ is{ other{"{0} pund á fertommu"} } } - proportion{ - karat{ - dnam{"karöt"} - one{"{0} karat"} - other{"{0} karöt"} - } - } speed{ kilometer-per-hour{ dnam{"kílómetrar á klukkustund"} @@ -1034,6 +1034,13 @@ is{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1457,13 +1464,6 @@ is{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"kílómetrar á klukkustund"} diff --git a/icu4c/source/data/unit/iw.txt b/icu4c/source/data/unit/iw.txt index a7db8ef063a..3477b345faf 100755 --- a/icu4c/source/data/unit/iw.txt +++ b/icu4c/source/data/unit/iw.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/iw_IL.txt b/icu4c/source/data/unit/iw_IL.txt index e2139898632..caeef7abfb6 100755 --- a/icu4c/source/data/unit/iw_IL.txt +++ b/icu4c/source/data/unit/iw_IL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ja_JP.txt b/icu4c/source/data/unit/ja_JP.txt index ecfe646c59b..46ab4979d92 100755 --- a/icu4c/source/data/unit/ja_JP.txt +++ b/icu4c/source/data/unit/ja_JP.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ja_JP_TRADITIONAL.txt b/icu4c/source/data/unit/ja_JP_TRADITIONAL.txt index 5eef82e57d9..ce3addb6af7 100755 --- a/icu4c/source/data/unit/ja_JP_TRADITIONAL.txt +++ b/icu4c/source/data/unit/ja_JP_TRADITIONAL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/jgo.txt b/icu4c/source/data/unit/jgo.txt index 61dec145260..16fb42b1e59 100755 --- a/icu4c/source/data/unit/jgo.txt +++ b/icu4c/source/data/unit/jgo.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/jgo.xml // * // *************************************************************************** jgo{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/jmc.txt b/icu4c/source/data/unit/jmc.txt index f8f55ba7162..9a0582c36ca 100755 --- a/icu4c/source/data/unit/jmc.txt +++ b/icu4c/source/data/unit/jmc.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/jmc.xml // * // *************************************************************************** jmc{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ka.txt b/icu4c/source/data/unit/ka.txt index 3eefd8238b8..cedf281cf8b 100755 --- a/icu4c/source/data/unit/ka.txt +++ b/icu4c/source/data/unit/ka.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ka.xml // * // *************************************************************************** ka{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ka{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"კარატი"} + one{"{0} კარატი"} + other{"{0} კარატი"} + } + } consumption{ liter-per-100kilometers{ dnam{"ლიტრი 100 კილომეტრში"} @@ -535,13 +542,6 @@ ka{ other{"{0} ფუნტი კვადრატულ დუიმზე"} } } - proportion{ - karat{ - dnam{"კარატი"} - one{"{0} კარატი"} - other{"{0} კარატი"} - } - } speed{ kilometer-per-hour{ dnam{"კილომეტრი საათში"} @@ -1042,6 +1042,13 @@ ka{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"კარატი"} + one{"{0} კარ."} + other{"{0} კარ."} + } + } consumption{ liter-per-100kilometers{ dnam{"ლ/100კმ"} @@ -1471,13 +1478,6 @@ ka{ other{"{0} ფნტ. კვ. დმ."} } } - proportion{ - karat{ - dnam{"კარატი"} - one{"{0} კარ."} - other{"{0} კარ."} - } - } speed{ kilometer-per-hour{ dnam{"კმ/სთ"} diff --git a/icu4c/source/data/unit/kab.txt b/icu4c/source/data/unit/kab.txt index 23e42c6403b..a664159a210 100755 --- a/icu4c/source/data/unit/kab.txt +++ b/icu4c/source/data/unit/kab.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kab.xml // * // *************************************************************************** kab{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/kam.txt b/icu4c/source/data/unit/kam.txt index 862736f1def..584f96e4b61 100755 --- a/icu4c/source/data/unit/kam.txt +++ b/icu4c/source/data/unit/kam.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kam.xml // * // *************************************************************************** kam{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/kde.txt b/icu4c/source/data/unit/kde.txt index 2b50bdc03ab..47276c17ffb 100755 --- a/icu4c/source/data/unit/kde.txt +++ b/icu4c/source/data/unit/kde.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kde.xml // * // *************************************************************************** kde{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/kea.txt b/icu4c/source/data/unit/kea.txt index 903e28b2787..c6fcc3d6a14 100755 --- a/icu4c/source/data/unit/kea.txt +++ b/icu4c/source/data/unit/kea.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kea.xml // * // *************************************************************************** kea{ - Version{"2.1.19.74"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -72,6 +72,12 @@ kea{ other{"{0} jarda kuadradu"} } } + concentr{ + karat{ + dnam{"kilati"} + other{"{0} kilati"} + } + } consumption{ liter-per-kilometer{ dnam{"litru pur kilómetru"} @@ -245,12 +251,6 @@ kea{ dnam{"watt"} } } - proportion{ - karat{ - dnam{"kilati"} - other{"{0} kilati"} - } - } speed{ kilometer-per-hour{ dnam{"kilómetru pur ora"} @@ -493,6 +493,12 @@ kea{ other{"{0} yd²"} } } + concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"l/km"} @@ -799,12 +805,6 @@ kea{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/khq.txt b/icu4c/source/data/unit/khq.txt index 725d3d357fe..6914c35d0f8 100755 --- a/icu4c/source/data/unit/khq.txt +++ b/icu4c/source/data/unit/khq.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/khq.xml // * // *************************************************************************** khq{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ki.txt b/icu4c/source/data/unit/ki.txt index 08ef53bf10a..12e00b6e09c 100755 --- a/icu4c/source/data/unit/ki.txt +++ b/icu4c/source/data/unit/ki.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ki.xml // * // *************************************************************************** ki{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/kk.txt b/icu4c/source/data/unit/kk.txt index 8be0a6a7c5b..f9184907938 100755 --- a/icu4c/source/data/unit/kk.txt +++ b/icu4c/source/data/unit/kk.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kk.xml // * // *************************************************************************** kk{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ kk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} карат"} + other{"{0} карат"} + } + } consumption{ liter-per-100kilometers{ dnam{"литр/100 километр"} @@ -535,13 +542,6 @@ kk{ other{"{0} фунт/шаршы дюйм"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} карат"} - other{"{0} карат"} - } - } speed{ kilometer-per-hour{ dnam{"километр/сағат"} @@ -1042,6 +1042,13 @@ kk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} КТ"} + other{"{0} КТ"} + } + } consumption{ liter-per-100kilometers{ dnam{"л/100 км"} @@ -1471,13 +1478,6 @@ kk{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} КТ"} - other{"{0} КТ"} - } - } speed{ kilometer-per-hour{ dnam{"км/сағ"} diff --git a/icu4c/source/data/unit/kkj.txt b/icu4c/source/data/unit/kkj.txt index 159f49fa1f5..f70da979699 100755 --- a/icu4c/source/data/unit/kkj.txt +++ b/icu4c/source/data/unit/kkj.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kkj.xml diff --git a/icu4c/source/data/unit/kl.txt b/icu4c/source/data/unit/kl.txt index 461178ba8a2..eb0ba93d72f 100755 --- a/icu4c/source/data/unit/kl.txt +++ b/icu4c/source/data/unit/kl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kl.xml diff --git a/icu4c/source/data/unit/kln.txt b/icu4c/source/data/unit/kln.txt index 428df43d1de..3eca5b698ba 100755 --- a/icu4c/source/data/unit/kln.txt +++ b/icu4c/source/data/unit/kln.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kln.xml // * // *************************************************************************** kln{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/km.txt b/icu4c/source/data/unit/km.txt index ea28c67fe27..98398926db9 100755 --- a/icu4c/source/data/unit/km.txt +++ b/icu4c/source/data/unit/km.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/km.xml // * // *************************************************************************** km{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ km{ compound{ per{"{0}​ ក្នុង​មួយ​ {1}"} } + concentr{ + karat{ + dnam{"ការ៉ាត់"} + other{"{0} ការ៉ាត់"} + } + } consumption{ liter-per-100kilometers{ dnam{"លីត្រក្នុង 100 គីឡូម៉ែត្រ"} @@ -442,12 +448,6 @@ km{ other{"{0} ផោន​ក្នុង​មួយ​អ៊ីញ​ការ៉េ"} } } - proportion{ - karat{ - dnam{"ការ៉ាត់"} - other{"{0} ការ៉ាត់"} - } - } speed{ kilometer-per-hour{ dnam{"គីឡូម៉ែត្រ​ក្នុង​មួយ​ម៉ោង"} @@ -854,6 +854,12 @@ km{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ការ៉ាត់"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1206,12 +1212,6 @@ km{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ការ៉ាត់"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/kn.txt b/icu4c/source/data/unit/kn.txt index 52be05d223b..5d27f1c7008 100755 --- a/icu4c/source/data/unit/kn.txt +++ b/icu4c/source/data/unit/kn.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kn.xml // * // *************************************************************************** kn{ - Version{"2.1.19.77"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ kn{ compound{ per{"{0} ಪ್ರತಿ {1} ಗೆ"} } + concentr{ + karat{ + dnam{"ಕಾರಟ್‌ಗಳು"} + one{"{0} ಕಾರಟ್‌"} + other{"{0} ಕಾರಟ್‌ಗಳು"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -535,13 +542,6 @@ kn{ other{"{0} ಪ್ರತಿ ಚದರ ಇಂಚಿಗೆ ಪೌಂಡ್‌ಗಳು"} } } - proportion{ - karat{ - dnam{"ಕಾರಟ್‌ಗಳು"} - one{"{0} ಕಾರಟ್‌"} - other{"{0} ಕಾರಟ್‌ಗಳು"} - } - } speed{ kilometer-per-hour{ dnam{"ಗಂಟೆಗೆ ಕಿಲೋಮೀಟರ್‌ಗಳು"} @@ -1042,6 +1042,13 @@ kn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ಕಾರ."} + one{"{0} ಕಾರ."} + other{"{0} ಕಾರ."} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1471,13 +1478,6 @@ kn{ other{"{0} ಪ್ರ.ಚ.ಇಂ.ಪೌಂ."} } } - proportion{ - karat{ - dnam{"ಕಾರ."} - one{"{0} ಕಾರ."} - other{"{0} ಕಾರ."} - } - } speed{ kilometer-per-hour{ dnam{"ಕಿ.ಮೀ/ಗಂ"} diff --git a/icu4c/source/data/unit/ko.txt b/icu4c/source/data/unit/ko.txt index d9319fe106a..9406c026a38 100755 --- a/icu4c/source/data/unit/ko.txt +++ b/icu4c/source/data/unit/ko.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ko.xml // * // *************************************************************************** ko{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ ko{ compound{ per{"{1}당 {0}"} } + concentr{ + karat{ + dnam{"캐럿"} + other{"{0}캐럿"} + } + } consumption{ liter-per-100kilometers{ dnam{"100킬로미터당 리터"} @@ -442,12 +448,6 @@ ko{ other{"{0}제곱인치당 파운드"} } } - proportion{ - karat{ - dnam{"캐럿"} - other{"{0}캐럿"} - } - } speed{ kilometer-per-hour{ dnam{"시간당 킬로미터"} @@ -854,6 +854,12 @@ ko{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"{0}kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1206,12 +1212,6 @@ ko{ other{"{0}psi"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0}kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/kok.txt b/icu4c/source/data/unit/kok.txt index 211c3e789b9..dd07ae3f874 100755 --- a/icu4c/source/data/unit/kok.txt +++ b/icu4c/source/data/unit/kok.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kok.xml // * // *************************************************************************** kok{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ks.txt b/icu4c/source/data/unit/ks.txt index 6b10b3ac372..f14595500ac 100755 --- a/icu4c/source/data/unit/ks.txt +++ b/icu4c/source/data/unit/ks.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ks.xml // * // *************************************************************************** ks{ - Version{"2.1.19.74"} + Version{"2.1.21.28"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/ksb.txt b/icu4c/source/data/unit/ksb.txt index 122102dc133..96db629f76c 100755 --- a/icu4c/source/data/unit/ksb.txt +++ b/icu4c/source/data/unit/ksb.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ksb.xml // * // *************************************************************************** ksb{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ksf.txt b/icu4c/source/data/unit/ksf.txt index 5623b5f13e4..18003fa129d 100755 --- a/icu4c/source/data/unit/ksf.txt +++ b/icu4c/source/data/unit/ksf.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ksf.xml // * // *************************************************************************** ksf{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ksh.txt b/icu4c/source/data/unit/ksh.txt index dc59d11bd11..cc538010d6b 100755 --- a/icu4c/source/data/unit/ksh.txt +++ b/icu4c/source/data/unit/ksh.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ksh.xml // * // *************************************************************************** ksh{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/kw.txt b/icu4c/source/data/unit/kw.txt index f84d9178315..846f52aed91 100755 --- a/icu4c/source/data/unit/kw.txt +++ b/icu4c/source/data/unit/kw.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/kw.xml // * // *************************************************************************** kw{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ky.txt b/icu4c/source/data/unit/ky.txt index f24f25fee38..39714c16873 100755 --- a/icu4c/source/data/unit/ky.txt +++ b/icu4c/source/data/unit/ky.txt @@ -1,17 +1,17 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ky.xml // * // *************************************************************************** ky{ - Version{"2.1.19.19"} + Version{"2.1.22.93"} durationUnits{ - hm{"ст:мүн"} - hms{"ст:мүн:сек"} - ms{"мүн:сек"} + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} } units{ acceleration{ @@ -106,6 +106,13 @@ ky{ compound{ per{"{1}/{0}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} карат"} + other{"{0} карат"} + } + } consumption{ liter-per-100kilometers{ dnam{"100 километрге литр"} @@ -535,13 +542,6 @@ ky{ other{"чарчы дюймга {0} фунт"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} карат"} - other{"{0} карат"} - } - } speed{ kilometer-per-hour{ dnam{"саатына километр"} @@ -1042,6 +1042,13 @@ ky{ compound{ per{"{1}/{0}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} кт"} + other{"{0} кт"} + } + } consumption{ liter-per-100kilometers{ dnam{"100 км/л"} @@ -1471,13 +1478,6 @@ ky{ other{"{0} фчд"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} кт"} - other{"{0} кт"} - } - } speed{ kilometer-per-hour{ dnam{"км/саат"} diff --git a/icu4c/source/data/unit/lag.txt b/icu4c/source/data/unit/lag.txt index c0ffcc8497e..3063e67a406 100755 --- a/icu4c/source/data/unit/lag.txt +++ b/icu4c/source/data/unit/lag.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lag.xml // * // *************************************************************************** lag{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/lb.txt b/icu4c/source/data/unit/lb.txt index d1ba4faed90..48d9c468d5a 100755 --- a/icu4c/source/data/unit/lb.txt +++ b/icu4c/source/data/unit/lb.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lb.xml // * // *************************************************************************** lb{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -95,6 +95,13 @@ lb{ other{"{0} Quadratyards"} } } + concentr{ + karat{ + dnam{"Karat"} + one{"{0} Karat"} + other{"{0} Karat"} + } + } consumption{ liter-per-kilometer{ dnam{"Liter pro Kilometer"} @@ -499,13 +506,6 @@ lb{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"Karat"} - one{"{0} Karat"} - other{"{0} Karat"} - } - } speed{ kilometer-per-hour{ dnam{"Kilometer pro Stonn"} @@ -1124,6 +1124,13 @@ lb{ other{"{0} yd²"} } } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"l/km"} @@ -1533,13 +1540,6 @@ lb{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/lg.txt b/icu4c/source/data/unit/lg.txt index 81d51c769ed..b9e9d35e40f 100755 --- a/icu4c/source/data/unit/lg.txt +++ b/icu4c/source/data/unit/lg.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lg.xml // * // *************************************************************************** lg{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/lkt.txt b/icu4c/source/data/unit/lkt.txt index 5ef967909dc..dd234e7a28a 100755 --- a/icu4c/source/data/unit/lkt.txt +++ b/icu4c/source/data/unit/lkt.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lkt.xml diff --git a/icu4c/source/data/unit/ln.txt b/icu4c/source/data/unit/ln.txt index 0888199dd6f..d5f70ec749d 100755 --- a/icu4c/source/data/unit/ln.txt +++ b/icu4c/source/data/unit/ln.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ln.xml // * // *************************************************************************** ln{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/lo.txt b/icu4c/source/data/unit/lo.txt index adf41f6b630..0518ad461ff 100755 --- a/icu4c/source/data/unit/lo.txt +++ b/icu4c/source/data/unit/lo.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lo.xml // * // *************************************************************************** lo{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ lo{ compound{ per{"{0} ຕໍ່ {1}"} } + concentr{ + karat{ + dnam{"ກະຣັດ"} + other{"{0} ກະຣັດ"} + } + } consumption{ liter-per-100kilometers{ dnam{"ລິດ ຕໍ່ 100 ກິໂລເເມັດ"} @@ -442,12 +448,6 @@ lo{ other{"{0} pounds per square inch"} } } - proportion{ - karat{ - dnam{"ກະຣັດ"} - other{"{0} ກະຣັດ"} - } - } speed{ kilometer-per-hour{ dnam{"ກິໂລແມັດຕໍ່ຊົ່ວໂມງ"} @@ -861,6 +861,12 @@ lo{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ກະຣັດ"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"ລ/ 100 ກມ"} @@ -1213,12 +1219,6 @@ lo{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ກະຣັດ"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"ກມ/ຊມ"} diff --git a/icu4c/source/data/unit/lrc.txt b/icu4c/source/data/unit/lrc.txt index 811579b032e..6feea04d6a3 100755 --- a/icu4c/source/data/unit/lrc.txt +++ b/icu4c/source/data/unit/lrc.txt @@ -1,16 +1,16 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lrc.xml // * // *************************************************************************** lrc{ - Version{"2.1.19.97"} + Version{"2.1.23.7"} durationUnits{ - hm{"ساأت:دئقه"} - hms{"ساأت:دئقه:ثانیه"} - ms{"دئیقه:ثانیه"} + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} } } diff --git a/icu4c/source/data/unit/lt.txt b/icu4c/source/data/unit/lt.txt index b1cb32f4b01..9d851f6db59 100755 --- a/icu4c/source/data/unit/lt.txt +++ b/icu4c/source/data/unit/lt.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lt.xml // * // *************************************************************************** lt{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -138,6 +138,15 @@ lt{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karatai"} + few{"{0} karatai"} + many{"{0} karato"} + one{"{0} karatas"} + other{"{0} karatų"} + } + } consumption{ liter-per-100kilometers{ dnam{"litrai 100 kilometrų"} @@ -742,15 +751,6 @@ lt{ other{"{0} svarų kv. colyje"} } } - proportion{ - karat{ - dnam{"karatai"} - few{"{0} karatai"} - many{"{0} karato"} - one{"{0} karatas"} - other{"{0} karatų"} - } - } speed{ kilometer-per-hour{ dnam{"kilometrai per valandą"} @@ -1512,6 +1512,15 @@ lt{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -2116,15 +2125,6 @@ lt{ other{"{0} lb in²"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/val."} diff --git a/icu4c/source/data/unit/lu.txt b/icu4c/source/data/unit/lu.txt index 4da55d3584d..1464d455eb8 100755 --- a/icu4c/source/data/unit/lu.txt +++ b/icu4c/source/data/unit/lu.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lu.xml // * // *************************************************************************** lu{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/luo.txt b/icu4c/source/data/unit/luo.txt index 53c305ee61b..d94b952d97c 100755 --- a/icu4c/source/data/unit/luo.txt +++ b/icu4c/source/data/unit/luo.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/luo.xml // * // *************************************************************************** luo{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/luy.txt b/icu4c/source/data/unit/luy.txt index df8fd94848c..dbb08805fa6 100755 --- a/icu4c/source/data/unit/luy.txt +++ b/icu4c/source/data/unit/luy.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/luy.xml // * // *************************************************************************** luy{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/lv.txt b/icu4c/source/data/unit/lv.txt index 1536fca1e1b..82f66e57144 100755 --- a/icu4c/source/data/unit/lv.txt +++ b/icu4c/source/data/unit/lv.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/lv.xml // * // *************************************************************************** lv{ - Version{"2.1.19.19"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -122,6 +122,14 @@ lv{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karāti"} + one{"{0} karāts"} + other{"{0} karāti"} + zero{"{0} karāti"} + } + } consumption{ liter-per-100kilometers{ dnam{"litri uz 100 kilometriem"} @@ -627,14 +635,6 @@ lv{ zero{"{0} mārciņas uz kvadrātcollu"} } } - proportion{ - karat{ - dnam{"karāti"} - one{"{0} karāts"} - other{"{0} karāti"} - zero{"{0} karāti"} - } - } speed{ kilometer-per-hour{ dnam{"kilometri stundā"} @@ -1224,6 +1224,14 @@ lv{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + zero{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1730,14 +1738,6 @@ lv{ zero{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - zero{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/st."} diff --git a/icu4c/source/data/unit/mas.txt b/icu4c/source/data/unit/mas.txt index 91a390c05d8..03278b46462 100755 --- a/icu4c/source/data/unit/mas.txt +++ b/icu4c/source/data/unit/mas.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mas.xml // * // *************************************************************************** mas{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/mer.txt b/icu4c/source/data/unit/mer.txt index f896c9dba48..46b20e95eb7 100755 --- a/icu4c/source/data/unit/mer.txt +++ b/icu4c/source/data/unit/mer.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mer.xml // * // *************************************************************************** mer{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/mfe.txt b/icu4c/source/data/unit/mfe.txt index 13cb111ddcb..0984cb2c93f 100755 --- a/icu4c/source/data/unit/mfe.txt +++ b/icu4c/source/data/unit/mfe.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mfe.xml // * // *************************************************************************** mfe{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/mg.txt b/icu4c/source/data/unit/mg.txt index d17ed17637a..4ecc3187e18 100755 --- a/icu4c/source/data/unit/mg.txt +++ b/icu4c/source/data/unit/mg.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mg.xml // * // *************************************************************************** mg{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/mgh.txt b/icu4c/source/data/unit/mgh.txt index a2c64d10626..757e71c17fa 100755 --- a/icu4c/source/data/unit/mgh.txt +++ b/icu4c/source/data/unit/mgh.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mgh.xml // * // *************************************************************************** mgh{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/mgo.txt b/icu4c/source/data/unit/mgo.txt index 3acb940bed3..97087332366 100755 --- a/icu4c/source/data/unit/mgo.txt +++ b/icu4c/source/data/unit/mgo.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mgo.xml // * // *************************************************************************** mgo{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/mk.txt b/icu4c/source/data/unit/mk.txt index 45e51dc161c..087af639ecb 100755 --- a/icu4c/source/data/unit/mk.txt +++ b/icu4c/source/data/unit/mk.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mk.xml // * // *************************************************************************** mk{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ mk{ compound{ per{"{0} на {1}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} карат"} + other{"{0} карати"} + } + } consumption{ liter-per-100kilometers{ dnam{"литри на 100 километри"} @@ -550,13 +557,6 @@ mk{ other{"{0} фунти на квадратен инч"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} карат"} - other{"{0} карати"} - } - } speed{ kilometer-per-hour{ dnam{"километри на час"} @@ -796,6 +796,12 @@ mk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + one{"{0} кт"} + other{"{0} кт"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1084,12 +1090,6 @@ mk{ other{"{0}mm Hg"} } } - proportion{ - karat{ - one{"{0} кт"} - other{"{0} кт"} - } - } speed{ kilometer-per-hour{ dnam{"км/ч"} @@ -1303,6 +1303,13 @@ mk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карати"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1747,13 +1754,6 @@ mk{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"карати"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"км/час"} diff --git a/icu4c/source/data/unit/ml.txt b/icu4c/source/data/unit/ml.txt index baae205436a..91271a9d5ee 100755 --- a/icu4c/source/data/unit/ml.txt +++ b/icu4c/source/data/unit/ml.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ml.xml // * // *************************************************************************** ml{ - Version{"2.1.19.77"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ml{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ക്യാരറ്റ്"} + one{"{0} ക്യാരറ്റ്"} + other{"{0} ക്യാരറ്റ്"} + } + } consumption{ liter-per-100kilometers{ dnam{"ലിറ്റർ/100 കിലോമീറ്റർ"} @@ -535,13 +542,6 @@ ml{ other{"{0} ചതുരശ്ര ഇഞ്ചിലുള്ള റാത്തൽ"} } } - proportion{ - karat{ - dnam{"ക്യാരറ്റ്"} - one{"{0} ക്യാരറ്റ്"} - other{"{0} ക്യാരറ്റ്"} - } - } speed{ kilometer-per-hour{ dnam{"കിലോമീറ്റർ/മണിക്കൂർ"} @@ -1042,6 +1042,13 @@ ml{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ക്യാരറ്റ്"} + one{"{0} ക്യാ."} + other{"{0} ക്യാ."} + } + } consumption{ liter-per-100kilometers{ dnam{"ലി./100 കി.മീ."} @@ -1471,13 +1478,6 @@ ml{ other{"{0} പിഎസ്ഐ"} } } - proportion{ - karat{ - dnam{"ക്യാരറ്റ്"} - one{"{0} ക്യാ."} - other{"{0} ക്യാ."} - } - } speed{ kilometer-per-hour{ dnam{"കി.മീ/മ."} diff --git a/icu4c/source/data/unit/mn.txt b/icu4c/source/data/unit/mn.txt index c542d7177ec..c6a1c80c3ac 100755 --- a/icu4c/source/data/unit/mn.txt +++ b/icu4c/source/data/unit/mn.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mn.xml // * // *************************************************************************** mn{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -98,6 +98,13 @@ mn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} карат"} + other{"{0} карат"} + } + } consumption{ liter-per-kilometer{ dnam{"литр/километр"} @@ -492,13 +499,6 @@ mn{ other{"{0} фунт инч квадрат"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} карат"} - other{"{0} карат"} - } - } speed{ kilometer-per-hour{ dnam{"километр/цаг"} @@ -954,6 +954,13 @@ mn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карат"} + one{"{0} кт"} + other{"{0} кт"} + } + } consumption{ liter-per-kilometer{ dnam{"литр/км"} @@ -1348,13 +1355,6 @@ mn{ other{"{0} ф ин кв"} } } - proportion{ - karat{ - dnam{"карат"} - one{"{0} кт"} - other{"{0} кт"} - } - } speed{ kilometer-per-hour{ dnam{"км/цаг"} diff --git a/icu4c/source/data/unit/mo.txt b/icu4c/source/data/unit/mo.txt index 826119612e9..31e165ab1b5 100755 --- a/icu4c/source/data/unit/mo.txt +++ b/icu4c/source/data/unit/mo.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/mr.txt b/icu4c/source/data/unit/mr.txt index 4572d164089..d9cd74b0d28 100755 --- a/icu4c/source/data/unit/mr.txt +++ b/icu4c/source/data/unit/mr.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mr.xml // * // *************************************************************************** mr{ - Version{"2.1.19.53"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ mr{ compound{ per{"{0} प्रति {1}"} } + concentr{ + karat{ + dnam{"कॅरेट्स"} + one{"{0} कॅरेट"} + other{"{0} कॅरेट्स"} + } + } consumption{ liter-per-100kilometers{ dnam{"लीटर प्रति 100 किलोमीटर"} @@ -535,13 +542,6 @@ mr{ other{"{0} प्रति चौरस इंच पाउंड"} } } - proportion{ - karat{ - dnam{"कॅरेट्स"} - one{"{0} कॅरेट"} - other{"{0} कॅरेट्स"} - } - } speed{ kilometer-per-hour{ dnam{"किलोमीटर प्रति तास"} @@ -1042,6 +1042,13 @@ mr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"कॅरेट्स"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"ली/100किमी"} @@ -1471,13 +1478,6 @@ mr{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"कॅरेट्स"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"किमी/तास"} diff --git a/icu4c/source/data/unit/mt.txt b/icu4c/source/data/unit/mt.txt index 41592d56ba0..cab3b4acf52 100755 --- a/icu4c/source/data/unit/mt.txt +++ b/icu4c/source/data/unit/mt.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mt.xml // * // *************************************************************************** mt{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} units{ angle{ arc-minute{ @@ -17,6 +17,15 @@ mt{ other{"{0}′"} } } + concentr{ + karat{ + dnam{"karati"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"L/km"} @@ -67,15 +76,6 @@ mt{ other{"{0} lx"} } } - proportion{ - karat{ - dnam{"karati"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } } unitsNarrow{ duration{ @@ -89,6 +89,15 @@ mt{ } } unitsShort{ + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-kilometer{ dnam{"L/km"} @@ -145,14 +154,5 @@ mt{ other{"{0} lx"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } } } diff --git a/icu4c/source/data/unit/mua.txt b/icu4c/source/data/unit/mua.txt index 746a1650e21..d3bca883420 100755 --- a/icu4c/source/data/unit/mua.txt +++ b/icu4c/source/data/unit/mua.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mua.xml // * // *************************************************************************** mua{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/my.txt b/icu4c/source/data/unit/my.txt index 07b5dccb9f8..836030c8157 100755 --- a/icu4c/source/data/unit/my.txt +++ b/icu4c/source/data/unit/my.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/my.xml // * // *************************************************************************** my{ - Version{"2.1.19.17"} + Version{"2.1.23.84"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -89,6 +89,12 @@ my{ compound{ per{"{0}လျှင်{1}နှုန်း"} } + concentr{ + karat{ + dnam{"ကရက်"} + other{"{0} ကရက်"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -441,12 +447,6 @@ my{ other{"၁စတုရန်းလက်မ {0}ပေါင်နှုန်း"} } } - proportion{ - karat{ - dnam{"ကရက်"} - other{"{0} ကရက်"} - } - } speed{ kilometer-per-hour{ dnam{"ကီလိုမီတာ/နာရီ"} @@ -853,6 +853,12 @@ my{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ကရက်"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1205,12 +1211,6 @@ my{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ကရက်"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"ကီလိုမီတာ/နာရီ"} diff --git a/icu4c/source/data/unit/mzn.txt b/icu4c/source/data/unit/mzn.txt index 0735c64f2ac..ebc11e8ce2d 100755 --- a/icu4c/source/data/unit/mzn.txt +++ b/icu4c/source/data/unit/mzn.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/mzn.xml // * // *************************************************************************** mzn{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -49,6 +49,12 @@ mzn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -303,12 +309,6 @@ mzn{ other{"{0} وات"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"کیلومتر بر ساعت"} @@ -559,6 +559,12 @@ mzn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -813,12 +819,6 @@ mzn{ other{"{0} W"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"کیلومتر بر ساعت"} diff --git a/icu4c/source/data/unit/naq.txt b/icu4c/source/data/unit/naq.txt index 955225f8d0a..0263d7ef1a6 100755 --- a/icu4c/source/data/unit/naq.txt +++ b/icu4c/source/data/unit/naq.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/naq.xml // * // *************************************************************************** naq{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/nb.txt b/icu4c/source/data/unit/nb.txt index abd1c174d57..3780b956eda 100755 --- a/icu4c/source/data/unit/nb.txt +++ b/icu4c/source/data/unit/nb.txt @@ -7,11 +7,20 @@ // * // *************************************************************************** nb{ - Version{"2.1.22.93"} + Version{"2.1.23.79"} durationUnits{ - hm{"h.mm"} - hms{"h.mm.ss"} - ms{"m.ss"} + hm{ + "h.mm", + "h:mm", + } + hms{ + "h.mm.ss", + "h:mm:ss", + } + ms{ + "m.ss", + "m:ss", + } } units{ acceleration{ diff --git a/icu4c/source/data/unit/nb_NO.txt b/icu4c/source/data/unit/nb_NO.txt index 2ba5fc31fea..25fc47dce6f 100755 --- a/icu4c/source/data/unit/nb_NO.txt +++ b/icu4c/source/data/unit/nb_NO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/nd.txt b/icu4c/source/data/unit/nd.txt index ae84fc48a90..f5603ee7634 100755 --- a/icu4c/source/data/unit/nd.txt +++ b/icu4c/source/data/unit/nd.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nd.xml // * // *************************************************************************** nd{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/ne.txt b/icu4c/source/data/unit/ne.txt index 89335bc7f14..50985d4151a 100755 --- a/icu4c/source/data/unit/ne.txt +++ b/icu4c/source/data/unit/ne.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ne.xml // * // *************************************************************************** ne{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ne{ compound{ per{"{0}प्रति{1}"} } + concentr{ + karat{ + dnam{"कराट"} + one{"{0}कराट"} + other{"{0}कराट"} + } + } consumption{ liter-per-100kilometers{ dnam{"लिटर प्रति १०० किलोमिटर"} @@ -535,13 +542,6 @@ ne{ other{"{0}पाउन्ड प्रति वर्ग इन्च"} } } - proportion{ - karat{ - dnam{"कराट"} - one{"{0}कराट"} - other{"{0}कराट"} - } - } speed{ kilometer-per-hour{ dnam{"किलोमिटर प्रति घण्टा"} @@ -1044,6 +1044,13 @@ ne{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"कराट"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"लि./१००कि.मि."} @@ -1473,13 +1480,6 @@ ne{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"कराट"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"किलोमिटर प्रति घण्टा"} diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index a4b905664be..dd89b660a02 100755 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** nl{ - Version{"2.1.22.93"} + Version{"2.1.23.81"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/nmg.txt b/icu4c/source/data/unit/nmg.txt index fb06a1bcd70..eb5887b12b6 100755 --- a/icu4c/source/data/unit/nmg.txt +++ b/icu4c/source/data/unit/nmg.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nmg.xml // * // *************************************************************************** nmg{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/nn.txt b/icu4c/source/data/unit/nn.txt index cd9b4e9c547..348e63dfdbe 100755 --- a/icu4c/source/data/unit/nn.txt +++ b/icu4c/source/data/unit/nn.txt @@ -1,17 +1,26 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nn.xml // * // *************************************************************************** nn{ - Version{"2.1.19.14"} + Version{"2.1.23.66"} durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} - ms{"m:ss"} + hm{ + "h.mm", + "h:mm", + } + hms{ + "h.mm.ss", + "h:mm:ss", + } + ms{ + "m.ss", + "m:ss", + } } unitsNarrow{ area{ diff --git a/icu4c/source/data/unit/nn_NO.txt b/icu4c/source/data/unit/nn_NO.txt index ef57e68962d..6741c51f50d 100755 --- a/icu4c/source/data/unit/nn_NO.txt +++ b/icu4c/source/data/unit/nn_NO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/nnh.txt b/icu4c/source/data/unit/nnh.txt index def882f34f2..c8f38ae442c 100755 --- a/icu4c/source/data/unit/nnh.txt +++ b/icu4c/source/data/unit/nnh.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nnh.xml // * // *************************************************************************** nnh{ - Version{"2.1.19.67"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/no.txt b/icu4c/source/data/unit/no.txt index fdd855f5489..56aa6e909b1 100755 --- a/icu4c/source/data/unit/no.txt +++ b/icu4c/source/data/unit/no.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/no_NO.txt b/icu4c/source/data/unit/no_NO.txt index 63cbf337c56..830a4252f8f 100755 --- a/icu4c/source/data/unit/no_NO.txt +++ b/icu4c/source/data/unit/no_NO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/no_NO_NY.txt b/icu4c/source/data/unit/no_NO_NY.txt index a9b8ef44d03..41bd7d7dbff 100755 --- a/icu4c/source/data/unit/no_NO_NY.txt +++ b/icu4c/source/data/unit/no_NO_NY.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/nus.txt b/icu4c/source/data/unit/nus.txt index 1be551c93aa..70cfcc4ba57 100755 --- a/icu4c/source/data/unit/nus.txt +++ b/icu4c/source/data/unit/nus.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nus.xml // * // *************************************************************************** nus{ - Version{"2.1.19.38"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/nyn.txt b/icu4c/source/data/unit/nyn.txt index 31c5e726fc7..677c3f2a93b 100755 --- a/icu4c/source/data/unit/nyn.txt +++ b/icu4c/source/data/unit/nyn.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/nyn.xml // * // *************************************************************************** nyn{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/om.txt b/icu4c/source/data/unit/om.txt index 44ca415b669..9019e929ddf 100755 --- a/icu4c/source/data/unit/om.txt +++ b/icu4c/source/data/unit/om.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/om.xml // * // *************************************************************************** om{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/or.txt b/icu4c/source/data/unit/or.txt index 0db06da31ff..f2c4f23c20b 100755 --- a/icu4c/source/data/unit/or.txt +++ b/icu4c/source/data/unit/or.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/or.xml // * // *************************************************************************** or{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/os.txt b/icu4c/source/data/unit/os.txt index 38fb51ba39e..86e55983805 100755 --- a/icu4c/source/data/unit/os.txt +++ b/icu4c/source/data/unit/os.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/os.xml // * // *************************************************************************** os{ - Version{"2.1.19.14"} + Version{"2.1.23.13"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/pa.txt b/icu4c/source/data/unit/pa.txt index 7317c282dee..3902cc6346c 100755 --- a/icu4c/source/data/unit/pa.txt +++ b/icu4c/source/data/unit/pa.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pa.xml // * // *************************************************************************** pa{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ pa{ compound{ per{"{0} ਪ੍ਰਤੀ {1}"} } + concentr{ + karat{ + dnam{"ਕੇਰਟ"} + one{"{0} ਕੇਰਟ"} + other{"{0} ਕੇਰਟ"} + } + } consumption{ liter-per-100kilometers{ dnam{"ਲਿਟਰ ਪ੍ਰਤੀ 100 ਕਿਲੋਮੀਟਰ"} @@ -550,13 +557,6 @@ pa{ other{"{0} ਪੌਂਡ ਪ੍ਰਤੀ ਵਰਗ ਇੰਚ"} } } - proportion{ - karat{ - dnam{"ਕੇਰਟ"} - one{"{0} ਕੇਰਟ"} - other{"{0} ਕੇਰਟ"} - } - } speed{ kilometer-per-hour{ dnam{"ਕਿਲੋਮੀਟਰ ਪ੍ਰਤੀ ਘੰਟਾ"} @@ -798,6 +798,12 @@ pa{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + one{"{0} ਕੇਰਟ"} + other{"{0} ਕੇਰਟ"} + } + } consumption{ liter-per-100kilometers{ dnam{"ਲਿ./100ਕਿ.ਮੀ."} @@ -1140,12 +1146,6 @@ pa{ other{"{0} ਪੌਂ.ਵ.ਇੰਚ"} } } - proportion{ - karat{ - one{"{0} ਕੇਰਟ"} - other{"{0} ਕੇਰਟ"} - } - } speed{ kilometer-per-hour{ dnam{"ਕਿ.ਮੀ./ਘੰਟਾ"} @@ -1354,6 +1354,13 @@ pa{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ਕੇਰਟ"} + one{"{0} ਕੇਰਟ"} + other{"{0} ਕੇਰਟ"} + } + } consumption{ liter-per-100kilometers{ dnam{"ਲਿ./100ਕਿ.ਮੀ."} @@ -1798,13 +1805,6 @@ pa{ other{"{0} ਪੌਂ.ਵ.ਇੰਚ"} } } - proportion{ - karat{ - dnam{"ਕੇਰਟ"} - one{"{0} ਕੇਰਟ"} - other{"{0} ਕੇਰਟ"} - } - } speed{ kilometer-per-hour{ dnam{"ਕਿ.ਮੀ./ਘੰਟਾ"} diff --git a/icu4c/source/data/unit/pa_Arab.txt b/icu4c/source/data/unit/pa_Arab.txt index cf5da23e198..1214338c026 100755 --- a/icu4c/source/data/unit/pa_Arab.txt +++ b/icu4c/source/data/unit/pa_Arab.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pa_Arab.xml diff --git a/icu4c/source/data/unit/pa_Arab_PK.txt b/icu4c/source/data/unit/pa_Arab_PK.txt index f311f297bbe..35729356014 100755 --- a/icu4c/source/data/unit/pa_Arab_PK.txt +++ b/icu4c/source/data/unit/pa_Arab_PK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/pa_Guru.txt b/icu4c/source/data/unit/pa_Guru.txt index 40465048d59..8cc912bc002 100755 --- a/icu4c/source/data/unit/pa_Guru.txt +++ b/icu4c/source/data/unit/pa_Guru.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pa_Guru.xml diff --git a/icu4c/source/data/unit/pa_Guru_IN.txt b/icu4c/source/data/unit/pa_Guru_IN.txt index 2a26edaa6fb..2381c07e21a 100755 --- a/icu4c/source/data/unit/pa_Guru_IN.txt +++ b/icu4c/source/data/unit/pa_Guru_IN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/pa_IN.txt b/icu4c/source/data/unit/pa_IN.txt index eb2a7df662d..e30b2cb5005 100755 --- a/icu4c/source/data/unit/pa_IN.txt +++ b/icu4c/source/data/unit/pa_IN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/pa_PK.txt b/icu4c/source/data/unit/pa_PK.txt index 989cc9df07f..0f699f15f08 100755 --- a/icu4c/source/data/unit/pa_PK.txt +++ b/icu4c/source/data/unit/pa_PK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ps.txt b/icu4c/source/data/unit/ps.txt index e7b22278e93..49ff03124b8 100755 --- a/icu4c/source/data/unit/ps.txt +++ b/icu4c/source/data/unit/ps.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ps.xml // * // *************************************************************************** ps{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/pt_AO.txt b/icu4c/source/data/unit/pt_AO.txt index 768557747d8..9d5b464d51d 100755 --- a/icu4c/source/data/unit/pt_AO.txt +++ b/icu4c/source/data/unit/pt_AO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_AO.xml diff --git a/icu4c/source/data/unit/pt_CV.txt b/icu4c/source/data/unit/pt_CV.txt index e04f13ba9b4..5861677e4da 100755 --- a/icu4c/source/data/unit/pt_CV.txt +++ b/icu4c/source/data/unit/pt_CV.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_CV.xml diff --git a/icu4c/source/data/unit/pt_GW.txt b/icu4c/source/data/unit/pt_GW.txt index 9d3a4397db7..7be2d1aaa18 100755 --- a/icu4c/source/data/unit/pt_GW.txt +++ b/icu4c/source/data/unit/pt_GW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_GW.xml diff --git a/icu4c/source/data/unit/pt_MO.txt b/icu4c/source/data/unit/pt_MO.txt index 9b07d67dcb7..6471a79a071 100755 --- a/icu4c/source/data/unit/pt_MO.txt +++ b/icu4c/source/data/unit/pt_MO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_MO.xml diff --git a/icu4c/source/data/unit/pt_MZ.txt b/icu4c/source/data/unit/pt_MZ.txt index beca939b13f..623d1f93689 100755 --- a/icu4c/source/data/unit/pt_MZ.txt +++ b/icu4c/source/data/unit/pt_MZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_MZ.xml diff --git a/icu4c/source/data/unit/pt_ST.txt b/icu4c/source/data/unit/pt_ST.txt index 547093cadd2..fc2e1123006 100755 --- a/icu4c/source/data/unit/pt_ST.txt +++ b/icu4c/source/data/unit/pt_ST.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_ST.xml diff --git a/icu4c/source/data/unit/pt_TL.txt b/icu4c/source/data/unit/pt_TL.txt index 231ecef19da..2aa48e66196 100755 --- a/icu4c/source/data/unit/pt_TL.txt +++ b/icu4c/source/data/unit/pt_TL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/pt_TL.xml diff --git a/icu4c/source/data/unit/qu.txt b/icu4c/source/data/unit/qu.txt index a9d5a490325..93113e80529 100755 --- a/icu4c/source/data/unit/qu.txt +++ b/icu4c/source/data/unit/qu.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/qu.xml // * // *************************************************************************** qu{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/resfiles.mk b/icu4c/source/data/unit/resfiles.mk index c3c4e27f597..920a5b2bea8 100755 --- a/icu4c/source/data/unit/resfiles.mk +++ b/icu4c/source/data/unit/resfiles.mk @@ -1,4 +1,4 @@ -# * Copyright (C) 1998-2015, International Business Machines +# * Copyright (C) 1998-2016, International Business Machines # * Corporation and others. All Rights Reserved. UNIT_CLDR_VERSION = %version% # A list of txt's to build @@ -47,72 +47,72 @@ UNIT_ALIAS_SOURCE = $(UNIT_SYNTHETIC_ALIAS) # Ordinary resources UNIT_SOURCE = af.txt agq.txt ak.txt am.txt\ - ar.txt as.txt asa.txt az.txt az_Cyrl.txt\ - az_Latn.txt bas.txt be.txt bem.txt bez.txt\ - bg.txt bm.txt bn.txt bo.txt br.txt\ - brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt ca.txt\ - ce.txt cgg.txt chr.txt cs.txt cy.txt\ - da.txt dav.txt de.txt de_CH.txt dje.txt\ - dsb.txt dua.txt dyo.txt dz.txt ebu.txt\ - ee.txt el.txt en.txt en_001.txt en_150.txt\ - en_AG.txt en_AI.txt en_AT.txt en_AU.txt en_BB.txt\ - en_BE.txt en_BM.txt en_BS.txt en_BW.txt en_BZ.txt\ - en_CA.txt en_CC.txt en_CH.txt en_CK.txt en_CM.txt\ - en_CX.txt en_CY.txt en_DE.txt en_DG.txt en_DK.txt\ - en_DM.txt en_ER.txt en_FI.txt en_FJ.txt en_FK.txt\ - en_FM.txt en_GB.txt en_GD.txt en_GG.txt en_GH.txt\ - en_GI.txt en_GM.txt en_GY.txt en_HK.txt en_IE.txt\ - en_IL.txt en_IM.txt en_IN.txt en_IO.txt en_JE.txt\ - en_JM.txt en_KE.txt en_KI.txt en_KN.txt en_KY.txt\ - en_LC.txt en_LR.txt en_LS.txt en_MG.txt en_MO.txt\ - en_MS.txt en_MT.txt en_MU.txt en_MW.txt en_MY.txt\ - en_NA.txt en_NF.txt en_NG.txt en_NL.txt en_NR.txt\ - en_NU.txt en_NZ.txt en_PG.txt en_PH.txt en_PK.txt\ - en_PN.txt en_PW.txt en_RW.txt en_SB.txt en_SC.txt\ - en_SD.txt en_SE.txt en_SG.txt en_SH.txt en_SI.txt\ - en_SL.txt en_SS.txt en_SX.txt en_SZ.txt en_TC.txt\ - en_TK.txt en_TO.txt en_TT.txt en_TV.txt en_TZ.txt\ - en_UG.txt en_VC.txt en_VG.txt en_VU.txt en_WS.txt\ - en_ZA.txt en_ZM.txt en_ZW.txt eo.txt es.txt\ - es_419.txt es_AR.txt es_BO.txt es_CL.txt es_CO.txt\ - es_CR.txt es_CU.txt es_DO.txt es_EC.txt es_GT.txt\ - es_HN.txt es_MX.txt es_NI.txt es_PA.txt es_PE.txt\ - es_PR.txt es_PY.txt es_SV.txt es_US.txt es_UY.txt\ - es_VE.txt et.txt eu.txt ewo.txt fa.txt\ - ff.txt fi.txt fil.txt fo.txt fr.txt\ - fr_CA.txt fr_HT.txt fur.txt fy.txt ga.txt\ - gd.txt gl.txt gsw.txt gu.txt guz.txt\ - gv.txt ha.txt haw.txt he.txt hi.txt\ - hr.txt hsb.txt hu.txt hy.txt id.txt\ - ig.txt ii.txt is.txt it.txt ja.txt\ - jgo.txt jmc.txt ka.txt kab.txt kam.txt\ - kde.txt kea.txt khq.txt ki.txt kk.txt\ - kkj.txt kl.txt kln.txt km.txt kn.txt\ - ko.txt kok.txt ks.txt ksb.txt ksf.txt\ - ksh.txt kw.txt ky.txt lag.txt lb.txt\ - lg.txt lkt.txt ln.txt lo.txt lrc.txt\ - lt.txt lu.txt luo.txt luy.txt lv.txt\ - mas.txt mer.txt mfe.txt mg.txt mgh.txt\ - mgo.txt mk.txt ml.txt mn.txt mr.txt\ - ms.txt mt.txt mua.txt my.txt mzn.txt\ - naq.txt nb.txt nd.txt ne.txt nl.txt\ - nmg.txt nn.txt nnh.txt nus.txt nyn.txt\ - om.txt or.txt os.txt pa.txt pa_Arab.txt\ - pa_Guru.txt pl.txt ps.txt pt.txt pt_AO.txt\ - pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt pt_PT.txt\ - pt_ST.txt pt_TL.txt qu.txt rm.txt rn.txt\ - ro.txt ro_MD.txt rof.txt ru.txt rw.txt\ - rwk.txt sah.txt saq.txt sbp.txt se.txt\ - seh.txt ses.txt sg.txt shi.txt shi_Latn.txt\ - shi_Tfng.txt si.txt sk.txt sl.txt smn.txt\ - sn.txt so.txt sq.txt sr.txt sr_Cyrl.txt\ - sr_Latn.txt sv.txt sv_FI.txt sw.txt ta.txt\ - te.txt teo.txt th.txt ti.txt to.txt\ - tr.txt twq.txt tzm.txt ug.txt uk.txt\ - ur.txt ur_IN.txt uz.txt uz_Arab.txt uz_Cyrl.txt\ - uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt vi.txt\ - vun.txt wae.txt xog.txt yav.txt yi.txt\ - yo.txt zgh.txt zh.txt zh_Hans.txt zh_Hans_HK.txt\ - zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt zh_Hant_HK.txt zh_Hant_MO.txt\ - zu.txt + ar.txt as.txt asa.txt ast.txt az.txt\ + az_Cyrl.txt az_Latn.txt bas.txt be.txt bem.txt\ + bez.txt bg.txt bm.txt bn.txt bo.txt\ + br.txt brx.txt bs.txt bs_Cyrl.txt bs_Latn.txt\ + ca.txt ce.txt cgg.txt chr.txt cs.txt\ + cy.txt da.txt dav.txt de.txt de_CH.txt\ + dje.txt dsb.txt dua.txt dyo.txt dz.txt\ + ebu.txt ee.txt el.txt en.txt en_001.txt\ + en_150.txt en_AG.txt en_AI.txt en_AT.txt en_AU.txt\ + en_BB.txt en_BE.txt en_BM.txt en_BS.txt en_BW.txt\ + en_BZ.txt en_CA.txt en_CC.txt en_CH.txt en_CK.txt\ + en_CM.txt en_CX.txt en_CY.txt en_DE.txt en_DG.txt\ + en_DK.txt en_DM.txt en_ER.txt en_FI.txt en_FJ.txt\ + en_FK.txt en_FM.txt en_GB.txt en_GD.txt en_GG.txt\ + en_GH.txt en_GI.txt en_GM.txt en_GY.txt en_HK.txt\ + en_IE.txt en_IL.txt en_IM.txt en_IN.txt en_IO.txt\ + en_JE.txt en_JM.txt en_KE.txt en_KI.txt en_KN.txt\ + en_KY.txt en_LC.txt en_LR.txt en_LS.txt en_MG.txt\ + en_MO.txt en_MS.txt en_MT.txt en_MU.txt en_MW.txt\ + en_MY.txt en_NA.txt en_NF.txt en_NG.txt en_NL.txt\ + en_NR.txt en_NU.txt en_NZ.txt en_PG.txt en_PH.txt\ + en_PK.txt en_PN.txt en_PW.txt en_RW.txt en_SB.txt\ + en_SC.txt en_SD.txt en_SE.txt en_SG.txt en_SH.txt\ + en_SI.txt en_SL.txt en_SS.txt en_SX.txt en_SZ.txt\ + en_TC.txt en_TK.txt en_TO.txt en_TT.txt en_TV.txt\ + en_TZ.txt en_UG.txt en_VC.txt en_VG.txt en_VU.txt\ + en_WS.txt en_ZA.txt en_ZM.txt en_ZW.txt eo.txt\ + es.txt es_419.txt es_AR.txt es_BO.txt es_CL.txt\ + es_CO.txt es_CR.txt es_CU.txt es_DO.txt es_EC.txt\ + es_GT.txt es_HN.txt es_MX.txt es_NI.txt es_PA.txt\ + es_PE.txt es_PR.txt es_PY.txt es_SV.txt es_US.txt\ + es_UY.txt es_VE.txt et.txt eu.txt ewo.txt\ + fa.txt ff.txt fi.txt fil.txt fo.txt\ + fr.txt fr_CA.txt fr_HT.txt fur.txt fy.txt\ + ga.txt gd.txt gl.txt gsw.txt gu.txt\ + guz.txt gv.txt ha.txt haw.txt he.txt\ + hi.txt hr.txt hsb.txt hu.txt hy.txt\ + id.txt ig.txt ii.txt is.txt it.txt\ + ja.txt jgo.txt jmc.txt ka.txt kab.txt\ + kam.txt kde.txt kea.txt khq.txt ki.txt\ + kk.txt kkj.txt kl.txt kln.txt km.txt\ + kn.txt ko.txt kok.txt ks.txt ksb.txt\ + ksf.txt ksh.txt kw.txt ky.txt lag.txt\ + lb.txt lg.txt lkt.txt ln.txt lo.txt\ + lrc.txt lt.txt lu.txt luo.txt luy.txt\ + lv.txt mas.txt mer.txt mfe.txt mg.txt\ + mgh.txt mgo.txt mk.txt ml.txt mn.txt\ + mr.txt ms.txt mt.txt mua.txt my.txt\ + mzn.txt naq.txt nb.txt nd.txt ne.txt\ + nl.txt nmg.txt nn.txt nnh.txt nus.txt\ + nyn.txt om.txt or.txt os.txt pa.txt\ + pa_Arab.txt pa_Guru.txt pl.txt ps.txt pt.txt\ + pt_AO.txt pt_CV.txt pt_GW.txt pt_MO.txt pt_MZ.txt\ + pt_PT.txt pt_ST.txt pt_TL.txt qu.txt rm.txt\ + rn.txt ro.txt ro_MD.txt rof.txt ru.txt\ + rw.txt rwk.txt sah.txt saq.txt sbp.txt\ + se.txt seh.txt ses.txt sg.txt shi.txt\ + shi_Latn.txt shi_Tfng.txt si.txt sk.txt sl.txt\ + smn.txt sn.txt so.txt sq.txt sr.txt\ + sr_Cyrl.txt sr_Latn.txt sv.txt sv_FI.txt sw.txt\ + ta.txt te.txt teo.txt th.txt ti.txt\ + to.txt tr.txt twq.txt tzm.txt ug.txt\ + uk.txt ur.txt ur_IN.txt uz.txt uz_Arab.txt\ + uz_Cyrl.txt uz_Latn.txt vai.txt vai_Latn.txt vai_Vaii.txt\ + vi.txt vun.txt wae.txt xog.txt yav.txt\ + yi.txt yo.txt yue.txt zgh.txt zh.txt\ + zh_Hans.txt zh_Hans_HK.txt zh_Hans_MO.txt zh_Hans_SG.txt zh_Hant.txt\ + zh_Hant_HK.txt zh_Hant_MO.txt zu.txt diff --git a/icu4c/source/data/unit/rm.txt b/icu4c/source/data/unit/rm.txt index 54cf96db6fa..65694053a7d 100755 --- a/icu4c/source/data/unit/rm.txt +++ b/icu4c/source/data/unit/rm.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/rm.xml // * // *************************************************************************** rm{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/rn.txt b/icu4c/source/data/unit/rn.txt index 30b1923912f..efa5a9ce849 100755 --- a/icu4c/source/data/unit/rn.txt +++ b/icu4c/source/data/unit/rn.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/rn.xml // * // *************************************************************************** rn{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ro_MD.txt b/icu4c/source/data/unit/ro_MD.txt index e573e2f99bf..39acf8307c5 100755 --- a/icu4c/source/data/unit/ro_MD.txt +++ b/icu4c/source/data/unit/ro_MD.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ro_MD.xml diff --git a/icu4c/source/data/unit/rof.txt b/icu4c/source/data/unit/rof.txt index 36c44ad86e6..98572c93b7c 100755 --- a/icu4c/source/data/unit/rof.txt +++ b/icu4c/source/data/unit/rof.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/rof.xml // * // *************************************************************************** rof{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/rw.txt b/icu4c/source/data/unit/rw.txt index 66403595fc3..be770298221 100755 --- a/icu4c/source/data/unit/rw.txt +++ b/icu4c/source/data/unit/rw.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/rw.xml diff --git a/icu4c/source/data/unit/rwk.txt b/icu4c/source/data/unit/rwk.txt index 59bcd45bfe9..15a1f984883 100755 --- a/icu4c/source/data/unit/rwk.txt +++ b/icu4c/source/data/unit/rwk.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/rwk.xml // * // *************************************************************************** rwk{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/sah.txt b/icu4c/source/data/unit/sah.txt index 83b7606945a..33dc2db1e86 100755 --- a/icu4c/source/data/unit/sah.txt +++ b/icu4c/source/data/unit/sah.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sah.xml // * // *************************************************************************** sah{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/saq.txt b/icu4c/source/data/unit/saq.txt index 05a3a00fb28..24aa1be99ac 100755 --- a/icu4c/source/data/unit/saq.txt +++ b/icu4c/source/data/unit/saq.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/saq.xml // * // *************************************************************************** saq{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/sbp.txt b/icu4c/source/data/unit/sbp.txt index e636f00de67..8eb9f78a96b 100755 --- a/icu4c/source/data/unit/sbp.txt +++ b/icu4c/source/data/unit/sbp.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sbp.xml // * // *************************************************************************** sbp{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/se.txt b/icu4c/source/data/unit/se.txt index a4ac6f85bec..18c4455a608 100755 --- a/icu4c/source/data/unit/se.txt +++ b/icu4c/source/data/unit/se.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/se.xml diff --git a/icu4c/source/data/unit/seh.txt b/icu4c/source/data/unit/seh.txt index a57758f4895..51b48f9dd2b 100755 --- a/icu4c/source/data/unit/seh.txt +++ b/icu4c/source/data/unit/seh.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/seh.xml // * // *************************************************************************** seh{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/ses.txt b/icu4c/source/data/unit/ses.txt index 1166a86694b..54b7186f92b 100755 --- a/icu4c/source/data/unit/ses.txt +++ b/icu4c/source/data/unit/ses.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ses.xml // * // *************************************************************************** ses{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/sg.txt b/icu4c/source/data/unit/sg.txt index c17b2a6fa7c..fd8545a76af 100755 --- a/icu4c/source/data/unit/sg.txt +++ b/icu4c/source/data/unit/sg.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sg.xml // * // *************************************************************************** sg{ - Version{"2.1.19.17"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/sh.txt b/icu4c/source/data/unit/sh.txt index 92016b419a0..2517eb3cddb 100755 --- a/icu4c/source/data/unit/sh.txt +++ b/icu4c/source/data/unit/sh.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sh_BA.txt b/icu4c/source/data/unit/sh_BA.txt index 56fcef4263b..e1299547bd3 100755 --- a/icu4c/source/data/unit/sh_BA.txt +++ b/icu4c/source/data/unit/sh_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sh_CS.txt b/icu4c/source/data/unit/sh_CS.txt index 30b8a4a021c..566f200ce13 100755 --- a/icu4c/source/data/unit/sh_CS.txt +++ b/icu4c/source/data/unit/sh_CS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sh_YU.txt b/icu4c/source/data/unit/sh_YU.txt index d15ea82eb1e..a9b1c28dd3b 100755 --- a/icu4c/source/data/unit/sh_YU.txt +++ b/icu4c/source/data/unit/sh_YU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/shi.txt b/icu4c/source/data/unit/shi.txt index 97128182738..3fb877abd40 100755 --- a/icu4c/source/data/unit/shi.txt +++ b/icu4c/source/data/unit/shi.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/shi.xml // * // *************************************************************************** shi{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/shi_Latn.txt b/icu4c/source/data/unit/shi_Latn.txt index e708c34e8ec..e4542bac9a0 100755 --- a/icu4c/source/data/unit/shi_Latn.txt +++ b/icu4c/source/data/unit/shi_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/shi_Latn.xml @@ -8,5 +8,5 @@ // *************************************************************************** shi_Latn{ %%Parent{"root"} - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/shi_MA.txt b/icu4c/source/data/unit/shi_MA.txt index 872f116d9af..4846c3cdf75 100755 --- a/icu4c/source/data/unit/shi_MA.txt +++ b/icu4c/source/data/unit/shi_MA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/shi_Tfng.txt b/icu4c/source/data/unit/shi_Tfng.txt index 8dc3451bb4c..cbe99554669 100755 --- a/icu4c/source/data/unit/shi_Tfng.txt +++ b/icu4c/source/data/unit/shi_Tfng.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/shi_Tfng.xml diff --git a/icu4c/source/data/unit/shi_Tfng_MA.txt b/icu4c/source/data/unit/shi_Tfng_MA.txt index 8d1c881c506..d86290bc57d 100755 --- a/icu4c/source/data/unit/shi_Tfng_MA.txt +++ b/icu4c/source/data/unit/shi_Tfng_MA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/si.txt b/icu4c/source/data/unit/si.txt index 47fae311ddb..e5ed083eebf 100755 --- a/icu4c/source/data/unit/si.txt +++ b/icu4c/source/data/unit/si.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/si.xml // * // *************************************************************************** si{ - Version{"2.1.20.4"} + Version{"2.1.23.84"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -106,6 +106,13 @@ si{ compound{ per{"{1} ට {0} බැගින්"} } + concentr{ + karat{ + dnam{"ක්‍රාත්"} + one{"ක්‍රාත් {0}"} + other{"ක්‍රාත් {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"කිලෝ මීටර 100 ට ලීටර"} @@ -535,13 +542,6 @@ si{ other{"වර්ග අලඟකට රාත්තල් {0}"} } } - proportion{ - karat{ - dnam{"ක්‍රාත්"} - one{"ක්‍රාත් {0}"} - other{"ක්‍රාත් {0}"} - } - } speed{ kilometer-per-hour{ dnam{"පැයට කිලෝමීටර්"} @@ -1042,6 +1042,13 @@ si{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ක්‍රාත්"} + one{"ක්‍රාත් {0}"} + other{"ක්‍රාත් {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"ලී/කිමී100"} @@ -1471,13 +1478,6 @@ si{ other{"වඅ රා {0}"} } } - proportion{ - karat{ - dnam{"ක්‍රාත්"} - one{"ක්‍රාත් {0}"} - other{"ක්‍රාත් {0}"} - } - } speed{ kilometer-per-hour{ dnam{"පැයට කිලෝමීටර්"} diff --git a/icu4c/source/data/unit/sl.txt b/icu4c/source/data/unit/sl.txt index ed1169cc2c5..3a011237da9 100755 --- a/icu4c/source/data/unit/sl.txt +++ b/icu4c/source/data/unit/sl.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sl.xml // * // *************************************************************************** sl{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -138,6 +138,15 @@ sl{ compound{ per{"{0} na {1}"} } + concentr{ + karat{ + dnam{"karat"} + few{"{0} karati"} + one{"{0} karat"} + other{"{0} karatov"} + two{"{0} karata"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -721,15 +730,6 @@ sl{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - few{"{0} karati"} - one{"{0} karat"} - other{"{0} karatov"} - two{"{0} karata"} - } - } speed{ kilometer-per-hour{ dnam{"kilometri na uro"} @@ -1418,6 +1418,15 @@ sl{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -2001,15 +2010,6 @@ sl{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/smn.txt b/icu4c/source/data/unit/smn.txt index 75fa39263ee..b4993e6113e 100755 --- a/icu4c/source/data/unit/smn.txt +++ b/icu4c/source/data/unit/smn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/smn.xml diff --git a/icu4c/source/data/unit/sn.txt b/icu4c/source/data/unit/sn.txt index 65fc9364391..f6598da6873 100755 --- a/icu4c/source/data/unit/sn.txt +++ b/icu4c/source/data/unit/sn.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sn.xml // * // *************************************************************************** sn{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/so.txt b/icu4c/source/data/unit/so.txt index 5fd56f74d1d..611a718f926 100755 --- a/icu4c/source/data/unit/so.txt +++ b/icu4c/source/data/unit/so.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/so.xml // * // *************************************************************************** so{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/sq.txt b/icu4c/source/data/unit/sq.txt index 8ec51093ddb..bc75d86c51a 100755 --- a/icu4c/source/data/unit/sq.txt +++ b/icu4c/source/data/unit/sq.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sq.xml // * // *************************************************************************** sq{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ sq{ compound{ per{"{0} në {1}"} } + concentr{ + karat{ + dnam{"karatë"} + one{"{0} karat"} + other{"{0} karatë"} + } + } consumption{ liter-per-100kilometers{ dnam{"litra për 100 kilometra"} @@ -535,13 +542,6 @@ sq{ other{"{0} paund për inç në katror"} } } - proportion{ - karat{ - dnam{"karatë"} - one{"{0} karat"} - other{"{0} karatë"} - } - } speed{ kilometer-per-hour{ dnam{"kilometra në orë"} @@ -1072,6 +1072,13 @@ sq{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1501,13 +1508,6 @@ sq{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/orë"} diff --git a/icu4c/source/data/unit/sr.txt b/icu4c/source/data/unit/sr.txt index 2d099605658..4c4099dedda 100755 --- a/icu4c/source/data/unit/sr.txt +++ b/icu4c/source/data/unit/sr.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sr.xml // * // *************************************************************************** sr{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -122,6 +122,14 @@ sr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карати"} + few{"{0} карата"} + one{"{0} карат"} + other{"{0} карата"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -619,14 +627,6 @@ sr{ other{"{0} фунти по квадратном инчу"} } } - proportion{ - karat{ - dnam{"карати"} - few{"{0} карата"} - one{"{0} карат"} - other{"{0} карата"} - } - } speed{ kilometer-per-hour{ dnam{"километри на сат"} @@ -1210,6 +1210,14 @@ sr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1710,14 +1718,6 @@ sr{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"километри на сат"} diff --git a/icu4c/source/data/unit/sr_BA.txt b/icu4c/source/data/unit/sr_BA.txt index 110b53240d8..0d1bedfa1c9 100755 --- a/icu4c/source/data/unit/sr_BA.txt +++ b/icu4c/source/data/unit/sr_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_CS.txt b/icu4c/source/data/unit/sr_CS.txt index 987c37c3f08..949405aa1f6 100755 --- a/icu4c/source/data/unit/sr_CS.txt +++ b/icu4c/source/data/unit/sr_CS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Cyrl.txt b/icu4c/source/data/unit/sr_Cyrl.txt index 913848d0438..19f704b0684 100755 --- a/icu4c/source/data/unit/sr_Cyrl.txt +++ b/icu4c/source/data/unit/sr_Cyrl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sr_Cyrl.xml diff --git a/icu4c/source/data/unit/sr_Cyrl_BA.txt b/icu4c/source/data/unit/sr_Cyrl_BA.txt index f8b597d2806..0e29d1da15f 100755 --- a/icu4c/source/data/unit/sr_Cyrl_BA.txt +++ b/icu4c/source/data/unit/sr_Cyrl_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Cyrl_CS.txt b/icu4c/source/data/unit/sr_Cyrl_CS.txt index 44d5e0fa10e..fb1a4d7231c 100755 --- a/icu4c/source/data/unit/sr_Cyrl_CS.txt +++ b/icu4c/source/data/unit/sr_Cyrl_CS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Cyrl_RS.txt b/icu4c/source/data/unit/sr_Cyrl_RS.txt index 5ad792ee53e..9faa6c19fd0 100755 --- a/icu4c/source/data/unit/sr_Cyrl_RS.txt +++ b/icu4c/source/data/unit/sr_Cyrl_RS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Cyrl_XK.txt b/icu4c/source/data/unit/sr_Cyrl_XK.txt index 9b8cc233a3c..277975e7c79 100755 --- a/icu4c/source/data/unit/sr_Cyrl_XK.txt +++ b/icu4c/source/data/unit/sr_Cyrl_XK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Cyrl_YU.txt b/icu4c/source/data/unit/sr_Cyrl_YU.txt index 1fbcd59343b..2224126c0e7 100755 --- a/icu4c/source/data/unit/sr_Cyrl_YU.txt +++ b/icu4c/source/data/unit/sr_Cyrl_YU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Latn.txt b/icu4c/source/data/unit/sr_Latn.txt index 0fe7b9e1fc6..65f1c03de8f 100755 --- a/icu4c/source/data/unit/sr_Latn.txt +++ b/icu4c/source/data/unit/sr_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sr_Latn.xml @@ -8,7 +8,7 @@ // *************************************************************************** sr_Latn{ %%Parent{"root"} - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -123,6 +123,14 @@ sr_Latn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karati"} + few{"{0} karata"} + one{"{0} karat"} + other{"{0} karata"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -620,14 +628,6 @@ sr_Latn{ other{"{0} funti po kvadratnom inču"} } } - proportion{ - karat{ - dnam{"karati"} - few{"{0} karata"} - one{"{0} karat"} - other{"{0} karata"} - } - } speed{ kilometer-per-hour{ dnam{"kilometri na sat"} @@ -1211,6 +1211,14 @@ sr_Latn{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1711,14 +1719,6 @@ sr_Latn{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"kilometri na sat"} diff --git a/icu4c/source/data/unit/sr_Latn_BA.txt b/icu4c/source/data/unit/sr_Latn_BA.txt index 104ccd0e784..d0431c98c6a 100755 --- a/icu4c/source/data/unit/sr_Latn_BA.txt +++ b/icu4c/source/data/unit/sr_Latn_BA.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Latn_CS.txt b/icu4c/source/data/unit/sr_Latn_CS.txt index 7e8037edef9..74d9b51ee0b 100755 --- a/icu4c/source/data/unit/sr_Latn_CS.txt +++ b/icu4c/source/data/unit/sr_Latn_CS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Latn_ME.txt b/icu4c/source/data/unit/sr_Latn_ME.txt index 8e13676a7be..86b1693b65a 100755 --- a/icu4c/source/data/unit/sr_Latn_ME.txt +++ b/icu4c/source/data/unit/sr_Latn_ME.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Latn_RS.txt b/icu4c/source/data/unit/sr_Latn_RS.txt index 748bde4b0ec..9708be63bef 100755 --- a/icu4c/source/data/unit/sr_Latn_RS.txt +++ b/icu4c/source/data/unit/sr_Latn_RS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_Latn_YU.txt b/icu4c/source/data/unit/sr_Latn_YU.txt index 91b61ed1088..2bf1b4e7473 100755 --- a/icu4c/source/data/unit/sr_Latn_YU.txt +++ b/icu4c/source/data/unit/sr_Latn_YU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_ME.txt b/icu4c/source/data/unit/sr_ME.txt index c342143b615..5cfdc82cc22 100755 --- a/icu4c/source/data/unit/sr_ME.txt +++ b/icu4c/source/data/unit/sr_ME.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_RS.txt b/icu4c/source/data/unit/sr_RS.txt index 7e25389629f..10df8ae68eb 100755 --- a/icu4c/source/data/unit/sr_RS.txt +++ b/icu4c/source/data/unit/sr_RS.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_XK.txt b/icu4c/source/data/unit/sr_XK.txt index 095ce67c005..07db21c6f47 100755 --- a/icu4c/source/data/unit/sr_XK.txt +++ b/icu4c/source/data/unit/sr_XK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sr_YU.txt b/icu4c/source/data/unit/sr_YU.txt index e110bd5aa8b..956fc6dd901 100755 --- a/icu4c/source/data/unit/sr_YU.txt +++ b/icu4c/source/data/unit/sr_YU.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/sv.txt b/icu4c/source/data/unit/sv.txt index 675d18c6533..c2cf152c70e 100755 --- a/icu4c/source/data/unit/sv.txt +++ b/icu4c/source/data/unit/sv.txt @@ -7,11 +7,20 @@ // * // *************************************************************************** sv{ - Version{"2.1.22.93"} + Version{"2.1.23.66"} durationUnits{ - hm{"h:mm"} - hms{"h:mm:ss"} - ms{"m:ss"} + hm{ + "h:mm", + "h.mm", + } + hms{ + "h:mm:ss", + "h.mm.ss", + } + ms{ + "m:ss", + "m.ss", + } } units{ acceleration{ diff --git a/icu4c/source/data/unit/sv_FI.txt b/icu4c/source/data/unit/sv_FI.txt index 4d32f0ef833..ff0e3637e6c 100755 --- a/icu4c/source/data/unit/sv_FI.txt +++ b/icu4c/source/data/unit/sv_FI.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sv_FI.xml diff --git a/icu4c/source/data/unit/sw.txt b/icu4c/source/data/unit/sw.txt index 269b24417aa..4806e45493b 100755 --- a/icu4c/source/data/unit/sw.txt +++ b/icu4c/source/data/unit/sw.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/sw.xml // * // *************************************************************************** sw{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ sw{ compound{ per{"{0} kwa kila {1}"} } + concentr{ + karat{ + dnam{"karati"} + one{"karati {0}"} + other{"karati {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"lita kwa kilomita 100"} @@ -535,13 +542,6 @@ sw{ other{"pauni {0} kwa kila inchi mraba"} } } - proportion{ - karat{ - dnam{"karati"} - one{"karati {0}"} - other{"karati {0}"} - } - } speed{ kilometer-per-hour{ dnam{"kilomita kwa saa"} @@ -1049,6 +1049,13 @@ sw{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karati"} + one{"karati {0}"} + other{"karati {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"lita kwa kilomita 100"} @@ -1478,13 +1485,6 @@ sw{ other{"psi {0}"} } } - proportion{ - karat{ - dnam{"karati"} - one{"karati {0}"} - other{"karati {0}"} - } - } speed{ kilometer-per-hour{ dnam{"kilomita kwa saa"} diff --git a/icu4c/source/data/unit/ta.txt b/icu4c/source/data/unit/ta.txt index 83dc515b4a7..58c9aca4707 100755 --- a/icu4c/source/data/unit/ta.txt +++ b/icu4c/source/data/unit/ta.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ta.xml // * // *************************************************************************** ta{ - Version{"2.1.19.55"} + Version{"2.1.23.16"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ta{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"காரட்கள்"} + one{"{0} காரட்"} + other{"{0} காரட்கள்"} + } + } consumption{ liter-per-100kilometers{ dnam{"லிட்டர்/100கி.மீ"} @@ -535,13 +542,6 @@ ta{ other{"{0} பவுண்டுகள்/சதுர அங்குலம்"} } } - proportion{ - karat{ - dnam{"காரட்கள்"} - one{"{0} காரட்"} - other{"{0} காரட்கள்"} - } - } speed{ kilometer-per-hour{ dnam{"கிலோமீட்டர்கள்/மணிநேரம்"} @@ -1042,6 +1042,13 @@ ta{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"காரட்கள்"} + one{"{0} கார."} + other{"{0} கார."} + } + } consumption{ liter-per-100kilometers{ dnam{"லி./100கி.மீ"} @@ -1471,13 +1478,6 @@ ta{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"காரட்கள்"} - one{"{0} கார."} - other{"{0} கார."} - } - } speed{ kilometer-per-hour{ dnam{"கி.மீ./மணிநேரம்"} diff --git a/icu4c/source/data/unit/te.txt b/icu4c/source/data/unit/te.txt index 3de67a3d410..bd17aec7797 100755 --- a/icu4c/source/data/unit/te.txt +++ b/icu4c/source/data/unit/te.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/te.xml // * // *************************************************************************** te{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ te{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"కేరట్లు"} + one{"{0} కేరట్"} + other{"{0} కేరట్లు"} + } + } consumption{ liter-per-100kilometers{ dnam{"లీటర్లు/100 కిలోమీటర్లకు"} @@ -535,13 +542,6 @@ te{ other{"{0} పౌండ్లు/చదరపు అంగుళం"} } } - proportion{ - karat{ - dnam{"కేరట్లు"} - one{"{0} కేరట్"} - other{"{0} కేరట్లు"} - } - } speed{ kilometer-per-hour{ dnam{"కిలోమీటర్లు/గంట"} @@ -1042,6 +1042,13 @@ te{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"కేరట్లు"} + one{"{0} కేర."} + other{"{0} కేర."} + } + } consumption{ liter-per-100kilometers{ dnam{"లీ/100 కి.మీ."} @@ -1471,13 +1478,6 @@ te{ other{"{0} పౌ/చ.అం"} } } - proportion{ - karat{ - dnam{"కేరట్లు"} - one{"{0} కేర."} - other{"{0} కేర."} - } - } speed{ kilometer-per-hour{ dnam{"కి.మీ/గంట"} diff --git a/icu4c/source/data/unit/teo.txt b/icu4c/source/data/unit/teo.txt index 3996f504446..d1a78e67874 100755 --- a/icu4c/source/data/unit/teo.txt +++ b/icu4c/source/data/unit/teo.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/teo.xml // * // *************************************************************************** teo{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/th_TH.txt b/icu4c/source/data/unit/th_TH.txt index 13be14ac077..27a87bee7e3 100755 --- a/icu4c/source/data/unit/th_TH.txt +++ b/icu4c/source/data/unit/th_TH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/th_TH_TRADITIONAL.txt b/icu4c/source/data/unit/th_TH_TRADITIONAL.txt index 3a44a9bdd47..d06bb644b64 100755 --- a/icu4c/source/data/unit/th_TH_TRADITIONAL.txt +++ b/icu4c/source/data/unit/th_TH_TRADITIONAL.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/ti.txt b/icu4c/source/data/unit/ti.txt index 6beea621436..5649364f2b7 100755 --- a/icu4c/source/data/unit/ti.txt +++ b/icu4c/source/data/unit/ti.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ti.xml // * // *************************************************************************** ti{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/tl.txt b/icu4c/source/data/unit/tl.txt index 83645e08882..769916495bb 100755 --- a/icu4c/source/data/unit/tl.txt +++ b/icu4c/source/data/unit/tl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/tl_PH.txt b/icu4c/source/data/unit/tl_PH.txt index f3698e224e8..a270cc050ed 100755 --- a/icu4c/source/data/unit/tl_PH.txt +++ b/icu4c/source/data/unit/tl_PH.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/to.txt b/icu4c/source/data/unit/to.txt index 1e92b33169b..cfbc7518ab3 100755 --- a/icu4c/source/data/unit/to.txt +++ b/icu4c/source/data/unit/to.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/to.xml // * // *************************************************************************** to{ - Version{"2.1.19.14"} + Version{"2.1.23.79"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -87,6 +87,12 @@ to{ compound{ per{"{0} ʻi he {1}"} } + concentr{ + karat{ + dnam{"kalati"} + other{"kalati ʻe {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"lita he kilomita ʻe 100"} @@ -423,12 +429,6 @@ to{ other{"pāuni he ʻinisi sikuea ʻe {0}"} } } - proportion{ - karat{ - dnam{"kalati"} - other{"kalati ʻe {0}"} - } - } speed{ kilometer-per-hour{ dnam{"kilomita he houa"} @@ -622,6 +622,12 @@ to{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -958,12 +964,6 @@ to{ other{"{0} pā/in²"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1157,6 +1157,12 @@ to{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"kt ʻe {0}"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1493,12 +1499,6 @@ to{ other{"pā/in² ʻe {0}"} } } - proportion{ - karat{ - dnam{"kt"} - other{"kt ʻe {0}"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/tr.txt b/icu4c/source/data/unit/tr.txt index 0ece554207e..4531f207eb6 100755 --- a/icu4c/source/data/unit/tr.txt +++ b/icu4c/source/data/unit/tr.txt @@ -7,7 +7,7 @@ // * // *************************************************************************** tr{ - Version{"2.1.22.93"} + Version{"2.1.23.73"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/twq.txt b/icu4c/source/data/unit/twq.txt index 1f317ae3e82..87911738f4c 100755 --- a/icu4c/source/data/unit/twq.txt +++ b/icu4c/source/data/unit/twq.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/twq.xml // * // *************************************************************************** twq{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/tzm.txt b/icu4c/source/data/unit/tzm.txt index 756f469178a..b7bc7dca58a 100755 --- a/icu4c/source/data/unit/tzm.txt +++ b/icu4c/source/data/unit/tzm.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/tzm.xml // * // *************************************************************************** tzm{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/ug.txt b/icu4c/source/data/unit/ug.txt index 6947edbdbe9..758759d5096 100755 --- a/icu4c/source/data/unit/ug.txt +++ b/icu4c/source/data/unit/ug.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ug.xml // * // *************************************************************************** ug{ - Version{"2.1.19.14"} + Version{"2.1.23.13"} units{ acceleration{ g-force{ diff --git a/icu4c/source/data/unit/ur.txt b/icu4c/source/data/unit/ur.txt index 32af1ecb4a6..c7773e1d0e7 100755 --- a/icu4c/source/data/unit/ur.txt +++ b/icu4c/source/data/unit/ur.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ur.xml // * // *************************************************************************** ur{ - Version{"2.1.19.17"} + Version{"2.1.23.11"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ur{ compound{ per{"{0} فی {1}"} } + concentr{ + karat{ + dnam{"قیراط"} + one{"{0} قیراط"} + other{"{0} قیراط"} + } + } consumption{ liter-per-100kilometers{ dnam{"لیٹر فی 100 کلو میٹر"} @@ -535,13 +542,6 @@ ur{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"قیراط"} - one{"{0} قیراط"} - other{"{0} قیراط"} - } - } speed{ kilometer-per-hour{ dnam{"کلومیٹر فی گھنٹہ"} @@ -820,7 +820,7 @@ ur{ other{"{0}cm"} } foot{ - one{"'{0}"} + one{"{0}′"} other{"{0}′"} } inch{ @@ -1044,6 +1044,13 @@ ur{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"قیراط"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"لیٹر/100 کلو میٹر"} @@ -1471,13 +1478,6 @@ ur{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"قیراط"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"کلومیٹر/گھنٹہ"} diff --git a/icu4c/source/data/unit/ur_IN.txt b/icu4c/source/data/unit/ur_IN.txt index 1536d6f1479..2a098c57714 100755 --- a/icu4c/source/data/unit/ur_IN.txt +++ b/icu4c/source/data/unit/ur_IN.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/ur_IN.xml // * // *************************************************************************** ur_IN{ - Version{"2.1.19.14"} + Version{"2.1.22.17"} units{ length{ astronomical-unit{ diff --git a/icu4c/source/data/unit/uz.txt b/icu4c/source/data/unit/uz.txt index c037da68cbc..afa6898b596 100755 --- a/icu4c/source/data/unit/uz.txt +++ b/icu4c/source/data/unit/uz.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/uz.xml // * // *************************************************************************** uz{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ uz{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"litr/100 km"} @@ -534,13 +541,6 @@ uz{ other{"{0} funt/kvadrat duym"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"km/soat"} @@ -1041,6 +1041,13 @@ uz{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100 km"} @@ -1470,13 +1477,6 @@ uz{ other{"{0} funt/kv.dy"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/soat"} diff --git a/icu4c/source/data/unit/uz_AF.txt b/icu4c/source/data/unit/uz_AF.txt index 84d43fc477c..ed5f59acc0f 100755 --- a/icu4c/source/data/unit/uz_AF.txt +++ b/icu4c/source/data/unit/uz_AF.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/uz_Arab.txt b/icu4c/source/data/unit/uz_Arab.txt index 84da04bcce2..18682255689 100755 --- a/icu4c/source/data/unit/uz_Arab.txt +++ b/icu4c/source/data/unit/uz_Arab.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/uz_Arab.xml diff --git a/icu4c/source/data/unit/uz_Arab_AF.txt b/icu4c/source/data/unit/uz_Arab_AF.txt index 4300cb07de7..99aba2e56d6 100755 --- a/icu4c/source/data/unit/uz_Arab_AF.txt +++ b/icu4c/source/data/unit/uz_Arab_AF.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/uz_Cyrl.txt b/icu4c/source/data/unit/uz_Cyrl.txt index 41e5d007711..3f5fed3cddb 100755 --- a/icu4c/source/data/unit/uz_Cyrl.txt +++ b/icu4c/source/data/unit/uz_Cyrl.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/uz_Cyrl.xml diff --git a/icu4c/source/data/unit/uz_Latn.txt b/icu4c/source/data/unit/uz_Latn.txt index 401f8f5ebc2..e1f277b97e9 100755 --- a/icu4c/source/data/unit/uz_Latn.txt +++ b/icu4c/source/data/unit/uz_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/uz_Latn.xml diff --git a/icu4c/source/data/unit/uz_Latn_UZ.txt b/icu4c/source/data/unit/uz_Latn_UZ.txt index b2e95b8ac90..6004bf2bf3c 100755 --- a/icu4c/source/data/unit/uz_Latn_UZ.txt +++ b/icu4c/source/data/unit/uz_Latn_UZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/uz_UZ.txt b/icu4c/source/data/unit/uz_UZ.txt index 336e5eb71bf..84d0db1ce4a 100755 --- a/icu4c/source/data/unit/uz_UZ.txt +++ b/icu4c/source/data/unit/uz_UZ.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/vai.txt b/icu4c/source/data/unit/vai.txt index 935f6f11d20..dcbee1520b7 100755 --- a/icu4c/source/data/unit/vai.txt +++ b/icu4c/source/data/unit/vai.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/vai.xml // * // *************************************************************************** vai{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/vai_LR.txt b/icu4c/source/data/unit/vai_LR.txt index 0ea76a783a8..4733efb7297 100755 --- a/icu4c/source/data/unit/vai_LR.txt +++ b/icu4c/source/data/unit/vai_LR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/vai_Latn.txt b/icu4c/source/data/unit/vai_Latn.txt index e023bab7fdf..f19ab1c4ea1 100755 --- a/icu4c/source/data/unit/vai_Latn.txt +++ b/icu4c/source/data/unit/vai_Latn.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/vai_Latn.xml @@ -8,5 +8,5 @@ // *************************************************************************** vai_Latn{ %%Parent{"root"} - Version{"2.1.19.14"} + Version{"2.1.21.28"} } diff --git a/icu4c/source/data/unit/vai_Vaii.txt b/icu4c/source/data/unit/vai_Vaii.txt index e8370ee2a16..b48849143d6 100755 --- a/icu4c/source/data/unit/vai_Vaii.txt +++ b/icu4c/source/data/unit/vai_Vaii.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/vai_Vaii.xml diff --git a/icu4c/source/data/unit/vai_Vaii_LR.txt b/icu4c/source/data/unit/vai_Vaii_LR.txt index e8f2600fc14..fee861fb83a 100755 --- a/icu4c/source/data/unit/vai_Vaii_LR.txt +++ b/icu4c/source/data/unit/vai_Vaii_LR.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/vun.txt b/icu4c/source/data/unit/vun.txt index 7482ae91ae5..5a30a5f17be 100755 --- a/icu4c/source/data/unit/vun.txt +++ b/icu4c/source/data/unit/vun.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/vun.xml // * // *************************************************************************** vun{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/wae.txt b/icu4c/source/data/unit/wae.txt index 48c1ebaa6eb..8617988ba0f 100755 --- a/icu4c/source/data/unit/wae.txt +++ b/icu4c/source/data/unit/wae.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/wae.xml // * // *************************************************************************** wae{ - Version{"2.1.19.14"} + Version{"2.1.21.28"} units{ duration{ day{ diff --git a/icu4c/source/data/unit/xog.txt b/icu4c/source/data/unit/xog.txt index 4ef1ea44696..d77e44aaec6 100755 --- a/icu4c/source/data/unit/xog.txt +++ b/icu4c/source/data/unit/xog.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/xog.xml // * // *************************************************************************** xog{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/yav.txt b/icu4c/source/data/unit/yav.txt index d337cc3b0d1..2507f33e7f2 100755 --- a/icu4c/source/data/unit/yav.txt +++ b/icu4c/source/data/unit/yav.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/yav.xml // * // *************************************************************************** yav{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/yi.txt b/icu4c/source/data/unit/yi.txt index 825baddc6a8..66a705a01cb 100755 --- a/icu4c/source/data/unit/yi.txt +++ b/icu4c/source/data/unit/yi.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/yi.xml // * // *************************************************************************** yi{ - Version{"2.1.19.94"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/yo.txt b/icu4c/source/data/unit/yo.txt index c968092dfab..39e4d1f92d3 100755 --- a/icu4c/source/data/unit/yo.txt +++ b/icu4c/source/data/unit/yo.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/yo.xml // * // *************************************************************************** yo{ - Version{"2.1.19.80"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/yue.txt b/icu4c/source/data/unit/yue.txt new file mode 100755 index 00000000000..f92edd838c5 --- /dev/null +++ b/icu4c/source/data/unit/yue.txt @@ -0,0 +1,1623 @@ +// *************************************************************************** +// * +// * Copyright (C) 2016 International Business Machines +// * Corporation and others. All Rights Reserved. +// * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter +// * Source File: /common/main/yue.xml +// * +// *************************************************************************** +yue{ + Version{"2.1.23.47"} + durationUnits{ + hm{"h:mm"} + hms{"h:mm:ss"} + ms{"m:ss"} + } + units{ + acceleration{ + g-force{ + dnam{"G 力"} + other{"{0} G 力"} + } + meter-per-second-squared{ + dnam{"每平方秒公尺"} + other{"每平方秒 {0} 米"} + } + } + angle{ + arc-minute{ + dnam{"角分"} + other{"{0} 角分"} + } + arc-second{ + dnam{"角秒"} + other{"{0} 角秒"} + } + degree{ + dnam{"角度"} + other{"{0} 度"} + } + radian{ + dnam{"弧度"} + other{"{0} 弧度"} + } + revolution{ + dnam{"圈數"} + other{"{0} 圈"} + } + } + area{ + acre{ + dnam{"英畝"} + other{"{0} 英畝"} + } + hectare{ + dnam{"公頃"} + other{"{0} 公頃"} + } + square-centimeter{ + dnam{"平方公分"} + other{"{0} 平方公分"} + per{"每平方厘米 {0}"} + } + square-foot{ + dnam{"平方英尺"} + other{"{0} 平方英尺"} + } + square-inch{ + dnam{"平方英寸"} + other{"{0} 平方英寸"} + per{"每平方吋 {0}"} + } + square-kilometer{ + dnam{"平方公里"} + other{"{0} 平方公里"} + } + square-meter{ + dnam{"平方公尺"} + other{"{0} 平方公尺"} + per{"每平方米 {0}"} + } + square-mile{ + dnam{"平方英里"} + other{"{0} 平方英里"} + } + square-yard{ + dnam{"平方碼"} + other{"{0} 平方碼"} + } + } + compound{ + per{"每 {1} {0}"} + } + concentr{ + karat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"每 100 公里公升"} + other{"每 100 公里 {0} 公升"} + } + liter-per-kilometer{ + dnam{"每公里公升"} + other{"每公里 {0} 公升"} + } + mile-per-gallon{ + dnam{"每加侖英里"} + other{"每加侖 {0} 英里"} + } + } + coordinate{ + east{"東經{0}"} + north{"北緯{0}"} + south{"南緯{0}"} + west{"西經{0}"} + } + digital{ + bit{ + dnam{"bit"} + other{"{0} bit"} + } + byte{ + dnam{"byte"} + other{"{0} byte"} + } + gigabit{ + dnam{"Gb"} + other{"{0} Gb"} + } + gigabyte{ + dnam{"GB"} + other{"{0} GB"} + } + kilobit{ + dnam{"kb"} + other{"{0} kb"} + } + kilobyte{ + dnam{"kB"} + other{"{0} kB"} + } + megabit{ + dnam{"Mb"} + other{"{0} Mb"} + } + megabyte{ + dnam{"MB"} + other{"{0} MB"} + } + terabit{ + dnam{"Tb"} + other{"{0} Tb"} + } + terabyte{ + dnam{"TB"} + other{"{0} TB"} + } + } + duration{ + century{ + dnam{"世紀"} + other{"{0} 個世紀"} + } + day{ + dnam{"天"} + other{"{0} 天"} + per{"每日 {0}"} + } + hour{ + dnam{"小時"} + other{"{0} 小時"} + per{"每小時 {0}"} + } + microsecond{ + dnam{"微秒"} + other{"{0} 微秒"} + } + millisecond{ + dnam{"毫秒"} + other{"{0} 毫秒"} + } + minute{ + dnam{"分鐘"} + other{"{0} 分鐘"} + per{"每分鐘 {0}"} + } + month{ + dnam{"月"} + other{"{0} 個月"} + per{"每月 {0}"} + } + nanosecond{ + dnam{"奈秒"} + other{"{0} 奈秒"} + } + second{ + dnam{"秒"} + other{"{0} 秒"} + per{"每秒 {0}"} + } + week{ + dnam{"週"} + other{"{0} 週"} + per{"每星期 {0}"} + } + year{ + dnam{"年"} + other{"{0} 年"} + per{"每年 {0}"} + } + } + electric{ + ampere{ + dnam{"安培"} + other{"{0} 安培"} + } + milliampere{ + dnam{"毫安培"} + other{"{0} 毫安培"} + } + ohm{ + dnam{"歐姆"} + other{"{0} 歐姆"} + } + volt{ + dnam{"伏特"} + other{"{0} 伏特"} + } + } + energy{ + calorie{ + dnam{"卡路里"} + other{"{0} 卡路里"} + } + foodcalorie{ + dnam{"卡路里"} + other{"{0} 大卡"} + } + joule{ + dnam{"焦耳"} + other{"{0} 焦耳"} + } + kilocalorie{ + dnam{"千卡路里"} + other{"{0} 千卡路里"} + } + kilojoule{ + dnam{"千焦耳"} + other{"{0} 千焦耳"} + } + kilowatt-hour{ + dnam{"千瓦小時"} + other{"{0} 千瓦小時"} + } + } + frequency{ + gigahertz{ + dnam{"吉赫"} + other{"{0} 吉赫"} + } + hertz{ + dnam{"赫茲"} + other{"{0} 赫茲"} + } + kilohertz{ + dnam{"千赫"} + other{"{0} 千赫"} + } + megahertz{ + dnam{"兆赫"} + other{"{0} 兆赫"} + } + } + length{ + astronomical-unit{ + dnam{"天文單位"} + other{"{0} 天文單位"} + } + centimeter{ + dnam{"公分"} + other{"{0} 公分"} + per{"每厘米 {0}"} + } + decimeter{ + dnam{"公寸"} + other{"{0} 公寸"} + } + fathom{ + dnam{"英尋"} + other{"{0} 英尋"} + } + foot{ + dnam{"英尺"} + other{"{0} 英尺"} + per{"每呎 {0}"} + } + furlong{ + dnam{"化朗"} + other{"{0} 化朗"} + } + inch{ + dnam{"英寸"} + other{"{0} 英寸"} + per{"每吋 {0}"} + } + kilometer{ + dnam{"公里"} + other{"{0} 公里"} + per{"每公里 {0}"} + } + light-year{ + dnam{"光年"} + other{"{0} 光年"} + } + meter{ + dnam{"公尺"} + other{"{0} 公尺"} + per{"每米 {0}"} + } + micrometer{ + dnam{"微米"} + other{"{0} 微米"} + } + mile{ + dnam{"英里"} + other{"{0} 英里"} + } + mile-scandinavian{ + dnam{"斯堪地那維亞英里"} + other{"{0} 斯堪地那維亞英里"} + } + millimeter{ + dnam{"公釐"} + other{"{0} 公釐"} + } + nanometer{ + dnam{"奈米"} + other{"{0} 奈米"} + } + nautical-mile{ + dnam{"海里"} + other{"{0} 海里"} + } + parsec{ + dnam{"秒差距"} + other{"{0} 秒差距"} + } + picometer{ + dnam{"皮米"} + other{"{0} 皮米"} + } + yard{ + dnam{"碼"} + other{"{0} 碼"} + } + } + light{ + lux{ + dnam{"勒克斯"} + other{"{0} 勒克斯"} + } + } + mass{ + carat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + gram{ + dnam{"克"} + other{"{0} 克"} + per{"每克 {0}"} + } + kilogram{ + dnam{"公斤"} + other{"{0} 公斤"} + per{"每公斤 {0}"} + } + metric-ton{ + dnam{"公噸"} + other{"{0} 公噸"} + } + microgram{ + dnam{"微克"} + other{"{0} 微克"} + } + milligram{ + dnam{"毫克"} + other{"{0} 毫克"} + } + ounce{ + dnam{"盎司"} + other{"{0} 盎司"} + per{"每安士 {0}"} + } + ounce-troy{ + dnam{"金衡盎司"} + other{"{0} 金衡盎司"} + } + pound{ + dnam{"磅"} + other{"{0} 磅"} + per{"每磅 {0}"} + } + stone{ + dnam{"英石"} + other{"{0} 英石"} + } + ton{ + dnam{"英噸"} + other{"{0} 英噸"} + } + } + power{ + gigawatt{ + dnam{"吉瓦"} + other{"{0} 吉瓦"} + } + horsepower{ + dnam{"馬力"} + other{"{0} 匹馬力"} + } + kilowatt{ + dnam{"千瓦特"} + other{"{0} 千瓦特"} + } + megawatt{ + dnam{"百萬瓦特"} + other{"{0} 百萬瓦特"} + } + milliwatt{ + dnam{"毫瓦特"} + other{"{0} 毫瓦特"} + } + watt{ + dnam{"瓦特"} + other{"{0} 瓦特"} + } + } + pressure{ + hectopascal{ + dnam{"百帕"} + other{"{0} 百帕"} + } + inch-hg{ + dnam{"英寸汞柱"} + other{"{0} 英寸汞柱"} + } + millibar{ + dnam{"毫巴"} + other{"{0} 毫巴"} + } + millimeter-of-mercury{ + dnam{"毫米汞柱"} + other{"{0} 毫米汞柱"} + } + pound-per-square-inch{ + dnam{"每平方英寸磅力"} + other{"每平方吋 {0} 磅"} + } + } + speed{ + kilometer-per-hour{ + dnam{"每小時公里"} + other{"每小時 {0} 公里"} + } + knot{ + dnam{"節"} + other{"{0} 節"} + } + meter-per-second{ + dnam{"每秒公尺"} + other{"每秒 {0} 米"} + } + mile-per-hour{ + dnam{"每小時英里"} + other{"每小時 {0} 英里"} + } + } + temperature{ + celsius{ + dnam{"攝氏度數"} + other{"攝氏 {0} 度"} + } + fahrenheit{ + dnam{"華氏度數"} + other{"華氏 {0} 度"} + } + generic{ + dnam{"°"} + other{"{0}°"} + } + kelvin{ + dnam{"克耳文"} + other{"{0} 克耳文"} + } + } + volume{ + acre-foot{ + dnam{"英畝英尺"} + other{"{0} 英畝英尺"} + } + bushel{ + dnam{"蒲式耳"} + other{"{0} 蒲式耳"} + } + centiliter{ + dnam{"釐升"} + other{"{0} 釐升"} + } + cubic-centimeter{ + dnam{"立方公分"} + other{"{0} 立方公分"} + per{"每立方厘米 {0}"} + } + cubic-foot{ + dnam{"立方英尺"} + other{"{0} 立方英尺"} + } + cubic-inch{ + dnam{"立方英寸"} + other{"{0} 立方英寸"} + } + cubic-kilometer{ + dnam{"立方公里"} + other{"{0} 立方公里"} + } + cubic-meter{ + dnam{"立方公尺"} + other{"{0} 立方公尺"} + per{"每立方米 {0}"} + } + cubic-mile{ + dnam{"立方英里"} + other{"{0} 立方英里"} + } + cubic-yard{ + dnam{"立方碼"} + other{"{0} 立方碼"} + } + cup{ + dnam{"量杯"} + other{"{0} 杯"} + } + cup-metric{ + dnam{"公制量杯"} + } + deciliter{ + dnam{"公合"} + other{"{0} 公合"} + } + fluid-ounce{ + dnam{"液盎司"} + other{"{0} 液盎司"} + } + gallon{ + dnam{"加侖"} + other{"{0} 加侖"} + per{"每加侖 {0}"} + } + hectoliter{ + dnam{"公石"} + other{"{0} 公石"} + } + liter{ + dnam{"公升"} + other{"{0} 公升"} + per{"每公升 {0}"} + } + megaliter{ + dnam{"兆升"} + other{"{0} 兆升"} + } + milliliter{ + dnam{"毫升"} + other{"{0} 毫升"} + } + pint{ + dnam{"品脫"} + other{"{0} 品脫"} + } + pint-metric{ + dnam{"公制品脫"} + other{"{0} 公制品脫"} + } + quart{ + dnam{"夸脫"} + other{"{0} 夸脫"} + } + tablespoon{ + dnam{"湯匙"} + other{"{0} 湯匙"} + } + teaspoon{ + dnam{"茶匙"} + other{"{0} 茶匙"} + } + } + } + unitsNarrow{ + acceleration{ + g-force{ + other{"{0}G"} + } + meter-per-second-squared{ + other{"{0}m/s²"} + } + } + angle{ + arc-minute{ + other{"{0}角分"} + } + arc-second{ + other{"{0}角秒"} + } + degree{ + other{"{0}度"} + } + radian{ + other{"{0}弧度"} + } + } + area{ + acre{ + other{"{0}英畝"} + } + hectare{ + other{"{0}公頃"} + } + square-centimeter{ + other{"{0}cm²"} + } + square-foot{ + other{"{0}平方英尺"} + } + square-inch{ + other{"{0}in²"} + } + square-kilometer{ + other{"{0}km²"} + } + square-meter{ + other{"{0}m²"} + } + square-mile{ + other{"{0}平方英里"} + } + square-yard{ + other{"{0}yd²"} + } + } + compound{ + per{"{0}/{1}"} + } + concentr{ + karat{ + other{"{0}kt"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"升/100公里"} + other{"每100公里{0}升"} + } + liter-per-kilometer{ + other{"{0}L/km"} + } + mile-per-gallon{ + other{"{0}mpg"} + } + } + coordinate{ + east{"東經{0}"} + north{"北緯{0}"} + south{"南緯{0}"} + west{"西經{0}"} + } + digital{ + bit{ + other{"{0}bit"} + } + byte{ + other{"{0}byte"} + } + gigabit{ + other{"{0}Gb"} + } + gigabyte{ + other{"{0}GB"} + } + kilobit{ + other{"{0}kb"} + } + kilobyte{ + other{"{0}kB"} + } + megabit{ + other{"{0}Mb"} + } + megabyte{ + other{"{0}MB"} + } + terabit{ + other{"{0}Tb"} + } + terabyte{ + other{"{0}TB"} + } + } + duration{ + day{ + dnam{"天"} + other{"{0}天"} + } + hour{ + dnam{"小時"} + other{"{0}時"} + } + microsecond{ + other{"{0}μs"} + } + millisecond{ + dnam{"毫秒"} + other{"{0}毫秒"} + } + minute{ + dnam{"分鐘"} + other{"{0}分"} + } + month{ + dnam{"月"} + other{"{0}月"} + } + nanosecond{ + other{"{0}ns"} + } + second{ + dnam{"秒"} + other{"{0}秒"} + } + week{ + dnam{"週"} + other{"{0}週"} + } + year{ + dnam{"年"} + other{"{0}年"} + } + } + electric{ + ampere{ + other{"{0}A"} + } + milliampere{ + other{"{0}mA"} + } + ohm{ + other{"{0}Ω"} + } + volt{ + other{"{0}V"} + } + } + energy{ + calorie{ + other{"{0}卡"} + } + foodcalorie{ + other{"{0}大卡"} + } + joule{ + other{"{0}焦"} + } + kilocalorie{ + other{"{0}千卡"} + } + kilojoule{ + other{"{0}千焦耳"} + } + kilowatt-hour{ + other{"{0}kWh"} + } + } + frequency{ + gigahertz{ + other{"{0}GHz"} + } + hertz{ + other{"{0}Hz"} + } + kilohertz{ + other{"{0}kHz"} + } + megahertz{ + other{"{0}MHz"} + } + } + length{ + astronomical-unit{ + other{"{0}au"} + } + centimeter{ + dnam{"公分"} + other{"{0}公分"} + } + decimeter{ + other{"{0}dm"} + } + fathom{ + dnam{"英尋"} + other{"{0}fm"} + } + foot{ + other{"{0}呎"} + } + furlong{ + dnam{"化朗"} + other{"{0}化朗"} + } + inch{ + other{"{0}吋"} + } + kilometer{ + dnam{"公里"} + other{"{0}公里"} + } + light-year{ + other{"{0}光年"} + } + meter{ + dnam{"公尺"} + other{"{0}公尺"} + } + micrometer{ + other{"{0}µm"} + } + mile{ + other{"{0}英里"} + } + millimeter{ + dnam{"公釐"} + other{"{0}公釐"} + } + nanometer{ + other{"{0}nm"} + } + nautical-mile{ + other{"{0}nmi"} + } + parsec{ + other{"{0}pc"} + } + picometer{ + other{"{0}皮米"} + } + yard{ + other{"{0}碼"} + } + } + light{ + lux{ + other{"{0}lx"} + } + } + mass{ + carat{ + other{"{0}CD"} + } + gram{ + dnam{"克"} + other{"{0}克"} + } + kilogram{ + dnam{"公斤"} + other{"{0}公斤"} + } + metric-ton{ + other{"{0}t"} + } + microgram{ + other{"{0}µg"} + } + milligram{ + other{"{0}mg"} + } + ounce{ + other{"{0}盎司"} + } + ounce-troy{ + other{"{0}oz-t"} + } + pound{ + other{"{0}磅"} + } + stone{ + dnam{"英石"} + other{"{0}st"} + } + ton{ + other{"{0}tn"} + } + } + power{ + gigawatt{ + other{"{0}GW"} + } + horsepower{ + other{"{0}匹"} + } + kilowatt{ + other{"{0}千瓦"} + } + megawatt{ + other{"{0}MW"} + } + milliwatt{ + other{"{0}mW"} + } + watt{ + other{"{0}瓦特"} + } + } + pressure{ + hectopascal{ + other{"{0}百帕"} + } + inch-hg{ + other{"{0}″ Hg"} + } + millibar{ + other{"{0}毫巴"} + } + millimeter-of-mercury{ + other{"{0}mmHg"} + } + pound-per-square-inch{ + other{"{0}psi"} + } + } + speed{ + kilometer-per-hour{ + dnam{"公里/小時"} + other{"{0}公里/小時"} + } + meter-per-second{ + other{"{0}m/s"} + } + mile-per-hour{ + other{"{0}英里/小時"} + } + } + temperature{ + celsius{ + dnam{"°C"} + other{"{0}°C"} + } + fahrenheit{ + other{"{0}°F"} + } + kelvin{ + dnam{"K"} + other{"{0}°K"} + } + } + volume{ + acre-foot{ + other{"{0}ac-ft"} + } + bushel{ + dnam{"蒲式耳"} + other{"{0}bu"} + } + centiliter{ + other{"{0}cL"} + } + cubic-centimeter{ + other{"{0}cm³"} + } + cubic-foot{ + other{"{0}ft³"} + } + cubic-inch{ + other{"{0}in³"} + } + cubic-kilometer{ + other{"{0}km³"} + } + cubic-meter{ + other{"{0}m³"} + } + cubic-mile{ + other{"{0}立方英里"} + } + cubic-yard{ + other{"{0}yd³"} + } + cup{ + other{"{0}c"} + } + deciliter{ + other{"{0}dL"} + } + fluid-ounce{ + other{"{0}fl-oz"} + } + gallon{ + other{"{0}gal"} + } + hectoliter{ + other{"{0}hL"} + } + liter{ + dnam{"公升"} + other{"{0}升"} + } + megaliter{ + other{"{0}ML"} + } + milliliter{ + other{"{0}mL"} + } + pint{ + other{"{0}pt"} + } + quart{ + other{"{0}qt"} + } + tablespoon{ + other{"{0}匙"} + } + teaspoon{ + other{"{0}tsp"} + } + } + } + unitsShort{ + acceleration{ + g-force{ + dnam{"G 力"} + other{"{0} G 力"} + } + meter-per-second-squared{ + dnam{"公尺/平方秒"} + other{"每平方秒{0}米"} + } + } + angle{ + arc-minute{ + dnam{"角分"} + other{"{0} 角分"} + } + arc-second{ + dnam{"角秒"} + other{"{0} 角秒"} + } + degree{ + dnam{"角度"} + other{"{0} 度"} + } + radian{ + dnam{"弧度"} + other{"{0} 弧度"} + } + revolution{ + dnam{"圈數"} + other{"{0} 圈"} + } + } + area{ + acre{ + dnam{"英畝"} + other{"{0} 英畝"} + } + hectare{ + dnam{"公頃"} + other{"{0} 公頃"} + } + square-centimeter{ + dnam{"平方公分"} + other{"{0} 平方公分"} + per{"每平方厘米{0}"} + } + square-foot{ + dnam{"平方英尺"} + other{"{0} 平方英尺"} + } + square-inch{ + dnam{"平方英寸"} + other{"{0} 平方英寸"} + per{"每平方吋{0}"} + } + square-kilometer{ + dnam{"平方公里"} + other{"{0} 平方公里"} + } + square-meter{ + dnam{"平方公尺"} + other{"{0} 平方公尺"} + per{"每平方米{0}"} + } + square-mile{ + dnam{"平方英里"} + other{"{0} 平方英里"} + } + square-yard{ + dnam{"平方碼"} + other{"{0} 平方碼"} + } + } + compound{ + per{"{0}/{1}"} + } + concentr{ + karat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + } + consumption{ + liter-per-100kilometers{ + dnam{"升/100 公里"} + other{"每100公里 {0} 升"} + } + liter-per-kilometer{ + dnam{"公升/公里"} + other{"每公里{0}公升"} + } + mile-per-gallon{ + dnam{"英里/加侖"} + other{"每加侖{0}英里"} + } + } + coordinate{ + east{"東經{0}"} + north{"北緯{0}"} + south{"南緯{0}"} + west{"西經{0}"} + } + digital{ + bit{ + dnam{"bit"} + other{"{0} bit"} + } + byte{ + dnam{"byte"} + other{"{0} byte"} + } + gigabit{ + dnam{"Gb"} + other{"{0} Gb"} + } + gigabyte{ + dnam{"GB"} + other{"{0} GB"} + } + kilobit{ + dnam{"kb"} + other{"{0} kb"} + } + kilobyte{ + dnam{"kB"} + other{"{0} kB"} + } + megabit{ + dnam{"Mb"} + other{"{0} Mb"} + } + megabyte{ + dnam{"MB"} + other{"{0} MB"} + } + terabit{ + dnam{"Tb"} + other{"{0} Tb"} + } + terabyte{ + dnam{"TB"} + other{"{0} TB"} + } + } + duration{ + century{ + dnam{"世紀"} + other{"{0} 世紀"} + } + day{ + dnam{"天"} + other{"{0} 天"} + per{"每日{0}"} + } + hour{ + dnam{"小時"} + other{"{0} 小時"} + per{"每小時{0}"} + } + microsecond{ + dnam{"微秒"} + other{"{0} 微秒"} + } + millisecond{ + dnam{"毫秒"} + other{"{0} 毫秒"} + } + minute{ + dnam{"分鐘"} + other{"{0} 分鐘"} + per{"每分鐘{0}"} + } + month{ + dnam{"月"} + other{"{0} 個月"} + per{"每月{0}"} + } + nanosecond{ + dnam{"奈秒"} + other{"{0} 奈秒"} + } + second{ + dnam{"秒"} + other{"{0} 秒"} + per{"每秒{0}"} + } + week{ + dnam{"週"} + other{"{0} 週"} + per{"每週{0}"} + } + year{ + dnam{"年"} + other{"{0} 年"} + per{"每年{0}"} + } + } + electric{ + ampere{ + dnam{"安培"} + other{"{0} 安培"} + } + milliampere{ + dnam{"毫安培"} + other{"{0} 毫安培"} + } + ohm{ + dnam{"歐姆"} + other{"{0} 歐姆"} + } + volt{ + dnam{"伏特"} + other{"{0} 伏"} + } + } + energy{ + calorie{ + dnam{"卡路里"} + other{"{0} 卡"} + } + foodcalorie{ + dnam{"大卡"} + other{"{0} 大卡"} + } + joule{ + dnam{"焦耳"} + other{"{0} 焦"} + } + kilocalorie{ + dnam{"千卡"} + other{"{0} 千卡"} + } + kilojoule{ + dnam{"千焦耳"} + other{"{0} 千焦"} + } + kilowatt-hour{ + dnam{"千瓦小時"} + other{"{0} 千瓦小時"} + } + } + frequency{ + gigahertz{ + dnam{"吉赫"} + other{"{0} 吉赫"} + } + hertz{ + dnam{"赫茲"} + other{"{0} 赫茲"} + } + kilohertz{ + dnam{"千赫"} + other{"{0} 千赫"} + } + megahertz{ + dnam{"兆赫"} + other{"{0} 兆赫"} + } + } + length{ + astronomical-unit{ + dnam{"天文單位"} + other{"{0} 天文單位"} + } + centimeter{ + dnam{"公分"} + other{"{0} 公分"} + per{"每厘米{0}"} + } + decimeter{ + dnam{"公寸"} + other{"{0} 公寸"} + } + fathom{ + dnam{"fm"} + other{"{0} 英尋"} + } + foot{ + dnam{"英尺"} + other{"{0} 呎"} + per{"每呎{0}"} + } + furlong{ + dnam{"化朗"} + other{"{0} 化朗"} + } + inch{ + dnam{"英寸"} + other{"{0} 吋"} + per{"每吋{0}"} + } + kilometer{ + dnam{"公里"} + other{"{0} 公里"} + per{"每公里{0}"} + } + light-year{ + dnam{"光年"} + other{"{0} 光年"} + } + meter{ + dnam{"公尺"} + other{"{0} 公尺"} + per{"每米{0}"} + } + micrometer{ + dnam{"微米"} + other{"{0} 微米"} + } + mile{ + dnam{"英里"} + other{"{0} 英里"} + } + mile-scandinavian{ + dnam{"斯堪地那維亞英里"} + other{"{0} 斯堪地那維亞英里"} + } + millimeter{ + dnam{"公釐"} + other{"{0} 公釐"} + } + nanometer{ + dnam{"奈米"} + other{"{0} 奈米"} + } + nautical-mile{ + dnam{"海里"} + other{"{0} 海里"} + } + parsec{ + dnam{"秒差距"} + other{"{0} 秒差距"} + } + picometer{ + dnam{"皮米"} + other{"{0} 皮米"} + } + yard{ + dnam{"碼"} + other{"{0} 碼"} + } + } + light{ + lux{ + dnam{"勒克斯"} + other{"{0} 勒克斯"} + } + } + mass{ + carat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + gram{ + dnam{"克"} + other{"{0} 克"} + per{"每克{0}"} + } + kilogram{ + dnam{"公斤"} + other{"{0} 公斤"} + per{"每公斤{0}"} + } + metric-ton{ + dnam{"公噸"} + other{"{0} 公噸"} + } + microgram{ + dnam{"微克"} + other{"{0} 微克"} + } + milligram{ + dnam{"毫克"} + other{"{0} 毫克"} + } + ounce{ + dnam{"盎司"} + other{"{0} 盎司"} + per{"每安士{0}"} + } + ounce-troy{ + dnam{"金衡盎司"} + other{"{0} 金衡盎司"} + } + pound{ + dnam{"磅"} + other{"{0} 磅"} + per{"每磅{0}"} + } + stone{ + dnam{"st"} + other{"{0} 英石"} + } + ton{ + dnam{"英噸"} + other{"{0} 英噸"} + } + } + power{ + gigawatt{ + dnam{"吉瓦"} + other{"{0} 吉瓦"} + } + horsepower{ + dnam{"匹"} + other{"{0} 匹"} + } + kilowatt{ + dnam{"千瓦"} + other{"{0} 千瓦"} + } + megawatt{ + dnam{"百萬瓦"} + other{"{0} 百萬瓦"} + } + milliwatt{ + dnam{"毫瓦"} + other{"{0} 毫瓦"} + } + watt{ + dnam{"瓦特"} + other{"{0} 瓦"} + } + } + pressure{ + hectopascal{ + dnam{"百帕"} + other{"{0} 百帕"} + } + inch-hg{ + dnam{"英寸汞柱"} + other{"{0} 英寸汞柱"} + } + millibar{ + dnam{"毫巴"} + other{"{0} 毫巴"} + } + millimeter-of-mercury{ + dnam{"毫米汞柱"} + other{"{0} 毫米汞柱"} + } + pound-per-square-inch{ + dnam{"磅力/平方英寸"} + other{"每平方吋{0}磅"} + } + } + speed{ + kilometer-per-hour{ + dnam{"公里/小時"} + other{"每小時{0}公里"} + } + knot{ + dnam{"節"} + other{"{0} 節"} + } + meter-per-second{ + dnam{"公尺/秒"} + other{"每秒{0}米"} + } + mile-per-hour{ + dnam{"英里/小時"} + other{"每小時{0}英里"} + } + } + temperature{ + celsius{ + dnam{"攝氏"} + other{"{0}°C"} + } + fahrenheit{ + dnam{"華氏"} + other{"{0}°F"} + } + generic{ + dnam{"°"} + other{"{0}°"} + } + kelvin{ + dnam{"K"} + other{"{0} K"} + } + } + volume{ + acre-foot{ + dnam{"英畝英尺"} + other{"{0} 英畝英尺"} + } + bushel{ + dnam{"bu"} + other{"{0} 蒲式耳"} + } + centiliter{ + dnam{"釐升"} + other{"{0} 釐升"} + } + cubic-centimeter{ + dnam{"立方公分"} + other{"{0} 立方公分"} + per{"每立方厘米{0}"} + } + cubic-foot{ + dnam{"立方英尺"} + other{"{0} 立方英尺"} + } + cubic-inch{ + dnam{"立方英寸"} + other{"{0} 立方英寸"} + } + cubic-kilometer{ + dnam{"立方公里"} + other{"{0} 立方公里"} + } + cubic-meter{ + dnam{"立方公尺"} + other{"{0} 立方公尺"} + per{"每立方米{0}"} + } + cubic-mile{ + dnam{"立方英里"} + other{"{0} 立方英里"} + } + cubic-yard{ + dnam{"立方碼"} + other{"{0} 立方碼"} + } + cup{ + dnam{"量杯"} + other{"{0} 杯"} + } + cup-metric{ + dnam{"公制量杯"} + other{"{0} 公制杯"} + } + deciliter{ + dnam{"公合"} + other{"{0} 公合"} + } + fluid-ounce{ + dnam{"液盎司"} + other{"{0} 液盎司"} + } + gallon{ + dnam{"加侖"} + other{"{0} 加侖"} + per{"每加侖{0}"} + } + hectoliter{ + dnam{"公石"} + other{"{0} 公石"} + } + liter{ + dnam{"公升"} + other{"{0} 升"} + per{"每升{0}"} + } + megaliter{ + dnam{"兆升"} + other{"{0} 兆升"} + } + milliliter{ + dnam{"毫升"} + other{"{0} 毫升"} + } + pint{ + dnam{"品脫"} + other{"{0} 品脫"} + } + pint-metric{ + dnam{"公制品脫"} + other{"{0} 公制品脫"} + } + quart{ + dnam{"夸脫"} + other{"{0} 夸脫"} + } + tablespoon{ + dnam{"湯匙"} + other{"{0} 湯匙"} + } + teaspoon{ + dnam{"茶匙"} + other{"{0} 茶匙"} + } + } + } +} diff --git a/icu4c/source/data/unit/zgh.txt b/icu4c/source/data/unit/zgh.txt index 7c46c943c6f..d19004a8c03 100755 --- a/icu4c/source/data/unit/zgh.txt +++ b/icu4c/source/data/unit/zgh.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zgh.xml // * // *************************************************************************** zgh{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} } diff --git a/icu4c/source/data/unit/zh_CN.txt b/icu4c/source/data/unit/zh_CN.txt index 6dcdfbac884..1688232d706 100755 --- a/icu4c/source/data/unit/zh_CN.txt +++ b/icu4c/source/data/unit/zh_CN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_HK.txt b/icu4c/source/data/unit/zh_HK.txt index 81e76f7ec69..30b7ea88798 100755 --- a/icu4c/source/data/unit/zh_HK.txt +++ b/icu4c/source/data/unit/zh_HK.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_Hans.txt b/icu4c/source/data/unit/zh_Hans.txt index 2d476fb9010..72fe1313937 100755 --- a/icu4c/source/data/unit/zh_Hans.txt +++ b/icu4c/source/data/unit/zh_Hans.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hans.xml diff --git a/icu4c/source/data/unit/zh_Hans_CN.txt b/icu4c/source/data/unit/zh_Hans_CN.txt index af9c02e8a24..1e9e15332d8 100755 --- a/icu4c/source/data/unit/zh_Hans_CN.txt +++ b/icu4c/source/data/unit/zh_Hans_CN.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_Hans_HK.txt b/icu4c/source/data/unit/zh_Hans_HK.txt index ad9a818eb7e..7416bc583fd 100755 --- a/icu4c/source/data/unit/zh_Hans_HK.txt +++ b/icu4c/source/data/unit/zh_Hans_HK.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hans_HK.xml // * // *************************************************************************** zh_Hans_HK{ - Version{"2.1.19.79"} + Version{"2.1.22.93"} units{ compound{ per{"{0}/{1}"} diff --git a/icu4c/source/data/unit/zh_Hans_MO.txt b/icu4c/source/data/unit/zh_Hans_MO.txt index 282f41793c8..3ef2da90102 100755 --- a/icu4c/source/data/unit/zh_Hans_MO.txt +++ b/icu4c/source/data/unit/zh_Hans_MO.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hans_MO.xml // * // *************************************************************************** zh_Hans_MO{ - Version{"2.1.19.79"} + Version{"2.1.22.93"} units{ compound{ per{"{0}/{1}"} diff --git a/icu4c/source/data/unit/zh_Hans_SG.txt b/icu4c/source/data/unit/zh_Hans_SG.txt index 9fe9a27bc2d..159f576571a 100755 --- a/icu4c/source/data/unit/zh_Hans_SG.txt +++ b/icu4c/source/data/unit/zh_Hans_SG.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hans_SG.xml // * // *************************************************************************** zh_Hans_SG{ - Version{"2.1.19.79"} + Version{"2.1.22.93"} units{ compound{ per{"{0}/{1}"} diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index 31029dbcb4b..376e77da881 100755 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.txt @@ -8,7 +8,7 @@ // *************************************************************************** zh_Hant{ %%Parent{"root"} - Version{"2.1.23.7"} + Version{"2.1.23.90"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} diff --git a/icu4c/source/data/unit/zh_Hant_HK.txt b/icu4c/source/data/unit/zh_Hant_HK.txt index b9e3c0fa773..0a476af0b7f 100755 --- a/icu4c/source/data/unit/zh_Hant_HK.txt +++ b/icu4c/source/data/unit/zh_Hant_HK.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hant_HK.xml // * // *************************************************************************** zh_Hant_HK{ - Version{"2.1.19.94"} + Version{"2.1.22.17"} units{ acceleration{ meter-per-second-squared{ diff --git a/icu4c/source/data/unit/zh_Hant_MO.txt b/icu4c/source/data/unit/zh_Hant_MO.txt index d92c648d7ce..9a07324f45d 100755 --- a/icu4c/source/data/unit/zh_Hant_MO.txt +++ b/icu4c/source/data/unit/zh_Hant_MO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zh_Hant_MO.xml diff --git a/icu4c/source/data/unit/zh_Hant_TW.txt b/icu4c/source/data/unit/zh_Hant_TW.txt index af0e3ad5111..519e037e73e 100755 --- a/icu4c/source/data/unit/zh_Hant_TW.txt +++ b/icu4c/source/data/unit/zh_Hant_TW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_MO.txt b/icu4c/source/data/unit/zh_MO.txt index 36850798abc..3c9ffed9a54 100755 --- a/icu4c/source/data/unit/zh_MO.txt +++ b/icu4c/source/data/unit/zh_MO.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_SG.txt b/icu4c/source/data/unit/zh_SG.txt index 27ef3cb8872..63fa3e0b44b 100755 --- a/icu4c/source/data/unit/zh_SG.txt +++ b/icu4c/source/data/unit/zh_SG.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zh_TW.txt b/icu4c/source/data/unit/zh_TW.txt index 9d627a7c4d1..31f3af97ef1 100755 --- a/icu4c/source/data/unit/zh_TW.txt +++ b/icu4c/source/data/unit/zh_TW.txt @@ -1,6 +1,6 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /icu-locale-deprecates.xml & build.xml diff --git a/icu4c/source/data/unit/zu.txt b/icu4c/source/data/unit/zu.txt index 28ce459ae2e..2b8e101c309 100755 --- a/icu4c/source/data/unit/zu.txt +++ b/icu4c/source/data/unit/zu.txt @@ -1,13 +1,13 @@ // *************************************************************************** // * -// * Copyright (C) 2015 International Business Machines +// * Copyright (C) 2016 International Business Machines // * Corporation and others. All Rights Reserved. // * Tool: org.unicode.cldr.icu.NewLdml2IcuConverter // * Source File: /common/main/zu.xml // * // *************************************************************************** zu{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ zu{ compound{ per{"{0} nge-{1}"} } + concentr{ + karat{ + dnam{"karats"} + one{"{0} i-karat"} + other{"{0} ama-karats"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -535,13 +542,6 @@ zu{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karats"} - one{"{0} i-karat"} - other{"{0} ama-karats"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -940,6 +940,13 @@ zu{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karats"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1369,13 +1376,6 @@ zu{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karats"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"}