diff --git a/core/i18n/src/main/res/values-fr/units.xml b/core/i18n/src/main/res/values-fr/units.xml
index 2c117aa1..02086abf 100644
--- a/core/i18n/src/main/res/values-fr/units.xml
+++ b/core/i18n/src/main/res/values-fr/units.xml
@@ -7,272 +7,325 @@
     <string name="unit_meter_symbol">m</string>
     <plurals name="unit_meter">
         <item quantity="one">mètre</item>
+        <item quantity="many">mètres</item>
         <item quantity="other">mètres</item>
     </plurals>
     <string name="unit_kilometer_symbol">km</string>
     <plurals name="unit_kilometer">
         <item quantity="one">kilomètre</item>
+        <item quantity="many">kilomètres</item>
         <item quantity="other">kilomètres</item>
     </plurals>
     <string name="unit_centimeter_symbol">cm</string>
     <plurals name="unit_centimeter">
         <item quantity="one">centimètre</item>
+        <item quantity="many">centimètres</item>
         <item quantity="other">centimètres</item>
     </plurals>
     <string name="unit_millimeter_symbol">mm</string>
     <plurals name="unit_millimeter">
         <item quantity="one">millimètre</item>
+        <item quantity="many">millimètres</item>
         <item quantity="other">millimètres</item>
     </plurals>
     <string name="unit_inch_symbol">in</string>
     <plurals name="unit_inch">
         <item quantity="one">pouce</item>
+        <item quantity="many">pouces</item>
         <item quantity="other">pouces</item>
     </plurals>
     <string name="unit_foot_symbol">ft</string>
     <plurals name="unit_foot">
         <item quantity="one">pied</item>
+        <item quantity="many">pieds</item>
         <item quantity="other">pieds</item>
     </plurals>
     <string name="unit_yard_symbol">yd</string>
     <plurals name="unit_yard">
         <item quantity="one">yard</item>
+        <item quantity="many">yards</item>
         <item quantity="other">yards</item>
     </plurals>
     <string name="unit_mile_symbol">mi</string>
     <plurals name="unit_mile">
         <item quantity="one">mile</item>
+        <item quantity="many">miles</item>
         <item quantity="other">miles</item>
     </plurals>
     <string name="unit_nautic_mile_symbol">NM</string>
     <plurals name="unit_nautic_mile">
-        <item quantity="one">mille marin</item>
-        <item quantity="other">milles marins</item>
+        <item quantity="one">mille nautique</item>
+        <item quantity="many">milles nautiques</item>
+        <item quantity="other">milles nautiques</item>
     </plurals>
     <!-- UNITS OF AREA -->
     <string name="unit_sqmeter_symbol">m²</string>
     <plurals name="unit_sqmeter">
         <item quantity="one">mètre carré</item>
+        <item quantity="many">mètres carrés</item>
         <item quantity="other">mètres carrés</item>
     </plurals>
     <string name="unit_sqkilometer_symbol">km²</string>
     <plurals name="unit_sqkilometer">
         <item quantity="one">kilomètre carré</item>
+        <item quantity="many">kilomètres carrés</item>
         <item quantity="other">kilomètres carrés</item>
     </plurals>
     <string name="unit_sqcentimeter_symbol">cm²</string>
     <plurals name="unit_sqcentimeter">
         <item quantity="one">centimètre carré</item>
+        <item quantity="many">centimètres carrés</item>
         <item quantity="other">centimètres carrés</item>
     </plurals>
     <string name="unit_sqmillimeter_symbol">mm²</string>
     <plurals name="unit_sqmillimeter">
         <item quantity="one">millimètre carré</item>
+        <item quantity="many">millimètres carrés</item>
         <item quantity="other">millimètres carrés</item>
     </plurals>
     <string name="unit_sqinch_symbol">sqin</string>
     <plurals name="unit_sqinch">
         <item quantity="one">pouce carré</item>
+        <item quantity="many">pouces carrés</item>
         <item quantity="other">pouces carrés</item>
     </plurals>
     <string name="unit_sqfoot_symbol">sqft</string>
     <plurals name="unit_sqfoot">
         <item quantity="one">pied carré</item>
+        <item quantity="many">pieds carrés</item>
         <item quantity="other">pieds carrés</item>
     </plurals>
     <string name="unit_sqyard_symbol">sqyd</string>
     <plurals name="unit_sqyard">
         <item quantity="one">yard carré</item>
+        <item quantity="many">yards carrés</item>
         <item quantity="other">yards carrés</item>
     </plurals>
     <string name="unit_hectare_symbol">ha</string>
     <plurals name="unit_hectare">
         <item quantity="one">hectare</item>
