The-Homebrew-Cloud/azahar
2
0
Fork 0
mirror of https://github.com/azahar-emu/azahar.git synced 2025-03-04 01:35:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated a myriad of user-facing strings to refer to Azahar, not Citra

Browse Source
This commit is contained in:
OpenSauce04 2024-11-21 23:30:29 +00:00
parent 97207ec574
commit 08f820089e
27 changed files with 90 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt
View File

@ -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

2
src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.kt
View File

@ -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

4
src/android/app/src/main/jni/native.cpp
View File

@ -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.

46
src/android/app/src/main/res/values/strings.xml
View File

@ -2,13 +2,13 @@
<resources>
<!-- General application strings -->
<string name="app_name" translatable="false">Citra</string>
<string name="app_disclaimer">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:\n<a href='https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage'>Wiki - Citra Android user data and storage</a></string>
<string name="app_notification_channel_name" translatable="false">Citra</string>
<string name="app_notification_channel_id" translatable="false">Citra</string>
<string name="app_notification_channel_description">Citra 3DS emulator notifications</string>
<string name="app_notification_running">Citra is Running</string>
<string name="app_game_install_description">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.</string>
<string name="app_name" translatable="false">Azahar</string>
<string name="app_disclaimer">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:\n<a href='https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage'>Wiki - Citra Android user data and storage</a></string>
<string name="app_notification_channel_name" translatable="false">Azahar</string>
<string name="app_notification_channel_id" translatable="false">Azahar</string>
<string name="app_notification_channel_description">Azahar 3DS emulator notifications</string>
<string name="app_notification_running">Azahar is Running</string>
<string name="app_game_install_description">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.</string>
<!-- Home Strings -->
<string name="grid_menu_core_settings">Settings</string>
@ -19,7 +19,7 @@
<string name="install_game_content">Install CIA file</string>
<string name="install_game_content_description">Install games, updates or DLC</string>
<string name="share_log">Share Log</string>
<string name="share_log_description">Share Citra\'s log file to debug issues</string>
<string name="share_log_description">Share Azahar\'s log file to debug issues</string>
<string name="gpu_driver_manager">GPU Driver Manager</string>
<string name="install_gpu_driver">Install GPU driver</string>
<string name="install_gpu_driver_description">Install alternative drivers for potentially better performance or accuracy</string>
@ -28,12 +28,12 @@
<string name="custom_driver_not_supported_description">Custom driver loading isn\'t currently supported for this device.\nCheck this option again in the future to see if support was added!</string>
<string name="share_log_not_found">No log file found</string>
<string name="select_games_folder">Select Games Folder</string>
<string name="select_games_folder_description">Allows Citra to populate the games list</string>
<string name="select_games_folder_description">Allows Azahar to populate the games list</string>
<string name="about">About</string>
<string name="citra_description">An open-source 3DS emulator</string>
<string name="about_description">Build version, credits, and more</string>
<string name="games_dir_selected">Games directory selected</string>
<string name="select_citra_user_folder_home_description">Changes the files that Citra uses to load games</string>
<string name="select_citra_user_folder_home_description">Changes the files that Azahar uses to load games</string>
<string name="theme_and_color_description">Modify the look of the app</string>
<string name="install_cia_title">Install CIA</string>
@ -51,9 +51,9 @@
<!-- About screen strings -->
<string name="copied_to_clipboard">Copied to clipboard</string>
<string name="contributors">Contributors</string>
<string name="contributors_description">Made with \u2764 from the Citra team</string>
<string name="contributors_description">Contributors who made Azahar possible</string>
<string name="contributors_link">https://github.com/citra-emu/citra/graphs/contributors</string>
<string name="licenses_description">Projects that make Citra for Android possible</string>
<string name="licenses_description">Projects used by Azahar for Android</string>
<string name="build">Build</string>
<string name="licenses">Licenses</string>
<string name="support_link">https://discord.gg/FAXfZV9</string>
@ -62,7 +62,7 @@
<!-- Setup strings -->
<string name="welcome">Welcome!</string>
<string name="welcome_description">Learn how to set up &lt;b>Citra&lt;/b> and jump into emulation.</string>
<string name="welcome_description">Learn how to set up &lt;b>Azahar&lt;/b> and jump into emulation.</string>
<string name="get_started">Get started</string>
<string name="step_complete">Complete!</string>
<string name="games">Games</string>
@ -75,7 +75,7 @@
<string name="notifications_description">Grant the notification permission with the button below.</string>
<string name="give_permission">Grant permission</string>
<string name="notification_warning">Skip granting the notification permission?</string>
<string name="notification_warning_description">Citra won\'t be able to notify you of important information.</string>
<string name="notification_warning_description">Azahar won\'t be able to notify you of important information.</string>
<string name="camera_permission">Camera</string>
<string name="camera_permission_description">Grant the camera permission below to emulate the 3DS camera.</string>
<string name="microphone_permission">Microphone</string>
@ -91,7 +91,7 @@
<string name="select_citra_user_folder_description"><![CDATA[Select your <a href="https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage">user data</a> directory with the button below.]]></string>
<string name="select">Select</string>
<string name="cannot_skip">You can\'t skip this step</string>
<string name="cannot_skip_directory_description">This step is required to allow Citra to work. Please select a directory and then you can continue.</string>
<string name="cannot_skip_directory_description">This step is required to allow Azahar to work. Please select a directory and then you can continue.</string>
<string name="cannot_skip_directory_help">https://web.archive.org/web/20240304193549/https://github.com/citra-emu/citra/wiki/Citra-Android-user-data-and-storage</string>
<string name="set_up_theme_settings">Theme Settings</string>
<string name="setup_theme_settings_description">Configure your theme preferences for Lime3DS.</string>
@ -150,7 +150,7 @@
<string name="system_type">System Type</string>
<string name="download">Download</string>
<string name="start">Start</string>
<string name="keys_missing">Citra is missing keys to download system files.</string>
<string name="keys_missing">Azahar is missing keys to download system files.</string>
<string name="how_to_get_keys"><![CDATA[<a href="https://web.archive.org/web/20240304203412/https://citra-emu.org/wiki/aes-keys/">How to get keys?</a>]]></string>
<string name="show_home_apps">Show HOME menu apps in games list</string>
<string name="run_system_setup">Run System Setup when the HOME Menu is launched</string>
@ -167,7 +167,7 @@
<string name="cancelling">Cancelling…</string>
<string name="home_menu">HOME Menu</string>
<string name="home_menu_warning">System Files Warning</string>
<string name="home_menu_warning_description">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.</string>
<string name="home_menu_warning_description">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.</string>
<!-- Generic buttons (Shared with lots of stuff) -->
<string name="generic_buttons">Buttons</string>
@ -426,7 +426,7 @@
<string name="write_permission_needed">You need to allow write access to external storage for the emulator to work</string>
<string name="load_settings">Loading Settings…</string>
<string name="external_storage_not_mounted">The external storage needs to be available in order to use Citra</string>
<string name="external_storage_not_mounted">The external storage needs to be available in order to use Azahar</string>
<string name="select_dir">Select This Directory</string>
<string name="empty_gamelist">No files were found or no game directory has been selected yet.</string>
@ -456,11 +456,11 @@
<!-- Camera -->
<string name="camera_select_image">Select Image</string>
<string name="camera">Camera</string>
<string name="camera_permission_needed">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.</string>
<string name="camera_permission_needed">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.</string>
<!-- Microphone -->
<string name="microphone">Microphone</string>
<string name="microphone_permission_needed">Citra needs to access your microphone to emulate the 3DS\'s microphone.\n\nAlternatively, you can also change \"Audio Input Device\" in Audio Settings.</string>
<string name="microphone_permission_needed">Azahar needs to access your microphone to emulate the 3DS\'s microphone.\n\nAlternatively, you can also change \"Audio Input Device\" in Audio Settings.</string>
<!-- Core Errors -->
<string name="abort_button">Abort</string>
@ -499,9 +499,9 @@
<item quantity="one">Installing %d file. See notification for more details.</item>
<item quantity="other">Installing %d files. See notification for more details.</item>
</plurals>
<string name="cia_install_notification_channel_name" translatable="false">Citra CIA Install</string>
<string name="cia_install_notification_channel_name" translatable="false">Azahar CIA Install</string>
<string name="cia_install_notification_channel_id" translatable="false">citra-cia</string>
<string name="cia_install_notification_channel_description">Citra notifications during CIA Install</string>
<string name="cia_install_notification_channel_description">Azahar notifications during CIA Install</string>
<string name="cia_install_notification_title">Installing CIA</string>
<string name="cia_install_notification_installing">Installing %s (%d/%d)</string>
<string name="cia_install_notification_success_title">Successfully installed CIA</string>
@ -509,7 +509,7 @@
<string name="cia_install_success">\"%s\" has been installed successfully</string>
<string name="cia_install_error_aborted">The installation of \"%s\" was aborted.\n Please see the log for more details</string>
<string name="cia_install_error_invalid">\"%s\" is not a valid CIA</string>
<string name="cia_install_error_encrypted">\"%s\" must be decrypted before being used with Citra.\n A real 3DS is required</string>
<string name="cia_install_error_encrypted">\"%s\" must be decrypted before being used with Azahar.\n A real 3DS is required</string>
<string name="cia_install_error_unknown">An unknown error occurred while installing \"%s\".\n Please see the log for more details</string>
<!-- Memory Sizes -->

