From 80db02c49789b73f10169bc398e51726e51b139e Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 13 Jan 2018 23:49:16 +0000 Subject: [PATCH] Minor cleanup --- .github/ISSUE_TEMPLATE.md | 31 +++++++++------------ CONTRIBUTING.md | 2 +- Doxyfile | 4 +-- src/common/CMakeLists.txt | 2 +- src/yuzu/configuration/configure.ui | 2 +- src/yuzu/configuration/configure_system.cpp | 4 +-- src/yuzu/main.cpp | 18 ++++++------ src/yuzu/main.ui | 2 +- src/yuzu_cmd/CMakeLists.txt | 4 +-- src/yuzu_cmd/yuzu.cpp | 4 +-- 10 files changed, 34 insertions(+), 39 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index ae11db988c..986efcfb91 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,25 +1,20 @@ - + + + + + ----> diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bf59d7dddd..767bd23bfb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Reporting Issues -**The issue tracker is not a support forum.** Unless you can provide precise *technical information* regarding an issue, you *should not post in it*. If you need support, first read the [FAQ](https://github.com/citra-emu/citra/wiki/FAQ) and then either visit our IRC channel, [our forum](https://community.citra-emu.org) or ask in a general emulation forum such as [/r/emulation](https://www.reddit.com/r/emulation/). If you post support questions, generic messages to the developers or vague reports without technical details, they will be closed and locked. +**The issue tracker is not a support forum.** Unless you can provide precise *technical information* regarding an issue, you *should not post in it*. If you need support, first read the [FAQ](https://github.com/yuzu-emu/yuzu/wiki/FAQ) and then either visit our Discord server, [our forum](https://community.citra-emu.org) or ask in a general emulation forum such as [/r/emulation](https://www.reddit.com/r/emulation/). If you post support questions, generic messages to the developers or vague reports without technical details, they will be closed and locked. If you believe you have a valid issue report, please post text or a screenshot from the log (the console window that opens alongside yuzu) and build version (hex string visible in the titlebar and zip filename), as well as your hardware and software information if applicable. diff --git a/Doxyfile b/Doxyfile index 6ddf2cf219..6686ab4789 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = Citra +PROJECT_NAME = yuzu # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version @@ -44,7 +44,7 @@ PROJECT_NUMBER = # for a project that appears at the top of each page and should give viewer a # quick idea about the purpose of the project. Keep the description short. -PROJECT_BRIEF = "Nintendo 3DS emulator/debugger" +PROJECT_BRIEF = "Nintendo Switch emulator/debugger" # With the PROJECT_LOGO tag one can specify an logo or icon that is included in # the documentation. The maximum height of the logo should not exceed 55 pixels diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 447d7198ca..26cf9480b7 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -8,7 +8,7 @@ if ($ENV{CI}) set(BUILD_REPOSITORY $ENV{APPVEYOR_REPO_NAME}) endif() # regex capture the string nightly or bleeding-edge into CMAKE_MATCH_1 - string(REGEX MATCH "citra-emu/citra-?(.*)" OUTVAR ${BUILD_REPOSITORY}) + string(REGEX MATCH "yuzu-emu/yuzu-?(.*)" OUTVAR ${BUILD_REPOSITORY}) if (${CMAKE_MATCH_COUNT} GREATER 0) # capitalize the first letter of each word in the repo name. string(REPLACE "-" ";" REPO_NAME_LIST ${CMAKE_MATCH_1}) diff --git a/src/yuzu/configuration/configure.ui b/src/yuzu/configuration/configure.ui index 8b92a907cc..babd583a21 100644 --- a/src/yuzu/configuration/configure.ui +++ b/src/yuzu/configuration/configure.ui @@ -11,7 +11,7 @@ - Citra Configuration + yuzu Configuration diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 00966266bf..417afef871 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -64,8 +64,8 @@ void ConfigureSystem::updateBirthdayComboBox(int birthmonth_index) { void ConfigureSystem::refreshConsoleID() { QMessageBox::StandardButton reply; - QString warning_text = tr("This will replace your current virtual 3DS with a new one. " - "Your current virtual 3DS will not be recoverable. " + QString warning_text = tr("This will replace your current virtual Switch with a new one. " + "Your current virtual Switch will not be recoverable. " "This might have unexpected effects in games. This might fail, " "if you use an outdated config savegame. Continue?"); reply = QMessageBox::critical(this, tr("Warning"), warning_text, diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 2f41de3fea..99a62c4324 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -122,13 +122,13 @@ void GMainWindow::InitializeWidgets() { emu_speed_label = new QLabel(); emu_speed_label->setToolTip(tr("Current emulation speed. Values higher or lower than 100% " - "indicate emulation is running faster or slower than a 3DS.")); + "indicate emulation is running faster or slower than a Switch.")); game_fps_label = new QLabel(); game_fps_label->setToolTip(tr("How many frames per second the game is currently displaying. " "This will vary from game to game and scene to scene.")); emu_frametime_label = new QLabel(); emu_frametime_label->setToolTip( - tr("Time taken to emulate a 3DS frame, not counting framelimiting or v-sync. For " + tr("Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For " "full-speed emulation this should be at most 16.67 ms.")); for (auto& label : {emu_speed_label, game_fps_label, emu_frametime_label}) { @@ -326,7 +326,7 @@ bool GMainWindow::LoadROM(const QString& filename) { QMessageBox::critical( this, tr("Error while loading ROM!"), tr("The game that you are trying to load must be decrypted before being used with " - "Citra. A real 3DS is required.

" + "yuzu. A real Switch is required.

" "For more information on dumping and decrypting games, please see the following " "wiki pages: