diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 24192841..b9e703f1 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2,8 +2,8 @@
     <string name="app_name">Απλή Αριθμομηχανή</string>
     <string name="app_launcher_name">Αριθμομηχανή</string>
     <string name="scientific_calculator">Επιστημονική Αριθμομηχανή</string>
-    <string name="unit_converter">Unit converter</string>
-    <string name="swap_units">Swap units</string>
+    <string name="unit_converter">Μετατροπέας μονάδων</string>
+    <string name="swap_units">Εναλλαγή μονάδων</string>
 
     <!-- Calculator field -->
     <string name="formula_divide_by_zero_error">Σφάλμα: διαίρεση με μηδέν</string>
@@ -18,86 +18,86 @@
     <string name="vibrate_on_button_press">Δόνηση στο πάτημα πλήκτρου</string>
     <string name="use_comma_as_decimal_mark">Χρήση κόμματος ως δεκαδικό σημείο</string>
     <!-- Unit converter -->
-    <string name="unit_length">Length</string>
-    <string name="unit_length_kilometer">Kilometer</string>
-    <string name="unit_length_meter">Meter</string>
-    <string name="unit_length_centimeter">Centimeter</string>
-    <string name="unit_length_millimeter">Millimeter</string>
-    <string name="unit_length_micrometer">Micrometer</string>
-    <string name="unit_length_nanometer">Nanometer</string>
+    <string name="unit_length">Μήκος</string>
+    <string name="unit_length_kilometer">Χιλιόμετρα</string>
+    <string name="unit_length_meter">Μέτρα</string>
+    <string name="unit_length_centimeter">Εκατοστά</string>
+    <string name="unit_length_millimeter">Χιλιοστά</string>
+    <string name="unit_length_micrometer">Μικρόμετρα</string>
+    <string name="unit_length_nanometer">Νάνομετρα</string>
     <string name="unit_length_angstrom">Angstrom</string>
-    <string name="unit_length_mile">Mile</string>
-    <string name="unit_length_yard">Yard</string>
-    <string name="unit_length_foot">Foot</string>
-    <string name="unit_length_inch">Inch</string>
+    <string name="unit_length_mile">Μίλια</string>
+    <string name="unit_length_yard">Γιάρδα</string>
+    <string name="unit_length_foot">Πόδι</string>
+    <string name="unit_length_inch">Ίντσα</string>
     <string name="unit_length_fathom">Fathom</string>
-    <string name="unit_length_nautical_mile">Nautical Mile</string>
-    <string name="unit_length_astronomical_unit">Astronomical Unit</string>
+    <string name="unit_length_nautical_mile">Ναυτικό μίλι</string>
+    <string name="unit_length_astronomical_unit">Αστρονομική μονάδα</string>
     <string name="unit_length_parsec">Parsec</string>
-    <string name="unit_length_light_year">Light Year</string>
-    <string name="unit_area">Area</string>
-    <string name="unit_area_square_kilometer">Square Kilometer</string>
-    <string name="unit_area_square_meter">Square Meter</string>
-    <string name="unit_area_square_centimeter">Square Centimeter</string>
-    <string name="unit_area_square_millimeter">Square Millimeter</string>
-    <string name="unit_area_square_mile">Square Mile</string>
-    <string name="unit_area_square_yard">Square Yard</string>
-    <string name="unit_area_square_foot">Square Foot</string>
-    <string name="unit_area_square_inch">Square Inch</string>
+    <string name="unit_length_light_year">Έτος φωτός</string>
+    <string name="unit_area">Περιοχή</string>
+    <string name="unit_area_square_kilometer">Τετραγωνικό χιλιόμετρο</string>
+    <string name="unit_area_square_meter">Τετραγωνικό μέτρο</string>
+    <string name="unit_area_square_centimeter">Τετραγωνικό εκατοστό</string>
+    <string name="unit_area_square_millimeter">Τετραγωνικό χιλιοστό</string>
+    <string name="unit_area_square_mile">Τετραγωνικό μίλι</string>
+    <string name="unit_area_square_yard">Τετραγωνική Γυάρδα</string>
+    <string name="unit_area_square_foot">Τετραγωνικό πόδι</string>
+    <string name="unit_area_square_inch">Τετραγωνική ίντσα</string>
     <string name="unit_area_acre">Acre</string>
-    <string name="unit_area_hectare">Hectare</string>
-    <string name="unit_volume">Volume</string>
-    <string name="unit_volume_cubic_meter">Cubic Meter</string>
-    <string name="unit_volume_cubic_decimeter">Cubic Decimeter</string>
-    <string name="unit_volume_cubic_centimeter">Cubic Centimeter</string>
-    <string name="unit_volume_cubic_millimeter">Cubic Millimeter</string>
-    <string name="unit_volume_liter">Liter</string>
-    <string name="unit_volume_centiliter">Centiliter</string>
-    <string name="unit_volume_deciliter">Deciliter</string>
-    <string name="unit_volume_milliliter">Milliliter</string>
+    <string name="unit_area_hectare">Εκτάριο</string>
+    <string name="unit_volume">Όγκος</string>
+    <string name="unit_volume_cubic_meter">Κυβικό μέτρο</string>
+    <string name="unit_volume_cubic_decimeter">Κυβικό δεκάμετρο</string>
+    <string name="unit_volume_cubic_centimeter">Κυβικό εκατοστόμετρο</string>
+    <string name="unit_volume_cubic_millimeter">Κυβικό χιλιοστόμετρο</string>
+    <string name="unit_volume_liter">Λίτρο</string>
+    <string name="unit_volume_centiliter">Εκατοστόλιτρο</string>
+    <string name="unit_volume_deciliter">Δεκάλιτρο</string>
+    <string name="unit_volume_milliliter">Χιλιοστόλιτρο</string>
     <string name="unit_volume_acre_foot">Acre Foot</string>
