diff --git a/core/base/src/main/res/values-de/strings.xml b/core/base/src/main/res/values-de/strings.xml
index 9920d049..d0b4b8d8 100644
--- a/core/base/src/main/res/values-de/strings.xml
+++ b/core/base/src/main/res/values-de/strings.xml
@@ -78,6 +78,8 @@ Used in this dialog window. Should be short -->
     <string name="settings_auto">Automatisch</string>
     <string name="settings_calculator_support">Verlaufsansicht</string>
     <string name="settings_clear_cache">Cache leeren</string>
+    <string name="settings_clear_input">Eingabe löschen</string>
+    <string name="settings_clear_input_support">Neuen Ausdruck beginnen, wenn \"=\" und eine beliebige Taste gedrückt wird.</string>
     <string name="settings_color_scheme">Farbschema</string>
     <string name="settings_color_theme">Farbthema</string>
     <string name="settings_color_theme_support">Farbthema auswählen</string>
@@ -229,31 +231,31 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Zweite kosmische Geschwindigkeit</string>
     <string name="unit_cosmic_velocity_third">Dritte kosmische Geschwindigkeit</string>
     <string name="unit_cubic_centimeter">Kubikzentimeter</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_foot_per_hour">Kubikfuß/Stunde</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/h</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Kubikfuß/Minute</string>
-    <string name="unit_cubic_foot_per_minute_short">ft3/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Kubikfuß/Sekunde</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/s</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/s</string>
     <string name="unit_cubic_kilometer">Kubikkilometer</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Kubikmeter</string>
     <string name="unit_cubic_meter_per_hour">Kubikmeter/Stunde</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/h</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/h</string>
     <string name="unit_cubic_meter_per_minute">Kubikmeter/Minute</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Kubikmeter/Sekunde</string>
-    <string name="unit_cubic_meter_per_second_short">m3/s</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_per_second_short">m³/s</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Kubikmillimeter</string>
     <string name="unit_cubic_millimeter_per_hour">Kubikmillimeter/Stunde</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
     <string name="unit_cubic_millimeter_per_minute">Kubikmillimeter/Minute</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Kubikmillimeter/Sekunde</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/s</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Dirham der Vereinigten Arabischen Emirate</string>
     <string name="unit_currency_afn">Afghanischer Afghani</string>
@@ -511,13 +513,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Gallone/Sekunde (US)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
     <string name="unit_gallon_uk_per_100_mile">Gallone/100 Meilen (UK)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_uk_per_mile">Gallone/Meile (UK)</string>
-    <string name="unit_gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
     <string name="unit_gallon_us_per_100_mile">Gallone/100 Meilen (US)</string>
-    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_us_per_mile">Gallone/Meile (US)</string>
-    <string name="unit_gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
     <string name="unit_gibibit">Gibibit</string>
     <string name="unit_gibibit_per_second">Gibibit/Sekunde</string>
     <string name="unit_gibibit_per_second_short">Gib/s</string>
@@ -591,19 +593,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Stunde</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Imperiale Tasse</string>
-    <string name="unit_imperial_cup_short">cup (UK)</string>
+    <string name="unit_imperial_cup_short">cup</string>
     <string name="unit_imperial_fluid_ounce">Imperiale Flüssigunze</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">imperiale Gallone</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Imperialer Pint</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Imperialer Quart</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Imperialer Esslöffel</string>
-    <string name="unit_imperial_tablespoon_short">Esslöffel (UK)</string>
+    <string name="unit_imperial_tablespoon_short">Esslöffel</string>
     <string name="unit_imperial_teaspoon">Imperialer Teelöffel</string>
-    <string name="unit_imperial_teaspoon_short">Teelöffel (UK)</string>
+    <string name="unit_imperial_teaspoon_short">Teelöffel</string>
     <string name="unit_imperial_ton">angloamerikanische Tonne</string>
     <string name="unit_imperial_ton_short">T</string>
     <string name="unit_inch">Zoll</string>
@@ -771,11 +773,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Tonne</string>
     <string name="unit_metric_ton_short">t</string>
     <string name="unit_mi_per_gallon_uk">Meile/Gallone (UK)</string>
-    <string name="unit_mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mpg</string>
     <string name="unit_mi_per_gallon_us">Meile/Gallone (US)</string>
