moonpower/azahar-UWP
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

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(