diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 8a4878cf..53924012 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Simple Calculator</string>
     <string name="app_launcher_name">Calculadora</string>
     <string name="scientific_calculator">Calculadora científica</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Convertidor d\'unitats</string>
+    <string name="swap_units">Intercanvia les unitats</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: divisió per zero</string>
     <!-- History -->
@@ -16,86 +16,86 @@
     <string name="vibrate_on_button_press">Vibra en prémer els botons</string>
     <string name="use_comma_as_decimal_mark">Utilitza la coma com a marca decimal</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">Longitud</string>
+    <string name="unit_length_kilometer">Quilòmetre</string>
+    <string name="unit_length_meter">Metre</string>
+    <string name="unit_length_centimeter">Centímetre</string>
+    <string name="unit_length_millimeter">Mil·límetre</string>
+    <string name="unit_length_micrometer">Micròmetre</string>
+    <string name="unit_length_nanometer">Nanòmetre</string>
+    <string name="unit_length_angstrom">Àngstrom</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_foot">Peu</string>
+    <string name="unit_length_inch">Polzada</string>
+    <string name="unit_length_fathom">Braça</string>
+    <string name="unit_length_nautical_mile">Milla nàutica</string>
+    <string name="unit_length_astronomical_unit">Unitat astronòmica</string>
     <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</string>
+    <string name="unit_length_light_year">Any llum</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">Quilòmetre quadrat</string>
+    <string name="unit_area_square_meter">Metre quadrat</string>
+    <string name="unit_area_square_centimeter">Centímetre quadrat</string>
+    <string name="unit_area_square_millimeter">Mil·límetre quadrat</string>
+    <string name="unit_area_square_mile">Milla quadrada</string>
+    <string name="unit_area_square_yard">Iarda quadrada</string>
+    <string name="unit_area_square_foot">Peu quadrat</string>
+    <string name="unit_area_square_inch">Polzada quadrada</string>
     <string name="unit_area_acre">Acre</string>
-    <string name="unit_area_hectare">Hectare</string>
+    <string name="unit_area_hectare">Hectàrea</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_cubic_meter">Metre cúbic</string>
+    <string name="unit_volume_cubic_decimeter">Decímetre cúbic</string>
+    <string name="unit_volume_cubic_centimeter">Centímetre cúbic</string>
+    <string name="unit_volume_cubic_millimeter">Mil·límetre cúbic</string>
+    <string name="unit_volume_liter">Litre</string>
+    <string name="unit_volume_centiliter">Centilitre</string>
+    <string name="unit_volume_deciliter">Decilitre</string>
+    <string name="unit_volume_milliliter">Mil·lilitre</string>
+    <string name="unit_volume_acre_foot">Acre peu</string>
+    <string name="unit_volume_cubic_foot">Peu cúbic</string>
+    <string name="unit_volume_cubic_inch">Polzada cúbica</string>
+    <string name="unit_volume_barrel_us">Barril (EUA)</string>
+    <string name="unit_volume_gallon_us">Galó (EUA)</string>
+    <string name="unit_volume_quart_us">Quart (EUA)</string>
+    <string name="unit_volume_pint_us">Pinta (EUA)</string>
+    <string name="unit_volume_gill_us">Gill (EUA)</string>
+    <string name="unit_volume_fluid_ounce_us">Unça fluida (EUA)</string>
+    <string name="unit_volume_barrel_imperial">Barril (Imperial)</string>
+    <string name="unit_volume_gallon_imperial">Galó (Imperial)</string>
     <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
