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>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7194f504..31f10c8c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Calculatrice simple</string>
     <string name="app_launcher_name">Calculatrice</string>
     <string name="scientific_calculator">Calculatrice scientifique</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Convertisseur d\'unités</string>
+    <string name="swap_units">Inverser les unités</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Erreur : division par zéro</string>
     <!-- History -->
@@ -16,56 +16,56 @@
     <string name="vibrate_on_button_press">Vibrer lors de l\'appui sur une touche</string>
     <string name="use_comma_as_decimal_mark">Utiliser la virgule comme séparateur décimal</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
-    <string name="unit_length_kilometer">Kilometer</string>
-    <string name="unit_length_meter">Meter</string>
-    <string name="unit_length_centimeter">Centimeter</string>
-    <string name="unit_length_millimeter">Millimeter</string>
-    <string name="unit_length_micrometer">Micrometer</string>
-    <string name="unit_length_nanometer">Nanometer</string>
-    <string name="unit_length_angstrom">Angstrom</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">Unités de longueur</string>
+    <string name="unit_length_kilometer">Kilomètre</string>
+    <string name="unit_length_meter">Mètre</string>
+    <string name="unit_length_centimeter">Centimètre</string>
+    <string name="unit_length_millimeter">Millimètre</string>
+    <string name="unit_length_micrometer">Micromètre</string>
+    <string name="unit_length_nanometer">Nanomètre</string>
+    <string name="unit_length_angstrom">Angström</string>
+    <string name="unit_length_mile">Mille terrestre international</string>
+    <string name="unit_length_yard">Verge</string>
+    <string name="unit_length_foot">Pied</string>
+    <string name="unit_length_inch">Pouce</string>
+    <string name="unit_length_fathom">Brasse</string>
+    <string name="unit_length_nautical_mile">Mille marin</string>
+    <string name="unit_length_astronomical_unit">Unités astronomiques</string>
     <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</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_length_light_year">Année-lumière</string>
+    <string name="unit_area">Unités de surface</string>
+    <string name="unit_area_square_kilometer">Kilomètre carré</string>
+    <string name="unit_area_square_meter">Mètre carré</string>
+    <string name="unit_area_square_centimeter">Centimètre carré</string>
+    <string name="unit_area_square_millimeter">Millimètre carré</string>
+    <string name="unit_area_square_mile">Mille carré</string>
+    <string name="unit_area_square_yard">Verge carrée</string>
+    <string name="unit_area_square_foot">Pied carré</string>
+    <string name="unit_area_square_inch">Pouce carré</string>
     <string name="unit_area_acre">Acre</string>
     <string name="unit_area_hectare">Hectare</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_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_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">Unités de volume</string>
+    <string name="unit_volume_cubic_meter">Mètre cube</string>
+    <string name="unit_volume_cubic_decimeter">Décimètre cube</string>
+    <string name="unit_volume_cubic_centimeter">Centimètre cube</string>
+    <string name="unit_volume_cubic_millimeter">Millimètre cube</string>
+    <string name="unit_volume_liter">Litre</string>
+    <string name="unit_volume_centiliter">Centilitre</string>
+    <string name="unit_volume_deciliter">Décilitre</string>
+    <string name="unit_volume_milliliter">Millilitre</string>
+    <string name="unit_volume_acre_foot">Acre-pied</string>
+    <string name="unit_volume_cubic_foot">Pied cube</string>
+    <string name="unit_volume_cubic_inch">Pouce cube</string>
+    <string name="unit_volume_barrel_us">Baril liquide américain</string>
+    <string name="unit_volume_gallon_us">Gallon liquide américain</string>
+    <string name="unit_volume_quart_us">Quart liquide américain</string>
+    <string name="unit_volume_pint_us">Pinte liquide américaine</string>
+    <string name="unit_volume_gill_us">Gille liquide américaine</string>
+    <string name="unit_volume_fluid_ounce_us">Once liquide américaine</string>
+    <string name="unit_volume_barrel_imperial">Baril impérial britannique</string>
+    <string name="unit_volume_gallon_imperial">Gallon impérial britannique</string>
+    <string name="unit_volume_quart_imperial">Quart impérial britannique</string>
+    <string name="unit_volume_pint_imperial">Pinte impériale britannique</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
     <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
     <string name="unit_mass">Mass</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index b3228c82..5e6af507 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Simpel kalkylator</string>
     <string name="app_launcher_name">Kalkylator</string>
     <string name="scientific_calculator">Avancerad kalkylator</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Enhetskonverterare</string>
+    <string name="swap_units">Byt enheter</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fel: delning med noll</string>
     <!-- History -->
@@ -16,46 +16,46 @@
     <string name="vibrate_on_button_press">Vibrera när jag trycker på knapparna</string>
     <string name="use_comma_as_decimal_mark">Använd komma som decimaltecken</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
+    <string name="unit_length">Längd</string>
     <string name="unit_length_kilometer">Kilometer</string>
     <string name="unit_length_meter">Meter</string>
     <string name="unit_length_centimeter">Centimeter</string>
     <string name="unit_length_millimeter">Millimeter</string>