+        <item quantity="many">hectares</item>
         <item quantity="other">hectares</item>
     </plurals>
     <string name="unit_acre_symbol">ac</string>
     <plurals name="unit_acre">
         <item quantity="one">acre</item>
+        <item quantity="many">acres</item>
         <item quantity="other">acres</item>
     </plurals>
     <!-- UNITS OF TIME -->
     <string name="unit_second_symbol">s</string>
     <plurals name="unit_second">
         <item quantity="one">seconde</item>
+        <item quantity="many">secondes</item>
         <item quantity="other">secondes</item>
     </plurals>
     <string name="unit_millisecond_symbol">ms</string>
     <plurals name="unit_millisecond">
         <item quantity="one">milliseconde</item>
+        <item quantity="many">millisecondes</item>
         <item quantity="other">millisecondes</item>
     </plurals>
     <string name="unit_minute_symbol">min</string>
     <plurals name="unit_minute">
         <item quantity="one">minute</item>
+        <item quantity="many">minutes</item>
         <item quantity="other">minutes</item>
     </plurals>
     <string name="unit_hour_symbol">h</string>
     <plurals name="unit_hour">
         <item quantity="one">heure</item>
+        <item quantity="many">heures</item>
         <item quantity="other">heures</item>
     </plurals>
     <string name="unit_day_symbol">j</string>
     <plurals name="unit_day">
         <item quantity="one">jour</item>
+        <item quantity="many">jours</item>
         <item quantity="other">jours</item>
     </plurals>
     <string name="unit_year_symbol">a</string>
     <plurals name="unit_year">
         <item quantity="one">année</item>
+        <item quantity="many">années</item>
         <item quantity="other">années</item>
     </plurals>
     <!-- UNITS OF DATA SIZES -->
     <string name="unit_byte_symbol">o</string>
     <plurals name="unit_byte">
         <item quantity="one">octet</item>
+        <item quantity="many">octets</item>
         <item quantity="other">octets</item>
     </plurals>
     <string name="unit_kilobyte_symbol">Ko</string>
     <plurals name="unit_kilobyte">
         <item quantity="one">kilo-octet</item>
+        <item quantity="many">kilo-octets</item>
         <item quantity="other">kilo-octets</item>
     </plurals>
     <string name="unit_megabyte_symbol">Mo</string>
     <plurals name="unit_megabyte">
         <item quantity="one">méga-octet</item>
+        <item quantity="many">méga-octets</item>
         <item quantity="other">méga-octets</item>
     </plurals>
     <string name="unit_gigabyte_symbol">Go</string>
     <plurals name="unit_gigabyte">
         <item quantity="one">giga-octet</item>
+        <item quantity="many">giga-octets</item>
         <item quantity="other">giga-octets</item>
     </plurals>
     <string name="unit_terabyte_symbol">To</string>
     <plurals name="unit_terabyte">
         <item quantity="one">téra-octet</item>
+        <item quantity="many">téra-octets</item>
         <item quantity="other">téra-octets</item>
     </plurals>
     <string name="unit_kibibyte_symbol">kio</string>
     <plurals name="unit_kibibyte">
         <item quantity="one">kibi-octet</item>
+        <item quantity="many">kibi-octets</item>
         <item quantity="other">kibi-octets</item>
     </plurals>
     <string name="unit_mebibyte_symbol">Mio</string>
     <plurals name="unit_mebibyte">
         <item quantity="one">mebi-octet</item>
+        <item quantity="many">mebi-octets</item>
         <item quantity="other">mebi-octets</item>
     </plurals>
     <string name="unit_gibibyte_symbol">Gio</string>
     <plurals name="unit_gibibyte">
         <item quantity="one">gibi-octet</item>
+        <item quantity="many">gibi-octets</item>
         <item quantity="other">gibi-octets</item>
     </plurals>
     <string name="unit_tebibyte_symbol">Tio</string>
     <plurals name="unit_tebibyte">
         <item quantity="one">tebi-octet</item>
+        <item quantity="many">tebi-octets</item>
         <item quantity="other">tebi-octets</item>
     </plurals>
     <string name="unit_bit_symbol">bit</string>
     <plurals name="unit_bit">
         <item quantity="one">bit</item>
+        <item quantity="many">bits</item>
         <item quantity="other">bits</item>
     </plurals>
     <string name="unit_kilobit_symbol">kbit</string>
     <plurals name="unit_kilobit">
         <item quantity="one">kilobit</item>
+        <item quantity="many">kilobits</item>
         <item quantity="other">kilobits</item>
     </plurals>
     <string name="unit_megabit_symbol">Mbit</string>
     <plurals name="unit_megabit">
         <item quantity="one">mégabit</item>
