diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index 594493e7..2cc9922f 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -1,97 +1,111 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="unit_temperature_celsius">Celsius</string>
-    <string name="unit_length_mile">Mile</string>
-    <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_inch">Inch</string>
-    <string name="unit_area_square_centimeter">Square Centimeter</string>
-    <string name="unit_length_foot">Foot</string>
-    <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
-    <string name="unit_volume_cubic_meter">Cubic Meter</string>
-    <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
-    <string name="unit_time_minute">ମିନିଟ୍</string>
-    <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
-    <string name="unit_length_kilometer">Kilometer</string>
+    <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>
-    <string name="unit_temperature_kelvin">Kelvin</string>
-    <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_centimeter">Cubic Centimeter</string>
-    <string name="unit_mass_dram">Dram</string>
-    <string name="unit_mass_milligram">Milligram</string>
-    <string name="unit_time_week">Week</string>
-    <string name="unit_mass_pound">Pound</string>
-    <string name="unit_mass_grain">Grain</string>
-    <string name="unit_time_day">Day</string>
-    <string name="unit_volume_centiliter">Centiliter</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_area_square_kilometer">Square Kilometer</string>
-    <string name="unit_mass_carat">Carat</string>
-    <string name="unit_length_centimeter">Centimeter</string>
-    <string name="unit_area_hectare">Hectare</string>
-    <string name="unit_mass_tonne">Tonne</string>
-    <string name="unit_area_square_inch">Square Inch</string>
-    <string name="unit_area_square_meter">Square Meter</string>
-    <string name="unit_volume">କ୍ଷେତ୍ରଫଳ</string>
-    <string name="unit_volume_barrel_us">Barrel (US)</string>
-    <string name="unit_area_acre">Acre</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>
-    <string name="unit_time">ସମୟ</string>
-    <string name="unit_mass_microgram">Microgram</string>
-    <string name="unit_volume_cubic_millimeter">Cubic Millimeter</string>
-    <string name="unit_time_hour">ଘଣ୍ଟା</string>
-    <string name="unit_length_meter">Meter</string>
-    <string name="app_launcher_name">Calculator</string>
-    <string name="history_empty">History is empty</string>
-    <string name="unit_mass_stone">Stone</string>
-    <string name="unit_length_micrometer">Micrometer</string>
-    <string name="unit_volume_cubic_foot">Cubic Foot</string>
-    <string name="unit_volume_deciliter">Deciliter</string>
-    <string name="unit_mass_long_ton">Long Ton</string>
-    <string name="unit_mass_ounce">Ounce</string>
-    <string name="unit_volume_quart_us">Quart (US)</string>
-    <string name="unit_mass_carat_metric">Carat (Metric)</string>
-    <string name="history_cleared">History has been cleared</string>
-    <string name="unit_length_nanometer">Nanometer</string>
-    <string name="unit_volume_cubic_inch">Cubic Inch</string>
-    <string name="unit_temperature_rankine">Rankine</string>
-    <string name="unit_time_second">ସେକେଣ୍ଡ</string>
-    <string name="unit_area_square_yard">Square Yard</string>
-    <string name="unit_area_square_mile">Square Mile</string>
-    <string name="scientific_calculator">Scientific Calculator</string>
-    <string name="unit_time_millisecond">Microsecond</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="unit_mass_short_ton">Short Ton</string>
-    <string name="unit_length_millimeter">Millimeter</string>
-    <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_length_fathom">Fathom</string>
-    <string name="history">History</string>
-    <string name="unit_temperature">ତାପମାତ୍ରା</string>
-    <string name="faq_1_title">How does the C (Clear) button work\?</string>
-    <string name="unit_volume_gallon_us">Gallon (US)</string>
-    <string name="unit_length_nautical_mile">Nautical Mile</string>
-    <string name="unit_volume_milliliter">Milliliter</string>
-    <string name="unit_temperature_fahrenheit">Fahrenheit</string>
-    <string name="unit_volume_pint_us">Pint (US)</string>
-    <string name="unit_area_square_millimeter">Square Millimeter</string>
-    <string name="unit_volume_liter">Liter</string>
-    <string name="unit_volume_cubic_decimeter">Cubic Decimeter</string>
-    <string name="unit_length_angstrom">Angstrom</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_length_yard">Yard</string>
-    <string name="unit_length_light_year">Light Year</string>
-    <string name="unit_length">ଦୈର୍ଘ୍ୟ</string>
-    <string name="unit_area_square_foot">Square Foot</string>
-    <string name="unit_time_year">Year</string>
-    <string name="app_name">Simple Calculator</string>
-    <string name="unit_area">କ୍ଷେତ୍ରଫଳ</string>
-    <string name="unit_length_astronomical_unit">Astronomical Unit</string>
-    <string name="swap_units">Swap units</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
-    <string name="use_comma_as_decimal_mark">Use comma as a decimal mark</string>
-    <string name="unit_mass">ଵସ୍ତୁତ୍ୱ</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="vibrate_on_button_press">Vibrate on button press</string>
-</resources>
\ No newline at end of file
+    <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>