From 08f820089e5576ac256bea817c9a5f02644d9e84 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Thu, 21 Nov 2024 23:30:29 +0000 Subject: [PATCH] Updated a myriad of user-facing strings to refer to Azahar, not Citra --- .../features/settings/ui/SettingsActivity.kt | 2 +- .../utils/DirectoryInitialization.kt | 2 +- src/android/app/src/main/jni/native.cpp | 4 +- .../app/src/main/res/values/strings.xml | 46 +++++++++---------- src/audio_core/cubeb_input.cpp | 8 ++-- src/audio_core/cubeb_sink.cpp | 6 +-- src/citra_qt/citra_qt.cpp | 44 +++++++++--------- src/citra_qt/configuration/config.cpp | 2 +- .../configuration/configure_general.cpp | 4 +- .../configuration/configure_motion_touch.cpp | 2 +- .../configuration/configure_per_game.cpp | 3 +- .../configuration/configure_system.cpp | 10 ++-- src/citra_qt/discord_impl.cpp | 2 +- src/citra_qt/dumping/dumping_dialog.cpp | 4 +- src/citra_qt/game_list.cpp | 9 ++-- src/citra_qt/multiplayer/host_room.cpp | 5 +- src/citra_qt/multiplayer/message.cpp | 4 +- src/citra_room/citra_room.cpp | 2 +- src/citra_sdl/citra_sdl.cpp | 6 +-- src/citra_sdl/emu_window/emu_window_sdl2.cpp | 2 +- .../emu_window/emu_window_sdl2_gl.cpp | 2 +- .../emu_window/emu_window_sdl2_sw.cpp | 2 +- .../emu_window/emu_window_sdl2_vk.cpp | 2 +- src/common/settings.cpp | 2 +- src/core/file_sys/plugin_3gx.cpp | 2 +- src/core/movie.cpp | 5 +- src/network/artic_base/artic_base_client.cpp | 2 +- 27 files changed, 90 insertions(+), 94 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt index 813b07fa3..86bab599a 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt @@ -216,7 +216,7 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { CitraApplication.documentsTree.setRoot(Uri.parse(DirectoryInitialization.userPath)) NativeLibrary.createConfigFile() } else { - throw IllegalStateException("Citra directory unavailable when accessing config file!") + throw IllegalStateException("Azahar directory unavailable when accessing config file!") } // Set default values for system config file diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt index c48f9d22e..1365c3722 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt @@ -94,7 +94,7 @@ object DirectoryInitialization { val dataPath = PermissionsHandler.citraDirectory if (dataPath.toString().isNotEmpty()) { userPath = dataPath.toString() - android.util.Log.d("[Citra Frontend]", "[DirectoryInitialization] User Dir: $userPath") + android.util.Log.d("[Azahar Frontend]", "[DirectoryInitialization] User Dir: $userPath") return true } return false diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 4682df04d..91176b530 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -133,7 +133,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) { // Citra core only supports a single running instance std::scoped_lock lock(running_mutex); - LOG_INFO(Frontend, "Citra starting..."); + LOG_INFO(Frontend, "Azahar starting..."); MicroProfileOnThreadCreate("EmuThread"); @@ -753,7 +753,7 @@ void Java_org_citra_citra_1emu_NativeLibrary_loadState([[maybe_unused]] JNIEnv* void Java_org_citra_citra_1emu_NativeLibrary_logDeviceInfo([[maybe_unused]] JNIEnv* env, [[maybe_unused]] jobject obj) { - LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + LOG_INFO(Frontend, "Azahar Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); LOG_INFO(Frontend, "Host CPU: {}", Common::GetCPUCaps().cpu_string); // There is no decent way to get the OS version, so we log the API level instead. diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 3c6c0a5e9..9e6cef2d6 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -2,13 +2,13 @@ - Citra - This software will run games for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Citra\'s user data in.\n\nWhat\'s this:\nWiki - Citra Android user data and storage - Citra - Citra - Citra 3DS emulator notifications - Citra is Running - Next, you will need to select a Game Folder. Citra will display all of the 3DS ROMs inside of the selected folder in the app.\n\nCIA ROMs, updates and DLC will need to be installed separately by clicking on the folder icon and selecting Install CIA. + Azahar + This software will run games for the Nintendo 3DS handheld game console. No game titles are included.\n\nBefore you can begin with emulating, please select a folder to store Azahar\'s user data in.\n\nWhat\'s this:\nWiki - Citra Android user data and storage + Azahar + Azahar + Azahar 3DS emulator notifications + Azahar is Running + Next, you will need to select a Game Folder. Azahar will display all of the 3DS ROMs inside of the selected folder in the app.\n\nCIA ROMs, updates and DLC will need to be installed separately by clicking on the folder icon and selecting Install CIA. Settings @@ -19,7 +19,7 @@ Install CIA file Install games, updates or DLC Share Log - Share Citra\'s log file to debug issues + Share Azahar\'s log file to debug issues GPU Driver Manager Install GPU driver Install alternative drivers for potentially better performance or accuracy @@ -28,12 +28,12 @@ Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added! No log file found Select Games Folder - Allows Citra to populate the games list + Allows Azahar to populate the games list About An open-source 3DS emulator Build version, credits, and more Games directory selected - Changes the files that Citra uses to load games + Changes the files that Azahar uses to load games Modify the look of the app Install CIA @@ -51,9 +51,9 @@ Copied to clipboard Contributors - Made with \u2764 from the Citra team + Contributors who made Azahar possible https://github.com/citra-emu/citra/graphs/contributors - Projects that make Citra for Android possible + Projects used by Azahar for Android Build Licenses https://discord.gg/FAXfZV9 @@ -62,7 +62,7 @@ Welcome! - Learn how to set up <b>Citra</b> and jump into emulation. + Learn how to set up <b>Azahar</b> and jump into emulation. Get started Complete! Games @@ -75,7 +75,7 @@ Grant the notification permission with the button below. Grant permission Skip granting the notification permission? - Citra won\'t be able to notify you of important information. + Azahar won\'t be able to notify you of important information. Camera Grant the camera permission below to emulate the 3DS camera. Microphone @@ -91,7 +91,7 @@ user data directory with the button below.]]> Select You can\'t skip this step - This step is required to allow Citra to work. Please select a directory and then you can continue. + This step is required to allow Azahar to work. Please select a directory and then you can continue. https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage Theme Settings Configure your theme preferences for Lime3DS. @@ -150,7 +150,7 @@ System Type Download Start - Citra is missing keys to download system files. + Azahar is missing keys to download system files. How to get keys?]]> Show HOME menu apps in games list Run System Setup when the HOME Menu is launched @@ -167,7 +167,7 @@ Cancelling… HOME Menu System Files Warning - Due to how slow Android\'s storage access framework is for accessing Citra\'s files, downloading multiple versions of system files can dramatically slow down loading for games, save states, and the games list. Only download the files that you require to avoid any issues with loading speeds. + Due to how slow Android\'s storage access framework is for accessing Azahar\'s files, downloading multiple versions of system files can dramatically slow down loading for games, save states, and the games list. Only download the files that you require to avoid any issues with loading speeds. Buttons @@ -426,7 +426,7 @@ You need to allow write access to external storage for the emulator to work Loading Settings… - The external storage needs to be available in order to use Citra + The external storage needs to be available in order to use Azahar Select This Directory No files were found or no game directory has been selected yet. @@ -456,11 +456,11 @@ Select Image Camera - Citra needs to access your camera to emulate the 3DS\'s cameras.\n\nAlternatively, you can also set \"Image Source\" to \"Still Image\" in Camera Settings. + Azahar needs to access your camera to emulate the 3DS\'s cameras.\n\nAlternatively, you can also set \"Image Source\" to \"Still Image\" in Camera Settings. Microphone - Citra needs to access your microphone to emulate the 3DS\'s microphone.\n\nAlternatively, you can also change \"Audio Input Device\" in Audio Settings. + Azahar needs to access your microphone to emulate the 3DS\'s microphone.\n\nAlternatively, you can also change \"Audio Input Device\" in Audio Settings. Abort @@ -499,9 +499,9 @@ Installing %d file. See notification for more details. Installing %d files. See notification for more details. - Citra CIA Install + Azahar CIA Install citra-cia - Citra notifications during CIA Install + Azahar notifications during CIA Install Installing CIA Installing %s (%d/%d) Successfully installed CIA @@ -509,7 +509,7 @@ \"%s\" has been installed successfully The installation of \"%s\" was aborted.\n Please see the log for more details \"%s\" is not a valid CIA - \"%s\" must be decrypted before being used with Citra.\n A real 3DS is required + \"%s\" must be decrypted before being used with Azahar.\n A real 3DS is required An unknown error occurred while installing \"%s\".\n Please see the log for more details diff --git a/src/audio_core/cubeb_input.cpp b/src/audio_core/cubeb_input.cpp index baee263fb..f182bd2c2 100644 --- a/src/audio_core/cubeb_input.cpp +++ b/src/audio_core/cubeb_input.cpp @@ -50,7 +50,7 @@ void CubebInput::StartSampling(const InputParameters& params) { parameters = params; impl->sample_size_in_bytes = params.sample_size / 8; - auto init_result = cubeb_init(&impl->ctx, "Citra Input", nullptr); + auto init_result = cubeb_init(&impl->ctx, "Azahar Input", nullptr); if (init_result != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_init failed: {}", init_result); return; @@ -91,8 +91,8 @@ void CubebInput::StartSampling(const InputParameters& params) { } auto stream_init_result = cubeb_stream_init( - impl->ctx, &impl->stream, "Citra Microphone", input_device, &input_params, nullptr, nullptr, - latency_frames, Impl::DataCallback, Impl::StateCallback, impl.get()); + impl->ctx, &impl->stream, "Azahar Microphone", input_device, &input_params, nullptr, + nullptr, latency_frames, Impl::DataCallback, Impl::StateCallback, impl.get()); if (stream_init_result != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_stream_init failed: {}", stream_init_result); StopSampling(); @@ -184,7 +184,7 @@ std::vector ListCubebInputDevices() { std::vector device_list; cubeb* ctx; - if (cubeb_init(&ctx, "Citra Input Device Enumerator", nullptr) != CUBEB_OK) { + if (cubeb_init(&ctx, "Azahar Input Device Enumerator", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio, "cubeb_init failed"); return {}; } diff --git a/src/audio_core/cubeb_sink.cpp b/src/audio_core/cubeb_sink.cpp index 4a42d3277..c55626e50 100644 --- a/src/audio_core/cubeb_sink.cpp +++ b/src/audio_core/cubeb_sink.cpp @@ -25,7 +25,7 @@ struct CubebSink::Impl { }; CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_unique()) { - if (cubeb_init(&impl->ctx, "Citra Output", nullptr) != CUBEB_OK) { + if (cubeb_init(&impl->ctx, "Azahar Output", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); return; } @@ -68,7 +68,7 @@ CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_uniqu } } - auto stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "CitraAudio", nullptr, nullptr, + auto stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "AzaharAudio", nullptr, nullptr, output_device, ¶ms, std::max(512u, minimum_latency), &Impl::DataCallback, &Impl::StateCallback, impl.get()); if (stream_err != CUBEB_OK) { @@ -164,7 +164,7 @@ std::vector ListCubebSinkDevices() { std::vector device_list; cubeb* ctx; - if (cubeb_init(&ctx, "Citra Output Device Enumerator", nullptr) != CUBEB_OK) { + if (cubeb_init(&ctx, "Azahar Output Device Enumerator", nullptr) != CUBEB_OK) { LOG_CRITICAL(Audio_Sink, "cubeb_init failed"); return {}; } diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 0dea388ca..cb54a9006 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -366,7 +366,7 @@ GMainWindow::GMainWindow(Core::System& system_) ConnectMenuEvents(); ConnectWidgetEvents(); - LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + LOG_INFO(Frontend, "Azahar Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); #if CITRA_ARCH(x86_64) const auto& caps = Common::GetCPUCaps(); @@ -741,7 +741,7 @@ void GMainWindow::InitializeHotkeys() { link_action_shortcut(ui->action_Load_File, QStringLiteral("Load File")); link_action_shortcut(ui->action_Load_Amiibo, QStringLiteral("Load Amiibo")); link_action_shortcut(ui->action_Remove_Amiibo, QStringLiteral("Remove Amiibo")); - link_action_shortcut(ui->action_Exit, QStringLiteral("Exit Citra")); + link_action_shortcut(ui->action_Exit, QStringLiteral("Exit Azahar")); link_action_shortcut(ui->action_Restart, QStringLiteral("Restart Emulation")); link_action_shortcut(ui->action_Pause, QStringLiteral("Continue/Pause Emulation")); link_action_shortcut(ui->action_Stop, QStringLiteral("Stop Emulation")); @@ -1223,7 +1223,7 @@ static std::optional HoldWakeLockLinux(u32 window_id = 0) { //: TRANSLATORS: This string is shown to the user to explain why Citra needs to prevent the //: computer from sleeping options.insert(QString::fromLatin1("reason"), - QCoreApplication::translate("GMainWindow", "Citra is running a game")); + QCoreApplication::translate("GMainWindow", "Azahar is running a game")); // 0x4: Suspend lock; 0x8: Idle lock QDBusReply reply = xdp.call(QString::fromLatin1("Inhibit"), @@ -1352,7 +1352,7 @@ bool GMainWindow::LoadROM(const QString& filename) { case Core::System::ResultStatus::ErrorLoader_ErrorGbaTitle: QMessageBox::critical(this, tr("Unsupported ROM"), - tr("GBA Virtual Console ROMs are not supported by Citra.")); + tr("GBA Virtual Console ROMs are not supported by Azahar.")); break; case Core::System::ResultStatus::ErrorArticDisconnected: @@ -1407,7 +1407,7 @@ void GMainWindow::BootGame(const QString& filename) { show_artic_label = is_artic; - LOG_INFO(Frontend, "Citra starting..."); + LOG_INFO(Frontend, "Azahar starting..."); if (!is_artic) { StoreRecentFile(filename); // Put the filename on top of the list } @@ -2066,7 +2066,7 @@ void GMainWindow::OnGameListCreateShortcut(u64 program_id, const std::string& ga if (CreateShortcutMessagesGUI(this, CREATE_SHORTCUT_MSGBOX_FULLSCREEN_PROMPT, qt_game_title)) { arguments = "-f " + arguments; } - const std::string comment = fmt::format("Start {:s} with the Citra Emulator", game_title); + const std::string comment = fmt::format("Start {:s} with the Azahar Emulator", game_title); const std::string categories = "Game;Emulator;Qt;"; const std::string keywords = "3ds;Nintendo;"; @@ -2100,7 +2100,7 @@ void GMainWindow::OnGameListDumpRomFS(QString game_path, u64 program_id) { const auto& [base, update] = future_watcher->result(); if (base != Loader::ResultStatus::Success) { QMessageBox::critical( - this, tr("Citra"), + this, tr("Azahar"), tr("Could not dump base RomFS.\nRefer to the log for details.")); return; } @@ -2262,7 +2262,7 @@ void GMainWindow::OnCIAInstallReport(Service::AM::InstallStatus status, QString case Service::AM::InstallStatus::ErrorEncrypted: QMessageBox::critical(this, tr("Encrypted File"), tr("%1 must be decrypted " - "before being used with Citra. A real 3DS is required.") + "before being used with Azahar. A real 3DS is required.") .arg(filename)); break; case Service::AM::InstallStatus::ErrorFileNotFound: @@ -2324,9 +2324,9 @@ void GMainWindow::UninstallTitles( future_watcher.waitForFinished(); if (failed) { - QMessageBox::critical(this, tr("Citra"), tr("Failed to uninstall '%1'.").arg(failed_name)); + QMessageBox::critical(this, tr("Azahar"), tr("Failed to uninstall '%1'.").arg(failed_name)); } else if (!future_watcher.isCanceled()) { - QMessageBox::information(this, tr("Citra"), + QMessageBox::information(this, tr("Azahar"), tr("Successfully uninstalled '%1'.").arg(first_name)); } } @@ -2959,7 +2959,7 @@ void GMainWindow::OnOpenFFmpeg() { for (auto& library_name : library_names) { if (!FileUtil::Exists(bin_dir + DIR_SEP + library_name)) { - QMessageBox::critical(this, tr("Citra"), + QMessageBox::critical(this, tr("Azahar"), tr("The provided FFmpeg directory is missing %1. Please make " "sure the correct directory was selected.") .arg(QString::fromStdString(library_name))); @@ -2983,9 +2983,9 @@ void GMainWindow::OnOpenFFmpeg() { FileUtil::ForeachDirectoryEntry(nullptr, bin_dir, process_file); if (success.load()) { - QMessageBox::information(this, tr("Citra"), tr("FFmpeg has been sucessfully installed.")); + QMessageBox::information(this, tr("Azahar"), tr("FFmpeg has been sucessfully installed.")); } else { - QMessageBox::critical(this, tr("Citra"), + QMessageBox::critical(this, tr("Azahar"), tr("Installation of FFmpeg failed. Check the log file for details.")); } } @@ -3015,7 +3015,7 @@ void GMainWindow::StartVideoDumping(const QString& path) { system.RegisterVideoDumper(dumper); } else { QMessageBox::critical( - this, tr("Citra"), + this, tr("Azahar"), tr("Could not start video dumping.
Please ensure that the video encoder is " "configured correctly.
Refer to the log for details.")); ui->action_Dump_Video->setChecked(false); @@ -3377,7 +3377,7 @@ bool GMainWindow::ConfirmClose() { } QMessageBox::StandardButton answer = - QMessageBox::question(this, tr("Citra"), tr("Would you like to exit now?"), + QMessageBox::question(this, tr("Azahar"), tr("Would you like to exit now?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); return answer != QMessageBox::No; } @@ -3470,7 +3470,7 @@ bool GMainWindow::ConfirmChangeGame() { } auto answer = QMessageBox::question( - this, tr("Citra"), tr("The game is still running. Would you like to stop emulation?"), + this, tr("Azahar"), tr("The game is still running. Would you like to stop emulation?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); return answer != QMessageBox::No; } @@ -3596,12 +3596,12 @@ void GMainWindow::UpdateWindowTitle() { const QString full_name = QString::fromUtf8(Common::g_build_fullname); if (game_title.isEmpty()) { - setWindowTitle(QStringLiteral("Citra %1").arg(full_name)); + setWindowTitle(QStringLiteral("Azahar %1").arg(full_name)); } else { - setWindowTitle(QStringLiteral("Citra %1 | %2").arg(full_name, game_title)); + setWindowTitle(QStringLiteral("Azahar %1 | %2").arg(full_name, game_title)); render_window->setWindowTitle( - QStringLiteral("Citra %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window"))); - secondary_window->setWindowTitle(QStringLiteral("Citra %1 | %2 | %3") + QStringLiteral("Azahar %1 | %2 | %3").arg(full_name, game_title, tr("Primary Window"))); + secondary_window->setWindowTitle(QStringLiteral("Azahar %1 | %2 | %3") .arg(full_name, game_title, tr("Secondary Window"))); } } @@ -3758,8 +3758,8 @@ void LaunchQtFrontend(int argc, char* argv[]) { SCOPE_EXIT({ MicroProfileShutdown(); }); // Init settings params - QCoreApplication::setOrganizationName(QStringLiteral("Citra team")); - QCoreApplication::setApplicationName(QStringLiteral("Citra")); + QCoreApplication::setOrganizationName(QStringLiteral("Azahar Developers")); + QCoreApplication::setApplicationName(QStringLiteral("Azahar")); auto rounding_policy = GetHighDpiRoundingPolicy(); QApplication::setHighDpiScaleFactorRoundingPolicy(rounding_policy); diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 1c88bf45c..bcc62d1b4 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -63,7 +63,7 @@ const std::array QtConfig::default_hotkeys {{ {QStringLiteral("Continue/Pause Emulation"), QStringLiteral("Main Window"), {QStringLiteral("F4"), Qt::WindowShortcut}}, {QStringLiteral("Decrease 3D Factor"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+-"), Qt::ApplicationShortcut}}, {QStringLiteral("Decrease Speed Limit"), QStringLiteral("Main Window"), {QStringLiteral("-"), Qt::ApplicationShortcut}}, - {QStringLiteral("Exit Citra"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, + {QStringLiteral("Exit Azahar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Q"), Qt::WindowShortcut}}, {QStringLiteral("Exit Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("Esc"), Qt::WindowShortcut}}, {QStringLiteral("Fullscreen"), QStringLiteral("Main Window"), {QStringLiteral("F11"), Qt::WindowShortcut}}, {QStringLiteral("Increase 3D Factor"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl++"), Qt::ApplicationShortcut}}, diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index a402523bf..51d04adaf 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -146,8 +146,8 @@ void ConfigureGeneral::SetConfiguration() { void ConfigureGeneral::ResetDefaults() { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), - tr("Are you sure you want to reset your settings and close Citra?"), + this, tr("Azahar"), + tr("Are you sure you want to reset your settings and close Azahar?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index 3bfbba71d..73968c5c2 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -340,7 +340,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() { bool ConfigureMotionTouch::CanCloseDialog() { if (udp_test_in_progress) { - QMessageBox::warning(this, tr("Citra"), + QMessageBox::warning(this, tr("Azahar"), tr("UDP Test or calibration configuration is in progress.
Please " "wait for them to finish.")); return false; diff --git a/src/citra_qt/configuration/configure_per_game.cpp b/src/citra_qt/configuration/configure_per_game.cpp index f48e7bea9..294b444b6 100644 --- a/src/citra_qt/configuration/configure_per_game.cpp +++ b/src/citra_qt/configuration/configure_per_game.cpp @@ -81,7 +81,8 @@ ConfigurePerGame::~ConfigurePerGame() = default; void ConfigurePerGame::ResetDefaults() { const auto config_file_name = title_id == 0 ? filename : fmt::format("{:016X}", title_id); QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to reset your settings for this game?"), + this, tr("Azahar"), + tr("Are you sure you want to reset your settings for this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 9f99cbc5e..da15db77f 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -296,11 +296,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent) ui->combo_download_region->setEnabled(false); ui->label_nus_download->setTextInteractionFlags(Qt::TextBrowserInteraction); ui->label_nus_download->setOpenExternalLinks(true); - ui->label_nus_download->setText( - tr("Citra is missing keys to download system files.
How to get keys?")); + ui->label_nus_download->setText(tr("Azahar is missing keys to download system files.")); } ConfigureTime(); @@ -703,9 +699,9 @@ void ConfigureSystem::DownloadFromNUS() { future_watcher.waitForFinished(); if (failed) { - QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed.")); + QMessageBox::critical(this, tr("Azahar"), tr("Downloading system files failed.")); } else if (!future_watcher.isCanceled()) { - QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files.")); + QMessageBox::information(this, tr("Azahar"), tr("Successfully downloaded system files.")); } ui->button_start_download->setEnabled(true); diff --git a/src/citra_qt/discord_impl.cpp b/src/citra_qt/discord_impl.cpp index 076c15fa8..3f872097e 100644 --- a/src/citra_qt/discord_impl.cpp +++ b/src/citra_qt/discord_impl.cpp @@ -42,7 +42,7 @@ void DiscordImpl::Update() { DiscordRichPresence presence{}; presence.largeImageKey = "citra"; - presence.largeImageText = "Citra is an emulator for the Nintendo 3DS"; + presence.largeImageText = "Azahar is an emulator for the Nintendo 3DS"; if (is_powered_on) { presence.state = title.c_str(); presence.details = "Currently in game"; diff --git a/src/citra_qt/dumping/dumping_dialog.cpp b/src/citra_qt/dumping/dumping_dialog.cpp index cd05d87d9..ff4bfc0da 100644 --- a/src/citra_qt/dumping/dumping_dialog.cpp +++ b/src/citra_qt/dumping/dumping_dialog.cpp @@ -22,7 +22,7 @@ DumpingDialog::DumpingDialog(QWidget* parent, Core::System& system_) connect(ui->pathExplore, &QToolButton::clicked, this, &DumpingDialog::OnToolButtonClicked); connect(ui->buttonBox, &QDialogButtonBox::accepted, [this] { if (ui->pathLineEdit->text().isEmpty()) { - QMessageBox::critical(this, tr("Citra"), tr("Please specify the output path.")); + QMessageBox::critical(this, tr("Azahar"), tr("Please specify the output path.")); return; } ApplyConfiguration(); @@ -82,7 +82,7 @@ void DumpingDialog::Populate() { } if (!missing.isEmpty()) { - QMessageBox::critical(this, tr("Citra"), + QMessageBox::critical(this, tr("Azahar"), tr("Could not find any available %1.\nPlease check your FFmpeg " "installation used for compilation.") .arg(missing)); diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index b71210d3c..ef0b2dfea 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -734,7 +734,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr #endif connect(uninstall_all, &QAction::triggered, this, [=, this] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), + this, tr("Azahar"), tr("Are you sure you want to completely uninstall '%1'?\n\nThis will " "delete the game if installed, as well as any installed updates or DLC.") .arg(name), @@ -757,7 +757,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_game, &QAction::triggered, this, [this, name, media_type, program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to uninstall '%1'?").arg(name), + this, tr("Azahar"), tr("Are you sure you want to uninstall '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; @@ -767,7 +767,7 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_update, &QAction::triggered, this, [this, name, update_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), + this, tr("Azahar"), tr("Are you sure you want to uninstall the update for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { @@ -779,7 +779,8 @@ void GameList::AddGamePopup(QMenu& context_menu, const QString& path, const QStr }); connect(uninstall_dlc, &QAction::triggered, this, [this, name, dlc_program_id] { QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Citra"), tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), + this, tr("Azahar"), + tr("Are you sure you want to uninstall all DLC for '%1'?").arg(name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::Yes) { std::vector> titles; diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 8a1ca02e2..3a8e31423 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -162,10 +162,7 @@ void HostRoomWindow::Host() { if (result.result_code != Common::WebResult::Code::Success) { QMessageBox::warning( this, tr("Error"), - tr("Failed to announce the room to the public lobby. In order to host a " - "room publicly, you must have a valid Citra account configured in " - "Emulation -> Configure -> Web. If you do not want to publish a room in " - "the public lobby, then select Unlisted instead.\nDebug Message: ") + + tr("Failed to announce the room to the public lobby.\nDebug Message: ") + QString::fromStdString(result.result_string), QMessageBox::Ok); ui->host->setEnabled(true); diff --git a/src/citra_qt/multiplayer/message.cpp b/src/citra_qt/multiplayer/message.cpp index beb45bbe0..dbf1c2fe0 100644 --- a/src/citra_qt/multiplayer/message.cpp +++ b/src/citra_qt/multiplayer/message.cpp @@ -30,12 +30,12 @@ const ConnectionError ErrorManager::UNABLE_TO_CONNECT( const ConnectionError ErrorManager::ROOM_IS_FULL( QT_TR_NOOP("Unable to connect to the room because it is already full.")); const ConnectionError ErrorManager::COULD_NOT_CREATE_ROOM( - QT_TR_NOOP("Creating a room failed. Please retry. Restarting Citra might be necessary.")); + QT_TR_NOOP("Creating a room failed. Please retry. Restarting Azahar might be necessary.")); const ConnectionError ErrorManager::HOST_BANNED( QT_TR_NOOP("The host of the room has banned you. Speak with the host to unban you " "or try a different room.")); const ConnectionError ErrorManager::WRONG_VERSION( - QT_TR_NOOP("Version mismatch! Please update to the latest version of Citra. If the problem " + QT_TR_NOOP("Version mismatch! Please update to the latest version of Azahar. If the problem " "persists, contact the room host and ask them to update the server.")); const ConnectionError ErrorManager::WRONG_PASSWORD(QT_TR_NOOP("Incorrect password.")); const ConnectionError ErrorManager::GENERIC_ERROR(QT_TR_NOOP( diff --git a/src/citra_room/citra_room.cpp b/src/citra_room/citra_room.cpp index 3d5f32a9b..beb6adeaf 100644 --- a/src/citra_room/citra_room.cpp +++ b/src/citra_room/citra_room.cpp @@ -62,7 +62,7 @@ static void PrintHelp(const char* argv0) { } static void PrintVersion() { - std::cout << "Citra dedicated room " << Common::g_scm_branch << " " << Common::g_scm_desc + std::cout << "Azahar dedicated room " << Common::g_scm_branch << " " << Common::g_scm_desc << " Libnetwork: " << Network::network_version << std::endl; } diff --git a/src/citra_sdl/citra_sdl.cpp b/src/citra_sdl/citra_sdl.cpp index a48a69c08..0907f7eb5 100644 --- a/src/citra_sdl/citra_sdl.cpp +++ b/src/citra_sdl/citra_sdl.cpp @@ -298,7 +298,7 @@ void LaunchSdlFrontend(int argc, char** argv) { } case 'v': const std::string version_string = - std::string("Citra ") + Common::g_scm_branch + " " + Common::g_scm_desc; + std::string("Azahar ") + Common::g_scm_branch + " " + Common::g_scm_desc; ShowCommandOutput("Version", version_string); exit(0); } @@ -391,7 +391,7 @@ void LaunchSdlFrontend(int argc, char** argv) { const auto scope = emu_window->Acquire(); - LOG_INFO(Frontend, "Citra Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, + LOG_INFO(Frontend, "Azahar Version: {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); Settings::LogSettings(); @@ -407,7 +407,7 @@ void LaunchSdlFrontend(int argc, char** argv) { exit(-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 Azahar. \n\n For more information on dumping and " "decrypting games, please refer to: " "https://web.archive.org/web/20240304210021/https://citra-emu.org/" "wiki/dumping-game-cartridges/"); diff --git a/src/citra_sdl/emu_window/emu_window_sdl2.cpp b/src/citra_sdl/emu_window/emu_window_sdl2.cpp index b70c33557..a84e38669 100644 --- a/src/citra_sdl/emu_window/emu_window_sdl2.cpp +++ b/src/citra_sdl/emu_window/emu_window_sdl2.cpp @@ -243,7 +243,7 @@ void EmuWindow_SDL2::UpdateFramerateCounter() { if (current_time > last_time + 2000) { const auto results = system.GetAndResetPerfStats(); const auto title = - fmt::format("Citra {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, + fmt::format("Azahar {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc, results.game_fps, results.emulation_speed * 100.0f); SDL_SetWindowTitle(render_window, title.c_str()); diff --git a/src/citra_sdl/emu_window/emu_window_sdl2_gl.cpp b/src/citra_sdl/emu_window/emu_window_sdl2_gl.cpp index 6242aa369..f2fc28dc3 100644 --- a/src/citra_sdl/emu_window/emu_window_sdl2_gl.cpp +++ b/src/citra_sdl/emu_window/emu_window_sdl2_gl.cpp @@ -77,7 +77,7 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(Core::System& system_, bool fullscreen, boo SDL_GL_SetAttribute(SDL_GL_CONTEXT_FLAGS, SDL_GL_CONTEXT_DEBUG_FLAG); } - std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname, + std::string window_title = fmt::format("Azahar {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); // First, try to create a context with the requested type. diff --git a/src/citra_sdl/emu_window/emu_window_sdl2_sw.cpp b/src/citra_sdl/emu_window/emu_window_sdl2_sw.cpp index 9ba30d0d5..8da894fec 100644 --- a/src/citra_sdl/emu_window/emu_window_sdl2_sw.cpp +++ b/src/citra_sdl/emu_window/emu_window_sdl2_sw.cpp @@ -20,7 +20,7 @@ class DummyContext : public Frontend::GraphicsContext {}; EmuWindow_SDL2_SW::EmuWindow_SDL2_SW(Core::System& system_, bool fullscreen, bool is_secondary) : EmuWindow_SDL2{system_, is_secondary}, system{system_} { - std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname, + std::string window_title = fmt::format("Azahar {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); render_window = SDL_CreateWindow(window_title.c_str(), diff --git a/src/citra_sdl/emu_window/emu_window_sdl2_vk.cpp b/src/citra_sdl/emu_window/emu_window_sdl2_vk.cpp index 9c47ce186..b002c15bb 100644 --- a/src/citra_sdl/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citra_sdl/emu_window/emu_window_sdl2_vk.cpp @@ -17,7 +17,7 @@ class DummyContext : public Frontend::GraphicsContext {}; EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool is_secondary) : EmuWindow_SDL2{system, is_secondary} { - const std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname, + const std::string window_title = fmt::format("Azahar {} | {}-{}", Common::g_build_fullname, Common::g_scm_branch, Common::g_scm_desc); render_window = SDL_CreateWindow(window_title.c_str(), diff --git a/src/common/settings.cpp b/src/common/settings.cpp index e99ec7787..d5e57fbc2 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -80,7 +80,7 @@ void LogSettings() { LOG_INFO(Config, "{}: {}", name, value); }; - LOG_INFO(Config, "Citra Configuration:"); + LOG_INFO(Config, "Azahar Configuration:"); log_setting("Core_UseCpuJit", values.use_cpu_jit.GetValue()); log_setting("Core_CPUClockPercentage", values.cpu_clock_percentage.GetValue()); log_setting("Controller_UseArticController", values.use_artic_base_controller.GetValue()); diff --git a/src/core/file_sys/plugin_3gx.cpp b/src/core/file_sys/plugin_3gx.cpp index e840a895f..fc7374d0b 100644 --- a/src/core/file_sys/plugin_3gx.cpp +++ b/src/core/file_sys/plugin_3gx.cpp @@ -91,7 +91,7 @@ Loader::ResultStatus FileSys::Plugin3GXLoader::Load( } if (header.infos.flags.compatibility == static_cast(_3gx_Infos::Compatibility::CONSOLE)) { - LOG_ERROR(Service_PLGLDR, "Failed to load 3GX plugin. Not compatible with Citra: {}", + LOG_ERROR(Service_PLGLDR, "Failed to load 3GX plugin. Not compatible with Azahar: {}", plg_context.plugin_path); return Loader::ResultStatus::Error; } diff --git a/src/core/movie.cpp b/src/core/movie.cpp index 49393bca0..e280a10a2 100644 --- a/src/core/movie.cpp +++ b/src/core/movie.cpp @@ -468,8 +468,9 @@ Movie::ValidationResult Movie::ValidateHeader(const CTMHeader& header) const { std::string revision = fmt::format("{:02x}", fmt::join(header.revision, "")); if (revision != Common::g_scm_rev) { - LOG_WARNING(Movie, - "This movie was created on a different version of Citra, playback may desync"); + LOG_WARNING( + Movie, // Refers to Citra intentionally, movie may be from Citra instead of Azahar + "This movie was created on a different version of Citra, playback may desync"); return ValidationResult::RevisionDismatch; } diff --git a/src/network/artic_base/artic_base_client.cpp b/src/network/artic_base/artic_base_client.cpp index edc587f35..4084df4bb 100644 --- a/src/network/artic_base/artic_base_client.cpp +++ b/src/network/artic_base/artic_base_client.cpp @@ -274,7 +274,7 @@ bool Client::Connect() { closesocket(main_socket); LOG_ERROR(Network, "Incompatible server version: {}", version_value); SignalCommunicationError("\nIncompatible Artic Base Server version.\nCheck for updates " - "to Artic Base Server or Citra."); + "to Artic Base Server or Azahar."); return false; } } else {