diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ae11db988c40de24294c24cf2ee498637b777c7b..986efcfb9194a514a05484879bba2d25bffd1800 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,25 +1,20 @@
-<!---
+<!--
+Please keep in mind yuzu is EXPERIMENTAL SOFTWARE.
-Please read the FAQ:
-https://citra-emu.org/wiki/faq/
+Please read the FAQ: https://yuzu-emu.org/wiki/faq/
-THIS IS NOT A SUPPORT FORUM, FOR SUPPORT GO TO:
-https://community.citra-emu.org/
+When submitting an issue, please do the following:
-If the FAQ does not answer your question, please go to:
-https://community.citra-emu.org/
-
-====================================================
-
-When submitting an issue, please check the following:
-
-- You have read the above.
-- You have provided the version (commit hash) of Citra you are using.
-- You have provided sufficient detail for the issue to be reproduced.
-- You have provided system specs (if relevant).
-- Please also provide:
+- Provide the version (commit hash) of yuzu you are using.
+- Provide sufficient detail for the issue to be reproduced.
+- Provide:
- For crashes, a backtrace.
- For graphical issues, comparison screenshots with real hardware.
- For emulation inaccuracies, a test-case (if able).
+-->
+
+
+
+
+
---->
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bf59d7dddd610d06cc4fa50b7f474fbf54b64a5c..767bd23bfb8222cf21f8925e92fbf538a89c5d54 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 6ddf2cf2198780c65d9713051798a4006cc68a4f..6686ab478940e268b7ebbabe4ed11f3bc22d2aea 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 447d7198ca605ddf736324feb98a3a338e1f889b..26cf9480b7990c4cad0a9d4635ba4cb24ab2d8ad 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 8b92a907ccf0c4d0a09cfaa98be7be7b06ba9a0e..babd583a21e33421ac3f27bf917d75ed34d8db65 100644
--- a/src/yuzu/configuration/configure.ui
+++ b/src/yuzu/configuration/configure.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Citra Configuration</string>
+ <string>yuzu Configuration</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 00966266bf61a4d599bdefa0a56d528f2450ad92..417afef8711d3a488f663054ea0a4e79cbfe1409 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 2f41de3fea4280e038888965c2d0c52ddcc5d507..99a62c4324bc648362a2ee9a9b053de4c07fd2b9 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.<br/><br/>"
+ "yuzu. A real Switch is required.<br/><br/>"
"For more information on dumping and decrypting games, please see the following "
"wiki pages: <ul>"
"<li><a href='https://citra-emu.org/wiki/dumping-game-cartridges/'>Dumping Game "
@@ -344,7 +344,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
case Core::System::ResultStatus::ErrorVideoCore:
QMessageBox::critical(
this, tr("An error occured in the video core."),
- tr("Citra has encountered an error while running the video core, please see the "
+ tr("yuzu has encountered an error while running the video core, please see the "
"log for more details."
"For more information on accessing the log, please see the following page: "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How "
@@ -649,7 +649,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
default:
answer = QMessageBox::question(
this, tr("Fatal Error"),
- tr("Citra has encountered a fatal error, please see the log for more details. "
+ tr("yuzu has encountered a fatal error, please see the log for more details. "
"For more information on accessing the log, please see the following page: "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How to "
"Upload the Log File</a>.<br/><br/>Would you like to quit back to the game list? "
@@ -677,7 +677,7 @@ bool GMainWindow::ConfirmClose() {
return true;
QMessageBox::StandardButton answer =
- QMessageBox::question(this, tr("Citra"), tr("Are you sure you want to close Citra?"),
+ QMessageBox::question(this, tr("yuzu"), tr("Are you sure you want to close yuzu?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
}
@@ -741,7 +741,7 @@ bool GMainWindow::ConfirmChangeGame() {
return true;
auto answer = QMessageBox::question(
- this, tr("Citra"),
+ this, tr("yuzu"),
tr("Are you sure you want to stop the emulation? Any unsaved progress will be lost."),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
@@ -764,8 +764,8 @@ int main(int argc, char* argv[]) {
SCOPE_EXIT({ MicroProfileShutdown(); });
// Init settings params
- QCoreApplication::setOrganizationName("Citra team");
- QCoreApplication::setApplicationName("Citra");
+ QCoreApplication::setOrganizationName("yuzu team");
+ QCoreApplication::setApplicationName("yuzu");
QApplication::setAttribute(Qt::AA_X11InitThreads);
QApplication app(argc, argv);
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index 234e90c3c9291f53fa3cfe8499c94deb81620bb6..dde8514a549eb14a47ee21fc8a6c9d38639be9c1 100644
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Citra</string>
+ <string>yuzu</string>
</property>
<property name="windowIcon">
<iconset>
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 802e060f436db6c464f5061fd6b8d11e6c6fe193..433e210b0326083e7fa3dc3b308b1daa267814de 100644
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -28,8 +28,8 @@ if(UNIX AND NOT APPLE)
endif()
if (MSVC)
- include(CopyCitraSDLDeps)
+ include(CopyYuzuSDLDeps)
include(CopyYuzuUnicornDeps)
- copy_citra_SDL_deps(yuzu-cmd)
+ copy_yuzu_SDL_deps(yuzu-cmd)
copy_yuzu_unicorn_deps(yuzu-cmd)
endif()
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 5efbf3910c597f8d938524b15eeac3a3da0b2273..785d96672dd0f782e28b9435c3491d2b8dcf8bed 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -47,7 +47,7 @@ static void PrintHelp(const char* argv0) {
}
static void PrintVersion() {
- std::cout << "Citra " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
+ std::cout << "yuzu " << Common::g_scm_branch << " " << Common::g_scm_desc << std::endl;
}
/// Application entry point
@@ -146,7 +146,7 @@ int main(int argc, char** argv) {
return -1;
case Core::System::ResultStatus::ErrorLoader_ErrorEncrypted:
LOG_CRITICAL(Frontend, "The game that you are trying to load must be decrypted before "
- "being used with Citra. \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: "
"https://citra-emu.org/wiki/dumping-game-cartridges/");
return -1;