ICU-12133 (C) integrate CLDR data for new units

X-SVN-Rev: 38239

diff --git a/icu4c/source/data/unit/en.txt b/icu4c/source/data/unit/en.txt
index d55df06ad25bc939b80fc2e189294b6e4f0c3143..57bbe6c4ce4cfd423217f7b13cf5afb45ade5ec3 100755 (executable)
--- a/icu4c/source/data/unit/en.txt
+++ b/icu4c/source/data/unit/en.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: <path>/common/main/en.xml
 // *
 // ***************************************************************************
 en{
-    Version{"2.1.19.72"}
+    Version{"2.1.23.48"}
     units{
         acceleration{
             g-force{
@@ -101,6 +101,23 @@ en{
         compound{
             per{"{0} per {1}"}
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"milligrams per deciliter"}
+                one{"{0} milligram per deciliter"}
+                other{"{0} milligrams per deciliter"}
+            }
+            millimole-per-liter{
+                dnam{"millimoles per liter"}
+                one{"{0} millimole per liter"}
+                other{"{0} millimoles per liter"}
+            }
+            part-per-million{
+                dnam{"parts per million"}
+                one{"{0} part per million"}
+                other{"{0} parts per million"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"liters per 100 kilometers"}
@@ -117,6 +134,11 @@ en{
                 one{"{0} mile per gallon"}
                 other{"{0} miles per gallon"}
             }
+            mile-per-gallon-imperial{
+                dnam{"miles per Imp. gallon"}
+                one{"{0} mile per Imp. gallon"}
+                other{"{0} miles per Imp. gallon"}
+            }
         }
         digital{
             bit{
@@ -664,6 +686,12 @@ en{
                 other{"{0} gallons"}
                 per{"{0} per gallon"}
             }
+            gallon-imperial{
+                dnam{"Imp. gallons"}
+                one{"{0} Imp. gallon"}
+                other{"{0} Imp. gallons"}
+                per{"{0} per Imp. gallon"}
+            }
             hectoliter{
                 dnam{"hectoliters"}
                 one{"{0} hectoliter"}
@@ -789,6 +817,23 @@ en{
                 other{"{0}yd²"}
             }
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0}mg/dL"}
+                other{"{0}mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/L"}
+                one{"{0}mmol/L"}
+                other{"{0}mmol/L"}
+            }
+            part-per-million{
+                dnam{"ppm"}
+                one{"{0}ppm"}
+                other{"{0}ppm"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100km"}
@@ -805,6 +850,11 @@ en{
                 one{"{0}mpg"}
                 other{"{0}mpg"}
             }
+            mile-per-gallon-imperial{
+                dnam{"mpg Imp"}
+                one{"{0}mpgIm"}
+                other{"{0}mpgIm"}
+            }
         }
         digital{
             bit{
@@ -1331,6 +1381,12 @@ en{
                 other{"{0}gal"}
                 per{"{0}/gal"}
             }
+            gallon-imperial{
+                dnam{"Imp gal"}
+                one{"{0}galIm"}
+                other{"{0}galIm"}
+                per{"{0}/galIm"}
+            }
             hectoliter{
                 dnam{"hL"}
                 one{"{0}hL"}
@@ -1472,6 +1528,23 @@ en{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0} mg/dL"}
+                other{"{0} mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"millimol/liter"}
+                one{"{0} mmol/L"}
+                other{"{0} mmol/L"}
+            }
+            part-per-million{
+                dnam{"parts/million"}
+                one{"{0} ppm"}
+                other{"{0} ppm"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100 km"}
@@ -1488,6 +1561,11 @@ en{
                 one{"{0} mpg"}
                 other{"{0} mpg"}
             }
+            mile-per-gallon-imperial{
+                dnam{"miles/gal Imp."}
+                one{"{0} mpg Imp."}
+                other{"{0} mpg Imp."}
+            }
         }
         digital{
             bit{
@@ -2032,6 +2110,11 @@ en{
                 one{"{0} gal"}
                 other{"{0} gal"}
             }
+            gallon-imperial{
+                dnam{"Imp. gal"}
+                one{"{0} gal Imp."}
+                other{"{0} gal Imp."}
+            }
             hectoliter{
                 dnam{"hL"}
                 one{"{0} hL"}

diff --git a/icu4c/source/data/unit/en_001.txt b/icu4c/source/data/unit/en_001.txt
index 96f487b8b744949508b5f51a06c5b4ce1787dd8c..531420e177434006ac44caccf46c9aa8016172f9 100755 (executable)
--- a/icu4c/source/data/unit/en_001.txt
+++ b/icu4c/source/data/unit/en_001.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: <path>/common/main/en_001.xml
@@ -35,6 +35,18 @@ en_001{
                 per{"{0} per square metre"}
             }
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"milligrams per decilitre"}
+                one{"{0} milligram per decilitre"}
+                other{"{0} milligrams per decilitre"}
+            }
+            millimole-per-liter{
+                dnam{"millimoles per litre"}
+                one{"{0} millimole per litre"}
+                other{"{0} millimoles per litre"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"litres per 100 kilometres"}
@@ -46,6 +58,16 @@ en_001{
                 one{"{0} litre per kilometre"}
                 other{"{0} litres per kilometre"}
             }
+            mile-per-gallon{
+                dnam{"miles per US gallon"}
+                one{"{0} mile per US gallon"}
+                other{"{0} miles per US gallon"}
+            }
+            mile-per-gallon-imperial{
+                dnam{"miles per gallon"}
+                one{"{0} mile per gallon"}
+                other{"{0} miles per gallon"}
+            }
         }
         length{
             centimeter{
@@ -139,6 +161,18 @@ en_001{
                 one{"{0} decilitre"}
                 other{"{0} decilitres"}
             }
+            gallon{
+                dnam{"US gallons"}
+                one{"{0} US gallon"}
+                other{"{0} US gallons"}
+                per{"{0} per US gallon"}
+            }
+            gallon-imperial{
+                dnam{"gallons"}
+                one{"{0} gallon"}
+                other{"{0} gallons"}
+                per{"{0} per gallon"}
+            }
             hectoliter{
                 dnam{"hectolitres"}
                 one{"{0} hectolitre"}
@@ -163,6 +197,18 @@ en_001{
         }
     }
     unitsNarrow{
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dl"}
+                one{"{0}mg/dl"}
+                other{"{0}mg/dl"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/l"}
+                one{"{0}mmol/l"}
+                other{"{0}mmol/l"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"l/100km"}
@@ -174,6 +220,16 @@ en_001{
                 one{"{0}l/km"}
                 other{"{0}l/km"}
             }
+            mile-per-gallon{
+                dnam{"mpg US"}
+                one{"{0}mpgUS"}
+                other{"{0}mpgUS"}
+            }
+            mile-per-gallon-imperial{
+                dnam{"mpg"}
+                one{"{0}mpg"}
+                other{"{0}mpg"}
+            }
         }
         mass{
             pound{
@@ -202,6 +258,18 @@ en_001{
                 one{"{0}dl"}
                 other{"{0}dl"}
             }
+            gallon{
+                dnam{"US gal"}
+                one{"{0}galUS"}
+                other{"{0}galUS"}
+                per{"{0}/galUS"}
+            }
+            gallon-imperial{
+                dnam{"gal"}
+                one{"{0}gal"}
+                other{"{0}gal"}
+                per{"{0}/gal"}
+            }
             hectoliter{
                 dnam{"hl"}
                 one{"{0}hl"}
@@ -231,6 +299,18 @@ en_001{
                 dnam{"metres/sec²"}
             }
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dl"}
+                one{"{0} mg/dl"}
+                other{"{0} mg/dl"}
+            }
+            millimole-per-liter{
+                dnam{"millimol/litre"}
+                one{"{0} mmol/l"}
+                other{"{0} mmol/l"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"l/100 km"}
@@ -242,6 +322,16 @@ en_001{
                 one{"{0} l/km"}
                 other{"{0} l/km"}
             }
+            mile-per-gallon{
+                dnam{"miles/gal US"}
+                one{"{0} mpg US"}
+                other{"{0} mpg US"}
+            }
+            mile-per-gallon-imperial{
+                dnam{"miles/gal"}
+                one{"{0} mpg"}
+                other{"{0} mpg"}
+            }
         }
         duration{
             hour{
@@ -281,6 +371,16 @@ en_001{
                 one{"{0} dl"}
                 other{"{0} dl"}
             }
+            gallon{
+                dnam{"US gal"}
+                one{"{0} gal US"}
+                other{"{0} gal US"}
+            }
+            gallon-imperial{
+                dnam{"gal"}
+                one{"{0} gal"}
+                other{"{0} gal"}
+            }
             hectoliter{
                 dnam{"hl"}
                 one{"{0} hl"}

diff --git a/icu4c/source/data/unit/en_AU.txt b/icu4c/source/data/unit/en_AU.txt
index 6881a6e0369653740b85a0efa984fd1c00f554e6..23845318bdbf06b50e2e3653c956263ea1bba3ff 100755 (executable)
--- a/icu4c/source/data/unit/en_AU.txt
+++ b/icu4c/source/data/unit/en_AU.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: <path>/common/main/en_AU.xml
@@ -8,7 +8,7 @@
 // ***************************************************************************
 en_AU{
     %%Parent{"en_001"}
-    Version{"2.1.20.4"}
+    Version{"2.1.22.91"}
     units{
         coordinate{
             east{"{0} east"}
@@ -64,6 +64,18 @@ en_AU{
         }
     }
     unitsNarrow{
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0}mg/dL"}
+                other{"{0}mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/L"}
+                one{"{0}mmol/L"}
+                other{"{0}mmol/L"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100km"}
@@ -170,6 +182,17 @@ en_AU{
                 dnam{"metres²"}
             }
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0} mg/dL"}
+                other{"{0} mg/dL"}
+            }
+            millimole-per-liter{
+                one{"{0} mmol/L"}
+                other{"{0} mmol/L"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100 km"}
@@ -181,6 +204,11 @@ en_AU{
                 other{"{0} L/km"}
             }
             mile-per-gallon{
+                dnam{"miles/gal. US"}
+                one{"{0} m.p.g. US"}
+                other{"{0} m.p.g. US"}
+            }
+            mile-per-gallon-imperial{
                 dnam{"miles/gal."}
                 one{"{0} m.p.g."}
                 other{"{0} m.p.g."}

diff --git a/icu4c/source/data/unit/en_CA.txt b/icu4c/source/data/unit/en_CA.txt
index 2c95dd3da8cb244b4fde9d7a7c8d6daeed9101b5..386057c6b028edcdaac88772b92ce00f5d2edf60 100755 (executable)
--- a/icu4c/source/data/unit/en_CA.txt
+++ b/icu4c/source/data/unit/en_CA.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: <path>/common/main/en_CA.xml
@@ -8,8 +8,20 @@
 // ***************************************************************************
 en_CA{
     %%Parent{"en_001"}
-    Version{"2.1.19.79"}
+    Version{"2.1.22.91"}
     unitsNarrow{
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0}mg/dL"}
+                other{"{0}mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/L"}
+                one{"{0}mmol/L"}
+                other{"{0}mmol/L"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100km"}
@@ -56,6 +68,17 @@ en_CA{
         }
     }
     unitsShort{
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                one{"{0} mg/dL"}
+                other{"{0} mg/dL"}
+            }
+            millimole-per-liter{
+                one{"{0} mmol/L"}
+                other{"{0} mmol/L"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100 km"}

diff --git a/icu4c/source/data/unit/root.txt b/icu4c/source/data/unit/root.txt
index da1d6861c6936af34c9c5545c7a9fcfe1e8c5adf..4192a60856ab89712748e905b11311c29281fbb3 100755 (executable)
--- a/icu4c/source/data/unit/root.txt
+++ b/icu4c/source/data/unit/root.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: <path>/common/main/root.xml
@@ -10,7 +10,7 @@
  * ICU <specials> source: <path>/common/main/root.xml
  */
 root{
-    Version{"2.1.19.19"}
+    Version{"2.1.22.93"}
     durationUnits{
         hm{"h:mm"}
         hms{"h:mm:ss"}
@@ -95,6 +95,20 @@ root{
         compound{
             per{"{0}/{1}"}
         }
+        concentr{
+            milligram-per-deciliter{
+                dnam{"mg/dL"}
+                other{"{0} mg/dL"}
+            }
+            millimole-per-liter{
+                dnam{"mmol/L"}
+                other{"{0} mmol/L"}
+            }
+            part-per-million{
+                dnam{"ppm"}
+                other{"{0} ppm"}
+            }
+        }
         consumption{
             liter-per-100kilometers{
                 dnam{"L/100km"}
@@ -105,8 +119,12 @@ root{
                 other{"{0} L/km"}
             }
             mile-per-gallon{
-                dnam{"mpg"}
-                other{"{0} mpg"}
+                dnam{"mpg US"}
+                other{"{0} mpg US"}
+            }
+            mile-per-gallon-imperial{
+                dnam{"mpg Imp."}
+                other{"{0} mpg Imp."}
             }
         }
         coordinate{
@@ -561,9 +579,14 @@ root{
                 other{"{0} fl oz"}
             }
             gallon{
-                dnam{"gal"}
-                other{"{0} gal"}
-                per{"{0}/gal"}
+                dnam{"US gal"}
+                other{"{0} gal US"}
+                per{"{0}/gal US"}
+            }
+            gallon-imperial{
+                dnam{"Imp. gal"}
+                other{"{0} gal Imp."}
+                per{"{0}/gal Imp."}
             }
             hectoliter{
                 dnam{"hL"}