From c1ff163943e4020ad45247dc18f7ab065e414cc2 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 20 Jan 2026 00:27:13 +1000 Subject: [PATCH] Misc: Replace more 'reset' strings with 'restart' --- src/core/achievements.cpp | 4 ++-- src/core/analog_controller.cpp | 4 ++-- src/core/fullscreenui_settings.cpp | 3 ++- src/core/fullscreenui_strings.h | 2 +- src/core/hotkeys.cpp | 2 +- src/core/system.cpp | 6 +++--- src/duckstation-qt/achievementlogindialog.cpp | 4 ++-- src/duckstation-qt/achievementsettingswidget.cpp | 9 +++++---- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index 5f19d1075..3c9f7a2a2 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -1350,12 +1350,12 @@ void Achievements::DisplayHardcoreDeferredMessage() if (FullscreenUI::HasActiveWindow()) { FullscreenUI::ShowToast(OSDMessageType::Info, {}, - TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on system reset.")); + TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on game restart.")); } else { Host::AddIconOSDMessage(OSDMessageType::Info, "AchievementsHardcoreDeferred", ICON_EMOJI_TROPHY, - TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on system reset.")); + TRANSLATE_STR("Achievements", "Hardcore mode will be enabled on game restart.")); } }); } diff --git a/src/core/analog_controller.cpp b/src/core/analog_controller.cpp index cba439edf..4d0cf8967 100644 --- a/src/core/analog_controller.cpp +++ b/src/core/analog_controller.cpp @@ -813,8 +813,8 @@ static constexpr const char* s_shoulder_settings[] = { TRANSLATE_NOOP("AnalogController", "Analog and Digital Modes"), nullptr}; static const SettingInfo s_settings[] = { - {SettingInfo::Type::Boolean, "ForceAnalogOnReset", TRANSLATE_NOOP("AnalogController", "Force Analog Mode on Reset"), - TRANSLATE_NOOP("AnalogController", "Forces the controller to analog mode when the console is reset/powered on."), + {SettingInfo::Type::Boolean, "ForceAnalogOnReset", TRANSLATE_NOOP("AnalogController", "Automatically Enable Analog Mode"), + TRANSLATE_NOOP("AnalogController", "Forces the controller to analog mode when the game is started/restarted."), "true", nullptr, nullptr, nullptr, nullptr, nullptr, 0.0f}, {SettingInfo::Type::Boolean, "AnalogDPadInDigitalMode", TRANSLATE_NOOP("AnalogController", "Use Left Analog for D-Pad in Digital Mode"), diff --git a/src/core/fullscreenui_settings.cpp b/src/core/fullscreenui_settings.cpp index 0153a1e2b..6ac8d11ca 100644 --- a/src/core/fullscreenui_settings.cpp +++ b/src/core/fullscreenui_settings.cpp @@ -4923,7 +4923,8 @@ void FullscreenUI::DrawAchievementsSettingsPage(std::unique_lock& se { OpenConfirmMessageDialog( ICON_EMOJI_INFORMATION, FSUI_ICONVSTR(ICON_FA_HAT_COWBOY, "Hardcore Mode"), - FSUI_STR("Hardcore mode will not be enabled until the system is reset. Do you want to reset the system now?"), + FSUI_STR( + "Hardcore mode will not be enabled until the game is restarted. Do you want to restart the game now?"), [](bool result) { if (result) Host::RunOnCoreThread(&System::ResetSystem); diff --git a/src/core/fullscreenui_strings.h b/src/core/fullscreenui_strings.h index 59d07f344..200c798ff 100644 --- a/src/core/fullscreenui_strings.h +++ b/src/core/fullscreenui_strings.h @@ -404,7 +404,7 @@ TRANSLATE_NOOP("FullscreenUI", "Graphics Settings"); TRANSLATE_NOOP("FullscreenUI", "Green Giant"); TRANSLATE_NOOP("FullscreenUI", "Grey Matter"); TRANSLATE_NOOP("FullscreenUI", "Hardcore Mode"); -TRANSLATE_NOOP("FullscreenUI", "Hardcore mode will not be enabled until the system is reset. Do you want to reset the system now?"); +TRANSLATE_NOOP("FullscreenUI", "Hardcore mode will not be enabled until the game is restarted. Do you want to restart the game now?"); TRANSLATE_NOOP("FullscreenUI", "Hide Cursor In Fullscreen"); TRANSLATE_NOOP("FullscreenUI", "Hides the mouse pointer/cursor when the emulator is in fullscreen mode."); TRANSLATE_NOOP("FullscreenUI", "Hotkeys"); diff --git a/src/core/hotkeys.cpp b/src/core/hotkeys.cpp index 8e9348957..110470c36 100644 --- a/src/core/hotkeys.cpp +++ b/src/core/hotkeys.cpp @@ -173,7 +173,7 @@ DEFINE_NON_ANDROID_HOTKEY("PowerOff", TRANSLATE_NOOP("Hotkeys", "System"), Host::RequestSystemShutdown(true, g_settings.save_state_on_exit, true); }) -DEFINE_HOTKEY("Reset", TRANSLATE_NOOP("Hotkeys", "System"), TRANSLATE_NOOP("Hotkeys", "Reset System"), [](s32 pressed) { +DEFINE_HOTKEY("Reset", TRANSLATE_NOOP("Hotkeys", "System"), TRANSLATE_NOOP("Hotkeys", "Restart Game"), [](s32 pressed) { if (!pressed) Host::RunOnCoreThread(System::ResetSystem); }) diff --git a/src/core/system.cpp b/src/core/system.cpp index a80945831..064196bbe 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -1668,8 +1668,8 @@ void System::ResetSystem() if (IsFastForwardingBoot()) UpdateSpeedLimiterState(); - Host::AddIconOSDMessage(OSDMessageType::Quick, "SystemReset", ICON_FA_POWER_OFF, - TRANSLATE_STR("OSDMessage", "System reset.")); + Host::AddIconOSDMessage(OSDMessageType::Quick, "GameRestarted", ICON_FA_POWER_OFF, + TRANSLATE_STR("OSDMessage", "Game restarted.")); PerformanceCounters::Reset(); ResetThrottler(); @@ -5484,7 +5484,7 @@ void System::UndoLoadState() { Host::AddIconOSDMessage( OSDMessageType::Error, std::move(osd_key), ICON_EMOJI_WARNING, std::move(osd_title), - fmt::format(TRANSLATE_FS("System", "Failed to load undo state, resetting system.\n{}"), error.GetDescription())); + fmt::format(TRANSLATE_FS("System", "Failed to load undo state, restarting game.\n{}"), error.GetDescription())); s_state.undo_load_state.reset(); Host::OnSystemUndoStateAvailabilityChanged(false, 0); ResetSystem(); diff --git a/src/duckstation-qt/achievementlogindialog.cpp b/src/duckstation-qt/achievementlogindialog.cpp index e9a698c9d..6509ba1f8 100644 --- a/src/duckstation-qt/achievementlogindialog.cpp +++ b/src/duckstation-qt/achievementlogindialog.cpp @@ -147,8 +147,8 @@ void AchievementLoginDialog::askToResetGameAndAccept() } QMessageBox* const msgbox = QtUtils::NewMessageBox( - this, QMessageBox::Question, tr("Reset System"), - tr("Hardcore mode will not be enabled until the system is reset. Do you want to reset the system now?"), + this, QMessageBox::Question, tr("Restart Game"), + tr("Hardcore mode will not be enabled until the game is restarted. Do you want to restart the game now?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton); msgbox->connect(msgbox, &QMessageBox::accepted, this, [this]() { g_core_thread->resetSystem(true); diff --git a/src/duckstation-qt/achievementsettingswidget.cpp b/src/duckstation-qt/achievementsettingswidget.cpp index 3c19c918d..c5f38577a 100644 --- a/src/duckstation-qt/achievementsettingswidget.cpp +++ b/src/duckstation-qt/achievementsettingswidget.cpp @@ -93,8 +93,9 @@ AchievementSettingsWidget::AchievementSettingsWidget(SettingsWindow* dialog, QWi dialog->registerWidgetHelp( m_ui.challengeIndicatorMode, tr("Challenge Indicators"), tr("Show Notifications"), tr("Shows a notification or icons in the selected location when a challenge/primed achievement is active.")); - dialog->registerWidgetHelp(m_ui.indicatorLocation, tr("Indicator Location"), tr("Bottom Right"), - tr("Selects the screen location for challenge/progress indicators, and leaderboard trackers.")); + dialog->registerWidgetHelp( + m_ui.indicatorLocation, tr("Indicator Location"), tr("Bottom Right"), + tr("Selects the screen location for challenge/progress indicators, and leaderboard trackers.")); dialog->registerWidgetHelp( m_ui.progressIndicators, tr("Show Progress Indicators"), tr("Checked"), tr("Shows a popup in the selected location when progress towards a measured achievement changes.")); @@ -194,8 +195,8 @@ void AchievementSettingsWidget::onHardcoreModeStateChanged() } QMessageBox* const msgbox = QtUtils::NewMessageBox( - this, QMessageBox::Question, tr("Reset System"), - tr("Hardcore mode will not be enabled until the system is reset. Do you want to reset the system now?"), + this, QMessageBox::Question, tr("Restart Game"), + tr("Hardcore mode will not be enabled until the game is restarted. Do you want to restart the game now?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::NoButton); msgbox->connect(msgbox, &QMessageBox::accepted, this, []() { g_core_thread->resetSystem(true); }); msgbox->open();