notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #267 from N00byKing/patch-1 

Update Dialog from citra to yuzu
This commit is contained in:
bunnei 2018-04-02 18:33:52 -04:00 committed by GitHub
parent 6cd1482354 10d6b07161
commit c824648db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/yuzu/main.cpp
View File

@ -371,9 +371,9 @@ bool GMainWindow::LoadROM(const QString& filename) {
"yuzu. A real Switch is required.<br/><br/>" "yuzu. A real Switch is required.<br/><br/>"
"For more information on dumping and decrypting games, please see the following " "For more information on dumping and decrypting games, please see the following "
"wiki pages: <ul>" "wiki pages: <ul>"
"<li><a href='https://citra-emu.org/wiki/dumping-game-cartridges/'>Dumping Game " "<li><a href='https://yuzu-emu.org/wiki/dumping-game-cartridges/'>Dumping Game "
"Cartridges</a></li>" "Cartridges</a></li>"
"<li><a href='https://citra-emu.org/wiki/dumping-installed-titles/'>Dumping " "<li><a href='https://yuzu-emu.org/wiki/dumping-installed-titles/'>Dumping "
"Installed Titles</a></li>" "Installed Titles</a></li>"
"</ul>")); "</ul>"));
break; break;
@ -695,18 +695,18 @@ void GMainWindow::UpdateStatusBar() {
void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) { void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
QMessageBox::StandardButton answer; QMessageBox::StandardButton answer;
QString status_message; QString status_message;
const QString common_message = const QString common_message = tr(
tr("The game you are trying to load requires additional files from your 3DS to be dumped " "The game you are trying to load requires additional files from your Switch to be dumped "
"before playing.<br/><br/>For more information on dumping these files, please see the " "before playing.<br/><br/>For more information on dumping these files, please see the "
"following wiki page: <a " "following wiki page: <a "
"href='https://citra-emu.org/wiki/" "href='https://yuzu-emu.org/wiki/"
"dumping-system-archives-and-the-shared-fonts-from-a-3ds-console/'>Dumping System " "dumping-system-archives-and-the-shared-fonts-from-a-switch-console/'>Dumping System "
"Archives and the Shared Fonts from a 3DS Console</a>.<br/><br/>Would you like to quit " "Archives and the Shared Fonts from a Switch Console</a>.<br/><br/>Would you like to quit "
"back to the game list? Continuing emulation may result in crashes, corrupted save " "back to the game list? Continuing emulation may result in crashes, corrupted save "
"data, or other bugs."); "data, or other bugs.");
switch (result) { switch (result) {
case Core::System::ResultStatus::ErrorSystemFiles: { case Core::System::ResultStatus::ErrorSystemFiles: {
QString message = "Citra was unable to locate a 3DS system archive"; QString message = "yuzu was unable to locate a Switch system archive";
if (!details.empty()) { if (!details.empty()) {
message.append(tr(": %1. ").arg(details.c_str())); message.append(tr(": %1. ").arg(details.c_str()));
} else { } else {
@ -721,7 +721,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
} }
case Core::System::ResultStatus::ErrorSharedFont: { case Core::System::ResultStatus::ErrorSharedFont: {
QString message = tr("Citra was unable to locate the 3DS shared fonts. "); QString message = tr("yuzu was unable to locate the Switch shared fonts. ");
message.append(common_message); message.append(common_message);
answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message, answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::Yes | QMessageBox::No, QMessageBox::No);

2
src/yuzu_cmd/yuzu.cpp
View File

@ -147,7 +147,7 @@ int main(int argc, char** argv) {
LOG_CRITICAL(Frontend, "The game that you are trying to load must be decrypted before " LOG_CRITICAL(Frontend, "The game that you are trying to load must be decrypted before "
"being used with yuzu. \n\n For more information on dumping and " "being used with yuzu. \n\n For more information on dumping and "
"decrypting games, please refer to: " "decrypting games, please refer to: "
"https://citra-emu.org/wiki/dumping-game-cartridges/"); "https://yuzu-emu.org/wiki/dumping-game-cartridges/");
return -1; return -1;
case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat:
LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported."); LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported.");