diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index feec1960e..62d20a844 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -3,11 +3,11 @@
     <string name="app_launcher_name">계산기</string>
     <string name="scientific_calculator">공학용 계산기</string>
     <string name="formula_divide_by_zero_error">오류: 0으로 나누기</string>
-    <string name="history">있습니다</string>
+    <string name="history">기록</string>
     <string name="history_empty">기록이 비어 있습니다</string>
     <string name="clear_history">지우기</string>
     <string name="history_cleared">기록이 지워졌습니다</string>
-    <string name="vibrate_on_button_press">진동 버튼을 누릅니다</string>
+    <string name="vibrate_on_button_press">버튼을 누를 때 진동</string>
     <string name="faq_1_title">C(지우기) 버튼은 어떻게 작동합니까\?</string>
     <string name="faq_1_text">누르면 한 번에 한 문자씩 제거됩니다. 길게 누르면 모든 필드가 한 번에 재설정됩니다.</string>
     <string name="unit_converter">단위 변환기</string>
@@ -92,4 +92,41 @@
     <string name="unit_area_square_millimeter">제곱밀리미터</string>
     <string name="unit_mass_microgram">마이크로그램</string>
     <string name="unit_mass_ounce">온스</string>
+    <string name="unit_volume_legal_cup_us">법정 컵 (미국)</string>
+    <string name="unit_volume_customary_cup_us">관용 컵 (미국)</string>
+    <string name="unit_speed">속도</string>
+    <string name="unit_speed_meter_per_second">초당 미터</string>
+    <string name="unit_speed_kilometer_per_second">초당 킬로미터</string>
+    <string name="unit_speed_kilometer_per_hour">시간당 킬로미터</string>
+    <string name="unit_speed_mile_per_hour">시간당 마일</string>
+    <string name="unit_speed_knot">노트</string>
+    <string name="unit_speed_foot_per_second">초당 피트</string>
+    <string name="unit_speed_mach">마하</string>
+    <string name="unit_speed_speed_of_light">광속</string>
+    <string name="unit_pressure">압력</string>
+    <string name="unit_pressure_pascal">파스칼</string>
+    <string name="unit_pressure_kilopascal">킬로파스칼</string>
+    <string name="unit_pressure_megapascal">메가파스칼</string>
+    <string name="unit_pressure_bar">바</string>
+    <string name="unit_pressure_millibar">밀리바</string>
+    <string name="unit_pressure_atmosphere">기압</string>
+    <string name="unit_pressure_psi">제곱인치당 파운드</string>
+    <string name="unit_pressure_torr">토르</string>
+    <string name="unit_pressure_mmhg">수은주 밀리미터</string>
+    <string name="unit_pressure_inhg">수은주 인치</string>
+    <string name="unit_energy">에너지</string>
+    <string name="unit_energy_joule">줄</string>
+    <string name="unit_energy_kilojoule">킬로줄</string>
+    <string name="unit_energy_megajoule">메가줄</string>
+    <string name="unit_energy_gigajoule">기가줄</string>
+    <string name="unit_energy_calorie">칼로리</string>
+    <string name="unit_energy_kilocalorie">킬로칼로리</string>
+    <string name="unit_energy_watt_hour">와트시</string>
+    <string name="unit_energy_kilowatt_hour">킬로와트시</string>
+    <string name="unit_energy_megawatt_hour">메가와트시</string>
+    <string name="unit_energy_electronvolt">전자볼트</string>
+    <string name="unit_energy_btu">영국 열량 단위</string>
+    <string name="unit_energy_therm">섬</string>
+    <string name="unit_energy_foot_pound">피트-파운드</string>
+    <string name="unit_energy_erg">에르그</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index d22a294ce..938f42cd3 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -9,6 +9,124 @@
     <string name="history_cleared">Zgodovina je bila izbrisana</string>
     <string name="vibrate_on_button_press">Vibriraj ob pritisku gumba</string>
     <string name="faq_1_title">Kako deluje gumb C (Clear)\?</string>
-    <string name="faq_1_text">Če ga stisnete, odstranite po en lik naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat.</string>
+    <string name="faq_1_text">Če ga stisnete, odstranite po en znak naenkrat. Z dolgim pritiskom nanj boste odstranili vsa polja naenkrat.</string>
     <string name="unit_converter">Pretvornik enot</string>
