diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 56749f20..9a747e05 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Lihtne kalkulaator</string>
     <string name="app_launcher_name">Kalkulaator</string>
     <string name="scientific_calculator">Teadusrežiim</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Ühikute teisendaja</string>
+    <string name="swap_units">Vaheta ühikud</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Viga: nulliga jagamine</string>
     <!-- History -->
@@ -23,79 +23,79 @@
     <string name="unit_length_millimeter">Millimeeter</string>
     <string name="unit_length_micrometer">Mikromeeter</string>
     <string name="unit_length_nanometer">Nanomeeter</string>
-    <string name="unit_length_angstrom">Angstrom</string>
+    <string name="unit_length_angstrom">Ongström</string>
     <string name="unit_length_mile">Mile</string>
     <string name="unit_length_yard">Yard</string>
-    <string name="unit_length_foot">Foot</string>
-    <string name="unit_length_inch">Inch</string>
-    <string name="unit_length_fathom">Fathom</string>
-    <string name="unit_length_nautical_mile">Nautical Mile</string>
-    <string name="unit_length_astronomical_unit">Astronomical Unit</string>
-    <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</string>
+    <string name="unit_length_foot">Jalg</string>
+    <string name="unit_length_inch">Toll</string>
+    <string name="unit_length_fathom">Süld</string>
+    <string name="unit_length_nautical_mile">Meremiil</string>
+    <string name="unit_length_astronomical_unit">Astronoomiline ühik</string>
+    <string name="unit_length_parsec">Parsek</string>
+    <string name="unit_length_light_year">Valgusaasta</string>
     <string name="unit_area">Area</string>
-    <string name="unit_area_square_kilometer">Square Kilometer</string>
-    <string name="unit_area_square_meter">Square Meter</string>
-    <string name="unit_area_square_centimeter">Square Centimeter</string>
-    <string name="unit_area_square_millimeter">Square Millimeter</string>
-    <string name="unit_area_square_mile">Square Mile</string>
-    <string name="unit_area_square_yard">Square Yard</string>
-    <string name="unit_area_square_foot">Square Foot</string>
-    <string name="unit_area_square_inch">Square Inch</string>
+    <string name="unit_area_square_kilometer">Ruutkilomeeter</string>
+    <string name="unit_area_square_meter">Ruutmeeter</string>
+    <string name="unit_area_square_centimeter">Ruutsentimeeter</string>
+    <string name="unit_area_square_millimeter">Ruutmillimeeter</string>
+    <string name="unit_area_square_mile">Ruutmiil</string>
+    <string name="unit_area_square_yard">Ruutjard</string>
+    <string name="unit_area_square_foot">Ruutjalg</string>
+    <string name="unit_area_square_inch">Ruuttoll</string>
     <string name="unit_area_acre">Acre</string>
-    <string name="unit_area_hectare">Hectare</string>
+    <string name="unit_area_hectare">Hektar</string>
     <string name="unit_volume">Volume</string>
-    <string name="unit_volume_cubic_meter">Cubic Meter</string>
-    <string name="unit_volume_cubic_decimeter">Cubic Decimeter</string>
-    <string name="unit_volume_cubic_centimeter">Cubic Centimeter</string>
-    <string name="unit_volume_cubic_millimeter">Cubic Millimeter</string>
-    <string name="unit_volume_liter">Liter</string>
-    <string name="unit_volume_centiliter">Centiliter</string>
-    <string name="unit_volume_deciliter">Deciliter</string>
-    <string name="unit_volume_milliliter">Milliliter</string>
-    <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_foot">Cubic Foot</string>
-    <string name="unit_volume_cubic_inch">Cubic Inch</string>
+    <string name="unit_volume_cubic_meter">Kuupmeeter</string>
+    <string name="unit_volume_cubic_decimeter">Kuupdetsimeeter</string>
+    <string name="unit_volume_cubic_centimeter">Kuupsentimeeter</string>
+    <string name="unit_volume_cubic_millimeter">Kuupmillimeeter</string>
+    <string name="unit_volume_liter">Liiter</string>
+    <string name="unit_volume_centiliter">Sentiliiter</string>
+    <string name="unit_volume_deciliter">Detsiliiter</string>
+    <string name="unit_volume_milliliter">Milliliiter</string>
+    <string name="unit_volume_acre_foot">Aakerjalg</string>
+    <string name="unit_volume_cubic_foot">Kuupjalg</string>
+    <string name="unit_volume_cubic_inch">Kuuptoll</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
     <string name="unit_volume_gallon_us">Gallon (US)</string>