-    <string name="unit_length_micrometer">Micrometer</string>
+    <string name="unit_length_micrometer">Mikrometer</string>
     <string name="unit_length_nanometer">Nanometer</string>
     <string name="unit_length_angstrom">Angstrom</string>
-    <string name="unit_length_mile">Mile</string>
+    <string name="unit_length_mile">Mil</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_foot">Fot</string>
+    <string name="unit_length_inch">Tum</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_nautical_mile">Nautisk Mil</string>
+    <string name="unit_length_astronomical_unit">Astronomisk Enhet</string>
     <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</string>
+    <string name="unit_length_light_year">Ljusår</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_kilometer">Kvadratkilometer</string>
+    <string name="unit_area_square_meter">Kvadratmeter</string>
+    <string name="unit_area_square_centimeter">Kvadratcentimeter</string>
+    <string name="unit_area_square_millimeter">Kvadratmillimeter</string>
+    <string name="unit_area_square_mile">Kvadratmil</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_acre">Acre</string>
-    <string name="unit_area_hectare">Hectare</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_area_square_foot">Kvadratfot</string>
+    <string name="unit_area_square_inch">Kvadrattum</string>
+    <string name="unit_area_acre">Tunnland</string>
+    <string name="unit_area_hectare">Hektar</string>
+    <string name="unit_volume">Volym</string>
+    <string name="unit_volume_cubic_meter">Kubikmeter</string>
+    <string name="unit_volume_cubic_decimeter">Kubikdecimeter</string>
+    <string name="unit_volume_cubic_centimeter">kubikcentimeter</string>
+    <string name="unit_volume_cubic_millimeter">Kubikmillimeter</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_foot">Kubikfot</string>
+    <string name="unit_volume_cubic_inch">Kubiktum</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>
@@ -68,34 +68,34 @@
     <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_mass">Mass</string>
+    <string name="unit_mass">Massa</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_microgram">Mikrogram</string>
+    <string name="unit_mass_tonne">Ton</string>
     <string name="unit_mass_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</string>
+    <string name="unit_mass_ounce">Uns</string>
     <string name="unit_mass_grain">Grain</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_carat">Karat</string>
+    <string name="unit_mass_carat_metric">Karat (Metrisk)</string>
+    <string name="unit_temperature">Temperatur</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_minute">Minute</string>
-    <string name="unit_time_second">Second</string>
-    <string name="unit_time_millisecond">Microsecond</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">Tid</string>
+    <string name="unit_time_hour">Timme</string>
+    <string name="unit_time_minute">Minut</string>
+    <string name="unit_time_second">Sekund</string>
+    <string name="unit_time_millisecond">Mikrosekund</string>
+    <string name="unit_time_day">Dag</string>
+    <string name="unit_time_week">Vecka</string>
+    <string name="unit_time_year">År</string>
     <!-- FAQ -->
     <string name="faq_1_title">Hur funkar C (Rensa) knappen\?</string>
     <string name="faq_1_text">Om du trycker på den tar du bort ett tecken i taget. Om du trycker länge på den återställs alla fält på en gång.</string>
@@ -103,4 +103,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 9b503eea..4df8e485 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Простий Калькулятор</string>
     <string name="app_launcher_name">Калькулятор</string>
     <string name="scientific_calculator">Науковий Калькулятор</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Перетворювач одиниць</string>
+    <string name="swap_units">Поміняти місцями</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Помилка: ділення на нуль</string>
     <!-- History -->
@@ -16,36 +16,36 @@
     <string name="vibrate_on_button_press">Вібрувати з натиском кнопок</string>
     <string name="use_comma_as_decimal_mark">Як десятковий знак використовувати кому</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
-    <string name="unit_length_kilometer">Kilometer</string>
-    <string name="unit_length_meter">Meter</string>
-    <string name="unit_length_centimeter">Centimeter</string>
-    <string name="unit_length_millimeter">Millimeter</string>
-    <string name="unit_length_micrometer">Micrometer</string>
-    <string name="unit_length_nanometer">Nanometer</string>
-    <string name="unit_length_angstrom">Angstrom</string>
+    <string name="unit_length">Довжина</string>
+    <string name="unit_length_kilometer">Кілометр</string>
+    <string name="unit_length_meter">Метр</string>
+    <string name="unit_length_centimeter">Сантиметр</string>
+    <string name="unit_length_millimeter">Міліметр</string>
+    <string name="unit_length_micrometer">Мікрометр</string>
+    <string name="unit_length_nanometer">Нанометр</string>
+    <string name="unit_length_angstrom">Ангстрем</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">Фут</string>
+    <string name="unit_length_inch">Дюйм</string>
+    <string name="unit_length_fathom">Морська сажень</string>
+    <string name="unit_length_nautical_mile">Морська миля</string>
+    <string name="unit_length_astronomical_unit">Астрономічна Одиниця</string>
+    <string name="unit_length_parsec">Парсек</string>
+    <string name="unit_length_light_year">Світловий Рік</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">Квадратний Кілометр</string>
+    <string name="unit_area_square_meter">Квадратний Метр</string>
+    <string name="unit_area_square_centimeter">Квадратний Сантиметр</string>
+    <string name="unit_area_square_millimeter">Квадратний Міліметр</string>
+    <string name="unit_area_square_mile">Квадратна Миля</string>
+    <string name="unit_area_square_yard">Квадратний Ярд</string>
+    <string name="unit_area_square_foot">Квадратний Фут</string>
+    <string name="unit_area_square_inch">Квадратний Дюйм</string>
     <string name="unit_area_acre">Acre</string>
