From db7533ef267e31732b7114a9b3b5bac52e4d8e61 Mon Sep 17 00:00:00 2001 From: Angelo Trotta <111277410+ShyVortex@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:11:44 +0100 Subject: [PATCH] Update about and configuration --- src/citra/citra.cpp | 2 +- src/citra/config.cpp | 2 +- src/citra/emu_window/emu_window_sdl2.cpp | 2 +- src/citra/emu_window/emu_window_sdl2_gl.cpp | 2 +- src/citra/emu_window/emu_window_sdl2_sw.cpp | 2 +- src/citra/emu_window/emu_window_sdl2_vk.cpp | 2 +- src/citra_qt/aboutdialog.ui | 6 +++--- src/citra_qt/configuration/config.cpp | 4 ++-- src/citra_qt/configuration/configure_audio.cpp | 2 +- src/citra_qt/configuration/configure_camera.cpp | 2 +- src/citra_qt/configuration/configure_cheats.cpp | 2 +- src/citra_qt/configuration/configure_debug.cpp | 2 +- src/citra_qt/configuration/configure_dialog.cpp | 2 +- src/citra_qt/configuration/configure_enhancements.cpp | 2 +- src/citra_qt/configuration/configure_general.cpp | 6 +++--- src/citra_qt/configuration/configure_graphics.cpp | 2 +- src/citra_qt/configuration/configure_hotkeys.cpp | 2 +- src/citra_qt/configuration/configure_input.cpp | 2 +- src/citra_qt/configuration/configure_motion_touch.cpp | 4 ++-- src/citra_qt/configuration/configure_per_game.cpp | 2 +- src/citra_qt/configuration/configure_storage.cpp | 2 +- src/citra_qt/configuration/configure_system.cpp | 8 ++++---- .../configuration/configure_touch_from_button.cpp | 2 +- src/citra_qt/configuration/configure_ui.cpp | 2 +- src/citra_qt/configuration/configure_web.cpp | 2 +- src/citra_qt/configuration/configure_web.ui | 6 +++--- src/citra_qt/main.cpp | 2 +- src/citra_qt/movie/movie_play_dialog.cpp | 4 ++-- src/citra_qt/movie/movie_record_dialog.cpp | 4 ++-- src/citra_qt/multiplayer/direct_connect.cpp | 4 ++-- src/citra_qt/multiplayer/host_room.cpp | 6 +++--- src/citra_qt/multiplayer/lobby.cpp | 4 ++-- src/citra_qt/multiplayer/message.cpp | 6 +++--- 33 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index 99fb285f0..35e794a7f 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/config.cpp b/src/citra/config.cpp index baf5bbded..9b1929937 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project +// Copyright 2024 Citra Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2.cpp b/src/citra/emu_window/emu_window_sdl2.cpp index 36c2f7fc7..731ad7537 100644 --- a/src/citra/emu_window/emu_window_sdl2.cpp +++ b/src/citra/emu_window/emu_window_sdl2.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_gl.cpp b/src/citra/emu_window/emu_window_sdl2_gl.cpp index c72c16bf6..da147dbaa 100644 --- a/src/citra/emu_window/emu_window_sdl2_gl.cpp +++ b/src/citra/emu_window/emu_window_sdl2_gl.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_sw.cpp b/src/citra/emu_window/emu_window_sdl2_sw.cpp index cdf60da79..4f4d82784 100644 --- a/src/citra/emu_window/emu_window_sdl2_sw.cpp +++ b/src/citra/emu_window/emu_window_sdl2_sw.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra/emu_window/emu_window_sdl2_vk.cpp b/src/citra/emu_window/emu_window_sdl2_vk.cpp index 47e10dc38..7bcacf777 100644 --- a/src/citra/emu_window/emu_window_sdl2_vk.cpp +++ b/src/citra/emu_window/emu_window_sdl2_vk.cpp @@ -1,4 +1,4 @@ -// Copyright 2023 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/aboutdialog.ui b/src/citra_qt/aboutdialog.ui index f676a6656..c3fa0f95f 100644 --- a/src/citra_qt/aboutdialog.ui +++ b/src/citra_qt/aboutdialog.ui @@ -57,7 +57,7 @@ - <html><head/><body><p><span style=" font-size:28pt;">Citra</span></p></body></html> + <html><head/><body><p><span style=" font-size:28pt;">Lime</span></p></body></html> @@ -87,7 +87,7 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Citra is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">Lime is a free and open source 3DS emulator licensed under GPLv2.0 or any later version.</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">This software should not be used to play games you have not legally obtained.</span></p></body></html> @@ -115,7 +115,7 @@ p, li { white-space: pre-wrap; } - <html><head/><body><p><a href="https://citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://community.citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Forum</span></a> | <a href="https://github.com/citra-emu"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/citra-emu/citra/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/citra-emu/citra/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> + <html><head/><body><p><a href="https://citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Website</span></a> | <a href="https://community.citra-emu.org/"><span style=" text-decoration: underline; color:#039be5;">Forum</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator"><span style=" text-decoration: underline; color:#039be5;">Source Code</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator/graphs/contributors"><span style=" text-decoration: underline; color:#039be5;">Contributors</span></a> | <a href="https://github.com/RyzenDew/Lime-3DS-Emulator/blob/master/license.txt"><span style=" text-decoration: underline; color:#039be5;">License</span></a></p></body></html> true diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 54c8c4f4b..7fa9981fb 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -1,4 +1,4 @@ -// Copyright 2014 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -63,7 +63,7 @@ const std::array Config::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 Lime"), 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_audio.cpp b/src/citra_qt/configuration/configure_audio.cpp index bf301d41e..0e0f7a9f7 100644 --- a/src/citra_qt/configuration/configure_audio.cpp +++ b/src/citra_qt/configuration/configure_audio.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_camera.cpp b/src/citra_qt/configuration/configure_camera.cpp index 08368fe5c..68796bcab 100644 --- a/src/citra_qt/configuration/configure_camera.cpp +++ b/src/citra_qt/configuration/configure_camera.cpp @@ -1,4 +1,4 @@ -// Copyright 2018 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_cheats.cpp b/src/citra_qt/configuration/configure_cheats.cpp index aa67f7440..035a21690 100644 --- a/src/citra_qt/configuration/configure_cheats.cpp +++ b/src/citra_qt/configuration/configure_cheats.cpp @@ -1,4 +1,4 @@ -// Copyright 2018 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_debug.cpp b/src/citra_qt/configuration/configure_debug.cpp index 2386e2049..a749da93a 100644 --- a/src/citra_qt/configuration/configure_debug.cpp +++ b/src/citra_qt/configuration/configure_debug.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_dialog.cpp b/src/citra_qt/configuration/configure_dialog.cpp index 1644b657a..c6c1819ad 100644 --- a/src/citra_qt/configuration/configure_dialog.cpp +++ b/src/citra_qt/configuration/configure_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_enhancements.cpp b/src/citra_qt/configuration/configure_enhancements.cpp index e1a831eee..d20ed48ba 100644 --- a/src/citra_qt/configuration/configure_enhancements.cpp +++ b/src/citra_qt/configuration/configure_enhancements.cpp @@ -1,4 +1,4 @@ -// Copyright 2019 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index a402523bf..447ea5928 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -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("Lime"), + tr("Are you sure you want to reset your settings and close Lime?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_graphics.cpp b/src/citra_qt/configuration/configure_graphics.cpp index 80c2d138d..95d6ffe32 100644 --- a/src/citra_qt/configuration/configure_graphics.cpp +++ b/src/citra_qt/configuration/configure_graphics.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_hotkeys.cpp b/src/citra_qt/configuration/configure_hotkeys.cpp index b07370528..9f0332e02 100644 --- a/src/citra_qt/configuration/configure_hotkeys.cpp +++ b/src/citra_qt/configuration/configure_hotkeys.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_input.cpp b/src/citra_qt/configuration/configure_input.cpp index da98da0d0..4fa6bc3d6 100644 --- a/src/citra_qt/configuration/configure_input.cpp +++ b/src/citra_qt/configuration/configure_input.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_motion_touch.cpp b/src/citra_qt/configuration/configure_motion_touch.cpp index 3bfbba71d..d927b921d 100644 --- a/src/citra_qt/configuration/configure_motion_touch.cpp +++ b/src/citra_qt/configuration/configure_motion_touch.cpp @@ -1,4 +1,4 @@ -// Copyright 2018 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -340,7 +340,7 @@ void ConfigureMotionTouch::OnConfigureTouchFromButton() { bool ConfigureMotionTouch::CanCloseDialog() { if (udp_test_in_progress) { - QMessageBox::warning(this, tr("Citra"), + QMessageBox::warning(this, tr("Lime"), 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 c11847a0d..0849cbba2 100644 --- a/src/citra_qt/configuration/configure_per_game.cpp +++ b/src/citra_qt/configuration/configure_per_game.cpp @@ -78,7 +78,7 @@ 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("Lime"), 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_storage.cpp b/src/citra_qt/configuration/configure_storage.cpp index d46cb0614..836331382 100644 --- a/src/citra_qt/configuration/configure_storage.cpp +++ b/src/citra_qt/configuration/configure_storage.cpp @@ -1,4 +1,4 @@ -// Copyright 2021 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 653957ca7..0be937472 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -1,4 +1,4 @@ -// Copyright 2016 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -269,7 +269,7 @@ ConfigureSystem::ConfigureSystem(Core::System& system_, QWidget* parent) 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?")); } @@ -611,9 +611,9 @@ void ConfigureSystem::DownloadFromNUS() { future_watcher.waitForFinished(); if (failed) { - QMessageBox::critical(this, tr("Citra"), tr("Downloading system files failed.")); + QMessageBox::critical(this, tr("Lime"), tr("Downloading system files failed.")); } else if (!future_watcher.isCanceled()) { - QMessageBox::information(this, tr("Citra"), tr("Successfully downloaded system files.")); + QMessageBox::information(this, tr("Lime"), tr("Successfully downloaded system files.")); } ui->button_start_download->setEnabled(true); diff --git a/src/citra_qt/configuration/configure_touch_from_button.cpp b/src/citra_qt/configuration/configure_touch_from_button.cpp index 76f2a77bc..7235763b8 100644 --- a/src/citra_qt/configuration/configure_touch_from_button.cpp +++ b/src/citra_qt/configuration/configure_touch_from_button.cpp @@ -1,4 +1,4 @@ -// Copyright 2020 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_ui.cpp b/src/citra_qt/configuration/configure_ui.cpp index f13fc41b8..125fcd70d 100644 --- a/src/citra_qt/configuration/configure_ui.cpp +++ b/src/citra_qt/configuration/configure_ui.cpp @@ -1,4 +1,4 @@ -// Copyright 2018 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index b9a15b6ec..e7dfa56d6 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui index c87cf48e6..c6978a374 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/citra_qt/configuration/configure_web.ui @@ -19,13 +19,13 @@ - Citra Web Service + Lime Web Service - By providing your username and token, you agree to allow Citra to collect additional usage data, which may include user identifying information. + By providing your username and token, you agree to allow Lime to collect additional usage data, which may include user identifying information. @@ -128,7 +128,7 @@ - Share anonymous usage data with the Citra team + Share anonymous usage data with the Lime team diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 260e69439..6b146d764 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -1835,7 +1835,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 Litra. A real 3DS is required.") + "before being used with Lime. A real 3DS is required.") .arg(filename)); break; case Service::AM::InstallStatus::ErrorFileNotFound: diff --git a/src/citra_qt/movie/movie_play_dialog.cpp b/src/citra_qt/movie/movie_play_dialog.cpp index 6df973af5..2ec038c70 100644 --- a/src/citra_qt/movie/movie_play_dialog.cpp +++ b/src/citra_qt/movie/movie_play_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2020 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -51,7 +51,7 @@ QString MoviePlayDialog::GetGamePath() const { void MoviePlayDialog::OnToolButtonClicked() { const QString path = QFileDialog::getOpenFileName(this, tr("Play Movie"), UISettings::values.movie_playback_path, - tr("Citra TAS Movie (*.ctm)")); + tr("Lime TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/citra_qt/movie/movie_record_dialog.cpp b/src/citra_qt/movie/movie_record_dialog.cpp index b68914535..49f17fbc5 100644 --- a/src/citra_qt/movie/movie_record_dialog.cpp +++ b/src/citra_qt/movie/movie_record_dialog.cpp @@ -1,4 +1,4 @@ -// Copyright 2020 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -47,7 +47,7 @@ QString MovieRecordDialog::GetAuthor() const { void MovieRecordDialog::OnToolButtonClicked() { const QString path = QFileDialog::getSaveFileName(this, tr("Record Movie"), UISettings::values.movie_record_path, - tr("Citra TAS Movie (*.ctm)")); + tr("Lime TAS Movie (*.ctm)")); if (path.isEmpty()) { return; } diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index bdc866a75..7874db239 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -33,7 +33,7 @@ DirectConnectWindow::DirectConnectWindow(Core::System& system_, QWidget* parent) ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default + // Use Lime Web Service user name as nickname by default ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); } ui->ip->setValidator(validation.GetIP()); diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 8a1ca02e2..7a748f072 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -53,7 +53,7 @@ HostRoomWindow::HostRoomWindow(Core::System& system_, QWidget* parent, QStandard // Restore the settings: ui->username->setText(UISettings::values.room_nickname); if (ui->username->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default + // Use Lime Web Service user name as nickname by default ui->username->setText(QString::fromStdString(NetSettings::values.citra_username)); } ui->room_name->setText(UISettings::values.room_name); @@ -163,7 +163,7 @@ void HostRoomWindow::Host() { 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 " + "room publicly, you must have a valid Lime 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: ") + QString::fromStdString(result.result_string), diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index 00671b842..5a29f27f4 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -57,7 +57,7 @@ Lobby::Lobby(Core::System& system_, QWidget* parent, QStandardItemModel* list, ui->nickname->setValidator(validation.GetNickname()); ui->nickname->setText(UISettings::values.nickname); if (ui->nickname->text().isEmpty() && !NetSettings::values.citra_username.empty()) { - // Use Citra Web Service user name as nickname by default + // Use Lime Web Service user name as nickname by default ui->nickname->setText(QString::fromStdString(NetSettings::values.citra_username)); } diff --git a/src/citra_qt/multiplayer/message.cpp b/src/citra_qt/multiplayer/message.cpp index beb45bbe0..ac3ef1507 100644 --- a/src/citra_qt/multiplayer/message.cpp +++ b/src/citra_qt/multiplayer/message.cpp @@ -1,4 +1,4 @@ -// Copyright 2017 Citra Emulator Project +// Copyright 2024 Lime Emulator Project // Licensed under GPLv2 or any later version // Refer to the license.txt file included. @@ -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 Lime 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 Lime. 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(