From 2fa88c4868f2d0378c946c02edac68a995b25029 Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Thu, 6 Aug 2026 16:10:24 -0400 Subject: [PATCH] Fix strings and some minor adjustment to settings --- .../app/src/main/res/values-ar/strings.xml | 1 - .../app/src/main/res/values-de/strings.xml | 1 - .../app/src/main/res/values-es/strings.xml | 1 - .../app/src/main/res/values-fr/strings.xml | 1 - .../app/src/main/res/values-pl/strings.xml | 1 - .../app/src/main/res/values-ru/strings.xml | 1 - .../app/src/main/res/values-uk/strings.xml | 1 - .../src/main/res/values-zh-rCN/strings.xml | 1 - .../app/src/main/res/values/strings.xml | 21 +++++++++---------- src/common/settings_enums.h | 4 ++-- src/core/core_timing.cpp | 6 +++--- src/qt_common/config/shared_translation.cpp | 21 ++++++++----------- src/video_core/gpu.cpp | 2 +- 13 files changed, 25 insertions(+), 37 deletions(-) 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 616f160fd1..dd03ec453f 100644 --- a/src/android/app/src/main/res/values-ar/strings.xml +++ b/src/android/app/src/main/res/values-ar/strings.xml @@ -958,7 +958,6 @@ سريع (2000MHz) - تعطيل متوسط (256) مرتفع (512) 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 182247580c..1c3b6c148f 100644 --- a/src/android/app/src/main/res/values-de/strings.xml +++ b/src/android/app/src/main/res/values-de/strings.xml @@ -884,7 +884,6 @@ Wirklich fortfahren? Schnell (2000MHz) - Aus Mittel (256) Hoch (512) 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 37bd14b2d1..a5092c4b2f 100644 --- a/src/android/app/src/main/res/values-es/strings.xml +++ b/src/android/app/src/main/res/values-es/strings.xml @@ -950,7 +950,6 @@ Rápido (2000MHz) - Desactivado Medio (256) Alto (512) 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 2cf6a1da91..602a542c5f 100644 --- a/src/android/app/src/main/res/values-fr/strings.xml +++ b/src/android/app/src/main/res/values-fr/strings.xml @@ -897,7 +897,6 @@ Rapide (2000MHz) - Désactivé Moyen (256) Élevé (512) 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 d96d420a98..4bcebd5a8c 100644 --- a/src/android/app/src/main/res/values-pl/strings.xml +++ b/src/android/app/src/main/res/values-pl/strings.xml @@ -871,7 +871,6 @@ Szybkie (2000MHz) - Wyłączone Średnie (256) Wysokie (512) 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 6e85084b77..3dbeb6ffdb 100644 --- a/src/android/app/src/main/res/values-ru/strings.xml +++ b/src/android/app/src/main/res/values-ru/strings.xml @@ -954,7 +954,6 @@ Быстрая (2000MHz) - Выкл. Среднее (256) Высокое (512) 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 86ea6ba787..83893210bd 100644 --- a/src/android/app/src/main/res/values-uk/strings.xml +++ b/src/android/app/src/main/res/values-uk/strings.xml @@ -943,7 +943,6 @@ Швидко (2000 МГц) - Вимкнено Середньо (256) Високо (512) 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 ff2db086e3..1e6ba26041 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 @@ -948,7 +948,6 @@ 快速 (2000MHz) - 关闭 中 (256) 高 (512) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index d534ebb37c..bb1d85db82 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -451,7 +451,7 @@ CPU Clocks - Forces the emulated CPU to run at a higher clock, reducing certain FPS limiters. Normal is the Switch\'s 1020MHz base clock, Boost (1734MHz) matches its highest native clock, and Fast (2040MHz) runs at 2x base. + Raises the clock the emulated CPU reports, which removes some FPS limiters. Weaker CPUs may see reduced performance, and certain games may behave improperly. Custom CPU Ticks Set a custom value of CPU ticks. Higher values can increase performance, but may also cause the game to freeze. A range of 77–21000 is recommended. Ticks @@ -513,7 +513,7 @@ Hacks GPU Clocks - Makes the game believe GPU work finishes faster than it does, which stops it from lowering resolution or framerate to fit the Switch\'s clocks. Multiplies the reported GPU speed by 256x or 512x. + Makes the game believe GPU work finishes faster than it does, so it stops lowering resolution and render distance to fit the Switch\'s clocks. Skip CPU Inner Invalidation Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it\'s performance. This may cause glitches or crashes on some games. Fix Bloom Effects @@ -969,16 +969,15 @@ 6GB (Unsafe) 8GB (Unsafe) - - Normal (1020MHz) - Boost (1734MHz) - Fast (2040MHz) + + Normal + Boost + Overclock - - Off - Normal (native) - Boost (256x) - Fast (512x) + + Normal + Boost + Overclock Very Small (16 MB) diff --git a/src/common/settings_enums.h b/src/common/settings_enums.h index edcc608b57..3d0131de70 100644 --- a/src/common/settings_enums.h +++ b/src/common/settings_enums.h @@ -140,7 +140,7 @@ ENUM(DmaAccuracy, Default, Unsafe, Safe); ENUM(GpuFenceBehavior, Default, Immediate, Balanced, Accurate, Strict); ENUM(CpuBackend, Dynarmic, Nce); ENUM(CpuAccuracy, Auto, Accurate, Unsafe, Paranoid, Debugging); -ENUM(CpuClock, Normal, Boost, Fast) +ENUM(CpuClock, Normal, Boost, Overclock) ENUM(MemoryLayout, Memory_4Gb, Memory_6Gb, Memory_8Gb, Memory_10Gb, Memory_12Gb); ENUM(ConfirmStop, Ask_Always, Ask_Based_On_Game, Ask_Never); ENUM(FullscreenMode, Borderless, Exclusive); @@ -152,7 +152,7 @@ ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch); ENUM(ConsoleMode, Handheld, Docked); ENUM(AppletMode, HLE, LLE); ENUM(SpirvOptimizeMode, Never, OnLoad, Always); -ENUM(GpuClock, Normal, Boost, Fast) +ENUM(GpuClock, Normal, Boost, Overclock) ENUM(GpuUnswizzleSize, VerySmall, Small, Normal, Large, VeryLarge) ENUM(GpuUnswizzle, VeryLow, Low, Normal, Medium, High) ENUM(GpuUnswizzleChunk, VeryLow, Low, Normal, Medium, High) diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 7b53ae3200..d2ee6769cc 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp @@ -25,14 +25,14 @@ constexpr s64 MAX_SLICE_LENGTH = 10000; constexpr u32 CPU_CLOCK_BASE_MHZ = 1020; constexpr u32 CPU_CLOCK_BOOST_MHZ = 1734; -constexpr u32 CPU_CLOCK_FAST_MHZ = 2040; +constexpr u32 CPU_CLOCK_OVERCLOCK_MHZ = 2040; constexpr u32 CpuClockTargetMhz(Settings::CpuClock clock) { switch (clock) { case Settings::CpuClock::Boost: return CPU_CLOCK_BOOST_MHZ; - case Settings::CpuClock::Fast: - return CPU_CLOCK_FAST_MHZ; + case Settings::CpuClock::Overclock: + return CPU_CLOCK_OVERCLOCK_MHZ; default: return CPU_CLOCK_BASE_MHZ; } diff --git a/src/qt_common/config/shared_translation.cpp b/src/qt_common/config/shared_translation.cpp index a42344647c..26597d412c 100644 --- a/src/qt_common/config/shared_translation.cpp +++ b/src/qt_common/config/shared_translation.cpp @@ -93,10 +93,8 @@ std::unique_ptr InitializeTranslations(QObject* parent) { INSERT(Settings, cpu_backend, tr("Backend:"), QString()); INSERT(Settings, cpu_clock, tr("CPU Clocks"), - tr("Sets the clock the emulated CPU reports, which removes some FPS limiters. Weaker " - "CPUs may see reduced performance, and certain games may behave improperly.\n" - "Normal is the Switch's 1020MHz base clock, Boost (1734MHz) matches its highest " - "native clock, and Fast (2040MHz) runs at 2x base.")); + tr("Raises the clock the emulated CPU reports, which removes some FPS limiters.\n" + "Weaker CPUs may see reduced performance, and certain games may behave improperly.")); INSERT(Settings, use_custom_cpu_ticks, QString(), QString()); INSERT(Settings, cpu_ticks, tr("Custom CPU Ticks"), @@ -231,8 +229,7 @@ std::unique_ptr InitializeTranslations(QObject* parent) { tr("May reduce shader stutter.")); INSERT(Settings, gpu_clock, tr("GPU Clocks"), tr("Makes the game believe GPU work finishes faster than it does, so it stops lowering " - "resolution and render distance to fit the Switch's clocks.\nBoost reports 256x the " - "GPU speed, Fast reports 512x.")); + "resolution and render distance to fit the Switch's clocks.")); INSERT(Settings, gpu_unswizzle_enabled, tr("GPU Unswizzle"), tr("Accelerates BCn 3D texture decoding using GPU compute.\n" "Disable if experiencing crashes or graphical glitches.")); @@ -639,9 +636,9 @@ std::unique_ptr ComboboxEnumeration(QObject* parent) { }}); translations->insert({Settings::EnumMetadata::Index(), { - PAIR(CpuClock, Normal, tr("Normal (1020MHz)")), - PAIR(CpuClock, Boost, tr("Boost (1734MHz)")), - PAIR(CpuClock, Fast, tr("Fast (2040MHz)")), + PAIR(CpuClock, Normal, tr("Normal")), + PAIR(CpuClock, Boost, tr("Boost")), + PAIR(CpuClock, Overclock, tr("Overclock")), }}); translations->insert( {Settings::EnumMetadata::Index(), @@ -652,9 +649,9 @@ std::unique_ptr ComboboxEnumeration(QObject* parent) { }}); translations->insert({Settings::EnumMetadata::Index(), { - PAIR(GpuClock, Normal, tr("Normal (native)")), - PAIR(GpuClock, Boost, tr("Boost (256x)")), - PAIR(GpuClock, Fast, tr("Fast (512x)")), + PAIR(GpuClock, Normal, tr("Normal")), + PAIR(GpuClock, Boost, tr("Boost")), + PAIR(GpuClock, Overclock, tr("Overclock")), }}); translations->insert({Settings::EnumMetadata::Index(), { diff --git a/src/video_core/gpu.cpp b/src/video_core/gpu.cpp index 4c948cea19..a44015c0dd 100644 --- a/src/video_core/gpu.cpp +++ b/src/video_core/gpu.cpp @@ -45,7 +45,7 @@ constexpr u64 GpuClockMultiplier(Settings::GpuClock clock) { switch (clock) { case Settings::GpuClock::Boost: return 256; - case Settings::GpuClock::Fast: + case Settings::GpuClock::Overclock: return 512; default: return 1;