-    <string name="unit_volume_quart_us">Quart (US)</string>
+    <string name="unit_volume_quart_us">Kvart (US)</string>
     <string name="unit_volume_pint_us">Pint (US)</string>
-    <string name="unit_volume_gill_us">Gill (US)</string>
-    <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
-    <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
-    <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
-    <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
-    <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
-    <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
+    <string name="unit_volume_gill_us">Kortel (US)</string>
+    <string name="unit_volume_fluid_ounce_us">Vedelikuunts (US)</string>
+    <string name="unit_volume_barrel_imperial">Barrel (inglise)</string>
+    <string name="unit_volume_gallon_imperial">Gallon (inglise)</string>
+    <string name="unit_volume_quart_imperial">Kvart (Imperial)</string>
+    <string name="unit_volume_pint_imperial">Pint (inglise)</string>
+    <string name="unit_volume_gill_imperial">Kortel (inglise)</string>
+    <string name="unit_volume_fluid_ounce_imperial">Vedelikuunts (inglise)</string>
     <string name="unit_mass">Mass</string>
-    <string name="unit_mass_gram">Gram</string>
-    <string name="unit_mass_kilogram">Kilogram</string>
-    <string name="unit_mass_milligram">Milligram</string>
-    <string name="unit_mass_microgram">Microgram</string>
-    <string name="unit_mass_tonne">Tonne</string>
+    <string name="unit_mass_gram">Gramm</string>
+    <string name="unit_mass_kilogram">Kilogramm</string>
+    <string name="unit_mass_milligram">Milligramm</string>
+    <string name="unit_mass_microgram">Mikrogramm</string>
+    <string name="unit_mass_tonne">Tonn</string>
     <string name="unit_mass_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</string>
-    <string name="unit_mass_grain">Grain</string>
+    <string name="unit_mass_ounce">Unts</string>
+    <string name="unit_mass_grain">Graan</string>
     <string name="unit_mass_dram">Dram</string>
-    <string name="unit_mass_stone">Stone</string>
-    <string name="unit_mass_long_ton">Long Ton</string>
-    <string name="unit_mass_short_ton">Short Ton</string>
-    <string name="unit_mass_carat">Carat</string>
-    <string name="unit_mass_carat_metric">Carat (Metric)</string>
-    <string name="unit_temperature">Temperature</string>
+    <string name="unit_mass_stone">Kivi</string>
+    <string name="unit_mass_long_ton">Pikk tonn</string>
+    <string name="unit_mass_short_ton">Lühike tonn</string>
+    <string name="unit_mass_carat">Karaat</string>
+    <string name="unit_mass_carat_metric">Karaat (SI)</string>
+    <string name="unit_temperature">Temperatuur</string>
     <string name="unit_temperature_celsius">Celsius</string>
     <string name="unit_temperature_fahrenheit">Fahrenheit</string>
     <string name="unit_temperature_rankine">Rankine</string>
     <string name="unit_temperature_kelvin">Kelvin</string>
-    <string name="unit_time">Time</string>
-    <string name="unit_time_hour">Hour</string>
+    <string name="unit_time">Aeg</string>
+    <string name="unit_time_hour">Tund</string>
     <string name="unit_time_minute">Minute</string>
-    <string name="unit_time_second">Second</string>
-    <string name="unit_time_millisecond">Microsecond</string>
+    <string name="unit_time_second">Sekund</string>
+    <string name="unit_time_millisecond">Mikrosekund</string>
     <string name="unit_time_day">Day</string>
-    <string name="unit_time_week">Week</string>
-    <string name="unit_time_year">Year</string>
+    <string name="unit_time_week">Nädal</string>
+    <string name="unit_time_year">Aasta</string>
     <!-- FAQ -->
     <string name="faq_1_title">Kuidas C (Clear) nupp toimib\?</string>
     <string name="faq_1_text">Üks klõpsatus kustutab ühe numbri. Pikk vajutus eemaldab kogu sisestuse.</string>