-    <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
+    <string name="unit_volume_pint_imperial">Pinta (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_volume_fluid_ounce_imperial">Unça fluida (Imperial)</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_kilogram">Quilogram</string>
+    <string name="unit_mass_milligram">Mil·ligram</string>
     <string name="unit_mass_microgram">Microgram</string>
-    <string name="unit_mass_tonne">Tonne</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_tonne">Tona</string>
+    <string name="unit_mass_pound">Lliura</string>
+    <string name="unit_mass_ounce">Unça</string>
+    <string name="unit_mass_grain">Gra</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">Pedra</string>
+    <string name="unit_mass_long_ton">Tona llarga</string>
+    <string name="unit_mass_short_ton">Tona curta</string>
+    <string name="unit_mass_carat">Quirat</string>
+    <string name="unit_mass_carat_metric">Quirat (Mètric)</string>
+    <string name="unit_temperature">Temperatura</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">Temps</string>
+    <string name="unit_time_hour">Hora</string>
+    <string name="unit_time_minute">Minut</string>
+    <string name="unit_time_second">Segon</string>
+    <string name="unit_time_millisecond">Microsegon</string>
+    <string name="unit_time_day">Dia</string>
+    <string name="unit_time_week">Setmana</string>
+    <string name="unit_time_year">Any</string>
     <!-- FAQ -->
     <string name="faq_1_title">Com funciona el botó C (Esborra)\?</string>
     <string name="faq_1_text">En tocar-lo, s\'eliminarà un caràcter a la vegada. Si el premeu prolongadament, es reiniciaran tots els camps de cop.</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-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 808e2fc4..8b4539b4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Schlichter Rechner</string>
     <string name="app_launcher_name">Rechner</string>ng&gt;
     <string name="scientific_calculator">Wissenschaftlicher Rechner</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Einheitenumrechner</string>
+    <string name="swap_units">Einheiten tauschen</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fehler: Division durch Null</string>
     <!-- History -->
@@ -16,86 +16,86 @@
     <string name="vibrate_on_button_press">Bei Tastendruck vibrieren</string>
     <string name="use_comma_as_decimal_mark">Komma als Dezimaltrennzeichen verwenden</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
+    <string name="unit_length">Länge</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_centimeter">Zentimeter</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_angstrom">Ångström</string>
+    <string name="unit_length_mile">Meile</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_foot">Fuß</string>
+    <string name="unit_length_inch">Zoll</string>
+    <string name="unit_length_fathom">Nautischer Faden</string>
+    <string name="unit_length_nautical_mile">Nautische Meile</string>
+    <string name="unit_length_astronomical_unit">Astronomische Einheit</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">Lichtjahr</string>
+    <string name="unit_area">Fläche</string>
+    <string name="unit_area_square_kilometer">Quadratkilometer</string>
+    <string name="unit_area_square_meter">Quadratmeter</string>
+    <string name="unit_area_square_centimeter">Quadratzentimeter</string>
+    <string name="unit_area_square_millimeter">Quadratmillimeter</string>
+    <string name="unit_area_square_mile">Quadratmeile</string>
+    <string name="unit_area_square_yard">Quadratyard</string>
+    <string name="unit_area_square_foot">Quadratfuß</string>
+    <string name="unit_area_square_inch">Quadratzoll</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_hectare">Hektar</string>
+    <string name="unit_volume">Volumen</string>
+    <string name="unit_volume_cubic_meter">Kubikmeter</string>
+    <string name="unit_volume_cubic_decimeter">Kubikdezimeter</string>
+    <string name="unit_volume_cubic_centimeter">Kubikzentimeter</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_centiliter">Zentiliter</string>
+    <string name="unit_volume_deciliter">Deziliter</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_acre_foot">Acre-foot</string>
+    <string name="unit_volume_cubic_foot">Kubikfuß</string>
+    <string name="unit_volume_cubic_inch">Kubikzoll</string>
     <string name="unit_volume_barrel_us">Barrel (US)</string>
-    <string name="unit_volume_gallon_us">Gallon (US)</string>
+    <string name="unit_volume_gallon_us">Gallone (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_fluid_ounce_us">Flüssigunze (US)</string>
     <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
-    <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
+    <string name="unit_volume_gallon_imperial">Gallone (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_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_volume_fluid_ounce_imperial">Flüssigunze (Imperial)</string>
+    <string name="unit_mass">Masse</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">Tonne</string>
-    <string name="unit_mass_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</string>
+    <string name="unit_mass_pound">Pfund</string>
+    <string name="unit_mass_ounce">Unze</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_temperature_celsius">Celsius</string>
-    <string name="unit_temperature_fahrenheit">Fahrenheit</string>
-    <string name="unit_temperature_rankine">Rankine</string>
+    <string name="unit_mass_long_ton">Britische Tonne</string>
+    <string name="unit_mass_short_ton">Amerikanische Tonne</string>
+    <string name="unit_mass_carat">Karat</string>
+    <string name="unit_mass_carat_metric">Karat (Metrisch)</string>
+    <string name="unit_temperature">Temperatur</string>
+    <string name="unit_temperature_celsius">Grad Celsius</string>
+    <string name="unit_temperature_fahrenheit">Grad Fahrenheit</string>
+    <string name="unit_temperature_rankine">Grad 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">Zeit</string>
+    <string name="unit_time_hour">Stunde</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_second">Sekunde</string>
+    <string name="unit_time_millisecond">Mikrosekunde</string>
+    <string name="unit_time_day">Tag</string>
+    <string name="unit_time_week">Woche</string>
+    <string name="unit_time_year">Jahr</string>
     <!-- FAQ -->
     <string name="faq_1_title">Wie funktioniert die C-Taste (Löschen)\?</string>
     <string name="faq_1_text">Bei einmaliger Berührung wird ein Zeichen entfernt. Bei langer Berührung werden alle Felder zurück gesetzt.</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-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 62ef147a..9ae70866 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Eenvoudige Rekenmachine</string>
     <string name="app_launcher_name">Rekenmachine</string>
     <string name="scientific_calculator">Wetenschappelijke Rekenmachine</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Eenheden omzetten</string>
+    <string name="swap_units">Omwisselen</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Fout: delen door nul</string>
     <!-- History -->
@@ -16,7 +16,7 @@
     <string name="vibrate_on_button_press">Trillen bij het indrukken van toetsen</string>
     <string name="use_comma_as_decimal_mark">Komma als decimaalteken gebruiken</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
+    <string name="unit_length">Lengte</string>
     <string name="unit_length_kilometer">Kilometer</string>
     <string name="unit_length_meter">Meter</string>
     <string name="unit_length_centimeter">Centimeter</string>
@@ -24,78 +24,78 @@
     <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_mile">Mijl</string>
     <string name="unit_length_yard">Yard</string>
-    <string name="unit_length_foot">Foot</string>
+    <string name="unit_length_foot">Voet</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_fathom">Vadem</string>
+    <string name="unit_length_nautical_mile">Zeemijl</string>
+    <string name="unit_length_astronomical_unit">Astronomische eenheid</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">Lichtjaar</string>
+    <string name="unit_area">Oppervlakte</string>
+    <string name="unit_area_square_kilometer">Vierkante kilometer</string>
+    <string name="unit_area_square_meter">Vierkante meter</string>
+    <string name="unit_area_square_centimeter">Vierkante centimeter</string>
+    <string name="unit_area_square_millimeter">Vierkante millimeter</string>
+    <string name="unit_area_square_mile">Vierkante mijl</string>
+    <string name="unit_area_square_yard">Vierkante yard</string>
+    <string name="unit_area_square_foot">Vierkante voet</string>
+    <string name="unit_area_square_inch">Vierkante 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_volume_cubic_meter">Kubieke meter</string>
+    <string name="unit_volume_cubic_decimeter">Kubieke decimeter</string>
+    <string name="unit_volume_cubic_centimeter">Kubieke centimeter</string>
+    <string name="unit_volume_cubic_millimeter">Kubieke 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_acre_foot">Acre voet</string>
+    <string name="unit_volume_cubic_foot">Kubieke voet</string>
+    <string name="unit_volume_cubic_inch">Kubieke inch</string>
+    <string name="unit_volume_barrel_us">Vat (VS)</string>
+    <string name="unit_volume_gallon_us">Gallon (VS)</string>
+    <string name="unit_volume_quart_us">Quart (VS)</string>
+    <string name="unit_volume_pint_us">Pint (VS)</string>
+    <string name="unit_volume_gill_us">Gill (VS)</string>
+    <string name="unit_volume_fluid_ounce_us">Fluid Ounce (VS)</string>
+    <string name="unit_volume_barrel_imperial">Vat (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_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_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</string>
-    <string name="unit_mass_grain">Grain</string>
+    <string name="unit_mass_tonne">Ton</string>
+    <string name="unit_mass_pound">Pond</string>
+    <string name="unit_mass_ounce">Ons</string>
+    <string name="unit_mass_grain">Grein</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_long_ton">Long ton</string>
+    <string name="unit_mass_short_ton">Short ton</string>
+    <string name="unit_mass_carat">Karaat</string>
+    <string name="unit_mass_carat_metric">Karaat (Metrisch)</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_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">Tijd</string>
+    <string name="unit_time_hour">Uur</string>
+    <string name="unit_time_minute">Minuut</string>
+    <string name="unit_time_second">Seconde</string>
+    <string name="unit_time_millisecond">Microseconde</string>
+    <string name="unit_time_day">Dag</string>
     <string name="unit_time_week">Week</string>
-    <string name="unit_time_year">Year</string>
+    <string name="unit_time_year">Jaar</string>
     <!-- FAQ -->
     <string name="faq_1_title">Hoe werkt de knop C (Clear)\?</string>
     <string name="faq_1_text">Kort indrukken verwijdert één karakter per keer. Lang drukken wist direct alle velden.</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-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8b1946df..41f35798 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Prosty kalkulator</string>
     <string name="app_launcher_name">Kalkulator</string>
     <string name="scientific_calculator">Kalkulator naukowy</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Konwerter jednostek</string>
+    <string name="swap_units">Zamień jednostki</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Błąd: dzielenie przez zero</string>
     <!-- History -->
@@ -16,86 +16,86 @@
     <string name="vibrate_on_button_press">Wibracja przy naciśnięciu przycisku</string>
     <string name="use_comma_as_decimal_mark">Używaj przecinka jako separatora dziesiętnego</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_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_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_length">Długość</string>
+    <string name="unit_length_kilometer">Kilometr</string>
+    <string name="unit_length_meter">Metr</string>
+    <string name="unit_length_centimeter">Centymetr</string>
+    <string name="unit_length_millimeter">Milimetr</string>
+    <string name="unit_length_micrometer">Mikrometr</string>
+    <string name="unit_length_nanometer">Nanometr</string>
+    <string name="unit_length_angstrom">Angstrem</string>
+    <string name="unit_length_mile">Mila</string>
+    <string name="unit_length_yard">Jard</string>
+    <string name="unit_length_foot">Stopa</string>
+    <string name="unit_length_inch">Cal</string>
+    <string name="unit_length_fathom">Sążeń</string>
+    <string name="unit_length_nautical_mile">Mila morska</string>
+    <string name="unit_length_astronomical_unit">Jednostka astronomiczna</string>
+    <string name="unit_length_parsec">Parsek</string>
+    <string name="unit_length_light_year">Rok świetlny</string>
+    <string name="unit_area">Powierzchnia</string>
+    <string name="unit_area_square_kilometer">Kilometr kwadratowy</string>
+    <string name="unit_area_square_meter">Metr kwadratowy</string>
+    <string name="unit_area_square_centimeter">Centymetr kwadratowy</string>
+    <string name="unit_area_square_millimeter">Milimetr kwadratowy</string>
+    <string name="unit_area_square_mile">Mila kwadratowa</string>
+    <string name="unit_area_square_yard">Jard kwadratowy</string>
+    <string name="unit_area_square_foot">Stopa kwadratowa</string>
+    <string name="unit_area_square_inch">Cal kwadratowy</string>
+    <string name="unit_area_acre">Akr</string>
+    <string name="unit_area_hectare">Hektar</string>
+    <string name="unit_volume">Objętość</string>
+    <string name="unit_volume_cubic_meter">Metr sześcienny</string>
+    <string name="unit_volume_cubic_decimeter">Decymetr sześcienny</string>
+    <string name="unit_volume_cubic_centimeter">Centymetr sześcienny</string>
+    <string name="unit_volume_cubic_millimeter">Milimetr sześcienny</string>
+    <string name="unit_volume_liter">Litr</string>
+    <string name="unit_volume_centiliter">Centylitr</string>
+    <string name="unit_volume_deciliter">Decylitr</string>
+    <string name="unit_volume_milliliter">Mililitr</string>
+    <string name="unit_volume_acre_foot">Akrostopa</string>
+    <string name="unit_volume_cubic_foot">Stopa sześcienna</string>
+    <string name="unit_volume_cubic_inch">Cal sześcienny</string>
+    <string name="unit_volume_barrel_us">Baryłka (US)</string>
+    <string name="unit_volume_gallon_us">Galon (US)</string>
+    <string name="unit_volume_quart_us">Kwarta (US)</string>
+    <string name="unit_volume_pint_us">Pinta (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_mass">Mass</string>
+    <string name="unit_volume_fluid_ounce_us">Uncja cieczy (US)</string>
+    <string name="unit_volume_barrel_imperial">Baryłka (imperialna)</string>
+    <string name="unit_volume_gallon_imperial">Galon (imperialny)</string>
+    <string name="unit_volume_quart_imperial">Kwarta (imperialna)</string>
+    <string name="unit_volume_pint_imperial">Pinta (imperialna)</string>
+    <string name="unit_volume_gill_imperial">Gill (imperialny)</string>
+    <string name="unit_volume_fluid_ounce_imperial">Uncja cieczy (imperialna)</string>
+    <string name="unit_mass">Masa</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_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</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_temperature_celsius">Celsius</string>
+    <string name="unit_mass_milligram">Miligram</string>
+    <string name="unit_mass_microgram">Mikrogram</string>
+    <string name="unit_mass_tonne">Tona</string>
+    <string name="unit_mass_pound">Funt</string>
+    <string name="unit_mass_ounce">Uncja</string>
+    <string name="unit_mass_grain">Gran</string>
+    <string name="unit_mass_dram">Drachma</string>
+    <string name="unit_mass_stone">Kamień</string>
+    <string name="unit_mass_long_ton">Tona angielska</string>
+    <string name="unit_mass_short_ton">Tona amerykańska</string>
+    <string name="unit_mass_carat">Karat</string>
+    <string name="unit_mass_carat_metric">Karat (metryczny)</string>
+    <string name="unit_temperature">Temperatura</string>
+    <string name="unit_temperature_celsius">Celsjusz</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_temperature_kelvin">Kelwin</string>
+    <string name="unit_time">Czas</string>
+    <string name="unit_time_hour">Godzina</string>
+    <string name="unit_time_minute">Minuta</string>
+    <string name="unit_time_second">Sekunda</string>
+    <string name="unit_time_millisecond">Mikrosekunda</string>
+    <string name="unit_time_day">Dzień</string>
+    <string name="unit_time_week">Tydzień</string>
+    <string name="unit_time_year">Rok</string>
     <!-- FAQ -->
     <string name="faq_1_title">Jak działa przycisk C (Wyczyść)?</string>
     <string name="faq_1_text">Naciśnięcie go usunie jeden znak naraz. Długie naciśnięcie zresetuje wszystkie pola jednocześnie.</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-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6aef7f95..f46570aa 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,8 +3,8 @@
     <string name="app_name">Basit Hesap Makinesi</string>
     <string name="app_launcher_name">Hesap Makinesi</string>
     <string name="scientific_calculator">Bilimsel Hesap Makinesi</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Birim dönüştürücü</string>
+    <string name="swap_units">Birimleri değiştir</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Hata: sıfıra bölme</string>
     <!-- History -->
@@ -16,86 +16,86 @@
     <string name="vibrate_on_button_press">Düğmeye basıldığında titret</string>
     <string name="use_comma_as_decimal_mark">Ondalık işareti olarak virgül kullan</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">Uzunluk</string>
+    <string name="unit_length_kilometer">Kilometre</string>
+    <string name="unit_length_meter">Metre</string>
+    <string name="unit_length_centimeter">Santimetre</string>
+    <string name="unit_length_millimeter">Milimetre</string>
+    <string name="unit_length_micrometer">Mikrometre</string>
+    <string name="unit_length_nanometer">Nanometre</string>
+    <string name="unit_length_angstrom">Angströ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_inch">İnç</string>
+    <string name="unit_length_fathom">Kulaç</string>
+    <string name="unit_length_nautical_mile">Deniz Mili</string>
+    <string name="unit_length_astronomical_unit">Astronomik Birim</string>
+    <string name="unit_length_parsec">Parsek</string>
+    <string name="unit_length_light_year">Işık Yılı</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">Kilometrekare</string>
+    <string name="unit_area_square_meter">Metrekare</string>
+    <string name="unit_area_square_centimeter">Santimetrekare</string>
+    <string name="unit_area_square_millimeter">Milimetrekare</string>
+    <string name="unit_area_square_mile">Milkare</string>
+    <string name="unit_area_square_yard">Yard kare</string>
+    <string name="unit_area_square_foot">Foot kare</string>
+    <string name="unit_area_square_inch">İnç kare</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_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_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_volume_cubic_meter">Metreküp</string>
+    <string name="unit_volume_cubic_decimeter">Desimetreküp</string>
+    <string name="unit_volume_cubic_centimeter">Santimetreküp</string>
+    <string name="unit_volume_cubic_millimeter">Milimetreküp</string>
+    <string name="unit_volume_liter">Litre</string>
+    <string name="unit_volume_centiliter">Santilitre</string>
+    <string name="unit_volume_deciliter">Desilitre</string>
+    <string name="unit_volume_milliliter">Mililitre</string>
+    <string name="unit_volume_acre_foot">Foot Dönüm</string>
+    <string name="unit_volume_cubic_foot">Foot Küp</string>
+    <string name="unit_volume_cubic_inch">İnç Küp</string>
+    <string name="unit_volume_barrel_us">Varil (ABD)</string>
+    <string name="unit_volume_gallon_us">Galon (ABD)</string>
+    <string name="unit_volume_quart_us">Quart (ABD)</string>
+    <string name="unit_volume_pint_us">Pint (ABD)</string>
+    <string name="unit_volume_gill_us">Gill (ABD)</string>
+    <string name="unit_volume_fluid_ounce_us">Sıvı Ons (ABD)</string>
+    <string name="unit_volume_barrel_imperial">Varil (İngiliz)</string>
+    <string name="unit_volume_gallon_imperial">Galon (İngiliz)</string>
+    <string name="unit_volume_quart_imperial">Quart (İngiliz)</string>
+    <string name="unit_volume_pint_imperial">Pint (İngiliz)</string>
+    <string name="unit_volume_gill_imperial">Gill (İngiliz)</string>
+    <string name="unit_volume_fluid_ounce_imperial">Sıvı Ons (İngiliz)</string>
+    <string name="unit_mass">Kütle</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_milligram">Miligram</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">Ons</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_temperature_celsius">Celsius</string>
-    <string name="unit_temperature_fahrenheit">Fahrenheit</string>
+    <string name="unit_mass_long_ton">Uzun Ton</string>
+    <string name="unit_mass_short_ton">Kısa Ton</string>
+    <string name="unit_mass_carat">Karat</string>
+    <string name="unit_mass_carat_metric">Karat (Metrik)</string>
+    <string name="unit_temperature">Sıcaklık</string>
+    <string name="unit_temperature_celsius">Santigrat</string>
+    <string name="unit_temperature_fahrenheit">Fahrenhayt</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">Zaman</string>
+    <string name="unit_time_hour">Saat</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">Saniye</string>
+    <string name="unit_time_millisecond">Mikrosaniye</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">Hafta</string>
+    <string name="unit_time_year">Yıl</string>
     <!-- FAQ -->
     <string name="faq_1_title">C (Temizle) düğmesi nasıl çalışır?</string>
     <string name="faq_1_text">Üzerine dokunmak, bir seferde bir karakteri kaldıracaktır. Uzun basma, tüm alanları bir kerede sıfırlayacaktır.</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-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index c0a73890..b43a113a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/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,86 +16,86 @@
     <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_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_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_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_volume_cubic_meter">立方米</string>
+    <string name="unit_volume_cubic_decimeter">立方分米</string>
+    <string name="unit_volume_cubic_centimeter">立方厘米</string>
+    <string name="unit_volume_cubic_millimeter">立方毫米</string>
+    <string name="unit_volume_liter">升</string>
+    <string name="unit_volume_centiliter">厘升</string>
+    <string name="unit_volume_deciliter">分升</string>
+    <string name="unit_volume_milliliter">毫升</string>
+    <string name="unit_volume_acre_foot">英亩-英尺</string>
+    <string name="unit_volume_cubic_foot">立方英尺</string>
+    <string name="unit_volume_cubic_inch">立方英寸</string>
+    <string name="unit_volume_barrel_us">桶 （美制）</string>
+    <string name="unit_volume_gallon_us">加仑（美制）</string>
+    <string name="unit_volume_quart_us">夸脱（美制）</string>
+    <string name="unit_volume_pint_us">品脱（美制）</string>
+    <string name="unit_volume_gill_us">及耳（美制）</string>
+    <string name="unit_volume_fluid_ounce_us">液量盎司（美制）</string>
+    <string name="unit_volume_barrel_imperial">桶 （英制）</string>
+    <string name="unit_volume_gallon_imperial">加仑（英制）</string>
+    <string name="unit_volume_quart_imperial">夸脱（英制）</string>
+    <string name="unit_volume_pint_imperial">品脱（英制）</string>
+    <string name="unit_volume_gill_imperial">及耳（英制）</string>
+    <string name="unit_volume_fluid_ounce_imperial">液量盎司（英制）</string>
+    <string name="unit_mass">摩尔质量</string>
+    <string name="unit_mass_gram">克</string>
+    <string name="unit_mass_kilogram">千克</string>
+    <string name="unit_mass_milligram">毫克</string>
+    <string name="unit_mass_microgram">微克</string>
+    <string name="unit_mass_tonne">公吨</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">盎司</string>
+    <string name="unit_mass_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_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_mass_stone">英石</string>
+    <string name="unit_mass_long_ton">长吨</string>
+    <string name="unit_mass_short_ton">短吨</string>
+    <string name="unit_mass_carat">克拉</string>
+    <string name="unit_mass_carat_metric">克拉（公制）</string>
+    <string name="unit_temperature">温度</string>
+    <string name="unit_temperature_celsius">摄氏度</string>
+    <string name="unit_temperature_fahrenheit">华氏度</string>
+    <string name="unit_temperature_rankine">兰金刻度</string>
+    <string name="unit_temperature_kelvin">开尔文</string>
+    <string name="unit_time">时间</string>
+    <string name="unit_time_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_second">秒</string>
+    <string name="unit_time_millisecond">微秒</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">周</string>
+    <string name="unit_time_year">年</string>
     <!-- FAQ -->
     <string name="faq_1_title">如何使用 C (清除) 按钮？</string>
     <string name="faq_1_text">点按它一次删除一个字母。长按它将立即重置所有字段。</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