+    <string name="swap_units">Zamenjaj enote</string>
+    <string name="unit_length">Dolžina</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">Milimeter</string>
+    <string name="unit_length_micrometer">Mikrometer</string>
+    <string name="unit_length_nanometer">Nanometer</string>
+    <string name="unit_length_angstrom">Angstrom</string>
+    <string name="unit_length_mile">Milja</string>
+    <string name="unit_length_yard">Jard</string>
+    <string name="unit_length_foot">Čevelj</string>
+    <string name="unit_length_inch">Palec</string>
+    <string name="unit_length_fathom">Seženj</string>
+    <string name="unit_length_nautical_mile">Morska milja</string>
+    <string name="unit_length_astronomical_unit">Astronomska enota</string>
+    <string name="unit_length_parsec">Parsek</string>
+    <string name="unit_length_light_year">Svetlobno leto</string>
+    <string name="unit_area">Površina</string>
+    <string name="unit_area_square_kilometer">Kvadratni kilometer</string>
+    <string name="unit_area_square_meter">Kvadratni meter</string>
+    <string name="unit_area_square_centimeter">Kvadratni centimeter</string>
+    <string name="unit_area_square_millimeter">Kvadratni milimeter</string>
+    <string name="unit_area_square_mile">Kvadratna milja</string>
+    <string name="unit_area_square_yard">Kvadratni jard</string>
+    <string name="unit_area_square_foot">Kvadratni čevelj</string>
+    <string name="unit_area_square_inch">Kvadratni palec</string>
+    <string name="unit_area_acre">Aker</string>
+    <string name="unit_area_hectare">Hektar</string>
+    <string name="unit_volume">Prostornina</string>
+    <string name="unit_volume_cubic_meter">Kubični meter</string>
+    <string name="unit_volume_cubic_decimeter">Kubični decimeter</string>
+    <string name="unit_volume_cubic_centimeter">Kubični centimeter</string>
+    <string name="unit_volume_cubic_millimeter">Kubični milimeter</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">Mililiter</string>
+    <string name="unit_volume_acre_foot">Acre Foot</string>
+    <string name="unit_volume_cubic_foot">Kubični čevelj</string>
+    <string name="unit_volume_cubic_inch">Kubični palec</string>
+    <string name="unit_volume_barrel_us">Ameriški sod</string>
+    <string name="unit_volume_gallon_us">Ameriška galona</string>
+    <string name="unit_volume_quart_us">Ameriški kvart</string>
+    <string name="unit_volume_pint_us">Ameriška pinta</string>
+    <string name="unit_volume_legal_cup_us">Ameriška zakonska merilna skodelica</string>
+    <string name="unit_volume_customary_cup_us">Ameriška kuhinjska skodelica</string>
+    <string name="unit_volume_gill_us">Ameriški gil</string>
+    <string name="unit_volume_fluid_ounce_us">Ameriška tekoča unča</string>
+    <string name="unit_volume_barrel_imperial">Imperialni sod</string>
+    <string name="unit_volume_gallon_imperial">Imperialna galona</string>
+    <string name="unit_volume_quart_imperial">Imperialni kvart</string>
+    <string name="unit_volume_pint_imperial">Imperialna pinta</string>
+    <string name="unit_volume_gill_imperial">Imperialni gil</string>
+    <string name="unit_volume_fluid_ounce_imperial">Imperialna tekoča unča</string>
+    <string name="unit_mass">Masa</string>
+    <string name="unit_mass_gram">Gram</string>
+    <string name="unit_mass_kilogram">Kilogram</string>
+    <string name="unit_mass_milligram">Miligram</string>
+    <string name="unit_mass_microgram">Mikrogram</string>
+    <string name="unit_mass_tonne">Tona</string>
+    <string name="unit_mass_pound">Funt</string>
+    <string name="unit_mass_ounce">Unča</string>
+    <string name="unit_mass_grain">Zrno</string>
+    <string name="unit_mass_dram">Dram</string>
+    <string name="unit_mass_stone">Kamen</string>
+    <string name="unit_mass_long_ton">Dolga tona</string>
+    <string name="unit_mass_short_ton">Kratka tona</string>
+    <string name="unit_mass_carat">Karat</string>
+    <string name="unit_mass_carat_metric">Karat (metrični)</string>
+    <string name="unit_temperature">Temperatura</string>
+    <string name="unit_temperature_celsius">Celzija</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">Čas</string>
+    <string name="unit_time_hour">Ura</string>
+    <string name="unit_time_minute">Minuta</string>
+    <string name="unit_time_second">Sekunda</string>
+    <string name="unit_time_millisecond">Milisekunda</string>
+    <string name="unit_time_day">Dan</string>
+    <string name="unit_time_week">Teden</string>
+    <string name="unit_time_year">Leto</string>
+    <string name="unit_speed">Hitrost</string>
+    <string name="unit_speed_meter_per_second">Metri na sekundo</string>
+    <string name="unit_speed_kilometer_per_second">Kilometri na sekundo</string>
+    <string name="unit_speed_kilometer_per_hour">Kilometri na uro</string>
+    <string name="unit_speed_mile_per_hour">Milja na uro</string>
+    <string name="unit_speed_knot">Vozel</string>
+    <string name="unit_speed_foot_per_second">Čevlji na sekundo</string>
+    <string name="unit_speed_mach">Mach</string>
+    <string name="unit_speed_speed_of_light">Svetlobna hitrost</string>
+    <string name="unit_pressure">Pritisk</string>
+    <string name="unit_pressure_pascal">Paskal</string>
+    <string name="unit_pressure_kilopascal">Kilopaskal</string>
+    <string name="unit_pressure_megapascal">Megapaskal</string>
+    <string name="unit_pressure_bar">Bar</string>
+    <string name="unit_pressure_millibar">Milibar</string>
+    <string name="unit_pressure_atmosphere">Atmosfera</string>
+    <string name="unit_pressure_psi">Funt na kvadratni palec</string>
+    <string name="unit_pressure_torr">Torr</string>
+    <string name="unit_pressure_mmhg">Milimeter živega srebra</string>
+    <string name="unit_pressure_inhg">Palec živega srebra</string>
+    <string name="unit_energy">Energija</string>
+    <string name="unit_energy_joule">Džul</string>
+    <string name="unit_energy_kilojoule">Kilodžul</string>
+    <string name="unit_energy_megajoule">Megadžul</string>
+    <string name="unit_energy_gigajoule">Gigadžul</string>
+    <string name="unit_energy_calorie">Kalorija</string>
+    <string name="unit_energy_kilocalorie">Kilokalorija</string>
+    <string name="unit_energy_watt_hour">Vatna ura</string>
+    <string name="unit_energy_kilowatt_hour">Kilovatna ura</string>
+    <string name="unit_energy_megawatt_hour">Megavatna ura</string>
+    <string name="unit_energy_electronvolt">Elektronvolt</string>
+    <string name="unit_energy_btu">Britanska termalna enota</string>
+    <string name="unit_energy_therm">Term</string>
+    <string name="unit_energy_foot_pound">Čevelj-funt</string>
+    <string name="unit_energy_erg">Erg</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3986aa0de..cc9ad8e69 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -96,4 +96,37 @@
     <string name="unit_volume_customary_cup_us">習慣杯（美制）</string>
     <string name="unit_speed_speed_of_light">光速</string>
     <string name="unit_speed">速度</string>