-    <string name="unit_mi_per_gallon_us_short">mpg (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
     <string name="unit_mi_us_per_l">Meile/Liter (US)</string>
-    <string name="unit_mi_us_per_l_short">mi/L (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfarad</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Mikrogramm</string>
@@ -1051,19 +1053,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Uranus Gravitation</string>
     <string name="unit_uranus_surface_gravity_short">Uranus g</string>
     <string name="unit_us_fluid_ounce">US-Flüssigunze</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (US)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">US-Tasse</string>
-    <string name="unit_us_legal_cup_short">cup (US)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">US-Flüssiggallone</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">US-Flüssigpint</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">US-Flüssigquart</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">US-Esslöffel</string>
-    <string name="unit_us_tablespoon_short">Esslöffel (US)</string>
+    <string name="unit_us_tablespoon_short">Esslöffel</string>
     <string name="unit_us_teaspoon">US-Teelöffel</string>
-    <string name="unit_us_teaspoon_short">Teelöffel (US)</string>
+    <string name="unit_us_teaspoon_short">Teelöffel</string>
     <string name="unit_velocity_of_light_in_vacuum">Lichtgeschwindigkeit im Vakuum</string>
     <string name="unit_venus_equatorial_radius">Venus Äquatorradius</string>
     <string name="unit_venus_equatorial_radius_short">Venus R</string>
diff --git a/core/base/src/main/res/values-en-rGB/strings.xml b/core/base/src/main/res/values-en-rGB/strings.xml
index 3712c261..10139493 100644
--- a/core/base/src/main/res/values-en-rGB/strings.xml
+++ b/core/base/src/main/res/values-en-rGB/strings.xml
@@ -10,6 +10,7 @@
     <string name="clear_history_label">Clear history</string>
     <string name="clear_input_description">Clear input</string>
     <string name="clear_label">Clear</string>
+    <string name="click_to_try_again_label">Click to try again</string>
     <string name="converter_favorite_button_description">Add or remove unit from favorites</string>
     <string name="converter_left_side_title">Convert from</string>
     <string name="converter_no_results_support">Make sure there are no typos, try different filters or check for disabled unit groups.</string>
@@ -17,6 +18,7 @@
     <string name="converter_search_bar_placeholder">Search units</string>
     <string name="converter_swap_units_description">Swap units</string>
     <string name="copied_label">Copied %1$s!</string>
+    <string name="date_calculator_add">Add</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
     <string name="date_calculator_days">Days</string>
@@ -32,6 +34,8 @@
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
     <string name="date_calculator_months">Months</string>
     <string name="date_calculator_start">Start</string>
+    <string name="date_calculator_subtract">Subtract</string>
+    <string name="date_calculator_title">Date calculator</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
     <string name="date_calculator_years">Years</string>
@@ -41,6 +45,9 @@
     <string name="enabled_label">Enabled</string>
     <string name="error_label">Error</string>
     <string name="hello_label">Hello!</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/iqEp9rZZ9XqtJ3CKVpy33lre.png -->
+    <string name="label_label">Label</string>
     <string name="loading_label">Loading…</string>
     <string name="navigate_up_description">Navigate up</string>
 
@@ -53,6 +60,7 @@ Used in this dialog window. Should be short -->
     <string name="open_menu_description">Open menu</string>
     <string name="open_settings_label">Open settings</string>
     <string name="search_button_description">Search button</string>
+    <string name="search_text_field_placeholder">Search…</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Select time</string>
@@ -68,14 +76,20 @@ Used in this dialog window. Should be short -->
     <string name="settings_amoled_dark">AMOLED Dark</string>
     <string name="settings_amoled_dark_support">Use black background for dark themes</string>
     <string name="settings_auto">Auto</string>
+    <string name="settings_calculator_support">History view</string>
+    <string name="settings_clear_cache">Clear cache</string>
+    <string name="settings_clear_input">Clear input</string>
+    <string name="settings_clear_input_support">Start new expression when clicking \"=\" and any button</string>
     <string name="settings_color_scheme">Colour scheme</string>
     <string name="settings_color_theme">Colour theme</string>
     <string name="settings_color_theme_support">Pick a theming mode</string>
     <string name="settings_comma">Comma</string>
+    <string name="settings_converter_support">Unit groups, sorting, formatting</string>
     <string name="settings_currency_rates_note_text">Currency rates are updated daily. There\'s no real-time market monitoring in the app</string>
     <string name="settings_currency_rates_note_title">Wrong currency rates?</string>
     <string name="settings_dark_mode">Dark</string>
     <string name="settings_disable_unit_group_description">Disable unit group</string>
+    <string name="settings_display">Display</string>
     <string name="settings_display_support">App look and feel</string>
     <string name="settings_dynamic_colors">Dynamic colours</string>
     <string name="settings_dynamic_colors_support">Use colours from your wallpaper</string>
@@ -92,8 +106,14 @@ https://s3.eu-west-1.amazonaws.com/po-pub/i/prtM85P6x1fMuLg1I0zbkceo.png
 
 Maybe this can be labeled better? Let me know. It should be something that can describe content of the Formatting screen. -->
     <string name="settings_formatting_support">Precision and numbers appearance</string>
+    <string name="settings_language">Language</string>
+    <string name="settings_language_support">Change the app language</string>
     <string name="settings_light_mode">Light</string>
+    <string name="settings_middle_zero">Zero in the middle</string>
+    <string name="settings_middle_zero_support">Swap zero and decimal buttons</string>
     <string name="settings_note">Note</string>
+    <string name="settings_partial_history_view">Partial history view</string>
+    <string name="settings_partial_history_view_support">Peek latest entrance in history</string>
     <string name="settings_period">Period</string>
     <string name="settings_precision">Precision</string>
     <string name="settings_precision_info">Converted values may have a precision higher than the preferred one.</string>
@@ -113,6 +133,12 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="settings_space">Space</string>
     <string name="settings_starting_screen">Starting screen</string>
     <string name="settings_starting_screen_support">Choose which screen is shown when you launch the app</string>
+
+    <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/r1VikAn70eXQP4da2hrntTGQ.jpg -->
+    <!-- Option name to use system default setting -->
+    <string name="settings_system">System</string>
+    <string name="settings_system_font">System font</string>
+    <string name="settings_system_font_support">Use system font for texts in app</string>
     <string name="settings_terms_and_conditions">Terms and Conditions</string>
     <string name="settings_third_party_licenses">Third party licenses</string>
     <string name="settings_title">Settings</string>
@@ -126,6 +152,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="settings_vibrations">Vibrations</string>
     <string name="settings_vibrations_support">Haptic feedback when clicking keyboard buttons</string>
     <string name="settings_view_source_code">View source code</string>
+    <string name="time_zone_add_title">Add time zone</string>
+    <string name="time_zone_no_results_button">Read the article</string>
+    <string name="time_zone_no_results_support">Need more time zones?</string>
+    <string name="time_zone_title">Time zones</string>
+    <string name="tomorrow">Tomorrow</string>
     <string name="unit_acre">Acre</string>
     <string name="unit_acre_short">ac</string>
     <string name="unit_angle_minute">Minute</string>
@@ -200,31 +231,31 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Second Cosmic Velocity</string>
     <string name="unit_cosmic_velocity_third">Third Cosmic Velocity</string>
     <string name="unit_cubic_centimeter">Cubic centimetre</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_foot_per_hour">Cubic Foot/hour</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/h</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Cubic Foot/minute</string>
-    <string name="unit_cubic_foot_per_minute_short">ft3/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Cubic Foot/second</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/s</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/s</string>
     <string name="unit_cubic_kilometer">Cubic kilometre</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Cubic metre</string>
     <string name="unit_cubic_meter_per_hour">Cubic Metre/hour</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/h</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/h</string>
     <string name="unit_cubic_meter_per_minute">Cubic Metre/minute</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Cubic Metre/second</string>
-    <string name="unit_cubic_meter_per_second_short">m3/s</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_per_second_short">m³/s</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Cubic millimetre</string>
     <string name="unit_cubic_millimeter_per_hour">Cubic Millimetre/hour</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
     <string name="unit_cubic_millimeter_per_minute">Cubic Millimetre/minute</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Cubic Millimetre/second</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/s</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">United Arab Emirates Dirham</string>
     <string name="unit_currency_afn">Afghan afghani</string>
@@ -481,6 +512,22 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_imperial_short">gal/s</string>
     <string name="unit_gallon_per_second_us">Gallon/second (US)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
+    <string name="unit_gallon_uk_per_100_mile">Gallon/100 mile (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi</string>
+    <string name="unit_gallon_uk_per_mile">Gallon/mile (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
+    <string name="unit_gallon_us_per_100_mile">Gallon/100 mile (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi</string>
+    <string name="unit_gallon_us_per_mile">Gallon/mile (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
+    <string name="unit_gibibit">Gibibit</string>
+    <string name="unit_gibibit_per_second">Gibibit/second</string>
+    <string name="unit_gibibit_per_second_short">Gib/s</string>
+    <string name="unit_gibibit_short">Gib</string>
+    <string name="unit_gibibyte">Gibibyte</string>
+    <string name="unit_gibibyte_per_second">Gibibyte/second</string>
+    <string name="unit_gibibyte_per_second_short">GiB/s</string>
+    <string name="unit_gibibyte_short">GiB</string>
     <string name="unit_gigabit">Gigabit</string>
     <string name="unit_gigabit_per_second">Gigabit/second</string>
     <string name="unit_gigabit_per_second_short">Gb/s</string>
@@ -520,6 +567,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_group_flow_rate">Flow</string>
     <string name="unit_group_flux">Flux</string>
     <string name="unit_group_force">Force</string>
+    <string name="unit_group_fuel_consumption">Fuel</string>
     <string name="unit_group_length">Length</string>
     <string name="unit_group_luminance">Luminance</string>
     <string name="unit_group_mass">Mass</string>
@@ -545,21 +593,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Hour</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Imperial cup</string>
-    <string name="unit_imperial_cup_short">cup (UK)</string>
+    <string name="unit_imperial_cup_short">cup</string>
     <string name="unit_imperial_fluid_ounce">Imperial fluid ounce</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Imperial gallon</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Imperial pint</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Imperial quart</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Imperial tablespoon</string>
-    <string name="unit_imperial_tablespoon_short">tablespoon (UK)</string>
+    <string name="unit_imperial_tablespoon_short">tablespoon</string>
     <string name="unit_imperial_teaspoon">Imperial teaspoon</string>
-    <string name="unit_imperial_teaspoon_short">teaspoon (UK)</string>
+    <string name="unit_imperial_teaspoon_short">teaspoon</string>
     <string name="unit_imperial_ton">Imperial ton</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Inch</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Jiffy</string>
@@ -639,9 +687,15 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_kilowatt_short">kW</string>
     <string name="unit_kiloweber">Kiloweber</string>
     <string name="unit_kiloweber_short">kWb</string>
+    <string name="unit_km_per_l">Kilometre/litre</string>
+    <string name="unit_km_per_l_short">km/L</string>
     <string name="unit_knot">Knot</string>
     <string name="unit_knot_short">kt</string>
     <string name="unit_ksi">Kilopound per square inch</string>
+    <string name="unit_l_per_100_km">Litre/100 kilometre</string>
+    <string name="unit_l_per_100_km_short">L/100 km</string>
+    <string name="unit_l_per_km">Litre/kilometre</string>
+    <string name="unit_l_per_km_short">L/km</string>
     <string name="unit_lambert">Lambert</string>
     <string name="unit_lambert_short">L</string>
     <string name="unit_light_year">Light year</string>
@@ -718,6 +772,12 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_meter_short">m</string>
     <string name="unit_metric_ton">Metric ton</string>
     <string name="unit_metric_ton_short">t</string>
+    <string name="unit_mi_per_gallon_uk">Mile/gallon (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mpg</string>
+    <string name="unit_mi_per_gallon_us">Mile/gallon (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
+    <string name="unit_mi_us_per_l">Mile/litre (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfarad</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Microgram</string>
@@ -993,19 +1053,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Uranus surface gravity</string>
     <string name="unit_uranus_surface_gravity_short">Uranus g</string>
     <string name="unit_us_fluid_ounce">US fluid ounce</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (US)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">US legal cup</string>
-    <string name="unit_us_legal_cup_short">cup (US)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">US liquid gallon</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">US liquid pint</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">US liquid quart</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">US tablespoon</string>
-    <string name="unit_us_tablespoon_short">tablespoon (US)</string>
+    <string name="unit_us_tablespoon_short">tablespoon</string>
     <string name="unit_us_teaspoon">US teaspoon</string>
-    <string name="unit_us_teaspoon_short">teaspoon (US)</string>
+    <string name="unit_us_teaspoon_short">teaspoon</string>
     <string name="unit_velocity_of_light_in_vacuum">Speed of light in vacuum</string>
     <string name="unit_venus_equatorial_radius">Venus equatorial radius</string>
     <string name="unit_venus_equatorial_radius_short">Venus R</string>
@@ -1030,4 +1090,5 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_yard_per_second_short">yd/s</string>
     <string name="unit_yard_short">yd</string>
     <string name="unit_year_short">y</string>
+    <string name="yesterday">Yesterday</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-es/strings.xml b/core/base/src/main/res/values-es/strings.xml
index ae4ee00a..1372468e 100644
--- a/core/base/src/main/res/values-es/strings.xml
+++ b/core/base/src/main/res/values-es/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="add_label">Añadir</string>
     <string name="calculator_clear_history_support">Todas las expresiones se borraran del historial para siempre. Esta acción no puede deshacerse!</string>
-    <string name="calculator_divide_by_zero_error">No se puede dividir por 0</string>
+    <string name="calculator_divide_by_zero_error">No se puede dividir entre 0</string>
     <string name="calculator_no_history">Sin historial</string>
     <string name="calculator_title">Calculadora</string>
     <string name="cancel_label">Cancelar</string>
@@ -35,7 +35,7 @@
     <string name="date_calculator_months">Meses</string>
     <string name="date_calculator_start">Inicio</string>
     <string name="date_calculator_subtract">Resta</string>
-    <string name="date_calculator_title">Date calculator</string>
+    <string name="date_calculator_title">Calculadora de fechas</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
     <string name="date_calculator_years">Años</string>
@@ -78,6 +78,8 @@ Used in this dialog window. Should be short -->
     <string name="settings_auto">Auto</string>
     <string name="settings_calculator_support">Vista del historial</string>
     <string name="settings_clear_cache">Borrar caché</string>
+    <string name="settings_clear_input">Borrar entrada</string>
+    <string name="settings_clear_input_support">Inicie una nueva expresión al hacer clic en \"=\" y hacer clic en cualquier botón</string>
     <string name="settings_color_scheme">Esquema de color</string>
     <string name="settings_color_theme">Tema</string>
     <string name="settings_color_theme_support">Escoger modo de tema</string>
@@ -108,7 +110,9 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="settings_language_support">Cambiar el idioma de la app</string>
     <string name="settings_light_mode">Claro</string>
     <string name="settings_middle_zero">Ceros de promedio</string>
-    <string name="settings_middle_zero_support">Intercmbiar botones  de zero y decimales</string>
+
+    <!-- Corrected error in translation -->
+    <string name="settings_middle_zero_support">Intercambiar botones  de zero y decimales</string>
     <string name="settings_note">Nota</string>
     <string name="settings_partial_history_view">Vista parcial del historial</string>
     <string name="settings_partial_history_view_support">Ver ultimas entradas del historiak</string>
@@ -230,30 +234,38 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_third">Tercera Velocidad Cósmica</string>
     <string name="unit_cubic_centimeter">Centímetro cúbico</string>
     <string name="unit_cubic_centimeter_short">cm³</string>
+    <string name="unit_cubic_foot">Pie cúbico</string>
     <string name="unit_cubic_foot_per_hour">Pie Cúbico/hora</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/h</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Pie Cúbico/minuto</string>
-    <string name="unit_cubic_foot_per_minute_short">ft3/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Pie Cúbico/segundo</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/s</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/s</string>
+    <string name="unit_cubic_foot_short">ft³</string>
+    <string name="unit_cubic_inch">Pulgada cúbica</string>
+    <string name="unit_cubic_inch_short">plg³</string>
     <string name="unit_cubic_kilometer">Kilómetro cúbico</string>
     <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Metro cúbico</string>
     <string name="unit_cubic_meter_per_hour">Metros Cúbicos/hora</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/h</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/h</string>
     <string name="unit_cubic_meter_per_minute">Metros Cúbicos/minuto</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Metros Cúbicos/segundo</string>
-    <string name="unit_cubic_meter_per_second_short">m3/s</string>
+    <string name="unit_cubic_meter_per_second_short">m³/s</string>
     <string name="unit_cubic_meter_short">m³</string>
+    <string name="unit_cubic_mile">Milla cúbica</string>
+    <string name="unit_cubic_mile_short">mi³</string>
     <string name="unit_cubic_millimeter">Milímetro cúbico</string>
     <string name="unit_cubic_millimeter_per_hour">Milímetros Cúbicos/hora</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
     <string name="unit_cubic_millimeter_per_minute">Milímetros Cúbicos/minuto</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Milímetros Cúbicos/segundo</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/s</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
     <string name="unit_cubic_millimeter_short">mm³</string>
+    <string name="unit_cubic_yard">Yarda cúbica</string>
+    <string name="unit_cubic_yard_short">yd³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Dirham de Emiratos Árabes Unidos</string>
     <string name="unit_currency_afn">Afghani Afgano</string>
@@ -511,13 +523,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Galón/segundo (US)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
     <string name="unit_gallon_uk_per_100_mile">Galones/100 millas (UK)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_uk_per_mile">Galón/milla (UK)</string>
-    <string name="unit_gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
     <string name="unit_gallon_us_per_100_mile">Galones/100 millas (US)</string>
-    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_us_per_mile">Galón/milla (US)</string>
-    <string name="unit_gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
     <string name="unit_gibibit">Gibibit</string>
     <string name="unit_gibibit_per_second">Gibibit/segundo</string>
     <string name="unit_gibibit_per_second_short">Gib/s</string>
@@ -552,6 +564,8 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gram_force_meter_short">gf*m</string>
     <string name="unit_gram_force_millimeter">Gramos-fuerza milímetros</string>
     <string name="unit_gram_force_millimeter_short">gf*mm</string>
+    <string name="unit_gram_force_per_square_centimeter">Gramos-fuerza/centímetro cuadrado</string>
+    <string name="unit_gram_force_per_square_centimeter_short">gf/cm²</string>
     <string name="unit_gram_force_short">gf</string>
     <string name="unit_gram_short">g</string>
     <string name="unit_group_acceleration">Aceleración</string>
@@ -591,21 +605,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Hora</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Taza UK</string>
-    <string name="unit_imperial_cup_short">tz (UK)</string>
+    <string name="unit_imperial_cup_short">tz</string>
     <string name="unit_imperial_fluid_ounce">Onza líquida UK</string>
-    <string name="unit_imperial_fluid_ounce_short">oz liq (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">oz liq</string>
     <string name="unit_imperial_gallon">Galón UK</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Pinta UK</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Cuarto UK</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">cucharada UK</string>
-    <string name="unit_imperial_tablespoon_short">cda (UK)</string>
+    <string name="unit_imperial_tablespoon_short">cda</string>
     <string name="unit_imperial_teaspoon">cucharadita UK</string>
-    <string name="unit_imperial_teaspoon_short">cdita (UK)</string>
+    <string name="unit_imperial_teaspoon_short">cdita</string>
     <string name="unit_imperial_ton">Tonelada imperial</string>
-    <string name="unit_imperial_ton_short">t(UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Pulgada</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Jiffy</string>
@@ -653,6 +667,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_kilogram_force_meter_short">kgf*m</string>
     <string name="unit_kilogram_force_millimeter">Kilogramos-fuerza milímetro</string>
     <string name="unit_kilogram_force_millimeter_short">kgf*mm</string>
+    <string name="unit_kilogram_force_per_square_centimeter">Kilogramos-fuerza/centímetro cuadrado</string>
+    <string name="unit_kilogram_force_per_square_centimeter_short">kgf/cm²</string>
+    <string name="unit_kilogram_force_per_square_meter">Kilogramo-fuerza/metro cuadrado</string>
+    <string name="unit_kilogram_force_per_square_meter_short">kgf/m²</string>
     <string name="unit_kilogram_force_short">kgf</string>
     <string name="unit_kilogram_short">kg</string>
     <string name="unit_kilojoule">Kilojulio</string>
@@ -771,11 +789,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Tonelada</string>
     <string name="unit_metric_ton_short">t</string>
     <string name="unit_mi_per_gallon_uk">Millas/galón (UK)</string>
-    <string name="unit_mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mpg</string>
     <string name="unit_mi_per_gallon_us">Millas/galón (US)</string>
-    <string name="unit_mi_per_gallon_us_short">mpg (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
     <string name="unit_mi_us_per_l">Millas/litro (US)</string>
-    <string name="unit_mi_us_per_l_short">mi/L (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfaradio</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Microgramo</string>
@@ -913,6 +931,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_pound_force_foot_short">lbf*ft</string>
     <string name="unit_pound_force_inch">Libra-fuerza pulgada</string>
     <string name="unit_pound_force_inch_short">lbf*in</string>
+    <string name="unit_pound_force_per_square_foot">Libra-fuerza/pie cuadrado</string>
+    <string name="unit_pound_force_per_square_foot_short">pf/f²</string>
+    <string name="unit_pound_force_per_square_inch">Libra-fuerza/pulgada cuadrada</string>
+    <string name="unit_pound_force_per_square_inch_short">pf/in²</string>
     <string name="unit_pound_force_short">lbf</string>
     <string name="unit_pound_short">lbs</string>
     <string name="unit_prefix_atto">Atto</string>
@@ -992,7 +1014,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_square_centimeter_short">cm²</string>
     <string name="unit_square_decimeter">Decímetro cuadrado</string>
     <string name="unit_square_decimeter_short">dm²</string>
-    <string name="unit_square_foot">Pié cuadrado</string>
+    <string name="unit_square_foot">Pie cuadrado</string>
     <string name="unit_square_foot_short">ft²</string>
     <string name="unit_square_inch">Pulgada cuadrada</string>
     <string name="unit_square_inch_short">in²</string>
@@ -1053,17 +1075,17 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_us_fluid_ounce">Onza Líquida US</string>
     <string name="unit_us_fluid_ounce_short">oz liq.</string>
     <string name="unit_us_legal_cup">Taza Legal US</string>
-    <string name="unit_us_legal_cup_short">tz (US)</string>
+    <string name="unit_us_legal_cup_short">tz</string>
     <string name="unit_us_liquid_gallon">Galón Líquido US</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">Pinta Líquida US</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">Cuarto Líquido US</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">Cucharada US</string>
-    <string name="unit_us_tablespoon_short">cda (US)</string>
+    <string name="unit_us_tablespoon_short">cda</string>
     <string name="unit_us_teaspoon">Cucharadita US</string>
-    <string name="unit_us_teaspoon_short">cdita (US)</string>
+    <string name="unit_us_teaspoon_short">cdita</string>
     <string name="unit_velocity_of_light_in_vacuum">Velocidad de la luz en el vacío</string>
     <string name="unit_venus_equatorial_radius">Radio ecuatorial de Venus</string>
     <string name="unit_venus_equatorial_radius_short">Venus R</string>
diff --git a/core/base/src/main/res/values-fr/strings.xml b/core/base/src/main/res/values-fr/strings.xml
index 64f43fb6..03c8a3a7 100644
--- a/core/base/src/main/res/values-fr/strings.xml
+++ b/core/base/src/main/res/values-fr/strings.xml
@@ -213,7 +213,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Vitesse de libération</string>
     <string name="unit_cosmic_velocity_third">Vitesse de libération du système</string>
     <string name="unit_cubic_centimeter">Centimètre cube</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_foot_per_hour">Pied cube/heure</string>
     <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Pied cube/minute</string>
@@ -221,7 +221,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cubic_foot_per_second">Pied Cube/seconde</string>
     <string name="unit_cubic_foot_per_second_short">ft³/s</string>
     <string name="unit_cubic_kilometer">Kilomètre cube</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Mètre cube</string>
     <string name="unit_cubic_meter_per_hour">Mètre cube</string>
     <string name="unit_cubic_meter_per_hour_short">m³/h</string>
@@ -229,7 +229,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Mètre cube/seconde</string>
     <string name="unit_cubic_meter_per_second_short">m³/s</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Millimètre cube</string>
     <string name="unit_cubic_millimeter_per_hour">Millimètre cube/heure</string>
     <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
@@ -237,7 +237,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Millimètre cube/seconde</string>
     <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Dirham des Émirats arabes unis</string>
     <string name="unit_currency_afn">Afghan afghani</string>
@@ -558,21 +558,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Heure</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Tasse impériale</string>
-    <string name="unit_imperial_cup_short">cup (UK)</string>
+    <string name="unit_imperial_cup_short">cup</string>
     <string name="unit_imperial_fluid_ounce">Imperial fluid ounce</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Gallon imperial</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Pinte impériale</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Quart impérial</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Imperial tablespoon</string>
-    <string name="unit_imperial_tablespoon_short">tablespoon (UK)</string>
+    <string name="unit_imperial_tablespoon_short">tablespoon</string>
     <string name="unit_imperial_teaspoon">Imperial teaspoon</string>
-    <string name="unit_imperial_teaspoon_short">teaspoon (UK)</string>
+    <string name="unit_imperial_teaspoon_short">teaspoon</string>
     <string name="unit_imperial_ton">Tonne impériale</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Pouce</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Jiffy</string>
@@ -1006,19 +1006,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Gravité de surface d\'Uranus</string>
     <string name="unit_uranus_surface_gravity_short">G Uranus</string>
     <string name="unit_us_fluid_ounce">US fluid ounce</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (US)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">Tasse américaine</string>
-    <string name="unit_us_legal_cup_short">cup (US)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">gallon américain</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">Pinte américaine</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">Quarts américain</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">Cuillère à soupe américaine</string>
-    <string name="unit_us_tablespoon_short">tablespoon (US)</string>
+    <string name="unit_us_tablespoon_short">tablespoon</string>
     <string name="unit_us_teaspoon">Cuillère à café américaine</string>
-    <string name="unit_us_teaspoon_short">teaspoon (US)</string>
+    <string name="unit_us_teaspoon_short">teaspoon</string>
     <string name="unit_velocity_of_light_in_vacuum">Vitesse de la lumière dans le vide</string>
     <string name="unit_venus_equatorial_radius">Radius équatorial de Vénus</string>
     <string name="unit_venus_equatorial_radius_short">R Vénus</string>
diff --git a/core/base/src/main/res/values-hu/strings.xml b/core/base/src/main/res/values-hu/strings.xml
index 62b8b7cb..579eff8d 100644
--- a/core/base/src/main/res/values-hu/strings.xml
+++ b/core/base/src/main/res/values-hu/strings.xml
@@ -1,11 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="calculator_clear_history_support">Minden kifejezés az előzményekből örökre törlődni fog. Ez a művelet visszafordíthatatlan!</string>
+    <string name="calculator_no_history">Nincsenek előzmények</string>
+    <string name="calculator_title">Számológép</string>
+    <string name="cancel_label">Mégse</string>
+    <string name="checked_filter_description">Kijelölt filter</string>
+    <string name="clear_history_label">Előzmények törlése</string>
+    <string name="clear_input_description">Bevitel ürítése</string>
+    <string name="clear_label">Kiürítés</string>
+    <string name="converter_favorite_button_description">Mértékegység hozzáadása vagy törlése a kedvencekből</string>
+    <string name="converter_left_side_title">Konvertálás ebből</string>
+    <string name="converter_no_results_support">Bizonyosodj meg róla, hogy nincs elírás, próbálj más filtereket, vagy keress kikapcsolt mértékegység-csoportokat.</string>
+    <string name="converter_right_side_title">Konvertálás erre</string>
+    <string name="converter_search_bar_placeholder">Mértékegységek keresése</string>
+    <string name="converter_swap_units_description">Mértékegységek váltása</string>
+    <string name="copied_label">%1$s másolva!</string>
+    <string name="disabled_label">Kikapcsolva</string>
+    <string name="drop_down_description">Legördülő menü kinyitása vagy bezárása</string>
+    <string name="enabled_label">Bekapcsolva</string>
+    <string name="error_label">Hiba</string>
+    <string name="hello_label">Hello!</string>
+    <string name="loading_label">Betöltés...</string>
+    <string name="navigate_up_description">Navigálás felfelé</string>
+    <string name="no_results_description">Üres keresési eredmény</string>
+    <string name="no_results_label">Nincs találat</string>
+    <string name="open_menu_description">Menü megnyitása</string>
+    <string name="open_settings_label">Beállítások megnyitása</string>
+    <string name="search_button_description">Keresőgomb</string>
+    <string name="settings_about_unitto">Az Unitto-ról</string>
+    <string name="settings_about_unitto_support">Tudj meg többet az appról</string>
+    <string name="settings_additional">Továbbiak</string>
+    <string name="settings_amoled_dark">AMOLED Sötét</string>
+    <string name="settings_amoled_dark_support">Fekete háttér használata sötét témákhoz</string>
+    <string name="settings_auto">Auto</string>
+    <string name="settings_color_theme">Színtéma</string>
+    <string name="settings_comma">Vessző</string>
+    <string name="settings_currency_rates_note_text">Az árfolyamok naponta frissülnek. Nincs valós idejű árfolyamfigyelő az alkalmazásba építve.</string>
+    <string name="settings_currency_rates_note_title">Hibás valutaárfolyamok?</string>
+    <string name="settings_dark_mode">Sötét</string>
+    <string name="settings_disable_unit_group_description">Mértékegység-csoportok kikapcsolása</string>
+    <string name="settings_display_support">Alkalmazás megjelenése</string>
+    <string name="settings_dynamic_colors">Dinamikus színek</string>
+    <string name="settings_dynamic_colors_support">Háttérkép színeinek használata</string>
+    <string name="settings_enable_unit_group_description">Mértékegység-csoportok bekapcsolása</string>
+    <string name="settings_exponential_notation">Exponenciális jelölés</string>
+    <string name="settings_exponential_notation_support">Szám részének E-re cserélése</string>
+    <string name="settings_formatting">Formázás</string>
+    <string name="settings_light_mode">Világos</string>
+    <string name="settings_note">Megjegyzés</string>
+    <string name="settings_period">Periódus</string>
+    <string name="settings_precision">Pontosság</string>
+    <string name="settings_precision_info">Az átváltott értékek pontosabbak lehetnek, mint az elvárt értékek.</string>
+    <string name="settings_precision_max">%1$s (Max)</string>
+    <string name="settings_precision_support">Tizedesjegyek száma</string>
+    <string name="settings_privacy_policy">Adatvédelmi Nyilatkozat</string>
+    <string name="settings_rate_this_app">Értékeld az alkalmazást</string>
+    <string name="settings_reorder_unit_group_description">Mértékegység-csoportok átrendezése</string>
+    <string name="settings_separator">Elválasztás</string>
+    <string name="settings_separator_support">Csoportelválasztó szimbólum</string>
+    <string name="settings_space">Szóköz</string>
+    <string name="settings_starting_screen">Kezdőképernyő</string>
+    <string name="settings_starting_screen_support">Az alkalmazásba belépéskor először megjelenő képernyő kiválasztása</string>
+    <string name="settings_terms_and_conditions">Felhasználási Feltételek</string>
+    <string name="settings_third_party_licenses">Külső licenszek</string>
+    <string name="settings_title">Beállítások</string>
+    <string name="settings_translate_app">Fordítsd le ezt az appot</string>
+    <string name="settings_translate_app_support">Csatlakozz a POEditoron a projekthez</string>
+    <string name="settings_unit_groups_support">Mértékegységek kikapcsolása és átrendezése</string>
+    <string name="settings_unit_groups_title">Egységcsoportok</string>
+    <string name="settings_version_name">Verzió neve</string>
+    <string name="settings_vibrations">Rezgés</string>
+    <string name="settings_vibrations_support">Haptikus visszajelzés a gombok megérintésekor</string>
+    <string name="settings_view_source_code">Forráskód megtekintése</string>
     <string name="unit_acre">Acre</string>
     <string name="unit_acre_short">ac</string>
     <string name="unit_angle_minute">Szögperc</string>
     <string name="unit_angle_second">Szögmásodperc</string>
     <string name="unit_atomic_mass_unit">Dalton</string>
     <string name="unit_atomic_mass_unit_short">u</string>
+    <string name="unit_attofarad">Attofarád</string>
+    <string name="unit_attofarad_short">aF</string>
     <string name="unit_attojoule">Attojoule</string>
     <string name="unit_attojoule_short">aJ</string>
     <string name="unit_attoliter">Attoliter</string>
@@ -22,6 +96,8 @@
     <string name="unit_attowatt_short">aW</string>
     <string name="unit_bar">Bar</string>
     <string name="unit_bar_short">bar</string>
+    <string name="unit_binary">Bináris</string>
+    <string name="unit_binary_short">base2</string>
     <string name="unit_bit">Bit</string>
     <string name="unit_bit_per_second">Bit/másodperc</string>
     <string name="unit_bit_per_second_short">b/s</string>
@@ -35,6 +111,8 @@
     <string name="unit_carat">Karát</string>
     <string name="unit_carat_short">ct</string>
     <string name="unit_celsius">Celsius</string>
+    <string name="unit_cent">Cent</string>
+    <string name="unit_cent_short">cent</string>
     <string name="unit_centimeter">Centiméter</string>
     <string name="unit_centimeter_per_hour">Centiméter/óra</string>
     <string name="unit_centimeter_per_hour_short">cm/h</string>
@@ -47,17 +125,18 @@
     <string name="unit_centimeter_short">cm</string>
     <string name="unit_centipascal">Centipascal</string>
     <string name="unit_centipascal_short">cPa</string>
+    <string name="unit_converter_title">Mértékváltó</string>
     <string name="unit_cosmic_velocity_first">Első Kozmikus Sebesség</string>
     <string name="unit_cosmic_velocity_second">Második Kozmikus Sebesség</string>
     <string name="unit_cosmic_velocity_third">Harmadik Kozmikus Sebesség</string>
     <string name="unit_cubic_centimeter">Köbcentiméter</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_kilometer">Köbkilóméter</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Köbméter</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Köbmilliméter</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Egyesült Arab Emírségeki Dirham</string>
     <string name="unit_currency_afn">Afgán afgáni</string>
@@ -168,8 +247,70 @@
     <string name="unit_currency_nok">Norvég korona</string>
     <string name="unit_currency_npr">Nepáli rúpia</string>
     <string name="unit_currency_nzd">Új-zélandi dollár</string>
+    <string name="unit_currency_omr">Ománia riál</string>
+    <string name="unit_currency_pab">Panamai balboa</string>
+    <string name="unit_currency_pen">Sol</string>
+    <string name="unit_currency_pgk">Pápua Új-Gueniai kina</string>
+    <string name="unit_currency_php">Fülöp-szigeteki peso</string>
+    <string name="unit_currency_pkr">Pakisztáni rúpia</string>
+    <string name="unit_currency_pln">Lengyel złoty</string>
+    <string name="unit_currency_pyg">Paraguayi guaráni</string>
+    <string name="unit_currency_qar">Katari riál</string>
+    <string name="unit_currency_ron">Román lej</string>
+    <string name="unit_currency_rsd">Szerb dínár</string>
+    <string name="unit_currency_rub">Orosz rubel</string>
+    <string name="unit_currency_rwf">Ruandai frank</string>
+    <string name="unit_currency_sar">Szaudi riál</string>
+    <string name="unit_currency_sbd">Solomon-szigeteki dollár</string>
+    <string name="unit_currency_scr">Seychellei rúpia</string>
+    <string name="unit_currency_sdg">Szudáni font</string>
+    <string name="unit_currency_sek">Svéd korona</string>
+    <string name="unit_currency_sgd">Szingapúri dollár</string>
+    <string name="unit_currency_shib">Shiba Inu</string>
+    <string name="unit_currency_shp">Szent-Ilonai font</string>
+    <string name="unit_currency_sll">Sierra Leonei leone</string>
+    <string name="unit_currency_sos">Szomáli shilling</string>
+    <string name="unit_currency_srd">Surinamei dollár</string>
+    <string name="unit_currency_std">São Tomé és Príncipei dobra (2018 előtt)</string>
+    <string name="unit_currency_svc">Salvadori colón</string>
+    <string name="unit_currency_syp">Szír font</string>
+    <string name="unit_currency_szl">Swázi lilageni</string>
+    <string name="unit_currency_thb">Thai baht</string>
+    <string name="unit_currency_theta">Theta</string>
+    <string name="unit_currency_tjs">Tádzsikisztáni somoni</string>
+    <string name="unit_currency_tmt">Türkmén manat</string>
+    <string name="unit_currency_tnd">Tunéziai dínár</string>
+    <string name="unit_currency_top">Tongai Pa\'anga</string>
+    <string name="unit_currency_try">Török líra</string>
+    <string name="unit_currency_ttd">Trinidad és Tobagoi dollár</string>
+    <string name="unit_currency_twd">Új Tajvani dollár</string>
+    <string name="unit_currency_tzs">Tanzániai shilling</string>
+    <string name="unit_currency_uah">Ukrán hryvnia</string>
+    <string name="unit_currency_ugx">Ugandai shilling</string>
+    <string name="unit_currency_uni">Universe</string>
+    <string name="unit_currency_usd">USA dollár</string>
+    <string name="unit_currency_usdc">USD érme</string>
+    <string name="unit_currency_uyu">Uruguayi peso</string>
+    <string name="unit_currency_uzs">Üzbég som</string>
+    <string name="unit_currency_vef">Szuverén bolivár</string>
+    <string name="unit_currency_vnd">Vietnámi dong</string>
+    <string name="unit_currency_vuv">Vanataui vatu</string>
+    <string name="unit_currency_wbtc">Csomagolt Bitcoin</string>
+    <string name="unit_currency_wst">Szamoai tala</string>
+    <string name="unit_currency_xaf">Közép-Afrikai CFA frank</string>
+    <string name="unit_currency_xag">Ezüst uncia</string>
+    <string name="unit_currency_xcd">Kelet-karibi dollár</string>
+    <string name="unit_currency_xdr">Speciális Bemutatási Jogok</string>
+    <string name="unit_currency_xof">Kelet-afrikai CFA frank</string>
+    <string name="unit_currency_xpf">CFP frank</string>
+    <string name="unit_currency_yer">Jemeni riál</string>
+    <string name="unit_currency_zar">Dél-Afrikai rand</string>
+    <string name="unit_currency_zmk">Zambiai kwacha</string>
+    <string name="unit_currency_zmw">Zambiai Kwacha</string>
     <string name="unit_day">Nap</string>
     <string name="unit_day_short">d</string>
+    <string name="unit_decimal">Decimális</string>
+    <string name="unit_decimal_short">base10</string>
     <string name="unit_decimeter">Deciméter</string>
     <string name="unit_decimeter_per_square_second">Deciméter/négyzetszögmásodperc</string>
     <string name="unit_decimeter_per_square_second_short">dm/s²</string>
@@ -181,6 +322,8 @@
     <string name="unit_dekameter_per_square_second_short">dam/s²</string>
     <string name="unit_dekapascal">Dekapascal</string>
     <string name="unit_dekapascal_short">daPa</string>
+    <string name="unit_duodecimal">Duodecimális</string>
+    <string name="unit_duodecimal_short">base12</string>
     <string name="unit_earth_equatorial_radius">Föld egyenlítői sugara</string>
     <string name="unit_earth_equatorial_radius_short">Föld E</string>
     <string name="unit_earth_mass">Földtömeg</string>
@@ -206,9 +349,13 @@
     <string name="unit_exabyte_per_second">Exabájt/másodperc</string>
     <string name="unit_exabyte_per_second_short">EB/s</string>
     <string name="unit_exabyte_short">EB</string>
+    <string name="unit_exafarad">Exafarád</string>
+    <string name="unit_exafarad_short">EF</string>
     <string name="unit_exapascal">Exapascal</string>
     <string name="unit_exapascal_short">EPa</string>
     <string name="unit_fahrenheit">Fahrenheit</string>
+    <string name="unit_farad">Farád</string>
+    <string name="unit_farad_short">F</string>
     <string name="unit_femtometer_per_square_second">Femtométer/négyzetszögmásodperc</string>
     <string name="unit_femtometer_per_square_second_short">fm/s²</string>
     <string name="unit_femtopascal">Femtopascal</string>
@@ -231,40 +378,65 @@
     <string name="unit_gigabyte_per_second">Gigabájt/másodperc</string>
     <string name="unit_gigabyte_per_second_short">GB/s</string>
     <string name="unit_gigabyte_short">GB</string>
+    <string name="unit_gigafarad">Gigafarád</string>
+    <string name="unit_gigafarad_short">GF</string>
     <string name="unit_gigajoule">Megajoule</string>
     <string name="unit_gigajoule_short">MJ</string>
     <string name="unit_gigapascal">Gigapascal</string>
     <string name="unit_gigapascal_short">GPa</string>
     <string name="unit_gigaton">1 gigatonna TNT</string>
     <string name="unit_gigaton_short">Gt</string>
+    <string name="unit_gigaweber">Gigaweber</string>
+    <string name="unit_gigaweber_short">GWb</string>
     <string name="unit_gram">gramm</string>
+    <string name="unit_gram_force">Gramm-erő</string>
+    <string name="unit_gram_force_short">gf</string>
     <string name="unit_gram_short">g</string>
+    <string name="unit_group_acceleration">Gyorsulás</string>
+    <string name="unit_group_angle">Szög</string>
+    <string name="unit_group_area">Terület</string>
+    <string name="unit_group_currency">Pénznem</string>
+    <string name="unit_group_data">Adat</string>
+    <string name="unit_group_data_transfer">Adatátvitel</string>
+    <string name="unit_group_energy">Energia</string>
+    <string name="unit_group_flux">Fluxus</string>
+    <string name="unit_group_length">Hosszúság</string>
+    <string name="unit_group_mass">Tömeg</string>
+    <string name="unit_group_number_base">Base</string>
+    <string name="unit_group_power">Erő</string>
+    <string name="unit_group_pressure">Nyomás</string>
+    <string name="unit_group_speed">Sebesség</string>
+    <string name="unit_group_temperature">Hőmérséklet</string>
+    <string name="unit_group_time">Idő</string>
+    <string name="unit_group_volume">Űrtartalom</string>
     <string name="unit_hectare">Hektár</string>
     <string name="unit_hectare_short">ha</string>
     <string name="unit_hectometer_per_square_second">Hektométer/négyzetszögmásodperc</string>
     <string name="unit_hectometer_per_square_second_short">hm/s²</string>
     <string name="unit_hectopascal">Hektopascal</string>
     <string name="unit_hectopascal_short">hPa</string>
+    <string name="unit_hexadecimal">Hexadecimális</string>
+    <string name="unit_hexadecimal_short">base16</string>
     <string name="unit_horse_power_mechanical">Lóerő</string>
     <string name="unit_horse_power_mechanical_short">hp</string>
     <string name="unit_hour">Óra</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Birodalmi kupa</string>
-    <string name="unit_imperial_cup_short">Kupa (UK)</string>
+    <string name="unit_imperial_cup_short">Kupa</string>
     <string name="unit_imperial_fluid_ounce">Birodalmi folyadékuncia</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Birodalmi gallon</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Birodalmi pint</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Birodalmi kvart</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Birodalmi evőkanál</string>
-    <string name="unit_imperial_tablespoon_short">Evőkanál (UK)</string>
+    <string name="unit_imperial_tablespoon_short">Evőkanál</string>
     <string name="unit_imperial_teaspoon">Birodalmi teáskanál</string>
-    <string name="unit_imperial_teaspoon_short">Teáskanál (UK)</string>
+    <string name="unit_imperial_teaspoon_short">Teáskanál</string>
     <string name="unit_imperial_ton">Birodalmi tonna</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Hüvelyk</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Pillanat</string>
@@ -296,7 +468,11 @@
     <string name="unit_kilobyte_short">KB</string>
     <string name="unit_kilocalorie_th">Kilókalória (th)</string>
     <string name="unit_kilocalorie_th_short">kcal</string>
+    <string name="unit_kilofarad">Kilofarád</string>
+    <string name="unit_kilofarad_short">kF</string>
     <string name="unit_kilogram">kilogramm</string>
+    <string name="unit_kilogram_force">Kilogram-erő</string>
+    <string name="unit_kilogram_force_short">kgf</string>
     <string name="unit_kilogram_short">kg</string>
     <string name="unit_kilojoule">Kilojoule</string>
     <string name="unit_kilojoule_short">kJ</string>
@@ -310,12 +486,18 @@
     <string name="unit_kilometer_per_square_second">Kilóméter/négyzetszögmásodperc</string>
     <string name="unit_kilometer_per_square_second_short">km/s²</string>
     <string name="unit_kilometer_short">km</string>
+    <string name="unit_kilonewton">Kilonewton</string>
+    <string name="unit_kilonewton_short">kN</string>
     <string name="unit_kiloparsec">Kilóparsec</string>
     <string name="unit_kiloparsec_short">kpc</string>
+    <string name="unit_kilopascal">Kilopascal</string>
+    <string name="unit_kilopascal_short">kPa</string>
     <string name="unit_kiloton">1 kilótonna TNT</string>
     <string name="unit_kiloton_short">kt</string>
     <string name="unit_kilowatt">Kilówatt</string>
     <string name="unit_kilowatt_short">kW</string>
+    <string name="unit_kiloweber">Kiloweber</string>
+    <string name="unit_kiloweber_short">kWb</string>
     <string name="unit_knot">Csomó</string>
     <string name="unit_knot_short">kt</string>
     <string name="unit_ksi">Kilófont/négyzethüvelyk</string>
@@ -331,6 +513,8 @@
     <string name="unit_mars_mass_short">Mars M</string>
     <string name="unit_mars_surface_gravity">A Mars felszini gravitációja</string>
     <string name="unit_mars_surface_gravity_short">Mars g</string>
+    <string name="unit_maxwell">Maxwell</string>
+    <string name="unit_maxwell_short">Mx</string>
     <string name="unit_mebibit">Mebibit</string>
     <string name="unit_mebibit_per_second">Mebibit/másodperc</string>
     <string name="unit_mebibit_per_second_short">Mib/s</string>
@@ -347,6 +531,8 @@
     <string name="unit_megabyte_per_second">Megabájt/másodperc</string>
     <string name="unit_megabyte_per_second_short">MB/s</string>
     <string name="unit_megabyte_short">MB</string>
+    <string name="unit_megafarad">Megafarád</string>
+    <string name="unit_megafarad_short">MF</string>
     <string name="unit_megajoule">Gigajoule</string>
     <string name="unit_megajoule_short">GJ</string>
     <string name="unit_megaparsec">Megaparsec</string>
@@ -357,6 +543,8 @@
     <string name="unit_megaton_short">Mt</string>
     <string name="unit_megawatt">Megawatt</string>
     <string name="unit_megawatt_short">MG</string>
+    <string name="unit_megaweber">Megaweber</string>
+    <string name="unit_megaweber_short">MWb</string>
     <string name="unit_mercury_equatorial_radius">Merkúr egyenlítői sugara</string>
     <string name="unit_mercury_equatorial_radius_short">Merkúr E</string>
     <string name="unit_mercury_mass">Merkúrtömeg</string>
@@ -375,14 +563,22 @@
     <string name="unit_meter_short">m</string>
     <string name="unit_metric_ton">Metrikus tonna</string>
     <string name="unit_metric_ton_short">t</string>
+    <string name="unit_microfarad">Mikrofarád</string>
+    <string name="unit_microfarad_short">µF</string>
+    <string name="unit_microgram">Mikrogram</string>
+    <string name="unit_microgram_short">µg</string>
     <string name="unit_micrometer">Mikrométer</string>
     <string name="unit_micrometer_per_square_second">Mikrométer/négyzetszögmásodperc</string>
     <string name="unit_micrometer_per_square_second_short">µm/s²</string>
     <string name="unit_micrometer_short">μm</string>
+    <string name="unit_micron_of_mercury">Higany micron</string>
+    <string name="unit_micron_of_mercury_short">μmHg</string>
     <string name="unit_micropascal">Mikropascal</string>
     <string name="unit_micropascal_short">µPa</string>
     <string name="unit_microsecond">Mikromásodperc</string>
     <string name="unit_microsecond_short">µs</string>
+    <string name="unit_microweber">Mikroweber</string>
+    <string name="unit_microweber_short">μWb</string>
     <string name="unit_mile">Mérföld</string>
     <string name="unit_mile_per_hour">Mérföld/óra</string>
     <string name="unit_mile_per_hour_short">mi/h</string>
@@ -391,6 +587,10 @@
     <string name="unit_mile_per_second">Mérföld/másodperc</string>
     <string name="unit_mile_per_second_short">mi/s</string>
     <string name="unit_mile_short">Mi</string>
+    <string name="unit_millibar">Millibar</string>
+    <string name="unit_millibar_short">mbar</string>
+    <string name="unit_millifarad">Millifarád</string>
+    <string name="unit_millifarad_short">mF</string>
     <string name="unit_milligram">Milligramm</string>
     <string name="unit_milligram_short">mg</string>
     <string name="unit_milliliter">Milliliter</string>
@@ -407,12 +607,19 @@
     <string name="unit_millimeter_per_square_second">Milliméter/négyzetszögmásodperc</string>
     <string name="unit_millimeter_per_square_second_short">mm/s²</string>
     <string name="unit_millimeter_short">mm</string>
+    <string name="unit_millinewton">Millinewton</string>
+    <string name="unit_millinewton_short">mN</string>
     <string name="unit_millipascal">Millipascal</string>
     <string name="unit_millipascal_short">mPa</string>
     <string name="unit_millisecond">Millimásodperc</string>
     <string name="unit_millisecond_short">ms</string>
+    <string name="unit_milliweber">Milliweber</string>
+    <string name="unit_milliweber_short">mWb</string>
     <string name="unit_minute">Perc</string>
     <string name="unit_minute_short">m</string>
+    <string name="unit_month_short">h</string>
+    <string name="unit_nanofarad">Nanofarád</string>
+    <string name="unit_nanofarad_short">nF</string>
     <string name="unit_nanometer">Nanométer</string>
     <string name="unit_nanometer_per_square_second">Nanométer/négyzetszögmásodperc</string>
     <string name="unit_nanometer_per_square_second_short">nm/s²</string>
@@ -421,18 +628,28 @@
     <string name="unit_nanopascal_short">nPa</string>
     <string name="unit_nanosecond">Nanomásodperc</string>
     <string name="unit_nanosecond_short">ns</string>
+    <string name="unit_nautical_mile">Tengeri mérföld</string>
+    <string name="unit_nautical_mile_short">M</string>
     <string name="unit_neptune_equatorial_radius">Neptunusz egyenlítői sugara</string>
     <string name="unit_neptune_equatorial_radius_short">Neptunusz E</string>
     <string name="unit_neptune_mass">Neptunusztömeg</string>
     <string name="unit_neptune_mass_short">Neptunusz M</string>
     <string name="unit_neptune_surface_gravity">A Neptunusz felszíni gravitációja</string>
     <string name="unit_neptune_surface_gravity_short">Neptunusz g</string>
+    <string name="unit_newton">Newton</string>
+    <string name="unit_newton_short">N</string>
+    <string name="unit_nonary">Nonáris</string>
+    <string name="unit_nonary_short">base9</string>
+    <string name="unit_octal">Oktális</string>
+    <string name="unit_octal_short">base8</string>
     <string name="unit_ounce">Uncia</string>
     <string name="unit_ounce_short">oz</string>
     <string name="unit_parsec">Parsec</string>
     <string name="unit_parsec_short">pc</string>
     <string name="unit_pascal">Pascal</string>
     <string name="unit_pascal_short">Pa</string>
+    <string name="unit_pentadecimal">Pentadecimális</string>
+    <string name="unit_pentadecimal_short">base15</string>
     <string name="unit_petabit">Petabit</string>
     <string name="unit_petabit_per_second">Petabit/másodperc</string>
     <string name="unit_petabit_per_second_short">Pb/s</string>
@@ -441,15 +658,73 @@
     <string name="unit_petabyte_per_second">Petabájt/másodperc</string>
     <string name="unit_petabyte_per_second_short">PB/s</string>
     <string name="unit_petabyte_short">PB</string>
+    <string name="unit_petafarad">Petafarád</string>
+    <string name="unit_petafarad_short">PF</string>
     <string name="unit_petapascal">Petapascal</string>
     <string name="unit_petapascal_short">PPa</string>
+    <string name="unit_picofarad">Pikofarád</string>
+    <string name="unit_picofarad_short">pF</string>
     <string name="unit_picometer_per_square_second">Pikométer/négyzetszögmásodperc</string>
     <string name="unit_picometer_per_square_second_short">pm/s²</string>
     <string name="unit_picopascal">Picopascal</string>
     <string name="unit_picopascal_short">pPa</string>
     <string name="unit_pound">Font</string>
     <string name="unit_pound_short">lbs</string>
+    <string name="unit_prefix_atto">Atto</string>
+    <string name="unit_prefix_atto_short">a</string>
+    <string name="unit_prefix_base">Alap</string>
+    <string name="unit_prefix_base_short">Alap</string>
+    <string name="unit_prefix_centi">Centi</string>
+    <string name="unit_prefix_centi_short">c</string>
+    <string name="unit_prefix_deca">Deka</string>
+    <string name="unit_prefix_deca_short">da</string>
+    <string name="unit_prefix_deci">Deci</string>
+    <string name="unit_prefix_deci_short">d</string>
+    <string name="unit_prefix_exa">Exa</string>
+    <string name="unit_prefix_exa_short">E</string>
+    <string name="unit_prefix_femto">Femto</string>
+    <string name="unit_prefix_femto_short">f</string>
+    <string name="unit_prefix_giga">Giga</string>
+    <string name="unit_prefix_giga_short">G</string>
+    <string name="unit_prefix_hecto">Hekto</string>
+    <string name="unit_prefix_hecto_short">h</string>
+    <string name="unit_prefix_kilo">Kilo</string>
+    <string name="unit_prefix_kilo_short">k</string>
+    <string name="unit_prefix_mega">Mega</string>
+    <string name="unit_prefix_mega_short">M</string>
+    <string name="unit_prefix_micro">Mikro</string>
+    <string name="unit_prefix_micro_short">μ</string>
+    <string name="unit_prefix_milli">Milli</string>
+    <string name="unit_prefix_milli_short">m</string>
+    <string name="unit_prefix_nano">Nano</string>
+    <string name="unit_prefix_nano_short">n</string>
+    <string name="unit_prefix_peta">Peta</string>
+    <string name="unit_prefix_peta_short">P</string>
+    <string name="unit_prefix_pico">Piko</string>
+    <string name="unit_prefix_pico_short">p</string>
+    <string name="unit_prefix_quecto">Qvekto</string>
+    <string name="unit_prefix_quecto_short">q</string>
+    <string name="unit_prefix_quetta">Qvetta</string>
+    <string name="unit_prefix_quetta_short">Q</string>
+    <string name="unit_prefix_ronna">Ronna</string>
+    <string name="unit_prefix_ronna_short">R</string>
+    <string name="unit_prefix_ronto">Ronto</string>
+    <string name="unit_prefix_ronto_short">r</string>
+    <string name="unit_prefix_tera">Terra</string>
+    <string name="unit_prefix_tera_short">T</string>
+    <string name="unit_prefix_yocto">Yokto</string>
+    <string name="unit_prefix_yocto_short">y</string>
+    <string name="unit_prefix_yotta">Yotta</string>
+    <string name="unit_prefix_yotta_short">Y</string>
+    <string name="unit_prefix_zepto">Zepto</string>
+    <string name="unit_prefix_zepto_short">z</string>
+    <string name="unit_prefix_zetta">Zetta</string>
+    <string name="unit_prefix_zetta_short">Z</string>
     <string name="unit_psi">Font/négyzethüvelyk</string>
+    <string name="unit_quaternary">Qvaternális</string>
+    <string name="unit_quaternary_short">base4</string>
+    <string name="unit_quinary">Qvináris</string>
+    <string name="unit_quinary_short">base5</string>
     <string name="unit_radian">Radián</string>
     <string name="unit_radian_short">rad</string>
     <string name="unit_saturn_equatorial_radius">Szaturnusz egyenlítői sugara</string>
@@ -460,6 +735,10 @@
     <string name="unit_saturn_surface_gravity_short">Szaturnusz g</string>
     <string name="unit_second">Másodperc</string>
     <string name="unit_second_short">s</string>
+    <string name="unit_senary">Szenáris</string>
+    <string name="unit_senary_short">base6</string>
+    <string name="unit_septenary">Szeptenáris</string>
+    <string name="unit_septenary_short">base7</string>
     <string name="unit_sextant">Szextáns</string>
     <string name="unit_sextant_short">sxt</string>
     <string name="unit_square_centimeter">Négyzetcentiméter</string>
@@ -484,6 +763,8 @@
     <string name="unit_square_yard_short">yd²</string>
     <string name="unit_standard_atmosphere">Szabványos légkör</string>
     <string name="unit_standard_atmosphere_short">atm</string>
+    <string name="unit_statfarad">Statfarád</string>
+    <string name="unit_statfarad_short">stF</string>
     <string name="unit_sun_equatorial_radius">Nap egyenlítői sugara</string>
     <string name="unit_sun_equatorial_radius_short">Nap E</string>
     <string name="unit_sun_mass">Naptömeg</string>
@@ -500,10 +781,20 @@
     <string name="unit_terabyte_short">TB</string>
     <string name="unit_terapascal">Terrapascal</string>
     <string name="unit_terapascal_short">TPa</string>
+    <string name="unit_ternary">Ternáris</string>
+    <string name="unit_ternary_short">base3</string>
+    <string name="unit_tetradecimal">Tetradecimális</string>
+    <string name="unit_tetradecimal_short">base14</string>
+    <string name="unit_ton_force">Tonna-erő</string>
+    <string name="unit_ton_force_short">tf</string>
     <string name="unit_torr">Torr</string>
     <string name="unit_torr_short">torr</string>
+    <string name="unit_tridecimal">Tridecimális</string>
+    <string name="unit_tridecimal_short">base13</string>
     <string name="unit_turn">Fordulat</string>
     <string name="unit_turn_short">tr</string>
+    <string name="unit_undecimal">Undecimális</string>
+    <string name="unit_undecimal_short">base11</string>
     <string name="unit_uranus_equatorial_radius">Uránusz egyenlítői sugara</string>
     <string name="unit_uranus_equatorial_radius_short">Uránusz E</string>
     <string name="unit_uranus_mass">Uránusztömeg</string>
@@ -511,19 +802,19 @@
     <string name="unit_uranus_surface_gravity">Az Uránusz felszíni gravitációja</string>
     <string name="unit_uranus_surface_gravity_short">Uránusz g</string>
     <string name="unit_us_fluid_ounce">Amerikai folyadékuncia</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (USA)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">Amerikai törvényi kupa</string>
-    <string name="unit_us_legal_cup_short">kupa (USA)</string>
+    <string name="unit_us_legal_cup_short">kupa</string>
     <string name="unit_us_liquid_gallon">Amerikai folyékony gallon</string>
-    <string name="unit_us_liquid_gallon_short">gal (USA)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">Amerikai folyékony pint</string>
-    <string name="unit_us_liquid_pint_short">pt (USA)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">Amerikai folyékony kvart</string>
-    <string name="unit_us_liquid_quart_short">qt (USA)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">Amerikai evőkanál</string>
-    <string name="unit_us_tablespoon_short">Evőkanál (USA)</string>
+    <string name="unit_us_tablespoon_short">Evőkanál</string>
     <string name="unit_us_teaspoon">Amerikai teáskanál</string>
-    <string name="unit_us_teaspoon_short">Teáskanál (USA)</string>
+    <string name="unit_us_teaspoon_short">Teáskanál</string>
     <string name="unit_velocity_of_light_in_vacuum">Fénysebesség vákuumban</string>
     <string name="unit_venus_equatorial_radius">Vénusz egyenlítői sugara</string>
     <string name="unit_venus_equatorial_radius_short">Vénusz E</string>
@@ -533,6 +824,8 @@
     <string name="unit_venus_surface_gravity_short">Vénusz g</string>
     <string name="unit_watt">Watt</string>
     <string name="unit_watt_short">W</string>
+    <string name="unit_weber">Weber</string>
+    <string name="unit_weber_short">Wb</string>
     <string name="unit_week">Hét</string>
     <string name="unit_week_short">w</string>
     <string name="unit_yard">Yard</string>
@@ -543,4 +836,5 @@
     <string name="unit_yard_per_second">Yard/másodperc</string>
     <string name="unit_yard_per_second_short">yd/s</string>
     <string name="unit_yard_short">yd</string>
+    <string name="unit_year_short">é</string>
 </resources>
\ No newline at end of file
diff --git a/core/base/src/main/res/values-in/strings.xml b/core/base/src/main/res/values-in/strings.xml
index 3fd4a1de..c2129131 100644
--- a/core/base/src/main/res/values-in/strings.xml
+++ b/core/base/src/main/res/values-in/strings.xml
@@ -210,31 +210,31 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Percepatan kosmik kedua</string>
     <string name="unit_cosmic_velocity_third">Percepatan kosmik ketiga</string>
     <string name="unit_cubic_centimeter">Sentimeter kubik</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_foot_per_hour">Kaki kubik/jam</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/j</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/j</string>
     <string name="unit_cubic_foot_per_minute">Kaki kubik/menit</string>
-    <string name="unit_cubic_foot_per_minute_short">ft3/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Kaki kubik/detik</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/d</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/d</string>
     <string name="unit_cubic_kilometer">Kilometer kubik</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Meter kubik</string>
     <string name="unit_cubic_meter_per_hour">Meter kubik/jam</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/j</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/j</string>
     <string name="unit_cubic_meter_per_minute">Meter kubik/menit</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Meter kubik/detik</string>
-    <string name="unit_cubic_meter_per_second_short">m3/d</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_per_second_short">m³/d</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Milimeter kubik</string>
     <string name="unit_cubic_millimeter_per_hour">Milimeter kubik/jam</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/j</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/j</string>
     <string name="unit_cubic_millimeter_per_minute">Milimeter kubik/menit</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Milimeter kubik/detik</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/d</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/d</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Dirham Uni Emirat Arab</string>
     <string name="unit_currency_ars">Peso Argentina</string>
@@ -445,9 +445,9 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_horse_power_mechanical_short">hp</string>
     <string name="unit_hour">Jam</string>
     <string name="unit_hour_short">j</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_ton">Ton imperial</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Inci</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_joule">Joule</string>
@@ -827,7 +827,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_mass_short">M Uranus</string>
     <string name="unit_uranus_surface_gravity">Gravitasi uranus</string>
     <string name="unit_uranus_surface_gravity_short">G Uranus</string>
-    <string name="unit_us_liquid_gallon_short">gal (AS)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_velocity_of_light_in_vacuum">Kecepatan cahaya dalam ruang hampa</string>
     <string name="unit_venus_equatorial_radius">Radius venus</string>
     <string name="unit_venus_equatorial_radius_short">R Venus</string>
diff --git a/core/base/src/main/res/values-it/strings.xml b/core/base/src/main/res/values-it/strings.xml
index 4e38bb44..9cea8b52 100644
--- a/core/base/src/main/res/values-it/strings.xml
+++ b/core/base/src/main/res/values-it/strings.xml
@@ -227,31 +227,31 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Seconda velocità cosmica</string>
     <string name="unit_cosmic_velocity_third">Terza velocità cosmica</string>
     <string name="unit_cubic_centimeter">Centimetro cubo</string>
-    <string name="unit_cubic_centimeter_short">cm^3</string>
+    <string name="unit_cubic_centimeter_short">cm³</string>
     <string name="unit_cubic_foot_per_hour">Piede cubo/ora</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/h</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Piede cubo/minuto</string>
-    <string name="unit_cubic_foot_per_minute_short">ft3/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Piede cubo/secondo</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/s</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/s</string>
     <string name="unit_cubic_kilometer">Chilometro cubo</string>
-    <string name="unit_cubic_kilometer_short">km^3</string>
+    <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Metro cubo</string>
     <string name="unit_cubic_meter_per_hour">Metro cubo/ora</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/h</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/h</string>
     <string name="unit_cubic_meter_per_minute">Metro cubo/minuto</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Metro cubo/secondo</string>
-    <string name="unit_cubic_meter_per_second_short">m3/s</string>
-    <string name="unit_cubic_meter_short">m^3</string>
+    <string name="unit_cubic_meter_per_second_short">m³/s</string>
+    <string name="unit_cubic_meter_short">m³</string>
     <string name="unit_cubic_millimeter">Millimetro cubo</string>
     <string name="unit_cubic_millimeter_per_hour">Millimetro cubo/ora</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
     <string name="unit_cubic_millimeter_per_minute">Millimetro cubo/minuto</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Millimetro cubo/secondo</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/s</string>
-    <string name="unit_cubic_millimeter_short">mm^3</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
+    <string name="unit_cubic_millimeter_short">mm³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">Dirham Emirati Arabi</string>
     <string name="unit_currency_afn">Afghani</string>
@@ -515,13 +515,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Gallone/secondo (US)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
     <string name="unit_gallon_uk_per_100_mile">Gallone/100 miglia (UK)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_uk_per_mile">Gallone/miglio (UK)</string>
-    <string name="unit_gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
     <string name="unit_gallon_us_per_100_mile">Gallone/100 miglia (US)</string>
-    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_us_per_mile">Gallone/miglio (US)</string>
-    <string name="unit_gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
     <string name="unit_gibibit">Gibibit</string>
     <string name="unit_gibibit_per_second">Gibibit al secondo</string>
     <string name="unit_gibibit_per_second_short">Gib/s</string>
@@ -599,21 +599,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Ora</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Coppa imperiale</string>
-    <string name="unit_imperial_cup_short">tazza (UK)</string>
+    <string name="unit_imperial_cup_short">tazza</string>
     <string name="unit_imperial_fluid_ounce">Oncia liquida imperiale</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Gallone imperiale</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Pinta imperiale</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Quarto imperiale</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Cucchiaio imperiale</string>
-    <string name="unit_imperial_tablespoon_short">Cucchiaio (UK)</string>
+    <string name="unit_imperial_tablespoon_short">Cucchiaio</string>
     <string name="unit_imperial_teaspoon">Cucchiaino imperiale</string>
-    <string name="unit_imperial_teaspoon_short">Cucchiaino (UK)</string>
+    <string name="unit_imperial_teaspoon_short">Cucchiaino</string>
     <string name="unit_imperial_ton">Tonnellata imperiale</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Pollice</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Jiffy</string>
@@ -779,11 +779,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Tonnellata metrica</string>
     <string name="unit_metric_ton_short">t</string>
     <string name="unit_mi_per_gallon_uk">Miglia/gallone (UK)</string>
-    <string name="unit_mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mpg</string>
     <string name="unit_mi_per_gallon_us">Miglia/gallone (US)</string>
-    <string name="unit_mi_per_gallon_us_short">mpg (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
     <string name="unit_mi_us_per_l">Miglia/litro (US)</string>
-    <string name="unit_mi_us_per_l_short">mi/L (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfarad</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Microgram</string>
@@ -1059,19 +1059,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Gravità superficie di Urano</string>
     <string name="unit_uranus_surface_gravity_short">Urano g</string>
     <string name="unit_us_fluid_ounce">Oncia liquida US</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (US)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">Coppa US</string>
-    <string name="unit_us_legal_cup_short">cup (US)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">Gallone US</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">Pinta US</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">Quarto US</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">Cucchiaio US</string>
-    <string name="unit_us_tablespoon_short">cucchiaio (US)</string>
+    <string name="unit_us_tablespoon_short">cucchiaio</string>
     <string name="unit_us_teaspoon">Cucchiaino US</string>
-    <string name="unit_us_teaspoon_short">cucchiaino (US)</string>
+    <string name="unit_us_teaspoon_short">cucchiaino</string>
     <string name="unit_velocity_of_light_in_vacuum">Velocità della luce nel vuoto</string>
     <string name="unit_venus_equatorial_radius">Raggio equatoriale di Venere</string>
     <string name="unit_venus_equatorial_radius_short">R Venere</string>
diff --git a/core/base/src/main/res/values-nl/strings.xml b/core/base/src/main/res/values-nl/strings.xml
index de6cb46d..42a60508 100644
--- a/core/base/src/main/res/values-nl/strings.xml
+++ b/core/base/src/main/res/values-nl/strings.xml
@@ -78,6 +78,8 @@ Used in this dialog window. Should be short -->
     <string name="settings_auto">Automatisch</string>
     <string name="settings_calculator_support">Geschiedenisweergave</string>
     <string name="settings_clear_cache">Verwijder cache</string>
+    <string name="settings_clear_input">Wis invoer</string>
+    <string name="settings_clear_input_support">Begin nieuwe uitdrukking bij het klikken op \"=\" en een andere knop</string>
     <string name="settings_color_scheme">Kleurenschema</string>
     <string name="settings_color_theme">Kleurthema</string>
     <string name="settings_color_theme_support">Selecteer kleurthema</string>
@@ -230,30 +232,38 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_third">Derde kosmische snelheid</string>
     <string name="unit_cubic_centimeter">Kubieke centimeter</string>
     <string name="unit_cubic_centimeter_short">cm³</string>
+    <string name="unit_cubic_foot">Kubieke voet</string>
     <string name="unit_cubic_foot_per_hour">Kubieke voet/uur</string>
-    <string name="unit_cubic_foot_per_hour_short">ft3/h</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/h</string>
     <string name="unit_cubic_foot_per_minute">Kubieke voet/minuut</string>
-    <string name="unit_cubic_foot_per_minute_short">ft/m</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/m</string>
     <string name="unit_cubic_foot_per_second">Kubieke voet/seconde</string>
-    <string name="unit_cubic_foot_per_second_short">ft3/s</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/s</string>
+    <string name="unit_cubic_foot_short">ft³</string>
+    <string name="unit_cubic_inch">Kubieke inch</string>
+    <string name="unit_cubic_inch_short">in³</string>
     <string name="unit_cubic_kilometer">Kubieke kilometer</string>
     <string name="unit_cubic_kilometer_short">km³</string>
     <string name="unit_cubic_meter">Kubieke meter</string>
     <string name="unit_cubic_meter_per_hour">Kubieke meter/uur</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/h</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/h</string>
     <string name="unit_cubic_meter_per_minute">Kubieke meter/minuut</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/m</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/m</string>
     <string name="unit_cubic_meter_per_second">Kubieke meter/seconde</string>
-    <string name="unit_cubic_meter_per_second_short">m3/s</string>
+    <string name="unit_cubic_meter_per_second_short">m³/s</string>
     <string name="unit_cubic_meter_short">m³</string>
+    <string name="unit_cubic_mile">Kubieke mijl</string>
+    <string name="unit_cubic_mile_short">mi³</string>
     <string name="unit_cubic_millimeter">Kubieke millimeter</string>
     <string name="unit_cubic_millimeter_per_hour">Kubieke millimeter/uur</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/h</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/h</string>
     <string name="unit_cubic_millimeter_per_minute">Kubieke millimeter/minuut</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/m</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/m</string>
     <string name="unit_cubic_millimeter_per_second">Kubieke millimeter/seconde</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/s</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/s</string>
     <string name="unit_cubic_millimeter_short">mm³</string>
+    <string name="unit_cubic_yard">Kubieke yard</string>
+    <string name="unit_cubic_yard_short">yd³</string>
     <string name="unit_currency_ada">Cardano</string>
     <string name="unit_currency_aed">VAE-dirham</string>
     <string name="unit_currency_afn">Afghaanse afghani</string>
@@ -511,13 +521,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Gallon/seconde (US)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
     <string name="unit_gallon_uk_per_100_mile">Gallon/100 mijl (UK)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_uk_per_mile">Gallon/mijl (UK)</string>
-    <string name="unit_gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
     <string name="unit_gallon_us_per_100_mile">Gallon/100 mijl (US)</string>
-    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">gal/100 mi</string>
     <string name="unit_gallon_us_per_mile">Gallon/mijl (US)</string>
-    <string name="unit_gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
     <string name="unit_gibibit">Gibibit</string>
     <string name="unit_gibibit_per_second">Gibibit/seconde</string>
     <string name="unit_gibibit_per_second_short">Gib/s</string>
@@ -552,6 +562,8 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gram_force_meter_short">gf*m</string>
     <string name="unit_gram_force_millimeter">Gram-kracht millimeter</string>
     <string name="unit_gram_force_millimeter_short">gf*mm</string>
+    <string name="unit_gram_force_per_square_centimeter">Gramkracht/vierkante centimeter</string>
+    <string name="unit_gram_force_per_square_centimeter_short">gf/cm²</string>
     <string name="unit_gram_force_short">gf</string>
     <string name="unit_gram_short">g</string>
     <string name="unit_group_acceleration">Versnelling</string>
@@ -591,21 +603,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Uur</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Imperiale cup</string>
-    <string name="unit_imperial_cup_short">cup (UK)</string>
+    <string name="unit_imperial_cup_short">cup</string>
     <string name="unit_imperial_fluid_ounce">Imperial fluid ounce</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Imperiale gallon</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Imperiale pint</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Imperiale quart</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Imperiale eetlepel</string>
-    <string name="unit_imperial_tablespoon_short">tbsp (UK)</string>
+    <string name="unit_imperial_tablespoon_short">tbsp</string>
     <string name="unit_imperial_teaspoon">Imperiale theelepel</string>
-    <string name="unit_imperial_teaspoon_short">tsp (UK)</string>
+    <string name="unit_imperial_teaspoon_short">tsp</string>
     <string name="unit_imperial_ton">Anglo-Amerikaanse ton</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Inch</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Jiffy</string>
@@ -653,6 +665,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_kilogram_force_meter_short">kgf*m</string>
     <string name="unit_kilogram_force_millimeter">Kilogram-kracht millimeter</string>
     <string name="unit_kilogram_force_millimeter_short">kgf*mm</string>
+    <string name="unit_kilogram_force_per_square_centimeter">Kilogramkracht/vierkante centimeter</string>
+    <string name="unit_kilogram_force_per_square_centimeter_short">kgf/cm²</string>
+    <string name="unit_kilogram_force_per_square_meter">Kilogramkracht/vierkante meter</string>
+    <string name="unit_kilogram_force_per_square_meter_short">kgf/m²</string>
     <string name="unit_kilogram_force_short">kgf</string>
     <string name="unit_kilogram_short">kg</string>
     <string name="unit_kilojoule">Kilojoule</string>
@@ -771,11 +787,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Ton</string>
     <string name="unit_metric_ton_short">t</string>
     <string name="unit_mi_per_gallon_uk">Mijl/gallon (UK)</string>
-    <string name="unit_mi_per_gallon_uk_short">mpg (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mpg</string>
     <string name="unit_mi_per_gallon_us">Mijl/gallon (US)</string>
-    <string name="unit_mi_per_gallon_us_short">mpg (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
     <string name="unit_mi_us_per_l">Mijl/liter (US)</string>
-    <string name="unit_mi_us_per_l_short">mi/L (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfarad</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Microgram</string>
@@ -913,6 +929,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_pound_force_foot_short">lbf*ft</string>
     <string name="unit_pound_force_inch">Pond-kracht inch</string>
     <string name="unit_pound_force_inch_short">lbf*in</string>
+    <string name="unit_pound_force_per_square_foot">Pondkracht/square foot</string>
+    <string name="unit_pound_force_per_square_foot_short">pf/f²</string>
+    <string name="unit_pound_force_per_square_inch">Pondkracht/vierkante inch</string>
+    <string name="unit_pound_force_per_square_inch_short">pf/in²</string>
     <string name="unit_pound_force_short">lbf</string>
     <string name="unit_pound_short">lbs</string>
     <string name="unit_prefix_atto">Atto</string>
@@ -1051,19 +1071,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Uranus zwaartekracht</string>
     <string name="unit_uranus_surface_gravity_short">Uranus g</string>
     <string name="unit_us_fluid_ounce">US fluid ounce</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (US)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">US legal cup</string>
-    <string name="unit_us_legal_cup_short">cup (US)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">US liquid gallon</string>
-    <string name="unit_us_liquid_gallon_short">gal (US)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">US liquid pint</string>
-    <string name="unit_us_liquid_pint_short">pt (US)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">US liquid quart</string>
-    <string name="unit_us_liquid_quart_short">qt (US)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">US eetlepel</string>
-    <string name="unit_us_tablespoon_short">tbsp (US)</string>
+    <string name="unit_us_tablespoon_short">tbsp</string>
     <string name="unit_us_teaspoon">US theelepel</string>
-    <string name="unit_us_teaspoon_short">tsp (US)</string>
+    <string name="unit_us_teaspoon_short">tsp</string>
     <string name="unit_velocity_of_light_in_vacuum">Lichtsnelheid in vacuum</string>
     <string name="unit_venus_equatorial_radius">Venus equatoriale straal</string>
     <string name="unit_venus_equatorial_radius_short">Venus R</string>
diff --git a/core/base/src/main/res/values-pt-rBR/strings.xml b/core/base/src/main/res/values-pt-rBR/strings.xml
index 7a6b7a97..581f54c7 100644
--- a/core/base/src/main/res/values-pt-rBR/strings.xml
+++ b/core/base/src/main/res/values-pt-rBR/strings.xml
@@ -78,6 +78,8 @@ Used in this dialog window. Should be short -->
     <string name="settings_auto">Auto</string>
     <string name="settings_calculator_support">Visualização do histórico</string>
     <string name="settings_clear_cache">Limpar cache</string>
+    <string name="settings_clear_input">Limpar entrada</string>
+    <string name="settings_clear_input_support">Iniciar nova expressão ao clicar em \"=\" e em qualquer botão</string>
     <string name="settings_color_scheme">Esquema de cores</string>
     <string name="settings_color_theme">Tema</string>
     <string name="settings_color_theme_support">Escolha um modo de tema</string>
@@ -511,13 +513,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Galão/segundo (EUA)</string>
     <string name="unit_gallon_per_second_us_short">gal/s</string>
     <string name="unit_gallon_uk_per_100_mile">Galão/100 milhas (UK)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">Galão/100 milhas (UK)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">Galão/100 milhas</string>
     <string name="unit_gallon_uk_per_mile">Galão/milha (UK)</string>
-    <string name="unit_gallon_uk_per_mile_short">gal/mi (UK)</string>
+    <string name="unit_gallon_uk_per_mile_short">gal/mi</string>
     <string name="unit_gallon_us_per_100_mile">Galão/100 milhas (US)</string>
-    <string name="unit_gallon_us_per_100_mile_short">galão/100 milhas (US)</string>
+    <string name="unit_gallon_us_per_100_mile_short">galão/100 milhas</string>
     <string name="unit_gallon_us_per_mile">Galão/milha (US)</string>
-    <string name="unit_gallon_us_per_mile_short">gal/mi (US)</string>
+    <string name="unit_gallon_us_per_mile_short">gal/mi</string>
     <string name="unit_gibibit">Gibibit</string>
     <string name="unit_gibibit_per_second">Gibibit/segundo</string>
     <string name="unit_gibibit_per_second_short">Gib/s</string>
@@ -588,24 +590,26 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hexadecimal_short">base16</string>
     <string name="unit_horse_power_mechanical">Potência</string>
     <string name="unit_horse_power_mechanical_short">hp</string>
-    <string name="unit_hour">Hor</string>
+
+    <!-- Correcting the "Hor" to "Hora". -->
+    <string name="unit_hour">Hora</string>
     <string name="unit_hour_short">h</string>
     <string name="unit_imperial_cup">Copo Imperial</string>
-    <string name="unit_imperial_cup_short">Cp (UK)</string>
+    <string name="unit_imperial_cup_short">Cp</string>
     <string name="unit_imperial_fluid_ounce">Onça fluída Imperial</string>
-    <string name="unit_imperial_fluid_ounce_short">fl oz (UK)</string>
+    <string name="unit_imperial_fluid_ounce_short">fl oz</string>
     <string name="unit_imperial_gallon">Galão imperial</string>
-    <string name="unit_imperial_gallon_short">gal (UK)</string>
+    <string name="unit_imperial_gallon_short">gal</string>
     <string name="unit_imperial_pint">Pinta Imperial</string>
-    <string name="unit_imperial_pint_short">pt (UK)</string>
+    <string name="unit_imperial_pint_short">pt</string>
     <string name="unit_imperial_quart">Quarteirão Imperial</string>
-    <string name="unit_imperial_quart_short">qt (UK)</string>
+    <string name="unit_imperial_quart_short">qt</string>
     <string name="unit_imperial_tablespoon">Colher de sopa imperial</string>
-    <string name="unit_imperial_tablespoon_short">Cs (UK)</string>
+    <string name="unit_imperial_tablespoon_short">Cs</string>
     <string name="unit_imperial_teaspoon">Colher de chá Imperial</string>
-    <string name="unit_imperial_teaspoon_short">Cc (UK)</string>
+    <string name="unit_imperial_teaspoon_short">Cc</string>
     <string name="unit_imperial_ton">Tonelada imperial</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">Polegada</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_jiffy">Momento</string>
@@ -771,11 +775,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Tonelada métrica</string>
     <string name="unit_metric_ton_short">t</string>
     <string name="unit_mi_per_gallon_uk">Milha/galão (UK)</string>
-    <string name="unit_mi_per_gallon_uk_short">mog (UK)</string>
+    <string name="unit_mi_per_gallon_uk_short">mog</string>
     <string name="unit_mi_per_gallon_us">Milha/galão (US)</string>
-    <string name="unit_mi_per_gallon_us_short">mpg (US)</string>
+    <string name="unit_mi_per_gallon_us_short">mpg</string>
     <string name="unit_mi_us_per_l">Milha/litro (US)</string>
-    <string name="unit_mi_us_per_l_short">mi/L (US)</string>
+    <string name="unit_mi_us_per_l_short">mi/L</string>
     <string name="unit_microfarad">Microfarad</string>
     <string name="unit_microfarad_short">µF</string>
     <string name="unit_microgram">Micrograma</string>
@@ -1051,21 +1055,21 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Gravidade superficial Uraniana</string>
     <string name="unit_uranus_surface_gravity_short">Urano g</string>
     <string name="unit_us_fluid_ounce">Onça fluida - EUA</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (EUA)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">Copo - EUA</string>
-    <string name="unit_us_legal_cup_short">cup (EUA)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">Galão líquido - EUA</string>
-    <string name="unit_us_liquid_gallon_short">gal (EUA)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">Pinta líquida - EUA</string>
-    <string name="unit_us_liquid_pint_short">pt (EUA)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">Quarteirão líquido - EUA</string>
-    <string name="unit_us_liquid_quart_short">qt (EUA)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">colher de sopa - EUA</string>
 
     <!-- Many of the culinary measurement units have an abbreviation in Portuguese - BR. -->
-    <string name="unit_us_tablespoon_short">Cs (EUA)</string>
+    <string name="unit_us_tablespoon_short">Cs</string>
     <string name="unit_us_teaspoon">Colhe de chá - EUA</string>
-    <string name="unit_us_teaspoon_short">Cc (EUA)</string>
+    <string name="unit_us_teaspoon_short">Cc</string>
     <string name="unit_velocity_of_light_in_vacuum">Velocidade da luz no vácuo</string>
     <string name="unit_venus_equatorial_radius">Raio equatorial de Venus</string>
     <string name="unit_venus_equatorial_radius_short">RE Venus</string>
diff --git a/core/base/src/main/res/values-ru/strings.xml b/core/base/src/main/res/values-ru/strings.xml
index 4601bde0..6d587f51 100644
--- a/core/base/src/main/res/values-ru/strings.xml
+++ b/core/base/src/main/res/values-ru/strings.xml
@@ -78,6 +78,8 @@ Used in this dialog window. Should be short -->
     <string name="settings_auto">Авто</string>
     <string name="settings_calculator_support">Вид истории</string>
     <string name="settings_clear_cache">Очистить кэш</string>
+    <string name="settings_clear_input">Очистить ввод</string>
+    <string name="settings_clear_input_support">Начинать новое выражение после нажатия \"=\" и любой кнопки</string>
     <string name="settings_color_scheme">Цветовая схема</string>
     <string name="settings_color_theme">Цветовая тема</string>
     <string name="settings_color_theme_support">Выберите режим темы</string>
@@ -229,31 +231,39 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_cosmic_velocity_second">Вторая космическая скорость</string>
     <string name="unit_cosmic_velocity_third">Третья космическая скорость</string>
     <string name="unit_cubic_centimeter">Кубический сантиметр</string>
-    <string name="unit_cubic_centimeter_short">см^3</string>
+    <string name="unit_cubic_centimeter_short">см³</string>
+    <string name="unit_cubic_foot">Кубический фут</string>
     <string name="unit_cubic_foot_per_hour">Кубический фут/час</string>
-    <string name="unit_cubic_foot_per_hour_short">фут^3/ч</string>
+    <string name="unit_cubic_foot_per_hour_short">фут³/ч</string>
     <string name="unit_cubic_foot_per_minute">Кубический фут/минута</string>
-    <string name="unit_cubic_foot_per_minute_short">фут^3/м</string>
+    <string name="unit_cubic_foot_per_minute_short">фут³/м</string>
     <string name="unit_cubic_foot_per_second">Кубический фут/секунда</string>
-    <string name="unit_cubic_foot_per_second_short">фут^3/с</string>
+    <string name="unit_cubic_foot_per_second_short">фут³/с</string>
+    <string name="unit_cubic_foot_short">фт³</string>
+    <string name="unit_cubic_inch">Кубический дюйм</string>
+    <string name="unit_cubic_inch_short">дюйм³</string>
     <string name="unit_cubic_kilometer">Кубический километр</string>
-    <string name="unit_cubic_kilometer_short">км^3</string>
+    <string name="unit_cubic_kilometer_short">км³</string>
     <string name="unit_cubic_meter">Кубический метр</string>
     <string name="unit_cubic_meter_per_hour">Кубический метр/час</string>
-    <string name="unit_cubic_meter_per_hour_short">м^3/ч</string>
+    <string name="unit_cubic_meter_per_hour_short">м³/ч</string>
     <string name="unit_cubic_meter_per_minute">Кубический метр/минута</string>
-    <string name="unit_cubic_meter_per_minute_short">м^3/м</string>
+    <string name="unit_cubic_meter_per_minute_short">м³/м</string>
     <string name="unit_cubic_meter_per_second">Кубический метр/секунда</string>
-    <string name="unit_cubic_meter_per_second_short">м^3/с</string>
-    <string name="unit_cubic_meter_short">м^3</string>
+    <string name="unit_cubic_meter_per_second_short">м³/с</string>
+    <string name="unit_cubic_meter_short">м³</string>
+    <string name="unit_cubic_mile">Кубическая миля</string>
+    <string name="unit_cubic_mile_short">миля³</string>
     <string name="unit_cubic_millimeter">Кубический миллиметр</string>
     <string name="unit_cubic_millimeter_per_hour">Кубический миллилитр/час</string>
-    <string name="unit_cubic_millimeter_per_hour_short">мм^3/ч</string>
+    <string name="unit_cubic_millimeter_per_hour_short">мм³/ч</string>
     <string name="unit_cubic_millimeter_per_minute">Кубический миллилитр/минута</string>
-    <string name="unit_cubic_millimeter_per_minute_short">мм^3/м</string>
+    <string name="unit_cubic_millimeter_per_minute_short">мм³/м</string>
     <string name="unit_cubic_millimeter_per_second">Кубический миллилитр/секунда</string>
-    <string name="unit_cubic_millimeter_per_second_short">мм^3/с</string>
-    <string name="unit_cubic_millimeter_short">мм^3</string>
+    <string name="unit_cubic_millimeter_per_second_short">мм³/с</string>
+    <string name="unit_cubic_millimeter_short">мм³</string>
+    <string name="unit_cubic_yard">Кубический ярд</string>
+    <string name="unit_cubic_yard_short">ярд³</string>
     <string name="unit_currency_ada">Кардано</string>
     <string name="unit_currency_aed">Дирхам ОАЭ</string>
     <string name="unit_currency_afn">Афганский афгани</string>
@@ -511,13 +521,13 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gallon_per_second_us">Галлон/секунда (США)</string>
     <string name="unit_gallon_per_second_us_short">гал/с</string>
     <string name="unit_gallon_uk_per_100_mile">Галлон/100 миль (Англ.)</string>
-    <string name="unit_gallon_uk_per_100_mile_short">гал/100 миль (Англ.)</string>
+    <string name="unit_gallon_uk_per_100_mile_short">гал/100 миль</string>
     <string name="unit_gallon_uk_per_mile">Галлон/миля (Англ.)</string>
-    <string name="unit_gallon_uk_per_mile_short">гал/миля (англ.)</string>
+    <string name="unit_gallon_uk_per_mile_short">гал/миля</string>
     <string name="unit_gallon_us_per_100_mile">Галлон/100 миль (США)</string>
-    <string name="unit_gallon_us_per_100_mile_short">гал/100 миль (США)</string>
+    <string name="unit_gallon_us_per_100_mile_short">гал/100 миль</string>
     <string name="unit_gallon_us_per_mile">Галлон/миля (США)</string>
-    <string name="unit_gallon_us_per_mile_short">гал/миля (США)</string>
+    <string name="unit_gallon_us_per_mile_short">гал/миля</string>
     <string name="unit_gibibit">Гибибит</string>
     <string name="unit_gibibit_per_second">Гибибит/секунда</string>
     <string name="unit_gibibit_per_second_short">Гиб/с</string>
@@ -552,6 +562,8 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_gram_force_meter_short">гс*м</string>
     <string name="unit_gram_force_millimeter">Грамм-сила миллиметр</string>
     <string name="unit_gram_force_millimeter_short">гс*мм</string>
+    <string name="unit_gram_force_per_square_centimeter">Грамм-сила/квадратный сантиметр</string>
+    <string name="unit_gram_force_per_square_centimeter_short">гс/см²</string>
     <string name="unit_gram_force_short">гс</string>
     <string name="unit_gram_short">г</string>
     <string name="unit_group_acceleration">Ускорение</string>
@@ -591,19 +603,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Час</string>
     <string name="unit_hour_short">ч</string>
     <string name="unit_imperial_cup">Англ. чашка</string>
-    <string name="unit_imperial_cup_short">чашка (англ.)</string>
+    <string name="unit_imperial_cup_short">чашка</string>
     <string name="unit_imperial_fluid_ounce">Англ. жидкая унция</string>
-    <string name="unit_imperial_fluid_ounce_short">унция (англ.)</string>
+    <string name="unit_imperial_fluid_ounce_short">унция</string>
     <string name="unit_imperial_gallon">Англ. галлон</string>
-    <string name="unit_imperial_gallon_short">галлон (англ.)</string>
+    <string name="unit_imperial_gallon_short">галлон</string>
     <string name="unit_imperial_pint">Англ. пинта</string>
-    <string name="unit_imperial_pint_short">пинта (англ.)</string>
+    <string name="unit_imperial_pint_short">пинта</string>
     <string name="unit_imperial_quart">Англ. кварта</string>
-    <string name="unit_imperial_quart_short">кварта (англ.)</string>
+    <string name="unit_imperial_quart_short">кварта</string>
     <string name="unit_imperial_tablespoon">Англ. столовая ложка</string>
-    <string name="unit_imperial_tablespoon_short">стол. ложка (англ.)</string>
+    <string name="unit_imperial_tablespoon_short">стол. ложка</string>
     <string name="unit_imperial_teaspoon">Англ. чайная ложка</string>
-    <string name="unit_imperial_teaspoon_short">чайн. ложка (англ.)</string>
+    <string name="unit_imperial_teaspoon_short">чайн. ложка</string>
     <string name="unit_imperial_ton">Английская тонна</string>
     <string name="unit_imperial_ton_short">т</string>
     <string name="unit_inch">Дюйм</string>
@@ -653,6 +665,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_kilogram_force_meter_short">кгс*м</string>
     <string name="unit_kilogram_force_millimeter">Килограмм-сила миллиметр</string>
     <string name="unit_kilogram_force_millimeter_short">кгс*мм</string>
+    <string name="unit_kilogram_force_per_square_centimeter">Килограмм-сила/квадратный сантиметр</string>
+    <string name="unit_kilogram_force_per_square_centimeter_short">кгс/см²</string>
+    <string name="unit_kilogram_force_per_square_meter">Килограмм-сила/квадратный метр</string>
+    <string name="unit_kilogram_force_per_square_meter_short">кгс/м²</string>
     <string name="unit_kilogram_force_short">кгс</string>
     <string name="unit_kilogram_short">кг</string>
     <string name="unit_kilojoule">Килоджоуль</string>
@@ -771,11 +787,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_metric_ton">Метрическая тонна</string>
     <string name="unit_metric_ton_short">т</string>
     <string name="unit_mi_per_gallon_uk">Миля/галлон (Англ.)</string>
-    <string name="unit_mi_per_gallon_uk_short">миля/гал (англ.)</string>
+    <string name="unit_mi_per_gallon_uk_short">миля/гал</string>
     <string name="unit_mi_per_gallon_us">Мила/галлон (США)</string>
-    <string name="unit_mi_per_gallon_us_short">миля/гал (США)</string>
+    <string name="unit_mi_per_gallon_us_short">миля/гал</string>
     <string name="unit_mi_us_per_l">Миля/литр (США)</string>
-    <string name="unit_mi_us_per_l_short">миля/л (США)</string>
+    <string name="unit_mi_us_per_l_short">миля/л</string>
     <string name="unit_microfarad">Микрофарад</string>
     <string name="unit_microfarad_short">мкФ</string>
     <string name="unit_microgram">Микрограмм</string>
@@ -913,6 +929,10 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_pound_force_foot_short">фс*ф</string>
     <string name="unit_pound_force_inch">Фунт-сила дюйм</string>
     <string name="unit_pound_force_inch_short">фс*дюйм</string>
+    <string name="unit_pound_force_per_square_foot">Фунт-сила/квадратный фут</string>
+    <string name="unit_pound_force_per_square_foot_short">фс/фт²</string>
+    <string name="unit_pound_force_per_square_inch">Фунт-сила/квадратный дюйм</string>
+    <string name="unit_pound_force_per_square_inch_short">фс/дюйм²</string>
     <string name="unit_pound_force_short">фс</string>
     <string name="unit_pound_short">фунт</string>
     <string name="unit_prefix_atto">Атто</string>
@@ -1051,19 +1071,19 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_uranus_surface_gravity">Поверхностная гравитация Урана</string>
     <string name="unit_uranus_surface_gravity_short">Уран g</string>
     <string name="unit_us_fluid_ounce">Амер. жидкая унция</string>
-    <string name="unit_us_fluid_ounce_short">унция (амер.)</string>
+    <string name="unit_us_fluid_ounce_short">унция</string>
     <string name="unit_us_legal_cup">Амер. чашка</string>
-    <string name="unit_us_legal_cup_short">чашка (амер.)</string>
+    <string name="unit_us_legal_cup_short">чашка</string>
     <string name="unit_us_liquid_gallon">Амер. жидкий галлон</string>
-    <string name="unit_us_liquid_gallon_short">галлон (амер.)</string>
+    <string name="unit_us_liquid_gallon_short">галлон</string>
     <string name="unit_us_liquid_pint">Амер. жидкая пинта</string>
-    <string name="unit_us_liquid_pint_short">пинта (амер.)</string>
+    <string name="unit_us_liquid_pint_short">пинта</string>
     <string name="unit_us_liquid_quart">Амер. жидкая кварта</string>
-    <string name="unit_us_liquid_quart_short">кварта (амер.)</string>
+    <string name="unit_us_liquid_quart_short">кварта</string>
     <string name="unit_us_tablespoon">Амер. столовая ложка</string>
-    <string name="unit_us_tablespoon_short">стол. ложка (амер.)</string>
+    <string name="unit_us_tablespoon_short">стол. ложка</string>
     <string name="unit_us_teaspoon">Амер. чайная ложка</string>
-    <string name="unit_us_teaspoon_short">чайн. ложка (амер.)</string>
+    <string name="unit_us_teaspoon_short">чайн. ложка</string>
     <string name="unit_velocity_of_light_in_vacuum">Скорость света в вакууме</string>
     <string name="unit_venus_equatorial_radius">Экваториальный радиус Венеры</string>
     <string name="unit_venus_equatorial_radius_short">Венера R</string>
diff --git a/core/base/src/main/res/values-tr/strings.xml b/core/base/src/main/res/values-tr/strings.xml
index 20cbaa29..69826b9c 100644
--- a/core/base/src/main/res/values-tr/strings.xml
+++ b/core/base/src/main/res/values-tr/strings.xml
@@ -33,7 +33,7 @@
     <string name="date_calculator_months">Ay</string>
     <string name="date_calculator_start">Başlangıç</string>
     <string name="date_calculator_subtract">Çıkar</string>
-    <string name="date_calculator_title">Tarih hesaplayıcı</string>
+    <string name="date_calculator_title">Tarih Hesaplayıcı</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/33QTn2NVrjJT772cBDFRqSMH.png -->
     <string name="date_calculator_years">Yıl</string>
@@ -57,6 +57,7 @@ Used in this dialog window. Should be short -->
     <string name="open_menu_description">Menüyü aç</string>
     <string name="open_settings_label">Ayarları aç</string>
     <string name="search_button_description">Arama düğmesi</string>
+    <string name="search_text_field_placeholder">Ara...</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Zaman seçin</string>
@@ -146,6 +147,8 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="settings_vibrations">Titreşimler</string>
     <string name="settings_vibrations_support">Klavye düğmelerini tıklattığınızda dokunsal geri bildirim</string>
     <string name="settings_view_source_code">Kaynak kodunu görüntüle</string>
+    <string name="time_zone_no_results_support">Daha fazla zaman dilimine mi ihtiyacınız var?</string>
+    <string name="time_zone_title">Zaman Dilimleri</string>
     <string name="unit_acre">Dönüm</string>
     <string name="unit_angle_minute">Dakika</string>
     <string name="unit_angle_second">Saniye</string>
@@ -158,6 +161,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_attometer_short">am</string>
     <string name="unit_attopascal">Attopaskal</string>
     <string name="unit_attosecond">Attosaniye</string>
+    <string name="unit_binary">İkili</string>
     <string name="unit_bit">Bit</string>
     <string name="unit_bit_per_second">Bit/saniye</string>
     <string name="unit_bit_per_second_short">b/s</string>
@@ -184,32 +188,32 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_centimeter_per_square_second">Santimetre/saniye kare</string>
     <string name="unit_centimeter_short">cm</string>
     <string name="unit_centipascal">Santipaskal</string>
-    <string name="unit_converter_title">Birim dönüştürücü</string>
+    <string name="unit_converter_title">Birim Dönüştürücü</string>
     <string name="unit_cosmic_velocity_first">İlk Kozmik Hız</string>
     <string name="unit_cosmic_velocity_second">İkinci Kozmik Hız</string>
     <string name="unit_cosmic_velocity_third">Üçüncü Kozmik Hız</string>
     <string name="unit_cubic_centimeter">Santimetreküp</string>
     <string name="unit_cubic_foot_per_hour">Fitküp/saat</string>
-    <string name="unit_cubic_foot_per_hour_short">ft/sa</string>
+    <string name="unit_cubic_foot_per_hour_short">ft³/sa</string>
     <string name="unit_cubic_foot_per_minute">Fitküp/dakika</string>
-    <string name="unit_cubic_foot_per_minute_short">ft/dk</string>
+    <string name="unit_cubic_foot_per_minute_short">ft³/dk</string>
     <string name="unit_cubic_foot_per_second">Fitküp/saniye</string>
-    <string name="unit_cubic_foot_per_second_short">ft/sn</string>
+    <string name="unit_cubic_foot_per_second_short">ft³/sn</string>
     <string name="unit_cubic_kilometer">Kilometreküp</string>
     <string name="unit_cubic_meter">Metreküp</string>
     <string name="unit_cubic_meter_per_hour">Metreküp/saat</string>
-    <string name="unit_cubic_meter_per_hour_short">m3/sa</string>
+    <string name="unit_cubic_meter_per_hour_short">m³/sa</string>
     <string name="unit_cubic_meter_per_minute">Metreküp/dakika</string>
-    <string name="unit_cubic_meter_per_minute_short">m3/dk</string>
+    <string name="unit_cubic_meter_per_minute_short">m³/dk</string>
     <string name="unit_cubic_meter_per_second">Metreküp/saniye</string>
-    <string name="unit_cubic_meter_per_second_short">m3/sn</string>
+    <string name="unit_cubic_meter_per_second_short">m³/sn</string>
     <string name="unit_cubic_millimeter">Milimetreküp</string>
     <string name="unit_cubic_millimeter_per_hour">Milimetreküp/saat</string>
-    <string name="unit_cubic_millimeter_per_hour_short">mm3/sa</string>
+    <string name="unit_cubic_millimeter_per_hour_short">mm³/sa</string>
     <string name="unit_cubic_millimeter_per_minute">Milimetreküp/dakika</string>
-    <string name="unit_cubic_millimeter_per_minute_short">mm3/dk</string>
+    <string name="unit_cubic_millimeter_per_minute_short">mm³/dk</string>
     <string name="unit_cubic_millimeter_per_second">Milimetreküp/saniye</string>
-    <string name="unit_cubic_millimeter_per_second_short">mm3/sn</string>
+    <string name="unit_cubic_millimeter_per_second_short">mm³/sn</string>
     <string name="unit_currency_aed">Birleşik Arap Emirlikleri Dirhemi</string>
     <string name="unit_currency_afn">Afgan Afganisi</string>
     <string name="unit_currency_all">Arnavutluk Leki</string>
@@ -235,6 +239,12 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_currency_bwp">Botsvana Pulası</string>
     <string name="unit_currency_byn">Yeni Beyaz Rusya Rublesi</string>
     <string name="unit_currency_byr">Beyaz Rusya Rublesi</string>
+    <string name="unit_currency_bzd">Belize doları</string>
+    <string name="unit_currency_cad">Kanada doları</string>
+    <string name="unit_currency_cdf">Kongo frangı</string>
+    <string name="unit_currency_chf">İsviçre frangı</string>
+    <string name="unit_currency_clf">Şili Hesap Birimi (UF)</string>
+    <string name="unit_currency_dkk">Danimarka kronu</string>
     <string name="unit_currency_eur">Euro</string>
     <string name="unit_currency_gbp">İngiliz Sterlini</string>
     <string name="unit_currency_try">Türk Lirası</string>
@@ -262,6 +272,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_currency_zwl">Zimbabve doları</string>
     <string name="unit_day">Gün</string>
     <string name="unit_day_short">g</string>
+    <string name="unit_decimal">Ondalıklı</string>
     <string name="unit_decimeter">Desimetre</string>
     <string name="unit_decimeter_per_square_second">Desimetre/saniye kare</string>
     <string name="unit_decimeter_short">dm</string>
@@ -277,6 +288,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_earth_mass">Dünya kütlesi</string>
     <string name="unit_earth_mass_short">Dünya M</string>
     <string name="unit_earth_surface_gravity">Dünya yüzeyi yerçekimi</string>
+    <string name="unit_earth_surface_gravity_short">Dünya g</string>
     <string name="unit_earths_orbital_speed">Dünyanın yörünge hızı</string>
     <string name="unit_electron_cross_section">Elektron tesir kesiti</string>
     <string name="unit_electron_mass_rest">Elektron kütlesi</string>
@@ -333,6 +345,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_group_electrostatic_capacitance">Kapasitans</string>
     <string name="unit_group_energy">Enerji</string>
     <string name="unit_group_flow_rate">Akış hızı</string>
+    <string name="unit_group_flux">Akı</string>
     <string name="unit_group_force">Kuvvet</string>
     <string name="unit_group_fuel_consumption">Yakıt</string>
     <string name="unit_group_length">Uzunluk</string>
@@ -353,7 +366,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_hour">Saat</string>
     <string name="unit_hour_short">sa</string>
     <string name="unit_imperial_ton">İngiliz tonu</string>
-    <string name="unit_imperial_ton_short">t (UK)</string>
+    <string name="unit_imperial_ton_short">t</string>
     <string name="unit_inch">İnç</string>
     <string name="unit_inch_short">in</string>
     <string name="unit_joule_per_centimeter">Joule/santimetre</string>
@@ -363,6 +376,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_jupiter_mass">Jüpiter kütlesi</string>
     <string name="unit_jupiter_mass_short">Jüpiter M</string>
     <string name="unit_jupiter_surface_gravity">Jüpiter yüzey yerçekimi</string>
+    <string name="unit_jupiter_surface_gravity_short">Jüpiter g</string>
     <string name="unit_kelvin">Kelvin</string>
     <string name="unit_kibibit">Kibibit</string>
     <string name="unit_kibibit_per_second">Kibibit/saniye</string>
@@ -513,9 +527,11 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_neptune_mass">Neptün kütlesi</string>
     <string name="unit_neptune_mass_short">Neptün M</string>
     <string name="unit_neptune_surface_gravity">Neptün yüzey yerçekimi</string>
+    <string name="unit_neptune_surface_gravity_short">Neptün g</string>
     <string name="unit_newton_centimeter">Newton santimetre</string>
     <string name="unit_newton_meter">Newton metre</string>
     <string name="unit_newton_millimeter">Newton milimetre</string>
+    <string name="unit_octal">Sekizli</string>
     <string name="unit_ounce">Ons</string>
     <string name="unit_ounce_force">Ons kuvvet</string>
     <string name="unit_ounce_force_foot">Ons-kuvvet fit</string>
@@ -555,6 +571,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_saturn_mass">Satürn kütlesi</string>
     <string name="unit_saturn_mass_short">Satürn M</string>
     <string name="unit_saturn_surface_gravity">Satürn yüzey yerçekimi</string>
+    <string name="unit_saturn_surface_gravity_short">Satürn g</string>
     <string name="unit_second">Saniye</string>
     <string name="unit_second_short">sn</string>
     <string name="unit_sextant">Sekstant</string>
@@ -574,6 +591,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_sun_mass">Güneş kütlesi</string>
     <string name="unit_sun_mass_short">Güneş M</string>
     <string name="unit_sun_surface_gravity">Güneş yüzeyi yerçekimi</string>
+    <string name="unit_sun_surface_gravity_short">Güneş g</string>
     <string name="unit_terabit">Terabit</string>
     <string name="unit_terabit_per_second">Terabit/saniye</string>
     <string name="unit_terabit_per_second_short">Tb/s</string>
@@ -583,33 +601,37 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="unit_terabyte_per_second_short">TB/s</string>
     <string name="unit_terabyte_short">TB</string>
     <string name="unit_terapascal">Terapaskal</string>
+    <string name="unit_ternary">Üçlü</string>
     <string name="unit_ton_force">Ton-kuvvet</string>
     <string name="unit_turn">Tur</string>
+    <string name="unit_undecimal">Ondalıksız</string>
     <string name="unit_uranus_equatorial_radius">Uranüs ekvator yarıçapı</string>
     <string name="unit_uranus_equatorial_radius_short">Uranüs R</string>
     <string name="unit_uranus_mass">Uranüs kütlesi</string>
     <string name="unit_uranus_mass_short">Uranüs M</string>
     <string name="unit_uranus_surface_gravity">Uranüs yüzey yerçekimi</string>
+    <string name="unit_uranus_surface_gravity_short">Uranüs g</string>
     <string name="unit_us_fluid_ounce">ABD sıvı onsu</string>
-    <string name="unit_us_fluid_ounce_short">fl oz (ABD)</string>
+    <string name="unit_us_fluid_ounce_short">fl oz</string>
     <string name="unit_us_legal_cup">ABD yasal kupası</string>
-    <string name="unit_us_legal_cup_short">cup (ABD)</string>
+    <string name="unit_us_legal_cup_short">cup</string>
     <string name="unit_us_liquid_gallon">ABD sıvı galonu</string>
-    <string name="unit_us_liquid_gallon_short">gal (ABD)</string>
+    <string name="unit_us_liquid_gallon_short">gal</string>
     <string name="unit_us_liquid_pint">ABD sıvı pint</string>
-    <string name="unit_us_liquid_pint_short">pt (ABD)</string>
+    <string name="unit_us_liquid_pint_short">pt</string>
     <string name="unit_us_liquid_quart">ABD sıvı quart</string>
-    <string name="unit_us_liquid_quart_short">qt (ABD)</string>
+    <string name="unit_us_liquid_quart_short">qt</string>
     <string name="unit_us_tablespoon">ABD yemek kaşığı</string>
-    <string name="unit_us_tablespoon_short">yemek kaşığı (ABD)</string>
+    <string name="unit_us_tablespoon_short">yemek kaşığı</string>
     <string name="unit_us_teaspoon">ABD çay kaşığı</string>
-    <string name="unit_us_teaspoon_short">çay kaşığı (ABD)</string>
+    <string name="unit_us_teaspoon_short">çay kaşığı</string>
     <string name="unit_velocity_of_light_in_vacuum">Işığın boşluktaki hızı</string>
     <string name="unit_venus_equatorial_radius">Venüs ekvator yarıçapı</string>
     <string name="unit_venus_equatorial_radius_short">Venüs R</string>
     <string name="unit_venus_mass">Venüs kütlesi</string>
     <string name="unit_venus_mass_short">Venüs M</string>
     <string name="unit_venus_surface_gravity">Venüs yüzey yerçekimi</string>
+    <string name="unit_venus_surface_gravity_short">Venüs g</string>
     <string name="unit_watt_per_square_centimeter_per_steradian">Watt/santimetrekare/steradyan</string>
     <string name="unit_week">Hafta</string>
     <string name="unit_week_short">h</string>