8
src/audio_core/cubeb_input.cpp
View File

@ -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<std::string> ListCubebInputDevices() {
std::vector<std::string> 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 {};
}

6
src/audio_core/cubeb_sink.cpp
View File

@ -25,7 +25,7 @@ struct CubebSink::Impl {
};
CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_unique<Impl>()) {
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, &params, std::max(512u, minimum_latency),
&Impl::DataCallback, &Impl::StateCallback, impl.get());
if (stream_err != CUBEB_OK) {
@ -164,7 +164,7 @@ std::vector<std::string> ListCubebSinkDevices() {
std::vector<std::string> 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 {};
}

44
src/citra_qt/citra_qt.cpp
View File

@ -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<QDBusObjectPath> 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<QDBusObjectPath> 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.<br>Please ensure that the video encoder is "
"configured correctly.<br>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);

2
src/citra_qt/configuration/config.cpp
View File

@ -63,7 +63,7 @@ const std::array<UISettings::Shortcut, 35> 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}},

4
src/citra_qt/configuration/configure_general.cpp
View File

@ -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 <b>reset your settings</b> and close Citra?"),
this, tr("Azahar"),
tr("Are you sure you want to <b>reset your settings</b> and close Azahar?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) {

2
src/citra_qt/configuration/configure_motion_touch.cpp
View File

@ -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.<br>Please "
"wait for them to finish."));
return false;