+        <item quantity="many">mégabits</item>
         <item quantity="other">mégabits</item>
     </plurals>
     <string name="unit_gigabit_symbol">Gbit</string>
     <plurals name="unit_gigabit">
         <item quantity="one">gigabit</item>
+        <item quantity="many">gigabits</item>
         <item quantity="other">gigabits</item>
     </plurals>
     <string name="unit_terabit_symbol">Tbit</string>
     <plurals name="unit_terabit">
         <item quantity="one">térabit</item>
+        <item quantity="many">térabits</item>
         <item quantity="other">térabits</item>
     </plurals>
     <!-- UNITS OF VELOCITY -->
     <string name="unit_meter_per_second_symbol">m/s</string>
     <plurals name="unit_meter_per_second">
         <item quantity="one">mètre par seconde</item>
+        <item quantity="many">mètres par seconde</item>
         <item quantity="other">mètres par seconde</item>
     </plurals>
     <string name="unit_kilometer_per_hour_symbol">km/h</string>
     <plurals name="unit_kilometer_per_hour">
         <item quantity="one">kilomètre par heure</item>
+        <item quantity="many">kilomètres par heure</item>
         <item quantity="other">kilomètres par heure</item>
     </plurals>
     <string name="unit_mile_per_hour_symbol">mph</string>
     <plurals name="unit_mile_per_hour">
         <item quantity="one">mile par heure</item>
+        <item quantity="many">miles par heure</item>
         <item quantity="other">miles par heure</item>
     </plurals>
     <string name="unit_knot_symbol">nd</string>
     <plurals name="unit_knot">
         <item quantity="one">nœud</item>
+        <item quantity="many">nœuds</item>
         <item quantity="other">nœuds</item>
     </plurals>
     <!-- UNITS OF MASS -->
     <string name="unit_kilogram_symbol">kg</string>
     <plurals name="unit_kilogram">
         <item quantity="one">kilogramme</item>
+        <item quantity="many">kilogrammes</item>
         <item quantity="other">kilogrammes</item>
     </plurals>
     <string name="unit_gram_symbol">g</string>
     <plurals name="unit_gram">
         <item quantity="one">gramme</item>
+        <item quantity="many">grammes</item>
         <item quantity="other">grammes</item>
     </plurals>
     <string name="unit_metric_ton_symbol">t</string>
     <plurals name="unit_metric_ton">
         <item quantity="one">tonne</item>
+        <item quantity="many">tonnes</item>
         <item quantity="other">tonnes</item>
     </plurals>
     <string name="unit_long_ton_symbol">tn.l.</string>
     <plurals name="unit_long_ton">
         <item quantity="one">tonne longue</item>
+        <item quantity="many">tonnes longues</item>
         <item quantity="other">tonnes longues</item>
     </plurals>
     <string name="unit_stone_symbol">st.</string>
     <plurals name="unit_stone">
         <item quantity="one">pierre</item>
+        <item quantity="many">pierres</item>
         <item quantity="other">pierres</item>
     </plurals>
     <string name="unit_pound_symbol">lb.</string>
     <plurals name="unit_pound">
         <item quantity="one">livre</item>
+        <item quantity="many">livres</item>
         <item quantity="other">livres</item>
     </plurals>
     <string name="unit_ounce_symbol">oz.</string>
     <plurals name="unit_ounce">
         <item quantity="one">once</item>
+        <item quantity="many">onces</item>
         <item quantity="other">onces</item>
     </plurals>
     <string name="unit_short_ton_symbol">tn.sh.</string>
     <plurals name="unit_short_ton">
         <item quantity="one">tonne courte</item>
+        <item quantity="many">tonnes courtes</item>
         <item quantity="other">tonnes courtes</item>
     </plurals>
     <!-- UNITS OF TEMPERATURE -->
     <string name="unit_degree_celsius_symbol">°C</string>
     <plurals name="unit_degree_celsius">
         <item quantity="one">degré Celsius</item>
+        <item quantity="many">degrés Celsius</item>
         <item quantity="other">degrés Celsius</item>
     </plurals>
     <string name="unit_degree_fahrenheit_symbol">°F</string>
     <plurals name="unit_degree_fahrenheit">
         <item quantity="one">degré Fahrenheit</item>
+        <item quantity="many">degrés Fahrenheit</item>
         <item quantity="other">degrés Fahrenheit</item>
     </plurals>
     <string name="unit_kelvin_symbol">K</string>
     <plurals name="unit_kelvin">
         <item quantity="one">Kelvin</item>
+        <item quantity="many">Kelvins</item>
         <item quantity="other">Kelvins</item>
     </plurals>
 </resources>
\ No newline at end of file