+    <string name="unit_speed_meter_per_second">公尺/秒</string>
+    <string name="unit_speed_kilometer_per_second">公里/秒</string>
+    <string name="unit_speed_kilometer_per_hour">公里/小時</string>
+    <string name="unit_speed_mile_per_hour">英里/小時</string>
+    <string name="unit_speed_knot">節</string>
+    <string name="unit_speed_foot_per_second">英尺/秒</string>
+    <string name="unit_speed_mach">馬赫</string>
+    <string name="unit_pressure">壓力</string>
+    <string name="unit_pressure_pascal">帕斯卡</string>
+    <string name="unit_pressure_kilopascal">千帕</string>
+    <string name="unit_pressure_megapascal">兆帕</string>
+    <string name="unit_pressure_bar">巴</string>
+    <string name="unit_pressure_millibar">毫巴</string>
+    <string name="unit_pressure_atmosphere">大氣壓</string>
+    <string name="unit_pressure_psi">磅/平方英寸</string>
+    <string name="unit_pressure_torr">托</string>
+    <string name="unit_pressure_mmhg">毫米汞柱</string>
+    <string name="unit_pressure_inhg">英寸汞柱</string>
+    <string name="unit_energy">能量</string>
+    <string name="unit_energy_joule">焦耳</string>
+    <string name="unit_energy_kilojoule">千焦</string>
+    <string name="unit_energy_megajoule">兆焦</string>
+    <string name="unit_energy_gigajoule">吉焦耳</string>
+    <string name="unit_energy_calorie">卡路里</string>
+    <string name="unit_energy_kilocalorie">千卡</string>
+    <string name="unit_energy_watt_hour">瓦時</string>
+    <string name="unit_energy_kilowatt_hour">千瓦時</string>
+    <string name="unit_energy_megawatt_hour">兆瓦時</string>
+    <string name="unit_energy_electronvolt">電子伏特</string>
+    <string name="unit_energy_btu">英熱單位</string>
+    <string name="unit_energy_therm">撒姆</string>
+    <string name="unit_energy_foot_pound">英尺磅</string>
+    <string name="unit_energy_erg">爾格</string>
 </resources>