3
src/citra_qt/configuration/configure_per_game.cpp
View File

@ -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 <b>reset your settings for this game</b>?"),
this, tr("Azahar"),
tr("Are you sure you want to <b>reset your settings for this game</b>?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) {

10
src/citra_qt/configuration/configure_system.cpp
View File

@ -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. <br><a "
"href='https://web.archive.org/web/20240304203412/https://citra-emu.org/wiki/"
"aes-keys/'><span style=\"text-decoration: "
"underline; color:#039be5;\">How to get keys?</span></a>"));
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);

2
src/citra_qt/discord_impl.cpp
View File

@ -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";

4
src/citra_qt/dumping/dumping_dialog.cpp
View File

@ -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));

9
src/citra_qt/game_list.cpp
View File

@ -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<std::tuple<Service::FS::MediaType, u64, QString>> 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<std::tuple<Service::FS::MediaType, u64, QString>> titles;

5
src/citra_qt/multiplayer/host_room.cpp
View File

@ -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);

4
src/citra_qt/multiplayer/message.cpp
View File

@ -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(

2
src/citra_room/citra_room.cpp
View File

@ -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;
}

6
src/citra_sdl/citra_sdl.cpp
View File

@ -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/");

2
src/citra_sdl/emu_window/emu_window_sdl2.cpp
View File

@ -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());

2
src/citra_sdl/emu_window/emu_window_sdl2_gl.cpp
View File

@ -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.

2
src/citra_sdl/emu_window/emu_window_sdl2_sw.cpp
View File

@ -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(),

2
src/citra_sdl/emu_window/emu_window_sdl2_vk.cpp
View File

@ -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(),

2
src/common/settings.cpp
View File

@ -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());

2
src/core/file_sys/plugin_3gx.cpp
View File

@ -91,7 +91,7 @@ Loader::ResultStatus FileSys::Plugin3GXLoader::Load(
}
if (header.infos.flags.compatibility == static_cast<u32>(_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;
}

5
src/core/movie.cpp
View File

@ -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;
}

2
src/network/artic_base/artic_base_client.cpp
View File

@ -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 {