-    <string name="unit_volume_cubic_foot">Cubic Foot</string>
-    <string name="unit_volume_cubic_inch">Cubic Inch</string>
-    <string name="unit_volume_barrel_us">Barrel (US)</string>
-    <string name="unit_volume_gallon_us">Gallon (US)</string>
-    <string name="unit_volume_quart_us">Quart (US)</string>
+    <string name="unit_volume_cubic_foot">Κυβικό πόδι</string>
+    <string name="unit_volume_cubic_inch">Κυβική ίντσα</string>
+    <string name="unit_volume_barrel_us">Βαρέλι (US)</string>
+    <string name="unit_volume_gallon_us">Γαλόνι (US)</string>
+    <string name="unit_volume_quart_us">Τέταρτο (US)</string>
     <string name="unit_volume_pint_us">Pint (US)</string>
     <string name="unit_volume_gill_us">Gill (US)</string>
-    <string name="unit_volume_fluid_ounce_us">Fluid Ounce (US)</string>
-    <string name="unit_volume_barrel_imperial">Barrel (Imperial)</string>
-    <string name="unit_volume_gallon_imperial">Gallon (Imperial)</string>
-    <string name="unit_volume_quart_imperial">Quart (Imperial)</string>
+    <string name="unit_volume_fluid_ounce_us">Ουγγιά υγρού (US)</string>
+    <string name="unit_volume_barrel_imperial">Βαρέλι (Imperial)</string>
+    <string name="unit_volume_gallon_imperial">Γαλόνι (Imperial)</string>
+    <string name="unit_volume_quart_imperial">Τέταρτο (Imperial)</string>
     <string name="unit_volume_pint_imperial">Pint (Imperial)</string>
     <string name="unit_volume_gill_imperial">Gill (Imperial)</string>
-    <string name="unit_volume_fluid_ounce_imperial">Fluid Ounce (Imperial)</string>
-    <string name="unit_mass">Mass</string>
-    <string name="unit_mass_gram">Gram</string>
-    <string name="unit_mass_kilogram">Kilogram</string>
-    <string name="unit_mass_milligram">Milligram</string>
-    <string name="unit_mass_microgram">Microgram</string>
-    <string name="unit_mass_tonne">Tonne</string>
-    <string name="unit_mass_pound">Pound</string>
-    <string name="unit_mass_ounce">Ounce</string>
-    <string name="unit_mass_grain">Grain</string>
-    <string name="unit_mass_dram">Dram</string>
+    <string name="unit_volume_fluid_ounce_imperial">Ουγγιά υγρού (Imperial)</string>
+    <string name="unit_mass">Μάζα</string>
+    <string name="unit_mass_gram">Γραμμάριο</string>
+    <string name="unit_mass_kilogram">Χιλιόγραμμα</string>
+    <string name="unit_mass_milligram">Χιλιοστόγραμμα</string>
+    <string name="unit_mass_microgram">Μικρογραμμάριο</string>
+    <string name="unit_mass_tonne">Τόνος</string>
+    <string name="unit_mass_pound">Λίβρα</string>
+    <string name="unit_mass_ounce">Ουγγιά</string>
+    <string name="unit_mass_grain">Κόκκος</string>
+    <string name="unit_mass_dram">Δράμι</string>
     <string name="unit_mass_stone">Stone</string>
     <string name="unit_mass_long_ton">Long Ton</string>
     <string name="unit_mass_short_ton">Short Ton</string>
-    <string name="unit_mass_carat">Carat</string>
-    <string name="unit_mass_carat_metric">Carat (Metric)</string>
-    <string name="unit_temperature">Temperature</string>
-    <string name="unit_temperature_celsius">Celsius</string>
-    <string name="unit_temperature_fahrenheit">Fahrenheit</string>
-    <string name="unit_temperature_rankine">Rankine</string>
-    <string name="unit_temperature_kelvin">Kelvin</string>
-    <string name="unit_time">Time</string>
-    <string name="unit_time_hour">Hour</string>
-    <string name="unit_time_minute">Minute</string>
-    <string name="unit_time_second">Second</string>
-    <string name="unit_time_millisecond">Microsecond</string>
-    <string name="unit_time_day">Day</string>
-    <string name="unit_time_week">Week</string>
-    <string name="unit_time_year">Year</string>
+    <string name="unit_mass_carat">Καράτι</string>
+    <string name="unit_mass_carat_metric">Καράτι (μετρικό)</string>
+    <string name="unit_temperature">Θερμοκρασία</string>
+    <string name="unit_temperature_celsius">Κελσίου</string>
+    <string name="unit_temperature_fahrenheit">Φαρενάιτ</string>
+    <string name="unit_temperature_rankine">Ρανκίν</string>
+    <string name="unit_temperature_kelvin">Κέλβιν</string>
+    <string name="unit_time">Χρόνος</string>
+    <string name="unit_time_hour">Ώρα</string>
+    <string name="unit_time_minute">Λεπτό</string>
+    <string name="unit_time_second">Δευτερόλεπτο</string>
+    <string name="unit_time_millisecond">Μικροδευτερόλεπτο</string>
+    <string name="unit_time_day">Ημέρα</string>
+    <string name="unit_time_week">Εβδομάδα</string>
+    <string name="unit_time_year">Έτος</string>
 
     <!-- FAQ -->
     <string name="faq_1_title">Πώς λειτουργεί το κουμπί C (Καθαρισμός);</string>