diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt index c124c91aa..826fa49d1 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -83,7 +83,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) fun loadSettingsList() { if (!TextUtils.isEmpty(gameId)) { - settingsActivity.setToolbarTitle("Game Settings: $gameId") + settingsActivity.setToolbarTitle("Application Settings: $gameId") } val sl = ArrayList() if (menuTag == null) { diff --git a/src/android/app/src/main/res/layout/dialog_about_game.xml b/src/android/app/src/main/res/layout/dialog_about_game.xml index fe4719161..8b1ded71a 100644 --- a/src/android/app/src/main/res/layout/dialog_about_game.xml +++ b/src/android/app/src/main/res/layout/dialog_about_game.xml @@ -47,7 +47,7 @@ android:textSize="20sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - tools:text="Game Title" /> + tools:text="Application Title" /> + tools:text="Company" /> + tools:text="Application Region" /> + tools:text="Application Filename" /> diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index b197e8a6d..60e0f6a01 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -3,21 +3,21 @@ 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 + This software will run applications 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. + Next, you will need to select an Applications 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 Options Search - Games + Applications Configure emulator settings Install CIA file - Install games, updates or DLC + Install applications, updates or DLC Share Log Share Azahar\'s log file to debug issues GPU Driver Manager @@ -27,13 +27,13 @@ Custom drivers not supported 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 Azahar to populate the games list + Select Applications Folder + Allows Azahar to populate the application list About An open-source 3DS emulator Build version, credits, and more - Games directory selected - Changes the files that Azahar uses to load games + Application directory selected + Changes the files that Azahar uses to load applications Modify the look of the app Install CIA @@ -65,12 +65,12 @@ Learn how to set up <b>Azahar</b> and jump into emulation. Get started Complete! - Games - Select your <b>Games</b> folder with the button below. + Applications + Select your <b>Applications</b> folder with the button below. Done - You\'re all set.\nEnjoy your games! + You\'re all set.\nEnjoy using the emulator! Continue - Add Games + Add Applications Notifications Grant the notification permission with the button below. Grant permission @@ -81,8 +81,8 @@ Microphone Grant the microphone permission below to emulate the 3DS microphone. Permission denied - Skip selecting games folder? - Games won\'t be displayed in the Games list if a folder isn\'t selected. + Skip selecting applications folder? + Software won\'t be displayed in the Applications list if a folder isn\'t selected. https://web.archive.org/web/20240304210021/https://citra-emu.org/wiki/dumping-game-cartridges/ Help Skip @@ -98,8 +98,8 @@ Set Theme - Search and Filter Games - Search Games + Search and Filter Applications + Search Applications Recently Played Recently Added Installed @@ -152,7 +152,7 @@ Start Azahar is missing keys to download system files. How to get keys?]]> - Show HOME menu apps in games list + Show HOME menu apps in Applications list Run System Setup when the HOME Menu is launched Minimal Old 3DS @@ -167,7 +167,7 @@ Cancelling… HOME Menu System Files Warning - 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. + 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 applications, save states, and the Applications list. Only download the files that you require to avoid any issues with loading speeds. Buttons @@ -198,10 +198,10 @@ Number of steps per hour reported by the pedometer. Range from 0 to 65,535. Console ID Regenerate Console ID - This will replace your current virtual 3DS with a new one. Your current virtual 3DS will not be recoverable. This might have unexpected effects in games. This might fail if you use an outdated config savegame. Continue? + This will replace your current virtual 3DS with a new one. Your current virtual 3DS will not be recoverable. This might have unexpected effects inside applications. This might fail if you use an outdated config save. Continue? 3GX Plugin Loader Loads 3GX plugins from the emulated SD card if they are available. - Allow Games to Change Plugin Loader State + Allow Applications to Change Plugin Loader State Allows homebrew apps to enable the plugin loader even when it is disabled. @@ -231,7 +231,7 @@ Linear Filtering Enables linear filtering, which causes game visuals to appear smoother. Texture Filter - Enhances the visuals of games by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX. + Enhances the visuals of applications by applying a filter to textures. The supported filters are Anime4K Ultrafast, Bicubic, ScaleForce, xBRZ freescale, and MMPX. Enable Hardware Shader Uses hardware to emulate 3DS shaders. When enabled, game performance will be significantly improved. Accurate Multiplication @@ -243,7 +243,7 @@ Limit Speed Percent Specifies the percentage to limit emulation speed. With the default of 100% emulation will be limited to normal speed. Values higher or lower will increase or decrease the speed limit. Internal Resolution - Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain games. + Specifies the resolution used to render at. A high resolution will improve visual quality a lot but is also quite heavy on performance and might cause glitches in certain applications. Native (400x240) 2x Native (800x480) 3x Native (1200x720) @@ -767,7 +767,7 @@ Connect to Artic Base Enter Artic Base server address Delay game render thread - Delay the game render thread when it submits data to the GPU. Helps with performance issues in the (very few) dynamic-fps games. + Delay the game render thread when it submits data to the GPU. Helps with performance issues in the (very few) applications with dynamic framerates. Quicksave @@ -783,6 +783,6 @@ Flush log output on every message Immediately commits the debug log to file. Use this if citra crashes and the log output is being cut. Disable Right Eye Render - Greatly improves performance in some games, but can cause flickering in others. + Greatly improves performance in some applications, but can cause flickering in others. diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp index d3fbfd0cb..c90201bbd 100644 --- a/src/audio_core/hle/source.cpp +++ b/src/audio_core/hle/source.cpp @@ -246,10 +246,11 @@ void Source::ParseConfig(SourceConfiguration::Configuration& config, // fix that, but as a stop gap, we can just prevent these underflowed values from playing in // the mean time if (static_cast(config.length) < 0) { - LOG_ERROR(Audio_DSP, - "Skipping embedded buffer sample! Game passed in improper value for length. " - "addr {:X} length {:X}", - static_cast(config.physical_address), static_cast(config.length)); + LOG_ERROR( + Audio_DSP, + "Skipping embedded buffer sample! Application passed in improper value for length. " + "addr {:X} length {:X}", + static_cast(config.physical_address), static_cast(config.length)); } else { state.input_queue.emplace(Buffer{ config.physical_address, diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index 1ec4160f9..4ed41742d 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -755,8 +755,7 @@ void GMainWindow::InitializeHotkeys() { link_action_shortcut(ui->action_Advance_Frame, QStringLiteral("Advance Frame")); link_action_shortcut(ui->action_Load_from_Newest_Slot, QStringLiteral("Load from Newest Slot")); link_action_shortcut(ui->action_Save_to_Oldest_Slot, QStringLiteral("Save to Oldest Slot")); - link_action_shortcut(ui->action_View_Lobby, - QStringLiteral("Multiplayer Browse Public Application Lobby")); + link_action_shortcut(ui->action_View_Lobby, QStringLiteral("Multiplayer Browse Public Rooms")); link_action_shortcut(ui->action_Start_Room, QStringLiteral("Multiplayer Create Room")); link_action_shortcut(ui->action_Connect_To_Room, QStringLiteral("Multiplayer Direct Connect to Room")); diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index bcc62d1b4..a925ca3b2 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -71,7 +71,7 @@ const std::array QtConfig::default_hotkeys {{ {QStringLiteral("Load Amiibo"), QStringLiteral("Main Window"), {QStringLiteral("F2"), Qt::WidgetWithChildrenShortcut}}, {QStringLiteral("Load File"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+O"), Qt::WidgetWithChildrenShortcut}}, {QStringLiteral("Load from Newest Slot"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+V"), Qt::WindowShortcut}}, - {QStringLiteral("Multiplayer Browse Public Game Lobby"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+B"), Qt::ApplicationShortcut}}, + {QStringLiteral("Multiplayer Browse Public Lobby"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+B"), Qt::ApplicationShortcut}}, {QStringLiteral("Multiplayer Create Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+N"), Qt::ApplicationShortcut}}, {QStringLiteral("Multiplayer Direct Connect to Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Shift"), Qt::ApplicationShortcut}}, {QStringLiteral("Multiplayer Leave Room"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+L"), Qt::ApplicationShortcut}}, @@ -86,7 +86,7 @@ const std::array QtConfig::default_hotkeys {{ {QStringLiteral("Toggle Custom Textures"), QStringLiteral("Main Window"), {QStringLiteral("F7"), Qt::ApplicationShortcut}}, {QStringLiteral("Toggle Filter Bar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+F"), Qt::WindowShortcut}}, {QStringLiteral("Toggle Frame Advancing"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+A"), Qt::ApplicationShortcut}}, - {QStringLiteral("Toggle Per-Game Speed"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Z"), Qt::ApplicationShortcut}}, + {QStringLiteral("Toggle Per-Application Speed"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+Z"), Qt::ApplicationShortcut}}, {QStringLiteral("Toggle Screen Layout"), QStringLiteral("Main Window"), {QStringLiteral("F10"), Qt::WindowShortcut}}, {QStringLiteral("Toggle Status Bar"), QStringLiteral("Main Window"), {QStringLiteral("Ctrl+S"), Qt::WindowShortcut}}, {QStringLiteral("Toggle Texture Dumping"), QStringLiteral("Main Window"), {QStringLiteral(""), Qt::ApplicationShortcut}}, diff --git a/src/citra_qt/configuration/configure_audio.ui b/src/citra_qt/configuration/configure_audio.ui index e5ceca000..5bf8e3b0b 100644 --- a/src/citra_qt/configuration/configure_audio.ui +++ b/src/citra_qt/configuration/configure_audio.ui @@ -98,7 +98,7 @@ - Scales audio playback speed to account for drops in emulation framerate. This means that audio will play at full speed even while the game framerate is low. May cause audio desync issues. + Scales audio playback speed to account for drops in emulation framerate. This means that audio will play at full speed even while the application framerate is low. May cause audio desync issues. Enable realtime audio diff --git a/src/citra_qt/configuration/configure_debug.ui b/src/citra_qt/configuration/configure_debug.ui index 70f4c2cb0..7a4b1f3a2 100644 --- a/src/citra_qt/configuration/configure_debug.ui +++ b/src/citra_qt/configuration/configure_debug.ui @@ -178,7 +178,7 @@ - <html><body>Changes the emulated CPU clock frequency.<br>Underclocking can increase performance but may cause the game to freeze.<br>Overclocking may reduce in game lag but also might cause freezes</body></html> + <html><body>Changes the emulated CPU clock frequency.<br>Underclocking can increase performance but may cause the application to freeze.<br>Overclocking may reduce application lag but also might cause freezes</body></html> 0 @@ -265,7 +265,7 @@ - <html><head/><body><p>CPU Clock Speed Information<br/>Underclocking can increase performance but may cause the game to freeze.<br/>Overclocking may reduce in game lag but also might cause freezes</p></body></html> + <html><head/><body><p>CPU Clock Speed Information<br/>Underclocking can increase performance but may cause the application to freeze.<br/>Overclocking may reduce lag in applications but also might cause freezes</p></body></html> Qt::RichText diff --git a/src/citra_qt/configuration/configure_enhancements.ui b/src/citra_qt/configuration/configure_enhancements.ui index f87d30167..a496d35f5 100644 --- a/src/citra_qt/configuration/configure_enhancements.ui +++ b/src/citra_qt/configuration/configure_enhancements.ui @@ -316,7 +316,7 @@ Disable Right Eye Rendering - <html><head/><body><p>Disable Right Eye Rendering</p><p>Disables rendering the right eye image when not using stereoscopic mode. Greatly improves performance in some games, but can cause flickering in others.</p></body></html> + <html><head/><body><p>Disable Right Eye Rendering</p><p>Disables rendering the right eye image when not using stereoscopic mode. Greatly improves performance in some applications, but can cause flickering in others.</p></body></html> @@ -352,7 +352,7 @@ - <html><head/><body><p>Load all custom textures into memory on boot, instead of loading them when the game requires them.</p></body></html> + <html><head/><body><p>Load all custom textures into memory on boot, instead of loading them when the application requires them.</p></body></html> Preload Custom Textures diff --git a/src/citra_qt/configuration/configure_graphics.ui b/src/citra_qt/configuration/configure_graphics.ui index 122fdddcd..cb0a7323c 100644 --- a/src/citra_qt/configuration/configure_graphics.ui +++ b/src/citra_qt/configuration/configure_graphics.ui @@ -188,7 +188,7 @@ - <html><head/><body><p>Correctly handle all edge cases in multiplication operation in shaders. </p><p>Some games requires this to be enabled for the hardware shader to render properly.</p><p>However this would reduce performance in most games.</p></body></html> + <html><head/><body><p>Correctly handle all edge cases in multiplication operation in shaders. </p><p>Some applications requires this to be enabled for the hardware shader to render properly.</p><p>However this would reduce performance in most applications.</p></body></html> Accurate Multiplication @@ -224,7 +224,7 @@ - <html><head/><body><p>Perform presentation on separate threads. Improves performance when using Vulkan in most games.</p></body></html> + <html><head/><body><p>Perform presentation on separate threads. Improves performance when using Vulkan in most applications.</p></body></html> Enable Async Presentation @@ -258,7 +258,7 @@ - <html><head/><body><p>Overrides the sampling filter used by games. This can be useful in certain cases with poorly behaved games when upscaling. If unsure set this to Game Controlled</p></body></html> + <html><head/><body><p>Overrides the sampling filter used by applications. This can be useful in certain cases with poorly behaved applications when upscaling. If unsure set this to Application Controlled</p></body></html> Texture Sampling @@ -269,7 +269,7 @@ - Game Controlled + Application Controlled @@ -331,7 +331,7 @@ - Use per-game + Use per-application @@ -339,10 +339,10 @@ - Delay game render thread: + Delay application render thread: - <html><head/><body><p>Delays the emulated game render thread the specified amount of milliseconds every time it submits render commands to the GPU.</p><p>Adjust this feature in the (very few) dynamic-fps games to fix performance issues.</p></body></html> + <html><head/><body><p>Delays the emulated application render thread the specified amount of milliseconds every time it submits render commands to the GPU.</p><p>Adjust this feature in the (very few) dynamic framerate applications to fix performance issues.</p></body></html> diff --git a/src/citra_qt/configuration/configure_per_game.cpp b/src/citra_qt/configuration/configure_per_game.cpp index 294b444b6..88709df16 100644 --- a/src/citra_qt/configuration/configure_per_game.cpp +++ b/src/citra_qt/configuration/configure_per_game.cpp @@ -82,7 +82,7 @@ void ConfigurePerGame::ResetDefaults() { const auto config_file_name = title_id == 0 ? filename : fmt::format("{:016X}", title_id); QMessageBox::StandardButton answer = QMessageBox::question( this, tr("Azahar"), - tr("Are you sure you want to reset your settings for this game?"), + tr("Are you sure you want to reset your settings for this application?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (answer == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_per_game.ui b/src/citra_qt/configuration/configure_per_game.ui index 4accbad40..d87ee57ff 100644 --- a/src/citra_qt/configuration/configure_per_game.ui +++ b/src/citra_qt/configuration/configure_per_game.ui @@ -180,7 +180,7 @@ - Reset Game Settings + Reset Per-Application Settings diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 14727ccf5..3b532f595 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -550,8 +550,8 @@ void ConfigureSystem::RefreshConsoleID() { QMessageBox::StandardButton reply; QString warning_text = tr("This will replace your current virtual 3DS with a new one. " "Your current virtual 3DS will not be recoverable. " - "This might have unexpected effects in games. This might fail, " - "if you use an outdated config savegame. Continue?"); + "This might have unexpected effects in applications. This might fail " + "if you use an outdated config save. Continue?"); reply = QMessageBox::critical(this, tr("Warning"), warning_text, QMessageBox::No | QMessageBox::Yes); if (reply == QMessageBox::No) { diff --git a/src/citra_qt/configuration/configure_system.ui b/src/citra_qt/configuration/configure_system.ui index 95640baa2..d62e61fe9 100644 --- a/src/citra_qt/configuration/configure_system.ui +++ b/src/citra_qt/configuration/configure_system.ui @@ -471,7 +471,7 @@ - Allow games to change plugin loader state + Allow applications to change plugin loader state @@ -721,7 +721,7 @@ - System settings are available only when game is not running. + System settings are available only when applications is not running. true diff --git a/src/citra_qt/configuration/configure_ui.ui b/src/citra_qt/configuration/configure_ui.ui index c9a0a659e..4ea6f4607 100644 --- a/src/citra_qt/configuration/configure_ui.ui +++ b/src/citra_qt/configuration/configure_ui.ui @@ -68,7 +68,7 @@ - Game List + Application List diff --git a/src/citra_qt/configuration/configure_web.ui b/src/citra_qt/configuration/configure_web.ui index a68936c59..29c292883 100644 --- a/src/citra_qt/configuration/configure_web.ui +++ b/src/citra_qt/configuration/configure_web.ui @@ -23,7 +23,7 @@ - Show Current Game in your Discord Status + Show current application in your Discord status diff --git a/src/citra_qt/main.ui b/src/citra_qt/main.ui index f63ba434e..271a1bc78 100644 --- a/src/citra_qt/main.ui +++ b/src/citra_qt/main.ui @@ -446,7 +446,7 @@ true - Browse Public Application Lobby + Browse Public Rooms diff --git a/src/citra_qt/movie/movie_play_dialog.cpp b/src/citra_qt/movie/movie_play_dialog.cpp index b2ed37666..726a7c87a 100644 --- a/src/citra_qt/movie/movie_play_dialog.cpp +++ b/src/citra_qt/movie/movie_play_dialog.cpp @@ -29,7 +29,7 @@ MoviePlayDialog::MoviePlayDialog(QWidget* parent, GameList* game_list_, const Co if (system.IsPoweredOn()) { QString note_text; - note_text = tr("Current running game will be stopped."); + note_text = tr("Current running application will be stopped."); if (system.Movie().GetPlayMode() == Core::Movie::PlayMode::Recording) { note_text.append(tr("
Current recording will be discarded.")); } @@ -103,7 +103,7 @@ void MoviePlayDialog::UpdateUIDisplay() { game_list->FindGameByProgramID(metadata.program_id, GameListItemPath::TitleRole); if (title.isEmpty()) { ui->gameLineEdit->setText(tr("(unknown)")); - ui->note1Label->setText(tr("Game used in this movie is not in game list.")); + ui->note1Label->setText(tr("Application used in this movie is not in Applications list.")); ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); } else { ui->gameLineEdit->setText(title); diff --git a/src/citra_qt/movie/movie_play_dialog.ui b/src/citra_qt/movie/movie_play_dialog.ui index ad9b595cd..ac6688703 100644 --- a/src/citra_qt/movie/movie_play_dialog.ui +++ b/src/citra_qt/movie/movie_play_dialog.ui @@ -54,7 +54,7 @@ - Game: + Application: diff --git a/src/citra_qt/movie/movie_record_dialog.cpp b/src/citra_qt/movie/movie_record_dialog.cpp index b68914535..6a8675e85 100644 --- a/src/citra_qt/movie/movie_record_dialog.cpp +++ b/src/citra_qt/movie/movie_record_dialog.cpp @@ -24,12 +24,12 @@ MovieRecordDialog::MovieRecordDialog(QWidget* parent, const Core::System& system QString note_text; if (system.IsPoweredOn()) { - note_text = tr("Current running game will be restarted."); + note_text = tr("Current running application will be restarted."); if (system.Movie().GetPlayMode() == Core::Movie::PlayMode::Recording) { note_text.append(tr("
Current recording will be discarded.")); } } else { - note_text = tr("Recording will start once you boot a game."); + note_text = tr("Recording will start once you boot an application."); } ui->noteLabel->setText(note_text); } diff --git a/src/citra_qt/multiplayer/chat_room.cpp b/src/citra_qt/multiplayer/chat_room.cpp index 1e4f2ff07..5fae89045 100644 --- a/src/citra_qt/multiplayer/chat_room.cpp +++ b/src/citra_qt/multiplayer/chat_room.cpp @@ -131,7 +131,7 @@ public: setData(QString::fromStdString(username), UsernameRole); setData(QString::fromStdString(avatar_url), AvatarUrlRole); if (game_name.empty()) { - setData(QObject::tr("Not playing a game"), GameNameRole); + setData(QObject::tr("Not running an application"), GameNameRole); } else { setData(QString::fromStdString(game_name), GameNameRole); } diff --git a/src/citra_qt/multiplayer/host_room.ui b/src/citra_qt/multiplayer/host_room.ui index d54cf49c6..2548d3455 100644 --- a/src/citra_qt/multiplayer/host_room.ui +++ b/src/citra_qt/multiplayer/host_room.ui @@ -48,7 +48,7 @@ - Preferred Game + Preferred Application @@ -98,7 +98,7 @@ QLineEdit::PasswordEchoOnEdit - (Leave blank for open game) + (Leave blank for open room) diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index 0ad6049f7..a512096e2 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -197,7 +197,8 @@ void Lobby::ResetModel() { model->insertColumns(0, Column::TOTAL); model->setHeaderData(Column::EXPAND, Qt::Horizontal, QString(), Qt::DisplayRole); model->setHeaderData(Column::ROOM_NAME, Qt::Horizontal, tr("Room Name"), Qt::DisplayRole); - model->setHeaderData(Column::GAME_NAME, Qt::Horizontal, tr("Preferred Game"), Qt::DisplayRole); + model->setHeaderData(Column::GAME_NAME, Qt::Horizontal, tr("Preferred Application"), + Qt::DisplayRole); model->setHeaderData(Column::HOST, Qt::Horizontal, tr("Host"), Qt::DisplayRole); model->setHeaderData(Column::MEMBER, Qt::Horizontal, tr("Players"), Qt::DisplayRole); } diff --git a/src/citra_qt/multiplayer/lobby.ui b/src/citra_qt/multiplayer/lobby.ui index 0ef0ef762..1f3eb509b 100644 --- a/src/citra_qt/multiplayer/lobby.ui +++ b/src/citra_qt/multiplayer/lobby.ui @@ -73,7 +73,7 @@ - Games I Own + Applications I Own diff --git a/src/citra_qt/multiplayer/lobby_p.h b/src/citra_qt/multiplayer/lobby_p.h index f1890fdef..99bad9727 100644 --- a/src/citra_qt/multiplayer/lobby_p.h +++ b/src/citra_qt/multiplayer/lobby_p.h @@ -253,9 +253,9 @@ public: out.append(QStringLiteral("\n")); const auto& m = member.value(); if (m.GetGameName().isEmpty()) { - out += QString(QObject::tr("%1 is not playing a game")).arg(m.GetName()); + out += QString(QObject::tr("%1 is not running an application")).arg(m.GetName()); } else { - out += QString(QObject::tr("%1 is playing %2")).arg(m.GetName(), m.GetGameName()); + out += QString(QObject::tr("%1 is running %2")).arg(m.GetName(), m.GetGameName()); } first = false; } diff --git a/src/citra_qt/multiplayer/message.cpp b/src/citra_qt/multiplayer/message.cpp index dbf1c2fe0..fb543463c 100644 --- a/src/citra_qt/multiplayer/message.cpp +++ b/src/citra_qt/multiplayer/message.cpp @@ -19,8 +19,9 @@ const ConnectionError ErrorManager::IP_ADDRESS_NOT_VALID( const ConnectionError ErrorManager::PORT_NOT_VALID( QT_TR_NOOP("Port must be a number between 0 to 65535.")); const ConnectionError ErrorManager::GAME_NOT_SELECTED(QT_TR_NOOP( - "You must choose a Preferred Game to host a room. If you do not have any games in your game " - "list yet, add a game folder by clicking on the plus icon in the game list.")); + "You must choose a Preferred Application to host a room. If you do not have any applications " + "in your Applications list yet, add an applications folder by clicking on the plus icon " + "in the Applications list.")); const ConnectionError ErrorManager::NO_INTERNET( QT_TR_NOOP("Unable to find an internet connection. Check your internet settings.")); const ConnectionError ErrorManager::UNABLE_TO_CONNECT( diff --git a/src/citra_sdl/citra_sdl.cpp b/src/citra_sdl/citra_sdl.cpp index 0907f7eb5..bca7b34cb 100644 --- a/src/citra_sdl/citra_sdl.cpp +++ b/src/citra_sdl/citra_sdl.cpp @@ -406,11 +406,12 @@ void LaunchSdlFrontend(int argc, char** argv) { LOG_CRITICAL(Frontend, "Failed to load ROM!"); 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 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/"); + LOG_CRITICAL(Frontend, + "The application that you are trying to load must be decrypted before " + "being used with Azahar. \n\n For more information on dumping and " + "decrypting applications, please refer to: " + "https://web.archive.org/web/20240304210021/https://citra-emu.org/" + "wiki/dumping-game-cartridges/"); exit(-1); case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: LOG_CRITICAL(Frontend, "Error while loading ROM: The ROM format is not supported."); diff --git a/src/core/hle/service/frd/frd.h b/src/core/hle/service/frd/frd.h index 004fdb1af..89c44fe1f 100644 --- a/src/core/hle/service/frd/frd.h +++ b/src/core/hle/service/frd/frd.h @@ -59,7 +59,7 @@ struct Game { u16 version; INSERT_PADDING_BYTES(0x6); }; -static_assert(sizeof(Game) == 0x10, "Game has inccorect size"); +static_assert(sizeof(Game) == 0x10, "Application has inccorect size"); struct ScreenName { // 20 bytes according to 3dbrew diff --git a/src/core/hle/service/nfc/nfc_device.cpp b/src/core/hle/service/nfc/nfc_device.cpp index dd388f51b..5f287715e 100644 --- a/src/core/hle/service/nfc/nfc_device.cpp +++ b/src/core/hle/service/nfc/nfc_device.cpp @@ -61,7 +61,8 @@ bool NfcDevice::LoadAmiibo(std::string filename) { } if (device_state != DeviceState::SearchingForTag) { - LOG_ERROR(Service_NFC, "Game is not looking for amiibos, current state {}", device_state); + LOG_ERROR(Service_NFC, "Application is not looking for amiibos, current state {}", + device_state); return false; }