-    <string name="unit_area_hectare">Hectare</string>
+    <string name="unit_area_hectare">Гектар</string>
     <string name="unit_volume">Volume</string>
-    <string name="unit_volume_cubic_meter">Cubic Meter</string>
+    <string name="unit_volume_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>
@@ -103,4 +103,4 @@
         Haven't found some strings? There's more at
         https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
     -->
-</resources>
+</resources>
\ No newline at end of file
diff --git a/fastlane/metadata/android/sv-SE/full_description.txt b/fastlane/metadata/android/sv-SE/full_description.txt
index 592ab985..f72214f8 100644
--- a/fastlane/metadata/android/sv-SE/full_description.txt
+++ b/fastlane/metadata/android/sv-SE/full_description.txt
@@ -1,12 +1,28 @@
-Appen har ingen enhetsomvandlare. Du kan kopiera resultat och formler till Urklipp genom att trycka länge på dem.
+Denna eleganta moderna kalkylator erbjuder en fantastisk användarupplevelse som du kommer att älska att se. Du kan kopiera resultatet eller formeln till urklipp genom att trycka länge på den. Du kan också använda den här kalkylatorn som en valutaomvandlare för att beräkna din dagliga inkomst och andra belopp i olika länders valuta. Med ett lugnande mörkt tema för ögonen är det nu lätt för dig att se knappar och siffror lättare och använda denna kalkylator för enkla beräkningar eller använda den som en valutaomvandlare. Du kan också använda den här matematikkalkylatorn som en bolånekalkylator.
 
-Du kan anpassa widgetens textfärg, bakgrundsfärg och bakgrundsgenomskinlighet. Tryck på resultatet eller formeln i widgeten för att öppna appen.
+Appen är en enkel hjälpreda för snabba beräkningar med många grundläggande funktioner inklusive multiplicera, dividera, rot och potenser. Den kommer också med mörkt tema så att du kan använda den här nya tekniken för att få din miniräknare att se smidigare och mer lättanvänd ut istället för att använda skarpa färger i olika miniräknare som inte kan hjälpa dig att koncentrera dig på dina komplexa beräkningar i den här matematikkalkylatorn.
 
-Den levereras med Material Design och mörkt tema som standard, och ger en bra användarupplevelse för enkel användning. Avsaknaden av internetåtkomst ger dig mer integritet, säkerhet och stabilitet än andra appar.
+Du kan få den att vibrera när du trycker på knapparna för att göra dig säker när du lägger in dina värden. De utsökta färgerna som används i den här appen är coola och ser mjuka ut för ögonen så att du enkelt kan skilja mellan alla knappar och beräkna med lätthet. Denna kalkylator kan användas för att lösa komplexa rotproblem eller den kan också användas som valutaomvandlare eller grafräknare.
 
-Innehåller ingen reklam eller onödiga behörigheter. Den har helt öppen källkod och anpassningsbara färger.
+Det finns ett alternativ i inställningen för att förhindra att telefonen sover medan du använder appen för bekväm användning.
 
-Kolla in hela uppsättningen Simple Tools här:
+Textfärgen på widgeten som kan ändras storlek kan anpassas, såväl som bakgrundens färg och alfa. Tryck på resultatet eller formeln i widgeten för att öppna appen.
+
+Du kan komma åt en historik över operationerna för att snabbt skanna igenom de senaste beräkningarna.
+
+Den kommer med materialdesign och mörkt tema som standard, vilket ger en fantastisk användarupplevelse för enkel användning. Bristen på internetåtkomst ger dig mer integritet, säkerhet och stabilitet än andra appar.
+
+Innehåller inga annonser eller onödiga behörigheter. Det är helt öppen källkod, ger anpassningsbara färger.
+
+Funktioner:
+- Lätt att använda miniräknare.
+- Operationshistorik.
+- Kommer med mörkt tema för att möjliggöra smidig användning av miniräknaren.
+- Fungerar som valutaomvandlare för att hjälpa dig att beräkna dina inkomster och andra belopp.
+- Anpassningsbar textfärg för att få den att se coolare ut och efter dina behov.
+- Knappar storleksanpassade enligt genomsnittligt fingertryck på skärmen för att göra beräkningarna bekvämare.
+
+Kolla in hela sviten av enkla verktyg här:
 https://www.simplemobiletools.com
 
 Facebook:
diff --git a/fastlane/metadata/android/sv-SE/title.txt b/fastlane/metadata/android/sv-SE/title.txt
index c28c3cdb..0d9e70c0 100644
--- a/fastlane/metadata/android/sv-SE/title.txt
+++ b/fastlane/metadata/android/sv-SE/title.txt
@@ -1 +1 @@
-Simpel kalkylator
+Simple Calculator