diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index f08344ae..643c0d70 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/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">Conversor de unidades</string>
+    <string name="swap_units">Cambiar unidades</string>
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Error: división por cero</string>
     <!-- History -->
@@ -16,86 +16,86 @@
     <string name="vibrate_on_button_press">Vibrar al presionar un botón</string>
     <string name="use_comma_as_decimal_mark">Usar una coma como 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">Kilómetros</string>
+    <string name="unit_length_meter">Metro</string>
+    <string name="unit_length_centimeter">Centímetro</string>
+    <string name="unit_length_millimeter">Milímetro</string>
+    <string name="unit_length_micrometer">Micrómetro</string>
+    <string name="unit_length_nanometer">Nanómetro</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_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</string>
+    <string name="unit_length_foot">Pie</string>
+    <string name="unit_length_inch">Pulgada</string>
+    <string name="unit_length_fathom">Braza inglesa</string>
+    <string name="unit_length_nautical_mile">Millas Náuticas</string>
+    <string name="unit_length_astronomical_unit">Unidad astronómica</string>
+    <string name="unit_length_parsec">Pársec</string>
+    <string name="unit_length_light_year">Año Luz</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">Kilómetro cuadrado</string>
+    <string name="unit_area_square_meter">Metro cuadrado</string>
+    <string name="unit_area_square_centimeter">Centímetro cuadrado</string>
+    <string name="unit_area_square_millimeter">Milímetro cuadrado</string>
+    <string name="unit_area_square_mile">Milla cuadrada</string>
+    <string name="unit_area_square_yard">Yarda cuadrada</string>
+    <string name="unit_area_square_foot">Pie cuadrado</string>
+    <string name="unit_area_square_inch">Pulgada cuadrada</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_quart_imperial">Quart (Imperial)</string>
-    <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
+    <string name="unit_volume_cubic_meter">Metro cúbico</string>
+    <string name="unit_volume_cubic_decimeter">Decímetro cúbico</string>
+    <string name="unit_volume_cubic_centimeter">Centímetro cúbico</string>
+    <string name="unit_volume_cubic_millimeter">Milímetro cúbico</string>
+    <string name="unit_volume_liter">Litro</string>
+    <string name="unit_volume_centiliter">Centilitro</string>
+    <string name="unit_volume_deciliter">Decilitro</string>
+    <string name="unit_volume_milliliter">Mililitro</string>
+    <string name="unit_volume_acre_foot">Acres</string>
+    <string name="unit_volume_cubic_foot">Pie cúbico</string>
+    <string name="unit_volume_cubic_inch">Pulgada cúbica</string>
+    <string name="unit_volume_barrel_us">Barril (EE.UU.)</string>
+    <string name="unit_volume_gallon_us">Galón (EE.UU.)</string>
+    <string name="unit_volume_quart_us">Cuarto de galón (EE.UU.)</string>
+    <string name="unit_volume_pint_us">Pinta (EE.UU.)</string>
+    <string name="unit_volume_gill_us">Gill (EE.UU.)</string>
+    <string name="unit_volume_fluid_ounce_us">Onza líquida (EE.UU.)</string>
+    <string name="unit_volume_barrel_imperial">Barril (Imperial)</string>
+    <string name="unit_volume_gallon_imperial">Galón (Imperial)</string>
+    <string name="unit_volume_quart_imperial">Cuarto de galón (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_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_fluid_ounce_imperial">Onza líquida (Imperial)</string>
+    <string name="unit_mass">Masa</string>
+    <string name="unit_mass_gram">Gramo</string>
+    <string name="unit_mass_kilogram">Kilogramo</string>
+    <string name="unit_mass_milligram">Miligramo</string>
+    <string name="unit_mass_microgram">Microgramo</string>
+    <string name="unit_mass_tonne">Tonelada</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">Onza</string>
+    <string name="unit_mass_grain">Grano</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">Piedra</string>
+    <string name="unit_mass_long_ton">Tonelada larga</string>
+    <string name="unit_mass_short_ton">Tonelada corta</string>
+    <string name="unit_mass_carat">Quilate</string>
+    <string name="unit_mass_carat_metric">Quilate (sistema métrico)</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">Tiempo</string>
+    <string name="unit_time_hour">Hora</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">Segundo</string>
+    <string name="unit_time_millisecond">Microsegundo</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">Semana</string>
+    <string name="unit_time_year">Año</string>
     <!-- FAQ -->
     <string name="faq_1_title">¿Cómo funciona el botón C (Borrar)\?</string>
     <string name="faq_1_text">Presionándolo una vez eliminará un solo carácter. Mantenerlo presionado reiniciará todos los campos.</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-et/strings.xml b/app/src/main/res/values-et/strings.xml
index bccf69e2..56749f20 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -16,13 +16,13 @@
     <string name="vibrate_on_button_press">Nupuvajutusel vibreeri</string>
     <string name="use_comma_as_decimal_mark">Kasutage koma kui kümnendmärki</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">Pikkus</string>
+    <string name="unit_length_kilometer">Kilomeeter</string>
+    <string name="unit_length_meter">Meeter</string>
+    <string name="unit_length_centimeter">Sentimeeter</string>
+    <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_mile">Mile</string>
     <string name="unit_length_yard">Yard</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-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 44504cc5..7194f504 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -13,7 +13,7 @@
     <string name="clear_history">Effacer</string>
     <string name="history_cleared">L\'historique a été effacé</string>
     <!-- Settings -->
-    <string name="vibrate_on_button_press">Vibrer lors de l\'appui sur les touches</string>
+    <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>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
new file mode 100644
index 00000000..2cc9922f
--- /dev/null
+++ b/app/src/main/res/values-or/strings.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Simple Calculator</string>
+    <string name="app_launcher_name">Calculator</string>
+    <string name="scientific_calculator">Scientific Calculator</string>
+    <string name="unit_converter">Unit converter</string>
+    <string name="swap_units">Swap units</string>
+
+    <!-- Calculator field -->
+    <string name="formula_divide_by_zero_error">Error: division by zero</string>
+
+    <!-- History -->
+    <string name="history">History</string>
+    <string name="history_empty">History is empty</string>
+    <string name="clear_history">Clear</string>
+    <string name="history_cleared">History has been cleared</string>
+
+    <!-- Settings -->
+    <string name="vibrate_on_button_press">Vibrate on button press</string>
+    <string name="use_comma_as_decimal_mark">Use comma as a 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_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_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_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_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>
+
+    <!-- FAQ -->
+    <string name="faq_1_title">How does the C (Clear) button work?</string>
+    <string name="faq_1_text">Tapping on it will remove one character at a time. Long pressing it will reset all fields at once.</string>
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e45190f0..8916b6e5 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/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
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index bd82d37d..3566f733 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/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 -->
@@ -14,88 +14,88 @@
     <string name="history_cleared">歷史紀錄已被清除</string>
     <!-- Settings -->
     <string name="vibrate_on_button_press">按下按鈕時震動</string>
-    <string name="use_comma_as_decimal_mark">Use comma as a decimal mark</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_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_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_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_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_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">英里</string>
+    <string name="unit_length_yard">碼</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">面積</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">英畝</string>
+    <string name="unit_area_hectare">公頃</string>
+    <string name="unit_volume">體積</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">磅</string>
+    <string name="unit_mass_ounce">盎司</string>
+    <string name="unit_mass_grain">格林</string>
+    <string name="unit_mass_dram">打蘭</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">分鐘</string>
+    <string name="unit_time_second">秒</string>
+    <string name="unit_time_millisecond">微秒</string>
+    <string name="unit_time_day">天</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
diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
index 796dca33..719d7c63 100644
--- a/fastlane/metadata/android/fr-FR/full_description.txt
+++ b/fastlane/metadata/android/fr-FR/full_description.txt
@@ -12,7 +12,7 @@ Vous avez accès à un historique des opérations pour parcourir rapidement les
 
 L'application est livrée avec une conception matérielle et un thème sombre par défaut, vous offrant une excellente expérience utilisateur et une utilisation simple. L'absence d'accès à Internet vous offre davantage de confidentialité, de sécurité et de stabilité, en comparaison des autres applications.
 
-Ne contient aucune publicité ni autorisation inutile. Le code source de l'application est entièrement libre. Elle fournit des couleurs personnalisables.
+Ne contient aucune publicité ni autorisation inutile. Le code source de l'application est entièrement ouvert. Elle fournit des couleurs personnalisables.
 
 Caractéristiques :