Misc: Replace more 'reset' strings with 'restart'

pull/3687/head
Stenzek 8 months ago
parent ce5b358d25
commit c1ff163943
No known key found for this signature in database

@ -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."));
}
});
}

@ -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"),

@ -4923,7 +4923,8 @@ void FullscreenUI::DrawAchievementsSettingsPage(std::unique_lock<std::mutex>& 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);

@ -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");

@ -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);
})

@ -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();

@ -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);

@ -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();

Loading…
Cancel
Save