From df50bdf28d345e2978696966e5e7716d5b919d6d Mon Sep 17 00:00:00 2001
From: lizzie <lizzie@eden-emu.dev>
Date: Sat, 27 Dec 2025 00:25:35 +0000
Subject: [PATCH] [android] Remove option showing temperature as Farenheit

---
 .../features/settings/model/IntSetting.kt         |  1 -
 .../features/settings/model/view/SettingsItem.kt  |  8 --------
 .../yuzu/yuzu_emu/fragments/EmulationFragment.kt  | 15 +--------------
 src/android/app/src/main/jni/android_settings.h   |  7 -------
 .../app/src/main/res/values-ar/strings.xml        |  3 ---
 .../app/src/main/res/values-ckb/strings.xml       |  3 ---
 .../app/src/main/res/values-cs/strings.xml        |  3 ---
 .../app/src/main/res/values-de/strings.xml        |  3 ---
 .../app/src/main/res/values-es/strings.xml        |  3 ---
 .../app/src/main/res/values-fa/strings.xml        |  3 ---
 .../app/src/main/res/values-fr/strings.xml        |  3 ---
 .../app/src/main/res/values-he/strings.xml        |  3 ---
 .../app/src/main/res/values-hu/strings.xml        |  3 ---
 .../app/src/main/res/values-id/strings.xml        |  3 ---
 .../app/src/main/res/values-it/strings.xml        |  3 ---
 .../app/src/main/res/values-ja/strings.xml        |  3 ---
 .../app/src/main/res/values-ko/strings.xml        |  3 ---
 .../app/src/main/res/values-nb/strings.xml        |  3 ---
 .../app/src/main/res/values-pl/strings.xml        |  3 ---
 .../app/src/main/res/values-pt-rBR/strings.xml    |  3 ---
 .../app/src/main/res/values-pt-rPT/strings.xml    |  3 ---
 .../app/src/main/res/values-ru/strings.xml        |  3 ---
 .../app/src/main/res/values-sr/strings.xml        |  3 ---
 .../app/src/main/res/values-uk/strings.xml        |  3 ---
 .../app/src/main/res/values-vi/strings.xml        |  3 ---
 .../app/src/main/res/values-zh-rCN/strings.xml    |  3 ---
 .../app/src/main/res/values-zh-rTW/strings.xml    |  3 ---
 src/android/app/src/main/res/values/arrays.xml    |  5 -----
 src/android/app/src/main/res/values/strings.xml   |  3 ---
 src/common/settings_enums.h                       |  1 -
 30 files changed, 1 insertion(+), 108 deletions(-)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
index aa9ba664e7..69503bd8da 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt
@@ -45,7 +45,6 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
     FAST_CPU_TIME("fast_cpu_time"),
     CPU_TICKS("cpu_ticks"),
     FAST_GPU_TIME("fast_gpu_time"),
-    BAT_TEMPERATURE_UNIT("bat_temperature_unit"),
     CABINET_APPLET("cabinet_applet_mode"),
     CONTROLLER_APPLET("controller_applet_mode"),
     DATA_ERASE_APPLET("data_erase_applet_mode"),
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
index 62929bf371..f680115e8c 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt
@@ -454,14 +454,6 @@ abstract class SettingsItem(
                     descriptionId = R.string.show_bat_temperature_description
                 )
             )
