From 80db02c49789b73f10169bc398e51726e51b139e Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 13 Jan 2018 23:49:16 +0000 Subject: Minor cleanup --- 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 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 447d7198c..26cf9480b 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 8b92a907c..babd583a2 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 00966266b..417afef87 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 2f41de3fe..99a62c432 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: