From d63bc540eca1cb09a01881b03af4940fa3fe8643 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 2 Feb 2016 00:38:16 +0000 Subject: [PATCH] ICU-12133 (C) Change proportion-karat to concentr-karat, add 5 new units in CLDR 29 X-SVN-Rev: 38249 --- icu4c/source/data/unit/ar.txt | 48 +- icu4c/source/data/unit/ca.txt | 32 +- icu4c/source/data/unit/cs.txt | 58 +-- icu4c/source/data/unit/da.txt | 32 +- icu4c/source/data/unit/de.txt | 44 +- icu4c/source/data/unit/el.txt | 32 +- icu4c/source/data/unit/en.txt | 36 +- icu4c/source/data/unit/es.txt | 32 +- icu4c/source/data/unit/es_GT.txt | 16 +- icu4c/source/data/unit/fi.txt | 46 +- icu4c/source/data/unit/fr.txt | 32 +- icu4c/source/data/unit/fr_CA.txt | 14 +- icu4c/source/data/unit/he.txt | 40 +- icu4c/source/data/unit/hi.txt | 32 +- icu4c/source/data/unit/hr.txt | 50 +- icu4c/source/data/unit/hu.txt | 32 +- icu4c/source/data/unit/id.txt | 28 +- icu4c/source/data/unit/it.txt | 32 +- icu4c/source/data/unit/ja.txt | 38 +- icu4c/source/data/unit/ms.txt | 28 +- icu4c/source/data/unit/nb.txt | 32 +- icu4c/source/data/unit/nl.txt | 44 +- icu4c/source/data/unit/pl.txt | 40 +- icu4c/source/data/unit/pt.txt | 32 +- icu4c/source/data/unit/pt_PT.txt | 35 +- icu4c/source/data/unit/ro.txt | 36 +- icu4c/source/data/unit/root.txt | 10 +- icu4c/source/data/unit/ru.txt | 40 +- icu4c/source/data/unit/sk.txt | 56 +-- icu4c/source/data/unit/sv.txt | 32 +- icu4c/source/data/unit/th.txt | 28 +- icu4c/source/data/unit/tr.txt | 44 +- icu4c/source/data/unit/uk.txt | 40 +- icu4c/source/data/unit/vi.txt | 28 +- icu4c/source/data/unit/zh.txt | 28 +- icu4c/source/data/unit/zh_Hant.txt | 38 +- icu4c/source/i18n/measfmt.cpp | 2 +- icu4c/source/i18n/measunit.cpp | 503 +++++++++++---------- icu4c/source/i18n/unicode/measunit.h | 68 ++- icu4c/source/test/intltest/measfmttest.cpp | 142 ++++++ 40 files changed, 1097 insertions(+), 883 deletions(-) diff --git a/icu4c/source/data/unit/ar.txt b/icu4c/source/data/unit/ar.txt index d6a1d3fb88e..b907acb8138 100755 --- a/icu4c/source/data/unit/ar.txt +++ b/icu4c/source/data/unit/ar.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/ar.xml // * // *************************************************************************** ar{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -170,6 +170,17 @@ ar{ compound{ per{"{0} لكل {1}"} } + concentr{ + karat{ + dnam{"قيراط"} + few{"{0} قيراط"} + many{"{0} قيراط"} + one{"{0} قيراط"} + other{"{0} قيراط"} + two{"{0} قيراط"} + zero{"{0} قيراط"} + } + } consumption{ liter-per-100kilometers{ dnam{"لتر لكل ١٠٠ كيلومتر"} @@ -907,17 +918,6 @@ ar{ zero{"{0} رطل لكل بوصة مربعة"} } } - proportion{ - karat{ - dnam{"قيراط"} - few{"{0} قيراط"} - many{"{0} قيراط"} - one{"{0} قيراط"} - other{"{0} قيراط"} - two{"{0} قيراط"} - zero{"{0} قيراط"} - } - } speed{ kilometer-per-hour{ dnam{"كيلومتر في الساعة"} @@ -1794,6 +1794,17 @@ ar{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"قيراط"} + few{"{0} قيراط"} + many{"{0} قيراط"} + one{"{0} قيراط"} + other{"{0} قيراط"} + two{"{0} قيراط"} + zero{"{0} قيراط"} + } + } consumption{ liter-per-100kilometers{ dnam{"لتر/‏١٠٠ كم"} @@ -2531,17 +2542,6 @@ ar{ zero{"{0} رطل/بوصة مربعة"} } } - proportion{ - karat{ - dnam{"قيراط"} - few{"{0} قيراط"} - many{"{0} قيراط"} - one{"{0} قيراط"} - other{"{0} قيراط"} - two{"{0} قيراط"} - zero{"{0} قيراط"} - } - } speed{ kilometer-per-hour{ dnam{"كم/س"} diff --git a/icu4c/source/data/unit/ca.txt b/icu4c/source/data/unit/ca.txt index e8f9aefe779..e1b0b9dd5b3 100755 --- a/icu4c/source/data/unit/ca.txt +++ b/icu4c/source/data/unit/ca.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/ca.xml // * // *************************************************************************** ca{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ ca{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"quirats"} + one{"{0} quirat"} + other{"{0} quirats"} + } + } consumption{ liter-per-100kilometers{ dnam{"litres per 100 quilòmetres"} @@ -535,13 +542,6 @@ ca{ other{"{0} lliures per polzada quadrada"} } } - proportion{ - karat{ - dnam{"quirats"} - one{"{0} quirat"} - other{"{0} quirats"} - } - } speed{ kilometer-per-hour{ dnam{"quilòmetres per hora"} @@ -1078,6 +1078,13 @@ ca{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ct"} + one{"{0} ct"} + other{"{0} ct"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1507,13 +1514,6 @@ ca{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ct"} - one{"{0} ct"} - other{"{0} ct"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/cs.txt b/icu4c/source/data/unit/cs.txt index e7b596b2af3..0a61cea27a0 100755 --- a/icu4c/source/data/unit/cs.txt +++ b/icu4c/source/data/unit/cs.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/cs.xml // * // *************************************************************************** cs{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ cs{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karáty"} + few{"{0} karáty"} + many{"{0} karátu"} + one{"{0} karát"} + other{"{0} karátů"} + } + } consumption{ liter-per-100kilometers{ dnam{"litry na sto kilometrů"} @@ -742,15 +751,6 @@ cs{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karáty"} - few{"{0} karáty"} - many{"{0} karátu"} - one{"{0} karát"} - other{"{0} karátů"} - } - } speed{ kilometer-per-hour{ dnam{"kilometry za hodinu"} @@ -1101,6 +1101,15 @@ cs{ 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"} @@ -1677,15 +1686,6 @@ cs{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -2038,6 +2038,15 @@ cs{ 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"} @@ -2642,15 +2651,6 @@ cs{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{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 68ffe2e27c9..aa36fa98c61 100755 --- a/icu4c/source/data/unit/da.txt +++ b/icu4c/source/data/unit/da.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/da.xml // * // *************************************************************************** da{ - Version{"2.1.19.44"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -106,6 +106,13 @@ da{ compound{ per{"{0} pr. {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter pr. 100 kilometer"} @@ -535,13 +542,6 @@ da{ other{"{0} pounds pr. kvadrattommer"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer i timen"} @@ -1050,6 +1050,13 @@ da{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1479,13 +1486,6 @@ da{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/t"} diff --git a/icu4c/source/data/unit/de.txt b/icu4c/source/data/unit/de.txt index eab9dc16736..dedbba9ae72 100755 --- a/icu4c/source/data/unit/de.txt +++ b/icu4c/source/data/unit/de.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/de.xml // * // *************************************************************************** de{ - Version{"2.1.19.72"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ de{ compound{ per{"{0} pro {1}"} } + concentr{ + karat{ + dnam{"Karat"} + one{"{0} Karat"} + other{"{0} Karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"Liter auf 100 Kilometer"} @@ -550,13 +557,6 @@ de{ other{"{0} Pfund pro Quadratzoll"} } } - proportion{ - karat{ - dnam{"Karat"} - one{"{0} Karat"} - other{"{0} Karat"} - } - } speed{ kilometer-per-hour{ dnam{"Kilometer pro Stunde"} @@ -799,6 +799,12 @@ de{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100 km"} @@ -1162,12 +1168,6 @@ de{ other{"{0} psi"} } } - proportion{ - karat{ - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1384,6 +1384,13 @@ de{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"Karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100 km"} @@ -1828,13 +1835,6 @@ de{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"Karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/el.txt b/icu4c/source/data/unit/el.txt index 045d0f79923..5499da67410 100755 --- a/icu4c/source/data/unit/el.txt +++ b/icu4c/source/data/unit/el.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/el.xml // * // *************************************************************************** el{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ el{ compound{ per{"{0} ανά {1}"} } + concentr{ + karat{ + dnam{"καράτια"} + one{"{0} καράτι"} + other{"{0} καράτια"} + } + } consumption{ liter-per-100kilometers{ dnam{"λίτρα ανά 100 χιλιόμετρα"} @@ -535,13 +542,6 @@ el{ other{"{0} λίβρες ανά τετραγωνική ίντσα"} } } - proportion{ - karat{ - dnam{"καράτια"} - one{"{0} καράτι"} - other{"{0} καράτια"} - } - } speed{ kilometer-per-hour{ dnam{"χιλιόμετρα ανά ώρα"} @@ -1044,6 +1044,13 @@ el{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"καράτια"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"λ./100 χλμ."} @@ -1473,13 +1480,6 @@ el{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"καράτια"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"χλμ./ώρα"} diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt index 57bbe6c4ce4..7032f4aee2c 100755 --- a/icu4c/source/data/unit/en.txt +++ b/icu4c/source/data/unit/en.txt @@ -102,6 +102,11 @@ en{ per{"{0} per {1}"} } concentr{ + karat{ + dnam{"karats"} + one{"{0} karat"} + other{"{0} karats"} + } milligram-per-deciliter{ dnam{"milligrams per deciliter"} one{"{0} milligram per deciliter"} @@ -561,13 +566,6 @@ en{ other{"{0} pounds per square inch"} } } - proportion{ - karat{ - dnam{"karats"} - one{"{0} karat"} - other{"{0} karats"} - } - } speed{ kilometer-per-hour{ dnam{"kilometers per hour"} @@ -818,6 +816,11 @@ en{ } } concentr{ + karat{ + dnam{"karat"} + one{"{0}kt"} + other{"{0}kt"} + } milligram-per-deciliter{ dnam{"mg/dL"} one{"{0}mg/dL"} @@ -1256,13 +1259,6 @@ en{ other{"{0}psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0}kt"} - other{"{0}kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/hr"} @@ -1529,6 +1525,11 @@ en{ per{"{0}/{1}"} } concentr{ + karat{ + dnam{"karats"} + one{"{0} kt"} + other{"{0} kt"} + } milligram-per-deciliter{ dnam{"mg/dL"} one{"{0} mg/dL"} @@ -1988,13 +1989,6 @@ en{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karats"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/hour"} diff --git a/icu4c/source/data/unit/es.txt b/icu4c/source/data/unit/es.txt index acad8c7d2e4..fc9cb94e740 100755 --- a/icu4c/source/data/unit/es.txt +++ b/icu4c/source/data/unit/es.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.xml // * // *************************************************************************** es{ - Version{"2.1.20.15"} + Version{"2.1.23.18"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ es{ compound{ per{"{0} por {1}"} } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} quilate"} + other{"{0} quilates"} + } + } consumption{ liter-per-100kilometers{ dnam{"litros por 100 kilómetros"} @@ -535,13 +542,6 @@ es{ other{"{0} libras por pulgada cuadrada"} } } - proportion{ - karat{ - dnam{"quilates"} - one{"{0} quilate"} - other{"{0} quilates"} - } - } speed{ kilometer-per-hour{ dnam{"kilómetros por hora"} @@ -1042,6 +1042,13 @@ es{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"c"} + one{"{0} c"} + other{"{0} c"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1471,13 +1478,6 @@ es{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"c"} - one{"{0} c"} - other{"{0} c"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/es_GT.txt b/icu4c/source/data/unit/es_GT.txt index d96096c56ed..f3ca99af930 100755 --- a/icu4c/source/data/unit/es_GT.txt +++ b/icu4c/source/data/unit/es_GT.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_GT.xml @@ -8,7 +8,7 @@ // *************************************************************************** es_GT{ %%Parent{"es_419"} - Version{"2.1.20.32"} + Version{"2.1.22.93"} units{ duration{ day{ @@ -78,6 +78,12 @@ es_GT{ } } unitsShort{ + concentr{ + karat{ + one{"{0} ct"} + other{"{0} ct"} + } + } electric{ volt{ dnam{"voltios"} @@ -93,12 +99,6 @@ es_GT{ dnam{"vatios"} } } - proportion{ - karat{ - one{"{0} ct"} - other{"{0} ct"} - } - } volume{ acre-foot{ dnam{"acre pie"} diff --git a/icu4c/source/data/unit/fi.txt b/icu4c/source/data/unit/fi.txt index 979ea36a599..d2f37e016ec 100755 --- a/icu4c/source/data/unit/fi.txt +++ b/icu4c/source/data/unit/fi.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/fi.xml // * // *************************************************************************** fi{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -106,6 +106,13 @@ fi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karaatit"} + one{"{0} karaatti"} + other{"{0} karaattia"} + } + } consumption{ liter-per-100kilometers{ dnam{"litrat per 100 kilometriä"} @@ -550,13 +557,6 @@ fi{ other{"{0} paunaa neliötuumaa kohti"} } } - proportion{ - karat{ - dnam{"karaatit"} - one{"{0} karaatti"} - other{"{0} karaattia"} - } - } speed{ kilometer-per-hour{ dnam{"kilometrit tunnissa"} @@ -821,6 +821,13 @@ fi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ka"} + one{"{0}ka"} + other{"{0}ka"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1265,13 +1272,6 @@ fi{ other{"{0}psi"} } } - proportion{ - karat{ - dnam{"ka"} - one{"{0}ka"} - other{"{0}ka"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1536,6 +1536,13 @@ fi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ka"} + one{"{0} ka"} + other{"{0} ka"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1980,13 +1987,6 @@ fi{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"ka"} - one{"{0} ka"} - other{"{0} ka"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/fr.txt b/icu4c/source/data/unit/fr.txt index ff766aef316..4e1903dd1f9 100755 --- a/icu4c/source/data/unit/fr.txt +++ b/icu4c/source/data/unit/fr.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/fr.xml // * // *************************************************************************** fr{ - Version{"2.1.20.4"} + Version{"2.1.22.93"} durationUnits{ hm{"hh:mm"} hms{"hh:mm:ss"} @@ -106,6 +106,13 @@ fr{ compound{ per{"{0} par {1}"} } + concentr{ + karat{ + dnam{"carats"} + one{"{0} carat"} + other{"{0} carats"} + } + } consumption{ liter-per-100kilometers{ dnam{"litres aux 100 km"} @@ -538,13 +545,6 @@ fr{ other{"{0} livres par pouce carré"} } } - proportion{ - karat{ - dnam{"carats"} - one{"{0} carat"} - other{"{0} carats"} - } - } speed{ kilometer-per-hour{ dnam{"kilomètres par heure"} @@ -1135,6 +1135,13 @@ fr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ct"} + one{"{0} ct"} + other{"{0} ct"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1568,13 +1575,6 @@ fr{ other{"{0} lb/po²"} } } - proportion{ - karat{ - dnam{"ct"} - one{"{0} ct"} - other{"{0} ct"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/fr_CA.txt b/icu4c/source/data/unit/fr_CA.txt index bf4b5f26810..311eef5954a 100755 --- a/icu4c/source/data/unit/fr_CA.txt +++ b/icu4c/source/data/unit/fr_CA.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/fr_CA.xml // * // *************************************************************************** fr_CA{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -142,6 +142,11 @@ fr_CA{ other{"{0} vg²"} } } + concentr{ + karat{ + dnam{"carats"} + } + } length{ astronomical-unit{ one{"{0} ua"} @@ -176,11 +181,6 @@ fr_CA{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"carats"} - } - } temperature{ generic{ one{"{0}°"} diff --git a/icu4c/source/data/unit/he.txt b/icu4c/source/data/unit/he.txt index 004b0bfe0c1..9e02b256455 100755 --- a/icu4c/source/data/unit/he.txt +++ b/icu4c/source/data/unit/he.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/he.xml // * // *************************************************************************** he{ - Version{"2.1.19.17"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ he{ compound{ per{"{0} לכל {1}"} } + concentr{ + karat{ + dnam{"קראט"} + many{"{0} קראט"} + one{"קראט אחד"} + other{"{0} קראט"} + two{"{0} קראט"} + } + } consumption{ liter-per-100kilometers{ dnam{"ליטר/100 ק״מ"} @@ -720,15 +729,6 @@ he{ two{"שני פאונד לאינץ׳ רבוע"} } } - proportion{ - karat{ - dnam{"קראט"} - many{"{0} קראט"} - one{"קראט אחד"} - other{"{0} קראט"} - two{"{0} קראט"} - } - } speed{ kilometer-per-hour{ dnam{"קילומטר לשעה"} @@ -1418,6 +1418,15 @@ he{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + two{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"ל׳/100 ק״מ"} @@ -1999,15 +2008,6 @@ he{ two{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - two{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"קמ״ש"} diff --git a/icu4c/source/data/unit/hi.txt b/icu4c/source/data/unit/hi.txt index 695f6bda32f..d897727ad66 100755 --- a/icu4c/source/data/unit/hi.txt +++ b/icu4c/source/data/unit/hi.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/hi.xml // * // *************************************************************************** hi{ - Version{"2.1.19.47"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ hi{ compound{ per{"{0} प्रति {1}"} } + concentr{ + karat{ + dnam{"कैरट"} + one{"{0} कैरट"} + other{"{0} कैरट"} + } + } consumption{ liter-per-100kilometers{ dnam{"लीटर प्रति 100 किलोमीटर"} @@ -535,13 +542,6 @@ hi{ other{"{0} पाउंड प्रति वर्ग इंच"} } } - proportion{ - karat{ - dnam{"कैरट"} - one{"{0} कैरट"} - other{"{0} कैरट"} - } - } speed{ kilometer-per-hour{ dnam{"किलोमीटर प्रति घंटा"} @@ -1043,6 +1043,13 @@ hi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"कैरट"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"ली./100 कि.मी."} @@ -1472,13 +1479,6 @@ hi{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"कैरट"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"कि.मी./घं."} diff --git a/icu4c/source/data/unit/hr.txt b/icu4c/source/data/unit/hr.txt index 7f2d0f405fc..1d52c8b1dec 100755 --- a/icu4c/source/data/unit/hr.txt +++ b/icu4c/source/data/unit/hr.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/hr.xml // * // *************************************************************************** hr{ - Version{"2.1.19.14"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -122,6 +122,14 @@ hr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karati"} + few{"{0} karata"} + one{"{0} karat"} + other{"{0} karata"} + } + } consumption{ liter-per-100kilometers{ dnam{"litre na 100 kilometara"} @@ -646,14 +654,6 @@ hr{ 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"} @@ -942,6 +942,13 @@ hr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1379,13 +1386,6 @@ hr{ other{"{0} psi"} } } - proportion{ - karat{ - few{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1646,6 +1646,14 @@ hr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -2170,14 +2178,6 @@ hr{ 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/hu.txt b/icu4c/source/data/unit/hu.txt index 8cb9c2e7a34..ca4daabb5e2 100755 --- a/icu4c/source/data/unit/hu.txt +++ b/icu4c/source/data/unit/hu.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/hu.xml // * // *************************************************************************** hu{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ hu{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karát"} + one{"{0} karát"} + other{"{0} karát"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter/100 km"} @@ -535,13 +542,6 @@ hu{ other{"{0} font per négyzethüvelyk"} } } - proportion{ - karat{ - dnam{"karát"} - one{"{0} karát"} - other{"{0} karát"} - } - } speed{ kilometer-per-hour{ dnam{"kilométer per óra"} @@ -1042,6 +1042,13 @@ hu{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1471,13 +1478,6 @@ hu{ 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/id.txt b/icu4c/source/data/unit/id.txt index b33660b6eeb..93a8ec56cfb 100755 --- a/icu4c/source/data/unit/id.txt +++ b/icu4c/source/data/unit/id.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/id.xml // * // *************************************************************************** id{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -90,6 +90,12 @@ id{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter per 100 kilometer"} @@ -442,12 +448,6 @@ id{ other{"{0} pon per inci persegi"} } } - proportion{ - karat{ - dnam{"karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer per jam"} @@ -854,6 +854,12 @@ id{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1206,12 +1212,6 @@ id{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/jam"} diff --git a/icu4c/source/data/unit/it.txt b/icu4c/source/data/unit/it.txt index 7a575255a1c..596f76ce5cf 100755 --- a/icu4c/source/data/unit/it.txt +++ b/icu4c/source/data/unit/it.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/it.xml // * // *************************************************************************** it{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ it{ compound{ per{"{0} al {1}"} } + concentr{ + karat{ + dnam{"carati"} + one{"{0} carato"} + other{"{0} carati"} + } + } consumption{ liter-per-100kilometers{ dnam{"litri per 100 chilometri"} @@ -535,13 +542,6 @@ it{ other{"{0} libbre per pollice quadrato"} } } - proportion{ - karat{ - dnam{"carati"} - one{"{0} carato"} - other{"{0} carati"} - } - } speed{ kilometer-per-hour{ dnam{"chilometri orari"} @@ -1043,6 +1043,13 @@ it{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1472,13 +1479,6 @@ it{ 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/ja.txt b/icu4c/source/data/unit/ja.txt index 21848984e14..0b9ba1cbafb 100755 --- a/icu4c/source/data/unit/ja.txt +++ b/icu4c/source/data/unit/ja.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/ja.xml // * // *************************************************************************** ja{ - Version{"2.1.19.89"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ ja{ compound{ per{"{0}毎{1}"} } + concentr{ + karat{ + dnam{"金"} + other{"{0} 金"} + } + } consumption{ liter-per-100kilometers{ dnam{"リットル毎100キロメートル"} @@ -454,12 +460,6 @@ ja{ other{"{0} 重量ポンド毎平方インチ"} } } - proportion{ - karat{ - dnam{"金"} - other{"{0} 金"} - } - } speed{ kilometer-per-hour{ dnam{"キロメートル毎時"} @@ -654,6 +654,11 @@ ja{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + other{"{0}K"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -931,11 +936,6 @@ ja{ other{"{0}psi"} } } - proportion{ - karat{ - other{"{0}K"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1108,6 +1108,12 @@ ja{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"金"} + other{"{0} 金"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1462,12 +1468,6 @@ ja{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"金"} - other{"{0} 金"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/ms.txt b/icu4c/source/data/unit/ms.txt index eb0fa7ced3f..e50c97c96c3 100755 --- a/icu4c/source/data/unit/ms.txt +++ b/icu4c/source/data/unit/ms.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/ms.xml // * // *************************************************************************** ms{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ ms{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter setiap 100 kilometer"} @@ -442,12 +448,6 @@ ms{ other{"{0} paun seinci persegi"} } } - proportion{ - karat{ - dnam{"karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer sejam"} @@ -854,6 +854,12 @@ ms{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1206,12 +1212,6 @@ ms{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/jam"} diff --git a/icu4c/source/data/unit/nb.txt b/icu4c/source/data/unit/nb.txt index 079072cd881..abd1c174d57 100755 --- a/icu4c/source/data/unit/nb.txt +++ b/icu4c/source/data/unit/nb.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/nb.xml // * // *************************************************************************** nb{ - Version{"2.1.19.96"} + Version{"2.1.22.93"} durationUnits{ hm{"h.mm"} hms{"h.mm.ss"} @@ -106,6 +106,13 @@ nb{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter per 100 kilometer"} @@ -535,13 +542,6 @@ nb{ other{"{0} pund per kvadrattomme"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer per time"} @@ -1064,6 +1064,13 @@ nb{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1493,13 +1500,6 @@ nb{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/time"} diff --git a/icu4c/source/data/unit/nl.txt b/icu4c/source/data/unit/nl.txt index 81f6b2bfeb0..a4b905664be 100755 --- a/icu4c/source/data/unit/nl.txt +++ b/icu4c/source/data/unit/nl.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/nl.xml // * // *************************************************************************** nl{ - Version{"2.1.19.96"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ nl{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karaat"} + one{"{0} karaat"} + other{"{0} karaat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter per 100 kilometer"} @@ -550,13 +557,6 @@ nl{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karaat"} - one{"{0} karaat"} - other{"{0} karaat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer per uur"} @@ -803,6 +803,12 @@ nl{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + one{"{0} K"} + other{"{0} K"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1161,12 +1167,6 @@ nl{ other{"{0} psi"} } } - proportion{ - karat{ - one{"{0} K"} - other{"{0} K"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1388,6 +1388,13 @@ nl{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"K"} + one{"{0} K"} + other{"{0} K"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -1832,13 +1839,6 @@ nl{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"K"} - one{"{0} K"} - other{"{0} K"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/pl.txt b/icu4c/source/data/unit/pl.txt index 098136dafaf..4d44184f792 100755 --- a/icu4c/source/data/unit/pl.txt +++ b/icu4c/source/data/unit/pl.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/pl.xml // * // *************************************************************************** pl{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ pl{ compound{ per{"{0} na {1}"} } + concentr{ + karat{ + dnam{"karaty"} + few{"{0} karaty"} + many{"{0} karatów"} + one{"{0} karat"} + other{"{0} karata"} + } + } consumption{ liter-per-100kilometers{ dnam{"litrów na 100 kilometrów"} @@ -721,15 +730,6 @@ pl{ other{"{0} funta na cal kwadratowy"} } } - proportion{ - karat{ - dnam{"karaty"} - few{"{0} karaty"} - many{"{0} karatów"} - one{"{0} karat"} - other{"{0} karata"} - } - } speed{ kilometer-per-hour{ dnam{"kilometry na godzinę"} @@ -1418,6 +1418,15 @@ pl{ 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"} @@ -2001,15 +2010,6 @@ pl{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/pt.txt b/icu4c/source/data/unit/pt.txt index 5545efa3381..149a664e6ab 100755 --- a/icu4c/source/data/unit/pt.txt +++ b/icu4c/source/data/unit/pt.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/pt.xml // * // *************************************************************************** pt{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ pt{ compound{ per{"{0} por {1}"} } + concentr{ + karat{ + dnam{"kilates"} + one{"{0} kilate"} + other{"{0} kilates"} + } + } consumption{ liter-per-100kilometers{ dnam{"litros por 100 quilômetros"} @@ -535,13 +542,6 @@ pt{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kilates"} - one{"{0} kilate"} - other{"{0} kilates"} - } - } speed{ kilometer-per-hour{ dnam{"quilômetros por hora"} @@ -1043,6 +1043,13 @@ pt{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kilates"} + one{"{0} k"} + other{"{0} k"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1472,13 +1479,6 @@ pt{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kilates"} - one{"{0} k"} - other{"{0} k"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/pt_PT.txt b/icu4c/source/data/unit/pt_PT.txt index 3108255e3ce..f90ecbd2335 100755 --- a/icu4c/source/data/unit/pt_PT.txt +++ b/icu4c/source/data/unit/pt_PT.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/pt_PT.xml // * // *************************************************************************** pt_PT{ - Version{"2.1.19.79"} + Version{"2.1.22.93"} units{ acceleration{ g-force{ @@ -28,6 +28,13 @@ pt_PT{ other{"{0} quilómetros quadrados"} } } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} quilate"} + other{"{0} quilates"} + } + } consumption{ liter-per-100kilometers{ dnam{"litros por 100 quilómetros"} @@ -42,6 +49,7 @@ pt_PT{ } duration{ century{ + one{"{0} século"} other{"{0} séculos"} } hour{ @@ -89,13 +97,6 @@ pt_PT{ other{"{0} picómetros"} } } - proportion{ - karat{ - dnam{"quilates"} - one{"{0} quilate"} - other{"{0} quilates"} - } - } speed{ kilometer-per-hour{ dnam{"quilómetros por hora"} @@ -105,6 +106,7 @@ pt_PT{ } temperature{ generic{ + one{"{0}°"} other{"{0}°"} } } @@ -188,6 +190,13 @@ pt_PT{ dnam{"yd²"} } } + concentr{ + karat{ + dnam{"quilates"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100km"} @@ -224,6 +233,7 @@ pt_PT{ other{"{0} milhas"} } mile-scandinavian{ + one{"{0} smi"} other{"{0} smi"} } nautical-mile{ @@ -256,13 +266,6 @@ pt_PT{ other{"{0} mb"} } } - proportion{ - karat{ - dnam{"quilates"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ meter-per-second{ dnam{"m/s"} diff --git a/icu4c/source/data/unit/ro.txt b/icu4c/source/data/unit/ro.txt index e74eaa88bda..1b915b4248a 100755 --- a/icu4c/source/data/unit/ro.txt +++ b/icu4c/source/data/unit/ro.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/ro.xml // * // *************************************************************************** ro{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -122,6 +122,14 @@ ro{ compound{ per{"{0} pe {1}"} } + concentr{ + karat{ + dnam{"karate"} + few{"{0} karate"} + one{"{0} karată"} + other{"{0} de karate"} + } + } consumption{ liter-per-100kilometers{ dnam{"litri la suta de kilometri"} @@ -628,14 +636,6 @@ ro{ other{"{0} de livre pe inch pătrat"} } } - proportion{ - karat{ - dnam{"karate"} - few{"{0} karate"} - one{"{0} karată"} - other{"{0} de karate"} - } - } speed{ kilometer-per-hour{ dnam{"kilometri pe oră"} @@ -1230,6 +1230,14 @@ ro{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + few{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1736,14 +1744,6 @@ ro{ 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/root.txt b/icu4c/source/data/unit/root.txt index 4192a60856a..4bb0aa299ed 100755 --- a/icu4c/source/data/unit/root.txt +++ b/icu4c/source/data/unit/root.txt @@ -96,6 +96,10 @@ root{ per{"{0}/{1}"} } concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } milligram-per-deciliter{ dnam{"mg/dL"} other{"{0} mg/dL"} @@ -477,12 +481,6 @@ root{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/ru.txt b/icu4c/source/data/unit/ru.txt index ffe0e25f9d7..5b134e8aa46 100755 --- a/icu4c/source/data/unit/ru.txt +++ b/icu4c/source/data/unit/ru.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/ru.xml // * // *************************************************************************** ru{ - Version{"2.1.19.74"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ ru{ 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 @@ ru{ other{"{0} фунта на квадратный дюйм"} } } - proportion{ - karat{ - dnam{"караты"} - few{"{0} карата"} - many{"{0} карат"} - one{"{0} карат"} - other{"{0} карата"} - } - } speed{ kilometer-per-hour{ dnam{"километры в час"} @@ -1419,6 +1419,15 @@ ru{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"кар"} + few{"{0} кар"} + many{"{0} кар"} + one{"{0} кар"} + other{"{0} кар"} + } + } consumption{ liter-per-100kilometers{ dnam{"л/100 км"} @@ -2002,15 +2011,6 @@ ru{ 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/sk.txt b/icu4c/source/data/unit/sk.txt index e032ea852df..504ee79b7fd 100755 --- a/icu4c/source/data/unit/sk.txt +++ b/icu4c/source/data/unit/sk.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/sk.xml // * // *************************************************************************** sk{ - Version{"2.1.19.14"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -138,6 +138,15 @@ sk{ compound{ per{"{0} za {1}"} } + concentr{ + karat{ + dnam{"karáty"} + few{"{0} karáty"} + many{"{0} karátu"} + one{"{0} karát"} + other{"{0} karátov"} + } + } consumption{ liter-per-100kilometers{ dnam{"litre na 100 kilometrov"} @@ -721,15 +730,6 @@ sk{ other{"{0} libier sily na štvorcový palec"} } } - proportion{ - karat{ - dnam{"karáty"} - few{"{0} karáty"} - many{"{0} karátu"} - one{"{0} karát"} - other{"{0} karátov"} - } - } speed{ kilometer-per-hour{ dnam{"kilometre za hodinu"} @@ -1058,6 +1058,14 @@ sk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + few{"{0} kt"} + many{"{0} kt"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1387,14 +1395,6 @@ sk{ other{"{0}mb"} } } - proportion{ - karat{ - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} @@ -1692,6 +1692,15 @@ sk{ 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"} @@ -2275,15 +2284,6 @@ sk{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - few{"{0} kt"} - many{"{0} kt"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/sv.txt b/icu4c/source/data/unit/sv.txt index 13216a02f1c..675d18c6533 100755 --- a/icu4c/source/data/unit/sv.txt +++ b/icu4c/source/data/unit/sv.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/sv.xml // * // *************************************************************************** sv{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ sv{ compound{ per{"{0} per {1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"liter per 100 kilometer"} @@ -550,13 +557,6 @@ sv{ other{"{0} pund per kvadrattum"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilometer per timme"} @@ -1508,6 +1508,13 @@ sv{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + one{"{0} kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"l/100 km"} @@ -1952,13 +1959,6 @@ sv{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - one{"{0} kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/th.txt b/icu4c/source/data/unit/th.txt index 88ebae54ac0..fa540bac6ce 100755 --- a/icu4c/source/data/unit/th.txt +++ b/icu4c/source/data/unit/th.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/th.xml // * // *************************************************************************** th{ - Version{"2.1.19.77"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ th{ compound{ per{"{0}ต่อ{1}"} } + concentr{ + karat{ + dnam{"กะรัต"} + other{"{0} กะรัต"} + } + } consumption{ liter-per-100kilometers{ dnam{"ลิตรต่อ100 กิโลเมตร"} @@ -442,12 +448,6 @@ th{ other{"{0} ปอนด์ต่อตารางนิ้ว"} } } - proportion{ - karat{ - dnam{"กะรัต"} - other{"{0} กะรัต"} - } - } speed{ kilometer-per-hour{ dnam{"กิโลเมตรต่อชั่วโมง"} @@ -855,6 +855,12 @@ th{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"กะรัต"} + other{"{0} กะรัต"} + } + } consumption{ liter-per-100kilometers{ dnam{"ลิตร/100 กิโลเมตร"} @@ -1207,12 +1213,6 @@ th{ other{"{0} ปอนด์/ตร.นิ้ว"} } } - proportion{ - karat{ - dnam{"กะรัต"} - other{"{0} กะรัต"} - } - } speed{ kilometer-per-hour{ dnam{"กม./ชั่วโมง"} diff --git a/icu4c/source/data/unit/tr.txt b/icu4c/source/data/unit/tr.txt index 39411a9a819..0ece554207e 100755 --- a/icu4c/source/data/unit/tr.txt +++ b/icu4c/source/data/unit/tr.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/tr.xml // * // *************************************************************************** tr{ - Version{"2.1.19.17"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -106,6 +106,13 @@ tr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ayar"} + one{"{0} ayar"} + other{"{0} ayar"} + } + } consumption{ liter-per-100kilometers{ dnam{"litre/100 kilometre"} @@ -550,13 +557,6 @@ tr{ other{"{0} libre/inç kare"} } } - proportion{ - karat{ - dnam{"ayar"} - one{"{0} ayar"} - other{"{0} ayar"} - } - } speed{ kilometer-per-hour{ dnam{"kilometre/saat"} @@ -798,6 +798,12 @@ tr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + one{"{0} ayar"} + other{"{0} ayar"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1156,12 +1162,6 @@ tr{ other{"{0} lb/in²"} } } - proportion{ - karat{ - one{"{0} ayar"} - other{"{0} ayar"} - } - } speed{ kilometer-per-hour{ dnam{"km/sa"} @@ -1378,6 +1378,13 @@ tr{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"ayar"} + one{"{0} ayar"} + other{"{0} ayar"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1822,13 +1829,6 @@ tr{ other{"{0} lb/in²"} } } - proportion{ - karat{ - dnam{"ayar"} - one{"{0} ayar"} - other{"{0} ayar"} - } - } speed{ kilometer-per-hour{ dnam{"km/sa"} diff --git a/icu4c/source/data/unit/uk.txt b/icu4c/source/data/unit/uk.txt index f84833ac1b5..fce6e2e7e1e 100755 --- a/icu4c/source/data/unit/uk.txt +++ b/icu4c/source/data/unit/uk.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/uk.xml // * // *************************************************************************** uk{ - Version{"2.1.19.94"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -136,6 +136,15 @@ uk{ compound{ per{"{0} на {1}"} } + concentr{ + karat{ + dnam{"карати"} + few{"{0} карати"} + many{"{0} каратів"} + one{"{0} карат"} + other{"{0} карата"} + } + } consumption{ liter-per-100kilometers{ dnam{"літри на 100 кілометрів"} @@ -715,15 +724,6 @@ uk{ other{"{0} фунта на квадратний дюйм"} } } - proportion{ - karat{ - dnam{"карати"} - few{"{0} карати"} - many{"{0} каратів"} - one{"{0} карат"} - other{"{0} карата"} - } - } speed{ kilometer-per-hour{ dnam{"кілометри на годину"} @@ -1425,6 +1425,15 @@ uk{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"карати"} + few{"{0} кар."} + many{"{0} кар."} + one{"{0} кар."} + other{"{0} кар."} + } + } consumption{ liter-per-100kilometers{ dnam{"л/100 км"} @@ -2008,15 +2017,6 @@ uk{ 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/vi.txt b/icu4c/source/data/unit/vi.txt index ac281ce08d8..6ebadd85e26 100755 --- a/icu4c/source/data/unit/vi.txt +++ b/icu4c/source/data/unit/vi.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/vi.xml // * // *************************************************************************** vi{ - Version{"2.1.19.17"} + Version{"2.1.23.12"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ vi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"karat"} + other{"{0} karat"} + } + } consumption{ liter-per-100kilometers{ dnam{"lít/100km"} @@ -442,12 +448,6 @@ vi{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"karat"} - other{"{0} karat"} - } - } speed{ kilometer-per-hour{ dnam{"kilômét/giờ"} @@ -854,6 +854,12 @@ vi{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"kt"} + other{"{0} kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"L/100km"} @@ -1206,12 +1212,6 @@ vi{ other{"{0} psi"} } } - proportion{ - karat{ - dnam{"kt"} - other{"{0} kt"} - } - } speed{ kilometer-per-hour{ dnam{"km/h"} diff --git a/icu4c/source/data/unit/zh.txt b/icu4c/source/data/unit/zh.txt index 2895bbe93db..194dd3258de 100755 --- a/icu4c/source/data/unit/zh.txt +++ b/icu4c/source/data/unit/zh.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.xml // * // *************************************************************************** zh{ - Version{"2.1.20.31"} + Version{"2.1.22.93"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -90,6 +90,12 @@ zh{ compound{ per{"{0}每{1}"} } + concentr{ + karat{ + dnam{"克拉"} + other{"{0}克拉"} + } + } consumption{ liter-per-100kilometers{ dnam{"升/100千米"} @@ -442,12 +448,6 @@ zh{ other{"每平方英寸{0}磅"} } } - proportion{ - karat{ - dnam{"克拉"} - other{"{0}克拉"} - } - } speed{ kilometer-per-hour{ dnam{"千米每小时"} @@ -850,6 +850,12 @@ zh{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"克拉"} + other{"{0}克拉"} + } + } consumption{ liter-per-100kilometers{ dnam{"升/100千米"} @@ -1202,12 +1208,6 @@ zh{ other{"每平方英寸{0}磅"} } } - proportion{ - karat{ - dnam{"克拉"} - other{"{0}克拉"} - } - } speed{ kilometer-per-hour{ dnam{"千米/小时"} diff --git a/icu4c/source/data/unit/zh_Hant.txt b/icu4c/source/data/unit/zh_Hant.txt index 9df62cb3506..31029dbcb4b 100755 --- a/icu4c/source/data/unit/zh_Hant.txt +++ b/icu4c/source/data/unit/zh_Hant.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.xml @@ -8,7 +8,7 @@ // *************************************************************************** zh_Hant{ %%Parent{"root"} - Version{"2.1.19.89"} + Version{"2.1.23.7"} durationUnits{ hm{"h:mm"} hms{"h:mm:ss"} @@ -91,6 +91,12 @@ zh_Hant{ compound{ per{"每{1} {0}"} } + concentr{ + karat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + } consumption{ liter-per-100kilometers{ dnam{"每 100 公里公升"} @@ -455,12 +461,6 @@ zh_Hant{ other{"每平方英寸 {0} 磅力"} } } - proportion{ - karat{ - dnam{"克拉"} - other{"{0} 克拉"} - } - } speed{ kilometer-per-hour{ dnam{"每小時公里"} @@ -654,6 +654,11 @@ zh_Hant{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + other{"{0}kt"} + } + } consumption{ liter-per-100kilometers{ dnam{"升/100公里"} @@ -934,11 +939,6 @@ zh_Hant{ other{"{0}psi"} } } - proportion{ - karat{ - other{"{0}kt"} - } - } speed{ kilometer-per-hour{ dnam{"公里/小時"} @@ -1112,6 +1112,12 @@ zh_Hant{ compound{ per{"{0}/{1}"} } + concentr{ + karat{ + dnam{"克拉"} + other{"{0} 克拉"} + } + } consumption{ liter-per-100kilometers{ dnam{"升/100 公里"} @@ -1476,12 +1482,6 @@ zh_Hant{ other{"{0} 磅力/平方英寸"} } } - proportion{ - karat{ - dnam{"克拉"} - other{"{0} 克拉"} - } - } speed{ kilometer-per-hour{ dnam{"公里/小時"} diff --git a/icu4c/source/i18n/measfmt.cpp b/icu4c/source/i18n/measfmt.cpp index cb6351aeb4f..9480275dd06 100644 --- a/icu4c/source/i18n/measfmt.cpp +++ b/icu4c/source/i18n/measfmt.cpp @@ -39,7 +39,7 @@ #include "standardplural.h" #include "unifiedcache.h" -#define MEAS_UNIT_COUNT 129 +#define MEAS_UNIT_COUNT 134 #define WIDTH_INDEX_COUNT (UMEASFMT_WIDTH_NARROW + 1) U_NAMESPACE_BEGIN diff --git a/icu4c/source/i18n/measunit.cpp b/icu4c/source/i18n/measunit.cpp index 80fa07a2d16..90cd02ee464 100644 --- a/icu4c/source/i18n/measunit.cpp +++ b/icu4c/source/i18n/measunit.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2004-2015, International Business Machines +* Copyright (c) 2004-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -36,22 +36,22 @@ static const int32_t gOffsets[] = { 2, 7, 16, - 19, - 279, - 289, - 300, - 304, - 310, - 314, - 333, - 334, - 345, - 351, + 20, + 24, + 284, + 294, + 305, + 309, + 315, + 319, + 338, + 339, + 350, 356, - 357, 361, 365, - 389 + 369, + 394 }; static const int32_t gIndexes[] = { @@ -59,22 +59,22 @@ static const int32_t gIndexes[] = { 2, 7, 16, - 19, - 19, - 29, - 40, - 44, - 50, - 54, - 73, - 74, - 85, - 91, + 20, + 24, + 24, + 34, + 45, + 49, + 55, + 59, + 78, + 79, + 90, 96, - 97, 101, 105, - 129 + 109, + 134 }; // Must be sorted alphabetically. @@ -82,6 +82,7 @@ static const char * const gTypes[] = { "acceleration", "angle", "area", + "concentr", "consumption", "currency", "digital", @@ -94,7 +95,6 @@ static const char * const gTypes[] = { "mass", "power", "pressure", - "proportion", "speed", "temperature", "volume" @@ -118,9 +118,14 @@ static const char * const gSubTypes[] = { "square-meter", "square-mile", "square-yard", + "karat", + "milligram-per-deciliter", + "millimole-per-liter", + "part-per-million", "liter-per-100kilometers", "liter-per-kilometer", "mile-per-gallon", + "mile-per-gallon-imperial", "ADP", "AED", "AFA", @@ -458,7 +463,6 @@ static const char * const gSubTypes[] = { "millibar", "millimeter-of-mercury", "pound-per-square-inch", - "karat", "kilometer-per-hour", "knot", "meter-per-second", @@ -482,6 +486,7 @@ static const char * const gSubTypes[] = { "deciliter", "fluid-ounce", "gallon", + "gallon-imperial", "hectoliter", "liter", "megaliter", @@ -495,12 +500,14 @@ static const char * const gSubTypes[] = { // Must be sorted by first value and then second value. static int32_t unitPerUnitToSingleUnit[][4] = { - {321, 291, 16, 0}, - {323, 297, 16, 2}, - {325, 291, 16, 3}, - {325, 379, 3, 2}, - {342, 11, 14, 4}, - {381, 321, 3, 1} + {326, 296, 16, 0}, + {328, 302, 16, 2}, + {330, 296, 16, 3}, + {330, 383, 4, 2}, + {330, 384, 4, 3}, + {344, 381, 3, 1}, + {347, 11, 15, 4}, + {386, 326, 4, 1} }; MeasureUnit *MeasureUnit::createGForce(UErrorCode &status) { @@ -567,330 +574,346 @@ MeasureUnit *MeasureUnit::createSquareYard(UErrorCode &status) { return MeasureUnit::create(2, 8, status); } -MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKarat(UErrorCode &status) { return MeasureUnit::create(3, 0, status); } -MeasureUnit *MeasureUnit::createLiterPerKilometer(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilligramPerDeciliter(UErrorCode &status) { return MeasureUnit::create(3, 1, status); } -MeasureUnit *MeasureUnit::createMilePerGallon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillimolePerLiter(UErrorCode &status) { return MeasureUnit::create(3, 2, status); } +MeasureUnit *MeasureUnit::createPartPerMillion(UErrorCode &status) { + return MeasureUnit::create(3, 3, status); +} + +MeasureUnit *MeasureUnit::createLiterPer100Kilometers(UErrorCode &status) { + return MeasureUnit::create(4, 0, status); +} + +MeasureUnit *MeasureUnit::createLiterPerKilometer(UErrorCode &status) { + return MeasureUnit::create(4, 1, status); +} + +MeasureUnit *MeasureUnit::createMilePerGallon(UErrorCode &status) { + return MeasureUnit::create(4, 2, status); +} + +MeasureUnit *MeasureUnit::createMilePerGallonImperial(UErrorCode &status) { + return MeasureUnit::create(4, 3, status); +} + MeasureUnit *MeasureUnit::createBit(UErrorCode &status) { - return MeasureUnit::create(5, 0, status); -} - -MeasureUnit *MeasureUnit::createByte(UErrorCode &status) { - return MeasureUnit::create(5, 1, status); -} - -MeasureUnit *MeasureUnit::createGigabit(UErrorCode &status) { - return MeasureUnit::create(5, 2, status); -} - -MeasureUnit *MeasureUnit::createGigabyte(UErrorCode &status) { - return MeasureUnit::create(5, 3, status); -} - -MeasureUnit *MeasureUnit::createKilobit(UErrorCode &status) { - return MeasureUnit::create(5, 4, status); -} - -MeasureUnit *MeasureUnit::createKilobyte(UErrorCode &status) { - return MeasureUnit::create(5, 5, status); -} - -MeasureUnit *MeasureUnit::createMegabit(UErrorCode &status) { - return MeasureUnit::create(5, 6, status); -} - -MeasureUnit *MeasureUnit::createMegabyte(UErrorCode &status) { - return MeasureUnit::create(5, 7, status); -} - -MeasureUnit *MeasureUnit::createTerabit(UErrorCode &status) { - return MeasureUnit::create(5, 8, status); -} - -MeasureUnit *MeasureUnit::createTerabyte(UErrorCode &status) { - return MeasureUnit::create(5, 9, status); -} - -MeasureUnit *MeasureUnit::createCentury(UErrorCode &status) { return MeasureUnit::create(6, 0, status); } -MeasureUnit *MeasureUnit::createDay(UErrorCode &status) { +MeasureUnit *MeasureUnit::createByte(UErrorCode &status) { return MeasureUnit::create(6, 1, status); } -MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGigabit(UErrorCode &status) { return MeasureUnit::create(6, 2, status); } -MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGigabyte(UErrorCode &status) { return MeasureUnit::create(6, 3, status); } -MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilobit(UErrorCode &status) { return MeasureUnit::create(6, 4, status); } -MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilobyte(UErrorCode &status) { return MeasureUnit::create(6, 5, status); } -MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegabit(UErrorCode &status) { return MeasureUnit::create(6, 6, status); } -MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegabyte(UErrorCode &status) { return MeasureUnit::create(6, 7, status); } -MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { +MeasureUnit *MeasureUnit::createTerabit(UErrorCode &status) { return MeasureUnit::create(6, 8, status); } -MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { +MeasureUnit *MeasureUnit::createTerabyte(UErrorCode &status) { return MeasureUnit::create(6, 9, status); } -MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { - return MeasureUnit::create(6, 10, status); -} - -MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCentury(UErrorCode &status) { return MeasureUnit::create(7, 0, status); } -MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) { +MeasureUnit *MeasureUnit::createDay(UErrorCode &status) { return MeasureUnit::create(7, 1, status); } -MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHour(UErrorCode &status) { return MeasureUnit::create(7, 2, status); } -MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrosecond(UErrorCode &status) { return MeasureUnit::create(7, 3, status); } -MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMillisecond(UErrorCode &status) { + return MeasureUnit::create(7, 4, status); +} + +MeasureUnit *MeasureUnit::createMinute(UErrorCode &status) { + return MeasureUnit::create(7, 5, status); +} + +MeasureUnit *MeasureUnit::createMonth(UErrorCode &status) { + return MeasureUnit::create(7, 6, status); +} + +MeasureUnit *MeasureUnit::createNanosecond(UErrorCode &status) { + return MeasureUnit::create(7, 7, status); +} + +MeasureUnit *MeasureUnit::createSecond(UErrorCode &status) { + return MeasureUnit::create(7, 8, status); +} + +MeasureUnit *MeasureUnit::createWeek(UErrorCode &status) { + return MeasureUnit::create(7, 9, status); +} + +MeasureUnit *MeasureUnit::createYear(UErrorCode &status) { + return MeasureUnit::create(7, 10, status); +} + +MeasureUnit *MeasureUnit::createAmpere(UErrorCode &status) { return MeasureUnit::create(8, 0, status); } -MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilliampere(UErrorCode &status) { return MeasureUnit::create(8, 1, status); } -MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) { +MeasureUnit *MeasureUnit::createOhm(UErrorCode &status) { return MeasureUnit::create(8, 2, status); } -MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) { +MeasureUnit *MeasureUnit::createVolt(UErrorCode &status) { return MeasureUnit::create(8, 3, status); } -MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) { - return MeasureUnit::create(8, 4, status); -} - -MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) { - return MeasureUnit::create(8, 5, status); -} - -MeasureUnit *MeasureUnit::createGigahertz(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCalorie(UErrorCode &status) { return MeasureUnit::create(9, 0, status); } -MeasureUnit *MeasureUnit::createHertz(UErrorCode &status) { +MeasureUnit *MeasureUnit::createFoodcalorie(UErrorCode &status) { return MeasureUnit::create(9, 1, status); } -MeasureUnit *MeasureUnit::createKilohertz(UErrorCode &status) { +MeasureUnit *MeasureUnit::createJoule(UErrorCode &status) { return MeasureUnit::create(9, 2, status); } -MeasureUnit *MeasureUnit::createMegahertz(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilocalorie(UErrorCode &status) { return MeasureUnit::create(9, 3, status); } -MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilojoule(UErrorCode &status) { + return MeasureUnit::create(9, 4, status); +} + +MeasureUnit *MeasureUnit::createKilowattHour(UErrorCode &status) { + return MeasureUnit::create(9, 5, status); +} + +MeasureUnit *MeasureUnit::createGigahertz(UErrorCode &status) { return MeasureUnit::create(10, 0, status); } -MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHertz(UErrorCode &status) { return MeasureUnit::create(10, 1, status); } -MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilohertz(UErrorCode &status) { return MeasureUnit::create(10, 2, status); } -MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegahertz(UErrorCode &status) { return MeasureUnit::create(10, 3, status); } -MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { - return MeasureUnit::create(10, 4, status); -} - -MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { - return MeasureUnit::create(10, 5, status); -} - -MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { - return MeasureUnit::create(10, 6, status); -} - -MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { - return MeasureUnit::create(10, 7, status); -} - -MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { - return MeasureUnit::create(10, 8, status); -} - -MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { - return MeasureUnit::create(10, 9, status); -} - -MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { - return MeasureUnit::create(10, 10, status); -} - -MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { - return MeasureUnit::create(10, 11, status); -} - -MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { - return MeasureUnit::create(10, 12, status); -} - -MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { - return MeasureUnit::create(10, 13, status); -} - -MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { - return MeasureUnit::create(10, 14, status); -} - -MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { - return MeasureUnit::create(10, 15, status); -} - -MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { - return MeasureUnit::create(10, 16, status); -} - -MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { - return MeasureUnit::create(10, 17, status); -} - -MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { - return MeasureUnit::create(10, 18, status); -} - -MeasureUnit *MeasureUnit::createLux(UErrorCode &status) { +MeasureUnit *MeasureUnit::createAstronomicalUnit(UErrorCode &status) { return MeasureUnit::create(11, 0, status); } -MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCentimeter(UErrorCode &status) { + return MeasureUnit::create(11, 1, status); +} + +MeasureUnit *MeasureUnit::createDecimeter(UErrorCode &status) { + return MeasureUnit::create(11, 2, status); +} + +MeasureUnit *MeasureUnit::createFathom(UErrorCode &status) { + return MeasureUnit::create(11, 3, status); +} + +MeasureUnit *MeasureUnit::createFoot(UErrorCode &status) { + return MeasureUnit::create(11, 4, status); +} + +MeasureUnit *MeasureUnit::createFurlong(UErrorCode &status) { + return MeasureUnit::create(11, 5, status); +} + +MeasureUnit *MeasureUnit::createInch(UErrorCode &status) { + return MeasureUnit::create(11, 6, status); +} + +MeasureUnit *MeasureUnit::createKilometer(UErrorCode &status) { + return MeasureUnit::create(11, 7, status); +} + +MeasureUnit *MeasureUnit::createLightYear(UErrorCode &status) { + return MeasureUnit::create(11, 8, status); +} + +MeasureUnit *MeasureUnit::createMeter(UErrorCode &status) { + return MeasureUnit::create(11, 9, status); +} + +MeasureUnit *MeasureUnit::createMicrometer(UErrorCode &status) { + return MeasureUnit::create(11, 10, status); +} + +MeasureUnit *MeasureUnit::createMile(UErrorCode &status) { + return MeasureUnit::create(11, 11, status); +} + +MeasureUnit *MeasureUnit::createMileScandinavian(UErrorCode &status) { + return MeasureUnit::create(11, 12, status); +} + +MeasureUnit *MeasureUnit::createMillimeter(UErrorCode &status) { + return MeasureUnit::create(11, 13, status); +} + +MeasureUnit *MeasureUnit::createNanometer(UErrorCode &status) { + return MeasureUnit::create(11, 14, status); +} + +MeasureUnit *MeasureUnit::createNauticalMile(UErrorCode &status) { + return MeasureUnit::create(11, 15, status); +} + +MeasureUnit *MeasureUnit::createParsec(UErrorCode &status) { + return MeasureUnit::create(11, 16, status); +} + +MeasureUnit *MeasureUnit::createPicometer(UErrorCode &status) { + return MeasureUnit::create(11, 17, status); +} + +MeasureUnit *MeasureUnit::createYard(UErrorCode &status) { + return MeasureUnit::create(11, 18, status); +} + +MeasureUnit *MeasureUnit::createLux(UErrorCode &status) { return MeasureUnit::create(12, 0, status); } -MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { - return MeasureUnit::create(12, 1, status); -} - -MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { - return MeasureUnit::create(12, 2, status); -} - -MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { - return MeasureUnit::create(12, 3, status); -} - -MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { - return MeasureUnit::create(12, 4, status); -} - -MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { - return MeasureUnit::create(12, 5, status); -} - -MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { - return MeasureUnit::create(12, 6, status); -} - -MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { - return MeasureUnit::create(12, 7, status); -} - -MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { - return MeasureUnit::create(12, 8, status); -} - -MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { - return MeasureUnit::create(12, 9, status); -} - -MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { - return MeasureUnit::create(12, 10, status); -} - -MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createCarat(UErrorCode &status) { return MeasureUnit::create(13, 0, status); } -MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGram(UErrorCode &status) { return MeasureUnit::create(13, 1, status); } -MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilogram(UErrorCode &status) { return MeasureUnit::create(13, 2, status); } -MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMetricTon(UErrorCode &status) { return MeasureUnit::create(13, 3, status); } -MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMicrogram(UErrorCode &status) { return MeasureUnit::create(13, 4, status); } -MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilligram(UErrorCode &status) { return MeasureUnit::create(13, 5, status); } -MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) { +MeasureUnit *MeasureUnit::createOunce(UErrorCode &status) { + return MeasureUnit::create(13, 6, status); +} + +MeasureUnit *MeasureUnit::createOunceTroy(UErrorCode &status) { + return MeasureUnit::create(13, 7, status); +} + +MeasureUnit *MeasureUnit::createPound(UErrorCode &status) { + return MeasureUnit::create(13, 8, status); +} + +MeasureUnit *MeasureUnit::createStone(UErrorCode &status) { + return MeasureUnit::create(13, 9, status); +} + +MeasureUnit *MeasureUnit::createTon(UErrorCode &status) { + return MeasureUnit::create(13, 10, status); +} + +MeasureUnit *MeasureUnit::createGigawatt(UErrorCode &status) { return MeasureUnit::create(14, 0, status); } -MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHorsepower(UErrorCode &status) { return MeasureUnit::create(14, 1, status); } -MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) { +MeasureUnit *MeasureUnit::createKilowatt(UErrorCode &status) { return MeasureUnit::create(14, 2, status); } -MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegawatt(UErrorCode &status) { return MeasureUnit::create(14, 3, status); } -MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilliwatt(UErrorCode &status) { return MeasureUnit::create(14, 4, status); } -MeasureUnit *MeasureUnit::createKarat(UErrorCode &status) { +MeasureUnit *MeasureUnit::createWatt(UErrorCode &status) { + return MeasureUnit::create(14, 5, status); +} + +MeasureUnit *MeasureUnit::createHectopascal(UErrorCode &status) { return MeasureUnit::create(15, 0, status); } +MeasureUnit *MeasureUnit::createInchHg(UErrorCode &status) { + return MeasureUnit::create(15, 1, status); +} + +MeasureUnit *MeasureUnit::createMillibar(UErrorCode &status) { + return MeasureUnit::create(15, 2, status); +} + +MeasureUnit *MeasureUnit::createMillimeterOfMercury(UErrorCode &status) { + return MeasureUnit::create(15, 3, status); +} + +MeasureUnit *MeasureUnit::createPoundPerSquareInch(UErrorCode &status) { + return MeasureUnit::create(15, 4, status); +} + MeasureUnit *MeasureUnit::createKilometerPerHour(UErrorCode &status) { return MeasureUnit::create(16, 0, status); } @@ -983,42 +1006,46 @@ MeasureUnit *MeasureUnit::createGallon(UErrorCode &status) { return MeasureUnit::create(18, 14, status); } -MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createGallonImperial(UErrorCode &status) { return MeasureUnit::create(18, 15, status); } -MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createHectoliter(UErrorCode &status) { return MeasureUnit::create(18, 16, status); } -MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createLiter(UErrorCode &status) { return MeasureUnit::create(18, 17, status); } -MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMegaliter(UErrorCode &status) { return MeasureUnit::create(18, 18, status); } -MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { +MeasureUnit *MeasureUnit::createMilliliter(UErrorCode &status) { return MeasureUnit::create(18, 19, status); } -MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPint(UErrorCode &status) { return MeasureUnit::create(18, 20, status); } -MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { +MeasureUnit *MeasureUnit::createPintMetric(UErrorCode &status) { return MeasureUnit::create(18, 21, status); } -MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createQuart(UErrorCode &status) { return MeasureUnit::create(18, 22, status); } -MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { +MeasureUnit *MeasureUnit::createTablespoon(UErrorCode &status) { return MeasureUnit::create(18, 23, status); } +MeasureUnit *MeasureUnit::createTeaspoon(UErrorCode &status) { + return MeasureUnit::create(18, 24, status); +} + // End generated code static int32_t binarySearch( diff --git a/icu4c/source/i18n/unicode/measunit.h b/icu4c/source/i18n/unicode/measunit.h index dc7c9703d03..5788a8113a8 100644 --- a/icu4c/source/i18n/unicode/measunit.h +++ b/icu4c/source/i18n/unicode/measunit.h @@ -1,6 +1,6 @@ /* ********************************************************************** -* Copyright (c) 2004-2015, International Business Machines +* Copyright (c) 2004-2016, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** * Author: Alan Liu @@ -337,6 +337,44 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit *createSquareYard(UErrorCode &status); + /** + * Returns unit of concentr: karat. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @stable ICU 54 + */ + static MeasureUnit *createKarat(UErrorCode &status); + +#ifndef U_HIDE_DRAFT_API + /** + * Returns unit of concentr: milligram-per-deciliter. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @draft ICU 57 + */ + static MeasureUnit *createMilligramPerDeciliter(UErrorCode &status); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns unit of concentr: millimole-per-liter. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @draft ICU 57 + */ + static MeasureUnit *createMillimolePerLiter(UErrorCode &status); +#endif /* U_HIDE_DRAFT_API */ + +#ifndef U_HIDE_DRAFT_API + /** + * Returns unit of concentr: part-per-million. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @draft ICU 57 + */ + static MeasureUnit *createPartPerMillion(UErrorCode &status); +#endif /* U_HIDE_DRAFT_API */ + #ifndef U_HIDE_DRAFT_API /** * Returns unit of consumption: liter-per-100kilometers. @@ -363,6 +401,16 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit *createMilePerGallon(UErrorCode &status); +#ifndef U_HIDE_DRAFT_API + /** + * Returns unit of consumption: mile-per-gallon-imperial. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @draft ICU 57 + */ + static MeasureUnit *createMilePerGallonImperial(UErrorCode &status); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns unit of digital: bit. * Caller owns returned value and must free it. @@ -983,14 +1031,6 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit *createPoundPerSquareInch(UErrorCode &status); - /** - * Returns unit of proportion: karat. - * Caller owns returned value and must free it. - * @param status ICU error code. - * @stable ICU 54 - */ - static MeasureUnit *createKarat(UErrorCode &status); - /** * Returns unit of speed: kilometer-per-hour. * Caller owns returned value and must free it. @@ -1181,6 +1221,16 @@ class U_I18N_API MeasureUnit: public UObject { */ static MeasureUnit *createGallon(UErrorCode &status); +#ifndef U_HIDE_DRAFT_API + /** + * Returns unit of volume: gallon-imperial. + * Caller owns returned value and must free it. + * @param status ICU error code. + * @draft ICU 57 + */ + static MeasureUnit *createGallonImperial(UErrorCode &status); +#endif /* U_HIDE_DRAFT_API */ + /** * Returns unit of volume: hectoliter. * Caller owns returned value and must free it. diff --git a/icu4c/source/test/intltest/measfmttest.cpp b/icu4c/source/test/intltest/measfmttest.cpp index 279d268458a..70a947845a8 100644 --- a/icu4c/source/test/intltest/measfmttest.cpp +++ b/icu4c/source/test/intltest/measfmttest.cpp @@ -42,6 +42,7 @@ private: void TestCompatible54_1(); void TestCompatible55_1(); void TestCompatible56_1(); + void TestCompatible57_1(); void TestGetAvailable(); void TestExamplesInDocs(); void TestFormatPeriodEn(); @@ -123,6 +124,7 @@ void MeasureFormatTest::runIndexedTest( TESTCASE_AUTO(TestCompatible54_1); TESTCASE_AUTO(TestCompatible55_1); TESTCASE_AUTO(TestCompatible56_1); + TESTCASE_AUTO(TestCompatible57_1); TESTCASE_AUTO(TestGetAvailable); TESTCASE_AUTO(TestExamplesInDocs); TESTCASE_AUTO(TestFormatPeriodEn); @@ -588,6 +590,146 @@ void MeasureFormatTest::TestCompatible56_1() { assertSuccess("", status); } +void MeasureFormatTest::TestCompatible57_1() { + UErrorCode status = U_ZERO_ERROR; + LocalPointer measureUnit; + measureUnit.adoptInstead(MeasureUnit::createGForce(status)); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecondSquared(status)); + measureUnit.adoptInstead(MeasureUnit::createArcMinute(status)); + measureUnit.adoptInstead(MeasureUnit::createArcSecond(status)); + measureUnit.adoptInstead(MeasureUnit::createDegree(status)); + measureUnit.adoptInstead(MeasureUnit::createRadian(status)); + measureUnit.adoptInstead(MeasureUnit::createRevolutionAngle(status)); + measureUnit.adoptInstead(MeasureUnit::createAcre(status)); + measureUnit.adoptInstead(MeasureUnit::createHectare(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareCentimeter(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareFoot(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareInch(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareKilometer(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareMeter(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareMile(status)); + measureUnit.adoptInstead(MeasureUnit::createSquareYard(status)); + measureUnit.adoptInstead(MeasureUnit::createKarat(status)); + measureUnit.adoptInstead(MeasureUnit::createMilligramPerDeciliter(status)); + measureUnit.adoptInstead(MeasureUnit::createMillimolePerLiter(status)); + measureUnit.adoptInstead(MeasureUnit::createPartPerMillion(status)); + measureUnit.adoptInstead(MeasureUnit::createLiterPer100Kilometers(status)); + measureUnit.adoptInstead(MeasureUnit::createLiterPerKilometer(status)); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallon(status)); + measureUnit.adoptInstead(MeasureUnit::createMilePerGallonImperial(status)); + measureUnit.adoptInstead(MeasureUnit::createBit(status)); + measureUnit.adoptInstead(MeasureUnit::createByte(status)); + measureUnit.adoptInstead(MeasureUnit::createGigabit(status)); + measureUnit.adoptInstead(MeasureUnit::createGigabyte(status)); + measureUnit.adoptInstead(MeasureUnit::createKilobit(status)); + measureUnit.adoptInstead(MeasureUnit::createKilobyte(status)); + measureUnit.adoptInstead(MeasureUnit::createMegabit(status)); + measureUnit.adoptInstead(MeasureUnit::createMegabyte(status)); + measureUnit.adoptInstead(MeasureUnit::createTerabit(status)); + measureUnit.adoptInstead(MeasureUnit::createTerabyte(status)); + measureUnit.adoptInstead(MeasureUnit::createCentury(status)); + measureUnit.adoptInstead(MeasureUnit::createDay(status)); + measureUnit.adoptInstead(MeasureUnit::createHour(status)); + measureUnit.adoptInstead(MeasureUnit::createMicrosecond(status)); + measureUnit.adoptInstead(MeasureUnit::createMillisecond(status)); + measureUnit.adoptInstead(MeasureUnit::createMinute(status)); + measureUnit.adoptInstead(MeasureUnit::createMonth(status)); + measureUnit.adoptInstead(MeasureUnit::createNanosecond(status)); + measureUnit.adoptInstead(MeasureUnit::createSecond(status)); + measureUnit.adoptInstead(MeasureUnit::createWeek(status)); + measureUnit.adoptInstead(MeasureUnit::createYear(status)); + measureUnit.adoptInstead(MeasureUnit::createAmpere(status)); + measureUnit.adoptInstead(MeasureUnit::createMilliampere(status)); + measureUnit.adoptInstead(MeasureUnit::createOhm(status)); + measureUnit.adoptInstead(MeasureUnit::createVolt(status)); + measureUnit.adoptInstead(MeasureUnit::createCalorie(status)); + measureUnit.adoptInstead(MeasureUnit::createFoodcalorie(status)); + measureUnit.adoptInstead(MeasureUnit::createJoule(status)); + measureUnit.adoptInstead(MeasureUnit::createKilocalorie(status)); + measureUnit.adoptInstead(MeasureUnit::createKilojoule(status)); + measureUnit.adoptInstead(MeasureUnit::createKilowattHour(status)); + measureUnit.adoptInstead(MeasureUnit::createGigahertz(status)); + measureUnit.adoptInstead(MeasureUnit::createHertz(status)); + measureUnit.adoptInstead(MeasureUnit::createKilohertz(status)); + measureUnit.adoptInstead(MeasureUnit::createMegahertz(status)); + measureUnit.adoptInstead(MeasureUnit::createAstronomicalUnit(status)); + measureUnit.adoptInstead(MeasureUnit::createCentimeter(status)); + measureUnit.adoptInstead(MeasureUnit::createDecimeter(status)); + measureUnit.adoptInstead(MeasureUnit::createFathom(status)); + measureUnit.adoptInstead(MeasureUnit::createFoot(status)); + measureUnit.adoptInstead(MeasureUnit::createFurlong(status)); + measureUnit.adoptInstead(MeasureUnit::createInch(status)); + measureUnit.adoptInstead(MeasureUnit::createKilometer(status)); + measureUnit.adoptInstead(MeasureUnit::createLightYear(status)); + measureUnit.adoptInstead(MeasureUnit::createMeter(status)); + measureUnit.adoptInstead(MeasureUnit::createMicrometer(status)); + measureUnit.adoptInstead(MeasureUnit::createMile(status)); + measureUnit.adoptInstead(MeasureUnit::createMileScandinavian(status)); + measureUnit.adoptInstead(MeasureUnit::createMillimeter(status)); + measureUnit.adoptInstead(MeasureUnit::createNanometer(status)); + measureUnit.adoptInstead(MeasureUnit::createNauticalMile(status)); + measureUnit.adoptInstead(MeasureUnit::createParsec(status)); + measureUnit.adoptInstead(MeasureUnit::createPicometer(status)); + measureUnit.adoptInstead(MeasureUnit::createYard(status)); + measureUnit.adoptInstead(MeasureUnit::createLux(status)); + measureUnit.adoptInstead(MeasureUnit::createCarat(status)); + measureUnit.adoptInstead(MeasureUnit::createGram(status)); + measureUnit.adoptInstead(MeasureUnit::createKilogram(status)); + measureUnit.adoptInstead(MeasureUnit::createMetricTon(status)); + measureUnit.adoptInstead(MeasureUnit::createMicrogram(status)); + measureUnit.adoptInstead(MeasureUnit::createMilligram(status)); + measureUnit.adoptInstead(MeasureUnit::createOunce(status)); + measureUnit.adoptInstead(MeasureUnit::createOunceTroy(status)); + measureUnit.adoptInstead(MeasureUnit::createPound(status)); + measureUnit.adoptInstead(MeasureUnit::createStone(status)); + measureUnit.adoptInstead(MeasureUnit::createTon(status)); + measureUnit.adoptInstead(MeasureUnit::createGigawatt(status)); + measureUnit.adoptInstead(MeasureUnit::createHorsepower(status)); + measureUnit.adoptInstead(MeasureUnit::createKilowatt(status)); + measureUnit.adoptInstead(MeasureUnit::createMegawatt(status)); + measureUnit.adoptInstead(MeasureUnit::createMilliwatt(status)); + measureUnit.adoptInstead(MeasureUnit::createWatt(status)); + measureUnit.adoptInstead(MeasureUnit::createHectopascal(status)); + measureUnit.adoptInstead(MeasureUnit::createInchHg(status)); + measureUnit.adoptInstead(MeasureUnit::createMillibar(status)); + measureUnit.adoptInstead(MeasureUnit::createMillimeterOfMercury(status)); + measureUnit.adoptInstead(MeasureUnit::createPoundPerSquareInch(status)); + measureUnit.adoptInstead(MeasureUnit::createKilometerPerHour(status)); + measureUnit.adoptInstead(MeasureUnit::createKnot(status)); + measureUnit.adoptInstead(MeasureUnit::createMeterPerSecond(status)); + measureUnit.adoptInstead(MeasureUnit::createMilePerHour(status)); + measureUnit.adoptInstead(MeasureUnit::createCelsius(status)); + measureUnit.adoptInstead(MeasureUnit::createFahrenheit(status)); + measureUnit.adoptInstead(MeasureUnit::createGenericTemperature(status)); + measureUnit.adoptInstead(MeasureUnit::createKelvin(status)); + measureUnit.adoptInstead(MeasureUnit::createAcreFoot(status)); + measureUnit.adoptInstead(MeasureUnit::createBushel(status)); + measureUnit.adoptInstead(MeasureUnit::createCentiliter(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicCentimeter(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicFoot(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicInch(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicKilometer(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicMeter(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicMile(status)); + measureUnit.adoptInstead(MeasureUnit::createCubicYard(status)); + measureUnit.adoptInstead(MeasureUnit::createCup(status)); + measureUnit.adoptInstead(MeasureUnit::createCupMetric(status)); + measureUnit.adoptInstead(MeasureUnit::createDeciliter(status)); + measureUnit.adoptInstead(MeasureUnit::createFluidOunce(status)); + measureUnit.adoptInstead(MeasureUnit::createGallon(status)); + measureUnit.adoptInstead(MeasureUnit::createGallonImperial(status)); + measureUnit.adoptInstead(MeasureUnit::createHectoliter(status)); + measureUnit.adoptInstead(MeasureUnit::createLiter(status)); + measureUnit.adoptInstead(MeasureUnit::createMegaliter(status)); + measureUnit.adoptInstead(MeasureUnit::createMilliliter(status)); + measureUnit.adoptInstead(MeasureUnit::createPint(status)); + measureUnit.adoptInstead(MeasureUnit::createPintMetric(status)); + measureUnit.adoptInstead(MeasureUnit::createQuart(status)); + measureUnit.adoptInstead(MeasureUnit::createTablespoon(status)); + measureUnit.adoptInstead(MeasureUnit::createTeaspoon(status)); + assertSuccess("", status); +} + void MeasureFormatTest::TestBasic() { UErrorCode status = U_ZERO_ERROR; MeasureUnit *ptr1 = MeasureUnit::createArcMinute(status);