-            put(
-                SingleChoiceSetting(
-                    IntSetting.BAT_TEMPERATURE_UNIT,
-                    R.string.bat_temperature_unit,
-                    choicesId = R.array.temperatureUnitEntries,
-                    valuesId = R.array.temperatureUnitValues
-                )
-            )
             put(
                 SwitchSetting(
                     BooleanSetting.SHOW_POWER_INFO,
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
index 3f5abc0858..e20eab49a6 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt
@@ -1168,17 +1168,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
 
                     if (BooleanSetting.SHOW_BAT_TEMPERATURE.getBoolean(needsGlobal)) {
                         if (sb.isNotEmpty()) sb.append(" | ")
-
                         val batteryTemp = getBatteryTemperature()
-                        when (IntSetting.BAT_TEMPERATURE_UNIT.getInt(needsGlobal)) {
-                            0 -> sb.append(String.format("%.1f°C", batteryTemp))
-                            1 -> sb.append(
-                                String.format(
-                                    "%.1f°F",
-                                    celsiusToFahrenheit(batteryTemp)
-                                )
-                            )
-                        }
+                        sb.append(String.format("%.1f°C", batteryTemp))
                     }
 
                     if (BooleanSetting.SHOW_POWER_INFO.getBoolean(needsGlobal)) {
@@ -1288,10 +1279,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         }
     }
 
-    private fun celsiusToFahrenheit(celsius: Float): Float {
-        return (celsius * 9 / 5) + 32
-    }
-
     private fun updateSocOverlay() {
         val showOverlay = BooleanSetting.SHOW_SOC_OVERLAY.getBoolean()
         binding.showSocOverlayText.apply {
diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.h
index e276f19284..4dea661e01 100644
--- a/src/android/app/src/main/jni/android_settings.h
+++ b/src/android/app/src/main/jni/android_settings.h
@@ -127,13 +127,6 @@ namespace AndroidSettings {
                                                      Settings::Category::Overlay,
                                                      Settings::Specialization::Default, true, true,
                                                      &show_performance_overlay};
-        Settings::Setting<Settings::TemperatureUnits> bat_temperature_unit{linkage,
-                                                                           Settings::TemperatureUnits::Celsius,
-                                                                           "bat_temperature_unit",
-                                                                           Settings::Category::Overlay,
-                                                                           Settings::Specialization::Default,
-                                                                           true, true,
-                                                                           &show_bat_temperature};
         Settings::Setting<bool> show_power_info{linkage, false, "show_power_info",
                                                 Settings::Category::Overlay,
                                                 Settings::Specialization::Default, true, true,
diff --git a/src/android/app/src/main/res/values-ar/strings.xml b/src/android/app/src/main/res/values-ar/strings.xml
index 8f31fe3f32..88aecd22a1 100644
--- a/src/android/app/src/main/res/values-ar/strings.xml
+++ b/src/android/app/src/main/res/values-ar/strings.xml
@@ -51,7 +51,6 @@
     <string name="show_system_ram_usage_description">عرض كمية ذاكرة الوصول العشوائي المستخدمة من قبل النظام</string>
     <string name="show_bat_temperature">عرض درجة حرارة البطارية</string>
     <string name="show_bat_temperature_description">عرض درجة حرارة البطارية الحالية</string>
-    <string name="bat_temperature_unit">وحدات قياس درجة حرارة البطارية</string>
     <string name="show_power_info">عرض معلومات البطارية</string>
     <string name="show_power_info_description">عرض استهلاك الطاقة الحالي والسعة المتبقية في البطارية</string>
     <string name="show_shaders_building">عرض بناء التظليل</string>
@@ -883,8 +882,6 @@
     <string name="gpu_high">مرتفع (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">مئوية</string>
-    <string name="temperature_fahrenheit">فهرنهايت</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">بت</string>
diff --git a/src/android/app/src/main/res/values-ckb/strings.xml b/src/android/app/src/main/res/values-ckb/strings.xml
index 3612202a16..0365ee4845 100644
--- a/src/android/app/src/main/res/values-ckb/strings.xml
+++ b/src/android/app/src/main/res/values-ckb/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">نیشاندانی بڕی RAM کە سیستم بەکاردەهێنێت</string>
     <string name="show_bat_temperature">نیشاندانی پلەی گەرمی بەتری</string>
     <string name="show_bat_temperature_description">پیشاندانی پلەی گەرمی بەترییەکەی ئێستا</string>
-    <string name="bat_temperature_unit">یەکەکانی پلەی گەرمی بەتری</string>
     <string name="show_power_info">پیشاندانی زانیاری بەتری</string>
     <string name="show_power_info_description">پیشاندانی بەکارهێنانی وزە و توانای ماوە لەسەر بەتری</string>
     <string name="show_shaders_building">پیشاندانی دروستکردنی شادەرەکان</string>
@@ -612,8 +611,6 @@
     <string name="gpu_high">بەرز (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">سیلیزی</string>
-    <string name="temperature_fahrenheit">فارینهایت</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-cs/strings.xml b/src/android/app/src/main/res/values-cs/strings.xml
index f1d3cc7a18..a1f7496538 100644
--- a/src/android/app/src/main/res/values-cs/strings.xml
+++ b/src/android/app/src/main/res/values-cs/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">Zobrazit množství RAM využívané systémem</string>
     <string name="show_bat_temperature">Zobrazit teplotu baterie</string>
     <string name="show_bat_temperature_description">Zobrazit aktuální teplotu baterie</string>
-    <string name="bat_temperature_unit">Jednotky teploty baterie</string>
     <string name="show_power_info">Zobrazit informace o baterii</string>
     <string name="show_power_info_description">Zobrazit aktuální odběr energie a zbývající kapacitu baterie</string>
     <string name="show_shaders_building">Zobrazit vytváření shaderů</string>
@@ -602,8 +601,6 @@
     <string name="gpu_high">Vysoké (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsia</string>
-    <string name="temperature_fahrenheit">Fahrenheita</string>
 
     <!-- Renderer APIs -->
     <string name="renderer_vulkan">Vulkan</string>
diff --git a/src/android/app/src/main/res/values-de/strings.xml b/src/android/app/src/main/res/values-de/strings.xml
index 6b51b62acf..a1011dab2c 100644
--- a/src/android/app/src/main/res/values-de/strings.xml
+++ b/src/android/app/src/main/res/values-de/strings.xml
@@ -35,7 +35,6 @@
     <string name="show_system_ram_usage_description">Zeigt den vom System genutzten RAM an</string>
     <string name="show_bat_temperature">Batterietemperatur anzeigen</string>
     <string name="show_bat_temperature_description">Aktuelle Batterietemperatur anzeigen</string>
-    <string name="bat_temperature_unit">Batterietemperatur-Einheiten</string>
     <string name="show_power_info">Batterieinfo anzeigen</string>
     <string name="show_power_info_description">Aktuellen Stromverbrauch und verbleibende Kapazität der Batterie anzeigen</string>
     <string name="show_shaders_building">Shader-Bau anzeigen</string>
@@ -775,8 +774,6 @@ Wirklich fortfahren?</string>
     <string name="gpu_high">Hoch (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-es/strings.xml b/src/android/app/src/main/res/values-es/strings.xml
index 7d7f2aaf7d..48ea9189f4 100644
--- a/src/android/app/src/main/res/values-es/strings.xml
+++ b/src/android/app/src/main/res/values-es/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">Mostrar la cantidad de RAM usada por el sistema</string>
     <string name="show_bat_temperature">Mostrar temperatura de la batería</string>
     <string name="show_bat_temperature_description">Mostrar temperatura actual de la batería</string>
-    <string name="bat_temperature_unit">Unidades de temperatura de la batería</string>
     <string name="show_power_info">Mostrar información de la batería</string>
     <string name="show_power_info_description">Muestra el consumo de energía actual y la capacidad restante de la batería</string>
     <string name="show_shaders_building">Mostrar construcción de sombreadores</string>
@@ -818,8 +817,6 @@
     <string name="gpu_high">Alto (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-fa/strings.xml b/src/android/app/src/main/res/values-fa/strings.xml
index ef7bdadfe2..4de78a944d 100644
--- a/src/android/app/src/main/res/values-fa/strings.xml
+++ b/src/android/app/src/main/res/values-fa/strings.xml
@@ -28,7 +28,6 @@
     <string name="show_system_ram_usage_description">نمایش میزان رم استفاده شده توسط سیستم</string>
     <string name="show_bat_temperature">نمایش دمای باتری</string>
     <string name="show_bat_temperature_description">نمایش دمای فعلی باتری</string>
-    <string name="bat_temperature_unit">واحدهای دمای باتری</string>
     <string name="show_power_info">نمایش اطلاعات باتری</string>
     <string name="show_power_info_description">نمایش مصرف فعلی برق و ظرفیت باقی‌مانده باتری</string>
     <string name="overlay_position">موقعیت اورلی</string>
@@ -95,8 +94,6 @@
     <string name="gpu_high">بالا (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">سلسیوس</string>
-    <string name="temperature_fahrenheit">فارنهایت</string>
 
     <string name="use_fast_cpu_time">زمان CPU سریع</string>
     <string name="use_fast_cpu_time_description">CPU شبیه‌سازی شده را مجبور می‌کند با سرعت کلاک بالاتر کار کند، که برخی محدودکننده‌های FPS را کاهش می‌دهد. این گزینه ناپایدار است و ممکن است باعث مشکلات شود و CPUهای ضعیف‌تر ممکن است کاهش عملکرد را تجربه کنند.</string>
diff --git a/src/android/app/src/main/res/values-fr/strings.xml b/src/android/app/src/main/res/values-fr/strings.xml
index 9574293e1b..1368e80c82 100644
--- a/src/android/app/src/main/res/values-fr/strings.xml
+++ b/src/android/app/src/main/res/values-fr/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">Afficher la quantité de RAM utilisée par le système</string>
     <string name="show_bat_temperature">Temp. batterie</string>
     <string name="show_bat_temperature_description">Afficher la température actuelle de la batterie</string>
-    <string name="bat_temperature_unit">Unités de température de batterie</string>
     <string name="show_power_info">Afficher les infos batterie</string>
     <string name="show_power_info_description">Afficher la consommation actuelle et la capacité restante de la batterie</string>
     <string name="show_shaders_building">Afficher la construction des shaders</string>
@@ -845,8 +844,6 @@
     <string name="gpu_high">Élevé (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-he/strings.xml b/src/android/app/src/main/res/values-he/strings.xml
index 171ee78806..59a0ce0d75 100644
--- a/src/android/app/src/main/res/values-he/strings.xml
+++ b/src/android/app/src/main/res/values-he/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">הצג את כמות ה-RAM שבה המערכת משתמשת</string>
     <string name="show_bat_temperature">הצג טמפרטורת סוללה</string>
     <string name="show_bat_temperature_description">הצג טמפרטורת סוללה נוכחית</string>
-    <string name="bat_temperature_unit">יחידות טמפרטורת סוללה</string>
     <string name="show_power_info">הצג מידע סוללה</string>
     <string name="show_power_info_description">הצג צריכת חשמל נוכחית וקיבולת סוללה remaining</string>
     <string name="show_shaders_building">הצג בניית שיידרים</string>
@@ -647,8 +646,6 @@
     <string name="gpu_high">גבוה (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">צלזיוס</string>
-    <string name="temperature_fahrenheit">פרנהייט</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-hu/strings.xml b/src/android/app/src/main/res/values-hu/strings.xml
index 6e6784c4a6..6d3f8dff75 100644
--- a/src/android/app/src/main/res/values-hu/strings.xml
+++ b/src/android/app/src/main/res/values-hu/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">A rendszer által használt RAM mennyiségének megjelenítése</string>
     <string name="show_bat_temperature">Akkumulátor hőmérséklet</string>
     <string name="show_bat_temperature_description">Az akkumulátor jelenlegi hőmérsékletének megjelenítése</string>
-    <string name="bat_temperature_unit">Akkumulátor hőmérséklet egységek</string>
     <string name="show_power_info">Akkumulátor információk</string>
     <string name="show_power_info_description">Jelenlegi energiafelhasználás és remaining kapacitás megjelenítése</string>
     <string name="show_shaders_building">Shader-építés megjelenítése</string>
@@ -742,8 +741,6 @@
     <string name="gpu_high">Magas (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-id/strings.xml b/src/android/app/src/main/res/values-id/strings.xml
index 7f3846890f..02ace45d82 100644
--- a/src/android/app/src/main/res/values-id/strings.xml
+++ b/src/android/app/src/main/res/values-id/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">Tampilkan jumlah RAM yang digunakan oleh sistem</string>
     <string name="show_bat_temperature">Tampilkan Suhu Baterai</string>
     <string name="show_bat_temperature_description">Tampilkan suhu baterai saat ini</string>
-    <string name="bat_temperature_unit">Satuan Suhu Baterai</string>
     <string name="show_power_info">Tampilkan Info Baterai</string>
     <string name="show_power_info_description">Tampilkan pengeluaran daya saat ini dan kapasitas baterai yang tersisa</string>
     <string name="show_shaders_building">Tampilkan Pembuatan Shader</string>
@@ -791,8 +790,6 @@
     <string name="gpu_high">Tinggi (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-it/strings.xml b/src/android/app/src/main/res/values-it/strings.xml
index 3dc87d69bc..4d7b4720ab 100644
--- a/src/android/app/src/main/res/values-it/strings.xml
+++ b/src/android/app/src/main/res/values-it/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">Mostra la quantità di RAM utilizzata dal sistema</string>
     <string name="show_bat_temperature">Mostra temperatura batteria</string>
     <string name="show_bat_temperature_description">Mostra temperatura attuale della batteria</string>
-    <string name="bat_temperature_unit">Unità temperatura batteria</string>
     <string name="show_power_info">Mostra informazioni batteria</string>
     <string name="show_power_info_description">Mostra consumo energetico attuale e capacità rimanente della batteria</string>
     <string name="show_shaders_building">Mostra costruzione shader</string>
@@ -830,8 +829,6 @@
     <string name="gpu_high">Alto (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-ja/strings.xml b/src/android/app/src/main/res/values-ja/strings.xml
index 0dbd0cf8dc..c5f7ca0ffb 100644
--- a/src/android/app/src/main/res/values-ja/strings.xml
+++ b/src/android/app/src/main/res/values-ja/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">システムが使用しているRAMの量を表示</string>
     <string name="show_bat_temperature">バッテリー温度</string>
     <string name="show_bat_temperature_description">現在のバッテリー温度を表示</string>
-    <string name="bat_temperature_unit">バッテリー温度単位</string>
     <string name="show_power_info">バッテリー情報を表示</string>
     <string name="show_power_info_description">現在の電力消費量とバッテリー残量を表示</string>
     <string name="show_shaders_building">シェーダー構築を表示</string>
@@ -647,8 +646,6 @@
     <string name="gpu_high">高 (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">摂氏</string>
-    <string name="temperature_fahrenheit">華氏</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-ko/strings.xml b/src/android/app/src/main/res/values-ko/strings.xml
index a77a5870e8..420b426f23 100644
--- a/src/android/app/src/main/res/values-ko/strings.xml
+++ b/src/android/app/src/main/res/values-ko/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">시스템이 사용 중인 RAM 양 표시</string>
     <string name="show_bat_temperature">배터리 온도 표시</string>
     <string name="show_bat_temperature_description">현재 배터리 온도 표시</string>
-    <string name="bat_temperature_unit">배터리 온도 단위</string>
     <string name="show_power_info">배터리 정보 표시</string>
     <string name="show_power_info_description">현재 전력 소모량 및 배터리 잔량 표시</string>
     <string name="show_shaders_building">셰이더 빌드 표시</string>
@@ -701,8 +700,6 @@
     <string name="gpu_high">높음 (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">섭씨</string>
-    <string name="temperature_fahrenheit">화씨</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-nb/strings.xml b/src/android/app/src/main/res/values-nb/strings.xml
index f28574e377..9ff5b0ba7e 100644
--- a/src/android/app/src/main/res/values-nb/strings.xml
+++ b/src/android/app/src/main/res/values-nb/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">Vis hvor mye RAM systemet bruker</string>
     <string name="show_bat_temperature">Vis batteritemperatur</string>
     <string name="show_bat_temperature_description">Vis gjeldende batteritemperatur</string>
-    <string name="bat_temperature_unit">Batteritemperatursenheter</string>
     <string name="show_power_info">Vis batteriinfo</string>
     <string name="show_power_info_description">Vis gjeldende strømforbruk og gjenværende batterikapasitet</string>
     <string name="show_shaders_building">Vis bygging av shadere</string>
@@ -625,8 +624,6 @@
     <string name="gpu_high">Høy (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-pl/strings.xml b/src/android/app/src/main/res/values-pl/strings.xml
index f30f16dfdc..5eab33e114 100644
--- a/src/android/app/src/main/res/values-pl/strings.xml
+++ b/src/android/app/src/main/res/values-pl/strings.xml
@@ -51,7 +51,6 @@
     <string name="show_system_ram_usage_description">Wyświetl ilość pamięci RAM używanej przez system</string>
     <string name="show_bat_temperature">Pokaż temperaturę baterii</string>
     <string name="show_bat_temperature_description">Wyświetl aktualną temperaturę baterii</string>
-    <string name="bat_temperature_unit">Jednostki temperatury baterii</string>
     <string name="show_power_info">Pokaż informacje o baterii</string>
     <string name="show_power_info_description">Wyświetl aktualne zużycie energii i pozostałą pojemność baterii</string>
     <string name="show_shaders_building">Pokaż budowanie shaderów</string>
@@ -879,8 +878,6 @@
     <string name="gpu_high">Wysokie (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsjusza</string>
-    <string name="temperature_fahrenheit">Fahrenheita</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-pt-rBR/strings.xml b/src/android/app/src/main/res/values-pt-rBR/strings.xml
index 3b91f6eebf..50643156d3 100644
--- a/src/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">Exibir a quantidade de memória usada pelo sistema</string>
     <string name="show_bat_temperature">Mostrar Temperatura da Bateria</string>
     <string name="show_bat_temperature_description">Exibir a temperatura atual da bateria</string>
-    <string name="bat_temperature_unit">Unidade de Temperatura da Bateria</string>
     <string name="show_power_info">Mostrar Informações da Bateria</string>
     <string name="show_power_info_description">Exibir consumo de energia atual e capacidade restante da bateria</string>
     <string name="show_shaders_building">Mostrar Construção de Shaders</string>
@@ -819,8 +818,6 @@ uma tentativa de mapeamento automático</string>
     <string name="gpu_high">Alto (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-pt-rPT/strings.xml b/src/android/app/src/main/res/values-pt-rPT/strings.xml
index d05d2cb4f4..992bda43b0 100644
--- a/src/android/app/src/main/res/values-pt-rPT/strings.xml
+++ b/src/android/app/src/main/res/values-pt-rPT/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">Mostrar a quantidade de RAM utilizada pelo sistema</string>
     <string name="show_bat_temperature">Mostrar Temp. Bateria</string>
     <string name="show_bat_temperature_description">Mostrar temperatura atual da bateria</string>
-    <string name="bat_temperature_unit">Unidades de temperatura da bateria</string>
     <string name="show_power_info">Mostrar informações da bateria</string>
     <string name="show_power_info_description">Mostrar consumo atual de energia e capacidade restante da bateria</string>
     <string name="show_shaders_building">Mostrar construção de shaders</string>
@@ -754,8 +753,6 @@ uma tentativa de mapeamento automático</string>
     <string name="gpu_high">Alto (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-ru/strings.xml b/src/android/app/src/main/res/values-ru/strings.xml
index b2c9fc5b6d..d2a423533e 100644
--- a/src/android/app/src/main/res/values-ru/strings.xml
+++ b/src/android/app/src/main/res/values-ru/strings.xml
@@ -51,7 +51,6 @@
     <string name="show_system_ram_usage_description">Показать объем оперативной памяти, используемой системой</string>
     <string name="show_bat_temperature">Показать температуру батареи</string>
     <string name="show_bat_temperature_description">Показать текущую температуру аккумулятора</string>
-    <string name="bat_temperature_unit">Единицы температуры аккумулятора</string>
     <string name="show_power_info">Показать информацию о батарее</string>
     <string name="show_power_info_description">Показать текущее энергопотребление и оставшуюся емкость аккумулятора</string>
     <string name="show_shaders_building">Показать компиляцию шейдеров</string>
@@ -879,8 +878,6 @@
     <string name="gpu_high">Высокий (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Цельсий</string>
-    <string name="temperature_fahrenheit">Фаренгейт</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-sr/strings.xml b/src/android/app/src/main/res/values-sr/strings.xml
index 1167f70973..59a99b34d1 100644
--- a/src/android/app/src/main/res/values-sr/strings.xml
+++ b/src/android/app/src/main/res/values-sr/strings.xml
@@ -25,7 +25,6 @@
     <string name="show_system_ram_usage_description">Прикажите износ РАМ-а који користи систем</string>
     <string name="show_bat_temperature">Прикажи температуру батерије</string>
     <string name="show_bat_temperature_description">Прикажи тренутну температуру батерије</string>
-    <string name="bat_temperature_unit">Јединице за температуру батерије</string>
     <string name="show_power_info">Прикажи информације о батерији</string>
     <string name="show_power_info_description">Приказ тренутне потрошње енергије и преостали капацитет батерије</string>
     <string name="show_shaders_building">Прикажи Схадерс Буилдинг</string>
@@ -751,8 +750,6 @@
     <string name="gpu_high">Висок (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Целзијус</string>
-    <string name="temperature_fahrenheit">Фаренхајт</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">Б</string>
diff --git a/src/android/app/src/main/res/values-uk/strings.xml b/src/android/app/src/main/res/values-uk/strings.xml
index 253ca47211..98bb64e9c6 100644
--- a/src/android/app/src/main/res/values-uk/strings.xml
+++ b/src/android/app/src/main/res/values-uk/strings.xml
@@ -51,7 +51,6 @@
     <string name="show_system_ram_usage_description">Показати обсяг оперативної пам\'яті, яку використовує система</string>
     <string name="show_bat_temperature">Показати температуру батареї</string>
     <string name="show_bat_temperature_description">Показати поточну температуру акумулятора</string>
-    <string name="bat_temperature_unit">Одиниці виміру температури акумулятора</string>
     <string name="show_power_info">Показати інформацію про акумулятор</string>
     <string name="show_power_info_description">Показати поточне споживання енергії та залишкову ємність акумулятора</string>
     <string name="show_shaders_building">Показати побудову шейдерів</string>
@@ -879,8 +878,6 @@
     <string name="gpu_high">Високий (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Цельсій</string>
-    <string name="temperature_fahrenheit">Фаренгейт</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">Б</string>
diff --git a/src/android/app/src/main/res/values-vi/strings.xml b/src/android/app/src/main/res/values-vi/strings.xml
index a185dce86b..63c725f48b 100644
--- a/src/android/app/src/main/res/values-vi/strings.xml
+++ b/src/android/app/src/main/res/values-vi/strings.xml
@@ -27,7 +27,6 @@
     <string name="show_system_ram_usage_description">Hiển thị lượng RAM được hệ thống sử dụng</string>
     <string name="show_bat_temperature">Hiển thị nhiệt độ pin</string>
     <string name="show_bat_temperature_description">Hiển thị nhiệt độ pin hiện tại</string>
-    <string name="bat_temperature_unit">Đơn vị nhiệt độ pin</string>
     <string name="show_power_info">Hiển thị thông tin pin</string>
     <string name="show_power_info_description">Hiển thị mức tiêu thụ điện hiện tại và dung lượng pin còn lại</string>
     <string name="show_shaders_building">Hiển thị xây dựng shader</string>
@@ -625,8 +624,6 @@
     <string name="gpu_high">Cao (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-zh-rCN/strings.xml b/src/android/app/src/main/res/values-zh-rCN/strings.xml
index 6b7aa35c66..e941404ec5 100644
--- a/src/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -48,7 +48,6 @@
     <string name="show_system_ram_usage_description">显示系统使用的内存量</string>
     <string name="show_bat_temperature">显示电池温度</string>
     <string name="show_bat_temperature_description">显示当前电池温度</string>
-    <string name="bat_temperature_unit">电池温度单位</string>
     <string name="show_power_info">显示电池信息</string>
     <string name="show_power_info_description">显示当前功耗和电池剩余容量</string>
     <string name="show_shaders_building">显示着色器构建</string>
@@ -870,8 +869,6 @@
     <string name="gpu_high">高 (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">摄氏度</string>
-    <string name="temperature_fahrenheit">华氏度</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values-zh-rTW/strings.xml b/src/android/app/src/main/res/values-zh-rTW/strings.xml
index baa7599210..31e3617e4d 100644
--- a/src/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/src/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -51,7 +51,6 @@
     <string name="show_system_ram_usage_description">顯示系統使用的記憶體量</string>
     <string name="show_bat_temperature">顯示電池溫度</string>
     <string name="show_bat_temperature_description">顯示電池溫度</string>
-    <string name="bat_temperature_unit">電池溫度單位</string>
     <string name="show_power_info">顯示電池資訊</string>
     <string name="show_power_info_description">顯示當前功耗和電池可續航時間</string>
     <string name="show_shaders_building">當著色器在編譯時顯示</string>
@@ -873,8 +872,6 @@
     <string name="gpu_high">高 (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">攝氏度</string>
-    <string name="temperature_fahrenheit">華氏度</string>
 
     <!-- Memory Sizes -->
     <string name="memory_byte_shorthand">B</string>
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 93fd4ff780..21ff29e7ba 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -559,11 +559,6 @@
         <item>2</item>
     </integer-array>
 
-    <string-array name="temperatureUnitEntries">
-        <item>@string/temperature_celsius</item>
-        <item>@string/temperature_fahrenheit</item>
-    </string-array>
-
     <integer-array name="temperatureUnitValues">
         <item>0</item>
         <item>1</item>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 9002d74bb8..b2cebf5f5a 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -56,7 +56,6 @@
     <string name="show_system_ram_usage_description">Display the amount of RAM used by the system</string>
     <string name="show_bat_temperature">Show Battery Temperature</string>
     <string name="show_bat_temperature_description">Display current battery temperature</string>
-    <string name="bat_temperature_unit">Battery Temperature Units</string>
     <string name="show_power_info">Show Battery Info</string>
     <string name="show_power_info_description">Display current power draw and remaining capacity on battery</string>
     <string name="show_shaders_building">Show Shaders Building</string>
@@ -886,8 +885,6 @@
     <string name="gpu_high">High (512)</string>
 
     <!-- Temperature Units -->
-    <string name="temperature_celsius">Celsius</string>
-    <string name="temperature_fahrenheit">Fahrenheit</string>
 
     <!-- Language Names -->
     <string name="language_japanese" translatable="false">日本語</string>
diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h
index 5090349270..9410a78372 100644
--- a/src/common/settings_enums.h
+++ b/src/common/settings_enums.h
@@ -150,7 +150,6 @@ ENUM(ConsoleMode, Handheld, Docked);
 ENUM(AppletMode, HLE, LLE);
 ENUM(SpirvOptimizeMode, Never, OnLoad, Always);
 ENUM(GpuOverclock, Low, Medium, High)
-ENUM(TemperatureUnits, Celsius, Fahrenheit)
 
 template <typename Type>
 inline std::string_view CanonicalizeEnum(Type id) {