VERY experimental Nintendo Switch 2 emulator
C++
[qt] Update FAQ links (#3710)
lizzie20f9aa4cfecf
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 68e9570671..f073000380 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -3,7 +3,7 @@<!-- General application strings --><string name="app_name" translatable="false">Eden</string>- <string name="app_disclaimer">This software will run games for the Nintendo Switch game console. No game titles or keys are included.<br /><br />Before you begin, please locate your <![CDATA[<b> prod.keys </b>]]> file on your device storage.<br /><br /><![CDATA[<a href=\"https://yuzu-mirror.github.io/help/quickstart\">Learn more</a>]]></string>+ <string name="app_disclaimer">This software will run games for the Nintendo Switch game console. No game titles or keys are included.<br /><br />Before you begin, please locate your <![CDATA[<b> prod.keys </b>]]> file on your device storage.<br /><br /><![CDATA[<a href=\"https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/QuickStart.md\">Learn more</a>]]></string><string name="notice_notification_channel_name">Notices and errors</string><string name="notice_notification_channel_id" translatable="false">noticesAndErrors</string><string name="notice_notification_channel_description">Shows notifications when something goes wrong.</string>@@ -933,7 +933,7 @@<string name="loader_error_file_not_found">ROM file does not exist</string><string name="loader_requires_firmware">Game Requires Firmware</string>- <string name="loader_requires_firmware_description"><![CDATA[The game you are trying to launch requires firmware to boot or to get past the opening menu. Please <a href=\"https://yuzu-mirror.github.io/help/quickstart\"> dump and install firmware</a>, or press \"OK\" to launch anyways.]]></string>+ <string name="loader_requires_firmware_description"><![CDATA[This game may require firmware to function properly, and you don\'t have any installed. Please install firmware before launching, or press \"OK\" to launch anyways.]]></string><!-- Intent Launch strings --><string name="searching_for_game">Searching for game...</string>diff --git a/src/qt_common/util/content.cpp b/src/qt_common/util/content.cppindex f22242e7f7..2838cd854e 100644--- a/src/qt_common/util/content.cpp+++ b/src/qt_common/util/content.cpp@@ -28,9 +28,8 @@ bool CheckGameFirmware(u64 program_id) {!FirmwareManager::CheckFirmwarePresence(*system)) {auto result = QtCommon::Frontend::Warning(tr("Game Requires Firmware"),- tr("The game you are trying to launch requires firmware to boot or to get past the "- "opening menu. Please <a href='https://yuzu-mirror.github.io/help/quickstart'>"- "dump and install firmware</a>, or press \"OK\" to launch anyways."),+ tr("This game may require firmware to function properly, and you don't have any installed. "+ "Please install firmware before launching, or press \"OK\" to launch anyways."),QtCommon::Frontend::Ok | QtCommon::Frontend::Cancel);return result == QtCommon::Frontend::Ok;diff --git a/src/yuzu/main.ui b/src/yuzu/main.uiindex c858be3cb3..13ded52cc0 100644--- a/src/yuzu/main.ui+++ b/src/yuzu/main.ui@@ -233,8 +233,7 @@</property><addaction name="action_Report_Compatibility"/><addaction name="action_Open_Mods_Page"/>- <addaction name="action_Open_Quickstart_Guide"/>- <addaction name="action_Open_FAQ"/>+ <addaction name="action_Open_UserHandbook"/><addaction name="separator"/><addaction name="action_About"/><addaction name="action_Eden_Dependencies"/>@@ -407,14 +406,9 @@<string>Open &Mods Page</string></property></action>- <action name="action_Open_Quickstart_Guide">+ <action name="action_Open_UserHandbook"><property name="text">- <string>Open &Quickstart Guide</string>- </property>- </action>- <action name="action_Open_FAQ">- <property name="text">- <string>&FAQ</string>+ <string>&User Handbook</string></property></action><action name="action_Capture_Screenshot">diff --git a/src/yuzu/main_window.cpp b/src/yuzu/main_window.cppindex 3f7feb83b2..9a167e18f7 100644--- a/src/yuzu/main_window.cpp+++ b/src/yuzu/main_window.cpp@@ -1506,8 +1506,7 @@ void MainWindow::ConnectMenuEvents() {connect_menu(ui->action_Pause, &MainWindow::OnPauseContinueGame);connect_menu(ui->action_Stop, &MainWindow::OnStopGame);connect_menu(ui->action_Open_Mods_Page, &MainWindow::OnOpenModsPage);- connect_menu(ui->action_Open_Quickstart_Guide, &MainWindow::OnOpenQuickstartGuide);- connect_menu(ui->action_Open_FAQ, &MainWindow::OnOpenFAQ);+ connect_menu(ui->action_Open_UserHandbook, &MainWindow::OnOpenUserHandbook);connect_menu(ui->action_Restart, &MainWindow::OnRestartGame);connect_menu(ui->action_Configure, &MainWindow::OnConfigure);connect_menu(ui->action_Configure_Current_Game, &MainWindow::OnConfigurePerGame);@@ -1843,12 +1842,10 @@ bool MainWindow::LoadROM(const QString& filename, Service::AM::FrontendAppletParcase Core::SystemResultStatus::ErrorVideoCore:QMessageBox::critical(this, tr("An error occurred initializing the video core."),- tr("Eden has encountered an error while running the video core. "- "This is usually caused by outdated GPU drivers, including integrated ones. "- "Please see the log for more details. "- "For more information on accessing the log, please see the following page: "- "<a href='https://yuzu-mirror.github.io/help/reference/log-files/'>"- "How to Upload the Log File</a>. "));+ tr("This is usually caused by outdated GPU drivers. "+ "Please see the log for more details. See: "+ "<a href='https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/HowToAccessLogs.md'>"+ "How to access log files</a>."));break;default:if (result > Core::SystemResultStatus::ErrorLoader) {@@ -3199,12 +3196,8 @@ void MainWindow::OnOpenModsPage() {OpenURL(QUrl(QStringLiteral("https://github.com/eden-emulator/yuzu-mod-archive")));}-void MainWindow::OnOpenQuickstartGuide() {- OpenURL(QUrl(QStringLiteral("https://yuzu-mirror.github.io/help/quickstart/")));-}--void MainWindow::OnOpenFAQ() {- OpenURL(QUrl(QStringLiteral("https://yuzu-mirror.github.io/help")));+void MainWindow::OnOpenUserHandbook() {+ OpenURL(QUrl(QStringLiteral("https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/user/README.md")));}void MainWindow::ToggleFullscreen() {diff --git a/src/yuzu/main_window.h b/src/yuzu/main_window.hindex 3fe7ec620f..693f16b598 100644--- a/src/yuzu/main_window.h+++ b/src/yuzu/main_window.h@@ -336,8 +336,7 @@ private slots:void OnPrepareForSleep(bool prepare_sleep);void OnMenuReportCompatibility();void OnOpenModsPage();- void OnOpenQuickstartGuide();- void OnOpenFAQ();+ void OnOpenUserHandbook();/// Called whenever a user selects a game in the game list widget.void OnGameListLoadFile(QString game_path, u64 program_id);