X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/38fbf2fd31f5cd99b500914d6037b1d06b608645..0f5d89e82340278ed3d7d50029f37cab2c41a57e:/icuSources/data/unit/fr.txt

diff --git a/icuSources/data/unit/fr.txt b/icuSources/data/unit/fr.txt
index d9ec12ed..6a804d49 100644
--- a/icuSources/data/unit/fr.txt
+++ b/icuSources/data/unit/fr.txt
@@ -1,11 +1,11 @@
 // © 2016 and later: Unicode, Inc. and others.
 // License & terms of use: http://www.unicode.org/copyright.html#License
 fr{
-    Version{"2.1.32.59"}
+    Version{"2.1.41.97"}
     durationUnits{
-        hm{"hh:mm"}
-        hms{"hh:mm:ss"}
-        ms{"mm:ss"}
+        hm{"h:mm"}
+        hms{"h:mm:ss"}
+        ms{"m:ss"}
     }
     units{
         acceleration{
@@ -361,12 +361,22 @@ fr{
                 one{"{0} décimètre"}
                 other{"{0} décimètres"}
             }
+            fathom{
+                dnam{"brasses"}
+                one{"{0} brasse"}
+                other{"{0} brasses"}
+            }
             foot{
                 dnam{"pieds"}
                 one{"{0} pied"}
                 other{"{0} pieds"}
                 per{"{0} par pied"}
             }
+            furlong{
+                dnam{"furlongs"}
+                one{"{0} furlong"}
+                other{"{0} furlongs"}
+            }
             inch{
                 dnam{"pouces"}
                 one{"{0} pouce"}
@@ -500,6 +510,8 @@ fr{
             }
             stone{
                 dnam{"stones"}
+                one{"{0} stone"}
+                other{"{0} stones"}
             }
             ton{
                 dnam{"tonnes courtes"}
@@ -650,8 +662,8 @@ fr{
             }
             cubic-mile{
                 dnam{"miles cubes"}
-                one{"{0} mille anglais cube"}
-                other{"{0} milles anglais cubes"}
+                one{"{0} mile cube"}
+                other{"{0} miles cubes"}
             }
             cubic-yard{
                 dnam{"yards cubes"}
@@ -685,10 +697,10 @@ fr{
                 per{"{0} par gallon"}
             }
             gallon-imperial{
-                dnam{"gallon imp."}
-                one{"{0} gal imp."}
-                other{"{0} gal imp."}
-                per{"{0} par gallon imp."}
+                dnam{"gallons impériaux"}
+                one{"{0} gallon impérial"}
+                other{"{0} gallons impériaux"}
+                per{"{0} par gallon impérial"}
             }
             hectoliter{
                 dnam{"hectolitres"}
@@ -741,9 +753,15 @@ fr{
     unitsNarrow{
         acceleration{
             g-force{
+                dnam{"G"}
                 one{"{0}G"}
                 other{"{0}G"}
             }
+            meter-per-second-squared{
+                dnam{"m/s²"}
+                one{"{0} m/s²"}
+                other{"{0} m/s²"}
+            }
         }
         angle{
             arc-minute{
@@ -815,15 +833,27 @@ fr{
             west{"{0}O"}
         }
         duration{
+            century{
+                dnam{"s."}
+                one{"{0} s."}
+                other{"{0} s."}
+            }
             day{
                 dnam{"j"}
                 one{"{0}j"}
                 other{"{0}j"}
+                per{"{0}/j"}
             }
             hour{
                 dnam{"h"}
                 one{"{0}h"}
                 other{"{0}h"}
+                per{"{0}/h"}
+            }
+            microsecond{
+                dnam{"μs"}
+                one{"{0} μs"}
+                other{"{0} μs"}
             }
             millisecond{
                 dnam{"ms"}
@@ -834,26 +864,36 @@ fr{
                 dnam{"mn"}
                 one{"{0}mn"}
                 other{"{0}mn"}
+                per{"{0}/mn"}
             }
             month{
                 dnam{"m"}
                 one{"{0}m"}
                 other{"{0}m"}
+                per{"{0}/m"}
+            }
+            nanosecond{
+                dnam{"ns"}
+                one{"{0}ns"}
+                other{"{0}ns"}
             }
             second{
                 dnam{"s"}
                 one{"{0}s"}
                 other{"{0}s"}
+                per{"{0}/s"}
             }
             week{
                 dnam{"sem"}
                 one{"{0}sem"}
                 other{"{0}sem"}
+                per{"{0}/sem"}
             }
             year{
                 dnam{"a"}
                 one{"{0}a"}
                 other{"{0}a"}
+                per{"{0}/a"}
             }
         }
         length{
@@ -866,21 +906,43 @@ fr{
                 dnam{"cm"}
                 one{"{0} cm"}
                 other{"{0} cm"}
+                per{"{0}/cm"}
+            }
+            decimeter{
+                dnam{"dm"}
+                one{"{0} dm"}
+                other{"{0} dm"}
+            }
+            fathom{
+                dnam{"fm"}
+                one{"{0} fm"}
+                other{"{0} fm"}
             }
             foot{
+                dnam{"pi"}
                 one{"{0}′"}
                 other{"{0}′"}
+                per{"{0}/pi"}
+            }
+            furlong{
+                dnam{"fur"}
+                one{"{0} fur"}
+                other{"{0} fur"}
             }
             inch{
+                dnam{"po"}
                 one{"{0}″"}
                 other{"{0}″"}
+                per{"{0}/po"}
             }
             kilometer{
                 dnam{"km"}
                 one{"{0} km"}
                 other{"{0} km"}
+                per{"{0}/km"}
             }
             light-year{
+                dnam{"al"}
                 one{"{0} a.l."}
                 other{"{0} a.l."}
             }
@@ -888,25 +950,55 @@ fr{
                 dnam{"m"}
                 one{"{0} m"}
                 other{"{0} m"}
+                per{"{0}/m"}
+            }
+            micrometer{
+                dnam{"µm"}
+                one{"{0} µm"}
+                other{"{0} µm"}
             }
             mile{
+                dnam{"mi"}
                 one{"{0} mi"}
                 other{"{0} mi"}
             }
+            mile-scandinavian{
+                dnam{"smi"}
+                one{"{0} smi"}
+                other{"{0} smi"}
+            }
             millimeter{
                 dnam{"mm"}
                 one{"{0} mm"}
                 other{"{0} mm"}
             }
+            nanometer{
+                dnam{"nm"}
+                one{"{0} nm"}
+                other{"{0} nm"}
+            }
+            nautical-mile{
+                dnam{"nmi"}
+                one{"{0} nmi"}
+                other{"{0} nmi"}
+            }
+            parsec{
+                dnam{"pc"}
+                one{"{0} pc"}
+                other{"{0} pc"}
+            }
             picometer{
+                dnam{"pm"}
                 one{"{0} pm"}
                 other{"{0} pm"}
             }
             point{
-                one{"{0}pt"}
-                other{"{0}pts"}
+                dnam{"pt"}
+                one{"{0} pt"}
+                other{"{0} pt"}
             }
             yard{
+                dnam{"yd"}
                 one{"{0} yd"}
                 other{"{0} yd"}
             }
@@ -921,19 +1013,45 @@ fr{
                 dnam{"g"}
                 one{"{0} g"}
                 other{"{0} g"}
+                per{"{0}/g"}
             }
             kilogram{
                 dnam{"kg"}
                 one{"{0} kg"}
                 other{"{0} kg"}
+                per{"{0}/kg"}
+            }
+            metric-ton{
+                dnam{"t"}
+                one{"{0} t"}
+                other{"{0} t"}
+            }
+            microgram{
+                dnam{"µg"}
+                one{"{0} µg"}
+                other{"{0} µg"}
+            }
+            milligram{
+                dnam{"mg"}
+                one{"{0} mg"}
+                other{"{0} mg"}
             }
             ounce{
+                dnam{"oz"}
                 one{"{0} oz"}
                 other{"{0} oz"}
+                per{"{0}/oz"}
             }
             pound{
+                dnam{"lb"}
                 one{"{0} lb"}
                 other{"{0} lb"}
+                per{"{0}/lb"}
+            }
+            stone{
+                dnam{"st"}
+                one{"{0} st"}
+                other{"{0} st"}
             }
             ton{
                 dnam{"sh tn"}
@@ -957,17 +1075,30 @@ fr{
         }
         pressure{
             hectopascal{
+                dnam{"hPa"}
                 one{"{0}hPa"}
                 other{"{0}hPa"}
             }
             inch-hg{
-                one{"{0}inHg"}
-                other{"{0}inHg"}
+                dnam{"″Hg"}
+                one{"{0}″ Hg"}
+                other{"{0}″ Hg"}
             }
             millibar{
+                dnam{"mbar"}
                 one{"{0}mbar"}
                 other{"{0}mbar"}
             }
+            millimeter-of-mercury{
+                dnam{"mmHg"}
+                one{"{0} mmHg"}
+                other{"{0} mmHg"}
+            }
+            pound-per-square-inch{
+                dnam{"lb/po²"}
+                one{"{0} lb/po²"}
+                other{"{0} lb/po²"}
+            }
         }
         speed{
             kilometer-per-hour{
@@ -975,11 +1106,18 @@ fr{
                 one{"{0} km/h"}
                 other{"{0} km/h"}
             }
+            knot{
+                dnam{"nd"}
+                one{"{0} nd"}
+                other{"{0} nd"}
+            }
             meter-per-second{
+                dnam{"m/s"}
                 one{"{0} m/s"}
                 other{"{0} m/s"}
             }
             mile-per-hour{
+                dnam{"mi/h"}
                 one{"{0} mi/h"}
                 other{"{0} mi/h"}
             }
@@ -991,9 +1129,20 @@ fr{
                 other{"{0}°C"}
             }
             fahrenheit{
+                dnam{"°F"}
                 one{"{0}°F"}
                 other{"{0}°F"}
             }
+            generic{
+                dnam{"°"}
+                one{"{0}°"}
+                other{"{0}°"}
+            }
+            kelvin{
+                dnam{"K"}
+                one{"{0} K"}
+                other{"{0} K"}
+            }
         }
         volume{
             centiliter{
@@ -1175,14 +1324,14 @@ fr{
                 other{"{0} ct"}
             }
             milligram-per-deciliter{
-                dnam{"mg/dL"}
-                one{"{0} mg/dL"}
-                other{"{0} mg/dL"}
+                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"}
+                dnam{"mmol/l"}
+                one{"{0} mmol/l"}
+                other{"{0} mmol/l"}
             }
             part-per-million{
                 dnam{"ppm"}
@@ -1325,7 +1474,7 @@ fr{
                 dnam{"sem."}
                 one{"{0} sem."}
                 other{"{0} sem."}
-                per{"{0}/sem"}
+                per{"{0}/sem."}
             }
             year{
                 dnam{"ans"}
@@ -1428,8 +1577,9 @@ fr{
                 other{"{0} dm"}
             }
             fathom{
-                one{"{0} fat"}
-                other{"{0} fat"}
+                dnam{"fm"}
+                one{"{0} fm"}
+                other{"{0} fm"}
             }
             foot{
                 dnam{"pi"}
@@ -1437,6 +1587,11 @@ fr{
                 other{"{0} pi"}
                 per{"{0}/pi"}
             }
+            furlong{
+                dnam{"fur"}
+                one{"{0} fur"}
+                other{"{0} fur"}
+            }
             inch{
                 dnam{"po"}
                 one{"{0} po"}
@@ -1503,7 +1658,7 @@ fr{
             point{
                 dnam{"points"}
                 one{"{0} pt"}
-                other{"{0} pts"}
+                other{"{0} pt"}
             }
             yard{
                 dnam{"yd"}
@@ -1568,6 +1723,11 @@ fr{
                 other{"{0} lb"}
                 per{"{0}/lb"}
             }
+            stone{
+                dnam{"st"}
+                one{"{0} st"}
+                other{"{0} st"}
+            }
             ton{
                 dnam{"sh tn"}
                 one{"{0} sh tn"}
@@ -1623,9 +1783,9 @@ fr{
                 other{"{0} mbar"}
             }
             millimeter-of-mercury{
-                dnam{"mm Hg"}
-                one{"{0} mm Hg"}
-                other{"{0} mm Hg"}
+                dnam{"mmHg"}
+                one{"{0} mmHg"}
+                other{"{0} mmHg"}
             }
             pound-per-square-inch{
                 dnam{"lb/po²"}